From 4c5898b5842fdeb4976f62294a0d52353f1b0ea2 Mon Sep 17 00:00:00 2001 From: Matty Evans Date: Mon, 8 Dec 2025 07:40:59 +1000 Subject: [PATCH] build: upgrade prysm dependency from v6 to v7 and bump related deps - replace github.com/OffchainLabs/prysm/v6 with v7 - add new github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 - bump prysmaticlabs/fastssz to v0.0.0-20251103153600-259302269bfc - bump ethereum/c-kzg-4844/v2 to v2.1.5 - bump libp2p/go-netroute to v0.4.0 --- go.mod | 11 ++++++----- go.sum | 18 ++++++++++-------- pkg/consensus/mimicry/crawler/crawler.go | 4 ++-- pkg/consensus/mimicry/p2p/eth/doc.go | 2 +- .../p2p/eth/examples/attestation_handler.go | 4 ++-- .../p2p/eth/examples/beacon_block_handler.go | 4 ++-- pkg/consensus/mimicry/p2p/eth/topic.go | 2 +- .../mimicry/p2p/eth/topics/definitions.go | 2 +- .../mimicry/p2p/eth/topics/definitions_test.go | 2 +- .../mimicry/p2p/eth/topics/encoder_test.go | 4 ++-- pkg/consensus/mimicry/p2p/req_resp.go | 2 +- pkg/discovery/peer.go | 2 +- 12 files changed, 30 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index bdda890..8359143 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module github.com/ethpandaops/ethcore go 1.25.1 require ( - github.com/OffchainLabs/prysm/v6 v6.1.1 + github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 + github.com/OffchainLabs/prysm/v7 v7.0.0 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 @@ -24,8 +25,7 @@ require ( github.com/prometheus/client_golang v1.23.2 github.com/protolambda/zrnt v0.34.1 github.com/protolambda/ztyp v0.2.2 - github.com/prysmaticlabs/fastssz v0.0.0-20241008181541-518c4ce73516 - github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 + github.com/prysmaticlabs/fastssz v0.0.0-20251103153600-259302269bfc github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.11.1 ) @@ -65,7 +65,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/elastic/gosigar v0.14.3 // indirect github.com/emicklei/dot v1.8.0 // indirect - github.com/ethereum/c-kzg-4844/v2 v2.1.3 // indirect + github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect github.com/ethereum/go-verkle v0.2.2 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -124,7 +124,7 @@ require ( github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect github.com/libp2p/go-mplex v0.7.0 // indirect github.com/libp2p/go-msgio v0.3.0 // indirect - github.com/libp2p/go-netroute v0.2.2 // indirect + github.com/libp2p/go-netroute v0.4.0 // indirect github.com/libp2p/go-reuseport v0.4.0 // indirect github.com/libp2p/go-yamux/v5 v5.0.0 // indirect github.com/logrusorgru/aurora v2.0.3+incompatible // indirect @@ -187,6 +187,7 @@ require ( github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.16.1 // indirect github.com/protolambda/bls12-381-util v0.1.0 // indirect + github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 // indirect github.com/prysmaticlabs/gohashtree v0.0.5-beta // indirect github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c // indirect github.com/quic-go/qpack v0.5.1 // indirect diff --git a/go.sum b/go.sum index 8d0c12b..3caffbf 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,10 @@ github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030I github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/OffchainLabs/prysm/v6 v6.1.1 h1:OpkmHJFdM9rmEh8jZPOhjSVRexhnGuBPPzjOOf2R/5E= -github.com/OffchainLabs/prysm/v6 v6.1.1/go.mod h1:g/rVgpjtbxpHDR6CDBmWVxIBZ9aog8ikvpBHLknhEZQ= +github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506 h1:d/SJkN8/9Ca+1YmuDiUJxAiV4w/a9S8NcsG7GMQSrVI= +github.com/OffchainLabs/go-bitfield v0.0.0-20251031151322-f427d04d8506/go.mod h1:6TZI4FU6zT8x6ZfWa1J8YQ2NgW0wLV/W3fHRca8ISBo= +github.com/OffchainLabs/prysm/v7 v7.0.0 h1:rtByY17isH3J3ddxrA0fgEXVJnZzP4JAvUtQn/Mr47s= +github.com/OffchainLabs/prysm/v7 v7.0.0/go.mod h1:2b+Y0Oxqg0cvOOe5LW5gC4o+WMrhaOqhoqz8UC2/yFg= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.26.1/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= @@ -175,8 +177,8 @@ github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/c-kzg-4844/v2 v2.1.3 h1:DQ21UU0VSsuGy8+pcMJHDS0CV1bKmJmxsJYK8l3MiLU= -github.com/ethereum/c-kzg-4844/v2 v2.1.3/go.mod h1:fyNcYI/yAuLWJxf4uzVtS8VDKeoAaRM8G/+ADz/pRdA= +github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s= +github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs= github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk= github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8= github.com/ethereum/go-ethereum v1.16.4 h1:H6dU0r2p/amA7cYg6zyG9Nt2JrKKH6oX2utfcqrSpkQ= @@ -494,8 +496,8 @@ github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU= github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0= github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM= -github.com/libp2p/go-netroute v0.2.2 h1:Dejd8cQ47Qx2kRABg6lPwknU7+nBnFRpko45/fFPuZ8= -github.com/libp2p/go-netroute v0.2.2/go.mod h1:Rntq6jUAH0l9Gg17w5bFGhcC9a+vk4KNXs6s7IljKYE= +github.com/libp2p/go-netroute v0.4.0 h1:sZZx9hyANYUx9PZyqcgE/E1GUG3iEtTZHUEvdtXT7/Q= +github.com/libp2p/go-netroute v0.4.0/go.mod h1:Nkd5ShYgSMS5MUKy/MU2T57xFoOKvvLR92Lic48LEyA= github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s= github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU= github.com/libp2p/go-yamux/v5 v5.0.0 h1:2djUh96d3Jiac/JpGkKs4TO49YhsfLopAoryfPmf+Po= @@ -768,8 +770,8 @@ github.com/protolambda/zrnt v0.34.1 h1:qW55rnhZJDnOb3TwFiFRJZi3yTXFrJdGOFQM7vCwY github.com/protolambda/zrnt v0.34.1/go.mod h1:A0fezkp9Tt3GBLATSPIbuY4ywYESyAuc/FFmPKg8Lqs= github.com/protolambda/ztyp v0.2.2 h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY= github.com/protolambda/ztyp v0.2.2/go.mod h1:9bYgKGqg3wJqT9ac1gI2hnVb0STQq7p/1lapqrqY1dU= -github.com/prysmaticlabs/fastssz v0.0.0-20241008181541-518c4ce73516 h1:xuVAdtz5ShYblG2sPyb4gw01DF8InbOI/kBCQjk7NiM= -github.com/prysmaticlabs/fastssz v0.0.0-20241008181541-518c4ce73516/go.mod h1:h2OlIZD/M6wFvV3YMZbW16lFgh3Rsye00G44J2cwLyU= +github.com/prysmaticlabs/fastssz v0.0.0-20251103153600-259302269bfc h1:ASmh3y4ALne2OoabF5pPL8OcIpBko8gFMg5018MxkBI= +github.com/prysmaticlabs/fastssz v0.0.0-20251103153600-259302269bfc/go.mod h1:h2OlIZD/M6wFvV3YMZbW16lFgh3Rsye00G44J2cwLyU= github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 h1:lC8kiphgdOBTcbTvo8MwkvpKjO0SlAgjv4xIK5FGJ94= github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15/go.mod h1:8svFBIKKu31YriBG/pNizo9N0Jr9i5PQ+dFkxWg3x5k= github.com/prysmaticlabs/gohashtree v0.0.5-beta h1:ct41mg7HyIZd7uoSM/ud23f+3DxQG9tlMlQG+BVX23c= diff --git a/pkg/consensus/mimicry/crawler/crawler.go b/pkg/consensus/mimicry/crawler/crawler.go index 9a900d7..725a85c 100644 --- a/pkg/consensus/mimicry/crawler/crawler.go +++ b/pkg/consensus/mimicry/crawler/crawler.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/encoder" - pb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" + "github.com/OffchainLabs/prysm/v7/beacon-chain/p2p/encoder" + pb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" "github.com/attestantio/go-eth2-client/api" "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/cenkalti/backoff/v5" diff --git a/pkg/consensus/mimicry/p2p/eth/doc.go b/pkg/consensus/mimicry/p2p/eth/doc.go index 7ca50da..14dd594 100644 --- a/pkg/consensus/mimicry/p2p/eth/doc.go +++ b/pkg/consensus/mimicry/p2p/eth/doc.go @@ -81,7 +81,7 @@ // "context" // "log" // -// eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" +// eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" // "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/eth/topics" // v1 "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/pubsub/v1" // "github.com/libp2p/go-libp2p" diff --git a/pkg/consensus/mimicry/p2p/eth/examples/attestation_handler.go b/pkg/consensus/mimicry/p2p/eth/examples/attestation_handler.go index 8be45a8..6df028b 100644 --- a/pkg/consensus/mimicry/p2p/eth/examples/attestation_handler.go +++ b/pkg/consensus/mimicry/p2p/eth/examples/attestation_handler.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p" - eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" + "github.com/OffchainLabs/prysm/v7/beacon-chain/p2p" + eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" "github.com/ethereum/go-ethereum/common" "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/eth/topics" v1 "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/pubsub/v1" diff --git a/pkg/consensus/mimicry/p2p/eth/examples/beacon_block_handler.go b/pkg/consensus/mimicry/p2p/eth/examples/beacon_block_handler.go index fc94708..a86f1f2 100644 --- a/pkg/consensus/mimicry/p2p/eth/examples/beacon_block_handler.go +++ b/pkg/consensus/mimicry/p2p/eth/examples/beacon_block_handler.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p" - eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" + "github.com/OffchainLabs/prysm/v7/beacon-chain/p2p" + eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" "github.com/ethereum/go-ethereum/common" "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/eth/topics" v1 "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/pubsub/v1" diff --git a/pkg/consensus/mimicry/p2p/eth/topic.go b/pkg/consensus/mimicry/p2p/eth/topic.go index b94a308..926c3a1 100644 --- a/pkg/consensus/mimicry/p2p/eth/topic.go +++ b/pkg/consensus/mimicry/p2p/eth/topic.go @@ -1,7 +1,7 @@ package eth import ( - "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/encoder" + "github.com/OffchainLabs/prysm/v7/beacon-chain/p2p/encoder" ) const ( diff --git a/pkg/consensus/mimicry/p2p/eth/topics/definitions.go b/pkg/consensus/mimicry/p2p/eth/topics/definitions.go index df1bbf5..d36c63b 100644 --- a/pkg/consensus/mimicry/p2p/eth/topics/definitions.go +++ b/pkg/consensus/mimicry/p2p/eth/topics/definitions.go @@ -3,7 +3,7 @@ package topics import ( "fmt" - eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" + eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" v1 "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/pubsub/v1" ) diff --git a/pkg/consensus/mimicry/p2p/eth/topics/definitions_test.go b/pkg/consensus/mimicry/p2p/eth/topics/definitions_test.go index 3f180b1..9d6de00 100644 --- a/pkg/consensus/mimicry/p2p/eth/topics/definitions_test.go +++ b/pkg/consensus/mimicry/p2p/eth/topics/definitions_test.go @@ -3,7 +3,7 @@ package topics_test import ( "testing" - eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" + eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/eth/topics" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/consensus/mimicry/p2p/eth/topics/encoder_test.go b/pkg/consensus/mimicry/p2p/eth/topics/encoder_test.go index cabc2c8..0b8823f 100644 --- a/pkg/consensus/mimicry/p2p/eth/topics/encoder_test.go +++ b/pkg/consensus/mimicry/p2p/eth/topics/encoder_test.go @@ -3,9 +3,9 @@ package topics_test import ( "testing" - eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1" + "github.com/OffchainLabs/go-bitfield" + eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1" "github.com/ethpandaops/ethcore/pkg/consensus/mimicry/p2p/eth/topics" - "github.com/prysmaticlabs/go-bitfield" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/mimicry/p2p/req_resp.go b/pkg/consensus/mimicry/p2p/req_resp.go index 3af7ea7..a6f9bbd 100644 --- a/pkg/consensus/mimicry/p2p/req_resp.go +++ b/pkg/consensus/mimicry/p2p/req_resp.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/OffchainLabs/prysm/v6/beacon-chain/p2p/encoder" + "github.com/OffchainLabs/prysm/v7/beacon-chain/p2p/encoder" "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" diff --git a/pkg/discovery/peer.go b/pkg/discovery/peer.go index 7b94012..d9ed3fb 100644 --- a/pkg/discovery/peer.go +++ b/pkg/discovery/peer.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/OffchainLabs/prysm/v6/crypto/ecdsa" + "github.com/OffchainLabs/prysm/v7/crypto/ecdsa" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr"