From 95481502ebdae13eceaf99a7e18612730d2e4cf3 Mon Sep 17 00:00:00 2001 From: Matty Evans Date: Thu, 7 May 2026 12:20:11 +1000 Subject: [PATCH] chore(go.mod): update dependency references to use ethpandaops/go-eth2-client and remove old attestantio references for better compatibility chore(go.sum): update checksums for modified dependencies to ensure integrity refactor(crawler): change import paths from attestantio to ethpandaops to align with the new package structure refactor(services): change import paths in services for consistency with updated go-eth2-client package refactor(fork): change import paths from attestantio to ethpandaops for alignment with updates refactor(serialize): change import paths in serialization and tests to match new package structure --- go.mod | 18 ++++++--------- go.sum | 24 ++++++++++++-------- pkg/consensus/mimicry/crawler/crawler.go | 4 ++-- pkg/consensus/mimicry/crawler/wiring.go | 2 +- pkg/ethereum/beacon.go | 4 ++-- pkg/ethereum/beacon/services/metadata.go | 2 +- pkg/ethereum/fork.go | 2 +- pkg/ethereum/fork_test.go | 2 +- pkg/ethereum/serialize/serialization.go | 4 ++-- pkg/ethereum/serialize/serialization_test.go | 4 ++-- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index ad04ca8..4ff60fd 100644 --- a/go.mod +++ b/go.mod @@ -2,22 +2,16 @@ module github.com/ethpandaops/ethcore go 1.25.1 -// Glamsterdam (Gloas) fork support: EIP-7928 (Block-Level Access Lists). -// Remove once merged upstream. -replace github.com/attestantio/go-eth2-client => github.com/pk910/go-eth2-client v0.0.0-20260211135810-4d8cc413fd3b // https://github.com/pk910/go-eth2-client/pull/7 - -replace github.com/ethpandaops/beacon => github.com/ethpandaops/beacon v0.65.1-0.20260323003205-7b1d6d7ddd50 // https://github.com/ethpandaops/beacon/pull/69 - require ( github.com/OffchainLabs/prysm/v6 v6.1.1 - github.com/attestantio/go-eth2-client v0.27.1 github.com/cenkalti/backoff/v5 v5.0.3 github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 github.com/ethereum/go-ethereum v1.17.2-0.20260324190457-8f361e342cb9 - github.com/ethpandaops/beacon v0.65.0 + github.com/ethpandaops/beacon v0.67.1-0.20260507021101-bdc1647be069 github.com/ethpandaops/ethereum-package-go v0.8.1 github.com/ethpandaops/ethwallclock v0.4.0 + github.com/ethpandaops/go-eth2-client v0.1.2-0.20260501105559-03ed5eacf583 github.com/go-co-op/gocron/v2 v2.16.6 github.com/golang/snappy v1.0.0 github.com/jellydator/ttlcache/v3 v3.4.0 @@ -46,10 +40,12 @@ require ( github.com/VictoriaMetrics/fastcache v1.13.0 // indirect github.com/adrg/xdg v0.4.0 // indirect github.com/aristanetworks/goarista v0.0.0-20200805130819-fd197cf57d96 // indirect + github.com/attestantio/go-eth2-client v0.27.1 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.22.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.5 // indirect + github.com/casbin/govaluate v1.10.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cockroachdb/errors v1.12.0 // indirect github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect @@ -114,7 +110,7 @@ require ( github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect github.com/kilic/bls12-381 v0.1.0 // indirect github.com/klauspost/compress v1.18.0 // indirect - github.com/klauspost/cpuid/v2 v2.2.10 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/koron/go-ssdp v0.0.6 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect @@ -185,7 +181,8 @@ require ( github.com/pion/transport/v3 v3.0.7 // indirect github.com/pion/turn/v4 v4.0.1 // indirect github.com/pion/webrtc/v4 v4.1.0 // indirect - github.com/pk910/dynamic-ssz v0.0.6 // indirect + github.com/pk910/dynamic-ssz v1.3.1 // indirect + github.com/pk910/hashtree-bindings v0.1.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.66.1 // indirect @@ -253,7 +250,6 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect google.golang.org/grpc v1.77.0 // indirect google.golang.org/protobuf v1.36.11 // indirect - gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 1ac1336..d3b9e06 100644 --- a/go.sum +++ b/go.sum @@ -51,6 +51,8 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/attestantio/go-eth2-client v0.27.1 h1:g7bm+gG/p+gfzYdEuxuAepVWYb8EO+2KojV5/Lo2BxM= +github.com/attestantio/go-eth2-client v0.27.1/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -71,6 +73,8 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.5 h1:dpAlnAwmT1yIBm3exhT1/8iUSD98RDJM5vqJ github.com/btcsuite/btcd/btcec/v2 v2.3.5/go.mod h1:m22FrOAiuxl/tht9wIqAoGHcbnCCaPWyauO8y2LGGtQ= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/casbin/govaluate v1.10.0 h1:ffGw51/hYH3w3rZcxO/KcaUIDOLP84w7nsidMVgaDG0= +github.com/casbin/govaluate v1.10.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= @@ -178,12 +182,14 @@ github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJ github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8= github.com/ethereum/go-ethereum v1.17.2-0.20260324190457-8f361e342cb9 h1:87oCZDemf+tvCIUtKt9EUtkfXbU/llIl41ML8+vZ8Mo= github.com/ethereum/go-ethereum v1.17.2-0.20260324190457-8f361e342cb9/go.mod h1:KHcRXfGOUfUmKg51IhQ0IowiqZ6PqZf08CMtk0g5K1o= -github.com/ethpandaops/beacon v0.65.1-0.20260323003205-7b1d6d7ddd50 h1:tgHX4SJYmzW5oz2uAB8kDnm9RCnF+3yAo9LXfff44Uk= -github.com/ethpandaops/beacon v0.65.1-0.20260323003205-7b1d6d7ddd50/go.mod h1:3wfZNuwIk9iR2FfbiuF/3haWF3ppbEDWeZvtSAaVdoU= +github.com/ethpandaops/beacon v0.67.1-0.20260507021101-bdc1647be069 h1:J4SqIUxVaUWkuiTyn/ogYwpBc6q2uptB1m9PTtKiBSM= +github.com/ethpandaops/beacon v0.67.1-0.20260507021101-bdc1647be069/go.mod h1:XbOg8z3zjyU6QfwoOl/AvTxz1UOb/P/OQqAZwMF/hK4= github.com/ethpandaops/ethereum-package-go v0.8.1 h1:VN5l8UXveyw7gp0Glj8BRzS/D5RKyvhLeaoi/C5Jy5M= github.com/ethpandaops/ethereum-package-go v0.8.1/go.mod h1:LQThCwlCeeNBTdXOFV+xSwudoced53x+o/Orya3Y+oo= github.com/ethpandaops/ethwallclock v0.4.0 h1:+sgnhf4pk6hLPukP076VxkiLloE4L0Yk1yat+ZyHh1g= github.com/ethpandaops/ethwallclock v0.4.0/go.mod h1:y0Cu+mhGLlem19vnAV2x0hpFS5KZ7oOi2SWYayv9l24= +github.com/ethpandaops/go-eth2-client v0.1.2-0.20260501105559-03ed5eacf583 h1:hELKAXI1fVVhrsm61rgNKtKHynxSlnHcpCXXF8mS4Yc= +github.com/ethpandaops/go-eth2-client v0.1.2-0.20260501105559-03ed5eacf583/go.mod h1:qoj9ZVKydI99IuIyWt4EvGq4rGgMYfOy6q8zTtwYdy4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -440,8 +446,8 @@ github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zt github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE= -github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -708,10 +714,10 @@ github.com/pion/turn/v4 v4.0.1 h1:01UTBhYToe8PDC8piB++i66q1mmctfhhoeguaFqB84c= github.com/pion/turn/v4 v4.0.1/go.mod h1:pMMKP/ieNAG/fN5cZiN4SDuyKsXtNTr0ccN7IToA1zs= github.com/pion/webrtc/v4 v4.1.0 h1:yq/p0G5nKGbHISf0YKNA8Yk+kmijbblBvuSLwaJ4QYg= github.com/pion/webrtc/v4 v4.1.0/go.mod h1:cgEGkcpxGkT6Di2ClBYO5lP9mFXbCfEOrkYUpjjCQO4= -github.com/pk910/dynamic-ssz v0.0.6 h1:Tu97LSc2TtCyqRfoSbhG9XuR/FbA7CkKeAnlkgUydFY= -github.com/pk910/dynamic-ssz v0.0.6/go.mod h1:b6CrLaB2X7pYA+OSEEbkgXDEcRnjLOZIxZTsMuO/Y9c= -github.com/pk910/go-eth2-client v0.0.0-20260211135810-4d8cc413fd3b h1:jfPN1Fg6yQzGdwRf1WEGbelmC+ciqVZw96LmFa8u7tI= -github.com/pk910/go-eth2-client v0.0.0-20260211135810-4d8cc413fd3b/go.mod h1:1MBvz1DVe6jZduHJDJuJ/1S4LzYmDmvx+r5alo4pyrM= +github.com/pk910/dynamic-ssz v1.3.1 h1:S/no7kRA5FSORmfybG4Cs49CjPgP94fePKPxt8uKkdI= +github.com/pk910/dynamic-ssz v1.3.1/go.mod h1:ARK5qDyrJ/MHpaZHGJYvCKElvaMYTE9pXOQbvPDeE0U= +github.com/pk910/hashtree-bindings v0.1.0 h1:w7NyRWFi2OaYEFvo9ADcE/QU6PMuVLl3hBgx92KiH9c= +github.com/pk910/hashtree-bindings v0.1.0/go.mod h1:zrWt88783JmhBfcgni6kkIMYRdXTZi/FL//OyI5T/l4= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1249,8 +1255,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= -gopkg.in/Knetic/govaluate.v3 v3.0.0 h1:18mUyIt4ZlRlFZAAfVetz4/rzlJs9yhN+U02F4u1AOc= -gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y= diff --git a/pkg/consensus/mimicry/crawler/crawler.go b/pkg/consensus/mimicry/crawler/crawler.go index 7b1b1a6..bea57f4 100644 --- a/pkg/consensus/mimicry/crawler/crawler.go +++ b/pkg/consensus/mimicry/crawler/crawler.go @@ -11,8 +11,8 @@ import ( "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/encoder" pb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/cenkalti/backoff/v5" "github.com/chuckpreslar/emission" "github.com/ethereum/go-ethereum/p2p/enode" diff --git a/pkg/consensus/mimicry/crawler/wiring.go b/pkg/consensus/mimicry/crawler/wiring.go index 1b55064..f281b89 100644 --- a/pkg/consensus/mimicry/crawler/wiring.go +++ b/pkg/consensus/mimicry/crawler/wiring.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/eth" "github.com/ethpandaops/ethcore/pkg/discovery" diff --git a/pkg/ethereum/beacon.go b/pkg/ethereum/beacon.go index 49ef598..7734b51 100644 --- a/pkg/ethereum/beacon.go +++ b/pkg/ethereum/beacon.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/ethcore/pkg/ethereum/beacon/services" "github.com/ethpandaops/ethwallclock" diff --git a/pkg/ethereum/beacon/services/metadata.go b/pkg/ethereum/beacon/services/metadata.go index ef98dbb..37ff406 100644 --- a/pkg/ethereum/beacon/services/metadata.go +++ b/pkg/ethereum/beacon/services/metadata.go @@ -8,7 +8,7 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/beacon/pkg/beacon/api/types" diff --git a/pkg/ethereum/fork.go b/pkg/ethereum/fork.go index a0c1b46..1695e3d 100644 --- a/pkg/ethereum/fork.go +++ b/pkg/ethereum/fork.go @@ -3,7 +3,7 @@ package ethereum import ( "crypto/sha256" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" ) // BlobScheduleEntry represents a blob parameter configuration for a specific epoch. diff --git a/pkg/ethereum/fork_test.go b/pkg/ethereum/fork_test.go index ff592db..7a012e1 100644 --- a/pkg/ethereum/fork_test.go +++ b/pkg/ethereum/fork_test.go @@ -3,7 +3,7 @@ package ethereum import ( "testing" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/stretchr/testify/assert" ) diff --git a/pkg/ethereum/serialize/serialization.go b/pkg/ethereum/serialize/serialization.go index b1fc3fd..f93cd10 100644 --- a/pkg/ethereum/serialize/serialization.go +++ b/pkg/ethereum/serialize/serialization.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "fmt" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/phase0" ) // RootAsString converts a phase0.Root to a string. diff --git a/pkg/ethereum/serialize/serialization_test.go b/pkg/ethereum/serialize/serialization_test.go index 8eff866..d303dd8 100644 --- a/pkg/ethereum/serialize/serialization_test.go +++ b/pkg/ethereum/serialize/serialization_test.go @@ -3,8 +3,8 @@ package serialize import ( "testing" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )