diff --git a/go.mod b/go.mod index 8184586e8..e78de6cc3 100644 --- a/go.mod +++ b/go.mod @@ -11,16 +11,16 @@ require ( github.com/ClickHouse/ch-go v0.71.0 github.com/IBM/sarama v1.46.2 github.com/OffchainLabs/prysm/v7 v7.0.0 - github.com/attestantio/go-eth2-client v0.27.1 github.com/avast/retry-go/v4 v4.6.1 github.com/beevik/ntp v1.4.3 github.com/cenkalti/backoff/v5 v5.0.3 github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 github.com/creasty/defaults v1.8.0 github.com/ethereum/go-ethereum v1.17.1 - github.com/ethpandaops/beacon v0.65.0 - github.com/ethpandaops/ethcore v0.0.0-20260506100832-68848ea0ddaa + github.com/ethpandaops/beacon v0.68.0 + github.com/ethpandaops/ethcore v0.0.0-20260513090510-be891b9812d8 github.com/ethpandaops/ethwallclock v0.4.0 + github.com/ethpandaops/go-eth2-client v0.1.2 github.com/failsafe-go/failsafe-go v0.9.6 github.com/ferranbt/fastssz v1.0.0 github.com/go-co-op/gocron/v2 v2.16.6 @@ -71,6 +71,7 @@ require ( ) require ( + github.com/casbin/govaluate v1.10.0 // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/klauspost/crc32 v1.3.0 // indirect github.com/minio/crc64nvme v1.1.1 // indirect @@ -78,6 +79,7 @@ require ( github.com/moby/moby/api v1.54.1 // indirect github.com/moby/moby/client v0.4.0 // indirect github.com/philhofer/fwd v1.2.0 // indirect + github.com/pk910/hashtree-bindings v0.1.0 // indirect github.com/rs/xid v1.6.0 // indirect github.com/tinylib/msgp v1.6.1 // indirect github.com/zeebo/xxh3 v1.1.0 // indirect @@ -144,7 +146,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-redsync/redsync/v4 v4.13.0 // indirect - github.com/goccy/go-yaml v1.17.1 // indirect + github.com/goccy/go-yaml v1.19.2 // indirect github.com/gofrs/flock v0.12.1 // indirect github.com/gofrs/uuid/v5 v5.4.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -253,7 +255,7 @@ require ( github.com/pion/transport/v3 v3.0.7 // indirect github.com/pion/turn/v4 v4.0.2 // indirect github.com/pion/webrtc/v4 v4.1.2 // indirect - github.com/pk910/dynamic-ssz v0.0.6 // indirect + github.com/pk910/dynamic-ssz v1.3.2-0.20260505131440-111bcb265c8f // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect @@ -321,7 +323,6 @@ require ( golang.org/x/tools v0.43.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect - gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 82b1bc050..1b3e3a367 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/alicebob/miniredis/v2 v2.33.0 h1:uvTF0EDeu9RLnUEG27Db5I68ESoIxTiXbNUi github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQevyi/DJpoj6mi0= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -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/attestantio/go-eth2-client v0.26.0 h1:oDWKvIUJfvr1EBi/w9L6mawYZHOCymjHkml7fZplT20= +github.com/attestantio/go-eth2-client v0.26.0/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= github.com/avast/retry-go/v4 v4.6.1 h1:VkOLRubHdisGrHnTu89g08aQEWEgRU7LVEop3GbIcMk= github.com/avast/retry-go/v4 v4.6.1/go.mod h1:V6oF8njAwxJ5gRo1Q7Cxab24xs5NCWZBeaHHBklR8mA= github.com/bazelbuild/rules_go v0.23.2 h1:Wxu7JjqnF78cKZbsBsARLSXx/jlGaSLCnUV3mTlyHvM= @@ -73,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/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw= github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c= +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/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= @@ -179,14 +181,16 @@ 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.1 h1:IjlQDjgxg2uL+GzPRkygGULPMLzcYWncEI7wbaizvho= github.com/ethereum/go-ethereum v1.17.1/go.mod h1:7UWOVHL7K3b8RfVRea022btnzLCaanwHtBuH1jUCH/I= -github.com/ethpandaops/beacon v0.65.0 h1:ssnab73uiuzhmhtU56q9D3ecVrEYv5n+tuqrXRK4YAg= -github.com/ethpandaops/beacon v0.65.0/go.mod h1:lgzrJjQVV77wZ+PJymsY3bQbAK4jrtP8n3WOwMf1Pcs= -github.com/ethpandaops/ethcore v0.0.0-20260506100832-68848ea0ddaa h1:DBdUJ+zYX7wgH5auHX8uJu/7f5NS+YkKRBA3TWaT4KY= -github.com/ethpandaops/ethcore v0.0.0-20260506100832-68848ea0ddaa/go.mod h1:QsmYTdesob+vQ6pW4KtRVvxLZUNop3cdtd/DgD30hJU= +github.com/ethpandaops/beacon v0.68.0 h1:qm3Yvn8ZypYNxoGicTuJijaQs1EixCOWqwKLK4mQPLg= +github.com/ethpandaops/beacon v0.68.0/go.mod h1:A/TEBvCp+4aUKPPXWMgGFpWpoJFr3L3muQX72i+DEx4= +github.com/ethpandaops/ethcore v0.0.0-20260513090510-be891b9812d8 h1:KCZkl5/P79QqwpSVq5JWUnA331J+3Xg5VMp0MQFunvQ= +github.com/ethpandaops/ethcore v0.0.0-20260513090510-be891b9812d8/go.mod h1:RbeOhj2Umh5rF3tJ69vlOBGn8zXtSWGsZz8cLnClkv4= 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 h1:nJr0YBmqHtbVeLeWEDyXwjCEO0AFt1Z0lIciMYlowfU= +github.com/ethpandaops/go-eth2-client v0.1.2/go.mod h1:U3KdR8QSq8vqs9LWSGAF4ETHJpcB62E1DFf0gVMgWv0= github.com/failsafe-go/failsafe-go v0.9.6 h1:vPSH2cry0Ee5cnR9wc9qshCDO6jdrMA9elBJNwyo4Uk= github.com/failsafe-go/failsafe-go v0.9.6/go.mod h1:IeRpglkcwzKagjDMh90ZhN2l4Ovt3+jemQBUbThag54= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= @@ -247,8 +251,8 @@ github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9L github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o= github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= -github.com/goccy/go-yaml v1.17.1 h1:LI34wktB2xEE3ONG/2Ar54+/HJVBriAGJ55PHls4YuY= -github.com/goccy/go-yaml v1.17.1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= +github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= @@ -662,8 +666,10 @@ github.com/pion/turn/v4 v4.0.2 h1:ZqgQ3+MjP32ug30xAbD6Mn+/K4Sxi3SdNOTFf+7mpps= github.com/pion/turn/v4 v4.0.2/go.mod h1:pMMKP/ieNAG/fN5cZiN4SDuyKsXtNTr0ccN7IToA1zs= github.com/pion/webrtc/v4 v4.1.2 h1:mpuUo/EJ1zMNKGE79fAdYNFZBX790KE7kQQpLMjjR54= github.com/pion/webrtc/v4 v4.1.2/go.mod h1:xsCXiNAmMEjIdFxAYU0MbB3RwRieJsegSB2JZsGN+8U= -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/dynamic-ssz v1.3.2-0.20260505131440-111bcb265c8f h1:k1Dn2h+msg+T0c25hoiJ739ckCNt1dqKErLylois7ss= +github.com/pk910/dynamic-ssz v1.3.2-0.20260505131440-111bcb265c8f/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.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1042,8 +1048,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/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y= gopkg.in/cenkalti/backoff.v1 v1.1.0/go.mod h1:J6Vskwqd+OMVJl8C33mmtxTBs2gyzfv7UDAkHu8BrjI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/cannon/cannon.go b/pkg/cannon/cannon.go index 325179fcc..06b971427 100644 --- a/pkg/cannon/cannon.go +++ b/pkg/cannon/cannon.go @@ -15,10 +15,10 @@ import ( //nolint:gosec // only exposed if pprofAddr config is set _ "net/http/pprof" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/beevik/ntp" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/coordinator" "github.com/ethpandaops/xatu/pkg/cannon/deriver" v1 "github.com/ethpandaops/xatu/pkg/cannon/deriver/beacon/eth/v1" diff --git a/pkg/cannon/deriver/beacon/eth/v1/beacon_blob.go b/pkg/cannon/deriver/beacon/eth/v1/beacon_blob.go index 1e9986ec8..811a4f0c6 100644 --- a/pkg/cannon/deriver/beacon/eth/v1/beacon_blob.go +++ b/pkg/cannon/deriver/beacon/eth/v1/beacon_blob.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v1/beacon_committee.go b/pkg/cannon/deriver/beacon/eth/v1/beacon_committee.go index 9127f97fb..88bfe8406 100644 --- a/pkg/cannon/deriver/beacon/eth/v1/beacon_committee.go +++ b/pkg/cannon/deriver/beacon/eth/v1/beacon_committee.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v1/beacon_sync_committee.go b/pkg/cannon/deriver/beacon/eth/v1/beacon_sync_committee.go index f7e44eb2d..e091a2585 100644 --- a/pkg/cannon/deriver/beacon/eth/v1/beacon_sync_committee.go +++ b/pkg/cannon/deriver/beacon/eth/v1/beacon_sync_committee.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - client "github.com/attestantio/go-eth2-client" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + client "github.com/ethpandaops/go-eth2-client" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v1/beacon_validators.go b/pkg/cannon/deriver/beacon/eth/v1/beacon_validators.go index ed9b285d1..5e1141b0f 100644 --- a/pkg/cannon/deriver/beacon/eth/v1/beacon_validators.go +++ b/pkg/cannon/deriver/beacon/eth/v1/beacon_validators.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v1/proposer_duty.go b/pkg/cannon/deriver/beacon/eth/v1/proposer_duty.go index 57bc6fe4d..58060019b 100644 --- a/pkg/cannon/deriver/beacon/eth/v1/proposer_duty.go +++ b/pkg/cannon/deriver/beacon/eth/v1/proposer_duty.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/attester_slashing.go b/pkg/cannon/deriver/beacon/eth/v2/attester_slashing.go index be8158cee..07a47f792 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/attester_slashing.go +++ b/pkg/cannon/deriver/beacon/eth/v2/attester_slashing.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/beacon_block.go b/pkg/cannon/deriver/beacon/eth/v2/beacon_block.go index 801c18032..7645476da 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/beacon_block.go +++ b/pkg/cannon/deriver/beacon/eth/v2/beacon_block.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/beacon_block_sync_aggregate.go b/pkg/cannon/deriver/beacon/eth/v2/beacon_block_sync_aggregate.go index fca3e8d95..6b31a668c 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/beacon_block_sync_aggregate.go +++ b/pkg/cannon/deriver/beacon/eth/v2/beacon_block_sync_aggregate.go @@ -8,11 +8,11 @@ import ( "sync" "time" - client "github.com/attestantio/go-eth2-client" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + client "github.com/ethpandaops/go-eth2-client" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/block_identifier.go b/pkg/cannon/deriver/beacon/eth/v2/block_identifier.go index 4783224b0..321802454 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/block_identifier.go +++ b/pkg/cannon/deriver/beacon/eth/v2/block_identifier.go @@ -3,8 +3,8 @@ package v2 import ( "fmt" - "github.com/attestantio/go-eth2-client/spec" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec" v1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/cannon/deriver/beacon/eth/v2/bls_to_execution_change.go b/pkg/cannon/deriver/beacon/eth/v2/bls_to_execution_change.go index 37bc000a7..e413c51eb 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/bls_to_execution_change.go +++ b/pkg/cannon/deriver/beacon/eth/v2/bls_to_execution_change.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/deposit.go b/pkg/cannon/deriver/beacon/eth/v2/deposit.go index 51f93bc83..9d8668a40 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/deposit.go +++ b/pkg/cannon/deriver/beacon/eth/v2/deposit.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/elaborated_attestation.go b/pkg/cannon/deriver/beacon/eth/v2/elaborated_attestation.go index 478f0a92a..86b21850e 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/elaborated_attestation.go +++ b/pkg/cannon/deriver/beacon/eth/v2/elaborated_attestation.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go b/pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go index c5f404b0c..4d10b12e3 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go +++ b/pkg/cannon/deriver/beacon/eth/v2/execution_transaction.go @@ -8,12 +8,12 @@ import ( "strconv" "time" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" @@ -434,7 +434,14 @@ func GetGasPrice(block *spec.VersionedSignedBeaconBlock, transaction *types.Tran switch block.Version { case spec.DataVersionBellatrix: - baseFee = new(big.Int).SetBytes(block.Bellatrix.Message.Body.ExecutionPayload.BaseFeePerGas[:]) + le := block.Bellatrix.Message.Body.ExecutionPayload.BaseFeePerGasLE + + var be [32]byte + for i := 0; i < 32; i++ { + be[i] = le[31-i] + } + + baseFee = new(big.Int).SetBytes(be[:]) case spec.DataVersionDeneb: executionPayload := block.Deneb.Message.Body.ExecutionPayload baseFee.SetBytes(executionPayload.BaseFeePerGas.Bytes()) diff --git a/pkg/cannon/deriver/beacon/eth/v2/proposer_slashing.go b/pkg/cannon/deriver/beacon/eth/v2/proposer_slashing.go index 38a5d9ab2..ccd287ae6 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/proposer_slashing.go +++ b/pkg/cannon/deriver/beacon/eth/v2/proposer_slashing.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/voluntary_exit.go b/pkg/cannon/deriver/beacon/eth/v2/voluntary_exit.go index 6a04888d0..5489e2e9f 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/voluntary_exit.go +++ b/pkg/cannon/deriver/beacon/eth/v2/voluntary_exit.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/beacon/eth/v2/withdrawal.go b/pkg/cannon/deriver/beacon/eth/v2/withdrawal.go index 88e88c0ba..e59062b03 100644 --- a/pkg/cannon/deriver/beacon/eth/v2/withdrawal.go +++ b/pkg/cannon/deriver/beacon/eth/v2/withdrawal.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/cannon/iterator" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/deriver/event_deriver.go b/pkg/cannon/deriver/event_deriver.go index 08574582c..37f286863 100644 --- a/pkg/cannon/deriver/event_deriver.go +++ b/pkg/cannon/deriver/event_deriver.go @@ -3,7 +3,7 @@ package deriver import ( "context" - "github.com/attestantio/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec" v1 "github.com/ethpandaops/xatu/pkg/cannon/deriver/beacon/eth/v1" v2 "github.com/ethpandaops/xatu/pkg/cannon/deriver/beacon/eth/v2" "github.com/ethpandaops/xatu/pkg/proto/xatu" diff --git a/pkg/cannon/ethereum/beacon.go b/pkg/cannon/ethereum/beacon.go index 0161a4faf..742348e7c 100644 --- a/pkg/cannon/ethereum/beacon.go +++ b/pkg/cannon/ethereum/beacon.go @@ -6,13 +6,13 @@ import ( "sync" "time" - client "github.com/attestantio/go-eth2-client" - "github.com/attestantio/go-eth2-client/api" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - ehttp "github.com/attestantio/go-eth2-client/http" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/beacon/pkg/beacon" + client "github.com/ethpandaops/go-eth2-client" + "github.com/ethpandaops/go-eth2-client/api" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + ehttp "github.com/ethpandaops/go-eth2-client/http" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/ethereum/services" "github.com/ethpandaops/xatu/pkg/networks" "github.com/ethpandaops/xatu/pkg/observability" @@ -56,7 +56,7 @@ func NewBeaconNode(ctx context.Context, name string, config *Config, log logrus. DisablePrometheusMetrics() opts.GoEth2ClientParams = []ehttp.Parameter{ - // Default JSON until https://github.com/attestantio/go-eth2-client/pull/198 is merged. + // Default JSON until https://github.com/ethpandaops/go-eth2-client/pull/198 is merged. ehttp.WithEnforceJSON(true), } diff --git a/pkg/cannon/ethereum/services/duties.go b/pkg/cannon/ethereum/services/duties.go index 45b773642..851f0d43b 100644 --- a/pkg/cannon/ethereum/services/duties.go +++ b/pkg/cannon/ethereum/services/duties.go @@ -6,10 +6,10 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/jellydator/ttlcache/v3" "github.com/sirupsen/logrus" ) diff --git a/pkg/cannon/ethereum/services/metadata.go b/pkg/cannon/ethereum/services/metadata.go index 7459d95c8..f9692a1c8 100644 --- a/pkg/cannon/ethereum/services/metadata.go +++ b/pkg/cannon/ethereum/services/metadata.go @@ -6,11 +6,11 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" backoff "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/beacon/pkg/beacon/state" "github.com/ethpandaops/ethwallclock" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethpandaops/xatu/pkg/networks" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/go-co-op/gocron/v2" diff --git a/pkg/cannon/iterator/backfilling_checkpoint_iterator.go b/pkg/cannon/iterator/backfilling_checkpoint_iterator.go index b60c18059..1634bcf4a 100644 --- a/pkg/cannon/iterator/backfilling_checkpoint_iterator.go +++ b/pkg/cannon/iterator/backfilling_checkpoint_iterator.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/cannon/coordinator" "github.com/ethpandaops/xatu/pkg/cannon/ethereum" "github.com/ethpandaops/xatu/pkg/observability" diff --git a/pkg/cannon/iterator/config.go b/pkg/cannon/iterator/config.go index ae35c9ade..cb382ee24 100644 --- a/pkg/cannon/iterator/config.go +++ b/pkg/cannon/iterator/config.go @@ -1,6 +1,6 @@ package iterator -import "github.com/attestantio/go-eth2-client/spec/phase0" +import "github.com/ethpandaops/go-eth2-client/spec/phase0" type BackfillingCheckpointConfig struct { Backfill struct { diff --git a/pkg/clmimicry/ethereum/services/duties.go b/pkg/clmimicry/ethereum/services/duties.go index 94982a963..17628e7fc 100644 --- a/pkg/clmimicry/ethereum/services/duties.go +++ b/pkg/clmimicry/ethereum/services/duties.go @@ -6,11 +6,11 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/ethwallclock" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/jellydator/ttlcache/v3" "github.com/sirupsen/logrus" ) diff --git a/pkg/clmimicry/ethereum/services/metadata.go b/pkg/clmimicry/ethereum/services/metadata.go index 3d6f338de..969da3091 100644 --- a/pkg/clmimicry/ethereum/services/metadata.go +++ b/pkg/clmimicry/ethereum/services/metadata.go @@ -6,11 +6,11 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" backoff "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/beacon/pkg/beacon/state" "github.com/ethpandaops/ethwallclock" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethpandaops/xatu/pkg/ethereum" "github.com/ethpandaops/xatu/pkg/networks" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" diff --git a/pkg/clmimicry/gossipsub_aggregate_and_proof.go b/pkg/clmimicry/gossipsub_aggregate_and_proof.go index c2b3beb60..45f811d19 100644 --- a/pkg/clmimicry/gossipsub_aggregate_and_proof.go +++ b/pkg/clmimicry/gossipsub_aggregate_and_proof.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/libp2p" "github.com/ethpandaops/xatu/pkg/proto/xatu" diff --git a/pkg/clmimicry/gossipsub_attestation.go b/pkg/clmimicry/gossipsub_attestation.go index c74867fe6..8377f95be 100644 --- a/pkg/clmimicry/gossipsub_attestation.go +++ b/pkg/clmimicry/gossipsub_attestation.go @@ -5,7 +5,7 @@ import ( "fmt" ethtypes "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/libp2p" "github.com/ethpandaops/xatu/pkg/proto/xatu" diff --git a/pkg/clmimicry/interfaces.go b/pkg/clmimicry/interfaces.go index 0e10350c7..2499025c1 100644 --- a/pkg/clmimicry/interfaces.go +++ b/pkg/clmimicry/interfaces.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/proto/xatu" ) diff --git a/pkg/proto/eth/block.go b/pkg/proto/eth/block.go index 8610ee9c0..c93d0dcd7 100644 --- a/pkg/proto/eth/block.go +++ b/pkg/proto/eth/block.go @@ -4,19 +4,31 @@ import ( "fmt" "math/big" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/altair" - "github.com/attestantio/go-eth2-client/spec/bellatrix" - "github.com/attestantio/go-eth2-client/spec/capella" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/electra" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/altair" + "github.com/ethpandaops/go-eth2-client/spec/bellatrix" + "github.com/ethpandaops/go-eth2-client/spec/capella" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/electra" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" v2 "github.com/ethpandaops/xatu/pkg/proto/eth/v2" "google.golang.org/protobuf/types/known/wrapperspb" ) +// baseFeePerGasFromLE converts the fork's little-endian 32-byte base fee +// representation to its decimal string form, matching the wire format the +// upstream library used to produce directly via BaseFeePerGas. +func baseFeePerGasFromLE(le [32]byte) string { + var be [32]byte + for i := 0; i < 32; i++ { + be[i] = le[31-i] + } + + return new(big.Int).SetBytes(be[:]).String() +} + func NewEventBlockV2FromVersionedProposal(proposal *api.VersionedProposal) (*v2.EventBlockV2, error) { var data *v2.EventBlockV2 @@ -177,7 +189,7 @@ func NewEventBlockFromBellatrix(block *bellatrix.BeaconBlock, signature *phase0. GasUsed: &wrapperspb.UInt64Value{Value: block.Body.ExecutionPayload.GasUsed}, Timestamp: &wrapperspb.UInt64Value{Value: block.Body.ExecutionPayload.Timestamp}, ExtraData: fmt.Sprintf("0x%x", block.Body.ExecutionPayload.ExtraData), - BaseFeePerGas: new(big.Int).SetBytes(block.Body.ExecutionPayload.BaseFeePerGas[:]).String(), + BaseFeePerGas: baseFeePerGasFromLE(block.Body.ExecutionPayload.BaseFeePerGasLE), BlockHash: block.Body.ExecutionPayload.BlockHash.String(), Transactions: getTransactions(block.Body.ExecutionPayload.Transactions), }, @@ -231,7 +243,7 @@ func NewEventBlockFromCapella(block *capella.BeaconBlock, signature *phase0.BLSS GasUsed: &wrapperspb.UInt64Value{Value: block.Body.ExecutionPayload.GasUsed}, Timestamp: &wrapperspb.UInt64Value{Value: block.Body.ExecutionPayload.Timestamp}, ExtraData: fmt.Sprintf("0x%x", block.Body.ExecutionPayload.ExtraData), - BaseFeePerGas: new(big.Int).SetBytes(block.Body.ExecutionPayload.BaseFeePerGas[:]).String(), + BaseFeePerGas: baseFeePerGasFromLE(block.Body.ExecutionPayload.BaseFeePerGasLE), BlockHash: block.Body.ExecutionPayload.BlockHash.String(), Transactions: getTransactions(block.Body.ExecutionPayload.Transactions), Withdrawals: v1.NewWithdrawalsFromCapella(block.Body.ExecutionPayload.Withdrawals), diff --git a/pkg/proto/eth/block_test.go b/pkg/proto/eth/block_test.go index 079109429..bea7cb4af 100644 --- a/pkg/proto/eth/block_test.go +++ b/pkg/proto/eth/block_test.go @@ -4,17 +4,17 @@ import ( "fmt" "testing" - "github.com/attestantio/go-eth2-client/api" - apiv1deneb "github.com/attestantio/go-eth2-client/api/v1/deneb" - apiv1electra "github.com/attestantio/go-eth2-client/api/v1/electra" - apiv1fulu "github.com/attestantio/go-eth2-client/api/v1/fulu" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/altair" - "github.com/attestantio/go-eth2-client/spec/bellatrix" - "github.com/attestantio/go-eth2-client/spec/capella" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/electra" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/api" + apiv1deneb "github.com/ethpandaops/go-eth2-client/api/v1/deneb" + apiv1electra "github.com/ethpandaops/go-eth2-client/api/v1/electra" + apiv1fulu "github.com/ethpandaops/go-eth2-client/api/v1/fulu" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/altair" + "github.com/ethpandaops/go-eth2-client/spec/bellatrix" + "github.com/ethpandaops/go-eth2-client/spec/capella" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/electra" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v2 "github.com/ethpandaops/xatu/pkg/proto/eth/v2" "github.com/holiman/uint256" ) diff --git a/pkg/proto/eth/v1/conversion.go b/pkg/proto/eth/v1/conversion.go index ea03d2b74..bfa2da520 100644 --- a/pkg/proto/eth/v1/conversion.go +++ b/pkg/proto/eth/v1/conversion.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "fmt" - "github.com/attestantio/go-eth2-client/spec/capella" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/electra" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/capella" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/electra" + "github.com/ethpandaops/go-eth2-client/spec/phase0" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/pkg/proto/eth/v1/fork_choice.go b/pkg/proto/eth/v1/fork_choice.go index 19c5e9e48..4a8ace62d 100644 --- a/pkg/proto/eth/v1/fork_choice.go +++ b/pkg/proto/eth/v1/fork_choice.go @@ -3,8 +3,8 @@ package v1 import ( "encoding/json" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/pkg/errors" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/pkg/proto/eth/v1/reorg.go b/pkg/proto/eth/v1/reorg.go index 4a4258e00..4cbec0672 100644 --- a/pkg/proto/eth/v1/reorg.go +++ b/pkg/proto/eth/v1/reorg.go @@ -1,7 +1,7 @@ package v1 import ( - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/pkg/proto/eth/v2/conversion.go b/pkg/proto/eth/v2/conversion.go index 5e800a294..e400a7f67 100644 --- a/pkg/proto/eth/v2/conversion.go +++ b/pkg/proto/eth/v2/conversion.go @@ -1,7 +1,7 @@ package v2 import ( - "github.com/attestantio/go-eth2-client/spec/capella" + "github.com/ethpandaops/go-eth2-client/spec/capella" ) func NewBLSToExecutionChangesFromCapella(data []*capella.SignedBLSToExecutionChange) []*SignedBLSToExecutionChange { diff --git a/pkg/relaymonitor/consistency.go b/pkg/relaymonitor/consistency.go index effd6ce33..b155674de 100644 --- a/pkg/relaymonitor/consistency.go +++ b/pkg/relaymonitor/consistency.go @@ -6,7 +6,7 @@ import ( "net/url" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/relaymonitor/iterator" "github.com/ethpandaops/xatu/pkg/relaymonitor/relay" diff --git a/pkg/relaymonitor/duplicate_cache.go b/pkg/relaymonitor/duplicate_cache.go index 70a83f3f7..75724d399 100644 --- a/pkg/relaymonitor/duplicate_cache.go +++ b/pkg/relaymonitor/duplicate_cache.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/jellydator/ttlcache/v3" ) diff --git a/pkg/relaymonitor/ethereum/ethereum.go b/pkg/relaymonitor/ethereum/ethereum.go index f7f1dc6d0..a79cc3b57 100644 --- a/pkg/relaymonitor/ethereum/ethereum.go +++ b/pkg/relaymonitor/ethereum/ethereum.go @@ -4,12 +4,12 @@ import ( "context" "time" - eth2client "github.com/attestantio/go-eth2-client" - "github.com/attestantio/go-eth2-client/api" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/ethwallclock" + eth2client "github.com/ethpandaops/go-eth2-client" + "github.com/ethpandaops/go-eth2-client/api" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/relaymonitor/iterator/backfill_iterator.go b/pkg/relaymonitor/iterator/backfill_iterator.go index b7816a683..9f480a8d6 100644 --- a/pkg/relaymonitor/iterator/backfill_iterator.go +++ b/pkg/relaymonitor/iterator/backfill_iterator.go @@ -6,8 +6,8 @@ import ( "net/url" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/relaymonitor/coordinator" "github.com/pkg/errors" diff --git a/pkg/relaymonitor/iterator/forward_fill_iterator.go b/pkg/relaymonitor/iterator/forward_fill_iterator.go index 46bd27a7f..ea6e84944 100644 --- a/pkg/relaymonitor/iterator/forward_fill_iterator.go +++ b/pkg/relaymonitor/iterator/forward_fill_iterator.go @@ -6,8 +6,8 @@ import ( "net/url" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/relaymonitor/coordinator" "github.com/pkg/errors" diff --git a/pkg/relaymonitor/poll.go b/pkg/relaymonitor/poll.go index b766b09f1..92cff7f35 100644 --- a/pkg/relaymonitor/poll.go +++ b/pkg/relaymonitor/poll.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/proto/mevrelay" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/relaymonitor/relay" diff --git a/pkg/relaymonitor/registrations/monitor.go b/pkg/relaymonitor/registrations/monitor.go index 6702d5684..1bd21dfd2 100644 --- a/pkg/relaymonitor/registrations/monitor.go +++ b/pkg/relaymonitor/registrations/monitor.go @@ -5,7 +5,7 @@ import ( "math" "time" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethpandaops/xatu/pkg/proto/mevrelay" "github.com/ethpandaops/xatu/pkg/relaymonitor/ethereum" "github.com/ethpandaops/xatu/pkg/relaymonitor/relay" diff --git a/pkg/relaymonitor/registrations/registrations_worker.go b/pkg/relaymonitor/registrations/registrations_worker.go index 2bd72b1bd..f0574359d 100644 --- a/pkg/relaymonitor/registrations/registrations_worker.go +++ b/pkg/relaymonitor/registrations/registrations_worker.go @@ -4,7 +4,7 @@ import ( "context" "time" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethpandaops/xatu/pkg/proto/mevrelay" "github.com/ethpandaops/xatu/pkg/relaymonitor/relay" "github.com/sirupsen/logrus" diff --git a/pkg/relaymonitor/registrations/validator_set.go b/pkg/relaymonitor/registrations/validator_set.go index 6bbffe407..15e9ada2c 100644 --- a/pkg/relaymonitor/registrations/validator_set.go +++ b/pkg/relaymonitor/registrations/validator_set.go @@ -6,8 +6,8 @@ import ( "math/rand/v2" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/pkg/errors" ) diff --git a/pkg/relaymonitor/registrations/validator_set_test.go b/pkg/relaymonitor/registrations/validator_set_test.go index 6d9d447d6..0122106de 100644 --- a/pkg/relaymonitor/registrations/validator_set_test.go +++ b/pkg/relaymonitor/registrations/validator_set_test.go @@ -3,8 +3,8 @@ package registrations_test import ( "testing" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/relaymonitor/registrations" ) diff --git a/pkg/relaymonitor/relay_monitor.go b/pkg/relaymonitor/relay_monitor.go index a800546b3..9640a5240 100644 --- a/pkg/relaymonitor/relay_monitor.go +++ b/pkg/relaymonitor/relay_monitor.go @@ -19,8 +19,8 @@ import ( //nolint:gosec // only exposed if pprofAddr config is set _ "net/http/pprof" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/beevik/ntp" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethpandaops/xatu/pkg/output" "github.com/ethpandaops/xatu/pkg/proto/mevrelay" "github.com/ethpandaops/xatu/pkg/proto/xatu" diff --git a/pkg/sentry/attestation_data.go b/pkg/sentry/attestation_data.go index 76c5f6d0f..9167f1470 100644 --- a/pkg/sentry/attestation_data.go +++ b/pkg/sentry/attestation_data.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/sentry/event/beacon/eth/v1" "github.com/go-co-op/gocron/v2" ) diff --git a/pkg/sentry/beacon_blob.go b/pkg/sentry/beacon_blob.go index 066cd675e..5b893d44a 100644 --- a/pkg/sentry/beacon_blob.go +++ b/pkg/sentry/beacon_blob.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/deneb" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" v1 "github.com/ethpandaops/xatu/pkg/sentry/event/beacon/eth/v1" diff --git a/pkg/sentry/beacon_committees.go b/pkg/sentry/beacon_committees.go index 01e5a097d..d5b7d3fba 100644 --- a/pkg/sentry/beacon_committees.go +++ b/pkg/sentry/beacon_committees.go @@ -4,8 +4,8 @@ import ( "context" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/sentry/event/beacon/eth/v1" ) diff --git a/pkg/sentry/ethereum/blob.go b/pkg/sentry/ethereum/blob.go index 030388ce8..a8f4844e1 100644 --- a/pkg/sentry/ethereum/blob.go +++ b/pkg/sentry/ethereum/blob.go @@ -3,7 +3,7 @@ package ethereum import ( "crypto/sha256" - "github.com/attestantio/go-eth2-client/spec/deneb" + "github.com/ethpandaops/go-eth2-client/spec/deneb" ) const blobCommitmentVersionKZG uint8 = 0x01 diff --git a/pkg/sentry/ethereum/services/duties.go b/pkg/sentry/ethereum/services/duties.go index 42667146f..9cdba0faf 100644 --- a/pkg/sentry/ethereum/services/duties.go +++ b/pkg/sentry/ethereum/services/duties.go @@ -6,11 +6,11 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" backoff "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/ethwallclock" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/jellydator/ttlcache/v3" "github.com/sirupsen/logrus" ) diff --git a/pkg/sentry/ethereum/services/metadata.go b/pkg/sentry/ethereum/services/metadata.go index d9be568d1..96febc9a4 100644 --- a/pkg/sentry/ethereum/services/metadata.go +++ b/pkg/sentry/ethereum/services/metadata.go @@ -8,12 +8,12 @@ import ( "sync" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" backoff "github.com/cenkalti/backoff/v5" "github.com/ethpandaops/beacon/pkg/beacon" "github.com/ethpandaops/beacon/pkg/beacon/api/types" "github.com/ethpandaops/beacon/pkg/beacon/state" "github.com/ethpandaops/ethwallclock" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" "github.com/ethpandaops/xatu/pkg/networks" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/go-co-op/gocron/v2" diff --git a/pkg/sentry/event/beacon/eth/v1/beacon_blob.go b/pkg/sentry/event/beacon/eth/v1/beacon_blob.go index 5eb323966..85986a70a 100644 --- a/pkg/sentry/event/beacon/eth/v1/beacon_blob.go +++ b/pkg/sentry/event/beacon/eth/v1/beacon_blob.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "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" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/beacon_committee.go b/pkg/sentry/event/beacon/eth/v1/beacon_committee.go index 46fd2ca05..3b81619bf 100644 --- a/pkg/sentry/event/beacon/eth/v1/beacon_committee.go +++ b/pkg/sentry/event/beacon/eth/v1/beacon_committee.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/debug_fork_choice.go b/pkg/sentry/event/beacon/eth/v1/debug_fork_choice.go index 8311fe891..6b202f2c6 100644 --- a/pkg/sentry/event/beacon/eth/v1/debug_fork_choice.go +++ b/pkg/sentry/event/beacon/eth/v1/debug_fork_choice.go @@ -4,8 +4,8 @@ import ( "context" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_attestation.go b/pkg/sentry/event/beacon/eth/v1/events_attestation.go index f6c6b64b5..a36a1bd7d 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_attestation.go +++ b/pkg/sentry/event/beacon/eth/v1/events_attestation.go @@ -5,8 +5,8 @@ import ( "fmt" "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" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_blob_sidecar.go b/pkg/sentry/event/beacon/eth/v1/events_blob_sidecar.go index 087effd98..2887efa34 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_blob_sidecar.go +++ b/pkg/sentry/event/beacon/eth/v1/events_blob_sidecar.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_block.go b/pkg/sentry/event/beacon/eth/v1/events_block.go index 18eb32d05..3d66c5a63 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_block.go +++ b/pkg/sentry/event/beacon/eth/v1/events_block.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_block_gossip.go b/pkg/sentry/event/beacon/eth/v1/events_block_gossip.go index 2e57149d2..19ff3e19a 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_block_gossip.go +++ b/pkg/sentry/event/beacon/eth/v1/events_block_gossip.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_chain_reorg.go b/pkg/sentry/event/beacon/eth/v1/events_chain_reorg.go index eeae5d40f..ff8232f1f 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_chain_reorg.go +++ b/pkg/sentry/event/beacon/eth/v1/events_chain_reorg.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_contribution_and_proof.go b/pkg/sentry/event/beacon/eth/v1/events_contribution_and_proof.go index 4d4571be1..ee4473bdf 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_contribution_and_proof.go +++ b/pkg/sentry/event/beacon/eth/v1/events_contribution_and_proof.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec/altair" + "github.com/ethpandaops/go-eth2-client/spec/altair" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_data_column_sidecar.go b/pkg/sentry/event/beacon/eth/v1/events_data_column_sidecar.go index 06b1b9d78..9709842fd 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_data_column_sidecar.go +++ b/pkg/sentry/event/beacon/eth/v1/events_data_column_sidecar.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - apiv1 "github.com/attestantio/go-eth2-client/api/v1" + apiv1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_finalized_checkpoint.go b/pkg/sentry/event/beacon/eth/v1/events_finalized_checkpoint.go index cf47d8d63..bcd15c817 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_finalized_checkpoint.go +++ b/pkg/sentry/event/beacon/eth/v1/events_finalized_checkpoint.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_head.go b/pkg/sentry/event/beacon/eth/v1/events_head.go index 3654d1d43..88f35566a 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_head.go +++ b/pkg/sentry/event/beacon/eth/v1/events_head.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_single_attestation.go b/pkg/sentry/event/beacon/eth/v1/events_single_attestation.go index d069b0f34..eaa6e04b8 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_single_attestation.go +++ b/pkg/sentry/event/beacon/eth/v1/events_single_attestation.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec/electra" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/electra" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/events_voluntary_exit.go b/pkg/sentry/event/beacon/eth/v1/events_voluntary_exit.go index ac8ac2782..6de5ab57d 100644 --- a/pkg/sentry/event/beacon/eth/v1/events_voluntary_exit.go +++ b/pkg/sentry/event/beacon/eth/v1/events_voluntary_exit.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/proposer_duty.go b/pkg/sentry/event/beacon/eth/v1/proposer_duty.go index d321c8ae8..87d9ee56c 100644 --- a/pkg/sentry/event/beacon/eth/v1/proposer_duty.go +++ b/pkg/sentry/event/beacon/eth/v1/proposer_duty.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v1/validator_attestation_data.go b/pkg/sentry/event/beacon/eth/v1/validator_attestation_data.go index c88f06c59..3b59fe44c 100644 --- a/pkg/sentry/event/beacon/eth/v1/validator_attestation_data.go +++ b/pkg/sentry/event/beacon/eth/v1/validator_attestation_data.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/attestantio/go-eth2-client/spec/phase0" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v2/beacon_block.go b/pkg/sentry/event/beacon/eth/v2/beacon_block.go index acf5908c7..a04aa2236 100644 --- a/pkg/sentry/event/beacon/eth/v2/beacon_block.go +++ b/pkg/sentry/event/beacon/eth/v2/beacon_block.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec" "github.com/ethpandaops/xatu/pkg/proto/eth" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/event/beacon/eth/v3/proposed_validator_block.go b/pkg/sentry/event/beacon/eth/v3/proposed_validator_block.go index fa094c789..93f2a9867 100644 --- a/pkg/sentry/event/beacon/eth/v3/proposed_validator_block.go +++ b/pkg/sentry/event/beacon/eth/v3/proposed_validator_block.go @@ -5,8 +5,8 @@ import ( "math/big" "time" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec" "github.com/ethpandaops/xatu/pkg/proto/eth" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/sentry/ethereum" diff --git a/pkg/sentry/fork_choice.go b/pkg/sentry/fork_choice.go index 94b1571f4..22929f9db 100644 --- a/pkg/sentry/fork_choice.go +++ b/pkg/sentry/fork_choice.go @@ -4,9 +4,9 @@ import ( "context" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" xatuethv1 "github.com/ethpandaops/xatu/pkg/proto/eth/v1" v1 "github.com/ethpandaops/xatu/pkg/sentry/event/beacon/eth/v1" "github.com/go-co-op/gocron/v2" diff --git a/pkg/sentry/proposed_validator_block.go b/pkg/sentry/proposed_validator_block.go index 701009819..0c3f3fc0d 100644 --- a/pkg/sentry/proposed_validator_block.go +++ b/pkg/sentry/proposed_validator_block.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - eth2client "github.com/attestantio/go-eth2-client" - "github.com/attestantio/go-eth2-client/api" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/ethpandaops/ethwallclock" + eth2client "github.com/ethpandaops/go-eth2-client" + "github.com/ethpandaops/go-eth2-client/api" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v3 "github.com/ethpandaops/xatu/pkg/sentry/event/beacon/eth/v3" "github.com/go-co-op/gocron/v2" ) diff --git a/pkg/sentry/proposer_duty.go b/pkg/sentry/proposer_duty.go index 0d5c2cedc..294545174 100644 --- a/pkg/sentry/proposer_duty.go +++ b/pkg/sentry/proposer_duty.go @@ -4,8 +4,8 @@ import ( "context" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec/phase0" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec/phase0" v1 "github.com/ethpandaops/xatu/pkg/sentry/event/beacon/eth/v1" ) diff --git a/pkg/sentry/sentry.go b/pkg/sentry/sentry.go index ff9f346a8..dbe015926 100644 --- a/pkg/sentry/sentry.go +++ b/pkg/sentry/sentry.go @@ -16,13 +16,13 @@ import ( "syscall" "time" - eth2v1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/attestantio/go-eth2-client/spec" - "github.com/attestantio/go-eth2-client/spec/altair" - "github.com/attestantio/go-eth2-client/spec/electra" - "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/beevik/ntp" "github.com/ethpandaops/beacon/pkg/beacon" + eth2v1 "github.com/ethpandaops/go-eth2-client/api/v1" + "github.com/ethpandaops/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec/altair" + "github.com/ethpandaops/go-eth2-client/spec/electra" + "github.com/ethpandaops/go-eth2-client/spec/phase0" "github.com/ethpandaops/xatu/pkg/networks" "github.com/ethpandaops/xatu/pkg/observability" "github.com/ethpandaops/xatu/pkg/output" diff --git a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block.go b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block.go index 492986dc5..cf10eac1b 100644 --- a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block.go +++ b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec" v2 "github.com/ethpandaops/xatu/pkg/proto/eth/v2" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/server/store" diff --git a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go index 8eab29dcb..d29e7480e 100644 --- a/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go +++ b/pkg/server/service/event-ingester/event/beacon/eth/v2/beacon_block_v2.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/attestantio/go-eth2-client/spec" + "github.com/ethpandaops/go-eth2-client/spec" v2 "github.com/ethpandaops/xatu/pkg/proto/eth/v2" "github.com/ethpandaops/xatu/pkg/proto/xatu" "github.com/ethpandaops/xatu/pkg/server/store"