diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index e2ac440efa..7c944ddedd 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -105,7 +105,8 @@ func (l *listenerWrapper) RandomNodes() enode.Iterator { func (l *listenerWrapper) Ping(node *enode.Node) error { l.mu.RLock() defer l.mu.RUnlock() - return l.listener.Ping(node) + _, err := l.listener.Ping(node) + return err } func (l *listenerWrapper) RequestENR(node *enode.Node) (*enode.Node, error) { diff --git a/changelog/pvl_geth_update.md b/changelog/pvl_geth_update.md new file mode 100644 index 0000000000..36e5aebed5 --- /dev/null +++ b/changelog/pvl_geth_update.md @@ -0,0 +1,3 @@ +### Changed + +- Updated geth to v1.15.9 diff --git a/deps.bzl b/deps.bzl index 389111583f..0c0189330e 100644 --- a/deps.bzl +++ b/deps.bzl @@ -427,8 +427,8 @@ def prysm_deps(): go_repository( name = "com_github_cloudflare_cloudflare_go", importpath = "github.com/cloudflare/cloudflare-go", - sum = "h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M=", - version = "v0.79.0", + sum = "h1:ucoti4/7Exo0XQ+rzpn1H+IfVVe++zgiM+tyKtf0HUA=", + version = "v0.114.0", ) go_repository( name = "com_github_cloudykit_fastprinter", @@ -555,8 +555,8 @@ def prysm_deps(): go_repository( name = "com_github_cpuguy83_go_md2man_v2", importpath = "github.com/cpuguy83/go-md2man/v2", - sum = "h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=", - version = "v2.0.3", + sum = "h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=", + version = "v2.0.5", ) go_repository( name = "com_github_crate_crypto_go_ipa", @@ -772,8 +772,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:LLb2jCPsbJZcB4INw+E/MgzUX5wlR6SdwXcv09/1ME4=", - version = "v1.15.0", + sum = "h1:bRra1zi+/q+qyXZ6fylZOrlaF8kDdnlTtzNTmNHfX+g=", + version = "v1.15.9", ) go_repository( name = "com_github_ethereum_go_verkle", @@ -1108,8 +1108,8 @@ def prysm_deps(): go_repository( name = "com_github_goccy_go_json", importpath = "github.com/goccy/go-json", - sum = "h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=", - version = "v0.10.2", + sum = "h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=", + version = "v0.10.4", ) go_repository( name = "com_github_godbus_dbus_v5", @@ -1410,8 +1410,8 @@ def prysm_deps(): go_repository( name = "com_github_hashicorp_go_cleanhttp", importpath = "github.com/hashicorp/go-cleanhttp", - sum = "h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=", - version = "v0.5.2", + sum = "h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=", + version = "v0.5.1", ) go_repository( name = "com_github_hashicorp_go_immutable_radix", @@ -1437,12 +1437,6 @@ def prysm_deps(): sum = "h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw=", version = "v0.0.1", ) - go_repository( - name = "com_github_hashicorp_go_retryablehttp", - importpath = "github.com/hashicorp/go-retryablehttp", - sum = "h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=", - version = "v0.7.4", - ) go_repository( name = "com_github_hashicorp_go_rootcerts", importpath = "github.com/hashicorp/go-rootcerts", @@ -2830,8 +2824,8 @@ def prysm_deps(): go_repository( name = "com_github_protolambda_zrnt", importpath = "github.com/protolambda/zrnt", - sum = "h1:KZ48T+3UhsPXNdtE/5QEvGc9DGjUaRI17nJaoznoIaM=", - version = "v0.32.2", + sum = "h1:qW55rnhZJDnOb3TwFiFRJZi3yTXFrJdGOFQM7vCwYGg=", + version = "v0.34.1", ) go_repository( name = "com_github_protolambda_ztyp", @@ -3393,8 +3387,8 @@ def prysm_deps(): go_repository( name = "com_github_urfave_cli_v2", importpath = "github.com/urfave/cli/v2", - sum = "h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=", - version = "v2.27.1", + sum = "h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=", + version = "v2.27.5", ) go_repository( name = "com_github_urfave_negroni", @@ -3534,8 +3528,8 @@ def prysm_deps(): go_repository( name = "com_github_xrash_smetrics", importpath = "github.com/xrash/smetrics", - sum = "h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=", - version = "v0.0.0-20201216005158-039620a65673", + sum = "h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=", + version = "v0.0.0-20240521201337-686a1a2994c1", ) go_repository( name = "com_github_xtaci_kcp_go", @@ -4829,8 +4823,8 @@ def prysm_deps(): go_repository( name = "org_golang_x_time", importpath = "golang.org/x/time", - sum = "h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=", - version = "v0.5.0", + sum = "h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=", + version = "v0.9.0", ) go_repository( name = "org_golang_x_tools", diff --git a/go.mod b/go.mod index 11fc8339b9..ca3e3b447e 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 github.com/ethereum/c-kzg-4844/v2 v2.1.1 - github.com/ethereum/go-ethereum v1.15.0 + github.com/ethereum/go-ethereum v1.15.9 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible @@ -74,7 +74,7 @@ require ( github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e github.com/trailofbits/go-mutexasserts v0.0.0-20250212181730-4c2b8e9e784b github.com/tyler-smith/go-bip39 v1.1.0 - github.com/urfave/cli/v2 v2.27.1 + github.com/urfave/cli/v2 v2.27.5 github.com/uudashr/gocognit v1.0.5 github.com/wealdtech/go-bytesutil v1.1.1 github.com/wealdtech/go-eth2-util v1.6.3 @@ -125,7 +125,7 @@ require ( github.com/consensys/bavard v0.1.22 // indirect github.com/containerd/cgroups v1.1.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect @@ -249,7 +249,7 @@ require ( github.com/tklauser/numcpus v0.7.0 // indirect github.com/wealdtech/go-eth2-types/v2 v2.8.2 // indirect github.com/wlynxg/anet v0.0.4 // indirect - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect + github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect @@ -265,7 +265,7 @@ require ( golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/term v0.30.0 // indirect golang.org/x/text v0.23.0 // indirect - golang.org/x/time v0.5.0 // indirect + golang.org/x/time v0.9.0 // indirect gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/go.sum b/go.sum index 561d7b3900..ec1dc9f0c2 100644 --- a/go.sum +++ b/go.sum @@ -172,8 +172,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc= +github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a h1:W8mUrRp6NOVl3J+MYp5kPMoUZPp7aOYHtaua31lwRHg= github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a/go.mod h1:sTwzHBvIzm2RfVCGNEBZgRyjwK40bVoun3ZnGOCafNM= github.com/crate-crypto/go-kzg-4844 v1.1.0 h1:EN/u9k2TF6OWSHrCCDBBU6GLNMq88OspHHlMnHfoyU4= @@ -239,8 +239,8 @@ github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHE github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/ethereum/c-kzg-4844/v2 v2.1.1 h1:KhzBVjmURsfr1+S3k/VE35T02+AW2qU9t9gr4R6YpSo= github.com/ethereum/c-kzg-4844/v2 v2.1.1/go.mod h1:TC48kOKjJKPbN7C++qIgt0TJzZ70QznYR7Ob+WXl57E= -github.com/ethereum/go-ethereum v1.15.0 h1:LLb2jCPsbJZcB4INw+E/MgzUX5wlR6SdwXcv09/1ME4= -github.com/ethereum/go-ethereum v1.15.0/go.mod h1:4q+4t48P2C03sjqGvTXix5lEOplf5dz4CTosbjt5tGs= +github.com/ethereum/go-ethereum v1.15.9 h1:bRra1zi+/q+qyXZ6fylZOrlaF8kDdnlTtzNTmNHfX+g= +github.com/ethereum/go-ethereum v1.15.9/go.mod h1:+S9k+jFzlyVTNcYGvqFhzN/SFhI6vA+aOY4T5tLSPL0= github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8= github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -1048,8 +1048,8 @@ github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10/go.mod github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= -github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w= +github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ= github.com/uudashr/gocognit v1.0.5 h1:rrSex7oHr3/pPLQ0xoWq108XMU8s678FJcQ+aSfOHa4= github.com/uudashr/gocognit v1.0.5/go.mod h1:wgYz0mitoKOTysqxTDMOUXg+Jb5SvtihkfmugIZYpEA= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -1074,8 +1074,8 @@ github.com/wlynxg/anet v0.0.4/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguH github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= +github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1432,8 +1432,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/third_party/com_github_ethereum_go_ethereum_secp256k1.patch b/third_party/com_github_ethereum_go_ethereum_secp256k1.patch index 9947571be9..2550c0793e 100644 --- a/third_party/com_github_ethereum_go_ethereum_secp256k1.patch +++ b/third_party/com_github_ethereum_go_ethereum_secp256k1.patch @@ -1,7 +1,8 @@ -diff --color -ruN a/crypto/secp256k1/BUILD.bazel b/crypto/secp256k1/BUILD.bazel ---- a/crypto/secp256k1/BUILD.bazel 2021-10-14 20:32:30.202922024 -0500 -+++ b/crypto/secp256k1/BUILD.bazel 2021-10-14 20:30:17.921027939 -0500 -@@ -11,10 +11,11 @@ +diff --git a/crypto/secp256k1/BUILD.bazel b/crypto/secp256k1/BUILD.bazel +index 379c6df1a..24ad195fd 100644 +--- a/crypto/secp256k1/BUILD.bazel ++++ b/crypto/secp256k1/BUILD.bazel +@@ -10,10 +10,11 @@ go_library( "scalar_mult_nocgo.go", "secp256.go", ], @@ -15,44 +16,62 @@ diff --color -ruN a/crypto/secp256k1/BUILD.bazel b/crypto/secp256k1/BUILD.bazel ], importpath = "github.com/ethereum/go-ethereum/crypto/secp256k1", visibility = ["//visibility:public"], -diff --color -ruN a/crypto/secp256k1/libsecp256k1/BUILD.bazel b/crypto/secp256k1/libsecp256k1/BUILD.bazel ---- a/crypto/secp256k1/libsecp256k1/BUILD.bazel 1969-12-31 18:00:00.000000000 -0600 -+++ b/crypto/secp256k1/libsecp256k1/BUILD.bazel 2021-10-14 12:54:27.704265206 -0500 -@@ -0,0 +1,37 @@ +diff --git a/crypto/secp256k1/libsecp256k1/BUILD.bazel b/crypto/secp256k1/libsecp256k1/BUILD.bazel +new file mode 100644 +index 000000000..1a6a1ea78 +--- /dev/null ++++ b/crypto/secp256k1/libsecp256k1/BUILD.bazel +@@ -0,0 +1,53 @@ +cc_library( -+ name = "hdrs", -+ hdrs = [ -+ "include/secp256k1.h", -+ "include/secp256k1_recovery.h", -+ "src/ecdsa.h", -+ "src/ecdsa_impl.h", -+ "src/eckey.h", -+ "src/eckey_impl.h", -+ "src/ecmult.h", -+ "src/ecmult_const.h", -+ "src/ecmult_const_impl.h", -+ "src/ecmult_gen.h", -+ "src/ecmult_gen_impl.h", -+ "src/ecmult_impl.h", -+ "src/field.h", -+ "src/field_5x52.h", -+ "src/field_5x52_impl.h", -+ "src/field_5x52_int128_impl.h", -+ "src/field_impl.h", -+ "src/group.h", -+ "src/group_impl.h", -+ "src/hash.h", -+ "src/hash_impl.h", -+ "src/modules/recovery/main_impl.h", -+ "src/num.h", -+ "src/num_impl.h", -+ "src/scalar.h", -+ "src/scalar_4x64.h", -+ "src/scalar_4x64_impl.h", -+ "src/scalar_impl.h", -+ "src/secp256k1.c", -+ "src/util.h", -+ ], -+ visibility = ["//visibility:public"], ++ name = "hdrs", ++ hdrs = [ ++ "include/secp256k1.h", ++ "include/secp256k1_preallocated.h", ++ "include/secp256k1_recovery.h", ++ "src/assumptions.h", ++ "src/checkmem.h", ++ "src/ecdsa.h", ++ "src/ecdsa_impl.h", ++ "src/eckey.h", ++ "src/eckey_impl.h", ++ "src/ecmult.h", ++ "src/ecmult_const.h", ++ "src/ecmult_const_impl.h", ++ "src/ecmult_gen.h", ++ "src/ecmult_gen_impl.h", ++ "src/ecmult_impl.h", ++ "src/field.h", ++ "src/field_5x52.h", ++ "src/field_5x52_impl.h", ++ "src/field_5x52_int128_impl.h", ++ "src/field_impl.h", ++ "src/group.h", ++ "src/group_impl.h", ++ "src/hash.h", ++ "src/hash_impl.h", ++ "src/hsort.h", ++ "src/hsort_impl.h", ++ "src/int128.h", ++ "src/int128_impl.h", ++ "src/int128_native.h", ++ "src/int128_native_impl.h", ++ "src/modinv64.h", ++ "src/modinv64_impl.h", ++ "src/modules/recovery/main_impl.h", ++ "src/precomputed_ecmult.c", ++ "src/precomputed_ecmult.h", ++ "src/precomputed_ecmult_gen.c", ++ "src/precomputed_ecmult_gen.h", ++ "src/scalar.h", ++ "src/scalar_4x64.h", ++ "src/scalar_4x64_impl.h", ++ "src/scalar_impl.h", ++ "src/scratch.h", ++ "src/scratch_impl.h", ++ "src/secp256k1.c", ++ "src/selftest.h", ++ "src/util.h", ++ ], ++ visibility = ["//visibility:public"], +) +