From e39d467c88741067092fb1b056495e091d61c5f8 Mon Sep 17 00:00:00 2001 From: Teddy Knox Date: Wed, 29 May 2024 11:52:46 -0400 Subject: [PATCH] Set submodule versions correctly, fix go dependency conflicts --- contracts | 1 + go-ethereum | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 contracts diff --git a/contracts b/contracts new file mode 160000 index 000000000..7eac99bec --- /dev/null +++ b/contracts @@ -0,0 +1 @@ +Subproject commit 7eac99bec471df3dd9eb0aa669e9159ab58ef7b2 diff --git a/go-ethereum b/go-ethereum index 021ff6fb5..22399a74e 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit 021ff6fb50c7ad8ffc338232c6802a1709ea3285 +Subproject commit 22399a74e2b413e99a4f0d06c65862ced0d021c7 diff --git a/go.mod b/go.mod index b9046d22d..4bca21dc6 100644 --- a/go.mod +++ b/go.mod @@ -120,6 +120,7 @@ require ( github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect + github.com/go-stack/stack v1.8.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -321,7 +322,6 @@ require ( github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-redis/redis/v8 v8.11.4 - github.com/go-stack/stack v1.8.1 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect