From 0e5a86e11560cb0632128a8fe92b9049f36be998 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Thu, 15 Aug 2024 16:22:22 -0500 Subject: [PATCH 01/49] updating the goethereum dependency --- WORKSPACE | 44 +++++++++++++++- deps.bzl | 76 +++++++++++++-------------- go.mod | 34 ++++++------ go.sum | 22 ++++++++ testing/middleware/builder/builder.go | 8 ++- 5 files changed, 127 insertions(+), 57 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 19948e919b08..1cc9236a2381 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -385,7 +385,49 @@ load("@com_github_atlassian_bazel_tools//gometalinter:deps.bzl", "gometalinter_d gometalinter_dependencies() -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") + +go_repository( + name = "com_github_cockroachdb_fifo", + importpath = "github.com/cockroachdb/fifo", + sum = "h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=", + version = "v0.0.0-20240606204812-0bbfbd93a7ce", +) + +go_repository( + name = "com_github_donovanhide_eventsource", + importpath = "github.com/donovanhide/eventsource", + sum = "h1:C7t6eeMaEQVy6e8CarIhscYQlNmw5e3G36y7l7Y21Ao=", + version = "v0.0.0-20210830082556-c59027999da0", +) + +go_repository( + name = "com_github_ethereum_go_verkle", + importpath = "github.com/ethereum/go-verkle", + sum = "h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=", + version = "v0.1.1-0.20240306133620-7d920df305f0", +) + +go_repository( + name = "com_github_karalabe_hid", + importpath = "github.com/karalabe/hid", + sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", + version = "v1.0.1-0.20240306101548-573246063e52", +) + +go_repository( + name = "com_github_protolambda_zrnt", + importpath = "github.com/protolambda/zrnt", + sum = "h1:KZ48T+3UhsPXNdtE/5QEvGc9DGjUaRI17nJaoznoIaM=", + version = "v0.32.2", +) + +go_repository( + name = "com_github_protolambda_ztyp", + importpath = "github.com/protolambda/ztyp", + sum = "h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY=", + version = "v0.2.2", +) gazelle_dependencies() diff --git a/deps.bzl b/deps.bzl index da7c8c7d02ff..c92f54071e76 100644 --- a/deps.bzl +++ b/deps.bzl @@ -373,8 +373,8 @@ def prysm_deps(): go_repository( name = "com_github_btcsuite_btcd_btcec_v2", importpath = "github.com/btcsuite/btcd/btcec/v2", - sum = "h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=", - version = "v2.3.2", + sum = "h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=", + version = "v2.3.4", ) go_repository( name = "com_github_btcsuite_btcd_chaincfg_chainhash", @@ -439,8 +439,8 @@ def prysm_deps(): go_repository( name = "com_github_cespare_xxhash_v2", importpath = "github.com/cespare/xxhash/v2", - sum = "h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=", - version = "v2.2.0", + sum = "h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=", + version = "v2.3.0", ) go_repository( name = "com_github_chromedp_cdproto", @@ -536,8 +536,8 @@ def prysm_deps(): name = "com_github_cockroachdb_errors", build_file_proto_mode = "disable_global", importpath = "github.com/cockroachdb/errors", - sum = "h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8=", - version = "v1.11.1", + sum = "h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=", + version = "v1.11.3", ) go_repository( name = "com_github_cockroachdb_logtags", @@ -548,8 +548,8 @@ def prysm_deps(): go_repository( name = "com_github_cockroachdb_pebble", importpath = "github.com/cockroachdb/pebble", - sum = "h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A=", - version = "v0.0.0-20230928194634-aa077af62593", + sum = "h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw=", + version = "v1.1.1", ) go_repository( name = "com_github_cockroachdb_redact", @@ -645,14 +645,14 @@ def prysm_deps(): go_repository( name = "com_github_crate_crypto_go_ipa", importpath = "github.com/crate-crypto/go-ipa", - sum = "h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0=", - version = "v0.0.0-20230601170251-1830d0757c80", + sum = "h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=", + version = "v0.0.0-20240223125850-b1e8a79f509c", ) go_repository( name = "com_github_crate_crypto_go_kzg_4844", importpath = "github.com/crate-crypto/go-kzg-4844", - sum = "h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA=", - version = "v0.7.0", + sum = "h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI=", + version = "v1.0.0", ) go_repository( name = "com_github_creack_pty", @@ -693,8 +693,8 @@ def prysm_deps(): go_repository( name = "com_github_deckarep_golang_set_v2", importpath = "github.com/deckarep/golang-set/v2", - sum = "h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA=", - version = "v2.5.0", + sum = "h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=", + version = "v2.6.0", ) go_repository( name = "com_github_decred_dcrd_crypto_blake256", @@ -860,8 +860,8 @@ def prysm_deps(): importpath = "github.com/ethereum/c-kzg-4844", patch_args = ["-p1"], patches = ["//third_party:com_github_ethereum_c_kzg_4844.patch"], - sum = "h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=", - version = "v0.4.0", + sum = "h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=", + version = "v1.0.0", ) go_repository( name = "com_github_ethereum_go_ethereum", @@ -873,8 +873,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=", - version = "v1.13.5", + sum = "h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=", + version = "v1.14.8", ) go_repository( name = "com_github_evanphx_json_patch", @@ -885,8 +885,8 @@ def prysm_deps(): go_repository( name = "com_github_fatih_color", importpath = "github.com/fatih/color", - sum = "h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=", - version = "v1.13.0", + sum = "h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=", + version = "v1.16.0", ) go_repository( name = "com_github_fatih_structs", @@ -903,8 +903,8 @@ def prysm_deps(): go_repository( name = "com_github_ferranbt_fastssz", importpath = "github.com/ferranbt/fastssz", - sum = "h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM=", - version = "v0.0.0-20210120143747-11b9eff30ea9", + sum = "h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=", + version = "v0.1.2", ) go_repository( name = "com_github_fjl_gencodec", @@ -1023,8 +1023,8 @@ def prysm_deps(): go_repository( name = "com_github_getsentry_sentry_go", importpath = "github.com/getsentry/sentry-go", - sum = "h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI=", - version = "v0.25.0", + sum = "h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=", + version = "v0.27.0", ) go_repository( name = "com_github_ghemawat_stream", @@ -1661,8 +1661,8 @@ def prysm_deps(): go_repository( name = "com_github_holiman_billy", importpath = "github.com/holiman/billy", - sum = "h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw=", - version = "v0.0.0-20230718173358-1c7e68d277a7", + sum = "h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=", + version = "v0.0.0-20240216141850-2abb0c79d3c4", ) go_repository( name = "com_github_holiman_bloomfilter_v2", @@ -1679,8 +1679,8 @@ def prysm_deps(): go_repository( name = "com_github_holiman_uint256", importpath = "github.com/holiman/uint256", - sum = "h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU=", - version = "v1.2.4", + sum = "h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs=", + version = "v1.3.1", ) go_repository( name = "com_github_hpcloud_tail", @@ -2304,8 +2304,8 @@ def prysm_deps(): go_repository( name = "com_github_microsoft_go_winio", importpath = "github.com/Microsoft/go-winio", - sum = "h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=", - version = "v0.6.1", + sum = "h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=", + version = "v0.6.2", ) go_repository( name = "com_github_miekg_dns", @@ -2967,8 +2967,8 @@ def prysm_deps(): go_repository( name = "com_github_protolambda_bls12_381_util", importpath = "github.com/protolambda/bls12-381-util", - sum = "h1:cZC+usqsYgHtlBaGulVnZ1hfKAi8iWtujBnRLQE698c=", - version = "v0.0.0-20220416220906-d8552aa452c7", + sum = "h1:05DU2wJN7DTU7z28+Q+zejXkIsA/MF8JZQGhtBZZiWk=", + version = "v0.1.0", ) go_repository( name = "com_github_prysmaticlabs_fastssz", @@ -3302,8 +3302,8 @@ def prysm_deps(): go_repository( name = "com_github_sirupsen_logrus", importpath = "github.com/sirupsen/logrus", - sum = "h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=", - version = "v1.9.0", + sum = "h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=", + version = "v1.9.3", ) go_repository( name = "com_github_smartystreets_assertions", @@ -4589,8 +4589,8 @@ def prysm_deps(): go_repository( name = "in_gopkg_natefinch_lumberjack_v2", importpath = "gopkg.in/natefinch/lumberjack.v2", - sum = "h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=", - version = "v2.0.0", + sum = "h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=", + version = "v2.2.1", ) go_repository( name = "in_gopkg_redis_v4", @@ -4786,8 +4786,8 @@ def prysm_deps(): go_repository( name = "org_golang_google_protobuf", importpath = "google.golang.org/protobuf", - sum = "h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=", - version = "v1.34.1", + sum = "h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=", + version = "v1.34.2", ) go_repository( name = "org_golang_x_build", diff --git a/go.mod b/go.mod index 482659fb5423..f621c273d2c0 100644 --- a/go.mod +++ b/go.mod @@ -10,14 +10,14 @@ require ( github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 github.com/aristanetworks/goarista v0.0.0-20200805130819-fd197cf57d96 github.com/bazelbuild/rules_go v0.23.2 - github.com/btcsuite/btcd/btcec/v2 v2.3.2 + github.com/btcsuite/btcd/btcec/v2 v2.3.4 github.com/consensys/gnark-crypto v0.12.1 - github.com/crate-crypto/go-kzg-4844 v0.7.0 + github.com/crate-crypto/go-kzg-4844 v1.0.0 github.com/d4l3k/messagediff v1.2.1 github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.13.5 + github.com/ethereum/go-ethereum v1.14.8 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 @@ -37,7 +37,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e - github.com/holiman/uint256 v1.2.4 + github.com/holiman/uint256 v1.3.1 github.com/ianlancetaylor/cgosymbolizer v0.0.0-20200424224625-be1b05b0b279 github.com/ipfs/go-log/v2 v2.5.1 github.com/jedib0t/go-pretty/v6 v6.5.4 @@ -71,7 +71,7 @@ require ( github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294 github.com/rs/cors v1.7.0 github.com/schollz/progressbar/v3 v3.3.4 - github.com/sirupsen/logrus v1.9.0 + github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.10.0 github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.9.0 @@ -95,7 +95,7 @@ require ( golang.org/x/tools v0.21.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.56.3 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 gopkg.in/d4l3k/messagediff.v1 v1.2.1 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -107,18 +107,18 @@ require ( require ( github.com/BurntSushi/toml v1.3.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect - github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.11.0 // indirect github.com/cespare/cp v1.1.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chzyer/readline v1.5.1 // indirect - github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect + github.com/cockroachdb/pebble v1.1.1 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect @@ -127,18 +127,18 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect - github.com/deckarep/golang-set/v2 v2.5.0 // indirect + github.com/deckarep/golang-set/v2 v2.6.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/deepmap/oapi-codegen v1.8.2 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect github.com/elastic/gosigar v0.14.2 // indirect - github.com/ethereum/c-kzg-4844 v0.4.0 // indirect - github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 // indirect + github.com/ethereum/c-kzg-4844 v1.0.0 // indirect + github.com/ferranbt/fastssz v0.1.2 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect - github.com/getsentry/sentry-go v0.25.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect @@ -153,7 +153,7 @@ require ( github.com/graph-gophers/graphql-go v1.3.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect - github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect + github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c // indirect github.com/huin/goupnp v1.3.0 // indirect @@ -256,7 +256,7 @@ require ( golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect lukechampine.com/blake3 v1.2.1 // indirect rsc.io/tmplfunc v0.0.3 // indirect @@ -266,7 +266,7 @@ require ( require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf - github.com/fatih/color v1.13.0 // indirect + github.com/fatih/color v1.16.0 // indirect github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect github.com/go-logr/logr v1.3.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect diff --git a/go.sum b/go.sum index c15dec2fca65..e91b6915ecb5 100644 --- a/go.sum +++ b/go.sum @@ -72,6 +72,7 @@ github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 h1:QD github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97/go.mod h1:xcjGtET6+7KeDHcwLQp3sIfyFALtoTjzZgY8Y+RUozM= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -128,6 +129,8 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBT github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= +github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/bufbuild/buf v0.37.0/go.mod h1:lQ1m2HkIaGOFba6w/aC3KYBHhKEOESP3gaAEpS3dAFM= @@ -142,6 +145,7 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= @@ -165,10 +169,12 @@ github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaY github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= +github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -201,6 +207,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0q github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= +github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI= +github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= @@ -213,6 +221,7 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/deckarep/golang-set/v2 v2.5.0 h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA= github.com/deckarep/golang-set/v2 v2.5.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= @@ -264,14 +273,20 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= +github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= +github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig= +github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM= github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= +github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= @@ -297,6 +312,7 @@ github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -535,12 +551,15 @@ github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygK github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA= github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c/go.mod h1:K6KFgcQq1U9ksldcRyLYcwtj4nUTPn4rEaZtX4Gjofc= github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= +github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= +github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= @@ -1043,6 +1062,7 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1736,6 +1756,7 @@ 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.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1759,6 +1780,7 @@ gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuv gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/testing/middleware/builder/builder.go b/testing/middleware/builder/builder.go index a0ed717c0fd3..439fcd203a9a 100644 --- a/testing/middleware/builder/builder.go +++ b/testing/middleware/builder/builder.go @@ -785,7 +785,13 @@ func executableDataToBlock(params engine.ExecutableData, prevBeaconRoot []byte) pRoot := common.Hash(prevBeaconRoot) header.ParentBeaconRoot = &pRoot } - block := gethTypes.NewBlockWithHeader(header).WithBody(txs, nil /* uncles */).WithWithdrawals(params.Withdrawals) + // TODO: update requests with requests for electra + body := gethTypes.Body{ + Transactions: txs, + Uncles: nil, + Withdrawals: params.Withdrawals, + } + block := gethTypes.NewBlockWithHeader(header).WithBody(body) return block, nil } From 4a19a7e8a36d2553a56624e334074b16708d2001 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 16 Aug 2024 15:03:57 -0500 Subject: [PATCH 02/49] fixing dependencies --- WORKSPACE | 42 ----------------------------- deps.bzl | 80 ++++++++++++++++++++++++++++++++++++------------------- go.mod | 17 +++++++----- go.sum | 26 ++++++++++++++++++ 4 files changed, 88 insertions(+), 77 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 1cc9236a2381..4f10ce0ac29b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -387,48 +387,6 @@ gometalinter_dependencies() load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") -go_repository( - name = "com_github_cockroachdb_fifo", - importpath = "github.com/cockroachdb/fifo", - sum = "h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=", - version = "v0.0.0-20240606204812-0bbfbd93a7ce", -) - -go_repository( - name = "com_github_donovanhide_eventsource", - importpath = "github.com/donovanhide/eventsource", - sum = "h1:C7t6eeMaEQVy6e8CarIhscYQlNmw5e3G36y7l7Y21Ao=", - version = "v0.0.0-20210830082556-c59027999da0", -) - -go_repository( - name = "com_github_ethereum_go_verkle", - importpath = "github.com/ethereum/go-verkle", - sum = "h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=", - version = "v0.1.1-0.20240306133620-7d920df305f0", -) - -go_repository( - name = "com_github_karalabe_hid", - importpath = "github.com/karalabe/hid", - sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", - version = "v1.0.1-0.20240306101548-573246063e52", -) - -go_repository( - name = "com_github_protolambda_zrnt", - importpath = "github.com/protolambda/zrnt", - sum = "h1:KZ48T+3UhsPXNdtE/5QEvGc9DGjUaRI17nJaoznoIaM=", - version = "v0.32.2", -) - -go_repository( - name = "com_github_protolambda_ztyp", - importpath = "github.com/protolambda/ztyp", - sum = "h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY=", - version = "v0.2.2", -) - gazelle_dependencies() load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") diff --git a/deps.bzl b/deps.bzl index c92f54071e76..f5897381cf7c 100644 --- a/deps.bzl +++ b/deps.bzl @@ -539,6 +539,12 @@ def prysm_deps(): sum = "h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=", version = "v1.11.3", ) + go_repository( + name = "com_github_cockroachdb_fifo", + importpath = "github.com/cockroachdb/fifo", + sum = "h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=", + version = "v0.0.0-20240606204812-0bbfbd93a7ce", + ) go_repository( name = "com_github_cockroachdb_logtags", importpath = "github.com/cockroachdb/logtags", @@ -557,12 +563,6 @@ def prysm_deps(): sum = "h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=", version = "v1.1.5", ) - go_repository( - name = "com_github_cockroachdb_sentry_go", - importpath = "github.com/cockroachdb/sentry-go", - sum = "h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=", - version = "v0.6.1-cockroachdb.2", - ) go_repository( name = "com_github_cockroachdb_tokenbucket", importpath = "github.com/cockroachdb/tokenbucket", @@ -645,8 +645,8 @@ def prysm_deps(): go_repository( name = "com_github_crate_crypto_go_ipa", importpath = "github.com/crate-crypto/go-ipa", - sum = "h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=", - version = "v0.0.0-20240223125850-b1e8a79f509c", + sum = "h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ=", + version = "v0.0.0-20231025140028-3c0104f4b233", ) go_repository( name = "com_github_crate_crypto_go_kzg_4844", @@ -768,6 +768,12 @@ def prysm_deps(): sum = "h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=", version = "v0.0.0-20180111231733-ee0de3bc6815", ) + go_repository( + name = "com_github_donovanhide_eventsource", + importpath = "github.com/donovanhide/eventsource", + sum = "h1:C7t6eeMaEQVy6e8CarIhscYQlNmw5e3G36y7l7Y21Ao=", + version = "v0.0.0-20210830082556-c59027999da0", + ) go_repository( name = "com_github_dop251_goja", importpath = "github.com/dop251/goja", @@ -873,8 +879,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=", - version = "v1.14.8", + sum = "h1:5zvnAqLtnCZrU9uod1JCvHWJbPMURzYFHfc2eHz4PHA=", + version = "v1.14.3", ) go_repository( name = "com_github_evanphx_json_patch", @@ -915,8 +921,8 @@ def prysm_deps(): go_repository( name = "com_github_fjl_memsize", importpath = "github.com/fjl/memsize", - sum = "h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=", - version = "v0.0.0-20190710130421-bcb5799ab5e5", + sum = "h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=", + version = "v0.0.2", ) go_repository( name = "com_github_flosch_pongo2_v4", @@ -999,8 +1005,8 @@ def prysm_deps(): go_repository( name = "com_github_gballet_go_verkle", importpath = "github.com/gballet/go-verkle", - sum = "h1:vMT47RYsrftsHSTQhqXwC3BYflo38OLC3Y4LtXtLyU0=", - version = "v0.0.0-20230607174250-df487255f46b", + sum = "h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE=", + version = "v0.1.1-0.20231031103413-a67434b50f46", ) go_repository( name = "com_github_gdamore_encoding", @@ -1011,8 +1017,8 @@ def prysm_deps(): go_repository( name = "com_github_gdamore_tcell_v2", importpath = "github.com/gdamore/tcell/v2", - sum = "h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=", - version = "v2.6.0", + sum = "h1:I5LiGTQuwrysAt1KS9wg1yFfOI3arI3ucFrxtd/xqaA=", + version = "v2.7.0", ) go_repository( name = "com_github_getkin_kin_openapi", @@ -1301,8 +1307,8 @@ def prysm_deps(): go_repository( name = "com_github_golang_snappy", importpath = "github.com/golang/snappy", - sum = "h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=", - version = "v0.0.5-0.20220116011046-fa5810519dcb", + sum = "h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc=", + version = "v0.0.5-0.20231225225746-43d5d4cd4e0e", ) go_repository( name = "com_github_golangci_lint_1", @@ -1673,8 +1679,8 @@ def prysm_deps(): go_repository( name = "com_github_holiman_goevmlab", importpath = "github.com/holiman/goevmlab", - sum = "h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA=", - version = "v0.0.0-20231201084119-c73b3c97929c", + sum = "h1:MnqrjbCnYO6ImEJiqza1vTcSFJno9cErjWG9ONXJgoc=", + version = "v0.0.0-20240515165425-8414a52dc9d4", ) go_repository( name = "com_github_holiman_uint256", @@ -1912,6 +1918,12 @@ def prysm_deps(): sum = "h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg=", version = "v0.0.0-20180517002512-3bf9e2903213", ) + go_repository( + name = "com_github_karalabe_hid", + importpath = "github.com/karalabe/hid", + sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", + version = "v1.0.1-0.20240306101548-573246063e52", + ) go_repository( name = "com_github_karalabe_usb", importpath = "github.com/karalabe/usb", @@ -2238,14 +2250,14 @@ def prysm_deps(): go_repository( name = "com_github_mariusvanderwijden_fuzzyvm", importpath = "github.com/MariusVanDerWijden/FuzzyVM", - sum = "h1:BwEuC3xavrv4HTUDH2fUrKgKooiH3Q/nSVnFGtnzpN0=", - version = "v0.0.0-20240209103030-ec53fa766bf8", + sum = "h1:RQtzNvriR3Yu5CvVBTJPwDmfItBT90TWZ3fFondhc08=", + version = "v0.0.0-20240516070431-7828990cad7d", ) go_repository( name = "com_github_mariusvanderwijden_tx_fuzz", importpath = "github.com/MariusVanDerWijden/tx-fuzz", - sum = "h1:QDTh0xHorSykJ4+2VccBADMeRAVUbnHaWrCPIMtN+Vc=", - version = "v1.3.3-0.20240227085032-f70dd7c85c97", + sum = "h1:ZPtYGiT50Zcd52AXItJKQ3wVze9yq/LCI7DIZWLKFXg=", + version = "v1.3.3-0.20240521060658-cbe8f24a510a", ) go_repository( name = "com_github_marten_seemann_tcp", @@ -2970,6 +2982,18 @@ def prysm_deps(): sum = "h1:05DU2wJN7DTU7z28+Q+zejXkIsA/MF8JZQGhtBZZiWk=", version = "v0.1.0", ) + go_repository( + name = "com_github_protolambda_zrnt", + importpath = "github.com/protolambda/zrnt", + sum = "h1:KZ48T+3UhsPXNdtE/5QEvGc9DGjUaRI17nJaoznoIaM=", + version = "v0.32.2", + ) + go_repository( + name = "com_github_protolambda_ztyp", + importpath = "github.com/protolambda/ztyp", + sum = "h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY=", + version = "v0.2.2", + ) go_repository( name = "com_github_prysmaticlabs_fastssz", importpath = "github.com/prysmaticlabs/fastssz", @@ -3052,8 +3076,8 @@ def prysm_deps(): go_repository( name = "com_github_rivo_tview", importpath = "github.com/rivo/tview", - sum = "h1:7UMY2qN9VlcY+x9jlhpYe5Bf1zrdhvmfZyLMk2u65BM=", - version = "v0.0.0-20231126152417-33a1d271f2b6", + sum = "h1:QLKAX9JLJ9RJVjnywcVg/U8nKNZvdftCtJRv1qzALYI=", + version = "v0.0.0-20240118093911-742cf086196e", ) go_repository( name = "com_github_rivo_uniseg", @@ -3542,8 +3566,8 @@ def prysm_deps(): go_repository( name = "com_github_urfave_cli_v2", importpath = "github.com/urfave/cli/v2", - sum = "h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=", - version = "v2.26.0", + sum = "h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=", + version = "v2.27.1", ) go_repository( name = "com_github_urfave_negroni", diff --git a/go.mod b/go.mod index f621c273d2c0..bc48e9eb7348 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ toolchain go1.22.4 require ( contrib.go.opencensus.io/exporter/jaeger v0.2.1 - github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 - github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 + github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d + github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a github.com/aristanetworks/goarista v0.0.0-20200805130819-fd197cf57d96 github.com/bazelbuild/rules_go v0.23.2 github.com/btcsuite/btcd/btcec/v2 v2.3.4 @@ -17,8 +17,8 @@ require ( github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.14.8 - github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 + github.com/ethereum/go-ethereum v1.14.3 + github.com/fjl/memsize v0.0.2 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible @@ -26,7 +26,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/gddo v0.0.0-20200528160355-8d077c1d8f4c github.com/golang/protobuf v1.5.4 - github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb + github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e github.com/google/go-cmp v0.6.0 github.com/google/gofuzz v1.2.0 github.com/google/uuid v1.4.0 @@ -79,7 +79,7 @@ require ( github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279 github.com/tyler-smith/go-bip39 v1.1.0 - github.com/urfave/cli/v2 v2.26.0 + github.com/urfave/cli/v2 v2.27.1 github.com/uudashr/gocognit v1.0.5 github.com/wealdtech/go-bytesutil v1.1.1 github.com/wealdtech/go-eth2-util v1.6.3 @@ -117,6 +117,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/errors v1.11.3 // indirect + github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect github.com/cockroachdb/pebble v1.1.1 // indirect github.com/cockroachdb/redact v1.1.5 // indirect @@ -125,6 +126,7 @@ require ( 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/deckarep/golang-set/v2 v2.6.0 // indirect @@ -138,6 +140,7 @@ require ( github.com/ferranbt/fastssz v0.1.2 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect + github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect @@ -155,7 +158,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c // indirect + github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 // indirect github.com/huin/goupnp v1.3.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect diff --git a/go.sum b/go.sum index e91b6915ecb5..7233c77c9346 100644 --- a/go.sum +++ b/go.sum @@ -68,10 +68,15 @@ github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 h1:BwEuC3xavrv4HTUDH2fUrKgKooiH3Q/nSVnFGtnzpN0= github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8/go.mod h1:L1QpLBqXlboJMOC2hndG95d1eiElzKsBhjzcuy8pxeM= +github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d h1:RQtzNvriR3Yu5CvVBTJPwDmfItBT90TWZ3fFondhc08= +github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d/go.mod h1:gWTykV/ZinShgltWofTEJY4TsletuvGhB6l4+Ai2F+E= github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 h1:QDTh0xHorSykJ4+2VccBADMeRAVUbnHaWrCPIMtN+Vc= github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97/go.mod h1:xcjGtET6+7KeDHcwLQp3sIfyFALtoTjzZgY8Y+RUozM= +github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a h1:ZPtYGiT50Zcd52AXItJKQ3wVze9yq/LCI7DIZWLKFXg= +github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a/go.mod h1:mA17gdGp3hbLmAfumxZNT8Aru+L/OF4PAP8AY6Bzkow= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= @@ -145,6 +150,7 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= @@ -169,11 +175,15 @@ github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaY github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= +github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= @@ -205,6 +215,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= +github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI= @@ -221,6 +233,7 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= github.com/deckarep/golang-set/v2 v2.5.0 h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA= github.com/deckarep/golang-set/v2 v2.5.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= @@ -277,6 +290,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/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= +github.com/ethereum/go-ethereum v1.14.3 h1:5zvnAqLtnCZrU9uod1JCvHWJbPMURzYFHfc2eHz4PHA= +github.com/ethereum/go-ethereum v1.14.3/go.mod h1:1STrq471D0BQbCX9He0hUj4bHxX2k6mt5nOQJhDNOJ8= github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig= github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -289,6 +304,7 @@ github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iu github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -308,10 +324,13 @@ github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbY github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= @@ -429,6 +448,8 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -556,6 +577,8 @@ github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZ github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA= github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c/go.mod h1:K6KFgcQq1U9ksldcRyLYcwtj4nUTPn4rEaZtX4Gjofc= +github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 h1:MnqrjbCnYO6ImEJiqza1vTcSFJno9cErjWG9ONXJgoc= +github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4/go.mod h1:3JURK6FtzpaEjCVxopnYN37phjHNI5gW9fhsKFF51Us= github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= @@ -1148,6 +1171,8 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +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/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= @@ -1756,6 +1781,7 @@ 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.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= 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= From 8c853fc008f307e9fef4ac2b708025d352d9f4d8 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 16 Aug 2024 15:05:57 -0500 Subject: [PATCH 03/49] reverting workspace --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 4f10ce0ac29b..19948e919b08 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -385,7 +385,7 @@ load("@com_github_atlassian_bazel_tools//gometalinter:deps.bzl", "gometalinter_d gometalinter_dependencies() -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() From 412fa6133be209d1b23840263b244d7ade6f5cbf Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 16 Aug 2024 16:30:06 -0500 Subject: [PATCH 04/49] more fixes, work in progress --- beacon-chain/blockchain/kzg/validation.go | 3 ++- beacon-chain/blockchain/kzg/validation_test.go | 5 +++-- beacon-chain/rpc/prysm/v1alpha1/debug/server.go | 4 +--- testing/endtoend/components/eth1/transactions.go | 7 ++++--- testing/endtoend/geth_deps.go | 1 - tools/bootnode/bootnode.go | 4 +--- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/beacon-chain/blockchain/kzg/validation.go b/beacon-chain/blockchain/kzg/validation.go index 6689d59d4a38..75f45ddca590 100644 --- a/beacon-chain/blockchain/kzg/validation.go +++ b/beacon-chain/blockchain/kzg/validation.go @@ -11,8 +11,9 @@ func Verify(sidecars ...blocks.ROBlob) error { return nil } if len(sidecars) == 1 { + blob := bytesToBlob(sidecars[0].Blob) return kzgContext.VerifyBlobKZGProof( - bytesToBlob(sidecars[0].Blob), + &blob, bytesToCommitment(sidecars[0].KzgCommitment), bytesToKZGProof(sidecars[0].KzgProof)) } diff --git a/beacon-chain/blockchain/kzg/validation_test.go b/beacon-chain/blockchain/kzg/validation_test.go index 832c6f5d79cc..2b1c86daa249 100644 --- a/beacon-chain/blockchain/kzg/validation_test.go +++ b/beacon-chain/blockchain/kzg/validation_test.go @@ -47,11 +47,12 @@ func GetRandBlob(seed int64) GoKZG.Blob { } func GenerateCommitmentAndProof(blob GoKZG.Blob) (GoKZG.KZGCommitment, GoKZG.KZGProof, error) { - commitment, err := kzgContext.BlobToKZGCommitment(blob, 0) + b := blob + commitment, err := kzgContext.BlobToKZGCommitment(&b, 0) if err != nil { return GoKZG.KZGCommitment{}, GoKZG.KZGProof{}, err } - proof, err := kzgContext.ComputeBlobKZGProof(blob, commitment, 0) + proof, err := kzgContext.ComputeBlobKZGProof(&b, commitment, 0) if err != nil { return GoKZG.KZGCommitment{}, GoKZG.KZGProof{}, err } diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/server.go b/beacon-chain/rpc/prysm/v1alpha1/debug/server.go index d6bd27b41e47..e565a645651a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/server.go @@ -56,9 +56,7 @@ func (_ *Server) SetLoggingLevel(_ context.Context, req *pbrpc.LoggingLevelReque // Libp2p specific logging. golog.SetAllLoggers(golog.LevelDebug) // Geth specific logging. - glogger := gethlog.NewGlogHandler(gethlog.StreamHandler(os.Stderr, gethlog.TerminalFormat(true))) - glogger.Verbosity(gethlog.LvlTrace) - gethlog.Root().SetHandler(glogger) + gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LvlTrace, true))) } return &empty.Empty{}, nil } diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index 5426adae257d..6fe40529245c 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -342,17 +342,18 @@ func EncodeBlobs(data []byte) ([]kzg4844.Blob, []kzg4844.Commitment, []kzg4844.P versionedHashes []common.Hash ) for _, blob := range blobs { - commit, err := kzg4844.BlobToCommitment(blob) + b := blob + commit, err := kzg4844.BlobToCommitment(&b) if err != nil { return nil, nil, nil, nil, err } commits = append(commits, commit) - proof, err := kzg4844.ComputeBlobProof(blob, commit) + proof, err := kzg4844.ComputeBlobProof(&b, commit) if err != nil { return nil, nil, nil, nil, err } - if err := kzg4844.VerifyBlobProof(blob, commit, proof); err != nil { + if err := kzg4844.VerifyBlobProof(&b, commit, proof); err != nil { return nil, nil, nil, nil, err } proofs = append(proofs, proof) diff --git a/testing/endtoend/geth_deps.go b/testing/endtoend/geth_deps.go index b021138818c7..d06d54c1bc50 100644 --- a/testing/endtoend/geth_deps.go +++ b/testing/endtoend/geth_deps.go @@ -12,7 +12,6 @@ import ( _ "github.com/ethereum/go-ethereum/eth" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/eth/downloader" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/ethclient" // Required for go-ethereum e2e. - _ "github.com/ethereum/go-ethereum/les" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/log" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/metrics" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/node" // Required for go-ethereum e2e. diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index a95e5c2ad9f2..2a41f1755e74 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -81,9 +81,7 @@ func main() { logrus.SetLevel(logrus.DebugLevel) // Geth specific logging. - glogger := gethlog.NewGlogHandler(gethlog.StreamHandler(os.Stderr, gethlog.TerminalFormat(false))) - glogger.Verbosity(gethlog.LvlTrace) - gethlog.Root().SetHandler(glogger) + gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LvlTrace, true))) log.Debug("Debug logging enabled.") } From 3540b4bf35dfb4a290064f26028be4cf04e8658e Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 16 Aug 2024 16:44:14 -0500 Subject: [PATCH 05/49] trying with upgraded geth version --- go.mod | 9 ++++---- go.sum | 68 +++++++++++----------------------------------------------- 2 files changed, 16 insertions(+), 61 deletions(-) diff --git a/go.mod b/go.mod index bc48e9eb7348..1f77d7773402 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.14.3 + github.com/ethereum/go-ethereum v1.14.8 github.com/fjl/memsize v0.0.2 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 @@ -126,7 +126,7 @@ require ( 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect + github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/deckarep/golang-set/v2 v2.6.0 // indirect @@ -137,15 +137,14 @@ require ( github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect github.com/elastic/gosigar v0.14.2 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect + github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect github.com/ferranbt/fastssz v0.1.2 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect - github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect - github.com/go-stack/stack v1.8.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/flock v0.8.1 // indirect @@ -167,7 +166,7 @@ require ( github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect - github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c // indirect + github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 // indirect github.com/klauspost/compress v1.17.8 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/koron/go-ssdp v0.0.4 // indirect diff --git a/go.sum b/go.sum index 7233c77c9346..f74758a041ba 100644 --- a/go.sum +++ b/go.sum @@ -66,16 +66,10 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 h1:BwEuC3xavrv4HTUDH2fUrKgKooiH3Q/nSVnFGtnzpN0= -github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8/go.mod h1:L1QpLBqXlboJMOC2hndG95d1eiElzKsBhjzcuy8pxeM= github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d h1:RQtzNvriR3Yu5CvVBTJPwDmfItBT90TWZ3fFondhc08= github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d/go.mod h1:gWTykV/ZinShgltWofTEJY4TsletuvGhB6l4+Ai2F+E= -github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 h1:QDTh0xHorSykJ4+2VccBADMeRAVUbnHaWrCPIMtN+Vc= -github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97/go.mod h1:xcjGtET6+7KeDHcwLQp3sIfyFALtoTjzZgY8Y+RUozM= github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a h1:ZPtYGiT50Zcd52AXItJKQ3wVze9yq/LCI7DIZWLKFXg= github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a/go.mod h1:mA17gdGp3hbLmAfumxZNT8Aru+L/OF4PAP8AY6Bzkow= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= @@ -132,8 +126,6 @@ github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= -github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= -github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= @@ -148,7 +140,6 @@ github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -173,16 +164,12 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= -github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4= github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= @@ -215,10 +202,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= -github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= -github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= -github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= +github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I= +github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI= github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -231,8 +216,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= -github.com/deckarep/golang-set/v2 v2.5.0 h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA= -github.com/deckarep/golang-set/v2 v2.5.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= @@ -284,26 +267,20 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= -github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= -github.com/ethereum/go-ethereum v1.14.3 h1:5zvnAqLtnCZrU9uod1JCvHWJbPMURzYFHfc2eHz4PHA= -github.com/ethereum/go-ethereum v1.14.3/go.mod h1:1STrq471D0BQbCX9He0hUj4bHxX2k6mt5nOQJhDNOJ8= github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig= github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= +github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4= +github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM= github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= +github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= @@ -324,12 +301,8 @@ github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbY github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= -github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= -github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= -github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -378,8 +351,6 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= @@ -446,8 +417,6 @@ github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc= github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= @@ -570,17 +539,12 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA= -github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c/go.mod h1:K6KFgcQq1U9ksldcRyLYcwtj4nUTPn4rEaZtX4Gjofc= github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 h1:MnqrjbCnYO6ImEJiqza1vTcSFJno9cErjWG9ONXJgoc= github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4/go.mod h1:3JURK6FtzpaEjCVxopnYN37phjHNI5gW9fhsKFF51Us= -github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= -github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -627,12 +591,11 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= -github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs= -github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I= +github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52/go.mod h1:qk1sX/IBgppQNcGCRoj90u6EGC056EBoIc1oEjCWla8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -723,7 +686,6 @@ github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9v github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -1083,8 +1045,7 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -1169,8 +1130,6 @@ github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMW 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.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= -github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= 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/uudashr/gocognit v1.0.5 h1:rrSex7oHr3/pPLQ0xoWq108XMU8s678FJcQ+aSfOHa4= @@ -1779,8 +1738,6 @@ google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX7 google.golang.org/protobuf v1.25.1-0.20201208041424-160c7477e0e8/go.mod h1:hFxJC2f0epmp1elRCiEGJTKAWbwxZ2nvqZdHl3FQXCY= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -1804,8 +1761,7 @@ gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eR gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= From 7b72d09ad2ccc24483dfe55edb8caab6ba8e8501 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 19 Aug 2024 15:36:15 -0500 Subject: [PATCH 06/49] fixing deprecated functions except for the time related ones on eth1 distance due to time issues --- beacon-chain/execution/BUILD.bazel | 5 +- beacon-chain/execution/block_reader_test.go | 13 ++-- beacon-chain/execution/log_processing_test.go | 59 +++++++++++-------- beacon-chain/execution/service_test.go | 58 +++++++++++------- beacon-chain/execution/testing/BUILD.bazel | 2 +- .../execution/testing/mock_execution_chain.go | 10 ++-- cmd/beacon-chain/main.go | 4 +- contracts/deposit/mock/BUILD.bazel | 3 +- contracts/deposit/mock/mock.go | 13 ++-- 9 files changed, 94 insertions(+), 73 deletions(-) diff --git a/beacon-chain/execution/BUILD.bazel b/beacon-chain/execution/BUILD.bazel index 15b1bb55a2b2..5013dbaa0c60 100644 --- a/beacon-chain/execution/BUILD.bazel +++ b/beacon-chain/execution/BUILD.bazel @@ -97,11 +97,8 @@ go_test( deps = [ "//async/event:go_default_library", "//beacon-chain/cache/depositsnapshot:go_default_library", - "//beacon-chain/core/feed:go_default_library", - "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/signing:go_default_library", - "//beacon-chain/db:go_default_library", "//beacon-chain/db/testing:go_default_library", "//beacon-chain/execution/testing:go_default_library", "//beacon-chain/execution/types:go_default_library", @@ -127,11 +124,11 @@ go_test( "//testing/util:go_default_library", "//time/slots:go_default_library", "@com_github_ethereum_go_ethereum//:go_default_library", - "@com_github_ethereum_go_ethereum//accounts/abi/bind/backends:go_default_library", "@com_github_ethereum_go_ethereum//beacon/engine:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", + "@com_github_ethereum_go_ethereum//ethclient/simulated:go_default_library", "@com_github_ethereum_go_ethereum//rpc:go_default_library", "@com_github_holiman_uint256//:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/execution/block_reader_test.go b/beacon-chain/execution/block_reader_test.go index 6dbda1d2118f..d84f6cbf047c 100644 --- a/beacon-chain/execution/block_reader_test.go +++ b/beacon-chain/execution/block_reader_test.go @@ -44,7 +44,7 @@ func TestLatestMainchainInfo_OK(t *testing.T) { web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) testAcc.Backend.Commit() @@ -141,7 +141,7 @@ func TestBlockExists_ValidHash(t *testing.T) { web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} testAcc.Backend.Commit() - block, err := testAcc.Backend.BlockByNumber(context.Background(), big.NewInt(0)) + block, err := testAcc.Backend.Client().BlockByNumber(context.Background(), big.NewInt(0)) assert.NoError(t, err) exists, height, err := web3Service.BlockExists(context.Background(), block.Hash()) @@ -201,6 +201,7 @@ func TestBlockExists_UsesCachedBlockInfo(t *testing.T) { } func TestService_BlockNumberByTimestamp(t *testing.T) { + ctx := context.Background() beaconDB := dbutil.SetupDB(t) testAcc, err := mock.Setup() require.NoError(t, err, "Unable to set up simulated backend") @@ -220,8 +221,8 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { for i := 0; i < 200; i++ { testAcc.Backend.Commit() } - ctx := context.Background() - hd, err := testAcc.Backend.HeaderByNumber(ctx, nil) + + hd, err := testAcc.Backend.Client().HeaderByNumber(ctx, nil) require.NoError(t, err) web3Service.latestEth1Data.BlockTime = hd.Time web3Service.latestEth1Data.BlockHeight = hd.Number.Uint64() @@ -253,7 +254,7 @@ func TestService_BlockNumberByTimestampLessTargetTime(t *testing.T) { testAcc.Backend.Commit() } ctx := context.Background() - hd, err := testAcc.Backend.HeaderByNumber(ctx, nil) + hd, err := testAcc.Backend.Client().HeaderByNumber(ctx, nil) require.NoError(t, err) web3Service.latestEth1Data.BlockTime = hd.Time // Use extremely small deadline to illustrate that context deadlines are respected. @@ -291,7 +292,7 @@ func TestService_BlockNumberByTimestampMoreTargetTime(t *testing.T) { testAcc.Backend.Commit() } ctx := context.Background() - hd, err := testAcc.Backend.HeaderByNumber(ctx, nil) + hd, err := testAcc.Backend.Client().HeaderByNumber(ctx, nil) require.NoError(t, err) web3Service.latestEth1Data.BlockTime = hd.Time // Use extremely small deadline to illustrate that context deadlines are respected. diff --git a/beacon-chain/execution/log_processing_test.go b/beacon-chain/execution/log_processing_test.go index 4120ca136f8e..d456b97a3730 100644 --- a/beacon-chain/execution/log_processing_test.go +++ b/beacon-chain/execution/log_processing_test.go @@ -47,7 +47,7 @@ func TestProcessDepositLog_OK(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) testAcc.Backend.Commit() @@ -72,7 +72,7 @@ func TestProcessDepositLog_OK(t *testing.T) { }, } - logs, err := testAcc.Backend.FilterLogs(web3Service.ctx, query) + logs, err := testAcc.Backend.Client().FilterLogs(web3Service.ctx, query) require.NoError(t, err, "Unable to retrieve logs") if len(logs) == 0 { @@ -116,7 +116,7 @@ func TestProcessDepositLog_InsertsPendingDeposit(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) testAcc.Backend.Commit() @@ -144,7 +144,7 @@ func TestProcessDepositLog_InsertsPendingDeposit(t *testing.T) { }, } - logs, err := testAcc.Backend.FilterLogs(web3Service.ctx, query) + logs, err := testAcc.Backend.Client().FilterLogs(web3Service.ctx, query) require.NoError(t, err, "Unable to retrieve logs") web3Service.chainStartData.Chainstarted = true @@ -176,7 +176,7 @@ func TestUnpackDepositLogData_OK(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) testAcc.Backend.Commit() @@ -199,7 +199,7 @@ func TestUnpackDepositLogData_OK(t *testing.T) { }, } - logz, err := testAcc.Backend.FilterLogs(web3Service.ctx, query) + logz, err := testAcc.Backend.Client().FilterLogs(web3Service.ctx, query) require.NoError(t, err, "Unable to retrieve logs") loggedPubkey, withCreds, _, loggedSig, index, err := contracts.UnpackDepositLogData(logz[0].Data) @@ -232,7 +232,7 @@ func TestProcessETH2GenesisLog_8DuplicatePubkeys(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) params.SetupTestConfigCleanup(t) @@ -269,7 +269,7 @@ func TestProcessETH2GenesisLog_8DuplicatePubkeys(t *testing.T) { }, } - logs, err := testAcc.Backend.FilterLogs(web3Service.ctx, query) + logs, err := testAcc.Backend.Client().FilterLogs(web3Service.ctx, query) require.NoError(t, err, "Unable to retrieve logs") for i := range logs { @@ -307,7 +307,7 @@ func TestProcessETH2GenesisLog(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} require.NoError(t, err) params.SetupTestConfigCleanup(t) @@ -342,7 +342,7 @@ func TestProcessETH2GenesisLog(t *testing.T) { }, } - logs, err := testAcc.Backend.FilterLogs(web3Service.ctx, query) + logs, err := testAcc.Backend.Client().FilterLogs(web3Service.ctx, query) require.NoError(t, err, "Unable to retrieve logs") require.Equal(t, depositsReqForChainStart, len(logs)) @@ -400,13 +400,15 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - web3Service.httpLogger = testAcc.Backend + web3Service.httpLogger = testAcc.Backend.Client() web3Service.latestEth1Data.LastRequestedBlock = 0 - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + block, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = block.NumberU64() + web3Service.latestEth1Data.BlockTime = block.Time() bConfig := params.MinimalSpecConfig().Copy() bConfig.MinGenesisTime = 0 bConfig.SecondsPerETH1Block = 10 @@ -444,8 +446,10 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { for i := uint64(0); i < params.BeaconConfig().Eth1FollowDistance; i++ { testAcc.Backend.Commit() } - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + b, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = b.NumberU64() + web3Service.latestEth1Data.BlockTime = b.Time() // Set up our subscriber now to listen for the chain started event. stateChannel := make(chan *feed.Event, 1) @@ -497,13 +501,15 @@ func TestProcessETH2GenesisLog_LargePeriodOfNoLogs(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - web3Service.httpLogger = testAcc.Backend + web3Service.httpLogger = testAcc.Backend.Client() web3Service.latestEth1Data.LastRequestedBlock = 0 - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + b, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = b.NumberU64() + web3Service.latestEth1Data.BlockTime = b.Time() bConfig := params.MinimalSpecConfig().Copy() bConfig.SecondsPerETH1Block = 10 params.OverrideBeaconConfig(bConfig) @@ -540,14 +546,19 @@ func TestProcessETH2GenesisLog_LargePeriodOfNoLogs(t *testing.T) { for i := uint64(0); i < 1500; i++ { testAcc.Backend.Commit() } - wantedGenesisTime := testAcc.Backend.Blockchain().CurrentBlock().Time + genesisBlock, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + + wantedGenesisTime := genesisBlock.Time() // Forward the chain to account for the follow distance for i := uint64(0); i < params.BeaconConfig().Eth1FollowDistance; i++ { testAcc.Backend.Commit() } - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + currBlock, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = currBlock.NumberU64() + web3Service.latestEth1Data.BlockTime = currBlock.Time() // Set the genesis time 500 blocks ahead of the last // deposit log. @@ -608,7 +619,7 @@ func newPowchainService(t *testing.T, eth1Backend *mock.TestAccount, beaconDB db ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(eth1Backend.ContractAddr, eth1Backend.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(eth1Backend.ContractAddr, eth1Backend.Backend.Client()) require.NoError(t, err) web3Service.rpcClient = &mockExecution.RPCClient{Backend: eth1Backend.Backend} diff --git a/beacon-chain/execution/service_test.go b/beacon-chain/execution/service_test.go index 32e8bc56dfa4..a372503b3bd1 100644 --- a/beacon-chain/execution/service_test.go +++ b/beacon-chain/execution/service_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" gethTypes "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/ethclient/simulated" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v5/async/event" @@ -41,7 +41,7 @@ var _ POWBlockFetcher = (*Service)(nil) var _ Chain = (*Service)(nil) type goodLogger struct { - backend *backends.SimulatedBackend + backend *simulated.Backend } func (_ *goodLogger) Close() {} @@ -50,7 +50,7 @@ func (g *goodLogger) SubscribeFilterLogs(ctx context.Context, q ethereum.FilterQ if g.backend == nil { return new(event.Feed).Subscribe(ch), nil } - return g.backend.SubscribeFilterLogs(ctx, q, ch) + return g.backend.Client().SubscribeFilterLogs(ctx, q, ch) } func (g *goodLogger) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]gethTypes.Log, error) { @@ -66,7 +66,7 @@ func (g *goodLogger) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([] } return logs, nil } - return g.backend.FilterLogs(ctx, q) + return g.backend.Client().FilterLogs(ctx, q) } type goodNotifier struct { @@ -100,7 +100,7 @@ func TestStart_OK(t *testing.T) { require.NoError(t, err, "unable to setup execution service") web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) testAcc.Backend.Commit() @@ -147,7 +147,7 @@ func TestStop_OK(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) testAcc.Backend.Commit() @@ -177,10 +177,12 @@ func TestService_Eth1Synced(t *testing.T) { ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") web3Service = setDefaultMocks(web3Service) - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) - currTime := testAcc.Backend.Blockchain().CurrentHeader().Time + header, err := testAcc.Backend.Client().HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + currTime := header.Time now := time.Now() assert.NoError(t, testAcc.Backend.AdjustTime(now.Sub(time.Unix(int64(currTime), 0)))) testAcc.Backend.Commit() @@ -211,14 +213,22 @@ func TestFollowBlock_OK(t *testing.T) { web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - baseHeight := testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() + block, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + baseHeight := block.NumberU64() // process follow_distance blocks + var lastHash common.Hash for i := 0; i < int(params.BeaconConfig().Eth1FollowDistance); i++ { - testAcc.Backend.Commit() + lastHash = testAcc.Backend.Commit() } + lb, err := testAcc.Backend.Client().BlockByHash(context.Background(), lastHash) + require.NoError(t, err) + log.Println(lb.NumberU64()) // set current height - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + block, err = testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = block.NumberU64() + web3Service.latestEth1Data.BlockTime = block.Time() h, err := web3Service.followedBlockHeight(context.Background()) require.NoError(t, err) @@ -229,9 +239,12 @@ func TestFollowBlock_OK(t *testing.T) { for i := uint64(0); i < numToForward; i++ { testAcc.Backend.Commit() } + + newBlock, err := testAcc.Backend.Client().BlockByNumber(context.Background(), nil) + require.NoError(t, err) // set current height - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + web3Service.latestEth1Data.BlockHeight = newBlock.NumberU64() + web3Service.latestEth1Data.BlockTime = newBlock.Time() h, err = web3Service.followedBlockHeight(context.Background()) require.NoError(t, err) @@ -316,11 +329,11 @@ func TestLogTillGenesis_OK(t *testing.T) { WithDatabase(beaconDB), ) require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") - web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) + web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend.Client()) require.NoError(t, err) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - web3Service.httpLogger = testAcc.Backend + web3Service.httpLogger = testAcc.Backend.Client() for i := 0; i < 30; i++ { testAcc.Backend.Commit() } @@ -476,15 +489,18 @@ func TestNewService_EarliestVotingBlock(t *testing.T) { for i := 0; i < numToForward; i++ { testAcc.Backend.Commit() } - currTime := testAcc.Backend.Blockchain().CurrentHeader().Time + currHeader, err := testAcc.Backend.Client().HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + currTime := currHeader.Time now := time.Now() err = testAcc.Backend.AdjustTime(now.Sub(time.Unix(int64(currTime), 0))) require.NoError(t, err) testAcc.Backend.Commit() - - currTime = testAcc.Backend.Blockchain().CurrentHeader().Time - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentHeader().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentHeader().Time + currHeader, err = testAcc.Backend.Client().HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + currTime = currHeader.Time + web3Service.latestEth1Data.BlockHeight = currHeader.Number.Uint64() + web3Service.latestEth1Data.BlockTime = currHeader.Time web3Service.chainStartData.GenesisTime = currTime // With a current slot of zero, only request follow_blocks behind. diff --git a/beacon-chain/execution/testing/BUILD.bazel b/beacon-chain/execution/testing/BUILD.bazel index ba5b27f98f6a..e9b1ef77e238 100644 --- a/beacon-chain/execution/testing/BUILD.bazel +++ b/beacon-chain/execution/testing/BUILD.bazel @@ -25,10 +25,10 @@ go_library( "//encoding/bytesutil:go_default_library", "//proto/engine/v1:go_default_library", "//proto/prysm/v1alpha1:go_default_library", - "@com_github_ethereum_go_ethereum//accounts/abi/bind/backends:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", + "@com_github_ethereum_go_ethereum//ethclient/simulated:go_default_library", "@com_github_ethereum_go_ethereum//rpc:go_default_library", "@com_github_holiman_uint256//:go_default_library", "@com_github_pkg_errors//:go_default_library", diff --git a/beacon-chain/execution/testing/mock_execution_chain.go b/beacon-chain/execution/testing/mock_execution_chain.go index 95b8718d2668..287738e18909 100644 --- a/beacon-chain/execution/testing/mock_execution_chain.go +++ b/beacon-chain/execution/testing/mock_execution_chain.go @@ -9,10 +9,10 @@ import ( "net/http/httptest" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" gethTypes "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/ethclient/simulated" "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v5/async/event" @@ -141,7 +141,7 @@ func (m *Chain) ETH1ConnectionErrors() []error { // RPCClient defines the mock rpc client. type RPCClient struct { - Backend *backends.SimulatedBackend + Backend *simulated.Backend BlockNumMap map[uint64]*types.HeaderInfo } @@ -195,7 +195,7 @@ func (r *RPCClient) CallContext(ctx context.Context, obj interface{}, methodName return err } } - h, err := r.Backend.HeaderByNumber(ctx, num) + h, err := r.Backend.Client().HeaderByNumber(ctx, num) if err != nil { return err } @@ -213,7 +213,7 @@ func (r *RPCClient) CallContext(ctx context.Context, obj interface{}, methodName if !ok { return errors.Errorf("wrong argument type provided: %T", args[0]) } - h, err := r.Backend.HeaderByHash(ctx, val) + h, err := r.Backend.Client().HeaderByHash(ctx, val) if err != nil { return err } @@ -241,7 +241,7 @@ func (r *RPCClient) BatchCall(b []rpc.BatchElem) error { if err != nil { return err } - h, err := r.Backend.HeaderByNumber(context.Background(), num) + h, err := r.Backend.Client().HeaderByNumber(context.Background(), num) if err != nil { return err } diff --git a/cmd/beacon-chain/main.go b/cmd/beacon-chain/main.go index 0f3a42547615..1ac4f37d56c3 100644 --- a/cmd/beacon-chain/main.go +++ b/cmd/beacon-chain/main.go @@ -286,9 +286,7 @@ func startNode(ctx *cli.Context, cancel context.CancelFunc) error { // libp2p specific logging. golog.SetAllLoggers(golog.LevelDebug) // Geth specific logging. - glogger := gethlog.NewGlogHandler(gethlog.StreamHandler(os.Stderr, gethlog.TerminalFormat(true))) - glogger.Verbosity(gethlog.LvlTrace) - gethlog.Root().SetHandler(glogger) + gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LvlTrace, true))) } blockchainFlagOpts, err := blockchaincmd.FlagOptions(ctx) diff --git a/contracts/deposit/mock/BUILD.bazel b/contracts/deposit/mock/BUILD.bazel index 6ad8a6115305..328ec2ad63f5 100644 --- a/contracts/deposit/mock/BUILD.bazel +++ b/contracts/deposit/mock/BUILD.bazel @@ -10,10 +10,9 @@ go_library( "//contracts/deposit:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", - "@com_github_ethereum_go_ethereum//accounts/abi/bind/backends:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", - "@com_github_ethereum_go_ethereum//core:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", "@com_github_ethereum_go_ethereum//crypto:go_default_library", + "@com_github_ethereum_go_ethereum//ethclient/simulated:go_default_library", ], ) diff --git a/contracts/deposit/mock/mock.go b/contracts/deposit/mock/mock.go index 7e15eeed77b7..030482a2780d 100644 --- a/contracts/deposit/mock/mock.go +++ b/contracts/deposit/mock/mock.go @@ -8,11 +8,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/ethclient/simulated" "github.com/prysmaticlabs/prysm/v5/contracts/deposit" ) @@ -28,13 +27,13 @@ type TestAccount struct { Addr common.Address ContractAddr common.Address Contract *deposit.DepositContract - Backend *backends.SimulatedBackend + Backend *simulated.Backend TxOpts *bind.TransactOpts } // Setup creates the simulated backend with the deposit contract deployed func Setup() (*TestAccount, error) { - genesis := make(core.GenesisAlloc) + genesis := make(types.GenesisAlloc) privKey, err := crypto.GenerateKey() if err != nil { return nil, err @@ -55,10 +54,10 @@ func Setup() (*TestAccount, error) { return nil, err } startingBalance, _ := new(big.Int).SetString("100000000000000000000000000000000000000", 10) - genesis[addr] = core.GenesisAccount{Balance: startingBalance} - backend := backends.NewSimulatedBackend(genesis, 210000000000) + genesis[addr] = types.Account{Balance: startingBalance} + backend := simulated.NewBackend(genesis, simulated.WithBlockGasLimit(210000000000)) - contractAddr, _, contract, err := DeployDepositContract(txOpts, backend) + contractAddr, _, contract, err := DeployDepositContract(txOpts, backend.Client()) if err != nil { return nil, err } From 2fb15996a41d660c91f2b5f19f13069ed1c7064a Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 19 Aug 2024 16:05:06 -0500 Subject: [PATCH 07/49] fixing time issues --- beacon-chain/execution/block_reader_test.go | 12 ++++++++++-- beacon-chain/execution/log_processing_test.go | 2 +- beacon-chain/execution/service_test.go | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/beacon-chain/execution/block_reader_test.go b/beacon-chain/execution/block_reader_test.go index d84f6cbf047c..10d10b81590a 100644 --- a/beacon-chain/execution/block_reader_test.go +++ b/beacon-chain/execution/block_reader_test.go @@ -12,6 +12,7 @@ import ( dbutil "github.com/prysmaticlabs/prysm/v5/beacon-chain/db/testing" mockExecution "github.com/prysmaticlabs/prysm/v5/beacon-chain/execution/testing" "github.com/prysmaticlabs/prysm/v5/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v5/config/params" contracts "github.com/prysmaticlabs/prysm/v5/contracts/deposit" "github.com/prysmaticlabs/prysm/v5/contracts/deposit/mock" "github.com/prysmaticlabs/prysm/v5/testing/assert" @@ -204,6 +205,7 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { ctx := context.Background() beaconDB := dbutil.SetupDB(t) testAcc, err := mock.Setup() + require.NoError(t, err, "Unable to set up simulated backend") server, endpoint, err := mockExecution.SetupRPCServer() require.NoError(t, err) @@ -217,7 +219,13 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { require.NoError(t, err) web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - + // simulated backend sets eth1 block + params.SetupTestConfigCleanup(t) + conf := params.BeaconConfig().Copy() + conf.SecondsPerETH1Block = 1 + params.OverrideBeaconConfig(conf) + initialHead, err := testAcc.Backend.Client().HeaderByNumber(ctx, nil) + require.NoError(t, err) for i := 0; i < 200; i++ { testAcc.Backend.Commit() } @@ -226,7 +234,7 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { require.NoError(t, err) web3Service.latestEth1Data.BlockTime = hd.Time web3Service.latestEth1Data.BlockHeight = hd.Number.Uint64() - blk, err := web3Service.BlockByTimestamp(ctx, 1000 /* time */) + blk, err := web3Service.BlockByTimestamp(ctx, initialHead.Time+100 /* time */) require.NoError(t, err) if blk.Number.Cmp(big.NewInt(0)) == 0 { t.Error("Returned a block with zero number, expected to be non zero") diff --git a/beacon-chain/execution/log_processing_test.go b/beacon-chain/execution/log_processing_test.go index d456b97a3730..c7f46239d71b 100644 --- a/beacon-chain/execution/log_processing_test.go +++ b/beacon-chain/execution/log_processing_test.go @@ -411,7 +411,7 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { web3Service.latestEth1Data.BlockTime = block.Time() bConfig := params.MinimalSpecConfig().Copy() bConfig.MinGenesisTime = 0 - bConfig.SecondsPerETH1Block = 10 + bConfig.SecondsPerETH1Block = 1 params.OverrideBeaconConfig(bConfig) nConfig := params.BeaconNetworkConfig() nConfig.ContractDeploymentBlock = 0 diff --git a/beacon-chain/execution/service_test.go b/beacon-chain/execution/service_test.go index a372503b3bd1..506b6d2fc946 100644 --- a/beacon-chain/execution/service_test.go +++ b/beacon-chain/execution/service_test.go @@ -205,10 +205,9 @@ func TestFollowBlock_OK(t *testing.T) { require.NoError(t, err, "unable to setup web3 ETH1.0 chain service") // simulated backend sets eth1 block - // time as 10 seconds params.SetupTestConfigCleanup(t) conf := params.BeaconConfig().Copy() - conf.SecondsPerETH1Block = 10 + conf.SecondsPerETH1Block = 1 params.OverrideBeaconConfig(conf) web3Service = setDefaultMocks(web3Service) From dc92e956a0863cb37f15960fc9073ac82ae0d286 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 19 Aug 2024 16:46:32 -0500 Subject: [PATCH 08/49] gaz --- beacon-chain/execution/BUILD.bazel | 3 +++ 1 file changed, 3 insertions(+) diff --git a/beacon-chain/execution/BUILD.bazel b/beacon-chain/execution/BUILD.bazel index 5013dbaa0c60..a09383fff8b2 100644 --- a/beacon-chain/execution/BUILD.bazel +++ b/beacon-chain/execution/BUILD.bazel @@ -97,8 +97,11 @@ go_test( deps = [ "//async/event:go_default_library", "//beacon-chain/cache/depositsnapshot:go_default_library", + "//beacon-chain/core/feed:go_default_library", + "//beacon-chain/core/feed/state:go_default_library", "//beacon-chain/core/helpers:go_default_library", "//beacon-chain/core/signing:go_default_library", + "//beacon-chain/db:go_default_library", "//beacon-chain/db/testing:go_default_library", "//beacon-chain/execution/testing:go_default_library", "//beacon-chain/execution/types:go_default_library", From b7e326e1847ae605d2876faa66f11a8ae602ddb7 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 19 Aug 2024 17:26:28 -0500 Subject: [PATCH 09/49] fixing test and upgrading some dependencies and reverting others --- contracts/deposit/contract_test.go | 2 +- deps.bzl | 54 +++++++++++++++++------------- go.mod | 14 ++++---- go.sum | 28 +++++++++------- 4 files changed, 54 insertions(+), 44 deletions(-) diff --git a/contracts/deposit/contract_test.go b/contracts/deposit/contract_test.go index d163d07e6bba..892d36df8ee4 100644 --- a/contracts/deposit/contract_test.go +++ b/contracts/deposit/contract_test.go @@ -67,7 +67,7 @@ func TestValidatorRegister_OK(t *testing.T) { }, } - logs, err := testAccount.Backend.FilterLogs(context.Background(), query) + logs, err := testAccount.Backend.Client().FilterLogs(context.Background(), query) assert.NoError(t, err, "Unable to get logs of deposit contract") merkleTreeIndex := make([]uint64, 5) diff --git a/deps.bzl b/deps.bzl index f5897381cf7c..74b140f7d629 100644 --- a/deps.bzl +++ b/deps.bzl @@ -645,8 +645,8 @@ def prysm_deps(): go_repository( name = "com_github_crate_crypto_go_ipa", importpath = "github.com/crate-crypto/go-ipa", - sum = "h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ=", - version = "v0.0.0-20231025140028-3c0104f4b233", + sum = "h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=", + version = "v0.0.0-20240223125850-b1e8a79f509c", ) go_repository( name = "com_github_crate_crypto_go_kzg_4844", @@ -879,8 +879,14 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:5zvnAqLtnCZrU9uod1JCvHWJbPMURzYFHfc2eHz4PHA=", - version = "v1.14.3", + sum = "h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=", + version = "v1.14.8", + ) + go_repository( + name = "com_github_ethereum_go_verkle", + importpath = "github.com/ethereum/go-verkle", + sum = "h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=", + version = "v0.1.1-0.20240306133620-7d920df305f0", ) go_repository( name = "com_github_evanphx_json_patch", @@ -909,8 +915,8 @@ def prysm_deps(): go_repository( name = "com_github_ferranbt_fastssz", importpath = "github.com/ferranbt/fastssz", - sum = "h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=", - version = "v0.1.2", + sum = "h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo=", + version = "v0.1.3", ) go_repository( name = "com_github_fjl_gencodec", @@ -921,8 +927,8 @@ def prysm_deps(): go_repository( name = "com_github_fjl_memsize", importpath = "github.com/fjl/memsize", - sum = "h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=", - version = "v0.0.2", + sum = "h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=", + version = "v0.0.0-20190710130421-bcb5799ab5e5", ) go_repository( name = "com_github_flosch_pongo2_v4", @@ -1661,8 +1667,8 @@ def prysm_deps(): go_repository( name = "com_github_herumi_bls_eth_go_binary", importpath = "github.com/herumi/bls-eth-go-binary", - sum = "h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk=", - version = "v0.0.0-20210917013441-d37c07cfda4e", + sum = "h1:9eeW3EA4epCb7FIHt2luENpAW69MvKGL5jieHlBiP+w=", + version = "v1.31.0", ) go_repository( name = "com_github_holiman_billy", @@ -1924,12 +1930,6 @@ def prysm_deps(): sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", version = "v1.0.1-0.20240306101548-573246063e52", ) - go_repository( - name = "com_github_karalabe_usb", - importpath = "github.com/karalabe/usb", - sum = "h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs=", - version = "v0.0.3-0.20230711191512-61db3e06439c", - ) go_repository( name = "com_github_kataras_blocks", importpath = "github.com/kataras/blocks", @@ -2400,8 +2400,8 @@ def prysm_deps(): go_repository( name = "com_github_mitchellh_mapstructure", importpath = "github.com/mitchellh/mapstructure", - sum = "h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=", - version = "v1.4.1", + sum = "h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=", + version = "v1.5.0", ) go_repository( name = "com_github_mitchellh_pointerstructure", @@ -3557,6 +3557,12 @@ def prysm_deps(): sum = "h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=", version = "v1.2.7", ) + go_repository( + name = "com_github_umbracle_gohashtree", + importpath = "github.com/umbracle/gohashtree", + sum = "h1:CQh33pStIp/E30b7TxDlXfM0145bn2e8boI30IxAhTg=", + version = "v0.0.2-alpha.0.20230207094856-5b775a815c10", + ) go_repository( name = "com_github_urfave_cli", importpath = "github.com/urfave/cli", @@ -3638,8 +3644,8 @@ def prysm_deps(): go_repository( name = "com_github_wealdtech_go_bytesutil", importpath = "github.com/wealdtech/go-bytesutil", - sum = "h1:ocEg3Ke2GkZ4vQw5lp46rmO+pfqCCTgq35gqOy8JKVc=", - version = "v1.1.1", + sum = "h1:TjuRzcG5KaPwaR5JB7L/OgJqMQWvlrblA1n0GfcXFSY=", + version = "v1.2.1", ) go_repository( name = "com_github_wealdtech_go_eth2_types_v2", @@ -3647,14 +3653,14 @@ def prysm_deps(): "gazelle:resolve go github.com/herumi/bls-eth-go-binary/bls @herumi_bls_eth_go_binary//:go_default_library", ], importpath = "github.com/wealdtech/go-eth2-types/v2", - sum = "h1:tiA6T88M6XQIbrV5Zz53l1G5HtRERcxQfmET225V4Ls=", - version = "v2.5.2", + sum = "h1:b5aXlNBLKgjAg/Fft9VvGlqAUCQMP5LzYhlHRrr4yPg=", + version = "v2.8.2", ) go_repository( name = "com_github_wealdtech_go_eth2_util", importpath = "github.com/wealdtech/go-eth2-util", - sum = "h1:2INPeOR35x5LdFFpSzyw954WzTD+DFyHe3yKlJnG5As=", - version = "v1.6.3", + sum = "h1:gq+JMrnadifyKadUr75wmfP7+usiqMu9t3VVoob5Dvo=", + version = "v1.8.2", ) go_repository( name = "com_github_wealdtech_go_eth2_wallet_encryptor_keystorev4", diff --git a/go.mod b/go.mod index 1f77d7773402..2ce6c09787c4 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 github.com/ethereum/go-ethereum v1.14.8 - github.com/fjl/memsize v0.0.2 + github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible @@ -36,7 +36,7 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d - github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e + github.com/herumi/bls-eth-go-binary v1.31.0 github.com/holiman/uint256 v1.3.1 github.com/ianlancetaylor/cgosymbolizer v0.0.0-20200424224625-be1b05b0b279 github.com/ipfs/go-log/v2 v2.5.1 @@ -81,8 +81,8 @@ require ( github.com/tyler-smith/go-bip39 v1.1.0 github.com/urfave/cli/v2 v2.27.1 github.com/uudashr/gocognit v1.0.5 - github.com/wealdtech/go-bytesutil v1.1.1 - github.com/wealdtech/go-eth2-util v1.6.3 + github.com/wealdtech/go-bytesutil v1.2.1 + github.com/wealdtech/go-eth2-util v1.8.2 github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3 go.etcd.io/bbolt v1.3.6 go.opencensus.io v0.24.0 @@ -138,7 +138,7 @@ require ( github.com/elastic/gosigar v0.14.2 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect - github.com/ferranbt/fastssz v0.1.2 // indirect + github.com/ferranbt/fastssz v0.1.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect @@ -190,7 +190,7 @@ require ( github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect - github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/pointerstructure v1.2.0 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -244,7 +244,7 @@ require ( github.com/tklauser/go-sysconf v0.3.13 // indirect github.com/tklauser/numcpus v0.7.0 // indirect github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect - github.com/wealdtech/go-eth2-types/v2 v2.5.2 // indirect + github.com/wealdtech/go-eth2-types/v2 v2.8.2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.uber.org/dig v1.17.1 // indirect diff --git a/go.sum b/go.sum index f74758a041ba..8e0158521227 100644 --- a/go.sum +++ b/go.sum @@ -278,10 +278,10 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= -github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= -github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= -github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= -github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= +github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= +github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= +github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -537,8 +537,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= -github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk= -github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= +github.com/herumi/bls-eth-go-binary v1.31.0 h1:9eeW3EA4epCb7FIHt2luENpAW69MvKGL5jieHlBiP+w= +github.com/herumi/bls-eth-go-binary v1.31.0/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= @@ -738,8 +738,9 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= @@ -1127,6 +1128,8 @@ github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2n github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10 h1:CQh33pStIp/E30b7TxDlXfM0145bn2e8boI30IxAhTg= +github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10/go.mod h1:x/Pa0FF5Te9kdrlZKJK82YmAkvL8+f989USgz6Jiw7M= 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= @@ -1139,12 +1142,13 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU= github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= -github.com/wealdtech/go-bytesutil v1.1.1 h1:ocEg3Ke2GkZ4vQw5lp46rmO+pfqCCTgq35gqOy8JKVc= -github.com/wealdtech/go-bytesutil v1.1.1/go.mod h1:jENeMqeTEU8FNZyDFRVc7KqBdRKSnJ9CCh26TcuNb9s= -github.com/wealdtech/go-eth2-types/v2 v2.5.2 h1:tiA6T88M6XQIbrV5Zz53l1G5HtRERcxQfmET225V4Ls= +github.com/wealdtech/go-bytesutil v1.2.1 h1:TjuRzcG5KaPwaR5JB7L/OgJqMQWvlrblA1n0GfcXFSY= +github.com/wealdtech/go-bytesutil v1.2.1/go.mod h1:RhUDUGT1F4UP4ydqbYp2MWJbAel3M+mKd057Pad7oag= github.com/wealdtech/go-eth2-types/v2 v2.5.2/go.mod h1:8lkNUbgklSQ4LZ2oMSuxSdR7WwJW3L9ge1dcoCVyzws= -github.com/wealdtech/go-eth2-util v1.6.3 h1:2INPeOR35x5LdFFpSzyw954WzTD+DFyHe3yKlJnG5As= -github.com/wealdtech/go-eth2-util v1.6.3/go.mod h1:0hFMj/qtio288oZFHmAbCnPQ9OB3c4WFzs5NVPKTY4k= +github.com/wealdtech/go-eth2-types/v2 v2.8.2 h1:b5aXlNBLKgjAg/Fft9VvGlqAUCQMP5LzYhlHRrr4yPg= +github.com/wealdtech/go-eth2-types/v2 v2.8.2/go.mod h1:IAz9Lz1NVTaHabQa+4zjk2QDKMv8LVYo0n46M9o/TXw= +github.com/wealdtech/go-eth2-util v1.8.2 h1:gq+JMrnadifyKadUr75wmfP7+usiqMu9t3VVoob5Dvo= +github.com/wealdtech/go-eth2-util v1.8.2/go.mod h1:/80GAK0K/3+PqUBZHvaOPd3b1sjHeimxQh1nrJzgaPk= github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3 h1:SxrDVSr+oXuT1x8kZt4uWqNCvv5xXEGV9zd7cuSrZS8= github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3/go.mod h1:qiIimacW5NhVRy8o+YxWo9YrecXqDAKKbL0+sOa0SJ4= github.com/wealdtech/go-eth2-wallet-types/v2 v2.8.2 h1:264/meVYWt1wFw6Mtn+xwkZkXjID42gNra4rycoiDXI= From d8b13a4733ebe0cf5ba6694e89895f45cda9d992 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Tue, 20 Aug 2024 12:26:40 -0500 Subject: [PATCH 10/49] Disable cgo in hid, delete old vendored usb library --- deps.bzl | 8 +- third_party/com_github_karalabe_hid.patch | 77 ++++++++++ third_party/usb/AUTHORS | 7 - third_party/usb/BUILD.bazel | 21 --- third_party/usb/LICENSE | 165 ---------------------- third_party/usb/README.md | 6 - third_party/usb/hid_disabled.go | 40 ------ third_party/usb/raw_disabled.go | 40 ------ third_party/usb/usb.go | 68 --------- third_party/usb/usb_disabled.go | 49 ------- third_party/usb/usb_test.go | 86 ----------- 11 files changed, 82 insertions(+), 485 deletions(-) create mode 100644 third_party/com_github_karalabe_hid.patch delete mode 100644 third_party/usb/AUTHORS delete mode 100644 third_party/usb/BUILD.bazel delete mode 100644 third_party/usb/LICENSE delete mode 100644 third_party/usb/README.md delete mode 100644 third_party/usb/hid_disabled.go delete mode 100644 third_party/usb/raw_disabled.go delete mode 100644 third_party/usb/usb.go delete mode 100644 third_party/usb/usb_disabled.go delete mode 100644 third_party/usb/usb_test.go diff --git a/deps.bzl b/deps.bzl index 74b140f7d629..00e6000e18a4 100644 --- a/deps.bzl +++ b/deps.bzl @@ -871,9 +871,6 @@ def prysm_deps(): ) go_repository( name = "com_github_ethereum_go_ethereum", - build_directives = [ - "gazelle:resolve go github.com/karalabe/usb @prysm//third_party/usb:go_default_library", - ], importpath = "github.com/ethereum/go-ethereum", patch_args = ["-p1"], patches = [ @@ -1929,6 +1926,11 @@ def prysm_deps(): importpath = "github.com/karalabe/hid", sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", version = "v1.0.1-0.20240306101548-573246063e52", + patch_args = ["-p1"], + patches = [ + # This patch disables the cgo aspects of this library. + "//third_party:com_github_karalabe_hid.patch", + ], ) go_repository( name = "com_github_kataras_blocks", diff --git a/third_party/com_github_karalabe_hid.patch b/third_party/com_github_karalabe_hid.patch new file mode 100644 index 000000000000..3768703835b9 --- /dev/null +++ b/third_party/com_github_karalabe_hid.patch @@ -0,0 +1,77 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 9be80a1..0e78457 100755 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -8,58 +8,7 @@ go_library( + srcs = [ + "hid.go", + "hid_disabled.go", +- "hid_enabled.go", +- "wchar.go", + ], +- cgo = True, +- clinkopts = select({ +- "@io_bazel_rules_go//go/platform:darwin": [ +- "-framework CoreFoundation -framework IOKit -lobjc", +- ], +- "@io_bazel_rules_go//go/platform:freebsd": [ +- "-lusb", +- ], +- "@io_bazel_rules_go//go/platform:linux": [ +- "-lrt", +- ], +- "@io_bazel_rules_go//go/platform:windows": [ +- "-lsetupapi", +- ], +- "//conditions:default": [], +- }), +- copts = select({ +- "@io_bazel_rules_go//go/platform:android": [ +- "-DDEFAULT_VISIBILITY=", +- "-DPOLL_NFDS_TYPE=int", +- "-Ihidapi/hidapi", +- "-Ilibusb/libusb -DOS_LINUX -D_GNU_SOURCE -DHAVE_SYS_TIME_H -DHAVE_CLOCK_GETTIME", +- ], +- "@io_bazel_rules_go//go/platform:darwin": [ +- "-DDEFAULT_VISIBILITY=", +- "-DOS_DARWIN -DHAVE_SYS_TIME_H", +- "-DPOLL_NFDS_TYPE=int", +- "-Ihidapi/hidapi", +- ], +- "@io_bazel_rules_go//go/platform:freebsd": [ +- "-DDEFAULT_VISIBILITY=", +- "-DOS_FREEBSD", +- "-DPOLL_NFDS_TYPE=int", +- "-Ihidapi/hidapi", +- ], +- "@io_bazel_rules_go//go/platform:linux": [ +- "-DDEFAULT_VISIBILITY=", +- "-DPOLL_NFDS_TYPE=int", +- "-Ihidapi/hidapi", +- "-Ilibusb/libusb -DOS_LINUX -D_GNU_SOURCE -DHAVE_SYS_TIME_H -DHAVE_CLOCK_GETTIME", +- ], +- "@io_bazel_rules_go//go/platform:windows": [ +- "-DDEFAULT_VISIBILITY=", +- "-DOS_WINDOWS", +- "-DPOLL_NFDS_TYPE=int", +- "-Ihidapi/hidapi", +- ], +- "//conditions:default": [], +- }), + importpath = "github.com/karalabe/hid", + visibility = ["//visibility:public"], + ) +diff --git a/hid_disabled.go b/hid_disabled.go +index fa2c504..0091853 100644 +--- a/hid_disabled.go ++++ b/hid_disabled.go +@@ -4,9 +4,6 @@ + // This file is released under the 3-clause BSD license. Note however that Linux + // support depends on libusb, released under GNU LGPL 2.1 or later. + +-//go:build (!freebsd && !linux && !darwin && !windows) || ios || !cgo +-// +build !freebsd,!linux,!darwin,!windows ios !cgo +- + package hid + + // Supported returns whether this platform is supported by the HID library or not. diff --git a/third_party/usb/AUTHORS b/third_party/usb/AUTHORS deleted file mode 100644 index bae45b3ec294..000000000000 --- a/third_party/usb/AUTHORS +++ /dev/null @@ -1,7 +0,0 @@ -Felix Lange -Guillaume Ballet -Jakob Weisblat -Martin Holst Swende -Mateusz MikoÅ‚ajczyk -Péter Szilágyi -Rosen Penev diff --git a/third_party/usb/BUILD.bazel b/third_party/usb/BUILD.bazel deleted file mode 100644 index a8a9d019ec2f..000000000000 --- a/third_party/usb/BUILD.bazel +++ /dev/null @@ -1,21 +0,0 @@ -load("@prysm//tools/go:def.bzl", "go_library", "go_test") - -# gazelle:prefix github.com/karalabe/usb - -go_library( - name = "go_default_library", - srcs = [ - "hid_disabled.go", - "raw_disabled.go", - "usb.go", - "usb_disabled.go", - ], - importpath = "github.com/karalabe/usb", - visibility = ["@com_github_ethereum_go_ethereum//:__subpackages__"], -) - -go_test( - name = "go_default_test", - srcs = ["usb_test.go"], - embed = [":go_default_library"], -) diff --git a/third_party/usb/LICENSE b/third_party/usb/LICENSE deleted file mode 100644 index 65c5ca88a67c..000000000000 --- a/third_party/usb/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/third_party/usb/README.md b/third_party/usb/README.md deleted file mode 100644 index a8f556681321..000000000000 --- a/third_party/usb/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# usb - -This is a copy of github.com/karalabe/usb, except that it is fully disabled. - -The current karalabe/usb library requires a bit of handwritten cc_library targets. -This library isn't used in Prysm anyway, so it is disabled for now. \ No newline at end of file diff --git a/third_party/usb/hid_disabled.go b/third_party/usb/hid_disabled.go deleted file mode 100644 index e8134ecb5fc2..000000000000 --- a/third_party/usb/hid_disabled.go +++ /dev/null @@ -1,40 +0,0 @@ -// usb - Self contained USB and HID library for Go -// Copyright 2017 The library Authors -// -// This library is free software: you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) any -// later version. -// -// The library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License along -// with the library. If not, see . - -package usb - -// HidDevice is a live HID USB connected device handle. On platforms that this file -// implements, the type lacks the actual HID device and all methods are noop. -type HidDevice struct { - DeviceInfo // Embed the infos for easier access -} - -// Close releases the HID USB device handle. On platforms that this file implements, -// the method is just a noop. -func (dev *HidDevice) Close() error { - return ErrUnsupportedPlatform -} - -// Write sends an output report to a HID device. On platforms that this file -// implements, the method just returns an error. -func (dev *HidDevice) Write(b []byte) (int, error) { - return 0, ErrUnsupportedPlatform -} - -// Read retrieves an input report from a HID device. On platforms that this file -// implements, the method just returns an error. -func (dev *HidDevice) Read(b []byte) (int, error) { - return 0, ErrUnsupportedPlatform -} diff --git a/third_party/usb/raw_disabled.go b/third_party/usb/raw_disabled.go deleted file mode 100644 index e00fa5878f11..000000000000 --- a/third_party/usb/raw_disabled.go +++ /dev/null @@ -1,40 +0,0 @@ -// usb - Self contained USB and HID library for Go -// Copyright 2017 The library Authors -// -// This library is free software: you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) any -// later version. -// -// The library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License along -// with the library. If not, see . - -package usb - -// RawDevice is a live raw USB connected device handle. On platforms that this file -// implements, the type lacks the actual USB device and all methods are noop. -type RawDevice struct { - DeviceInfo // Embed the infos for easier access -} - -// Close releases the USB device handle. On platforms that this file implements, -// the method is just a noop. -func (dev *RawDevice) Close() error { - return ErrUnsupportedPlatform -} - -// Write sends a binary blob to a USB device. On platforms that this file -// implements, the method just returns an error. -func (dev *RawDevice) Write(b []byte) (int, error) { - return 0, ErrUnsupportedPlatform -} - -// Read retrieves a binary blob from a USB device. On platforms that this file -// implements, the method just returns an error. -func (dev *RawDevice) Read(b []byte) (int, error) { - return 0, ErrUnsupportedPlatform -} diff --git a/third_party/usb/usb.go b/third_party/usb/usb.go deleted file mode 100644 index 96a1e2502c1b..000000000000 --- a/third_party/usb/usb.go +++ /dev/null @@ -1,68 +0,0 @@ -// usb - Self contained USB and HID library for Go -// Copyright 2019 The library Authors -// -// This library is free software: you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) any -// later version. -// -// The library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License along -// with the library. If not, see . - -// Package usb provide interfaces for generic USB devices. -package usb - -import "errors" - -// ErrDeviceClosed is returned for operations where the device closed before or -// during the execution. -var ErrDeviceClosed = errors.New("usb: device closed") - -// ErrUnsupportedPlatform is returned for all operations where the underlying -// operating system is not supported by the library. -var ErrUnsupportedPlatform = errors.New("usb: unsupported platform") - -// DeviceInfo contains all the information we know about a USB device. In case of -// HID devices, that might be a lot more extensive (empty fields for raw USB). -type DeviceInfo struct { - Path string // Platform-specific device path - VendorID uint16 // Device Vendor ID - ProductID uint16 // Device Product ID - Release uint16 // Device Release Number in binary-coded decimal, also known as Device Version Number - Serial string // Serial Number - Manufacturer string // Manufacturer String - Product string // Product string - UsagePage uint16 // Usage Page for this Device/Interface (Windows/Mac only) - Usage uint16 // Usage for this Device/Interface (Windows/Mac only) - - // The USB interface which this logical device - // represents. Valid on both Linux implementations - // in all cases, and valid on the Windows implementation - // only if the device contains more than one interface. - Interface int - - // Raw low level libusb endpoint data for simplified communication - rawDevice interface{} - rawPort *uint8 // Pointer to differentiate between unset and port 0 - rawReader *uint8 // Pointer to differentiate between unset and endpoint 0 - rawWriter *uint8 // Pointer to differentiate between unset and endpoint 0 -} - -// Device is a generic USB device interface. It may either be backed by a USB HID -// device or a low level raw (libusb) device. -type Device interface { - // Close releases the USB device handle. - Close() error - - // Write sends a binary blob to a USB device. For HID devices write uses reports, - // for low level USB write uses interrupt transfers. - Write(b []byte) (int, error) - - // Read retrieves a binary blob from a USB device. For HID devices read uses - // reports, for low level USB read uses interrupt transfers. - Read(b []byte) (int, error) -} diff --git a/third_party/usb/usb_disabled.go b/third_party/usb/usb_disabled.go deleted file mode 100644 index 6e4a30037a81..000000000000 --- a/third_party/usb/usb_disabled.go +++ /dev/null @@ -1,49 +0,0 @@ -// usb - Self contained USB and HID library for Go -// Copyright 2019 The library Authors -// -// This library is free software: you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) any -// later version. -// -// The library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License along -// with the library. If not, see . - -package usb - -// Supported returns whether this platform is supported by the USB library or not. -// The goal of this method is to allow programmatically handling platforms that do -// not support USB and not having to fall back to build constraints. -func Supported() bool { - return false -} - -// Enumerate returns a list of all the USB devices attached to the system which -// match the vendor and product id. On platforms that this file implements the -// function is a noop and returns an empty list always. -func Enumerate(vendorID uint16, productID uint16) ([]DeviceInfo, error) { - return nil, nil -} - -// EnumerateRaw returns a list of all the USB devices attached to the system which -// match the vendor and product id. On platforms that this file implements the -// function is a noop and returns an empty list always. -func EnumerateRaw(vendorID uint16, productID uint16) ([]DeviceInfo, error) { - return nil, nil -} - -// EnumerateHid returns a list of all the HID devices attached to the system which -// match the vendor and product id. On platforms that this file implements the -// function is a noop and returns an empty list always. -func EnumerateHid(vendorID uint16, productID uint16) ([]DeviceInfo, error) { - return nil, nil -} - -// Open connects to a previously discovered USB device. -func (info DeviceInfo) Open() (Device, error) { - return nil, ErrUnsupportedPlatform -} diff --git a/third_party/usb/usb_test.go b/third_party/usb/usb_test.go deleted file mode 100644 index c238c0af432f..000000000000 --- a/third_party/usb/usb_test.go +++ /dev/null @@ -1,86 +0,0 @@ -// usb - Self contained USB and HID library for Go -// Copyright 2017 The library Authors -// -// This library is free software: you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) any -// later version. -// -// The library is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License along -// with the library. If not, see . - -package usb - -import ( - "os" - "runtime" - "sync" - "testing" -) - -// Tests that HID enumeration can be called concurrently from multiple threads. -func TestThreadedEnumerateHid(t *testing.T) { - var pend sync.WaitGroup - for i := 0; i < 8; i++ { - pend.Add(1) - - go func(index int) { - defer pend.Done() - for j := 0; j < 512; j++ { - if _, err := EnumerateHid(uint16(index), 0); err != nil { - t.Errorf("thread %d, iter %d: failed to enumerate: %v", index, j, err) - } - } - }(i) - } - pend.Wait() -} - -// Tests that RAW enumeration can be called concurrently from multiple threads. -func TestThreadedEnumerateRaw(t *testing.T) { - // Travis does not have usbfs enabled in the Linux kernel - if os.Getenv("TRAVIS") != "" && runtime.GOOS == "linux" { - t.Skip("Linux on Travis doesn't have usbfs, skipping test") - } - // Yay, we can actually test this - var pend sync.WaitGroup - for i := 0; i < 8; i++ { - pend.Add(1) - - go func(index int) { - defer pend.Done() - for j := 0; j < 512; j++ { - if _, err := EnumerateRaw(uint16(index), 0); err != nil { - t.Errorf("thread %d, iter %d: failed to enumerate: %v", index, j, err) - } - } - }(i) - } - pend.Wait() -} - -// Tests that generic enumeration can be called concurrently from multiple threads. -func TestThreadedEnumerate(t *testing.T) { - // Travis does not have usbfs enabled in the Linux kernel - if os.Getenv("TRAVIS") != "" && runtime.GOOS == "linux" { - t.Skip("Linux on Travis doesn't have usbfs, skipping test") - } - var pend sync.WaitGroup - for i := 0; i < 8; i++ { - pend.Add(1) - - go func(index int) { - defer pend.Done() - for j := 0; j < 512; j++ { - if _, err := Enumerate(uint16(index), 0); err != nil { - t.Errorf("thread %d, iter %d: failed to enumerate: %v", index, j, err) - } - } - }(i) - } - pend.Wait() -} From 56b4ec125fdde297c18e1cc2914fcf29b3236b7c Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 17 Sep 2024 16:30:51 -0500 Subject: [PATCH 11/49] changelog --- CHANGELOG.md | 2 ++ go.mod | 2 +- go.sum | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d71b3efb074e..bdedadc56ba8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve - Updated k8s-io/client-go to v0.30.4 and k8s-io/apimachinery to v0.30.4 - Migrated tracing library from opencensus to opentelemetry for both the beacon node and validator. - Refactored light client code to make it more readable and make future PRs easier. +- updated geth to 1.14 ~ +- e2e tests start from post merge (bellatrix) ### Deprecated - `--disable-grpc-gateway` flag is deprecated due to grpc gateway removal. diff --git a/go.mod b/go.mod index 8c4ff4551d6f..5c57eb2310b3 100644 --- a/go.mod +++ b/go.mod @@ -245,7 +245,7 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tklauser/go-sysconf v0.3.13 // indirect github.com/tklauser/numcpus v0.7.0 // indirect - github.com/wealdtech/go-eth2-types/v2 v2.5.2 // indirect + github.com/wealdtech/go-eth2-types/v2 v2.8.2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opentelemetry.io/otel/metric v1.29.0 // indirect diff --git a/go.sum b/go.sum index 734685b5a62b..4114579e22ff 100644 --- a/go.sum +++ b/go.sum @@ -1612,6 +1612,7 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From c94326044ee1b157ce9432f455ffab3f8dbf0e7c Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 17 Sep 2024 16:39:25 -0500 Subject: [PATCH 12/49] rolling back dependencies --- deps.bzl | 52 ++++++++++++++++++++++++++-------------------------- go.mod | 3 --- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/deps.bzl b/deps.bzl index 74906ef4e408..1affbb59b534 100644 --- a/deps.bzl +++ b/deps.bzl @@ -451,14 +451,14 @@ def prysm_deps(): go_repository( name = "com_github_cncf_udpa_go", importpath = "github.com/cncf/udpa/go", - sum = "h1:cqQfy1jclcSy/FwLjemeg3SR1yaINm74aQyupQ0Bl8M=", - version = "v0.0.0-20201120205902-5459f2c99403", + sum = "h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=", + version = "v0.0.0-20220112060539-c52dc94e7fbe", ) go_repository( name = "com_github_cncf_xds_go", importpath = "github.com/cncf/xds/go", - sum = "h1:ga8SEFjZ60pxLcmhnThWgvH2wg8376yUJmPhEH4H3kw=", - version = "v0.0.0-20240423153145-555b57ec207b", + sum = "h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=", + version = "v0.0.0-20230607035331-e9ce68804cb4", ) go_repository( name = "com_github_cockroachdb_datadriven", @@ -759,14 +759,14 @@ def prysm_deps(): go_repository( name = "com_github_envoyproxy_go_control_plane", importpath = "github.com/envoyproxy/go-control-plane", - sum = "h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI=", - version = "v0.12.0", + sum = "h1:7T++XKzy4xg7PKy+bM+Sa9/oe1OC88yz2hXQUISoXfA=", + version = "v0.11.1-0.20230524094728-9239064ad72f", ) go_repository( name = "com_github_envoyproxy_protoc_gen_validate", importpath = "github.com/envoyproxy/protoc-gen-validate", - sum = "h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A=", - version = "v1.0.4", + sum = "h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=", + version = "v0.10.1", ) go_repository( name = "com_github_ethereum_c_kzg_4844", @@ -984,8 +984,8 @@ def prysm_deps(): go_repository( name = "com_github_go_errors_errors", importpath = "github.com/go-errors/errors", - sum = "h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=", - version = "v1.4.2", + sum = "h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=", + version = "v1.0.1", ) go_repository( name = "com_github_go_gl_glfw", @@ -1176,8 +1176,8 @@ def prysm_deps(): go_repository( name = "com_github_golang_glog", importpath = "github.com/golang/glog", - sum = "h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=", - version = "v1.2.1", + sum = "h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=", + version = "v1.1.0", ) go_repository( name = "com_github_golang_groupcache", @@ -1798,13 +1798,13 @@ def prysm_deps(): go_repository( name = "com_github_karalabe_hid", importpath = "github.com/karalabe/hid", - sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", - version = "v1.0.1-0.20240306101548-573246063e52", patch_args = ["-p1"], patches = [ # This patch disables the cgo aspects of this library. "//third_party:com_github_karalabe_hid.patch", ], + sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", + version = "v1.0.1-0.20240306101548-573246063e52", ) go_repository( name = "com_github_kataras_blocks", @@ -1947,14 +1947,14 @@ def prysm_deps(): go_repository( name = "com_github_labstack_echo_v4", importpath = "github.com/labstack/echo/v4", - sum = "h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA=", - version = "v4.10.0", + sum = "h1:LF5Iq7t/jrtUuSutNuiEWtB5eiHfZ5gSe2pcu5exjQw=", + version = "v4.2.1", ) go_repository( name = "com_github_labstack_gommon", importpath = "github.com/labstack/gommon", - sum = "h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=", - version = "v0.4.0", + sum = "h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=", + version = "v0.3.0", ) go_repository( name = "com_github_leanovate_gopter", @@ -2180,8 +2180,8 @@ def prysm_deps(): go_repository( name = "com_github_microcosm_cc_bluemonday", importpath = "github.com/microcosm-cc/bluemonday", - sum = "h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=", - version = "v1.0.23", + sum = "h1:SIYunPjnlXcW+gVfvm0IlSeR5U3WZUOLfVmqg85Go44=", + version = "v1.0.1", ) go_repository( name = "com_github_microsoft_go_winio", @@ -3424,8 +3424,8 @@ def prysm_deps(): go_repository( name = "com_github_valyala_fasttemplate", importpath = "github.com/valyala/fasttemplate", - sum = "h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=", - version = "v1.2.2", + sum = "h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=", + version = "v1.2.1", ) go_repository( name = "com_github_viant_assertly", @@ -3721,8 +3721,8 @@ def prysm_deps(): go_repository( name = "com_google_cloud_go_compute", importpath = "cloud.google.com/go/compute", - sum = "h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ=", - version = "v1.19.0", + sum = "h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY=", + version = "v1.19.1", ) go_repository( name = "com_google_cloud_go_compute_metadata", @@ -4674,8 +4674,8 @@ def prysm_deps(): name = "org_golang_google_grpc", build_file_proto_mode = "disable", importpath = "google.golang.org/grpc", - sum = "h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=", - version = "v1.65.0", + sum = "h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=", + version = "v1.56.3", ) go_repository( name = "org_golang_google_protobuf", diff --git a/go.mod b/go.mod index 5c57eb2310b3..e7207dc7c8b3 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/ethereum/go-ethereum v1.14.8 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.6.0 - github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -108,7 +107,6 @@ require ( require ( github.com/BurntSushi/toml v1.3.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect - github.com/Microsoft/go-winio v0.6.2 // indirect github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -142,7 +140,6 @@ require ( github.com/ferranbt/fastssz v0.1.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect - github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect From e47892d13fa07cad280a185e7863327e035318e2 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 17 Sep 2024 16:41:35 -0500 Subject: [PATCH 13/49] fixing go mod tidy --- go.mod | 3 +++ go.sum | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e7207dc7c8b3..5c57eb2310b3 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/ethereum/go-ethereum v1.14.8 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.6.0 + github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v4 v4.5.0 @@ -107,6 +108,7 @@ require ( require ( github.com/BurntSushi/toml v1.3.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -140,6 +142,7 @@ require ( github.com/ferranbt/fastssz v0.1.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect diff --git a/go.sum b/go.sum index 4114579e22ff..31c610159248 100644 --- a/go.sum +++ b/go.sum @@ -57,7 +57,6 @@ github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a h1:ZP github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240521060658-cbe8f24a510a/go.mod h1:mA17gdGp3hbLmAfumxZNT8Aru+L/OF4PAP8AY6Bzkow= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -242,7 +241,6 @@ github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4= github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= @@ -273,7 +271,6 @@ github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= @@ -1612,9 +1609,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 902d0295c187e60fa1ddb364c1aa2438256a5d83 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Mon, 23 Sep 2024 11:40:52 -0500 Subject: [PATCH 14/49] Geth v1.13.6 --- beacon-chain/rpc/prysm/v1alpha1/debug/server.go | 4 +--- cmd/beacon-chain/main.go | 4 +--- deps.bzl | 12 ++++++------ go.mod | 5 +++-- go.sum | 11 ++++++----- testing/endtoend/geth_deps.go | 1 - tools/bootnode/bootnode.go | 4 +--- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/beacon-chain/rpc/prysm/v1alpha1/debug/server.go b/beacon-chain/rpc/prysm/v1alpha1/debug/server.go index d6bd27b41e47..e565a645651a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/debug/server.go +++ b/beacon-chain/rpc/prysm/v1alpha1/debug/server.go @@ -56,9 +56,7 @@ func (_ *Server) SetLoggingLevel(_ context.Context, req *pbrpc.LoggingLevelReque // Libp2p specific logging. golog.SetAllLoggers(golog.LevelDebug) // Geth specific logging. - glogger := gethlog.NewGlogHandler(gethlog.StreamHandler(os.Stderr, gethlog.TerminalFormat(true))) - glogger.Verbosity(gethlog.LvlTrace) - gethlog.Root().SetHandler(glogger) + gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LvlTrace, true))) } return &empty.Empty{}, nil } diff --git a/cmd/beacon-chain/main.go b/cmd/beacon-chain/main.go index 57eb8928ac41..ca513a5fc540 100644 --- a/cmd/beacon-chain/main.go +++ b/cmd/beacon-chain/main.go @@ -285,9 +285,7 @@ func startNode(ctx *cli.Context, cancel context.CancelFunc) error { // libp2p specific logging. golog.SetAllLoggers(golog.LevelDebug) // Geth specific logging. - glogger := gethlog.NewGlogHandler(gethlog.StreamHandler(os.Stderr, gethlog.TerminalFormat(true))) - glogger.Verbosity(gethlog.LvlTrace) - gethlog.Root().SetHandler(glogger) + gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LvlTrace, true))) } blockchainFlagOpts, err := blockchaincmd.FlagOptions(ctx) diff --git a/deps.bzl b/deps.bzl index 47454080dd1e..8442ec6fdbb3 100644 --- a/deps.bzl +++ b/deps.bzl @@ -567,8 +567,8 @@ def prysm_deps(): go_repository( name = "com_github_crate_crypto_go_ipa", importpath = "github.com/crate-crypto/go-ipa", - sum = "h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0=", - version = "v0.0.0-20230601170251-1830d0757c80", + sum = "h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ=", + version = "v0.0.0-20231025140028-3c0104f4b233", ) go_repository( name = "com_github_crate_crypto_go_kzg_4844", @@ -771,8 +771,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk=", - version = "v1.13.5", + sum = "h1:TMlJ4t3TLVcnAMo2S8q+WocDLB6z496cYtkRyJJNNKQ=", + version = "v1.13.6", ) go_repository( name = "com_github_evanphx_json_patch", @@ -897,8 +897,8 @@ def prysm_deps(): go_repository( name = "com_github_gballet_go_verkle", importpath = "github.com/gballet/go-verkle", - sum = "h1:vMT47RYsrftsHSTQhqXwC3BYflo38OLC3Y4LtXtLyU0=", - version = "v0.0.0-20230607174250-df487255f46b", + sum = "h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE=", + version = "v0.1.1-0.20231031103413-a67434b50f46", ) go_repository( name = "com_github_gdamore_encoding", diff --git a/go.mod b/go.mod index f2a01cad02cc..a6a842a73aa5 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.13.5 + github.com/ethereum/go-ethereum v1.13.6 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 @@ -126,6 +126,7 @@ require ( 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/deckarep/golang-set/v2 v2.5.0 // indirect @@ -139,12 +140,12 @@ require ( github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect + github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect github.com/getsentry/sentry-go v0.25.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect - github.com/go-stack/stack v1.8.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/flock v0.8.1 // indirect diff --git a/go.sum b/go.sum index 90af6e2e4b5a..591b04f9ad9e 100644 --- a/go.sum +++ b/go.sum @@ -172,6 +172,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= +github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -233,8 +235,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.13.5 h1:U6TCRciCqZRe4FPXmy1sMGxTfuk8P7u2UoinF3VbaFk= -github.com/ethereum/go-ethereum v1.13.5/go.mod h1:yMTu38GSuyxaYzQMViqNmQ1s3cE84abZexQmTgenWk0= +github.com/ethereum/go-ethereum v1.13.6 h1:TMlJ4t3TLVcnAMo2S8q+WocDLB6z496cYtkRyJJNNKQ= +github.com/ethereum/go-ethereum v1.13.6/go.mod h1:kcRZmuzRn1lVejiFNTz4l4W7imnpq1bDAnuKS/RyhbQ= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -260,6 +262,8 @@ github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbY github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= +github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= @@ -309,8 +313,6 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= @@ -534,7 +536,6 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU= github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= diff --git a/testing/endtoend/geth_deps.go b/testing/endtoend/geth_deps.go index b021138818c7..d06d54c1bc50 100644 --- a/testing/endtoend/geth_deps.go +++ b/testing/endtoend/geth_deps.go @@ -12,7 +12,6 @@ import ( _ "github.com/ethereum/go-ethereum/eth" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/eth/downloader" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/ethclient" // Required for go-ethereum e2e. - _ "github.com/ethereum/go-ethereum/les" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/log" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/metrics" // Required for go-ethereum e2e. _ "github.com/ethereum/go-ethereum/node" // Required for go-ethereum e2e. diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index a95e5c2ad9f2..2a41f1755e74 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -81,9 +81,7 @@ func main() { logrus.SetLevel(logrus.DebugLevel) // Geth specific logging. - glogger := gethlog.NewGlogHandler(gethlog.StreamHandler(os.Stderr, gethlog.TerminalFormat(false))) - glogger.Verbosity(gethlog.LvlTrace) - gethlog.Root().SetHandler(glogger) + gethlog.SetDefault(gethlog.NewLogger(gethlog.NewTerminalHandlerWithLevel(os.Stderr, gethlog.LvlTrace, true))) log.Debug("Debug logging enabled.") } From 6e16bb5cd6b731bf0eafe5c95ef4e6649b9c0edd Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Mon, 23 Sep 2024 16:22:50 -0500 Subject: [PATCH 15/49] fix tests --- testing/assertions/assertions.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/assertions/assertions.go b/testing/assertions/assertions.go index 5bf5303967df..2329cd2ab0d1 100644 --- a/testing/assertions/assertions.go +++ b/testing/assertions/assertions.go @@ -138,7 +138,8 @@ func StringContains(loggerFn assertionLoggerFn, expected, actual string, flag bo // NoError asserts that error is nil. func NoError(loggerFn assertionLoggerFn, err error, msg ...interface{}) { // reflect.ValueOf is needed for nil instances of custom types implementing Error - if err != nil && !reflect.ValueOf(err).IsNil() { + v := reflect.ValueOf(err) + if err != nil && !(v.Kind() == reflect.Ptr && v.IsNil()) { errMsg := parseMsg("Unexpected error", msg...) _, file, line, _ := runtime.Caller(2) loggerFn("%s:%d %s: %v", filepath.Base(file), line, errMsg, err) From 95d2a70bcb7251191c027b38d4ef1b8fb400304b Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Tue, 24 Sep 2024 13:34:07 -0500 Subject: [PATCH 16/49] Add ping interval, set to 500ms for tests. This didnt work --- beacon-chain/p2p/broadcaster_test.go | 2 +- beacon-chain/p2p/config.go | 3 +++ beacon-chain/p2p/discovery.go | 1 + beacon-chain/p2p/discovery_test.go | 2 +- beacon-chain/p2p/fork_test.go | 3 ++- beacon-chain/p2p/service_test.go | 4 +++- beacon-chain/p2p/subnets_test.go | 2 +- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/beacon-chain/p2p/broadcaster_test.go b/beacon-chain/p2p/broadcaster_test.go index aa5253314440..6353abf5b3c5 100644 --- a/beacon-chain/p2p/broadcaster_test.go +++ b/beacon-chain/p2p/broadcaster_test.go @@ -210,7 +210,7 @@ func TestService_BroadcastAttestation(t *testing.T) { func TestService_BroadcastAttestationWithDiscoveryAttempts(t *testing.T) { // Setup bootnode. - cfg := &Config{} + cfg := &Config{PingInterval: testPingInterval} port := 2000 cfg.UDPPort = uint(port) _, pkey := createAddrAndPrivKey(t) diff --git a/beacon-chain/p2p/config.go b/beacon-chain/p2p/config.go index 3da7d055cbb2..5cc7e1386423 100644 --- a/beacon-chain/p2p/config.go +++ b/beacon-chain/p2p/config.go @@ -1,6 +1,8 @@ package p2p import ( + "time" + statefeed "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/state" "github.com/prysmaticlabs/prysm/v5/beacon-chain/db" "github.com/prysmaticlabs/prysm/v5/beacon-chain/startup" @@ -27,6 +29,7 @@ type Config struct { QUICPort uint TCPPort uint UDPPort uint + PingInterval time.Duration MaxPeers uint QueueSize uint AllowListCIDR string diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index 67341e73c674..08dda8993174 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -223,6 +223,7 @@ func (s *Service) createListener( dv5Cfg := discover.Config{ PrivateKey: privKey, Bootnodes: bootNodes, + PingInterval: s.cfg.PingInterval, } listener, err := discover.ListenV5(conn, localNode, dv5Cfg) diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index 8860a2d0fad5..4307c2392e7d 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -85,7 +85,7 @@ func TestStartDiscV5_DiscoverAllPeers(t *testing.T) { genesisTime := time.Now() genesisValidatorsRoot := make([]byte, 32) s := &Service{ - cfg: &Config{UDPPort: uint(port)}, + cfg: &Config{UDPPort: uint(port), PingInterval: testPingInterval}, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, } diff --git a/beacon-chain/p2p/fork_test.go b/beacon-chain/p2p/fork_test.go index d5780f719901..b46000aa4e13 100644 --- a/beacon-chain/p2p/fork_test.go +++ b/beacon-chain/p2p/fork_test.go @@ -125,7 +125,7 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { genesisTime := time.Now() genesisValidatorsRoot := make([]byte, 32) s := &Service{ - cfg: &Config{UDPPort: uint(port)}, + cfg: &Config{UDPPort: uint(port), PingInterval: testPingInterval}, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, } @@ -137,6 +137,7 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { cfg := &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), + PingInterval: testPingInterval, } var listeners []*discover.UDPv5 diff --git a/beacon-chain/p2p/service_test.go b/beacon-chain/p2p/service_test.go index c09ad1db6407..037ec8bac246 100644 --- a/beacon-chain/p2p/service_test.go +++ b/beacon-chain/p2p/service_test.go @@ -29,6 +29,8 @@ import ( logTest "github.com/sirupsen/logrus/hooks/test" ) +const testPingInterval = 500*time.Millisecond + type mockListener struct { localNode *enode.LocalNode } @@ -185,7 +187,7 @@ func TestListenForNewNodes(t *testing.T) { params.SetupTestConfigCleanup(t) // Setup bootnode. notifier := &mock.MockStateNotifier{} - cfg := &Config{StateNotifier: notifier} + cfg := &Config{StateNotifier: notifier, PingInterval: testPingInterval} port := 2000 cfg.UDPPort = uint(port) _, pkey := createAddrAndPrivKey(t) diff --git a/beacon-chain/p2p/subnets_test.go b/beacon-chain/p2p/subnets_test.go index 668324025d52..ed641269d26d 100644 --- a/beacon-chain/p2p/subnets_test.go +++ b/beacon-chain/p2p/subnets_test.go @@ -66,7 +66,7 @@ func TestStartDiscV5_FindPeersWithSubnet(t *testing.T) { genesisTime := time.Now() bootNodeService := &Service{ - cfg: &Config{UDPPort: 2000, TCPPort: 3000, QUICPort: 3000}, + cfg: &Config{UDPPort: 2000, TCPPort: 3000, QUICPort: 3000, PingInterval: testPingInterval}, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, } From 2c81dd95eca29f5518358697317209eef8130148 Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 15:15:06 +0800 Subject: [PATCH 17/49] Update to v1.14.8 --- beacon-chain/blockchain/kzg/validation.go | 7 +- beacon-chain/p2p/discovery.go | 4 +- beacon-chain/p2p/discovery_test.go | 5 + beacon-chain/p2p/fork_test.go | 2 +- beacon-chain/p2p/service_test.go | 2 +- deps.bzl | 144 +++++++++++++--------- go.mod | 49 ++++---- go.sum | 98 +++++++-------- 8 files changed, 172 insertions(+), 139 deletions(-) diff --git a/beacon-chain/blockchain/kzg/validation.go b/beacon-chain/blockchain/kzg/validation.go index 6689d59d4a38..dd0c6f6d00b0 100644 --- a/beacon-chain/blockchain/kzg/validation.go +++ b/beacon-chain/blockchain/kzg/validation.go @@ -20,16 +20,17 @@ func Verify(sidecars ...blocks.ROBlob) error { cmts := make([]GoKZG.KZGCommitment, len(sidecars)) proofs := make([]GoKZG.KZGProof, len(sidecars)) for i, sidecar := range sidecars { - blobs[i] = bytesToBlob(sidecar.Blob) + blobs[i] = *bytesToBlob(sidecar.Blob) cmts[i] = bytesToCommitment(sidecar.KzgCommitment) proofs[i] = bytesToKZGProof(sidecar.KzgProof) } return kzgContext.VerifyBlobKZGProofBatch(blobs, cmts, proofs) } -func bytesToBlob(blob []byte) (ret GoKZG.Blob) { +func bytesToBlob(blob []byte) *GoKZG.Blob { + var ret GoKZG.Blob copy(ret[:], blob) - return + return &ret } func bytesToCommitment(commitment []byte) (ret GoKZG.KZGCommitment) { diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index 08dda8993174..b16401f518b1 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -221,8 +221,8 @@ func (s *Service) createListener( } dv5Cfg := discover.Config{ - PrivateKey: privKey, - Bootnodes: bootNodes, + PrivateKey: privKey, + Bootnodes: bootNodes, PingInterval: s.cfg.PingInterval, } diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index 4307c2392e7d..e078be1ef84e 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -101,6 +101,11 @@ func TestStartDiscV5_DiscoverAllPeers(t *testing.T) { cfg := &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), + PingInterval: testPingInterval, + } + // Add another node to allow for more cross peer discovery. + if len(listeners) > 0 { + cfg.Discv5BootStrapAddrs = append(cfg.Discv5BootStrapAddrs, listeners[len(listeners)-1].Self().String()) } ipAddr, pkey := createAddrAndPrivKey(t) s = &Service{ diff --git a/beacon-chain/p2p/fork_test.go b/beacon-chain/p2p/fork_test.go index b46000aa4e13..8183faaf6214 100644 --- a/beacon-chain/p2p/fork_test.go +++ b/beacon-chain/p2p/fork_test.go @@ -137,7 +137,7 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { cfg := &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), - PingInterval: testPingInterval, + PingInterval: testPingInterval, } var listeners []*discover.UDPv5 diff --git a/beacon-chain/p2p/service_test.go b/beacon-chain/p2p/service_test.go index 037ec8bac246..16d60bcd0e47 100644 --- a/beacon-chain/p2p/service_test.go +++ b/beacon-chain/p2p/service_test.go @@ -29,7 +29,7 @@ import ( logTest "github.com/sirupsen/logrus/hooks/test" ) -const testPingInterval = 500*time.Millisecond +const testPingInterval = 100 * time.Millisecond type mockListener struct { localNode *enode.LocalNode diff --git a/deps.bzl b/deps.bzl index 8442ec6fdbb3..598e55f9f070 100644 --- a/deps.bzl +++ b/deps.bzl @@ -313,8 +313,8 @@ def prysm_deps(): go_repository( name = "com_github_btcsuite_btcd_btcec_v2", importpath = "github.com/btcsuite/btcd/btcec/v2", - sum = "h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=", - version = "v2.3.2", + sum = "h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=", + version = "v2.3.4", ) go_repository( name = "com_github_btcsuite_btcd_chaincfg_chainhash", @@ -470,8 +470,14 @@ def prysm_deps(): name = "com_github_cockroachdb_errors", build_file_proto_mode = "disable_global", importpath = "github.com/cockroachdb/errors", - sum = "h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8=", - version = "v1.11.1", + sum = "h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=", + version = "v1.11.3", + ) + go_repository( + name = "com_github_cockroachdb_fifo", + importpath = "github.com/cockroachdb/fifo", + sum = "h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=", + version = "v0.0.0-20240606204812-0bbfbd93a7ce", ) go_repository( name = "com_github_cockroachdb_logtags", @@ -482,8 +488,8 @@ def prysm_deps(): go_repository( name = "com_github_cockroachdb_pebble", importpath = "github.com/cockroachdb/pebble", - sum = "h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A=", - version = "v0.0.0-20230928194634-aa077af62593", + sum = "h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw=", + version = "v1.1.1", ) go_repository( name = "com_github_cockroachdb_redact", @@ -491,12 +497,6 @@ def prysm_deps(): sum = "h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=", version = "v1.1.5", ) - go_repository( - name = "com_github_cockroachdb_sentry_go", - importpath = "github.com/cockroachdb/sentry-go", - sum = "h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=", - version = "v0.6.1-cockroachdb.2", - ) go_repository( name = "com_github_cockroachdb_tokenbucket", importpath = "github.com/cockroachdb/tokenbucket", @@ -567,14 +567,14 @@ def prysm_deps(): go_repository( name = "com_github_crate_crypto_go_ipa", importpath = "github.com/crate-crypto/go-ipa", - sum = "h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ=", - version = "v0.0.0-20231025140028-3c0104f4b233", + sum = "h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=", + version = "v0.0.0-20240223125850-b1e8a79f509c", ) go_repository( name = "com_github_crate_crypto_go_kzg_4844", importpath = "github.com/crate-crypto/go-kzg-4844", - sum = "h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA=", - version = "v0.7.0", + sum = "h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI=", + version = "v1.0.0", ) go_repository( name = "com_github_creack_pty", @@ -615,8 +615,8 @@ def prysm_deps(): go_repository( name = "com_github_deckarep_golang_set_v2", importpath = "github.com/deckarep/golang-set/v2", - sum = "h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA=", - version = "v2.5.0", + sum = "h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=", + version = "v2.6.0", ) go_repository( name = "com_github_decred_dcrd_crypto_blake256", @@ -672,6 +672,12 @@ def prysm_deps(): sum = "h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=", version = "v0.5.0", ) + go_repository( + name = "com_github_donovanhide_eventsource", + importpath = "github.com/donovanhide/eventsource", + sum = "h1:C7t6eeMaEQVy6e8CarIhscYQlNmw5e3G36y7l7Y21Ao=", + version = "v0.0.0-20210830082556-c59027999da0", + ) go_repository( name = "com_github_dop251_goja", importpath = "github.com/dop251/goja", @@ -758,8 +764,8 @@ def prysm_deps(): importpath = "github.com/ethereum/c-kzg-4844", patch_args = ["-p1"], patches = ["//third_party:com_github_ethereum_c_kzg_4844.patch"], - sum = "h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=", - version = "v0.4.0", + sum = "h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=", + version = "v1.0.0", ) go_repository( name = "com_github_ethereum_go_ethereum", @@ -771,8 +777,14 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:TMlJ4t3TLVcnAMo2S8q+WocDLB6z496cYtkRyJJNNKQ=", - version = "v1.13.6", + sum = "h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=", + version = "v1.14.8", + ) + go_repository( + name = "com_github_ethereum_go_verkle", + importpath = "github.com/ethereum/go-verkle", + sum = "h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=", + version = "v0.1.1-0.20240306133620-7d920df305f0", ) go_repository( name = "com_github_evanphx_json_patch", @@ -783,8 +795,8 @@ def prysm_deps(): go_repository( name = "com_github_fatih_color", importpath = "github.com/fatih/color", - sum = "h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=", - version = "v1.13.0", + sum = "h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=", + version = "v1.16.0", ) go_repository( name = "com_github_fatih_structs", @@ -801,8 +813,8 @@ def prysm_deps(): go_repository( name = "com_github_ferranbt_fastssz", importpath = "github.com/ferranbt/fastssz", - sum = "h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM=", - version = "v0.0.0-20210120143747-11b9eff30ea9", + sum = "h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=", + version = "v0.1.2", ) go_repository( name = "com_github_fjl_gencodec", @@ -813,8 +825,8 @@ def prysm_deps(): go_repository( name = "com_github_fjl_memsize", importpath = "github.com/fjl/memsize", - sum = "h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=", - version = "v0.0.0-20190710130421-bcb5799ab5e5", + sum = "h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=", + version = "v0.0.2", ) go_repository( name = "com_github_flosch_pongo2_v4", @@ -909,8 +921,8 @@ def prysm_deps(): go_repository( name = "com_github_gdamore_tcell_v2", importpath = "github.com/gdamore/tcell/v2", - sum = "h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=", - version = "v2.6.0", + sum = "h1:I5LiGTQuwrysAt1KS9wg1yFfOI3arI3ucFrxtd/xqaA=", + version = "v2.7.0", ) go_repository( name = "com_github_getkin_kin_openapi", @@ -921,8 +933,8 @@ def prysm_deps(): go_repository( name = "com_github_getsentry_sentry_go", importpath = "github.com/getsentry/sentry-go", - sum = "h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI=", - version = "v0.25.0", + sum = "h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=", + version = "v0.27.0", ) go_repository( name = "com_github_ghemawat_stream", @@ -1193,8 +1205,8 @@ def prysm_deps(): go_repository( name = "com_github_golang_snappy", importpath = "github.com/golang/snappy", - sum = "h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=", - version = "v0.0.5-0.20220116011046-fa5810519dcb", + sum = "h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc=", + version = "v0.0.5-0.20231225225746-43d5d4cd4e0e", ) go_repository( name = "com_github_golangci_lint_1", @@ -1529,8 +1541,8 @@ def prysm_deps(): go_repository( name = "com_github_holiman_billy", importpath = "github.com/holiman/billy", - sum = "h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw=", - version = "v0.0.0-20230718173358-1c7e68d277a7", + sum = "h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=", + version = "v0.0.0-20240216141850-2abb0c79d3c4", ) go_repository( name = "com_github_holiman_bloomfilter_v2", @@ -1541,14 +1553,14 @@ def prysm_deps(): go_repository( name = "com_github_holiman_goevmlab", importpath = "github.com/holiman/goevmlab", - sum = "h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA=", - version = "v0.0.0-20231201084119-c73b3c97929c", + sum = "h1:MnqrjbCnYO6ImEJiqza1vTcSFJno9cErjWG9ONXJgoc=", + version = "v0.0.0-20240515165425-8414a52dc9d4", ) go_repository( name = "com_github_holiman_uint256", importpath = "github.com/holiman/uint256", - sum = "h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU=", - version = "v1.2.4", + sum = "h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs=", + version = "v1.3.1", ) go_repository( name = "com_github_hpcloud_tail", @@ -1775,10 +1787,10 @@ def prysm_deps(): version = "v0.0.0-20180517002512-3bf9e2903213", ) go_repository( - name = "com_github_karalabe_usb", - importpath = "github.com/karalabe/usb", - sum = "h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs=", - version = "v0.0.3-0.20230711191512-61db3e06439c", + name = "com_github_karalabe_hid", + importpath = "github.com/karalabe/hid", + sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", + version = "v1.0.1-0.20240306101548-573246063e52", ) go_repository( name = "com_github_kataras_blocks", @@ -2094,14 +2106,14 @@ def prysm_deps(): go_repository( name = "com_github_mariusvanderwijden_fuzzyvm", importpath = "github.com/MariusVanDerWijden/FuzzyVM", - sum = "h1:BwEuC3xavrv4HTUDH2fUrKgKooiH3Q/nSVnFGtnzpN0=", - version = "v0.0.0-20240209103030-ec53fa766bf8", + sum = "h1:RQtzNvriR3Yu5CvVBTJPwDmfItBT90TWZ3fFondhc08=", + version = "v0.0.0-20240516070431-7828990cad7d", ) go_repository( name = "com_github_mariusvanderwijden_tx_fuzz", importpath = "github.com/MariusVanDerWijden/tx-fuzz", - sum = "h1:QDTh0xHorSykJ4+2VccBADMeRAVUbnHaWrCPIMtN+Vc=", - version = "v1.3.3-0.20240227085032-f70dd7c85c97", + sum = "h1:Tq4lXivsR8mtoP4RpasUDIUpDLHfN1YhFge/kzrzK78=", + version = "v1.4.0", ) go_repository( name = "com_github_marten_seemann_tcp", @@ -2160,8 +2172,8 @@ def prysm_deps(): go_repository( name = "com_github_microsoft_go_winio", importpath = "github.com/Microsoft/go-winio", - sum = "h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=", - version = "v0.6.1", + sum = "h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=", + version = "v0.6.2", ) go_repository( name = "com_github_miekg_dns", @@ -2805,8 +2817,20 @@ def prysm_deps(): go_repository( name = "com_github_protolambda_bls12_381_util", importpath = "github.com/protolambda/bls12-381-util", - sum = "h1:cZC+usqsYgHtlBaGulVnZ1hfKAi8iWtujBnRLQE698c=", - version = "v0.0.0-20220416220906-d8552aa452c7", + sum = "h1:05DU2wJN7DTU7z28+Q+zejXkIsA/MF8JZQGhtBZZiWk=", + version = "v0.1.0", + ) + go_repository( + name = "com_github_protolambda_zrnt", + importpath = "github.com/protolambda/zrnt", + sum = "h1:KZ48T+3UhsPXNdtE/5QEvGc9DGjUaRI17nJaoznoIaM=", + version = "v0.32.2", + ) + go_repository( + name = "com_github_protolambda_ztyp", + importpath = "github.com/protolambda/ztyp", + sum = "h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY=", + version = "v0.2.2", ) go_repository( name = "com_github_prysmaticlabs_fastssz", @@ -2878,8 +2902,8 @@ def prysm_deps(): go_repository( name = "com_github_rivo_tview", importpath = "github.com/rivo/tview", - sum = "h1:7UMY2qN9VlcY+x9jlhpYe5Bf1zrdhvmfZyLMk2u65BM=", - version = "v0.0.0-20231126152417-33a1d271f2b6", + sum = "h1:QLKAX9JLJ9RJVjnywcVg/U8nKNZvdftCtJRv1qzALYI=", + version = "v0.0.0-20240118093911-742cf086196e", ) go_repository( name = "com_github_rivo_uniseg", @@ -3128,8 +3152,8 @@ def prysm_deps(): go_repository( name = "com_github_sirupsen_logrus", importpath = "github.com/sirupsen/logrus", - sum = "h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=", - version = "v1.9.0", + sum = "h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=", + version = "v1.9.3", ) go_repository( name = "com_github_smartystreets_assertions", @@ -3350,8 +3374,8 @@ def prysm_deps(): go_repository( name = "com_github_urfave_cli_v2", importpath = "github.com/urfave/cli/v2", - sum = "h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=", - version = "v2.26.0", + sum = "h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=", + version = "v2.27.1", ) go_repository( name = "com_github_urfave_negroni", @@ -4409,8 +4433,8 @@ def prysm_deps(): go_repository( name = "in_gopkg_natefinch_lumberjack_v2", importpath = "gopkg.in/natefinch/lumberjack.v2", - sum = "h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=", - version = "v2.0.0", + sum = "h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=", + version = "v2.2.1", ) go_repository( name = "in_gopkg_redis_v4", diff --git a/go.mod b/go.mod index a6a842a73aa5..1ea2bbe84c81 100644 --- a/go.mod +++ b/go.mod @@ -5,19 +5,19 @@ go 1.22.0 toolchain go1.22.4 require ( - github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 - github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 + github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d + github.com/MariusVanDerWijden/tx-fuzz v1.4.0 github.com/aristanetworks/goarista v0.0.0-20200805130819-fd197cf57d96 github.com/bazelbuild/rules_go v0.23.2 - github.com/btcsuite/btcd/btcec/v2 v2.3.2 + github.com/btcsuite/btcd/btcec/v2 v2.3.4 github.com/consensys/gnark-crypto v0.12.1 - github.com/crate-crypto/go-kzg-4844 v0.7.0 + github.com/crate-crypto/go-kzg-4844 v1.0.0 github.com/d4l3k/messagediff v1.2.1 github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.13.6 - github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 + github.com/ethereum/go-ethereum v1.14.8 + github.com/fjl/memsize v0.0.2 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible @@ -25,7 +25,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/gddo v0.0.0-20200528160355-8d077c1d8f4c github.com/golang/protobuf v1.5.4 - github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb + github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e github.com/google/go-cmp v0.6.0 github.com/google/gofuzz v1.2.0 github.com/google/uuid v1.6.0 @@ -34,7 +34,7 @@ require ( github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e - github.com/holiman/uint256 v1.2.4 + github.com/holiman/uint256 v1.3.1 github.com/ianlancetaylor/cgosymbolizer v0.0.0-20200424224625-be1b05b0b279 github.com/ipfs/go-log/v2 v2.5.1 github.com/jedib0t/go-pretty/v6 v6.5.4 @@ -68,7 +68,7 @@ require ( github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294 github.com/rs/cors v1.7.0 github.com/schollz/progressbar/v3 v3.3.4 - github.com/sirupsen/logrus v1.9.0 + github.com/sirupsen/logrus v1.9.3 github.com/spf13/afero v1.10.0 github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.9.0 @@ -76,7 +76,7 @@ require ( github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279 github.com/tyler-smith/go-bip39 v1.1.0 - github.com/urfave/cli/v2 v2.26.0 + github.com/urfave/cli/v2 v2.27.1 github.com/uudashr/gocognit v1.0.5 github.com/wealdtech/go-bytesutil v1.1.1 github.com/wealdtech/go-eth2-util v1.6.3 @@ -108,7 +108,7 @@ require ( require ( github.com/BurntSushi/toml v1.3.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect - github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -117,31 +117,32 @@ require ( github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chzyer/readline v1.5.1 // indirect - github.com/cockroachdb/errors v1.11.1 // indirect + github.com/cockroachdb/errors v1.11.3 // indirect + github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect + github.com/cockroachdb/pebble v1.1.1 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect + github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect - github.com/deckarep/golang-set/v2 v2.5.0 // indirect + github.com/deckarep/golang-set/v2 v2.6.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/deepmap/oapi-codegen v1.8.2 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect github.com/elastic/gosigar v0.14.2 // indirect - github.com/ethereum/c-kzg-4844 v0.4.0 // indirect - github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 // indirect + github.com/ethereum/c-kzg-4844 v1.0.0 // indirect + github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect + github.com/ferranbt/fastssz v0.1.2 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect - github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect - github.com/getsentry/sentry-go v0.25.0 // indirect + github.com/getsentry/sentry-go v0.27.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect @@ -156,9 +157,9 @@ require ( github.com/graph-gophers/graphql-go v1.3.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect - github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect + github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c // indirect + github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 // indirect github.com/huin/goupnp v1.3.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect @@ -167,7 +168,7 @@ require ( github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a // indirect - github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c // indirect + github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 // indirect github.com/klauspost/compress v1.17.8 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/koron/go-ssdp v0.0.4 // indirect @@ -259,7 +260,7 @@ require ( golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.5.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect lukechampine.com/blake3 v1.2.1 // indirect rsc.io/tmplfunc v0.0.3 // indirect @@ -270,7 +271,7 @@ require ( require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf - github.com/fatih/color v1.13.0 // indirect + github.com/fatih/color v1.16.0 // indirect github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect diff --git a/go.sum b/go.sum index 591b04f9ad9e..50705ce7182c 100644 --- a/go.sum +++ b/go.sum @@ -51,12 +51,12 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8 h1:BwEuC3xavrv4HTUDH2fUrKgKooiH3Q/nSVnFGtnzpN0= -github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240209103030-ec53fa766bf8/go.mod h1:L1QpLBqXlboJMOC2hndG95d1eiElzKsBhjzcuy8pxeM= -github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97 h1:QDTh0xHorSykJ4+2VccBADMeRAVUbnHaWrCPIMtN+Vc= -github.com/MariusVanDerWijden/tx-fuzz v1.3.3-0.20240227085032-f70dd7c85c97/go.mod h1:xcjGtET6+7KeDHcwLQp3sIfyFALtoTjzZgY8Y+RUozM= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d h1:RQtzNvriR3Yu5CvVBTJPwDmfItBT90TWZ3fFondhc08= +github.com/MariusVanDerWijden/FuzzyVM v0.0.0-20240516070431-7828990cad7d/go.mod h1:gWTykV/ZinShgltWofTEJY4TsletuvGhB6l4+Ai2F+E= +github.com/MariusVanDerWijden/tx-fuzz v1.4.0 h1:Tq4lXivsR8mtoP4RpasUDIUpDLHfN1YhFge/kzrzK78= +github.com/MariusVanDerWijden/tx-fuzz v1.4.0/go.mod h1:gmOVECg7o5FY5VU3DQ/fY0zTk/ExBdMkUGz0vA8qqms= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -104,8 +104,8 @@ github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFS github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= -github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= -github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= +github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= @@ -141,12 +141,14 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= -github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= +github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I= +github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4= +github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= -github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= +github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= +github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -172,10 +174,10 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma 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/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 h1:d28BXYi+wUpz1KBmiF9bWrjEMacUEREV6MBi2ODnrfQ= -github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= -github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA= -github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= +github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I= +github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs= +github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI= +github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= @@ -186,8 +188,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU= github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U= -github.com/deckarep/golang-set/v2 v2.5.0 h1:hn6cEZtQ0h3J8kFrHR/NrzyOoTnjgW1+FmNJzQ7y/sA= -github.com/deckarep/golang-set/v2 v2.5.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM= +github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg= @@ -233,17 +235,20 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= -github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.13.6 h1:TMlJ4t3TLVcnAMo2S8q+WocDLB6z496cYtkRyJJNNKQ= -github.com/ethereum/go-ethereum v1.13.6/go.mod h1:kcRZmuzRn1lVejiFNTz4l4W7imnpq1bDAnuKS/RyhbQ= +github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= +github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig= +github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= +github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4= +github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9 h1:9VDpsWq096+oGMDTT/SgBD/VgZYf4pTF+KTPmZ+OaKM= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= -github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= +github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= +github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= +github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -262,12 +267,10 @@ github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbY github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays= github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= -github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= -github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= -github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps= +github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= @@ -372,8 +375,8 @@ github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= -github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc= +github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -484,14 +487,14 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= -github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c h1:J973NLskKmFIj3EGfpQ1ztUQKdwyJ+fG34638ief0eA= -github.com/holiman/goevmlab v0.0.0-20231201084119-c73b3c97929c/go.mod h1:K6KFgcQq1U9ksldcRyLYcwtj4nUTPn4rEaZtX4Gjofc= -github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= -github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= +github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4 h1:MnqrjbCnYO6ImEJiqza1vTcSFJno9cErjWG9ONXJgoc= +github.com/holiman/goevmlab v0.0.0-20240515165425-8414a52dc9d4/go.mod h1:3JURK6FtzpaEjCVxopnYN37phjHNI5gW9fhsKFF51Us= +github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs= +github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= @@ -539,8 +542,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= -github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs= -github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I= +github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52/go.mod h1:qk1sX/IBgppQNcGCRoj90u6EGC056EBoIc1oEjCWla8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -629,7 +632,6 @@ github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9v github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -972,8 +974,8 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1043,8 +1045,8 @@ github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3C 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.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI= -github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= +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/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= @@ -1639,8 +1641,8 @@ gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eR gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM= gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= From c468f650bf5258ff06639b0ccf7c4460faff9b39 Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 15:27:07 +0800 Subject: [PATCH 18/49] Spread it out to different bootnodes --- beacon-chain/p2p/fork_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/beacon-chain/p2p/fork_test.go b/beacon-chain/p2p/fork_test.go index 8183faaf6214..658813b57e01 100644 --- a/beacon-chain/p2p/fork_test.go +++ b/beacon-chain/p2p/fork_test.go @@ -37,6 +37,7 @@ func TestStartDiscv5_DifferentForkDigests(t *testing.T) { cfg: &Config{ UDPPort: uint(port), StateNotifier: &mock.MockStateNotifier{}, + PingInterval: testPingInterval, }, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, @@ -50,12 +51,16 @@ func TestStartDiscv5_DifferentForkDigests(t *testing.T) { Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), StateNotifier: &mock.MockStateNotifier{}, + PingInterval: testPingInterval, } var listeners []*discover.UDPv5 for i := 1; i <= 5; i++ { port := 3000 + i cfg.UDPPort = uint(port) + if len(listeners) > 0 { + cfg.Discv5BootStrapAddrs = []string{bootNode.String(), listeners[len(listeners)-1].Self().String()} + } ipAddr, pkey := createAddrAndPrivKey(t) // We give every peer a different genesis validators root, which @@ -145,7 +150,9 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { port := 3000 + i cfg.UDPPort = uint(port) ipAddr, pkey := createAddrAndPrivKey(t) - + if len(listeners) > 0 { + cfg.Discv5BootStrapAddrs = []string{bootNode.String(), listeners[len(listeners)-1].Self().String()} + } c := params.BeaconConfig().Copy() nextForkEpoch := primitives.Epoch(i) c.ForkVersionSchedule[[4]byte{'A', 'B', 'C', 'D'}] = nextForkEpoch From 2edc281b84a21bd60996a6f887a8843084bffd6f Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 15:31:14 +0800 Subject: [PATCH 19/49] Fix it --- beacon-chain/p2p/broadcaster_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/beacon-chain/p2p/broadcaster_test.go b/beacon-chain/p2p/broadcaster_test.go index 6353abf5b3c5..b4dc9b5b70e5 100644 --- a/beacon-chain/p2p/broadcaster_test.go +++ b/beacon-chain/p2p/broadcaster_test.go @@ -242,12 +242,16 @@ func TestService_BroadcastAttestationWithDiscoveryAttempts(t *testing.T) { cfg = &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, MaxPeers: 30, + PingInterval: testPingInterval, } // Setup 2 different hosts for i := 1; i <= 2; i++ { h, pkey, ipAddr := createHost(t, port+i) cfg.UDPPort = uint(port + i) cfg.TCPPort = uint(port + i) + if len(listeners) > 0 { + cfg.Discv5BootStrapAddrs = append(cfg.Discv5BootStrapAddrs, listeners[len(listeners)-1].Self().String()) + } s := &Service{ cfg: cfg, genesisTime: genesisTime, From 51935959d63de4e00a17ed0be3a40c1ece3a01ef Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 15:49:42 +0800 Subject: [PATCH 20/49] Remove Memsize --- deps.bzl | 6 ------ go.mod | 1 - go.sum | 2 -- runtime/debug/BUILD.bazel | 1 - runtime/debug/debug.go | 4 ---- 5 files changed, 14 deletions(-) diff --git a/deps.bzl b/deps.bzl index 598e55f9f070..3b7a5fd234fc 100644 --- a/deps.bzl +++ b/deps.bzl @@ -822,12 +822,6 @@ def prysm_deps(): sum = "h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=", version = "v0.0.0-20230517082657-f9840df7b83e", ) - go_repository( - name = "com_github_fjl_memsize", - importpath = "github.com/fjl/memsize", - sum = "h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA=", - version = "v0.0.2", - ) go_repository( name = "com_github_flosch_pongo2_v4", importpath = "github.com/flosch/pongo2/v4", diff --git a/go.mod b/go.mod index 1ea2bbe84c81..13978b7e026a 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 github.com/ethereum/go-ethereum v1.14.8 - github.com/fjl/memsize v0.0.2 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible diff --git a/go.sum b/go.sum index 50705ce7182c..ff75b7a25ae6 100644 --- a/go.sum +++ b/go.sum @@ -247,8 +247,6 @@ github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4Nij github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= -github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= -github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= diff --git a/runtime/debug/BUILD.bazel b/runtime/debug/BUILD.bazel index db34de5e7ed2..bd3d7bdcedc6 100644 --- a/runtime/debug/BUILD.bazel +++ b/runtime/debug/BUILD.bazel @@ -18,7 +18,6 @@ go_library( importpath = "github.com/prysmaticlabs/prysm/v5/runtime/debug", visibility = ["//visibility:public"], deps = [ - "@com_github_fjl_memsize//memsizeui:go_default_library", "@com_github_prometheus_client_golang//prometheus:go_default_library", "@com_github_prometheus_client_golang//prometheus/promauto:go_default_library", "@com_github_sirupsen_logrus//:go_default_library", diff --git a/runtime/debug/debug.go b/runtime/debug/debug.go index ab79ec4bece8..45c6994c5e02 100644 --- a/runtime/debug/debug.go +++ b/runtime/debug/debug.go @@ -37,7 +37,6 @@ import ( "sync" "time" - "github.com/fjl/memsize/memsizeui" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) @@ -45,8 +44,6 @@ import ( // Handler is the global debugging handler. var Handler = new(HandlerT) -// Memsize is the memsizeui Handler(?). -var Memsize memsizeui.Handler var ( // PProfFlag to enable pprof HTTP server. PProfFlag = &cli.BoolFlag{ @@ -351,7 +348,6 @@ func Setup(ctx *cli.Context) error { } func startPProf(address string) { - http.Handle("/memsize/", http.StripPrefix("/memsize", &Memsize)) log.WithField("addr", fmt.Sprintf("http://%s/debug/pprof", address)).Info("Starting pprof server") go func() { srv := &http.Server{ From 24001d36791c7674e75b99b573ad3c8a3e291a5d Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 15:54:49 +0800 Subject: [PATCH 21/49] Update all out of date dependencies --- deps.bzl | 18 ++++++++++++------ go.mod | 6 +++--- go.sum | 6 ++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/deps.bzl b/deps.bzl index 3b7a5fd234fc..1c17d162bb2a 100644 --- a/deps.bzl +++ b/deps.bzl @@ -813,8 +813,8 @@ def prysm_deps(): go_repository( name = "com_github_ferranbt_fastssz", importpath = "github.com/ferranbt/fastssz", - sum = "h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=", - version = "v0.1.2", + sum = "h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo=", + version = "v0.1.3", ) go_repository( name = "com_github_fjl_gencodec", @@ -1529,8 +1529,8 @@ def prysm_deps(): go_repository( name = "com_github_herumi_bls_eth_go_binary", importpath = "github.com/herumi/bls-eth-go-binary", - sum = "h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk=", - version = "v0.0.0-20210917013441-d37c07cfda4e", + sum = "h1:9eeW3EA4epCb7FIHt2luENpAW69MvKGL5jieHlBiP+w=", + version = "v1.31.0", ) go_repository( name = "com_github_holiman_billy", @@ -3359,6 +3359,12 @@ def prysm_deps(): sum = "h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=", version = "v1.2.7", ) + go_repository( + name = "com_github_umbracle_gohashtree", + importpath = "github.com/umbracle/gohashtree", + sum = "h1:CQh33pStIp/E30b7TxDlXfM0145bn2e8boI30IxAhTg=", + version = "v0.0.2-alpha.0.20230207094856-5b775a815c10", + ) go_repository( name = "com_github_urfave_cli", importpath = "github.com/urfave/cli", @@ -3449,8 +3455,8 @@ def prysm_deps(): "gazelle:resolve go github.com/herumi/bls-eth-go-binary/bls @herumi_bls_eth_go_binary//:go_default_library", ], importpath = "github.com/wealdtech/go-eth2-types/v2", - sum = "h1:tiA6T88M6XQIbrV5Zz53l1G5HtRERcxQfmET225V4Ls=", - version = "v2.5.2", + sum = "h1:b5aXlNBLKgjAg/Fft9VvGlqAUCQMP5LzYhlHRrr4yPg=", + version = "v2.8.2", ) go_repository( name = "com_github_wealdtech_go_eth2_util", diff --git a/go.mod b/go.mod index 13978b7e026a..ed2b850da559 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d - github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e + github.com/herumi/bls-eth-go-binary v1.31.0 github.com/holiman/uint256 v1.3.1 github.com/ianlancetaylor/cgosymbolizer v0.0.0-20200424224625-be1b05b0b279 github.com/ipfs/go-log/v2 v2.5.1 @@ -138,7 +138,7 @@ require ( github.com/elastic/gosigar v0.14.2 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect - github.com/ferranbt/fastssz v0.1.2 // indirect + github.com/ferranbt/fastssz v0.1.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/getsentry/sentry-go v0.27.0 // indirect @@ -244,7 +244,7 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tklauser/go-sysconf v0.3.13 // indirect github.com/tklauser/numcpus v0.7.0 // indirect - github.com/wealdtech/go-eth2-types/v2 v2.5.2 // indirect + github.com/wealdtech/go-eth2-types/v2 v2.8.2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opentelemetry.io/otel/metric v1.29.0 // indirect diff --git a/go.sum b/go.sum index ff75b7a25ae6..247eb90a811a 100644 --- a/go.sum +++ b/go.sum @@ -247,6 +247,8 @@ github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4Nij github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= +github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= +github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -485,6 +487,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk= github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= +github.com/herumi/bls-eth-go-binary v1.31.0 h1:9eeW3EA4epCb7FIHt2luENpAW69MvKGL5jieHlBiP+w= +github.com/herumi/bls-eth-go-binary v1.31.0/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= @@ -1056,6 +1060,8 @@ github.com/wealdtech/go-bytesutil v1.1.1 h1:ocEg3Ke2GkZ4vQw5lp46rmO+pfqCCTgq35gq github.com/wealdtech/go-bytesutil v1.1.1/go.mod h1:jENeMqeTEU8FNZyDFRVc7KqBdRKSnJ9CCh26TcuNb9s= github.com/wealdtech/go-eth2-types/v2 v2.5.2 h1:tiA6T88M6XQIbrV5Zz53l1G5HtRERcxQfmET225V4Ls= github.com/wealdtech/go-eth2-types/v2 v2.5.2/go.mod h1:8lkNUbgklSQ4LZ2oMSuxSdR7WwJW3L9ge1dcoCVyzws= +github.com/wealdtech/go-eth2-types/v2 v2.8.2 h1:b5aXlNBLKgjAg/Fft9VvGlqAUCQMP5LzYhlHRrr4yPg= +github.com/wealdtech/go-eth2-types/v2 v2.8.2/go.mod h1:IAz9Lz1NVTaHabQa+4zjk2QDKMv8LVYo0n46M9o/TXw= github.com/wealdtech/go-eth2-util v1.6.3 h1:2INPeOR35x5LdFFpSzyw954WzTD+DFyHe3yKlJnG5As= github.com/wealdtech/go-eth2-util v1.6.3/go.mod h1:0hFMj/qtio288oZFHmAbCnPQ9OB3c4WFzs5NVPKTY4k= github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3 h1:SxrDVSr+oXuT1x8kZt4uWqNCvv5xXEGV9zd7cuSrZS8= From d6af5a3fe1f8c2845a633c789fde4c04c7ca213f Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 16:02:40 +0800 Subject: [PATCH 22/49] Fix geth body change --- testing/middleware/builder/builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/middleware/builder/builder.go b/testing/middleware/builder/builder.go index a09569301de0..49a2bde85e71 100644 --- a/testing/middleware/builder/builder.go +++ b/testing/middleware/builder/builder.go @@ -798,7 +798,7 @@ func executableDataToBlock(params engine.ExecutableData, prevBeaconRoot []byte) pRoot := common.Hash(prevBeaconRoot) header.ParentBeaconRoot = &pRoot } - block := gethTypes.NewBlockWithHeader(header).WithBody(txs, nil /* uncles */).WithWithdrawals(params.Withdrawals) + block := gethTypes.NewBlockWithHeader(header).WithBody(gethTypes.Body{Transactions: txs, Uncles: nil, Withdrawals: params.Withdrawals}) return block, nil } From 8fd2ea695563f8f339b3ea5c9cfa76219a02eb14 Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 16:05:14 +0800 Subject: [PATCH 23/49] Fix Test --- beacon-chain/blockchain/kzg/validation_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beacon-chain/blockchain/kzg/validation_test.go b/beacon-chain/blockchain/kzg/validation_test.go index 832c6f5d79cc..6bb2cb4a531a 100644 --- a/beacon-chain/blockchain/kzg/validation_test.go +++ b/beacon-chain/blockchain/kzg/validation_test.go @@ -47,11 +47,11 @@ func GetRandBlob(seed int64) GoKZG.Blob { } func GenerateCommitmentAndProof(blob GoKZG.Blob) (GoKZG.KZGCommitment, GoKZG.KZGProof, error) { - commitment, err := kzgContext.BlobToKZGCommitment(blob, 0) + commitment, err := kzgContext.BlobToKZGCommitment(&blob, 0) if err != nil { return GoKZG.KZGCommitment{}, GoKZG.KZGProof{}, err } - proof, err := kzgContext.ComputeBlobKZGProof(blob, commitment, 0) + proof, err := kzgContext.ComputeBlobKZGProof(&blob, commitment, 0) if err != nil { return GoKZG.KZGCommitment{}, GoKZG.KZGProof{}, err } From 18d6b8a1f4a78464b75586fe543d54a0a9cb96fa Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 16:17:45 +0800 Subject: [PATCH 24/49] Fix Build --- testing/endtoend/components/eth1/transactions.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index 5426adae257d..f17980994671 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -342,17 +342,17 @@ func EncodeBlobs(data []byte) ([]kzg4844.Blob, []kzg4844.Commitment, []kzg4844.P versionedHashes []common.Hash ) for _, blob := range blobs { - commit, err := kzg4844.BlobToCommitment(blob) + commit, err := kzg4844.BlobToCommitment(&blob) if err != nil { return nil, nil, nil, nil, err } commits = append(commits, commit) - proof, err := kzg4844.ComputeBlobProof(blob, commit) + proof, err := kzg4844.ComputeBlobProof(&blob, commit) if err != nil { return nil, nil, nil, nil, err } - if err := kzg4844.VerifyBlobProof(blob, commit, proof); err != nil { + if err := kzg4844.VerifyBlobProof(&blob, commit, proof); err != nil { return nil, nil, nil, nil, err } proofs = append(proofs, proof) From 964695b7a734f8920603d250cc29a80fef3ea34f Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 16:41:43 +0800 Subject: [PATCH 25/49] Fix Tests --- beacon-chain/execution/log_processing_test.go | 28 +++++++++++----- beacon-chain/execution/service_test.go | 33 +++++++++++++------ 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/beacon-chain/execution/log_processing_test.go b/beacon-chain/execution/log_processing_test.go index 4120ca136f8e..bd6f3a935e5d 100644 --- a/beacon-chain/execution/log_processing_test.go +++ b/beacon-chain/execution/log_processing_test.go @@ -405,8 +405,10 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} web3Service.httpLogger = testAcc.Backend web3Service.latestEth1Data.LastRequestedBlock = 0 - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + hdr, err := testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time bConfig := params.MinimalSpecConfig().Copy() bConfig.MinGenesisTime = 0 bConfig.SecondsPerETH1Block = 10 @@ -444,8 +446,10 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { for i := uint64(0); i < params.BeaconConfig().Eth1FollowDistance; i++ { testAcc.Backend.Commit() } - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time // Set up our subscriber now to listen for the chain started event. stateChannel := make(chan *feed.Event, 1) @@ -502,8 +506,10 @@ func TestProcessETH2GenesisLog_LargePeriodOfNoLogs(t *testing.T) { web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} web3Service.httpLogger = testAcc.Backend web3Service.latestEth1Data.LastRequestedBlock = 0 - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + hdr, err := testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time bConfig := params.MinimalSpecConfig().Copy() bConfig.SecondsPerETH1Block = 10 params.OverrideBeaconConfig(bConfig) @@ -540,14 +546,18 @@ func TestProcessETH2GenesisLog_LargePeriodOfNoLogs(t *testing.T) { for i := uint64(0); i < 1500; i++ { testAcc.Backend.Commit() } - wantedGenesisTime := testAcc.Backend.Blockchain().CurrentBlock().Time + hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + wantedGenesisTime := hdr.Time // Forward the chain to account for the follow distance for i := uint64(0); i < params.BeaconConfig().Eth1FollowDistance; i++ { testAcc.Backend.Commit() } - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time // Set the genesis time 500 blocks ahead of the last // deposit log. diff --git a/beacon-chain/execution/service_test.go b/beacon-chain/execution/service_test.go index 32e8bc56dfa4..7b2b2b06a863 100644 --- a/beacon-chain/execution/service_test.go +++ b/beacon-chain/execution/service_test.go @@ -180,7 +180,9 @@ func TestService_Eth1Synced(t *testing.T) { web3Service.depositContractCaller, err = contracts.NewDepositContractCaller(testAcc.ContractAddr, testAcc.Backend) require.NoError(t, err) - currTime := testAcc.Backend.Blockchain().CurrentHeader().Time + hdr, err := testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + currTime := hdr.Time now := time.Now() assert.NoError(t, testAcc.Backend.AdjustTime(now.Sub(time.Unix(int64(currTime), 0)))) testAcc.Backend.Commit() @@ -211,14 +213,18 @@ func TestFollowBlock_OK(t *testing.T) { web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} - baseHeight := testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() + hdr, err := testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + baseHeight := hdr.Number.Uint64() // process follow_distance blocks for i := 0; i < int(params.BeaconConfig().Eth1FollowDistance); i++ { testAcc.Backend.Commit() } + hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) // set current height - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time h, err := web3Service.followedBlockHeight(context.Background()) require.NoError(t, err) @@ -229,9 +235,11 @@ func TestFollowBlock_OK(t *testing.T) { for i := uint64(0); i < numToForward; i++ { testAcc.Backend.Commit() } + hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) // set current height - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentBlock().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentBlock().Time + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time h, err = web3Service.followedBlockHeight(context.Background()) require.NoError(t, err) @@ -476,15 +484,20 @@ func TestNewService_EarliestVotingBlock(t *testing.T) { for i := 0; i < numToForward; i++ { testAcc.Backend.Commit() } - currTime := testAcc.Backend.Blockchain().CurrentHeader().Time + hdr, err := testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + currTime := hdr.Time now := time.Now() err = testAcc.Backend.AdjustTime(now.Sub(time.Unix(int64(currTime), 0))) require.NoError(t, err) testAcc.Backend.Commit() - currTime = testAcc.Backend.Blockchain().CurrentHeader().Time - web3Service.latestEth1Data.BlockHeight = testAcc.Backend.Blockchain().CurrentHeader().Number.Uint64() - web3Service.latestEth1Data.BlockTime = testAcc.Backend.Blockchain().CurrentHeader().Time + hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) + require.NoError(t, err) + + currTime = hdr.Time + web3Service.latestEth1Data.BlockHeight = hdr.Number.Uint64() + web3Service.latestEth1Data.BlockTime = hdr.Time web3Service.chainStartData.GenesisTime = currTime // With a current slot of zero, only request follow_blocks behind. From 14b4bb2ff95fb8bb92490a214cc9b97eaf2b491d Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 17:17:27 +0800 Subject: [PATCH 26/49] Fix Tests Again --- beacon-chain/blockchain/kzg/validation_test.go | 2 +- tools/bootnode/bootnode_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/beacon-chain/blockchain/kzg/validation_test.go b/beacon-chain/blockchain/kzg/validation_test.go index 6bb2cb4a531a..1210afdb0564 100644 --- a/beacon-chain/blockchain/kzg/validation_test.go +++ b/beacon-chain/blockchain/kzg/validation_test.go @@ -68,7 +68,7 @@ func TestBytesToAny(t *testing.T) { blob := GoKZG.Blob{0x01, 0x02} commitment := GoKZG.KZGCommitment{0x01, 0x02} proof := GoKZG.KZGProof{0x01, 0x02} - require.DeepEqual(t, blob, bytesToBlob(bytes)) + require.DeepEqual(t, blob, *bytesToBlob(bytes)) require.DeepEqual(t, commitment, bytesToCommitment(bytes)) require.DeepEqual(t, proof, bytesToKZGProof(bytes)) } diff --git a/tools/bootnode/bootnode_test.go b/tools/bootnode/bootnode_test.go index 6474fa244806..a36c2a24718e 100644 --- a/tools/bootnode/bootnode_test.go +++ b/tools/bootnode/bootnode_test.go @@ -31,7 +31,8 @@ func TestBootnode_OK(t *testing.T) { require.NoError(t, err) privKey := extractPrivateKey() cfg := discover.Config{ - PrivateKey: privKey, + PrivateKey: privKey, + PingInterval: 100 * time.Millisecond, } listener := createListener(ipAddr, 4000, cfg) defer listener.Close() From d36cefd16f2052374b3b20bfb21d102e7dd97e11 Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 18:28:43 +0800 Subject: [PATCH 27/49] Fix Tests Again --- beacon-chain/execution/log_processing_test.go | 8 +++++++- beacon-chain/execution/service_test.go | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/beacon-chain/execution/log_processing_test.go b/beacon-chain/execution/log_processing_test.go index bd6f3a935e5d..f53fba8da153 100644 --- a/beacon-chain/execution/log_processing_test.go +++ b/beacon-chain/execution/log_processing_test.go @@ -417,7 +417,7 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { nConfig.ContractDeploymentBlock = 0 params.OverrideBeaconNetworkConfig(nConfig) - testAcc.Backend.Commit() + assert.NoError(t, testAcc.Backend.AdjustTime(10*time.Second)) totalNumOfDeposits := depositsReqForChainStart + 30 @@ -440,11 +440,17 @@ func TestProcessETH2GenesisLog_CorrectNumOfDeposits(t *testing.T) { // 5 if (i+1)%8 == depositOffset { testAcc.Backend.Commit() + // Throw away error in case adjustment wasn't successful. + err = testAcc.Backend.AdjustTime(10 * time.Second) + _ = err } } // Forward the chain to account for the follow distance for i := uint64(0); i < params.BeaconConfig().Eth1FollowDistance; i++ { testAcc.Backend.Commit() + // Throw away error in case adjustment wasn't successful. + err = testAcc.Backend.AdjustTime(10 * time.Second) + _ = err } hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) require.NoError(t, err) diff --git a/beacon-chain/execution/service_test.go b/beacon-chain/execution/service_test.go index 7b2b2b06a863..f03cd7e87a9c 100644 --- a/beacon-chain/execution/service_test.go +++ b/beacon-chain/execution/service_test.go @@ -218,7 +218,9 @@ func TestFollowBlock_OK(t *testing.T) { baseHeight := hdr.Number.Uint64() // process follow_distance blocks for i := 0; i < int(params.BeaconConfig().Eth1FollowDistance); i++ { - testAcc.Backend.Commit() + // Throw away error in case adjustment wasn't successful. + err = testAcc.Backend.AdjustTime(10 * time.Second) + _ = err } hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) require.NoError(t, err) @@ -233,7 +235,9 @@ func TestFollowBlock_OK(t *testing.T) { expectedHeight := numToForward + baseHeight // forward 2 blocks for i := uint64(0); i < numToForward; i++ { - testAcc.Backend.Commit() + // Throw away error in case adjustment wasn't successful. + err = testAcc.Backend.AdjustTime(10 * time.Second) + _ = err } hdr, err = testAcc.Backend.Client.HeaderByNumber(context.Background(), nil) require.NoError(t, err) From 20c790bc761900721e516ce95291e689371404b1 Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 18:32:12 +0800 Subject: [PATCH 28/49] Fix Tests --- beacon-chain/execution/block_reader_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/beacon-chain/execution/block_reader_test.go b/beacon-chain/execution/block_reader_test.go index 6dbda1d2118f..b6a46d54c338 100644 --- a/beacon-chain/execution/block_reader_test.go +++ b/beacon-chain/execution/block_reader_test.go @@ -218,14 +218,16 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} for i := 0; i < 200; i++ { - testAcc.Backend.Commit() + // Throw away error in case adjustment wasn't successful. + err = testAcc.Backend.AdjustTime(10 * time.Second) + _ = err } ctx := context.Background() hd, err := testAcc.Backend.HeaderByNumber(ctx, nil) require.NoError(t, err) web3Service.latestEth1Data.BlockTime = hd.Time web3Service.latestEth1Data.BlockHeight = hd.Number.Uint64() - blk, err := web3Service.BlockByTimestamp(ctx, 1000 /* time */) + blk, err := web3Service.BlockByTimestamp(ctx, uint64(time.Now().Unix()) /* time */) require.NoError(t, err) if blk.Number.Cmp(big.NewInt(0)) == 0 { t.Error("Returned a block with zero number, expected to be non zero") From 277a3dd83f400490a7c3102a73701d8d8405a13c Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 18:33:29 +0800 Subject: [PATCH 29/49] Fix Test --- beacon-chain/execution/block_reader_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beacon-chain/execution/block_reader_test.go b/beacon-chain/execution/block_reader_test.go index b6a46d54c338..454527362e69 100644 --- a/beacon-chain/execution/block_reader_test.go +++ b/beacon-chain/execution/block_reader_test.go @@ -216,6 +216,7 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { require.NoError(t, err) web3Service = setDefaultMocks(web3Service) web3Service.rpcClient = &mockExecution.RPCClient{Backend: testAcc.Backend} + wantedTime := time.Now().Unix() + 100*10 for i := 0; i < 200; i++ { // Throw away error in case adjustment wasn't successful. @@ -227,7 +228,7 @@ func TestService_BlockNumberByTimestamp(t *testing.T) { require.NoError(t, err) web3Service.latestEth1Data.BlockTime = hd.Time web3Service.latestEth1Data.BlockHeight = hd.Number.Uint64() - blk, err := web3Service.BlockByTimestamp(ctx, uint64(time.Now().Unix()) /* time */) + blk, err := web3Service.BlockByTimestamp(ctx, uint64(wantedTime) /* time */) require.NoError(t, err) if blk.Number.Cmp(big.NewInt(0)) == 0 { t.Error("Returned a block with zero number, expected to be non zero") From f7224413ded27096bff108ff5eb6dcbbf64ffe24 Mon Sep 17 00:00:00 2001 From: nisdas Date: Wed, 25 Sep 2024 18:49:27 +0800 Subject: [PATCH 30/49] Copy USB Package for HID --- deps.bzl | 7 +- third_party/hid/AUTHORS | 7 ++ third_party/hid/BUILD.bazel | 21 ++++ third_party/hid/LICENSE | 165 ++++++++++++++++++++++++++++++++ third_party/hid/README.md | 6 ++ third_party/hid/hid_disabled.go | 40 ++++++++ third_party/hid/raw_disabled.go | 40 ++++++++ third_party/hid/usb.go | 68 +++++++++++++ third_party/hid/usb_disabled.go | 49 ++++++++++ third_party/hid/usb_test.go | 86 +++++++++++++++++ 10 files changed, 483 insertions(+), 6 deletions(-) create mode 100644 third_party/hid/AUTHORS create mode 100644 third_party/hid/BUILD.bazel create mode 100644 third_party/hid/LICENSE create mode 100644 third_party/hid/README.md create mode 100644 third_party/hid/hid_disabled.go create mode 100644 third_party/hid/raw_disabled.go create mode 100644 third_party/hid/usb.go create mode 100644 third_party/hid/usb_disabled.go create mode 100644 third_party/hid/usb_test.go diff --git a/deps.bzl b/deps.bzl index 1c17d162bb2a..c3ef9dac170a 100644 --- a/deps.bzl +++ b/deps.bzl @@ -771,6 +771,7 @@ def prysm_deps(): name = "com_github_ethereum_go_ethereum", build_directives = [ "gazelle:resolve go github.com/karalabe/usb @prysm//third_party/usb:go_default_library", + "gazelle:resolve go github.com/karalabe/hid @prysm//third_party/hid:go_default_library", ], importpath = "github.com/ethereum/go-ethereum", patch_args = ["-p1"], @@ -1780,12 +1781,6 @@ def prysm_deps(): sum = "h1:qGQQKEcAR99REcMpsXCp3lJ03zYT1PkRd3kQGPn9GVg=", version = "v0.0.0-20180517002512-3bf9e2903213", ) - go_repository( - name = "com_github_karalabe_hid", - importpath = "github.com/karalabe/hid", - sum = "h1:msKODTL1m0wigztaqILOtla9HeW1ciscYG4xjLtvk5I=", - version = "v1.0.1-0.20240306101548-573246063e52", - ) go_repository( name = "com_github_kataras_blocks", importpath = "github.com/kataras/blocks", diff --git a/third_party/hid/AUTHORS b/third_party/hid/AUTHORS new file mode 100644 index 000000000000..bae45b3ec294 --- /dev/null +++ b/third_party/hid/AUTHORS @@ -0,0 +1,7 @@ +Felix Lange +Guillaume Ballet +Jakob Weisblat +Martin Holst Swende +Mateusz MikoÅ‚ajczyk +Péter Szilágyi +Rosen Penev diff --git a/third_party/hid/BUILD.bazel b/third_party/hid/BUILD.bazel new file mode 100644 index 000000000000..5618968123af --- /dev/null +++ b/third_party/hid/BUILD.bazel @@ -0,0 +1,21 @@ +load("@prysm//tools/go:def.bzl", "go_library", "go_test") + +# gazelle:prefix github.com/karalabe/hid + +go_library( + name = "go_default_library", + srcs = [ + "hid_disabled.go", + "raw_disabled.go", + "usb.go", + "usb_disabled.go", + ], + importpath = "github.com/karalabe/hid", + visibility = ["@com_github_ethereum_go_ethereum//:__subpackages__"], +) + +go_test( + name = "go_default_test", + srcs = ["usb_test.go"], + embed = [":go_default_library"], +) diff --git a/third_party/hid/LICENSE b/third_party/hid/LICENSE new file mode 100644 index 000000000000..65c5ca88a67c --- /dev/null +++ b/third_party/hid/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/third_party/hid/README.md b/third_party/hid/README.md new file mode 100644 index 000000000000..a8f556681321 --- /dev/null +++ b/third_party/hid/README.md @@ -0,0 +1,6 @@ +# usb + +This is a copy of github.com/karalabe/usb, except that it is fully disabled. + +The current karalabe/usb library requires a bit of handwritten cc_library targets. +This library isn't used in Prysm anyway, so it is disabled for now. \ No newline at end of file diff --git a/third_party/hid/hid_disabled.go b/third_party/hid/hid_disabled.go new file mode 100644 index 000000000000..bfc1e8e9f023 --- /dev/null +++ b/third_party/hid/hid_disabled.go @@ -0,0 +1,40 @@ +// usb - Self contained USB and HID library for Go +// Copyright 2017 The library Authors +// +// This library is free software: you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// The library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License along +// with the library. If not, see . + +package hid + +// HidDevice is a live HID USB connected device handle. On platforms that this file +// implements, the type lacks the actual HID device and all methods are noop. +type HidDevice struct { + DeviceInfo // Embed the infos for easier access +} + +// Close releases the HID USB device handle. On platforms that this file implements, +// the method is just a noop. +func (dev *HidDevice) Close() error { + return ErrUnsupportedPlatform +} + +// Write sends an output report to a HID device. On platforms that this file +// implements, the method just returns an error. +func (dev *HidDevice) Write(b []byte) (int, error) { + return 0, ErrUnsupportedPlatform +} + +// Read retrieves an input report from a HID device. On platforms that this file +// implements, the method just returns an error. +func (dev *HidDevice) Read(b []byte) (int, error) { + return 0, ErrUnsupportedPlatform +} diff --git a/third_party/hid/raw_disabled.go b/third_party/hid/raw_disabled.go new file mode 100644 index 000000000000..bb11dbb7fcd7 --- /dev/null +++ b/third_party/hid/raw_disabled.go @@ -0,0 +1,40 @@ +// usb - Self contained USB and HID library for Go +// Copyright 2017 The library Authors +// +// This library is free software: you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// The library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License along +// with the library. If not, see . + +package hid + +// RawDevice is a live raw USB connected device handle. On platforms that this file +// implements, the type lacks the actual USB device and all methods are noop. +type RawDevice struct { + DeviceInfo // Embed the infos for easier access +} + +// Close releases the USB device handle. On platforms that this file implements, +// the method is just a noop. +func (dev *RawDevice) Close() error { + return ErrUnsupportedPlatform +} + +// Write sends a binary blob to a USB device. On platforms that this file +// implements, the method just returns an error. +func (dev *RawDevice) Write(b []byte) (int, error) { + return 0, ErrUnsupportedPlatform +} + +// Read retrieves a binary blob from a USB device. On platforms that this file +// implements, the method just returns an error. +func (dev *RawDevice) Read(b []byte) (int, error) { + return 0, ErrUnsupportedPlatform +} diff --git a/third_party/hid/usb.go b/third_party/hid/usb.go new file mode 100644 index 000000000000..4aa13353fe1c --- /dev/null +++ b/third_party/hid/usb.go @@ -0,0 +1,68 @@ +// usb - Self contained USB and HID library for Go +// Copyright 2019 The library Authors +// +// This library is free software: you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// The library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License along +// with the library. If not, see . + +// Package hid provide interfaces for generic USB devices. +package hid + +import "errors" + +// ErrDeviceClosed is returned for operations where the device closed before or +// during the execution. +var ErrDeviceClosed = errors.New("usb: device closed") + +// ErrUnsupportedPlatform is returned for all operations where the underlying +// operating system is not supported by the library. +var ErrUnsupportedPlatform = errors.New("usb: unsupported platform") + +// DeviceInfo contains all the information we know about a USB device. In case of +// HID devices, that might be a lot more extensive (empty fields for raw USB). +type DeviceInfo struct { + Path string // Platform-specific device path + VendorID uint16 // Device Vendor ID + ProductID uint16 // Device Product ID + Release uint16 // Device Release Number in binary-coded decimal, also known as Device Version Number + Serial string // Serial Number + Manufacturer string // Manufacturer String + Product string // Product string + UsagePage uint16 // Usage Page for this Device/Interface (Windows/Mac only) + Usage uint16 // Usage for this Device/Interface (Windows/Mac only) + + // The USB interface which this logical device + // represents. Valid on both Linux implementations + // in all cases, and valid on the Windows implementation + // only if the device contains more than one interface. + Interface int + + // Raw low level libusb endpoint data for simplified communication + rawDevice interface{} + rawPort *uint8 // Pointer to differentiate between unset and port 0 + rawReader *uint8 // Pointer to differentiate between unset and endpoint 0 + rawWriter *uint8 // Pointer to differentiate between unset and endpoint 0 +} + +// Device is a generic USB device interface. It may either be backed by a USB HID +// device or a low level raw (libusb) device. +type Device interface { + // Close releases the USB device handle. + Close() error + + // Write sends a binary blob to a USB device. For HID devices write uses reports, + // for low level USB write uses interrupt transfers. + Write(b []byte) (int, error) + + // Read retrieves a binary blob from a USB device. For HID devices read uses + // reports, for low level USB read uses interrupt transfers. + Read(b []byte) (int, error) +} diff --git a/third_party/hid/usb_disabled.go b/third_party/hid/usb_disabled.go new file mode 100644 index 000000000000..4f56a6a3ebe2 --- /dev/null +++ b/third_party/hid/usb_disabled.go @@ -0,0 +1,49 @@ +// usb - Self contained USB and HID library for Go +// Copyright 2019 The library Authors +// +// This library is free software: you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// The library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License along +// with the library. If not, see . + +package hid + +// Supported returns whether this platform is supported by the USB library or not. +// The goal of this method is to allow programmatically handling platforms that do +// not support USB and not having to fall back to build constraints. +func Supported() bool { + return false +} + +// Enumerate returns a list of all the USB devices attached to the system which +// match the vendor and product id. On platforms that this file implements the +// function is a noop and returns an empty list always. +func Enumerate(vendorID uint16, productID uint16) ([]DeviceInfo, error) { + return nil, nil +} + +// EnumerateRaw returns a list of all the USB devices attached to the system which +// match the vendor and product id. On platforms that this file implements the +// function is a noop and returns an empty list always. +func EnumerateRaw(vendorID uint16, productID uint16) ([]DeviceInfo, error) { + return nil, nil +} + +// EnumerateHid returns a list of all the HID devices attached to the system which +// match the vendor and product id. On platforms that this file implements the +// function is a noop and returns an empty list always. +func EnumerateHid(vendorID uint16, productID uint16) ([]DeviceInfo, error) { + return nil, nil +} + +// Open connects to a previously discovered USB device. +func (info DeviceInfo) Open() (Device, error) { + return nil, ErrUnsupportedPlatform +} diff --git a/third_party/hid/usb_test.go b/third_party/hid/usb_test.go new file mode 100644 index 000000000000..c05e21785cb0 --- /dev/null +++ b/third_party/hid/usb_test.go @@ -0,0 +1,86 @@ +// usb - Self contained USB and HID library for Go +// Copyright 2017 The library Authors +// +// This library is free software: you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License as published by the Free +// Software Foundation, either version 3 of the License, or (at your option) any +// later version. +// +// The library is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +// A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License along +// with the library. If not, see . + +package hid + +import ( + "os" + "runtime" + "sync" + "testing" +) + +// Tests that HID enumeration can be called concurrently from multiple threads. +func TestThreadedEnumerateHid(t *testing.T) { + var pend sync.WaitGroup + for i := 0; i < 8; i++ { + pend.Add(1) + + go func(index int) { + defer pend.Done() + for j := 0; j < 512; j++ { + if _, err := EnumerateHid(uint16(index), 0); err != nil { + t.Errorf("thread %d, iter %d: failed to enumerate: %v", index, j, err) + } + } + }(i) + } + pend.Wait() +} + +// Tests that RAW enumeration can be called concurrently from multiple threads. +func TestThreadedEnumerateRaw(t *testing.T) { + // Travis does not have usbfs enabled in the Linux kernel + if os.Getenv("TRAVIS") != "" && runtime.GOOS == "linux" { + t.Skip("Linux on Travis doesn't have usbfs, skipping test") + } + // Yay, we can actually test this + var pend sync.WaitGroup + for i := 0; i < 8; i++ { + pend.Add(1) + + go func(index int) { + defer pend.Done() + for j := 0; j < 512; j++ { + if _, err := EnumerateRaw(uint16(index), 0); err != nil { + t.Errorf("thread %d, iter %d: failed to enumerate: %v", index, j, err) + } + } + }(i) + } + pend.Wait() +} + +// Tests that generic enumeration can be called concurrently from multiple threads. +func TestThreadedEnumerate(t *testing.T) { + // Travis does not have usbfs enabled in the Linux kernel + if os.Getenv("TRAVIS") != "" && runtime.GOOS == "linux" { + t.Skip("Linux on Travis doesn't have usbfs, skipping test") + } + var pend sync.WaitGroup + for i := 0; i < 8; i++ { + pend.Add(1) + + go func(index int) { + defer pend.Done() + for j := 0; j < 512; j++ { + if _, err := Enumerate(uint16(index), 0); err != nil { + t.Errorf("thread %d, iter %d: failed to enumerate: %v", index, j, err) + } + } + }(i) + } + pend.Wait() +} From de52ebb70ab29165be066b51ad13f73a9170a76b Mon Sep 17 00:00:00 2001 From: nisdas Date: Thu, 26 Sep 2024 23:22:16 +0800 Subject: [PATCH 31/49] Push it up --- tools/bootnode/bootnode_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/bootnode/bootnode_test.go b/tools/bootnode/bootnode_test.go index a36c2a24718e..7bf767a33f16 100644 --- a/tools/bootnode/bootnode_test.go +++ b/tools/bootnode/bootnode_test.go @@ -36,6 +36,7 @@ func TestBootnode_OK(t *testing.T) { } listener := createListener(ipAddr, 4000, cfg) defer listener.Close() + time.Sleep(10 * time.Second) cfg.PrivateKey = extractPrivateKey() bootNode, err := enode.Parse(enode.ValidSchemes, listener.Self().String()) From 809cc049f0baa973c1d661709372bdbd9693964c Mon Sep 17 00:00:00 2001 From: nisdas Date: Fri, 27 Sep 2024 14:53:16 +0800 Subject: [PATCH 32/49] Finally fix all tests with felix's changes --- beacon-chain/p2p/config.go | 1 + beacon-chain/p2p/discovery.go | 7 ++++--- beacon-chain/p2p/discovery_test.go | 11 ++++++----- beacon-chain/p2p/fork_test.go | 25 +++++++++++++++---------- beacon-chain/p2p/service_test.go | 8 +++++++- beacon-chain/p2p/subnets_test.go | 10 +++++++++- deps.bzl | 17 +++++++++-------- go.mod | 10 ++++++---- go.sum | 27 ++++++++++++--------------- tools/bootnode/bootnode_test.go | 7 ++++--- 10 files changed, 73 insertions(+), 50 deletions(-) diff --git a/beacon-chain/p2p/config.go b/beacon-chain/p2p/config.go index 5cc7e1386423..943d2d3fa673 100644 --- a/beacon-chain/p2p/config.go +++ b/beacon-chain/p2p/config.go @@ -17,6 +17,7 @@ type Config struct { NoDiscovery bool EnableUPnP bool StaticPeerID bool + DisableLivenessCheck bool StaticPeers []string Discv5BootStrapAddrs []string RelayNodeAddr string diff --git a/beacon-chain/p2p/discovery.go b/beacon-chain/p2p/discovery.go index b16401f518b1..f15a73cda07e 100644 --- a/beacon-chain/p2p/discovery.go +++ b/beacon-chain/p2p/discovery.go @@ -221,9 +221,10 @@ func (s *Service) createListener( } dv5Cfg := discover.Config{ - PrivateKey: privKey, - Bootnodes: bootNodes, - PingInterval: s.cfg.PingInterval, + PrivateKey: privKey, + Bootnodes: bootNodes, + PingInterval: s.cfg.PingInterval, + NoFindnodeLivenessCheck: s.cfg.DisableLivenessCheck, } listener, err := discover.ListenV5(conn, localNode, dv5Cfg) diff --git a/beacon-chain/p2p/discovery_test.go b/beacon-chain/p2p/discovery_test.go index e078be1ef84e..25e2f811b66b 100644 --- a/beacon-chain/p2p/discovery_test.go +++ b/beacon-chain/p2p/discovery_test.go @@ -85,7 +85,7 @@ func TestStartDiscV5_DiscoverAllPeers(t *testing.T) { genesisTime := time.Now() genesisValidatorsRoot := make([]byte, 32) s := &Service{ - cfg: &Config{UDPPort: uint(port), PingInterval: testPingInterval}, + cfg: &Config{UDPPort: uint(port), PingInterval: testPingInterval, DisableLivenessCheck: true}, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, } @@ -93,6 +93,10 @@ func TestStartDiscV5_DiscoverAllPeers(t *testing.T) { require.NoError(t, err) defer bootListener.Close() + // Allow bootnode's table to have its initial refresh. This allows + // inbound nodes to be added in. + time.Sleep(5 * time.Second) + bootNode := bootListener.Self() var listeners []*discover.UDPv5 @@ -102,10 +106,7 @@ func TestStartDiscV5_DiscoverAllPeers(t *testing.T) { Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), PingInterval: testPingInterval, - } - // Add another node to allow for more cross peer discovery. - if len(listeners) > 0 { - cfg.Discv5BootStrapAddrs = append(cfg.Discv5BootStrapAddrs, listeners[len(listeners)-1].Self().String()) + DisableLivenessCheck: true, } ipAddr, pkey := createAddrAndPrivKey(t) s = &Service{ diff --git a/beacon-chain/p2p/fork_test.go b/beacon-chain/p2p/fork_test.go index 658813b57e01..1d19ef3e7b3b 100644 --- a/beacon-chain/p2p/fork_test.go +++ b/beacon-chain/p2p/fork_test.go @@ -35,9 +35,10 @@ func TestStartDiscv5_DifferentForkDigests(t *testing.T) { genesisValidatorsRoot := make([]byte, fieldparams.RootLength) s := &Service{ cfg: &Config{ - UDPPort: uint(port), - StateNotifier: &mock.MockStateNotifier{}, - PingInterval: testPingInterval, + UDPPort: uint(port), + StateNotifier: &mock.MockStateNotifier{}, + PingInterval: testPingInterval, + DisableLivenessCheck: true, }, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, @@ -46,21 +47,23 @@ func TestStartDiscv5_DifferentForkDigests(t *testing.T) { require.NoError(t, err) defer bootListener.Close() + // Allow bootnode's table to have its initial refresh. This allows + // inbound nodes to be added in. + time.Sleep(5 * time.Second) + bootNode := bootListener.Self() cfg := &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), StateNotifier: &mock.MockStateNotifier{}, PingInterval: testPingInterval, + DisableLivenessCheck: true, } var listeners []*discover.UDPv5 for i := 1; i <= 5; i++ { port := 3000 + i cfg.UDPPort = uint(port) - if len(listeners) > 0 { - cfg.Discv5BootStrapAddrs = []string{bootNode.String(), listeners[len(listeners)-1].Self().String()} - } ipAddr, pkey := createAddrAndPrivKey(t) // We give every peer a different genesis validators root, which @@ -130,7 +133,7 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { genesisTime := time.Now() genesisValidatorsRoot := make([]byte, 32) s := &Service{ - cfg: &Config{UDPPort: uint(port), PingInterval: testPingInterval}, + cfg: &Config{UDPPort: uint(port), PingInterval: testPingInterval, DisableLivenessCheck: true}, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, } @@ -138,11 +141,16 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { require.NoError(t, err) defer bootListener.Close() + // Allow bootnode's table to have its initial refresh. This allows + // inbound nodes to be added in. + time.Sleep(5 * time.Second) + bootNode := bootListener.Self() cfg := &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, UDPPort: uint(port), PingInterval: testPingInterval, + DisableLivenessCheck: true, } var listeners []*discover.UDPv5 @@ -150,9 +158,6 @@ func TestStartDiscv5_SameForkDigests_DifferentNextForkData(t *testing.T) { port := 3000 + i cfg.UDPPort = uint(port) ipAddr, pkey := createAddrAndPrivKey(t) - if len(listeners) > 0 { - cfg.Discv5BootStrapAddrs = []string{bootNode.String(), listeners[len(listeners)-1].Self().String()} - } c := params.BeaconConfig().Copy() nextForkEpoch := primitives.Epoch(i) c.ForkVersionSchedule[[4]byte{'A', 'B', 'C', 'D'}] = nextForkEpoch diff --git a/beacon-chain/p2p/service_test.go b/beacon-chain/p2p/service_test.go index 16d60bcd0e47..d7e59a510de1 100644 --- a/beacon-chain/p2p/service_test.go +++ b/beacon-chain/p2p/service_test.go @@ -187,7 +187,7 @@ func TestListenForNewNodes(t *testing.T) { params.SetupTestConfigCleanup(t) // Setup bootnode. notifier := &mock.MockStateNotifier{} - cfg := &Config{StateNotifier: notifier, PingInterval: testPingInterval} + cfg := &Config{StateNotifier: notifier, PingInterval: testPingInterval, DisableLivenessCheck: true} port := 2000 cfg.UDPPort = uint(port) _, pkey := createAddrAndPrivKey(t) @@ -203,6 +203,10 @@ func TestListenForNewNodes(t *testing.T) { require.NoError(t, err) defer bootListener.Close() + // Allow bootnode's table to have its initial refresh. This allows + // inbound nodes to be added in. + time.Sleep(5 * time.Second) + // Use shorter period for testing. currentPeriod := pollingPeriod pollingPeriod = 1 * time.Second @@ -218,6 +222,8 @@ func TestListenForNewNodes(t *testing.T) { cs := startup.NewClockSynchronizer() cfg = &Config{ Discv5BootStrapAddrs: []string{bootNode.String()}, + PingInterval: testPingInterval, + DisableLivenessCheck: true, MaxPeers: 30, ClockWaiter: cs, } diff --git a/beacon-chain/p2p/subnets_test.go b/beacon-chain/p2p/subnets_test.go index ed641269d26d..5de61f378499 100644 --- a/beacon-chain/p2p/subnets_test.go +++ b/beacon-chain/p2p/subnets_test.go @@ -66,7 +66,7 @@ func TestStartDiscV5_FindPeersWithSubnet(t *testing.T) { genesisTime := time.Now() bootNodeService := &Service{ - cfg: &Config{UDPPort: 2000, TCPPort: 3000, QUICPort: 3000, PingInterval: testPingInterval}, + cfg: &Config{UDPPort: 2000, TCPPort: 3000, QUICPort: 3000, DisableLivenessCheck: true, PingInterval: testPingInterval}, genesisTime: genesisTime, genesisValidatorsRoot: genesisValidatorsRoot, } @@ -78,6 +78,10 @@ func TestStartDiscV5_FindPeersWithSubnet(t *testing.T) { require.NoError(t, err) defer bootListener.Close() + // Allow bootnode's table to have its initial refresh. This allows + // inbound nodes to be added in. + time.Sleep(5 * time.Second) + bootNodeENR := bootListener.Self().String() // Create 3 nodes, each subscribed to a different subnet. @@ -92,6 +96,8 @@ func TestStartDiscV5_FindPeersWithSubnet(t *testing.T) { UDPPort: uint(2000 + i), TCPPort: uint(3000 + i), QUICPort: uint(3000 + i), + PingInterval: testPingInterval, + DisableLivenessCheck: true, }) require.NoError(t, err) @@ -133,6 +139,8 @@ func TestStartDiscV5_FindPeersWithSubnet(t *testing.T) { cfg := &Config{ Discv5BootStrapAddrs: []string{bootNodeENR}, + PingInterval: testPingInterval, + DisableLivenessCheck: true, MaxPeers: 30, UDPPort: 2010, TCPPort: 3010, diff --git a/deps.bzl b/deps.bzl index c3ef9dac170a..aa431de00117 100644 --- a/deps.bzl +++ b/deps.bzl @@ -295,8 +295,8 @@ def prysm_deps(): go_repository( name = "com_github_bits_and_blooms_bitset", importpath = "github.com/bits-and-blooms/bitset", - sum = "h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k=", - version = "v1.11.0", + sum = "h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=", + version = "v1.13.0", ) go_repository( name = "com_github_bradfitz_go_smtpd", @@ -488,8 +488,8 @@ def prysm_deps(): go_repository( name = "com_github_cockroachdb_pebble", importpath = "github.com/cockroachdb/pebble", - sum = "h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw=", - version = "v1.1.1", + sum = "h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA=", + version = "v1.1.2", ) go_repository( name = "com_github_cockroachdb_redact", @@ -778,14 +778,15 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=", - version = "v1.14.8", + replace = "github.com/fjl/go-ethereum", + sum = "h1:YJ2iHhMN7b/YGrWebITsPiduDfXv/6h225UFe3szB8w=", + version = "v0.6.9-0.20240926130606-32ae7902e5f3", ) go_repository( name = "com_github_ethereum_go_verkle", importpath = "github.com/ethereum/go-verkle", - sum = "h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=", - version = "v0.1.1-0.20240306133620-7d920df305f0", + sum = "h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=", + version = "v0.1.1-0.20240829091221-dffa7562dbe9", ) go_repository( name = "com_github_evanphx_json_patch", diff --git a/go.mod b/go.mod index ed2b850da559..163ab0b4aa34 100644 --- a/go.mod +++ b/go.mod @@ -71,7 +71,7 @@ require ( github.com/spf13/afero v1.10.0 github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.9.0 - github.com/supranational/blst v0.3.11 + github.com/supranational/blst v0.3.13 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279 github.com/tyler-smith/go-bip39 v1.1.0 @@ -111,7 +111,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.11.0 // indirect + github.com/bits-and-blooms/bitset v1.13.0 // indirect github.com/cespare/cp v1.1.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -119,7 +119,7 @@ require ( github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v1.1.1 // indirect + github.com/cockroachdb/pebble v1.1.2 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect @@ -137,7 +137,7 @@ require ( github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect github.com/elastic/gosigar v0.14.2 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect - github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect + github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect github.com/ferranbt/fastssz v0.1.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect @@ -283,3 +283,5 @@ require ( ) replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b + +replace github.com/ethereum/go-ethereum => github.com/fjl/go-ethereum v0.6.9-0.20240926130606-32ae7902e5f3 diff --git a/go.sum b/go.sum index 247eb90a811a..3cdb0026b6ea 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k= -github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= +github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= @@ -147,8 +147,8 @@ github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/e github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= -github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= +github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA= +github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -237,18 +237,16 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= -github.com/ethereum/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig= -github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= -github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4= -github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w= +github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A= +github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= -github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk= -github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs= github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= +github.com/fjl/go-ethereum v0.6.9-0.20240926130606-32ae7902e5f3 h1:YJ2iHhMN7b/YGrWebITsPiduDfXv/6h225UFe3szB8w= +github.com/fjl/go-ethereum v0.6.9-0.20240926130606-32ae7902e5f3/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= @@ -485,8 +483,6 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/herumi/bls-eth-go-binary v0.0.0-20210130185500-57372fb27371/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= -github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e h1:wCMygKUQhmcQAjlk2Gquzq6dLmyMv2kF+llRspoRgrk= -github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/herumi/bls-eth-go-binary v1.31.0 h1:9eeW3EA4epCb7FIHt2luENpAW69MvKGL5jieHlBiP+w= github.com/herumi/bls-eth-go-binary v1.31.0/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U= github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= @@ -1023,8 +1019,8 @@ github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= -github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= +github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= @@ -1044,6 +1040,8 @@ github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279 h1:+Ly github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279/go.mod h1:GA3+Mq3kt3tYAfM0WZCu7ofy+GW9PuGysHfhr+6JX7s= github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= +github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10 h1:CQh33pStIp/E30b7TxDlXfM0145bn2e8boI30IxAhTg= +github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10/go.mod h1:x/Pa0FF5Te9kdrlZKJK82YmAkvL8+f989USgz6Jiw7M= 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= @@ -1058,7 +1056,6 @@ github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49u github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM= github.com/wealdtech/go-bytesutil v1.1.1 h1:ocEg3Ke2GkZ4vQw5lp46rmO+pfqCCTgq35gqOy8JKVc= github.com/wealdtech/go-bytesutil v1.1.1/go.mod h1:jENeMqeTEU8FNZyDFRVc7KqBdRKSnJ9CCh26TcuNb9s= -github.com/wealdtech/go-eth2-types/v2 v2.5.2 h1:tiA6T88M6XQIbrV5Zz53l1G5HtRERcxQfmET225V4Ls= github.com/wealdtech/go-eth2-types/v2 v2.5.2/go.mod h1:8lkNUbgklSQ4LZ2oMSuxSdR7WwJW3L9ge1dcoCVyzws= github.com/wealdtech/go-eth2-types/v2 v2.8.2 h1:b5aXlNBLKgjAg/Fft9VvGlqAUCQMP5LzYhlHRrr4yPg= github.com/wealdtech/go-eth2-types/v2 v2.8.2/go.mod h1:IAz9Lz1NVTaHabQa+4zjk2QDKMv8LVYo0n46M9o/TXw= diff --git a/tools/bootnode/bootnode_test.go b/tools/bootnode/bootnode_test.go index 7bf767a33f16..f9927954ec4a 100644 --- a/tools/bootnode/bootnode_test.go +++ b/tools/bootnode/bootnode_test.go @@ -31,12 +31,13 @@ func TestBootnode_OK(t *testing.T) { require.NoError(t, err) privKey := extractPrivateKey() cfg := discover.Config{ - PrivateKey: privKey, - PingInterval: 100 * time.Millisecond, + PrivateKey: privKey, + PingInterval: 100 * time.Millisecond, + NoFindnodeLivenessCheck: true, } listener := createListener(ipAddr, 4000, cfg) defer listener.Close() - time.Sleep(10 * time.Second) + time.Sleep(5 * time.Second) cfg.PrivateKey = extractPrivateKey() bootNode, err := enode.Parse(enode.ValidSchemes, listener.Self().String()) From b45a6663b41488822c4f7d9fd0c854ad9ae9f03d Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 23 Oct 2024 14:11:34 -0500 Subject: [PATCH 33/49] updating geth dependency --- deps.bzl | 36 ++++++++++++++++++------------------ go.mod | 12 ++++++------ go.sum | 10 ++++++++++ 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/deps.bzl b/deps.bzl index 1cd89312d1dc..aa644132303b 100644 --- a/deps.bzl +++ b/deps.bzl @@ -295,8 +295,8 @@ def prysm_deps(): go_repository( name = "com_github_bits_and_blooms_bitset", importpath = "github.com/bits-and-blooms/bitset", - sum = "h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k=", - version = "v1.11.0", + sum = "h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=", + version = "v1.13.0", ) go_repository( name = "com_github_bradfitz_go_smtpd", @@ -470,8 +470,8 @@ def prysm_deps(): go_repository( name = "com_github_cockroachdb_pebble", importpath = "github.com/cockroachdb/pebble", - sum = "h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw=", - version = "v1.1.1", + sum = "h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA=", + version = "v1.1.2", ) go_repository( name = "com_github_cockroachdb_redact", @@ -768,14 +768,14 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig=", - version = "v1.14.8", + sum = "h1:8nFDCUUE67rPc6AKxFj7JKaOa2W/W1Rse3oS6LvvxEY=", + version = "v1.14.11", ) go_repository( name = "com_github_ethereum_go_verkle", importpath = "github.com/ethereum/go-verkle", - sum = "h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=", - version = "v0.1.1-0.20240306133620-7d920df305f0", + sum = "h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=", + version = "v0.1.1-0.20240829091221-dffa7562dbe9", ) go_repository( name = "com_github_evanphx_json_patch", @@ -966,8 +966,8 @@ def prysm_deps(): go_repository( name = "com_github_go_errors_errors", importpath = "github.com/go-errors/errors", - sum = "h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=", - version = "v1.0.1", + sum = "h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=", + version = "v1.4.2", ) go_repository( name = "com_github_go_gl_glfw", @@ -1917,14 +1917,14 @@ def prysm_deps(): go_repository( name = "com_github_labstack_echo_v4", importpath = "github.com/labstack/echo/v4", - sum = "h1:LF5Iq7t/jrtUuSutNuiEWtB5eiHfZ5gSe2pcu5exjQw=", - version = "v4.2.1", + sum = "h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA=", + version = "v4.10.0", ) go_repository( name = "com_github_labstack_gommon", importpath = "github.com/labstack/gommon", - sum = "h1:JEeO0bvc78PKdyHxloTKiF8BD5iGrH8T6MSeGvSgob0=", - version = "v0.3.0", + sum = "h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=", + version = "v0.4.0", ) go_repository( name = "com_github_leanovate_gopter", @@ -2150,8 +2150,8 @@ def prysm_deps(): go_repository( name = "com_github_microcosm_cc_bluemonday", importpath = "github.com/microcosm-cc/bluemonday", - sum = "h1:SIYunPjnlXcW+gVfvm0IlSeR5U3WZUOLfVmqg85Go44=", - version = "v1.0.1", + sum = "h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=", + version = "v1.0.23", ) go_repository( name = "com_github_microsoft_go_winio", @@ -3400,8 +3400,8 @@ def prysm_deps(): go_repository( name = "com_github_valyala_fasttemplate", importpath = "github.com/valyala/fasttemplate", - sum = "h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=", - version = "v1.2.1", + sum = "h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=", + version = "v1.2.2", ) go_repository( name = "com_github_viant_assertly", diff --git a/go.mod b/go.mod index cc7638bca97e..0d25ab0ef185 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.14.8 + github.com/ethereum/go-ethereum v1.14.11 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 @@ -73,7 +73,7 @@ require ( github.com/spf13/afero v1.10.0 github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.9.0 - github.com/supranational/blst v0.3.11 + github.com/supranational/blst v0.3.13 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e github.com/trailofbits/go-mutexasserts v0.0.0-20230328101604-8cdbc5f3d279 github.com/tyler-smith/go-bip39 v1.1.0 @@ -113,7 +113,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.12.2 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.11.0 // indirect + github.com/bits-and-blooms/bitset v1.13.0 // indirect github.com/cespare/cp v1.1.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -121,7 +121,7 @@ require ( github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v1.1.1 // indirect + github.com/cockroachdb/pebble v1.1.2 // indirect github.com/cockroachdb/redact v1.1.5 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect @@ -137,9 +137,9 @@ require ( github.com/dlclark/regexp2 v1.7.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect - github.com/elastic/gosigar v0.14.3 // indirect + github.com/elastic/gosigar v0.14.3 // indirect github.com/ethereum/c-kzg-4844 v1.0.0 // indirect - github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect + github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect github.com/ferranbt/fastssz v0.1.3 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect diff --git a/go.sum b/go.sum index 7c6d883f3f08..973b7d86450c 100644 --- a/go.sum +++ b/go.sum @@ -102,6 +102,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bits-and-blooms/bitset v1.11.0 h1:RMyy2mBBShArUAhfVRZJ2xyBO58KCBCtZFShw3umo6k= github.com/bits-and-blooms/bitset v1.11.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= +github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60= github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ= @@ -149,6 +151,7 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw= github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= +github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -239,8 +242,12 @@ 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/go-ethereum v1.14.8 h1:NgOWvXS+lauK+zFukEvi85UmmsS/OkV0N23UZ1VTIig= github.com/ethereum/go-ethereum v1.14.8/go.mod h1:TJhyuDq0JDppAkFXgqjwpdlQApywnu/m10kFPxh8vvs= +github.com/ethereum/go-ethereum v1.14.11 h1:8nFDCUUE67rPc6AKxFj7JKaOa2W/W1Rse3oS6LvvxEY= +github.com/ethereum/go-ethereum v1.14.11/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4= github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w= +github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A= +github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= @@ -316,6 +323,7 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= @@ -1023,6 +1031,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4= github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= +github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk= +github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= From 146b4bc3867579fa7c0688e35682099b16fccbd8 Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Wed, 23 Oct 2024 14:52:00 -0500 Subject: [PATCH 34/49] Update go-ethereum to v1.14.11 --- deps.bzl | 5 ++--- go.mod | 4 +--- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/deps.bzl b/deps.bzl index 34cb424620f1..987965805dfa 100644 --- a/deps.bzl +++ b/deps.bzl @@ -760,9 +760,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - replace = "github.com/fjl/go-ethereum", - sum = "h1:YJ2iHhMN7b/YGrWebITsPiduDfXv/6h225UFe3szB8w=", - version = "v0.6.9-0.20240926130606-32ae7902e5f3", + sum = "h1:8nFDCUUE67rPc6AKxFj7JKaOa2W/W1Rse3oS6LvvxEY=", + version = "v1.14.11", ) go_repository( name = "com_github_ethereum_go_verkle", diff --git a/go.mod b/go.mod index 4d765f00ff09..dc754dc4b976 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/dot v0.11.0 - github.com/ethereum/go-ethereum v1.14.8 + github.com/ethereum/go-ethereum v1.14.11 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible @@ -287,5 +287,3 @@ require ( ) replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b - -replace github.com/ethereum/go-ethereum => github.com/fjl/go-ethereum v0.6.9-0.20240926130606-32ae7902e5f3 diff --git a/go.sum b/go.sum index b2c0da0a798c..103928d6c9e5 100644 --- a/go.sum +++ b/go.sum @@ -237,6 +237,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/go-ethereum v1.14.11 h1:8nFDCUUE67rPc6AKxFj7JKaOa2W/W1Rse3oS6LvvxEY= +github.com/ethereum/go-ethereum v1.14.11/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A= github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -245,8 +247,6 @@ github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4Nij github.com/ferranbt/fastssz v0.0.0-20210120143747-11b9eff30ea9/go.mod h1:DyEu2iuLBnb/T51BlsiO3yLYdJC6UbGMrIkqK1KmQxM= github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= -github.com/fjl/go-ethereum v0.6.9-0.20240926130606-32ae7902e5f3 h1:YJ2iHhMN7b/YGrWebITsPiduDfXv/6h225UFe3szB8w= -github.com/fjl/go-ethereum v0.6.9-0.20240926130606-32ae7902e5f3/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= From 976d83949c4a3205f76db7800c8d25174d9a0e09 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 23 Oct 2024 16:30:47 -0500 Subject: [PATCH 35/49] fixing import --- beacon-chain/execution/block_reader_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/beacon-chain/execution/block_reader_test.go b/beacon-chain/execution/block_reader_test.go index f1e199137bf5..10d10b81590a 100644 --- a/beacon-chain/execution/block_reader_test.go +++ b/beacon-chain/execution/block_reader_test.go @@ -12,6 +12,7 @@ import ( dbutil "github.com/prysmaticlabs/prysm/v5/beacon-chain/db/testing" mockExecution "github.com/prysmaticlabs/prysm/v5/beacon-chain/execution/testing" "github.com/prysmaticlabs/prysm/v5/beacon-chain/execution/types" + "github.com/prysmaticlabs/prysm/v5/config/params" contracts "github.com/prysmaticlabs/prysm/v5/contracts/deposit" "github.com/prysmaticlabs/prysm/v5/contracts/deposit/mock" "github.com/prysmaticlabs/prysm/v5/testing/assert" From 01988cb096f62eee25a94951c1445780568e577c Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 23 Oct 2024 16:36:37 -0500 Subject: [PATCH 36/49] reverting blob change --- beacon-chain/blockchain/kzg/validation.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/beacon-chain/blockchain/kzg/validation.go b/beacon-chain/blockchain/kzg/validation.go index b187378b5680..dd0c6f6d00b0 100644 --- a/beacon-chain/blockchain/kzg/validation.go +++ b/beacon-chain/blockchain/kzg/validation.go @@ -11,9 +11,8 @@ func Verify(sidecars ...blocks.ROBlob) error { return nil } if len(sidecars) == 1 { - blob := bytesToBlob(sidecars[0].Blob) return kzgContext.VerifyBlobKZGProof( - &blob, + bytesToBlob(sidecars[0].Blob), bytesToCommitment(sidecars[0].KzgCommitment), bytesToKZGProof(sidecars[0].KzgProof)) } From f3356f828d151c326637e46be6d064068cf7d6a4 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 23 Oct 2024 17:12:07 -0500 Subject: [PATCH 37/49] fixing Implicit memory aliasing in for loop. --- testing/endtoend/components/eth1/transactions.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index f17980994671..6fe40529245c 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -342,17 +342,18 @@ func EncodeBlobs(data []byte) ([]kzg4844.Blob, []kzg4844.Commitment, []kzg4844.P versionedHashes []common.Hash ) for _, blob := range blobs { - commit, err := kzg4844.BlobToCommitment(&blob) + b := blob + commit, err := kzg4844.BlobToCommitment(&b) if err != nil { return nil, nil, nil, nil, err } commits = append(commits, commit) - proof, err := kzg4844.ComputeBlobProof(&blob, commit) + proof, err := kzg4844.ComputeBlobProof(&b, commit) if err != nil { return nil, nil, nil, nil, err } - if err := kzg4844.VerifyBlobProof(&blob, commit, proof); err != nil { + if err := kzg4844.VerifyBlobProof(&b, commit, proof); err != nil { return nil, nil, nil, nil, err } proofs = append(proofs, proof) From 6c8c65e7599c56452e0dab3a28daf7267f82c3e6 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 29 Oct 2024 15:45:33 -0500 Subject: [PATCH 38/49] WIP changes --- runtime/interop/genesis.go | 90 +++++++++---------- testing/endtoend/components/eth1/miner.go | 30 +++---- testing/endtoend/mainnet_e2e_test.go | 4 +- testing/endtoend/mainnet_scenario_e2e_test.go | 2 +- testing/endtoend/minimal_builder_e2e_test.go | 4 +- testing/endtoend/minimal_e2e_test.go | 2 +- testing/endtoend/minimal_scenario_e2e_test.go | 10 +-- 7 files changed, 71 insertions(+), 71 deletions(-) diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index d7d442a15dde..345c6171e15d 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -1,13 +1,13 @@ package interop import ( - "fmt" "math" "math/big" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" clparams "github.com/prysmaticlabs/prysm/v5/config/params" "github.com/prysmaticlabs/prysm/v5/time/slots" @@ -126,57 +126,57 @@ func GethPragueTime(genesisTime uint64, cfg *clparams.BeaconChainConfig) *uint64 // like in an e2e test. The parameters are minimal but the full value is returned unmarshaled so that it can be // customized as desired. func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *core.Genesis { - ttd, ok := big.NewInt(0).SetString(clparams.BeaconConfig().TerminalTotalDifficulty, 10) - if !ok { - panic(fmt.Sprintf("unable to parse TerminalTotalDifficulty as an integer = %s", clparams.BeaconConfig().TerminalTotalDifficulty)) - } + //ttd, ok := big.NewInt(0).SetString(clparams.BeaconConfig().TerminalTotalDifficulty, 10) + //if !ok { + // panic(fmt.Sprintf("unable to parse TerminalTotalDifficulty as an integer = %s", clparams.BeaconConfig().TerminalTotalDifficulty)) + //} - shanghaiTime := GethShanghaiTime(genesisTime, cfg) - cancunTime := GethCancunTime(genesisTime, cfg) + //shanghaiTime := GethShanghaiTime(genesisTime, cfg) + //cancunTime := GethCancunTime(genesisTime, cfg) pragueTime := GethPragueTime(genesisTime, cfg) cc := ¶ms.ChainConfig{ - ChainID: big.NewInt(defaultTestChainId), - HomesteadBlock: bigz, - DAOForkBlock: bigz, - EIP150Block: bigz, - EIP155Block: bigz, - EIP158Block: bigz, - ByzantiumBlock: bigz, - ConstantinopleBlock: bigz, - PetersburgBlock: bigz, - IstanbulBlock: bigz, - MuirGlacierBlock: bigz, - BerlinBlock: bigz, - LondonBlock: bigz, - ArrowGlacierBlock: bigz, - GrayGlacierBlock: bigz, - MergeNetsplitBlock: bigz, - TerminalTotalDifficulty: ttd, - TerminalTotalDifficultyPassed: false, - Clique: ¶ms.CliqueConfig{ - Period: cfg.SecondsPerETH1Block, - Epoch: 20000, - }, - ShanghaiTime: shanghaiTime, - CancunTime: cancunTime, + ChainID: big.NewInt(defaultTestChainId), + HomesteadBlock: bigz, + DAOForkBlock: bigz, + EIP150Block: bigz, + EIP155Block: bigz, + EIP158Block: bigz, + ByzantiumBlock: bigz, + ConstantinopleBlock: bigz, + PetersburgBlock: bigz, + IstanbulBlock: bigz, + MuirGlacierBlock: bigz, + BerlinBlock: bigz, + LondonBlock: bigz, + ArrowGlacierBlock: bigz, + GrayGlacierBlock: bigz, + MergeNetsplitBlock: bigz, + //TerminalTotalDifficulty: ttd, + //TerminalTotalDifficultyPassed: false, + //Clique: ¶ms.CliqueConfig{ + // Period: cfg.SecondsPerETH1Block, + // Epoch: 20000, + //}, + ShanghaiTime: &genesisTime, + CancunTime: &genesisTime, PragueTime: pragueTime, } da := defaultDepositContractAllocation(cfg.DepositContractAddress) ma := minerAllocation() - extra, err := hexutil.Decode(DefaultCliqueSigner) - if err != nil { - panic(fmt.Sprintf("unable to decode DefaultCliqueSigner, with error %v", err.Error())) - } + //extra, err := hexutil.Decode(DefaultCliqueSigner) + //if err != nil { + // panic(fmt.Sprintf("unable to decode DefaultCliqueSigner, with error %v", err.Error())) + //} return &core.Genesis{ - Config: cc, - Nonce: 0, // overridden for authorized signer votes in clique, so we should leave it empty? - Timestamp: genesisTime, - ExtraData: extra, + Config: cc, + //Nonce: 0, // overridden for authorized signer votes in clique, so we should leave it empty? + Timestamp: genesisTime, + //ExtraData: extra, GasLimit: cfg.DefaultBuilderGasLimit, Difficulty: common.HexToHash(defaultDifficulty).Big(), - Mixhash: common.HexToHash(defaultMixhash), - Coinbase: common.HexToAddress(defaultCoinbase), - Alloc: core.GenesisAlloc{ + //Mixhash: common.HexToHash(defaultMixhash), + //Coinbase: common.HexToAddress(defaultCoinbase), + Alloc: types.GenesisAlloc{ da.Address: da.Account, ma.Address: ma.Account, }, @@ -186,13 +186,13 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co type depositAllocation struct { Address common.Address - Account core.GenesisAccount + Account types.Account } func minerAllocation() depositAllocation { return depositAllocation{ Address: common.HexToAddress(defaultMinerAddress), - Account: core.GenesisAccount{ + Account: types.Account{ Balance: minerBalance, }, } @@ -209,7 +209,7 @@ func defaultDepositContractAllocation(contractAddress string) depositAllocation } return depositAllocation{ Address: common.HexToAddress(contractAddress), - Account: core.GenesisAccount{ + Account: types.Account{ Code: codeBytes, Storage: s, Balance: bigz, diff --git a/testing/endtoend/components/eth1/miner.go b/testing/endtoend/components/eth1/miner.go index 9d7998ea6ac0..2ae2c58551fb 100644 --- a/testing/endtoend/components/eth1/miner.go +++ b/testing/endtoend/components/eth1/miner.go @@ -121,7 +121,7 @@ func (m *Miner) initAttempt(ctx context.Context, attempt int) (*os.File, error) return nil, err } - pwFile := m.DataDir("keystore", minerPasswordFile) + //pwFile := m.DataDir("keystore", minerPasswordFile) args := []string{ "--nat=none", // disable nat traversal in e2e, it is failure prone and not needed fmt.Sprintf("--datadir=%s", m.DataDir()), @@ -143,26 +143,26 @@ func (m *Miner) initAttempt(ctx context.Context, attempt int) (*os.File, error) "--ws.origins=\"*\"", "--ipcdisable", "--verbosity=4", - "--mine", + //"--mine", fmt.Sprintf("--unlock=%s", EthAddress), "--allow-insecure-unlock", "--syncmode=full", - fmt.Sprintf("--miner.etherbase=%s", EthAddress), + //fmt.Sprintf("--miner.etherbase=%s", EthAddress), fmt.Sprintf("--txpool.locals=%s", EthAddress), - fmt.Sprintf("--password=%s", pwFile), + //fmt.Sprintf("--password=%s", pwFile), } - keystorePath, err := e2e.TestParams.Paths.MinerKeyPath() - if err != nil { - return nil, err - } - if err = file.CopyFile(keystorePath, m.DataDir("keystore", minerFile)); err != nil { - return nil, errors.Wrapf(err, "error copying %s to %s", keystorePath, m.DataDir("keystore", minerFile)) - } - err = file.WriteFile(pwFile, []byte(KeystorePassword)) - if err != nil { - return nil, err - } + //keystorePath, err := e2e.TestParams.Paths.MinerKeyPath() + //if err != nil { + // return nil, err + //} + //if err = file.CopyFile(keystorePath, m.DataDir("keystore", minerFile)); err != nil { + // return nil, errors.Wrapf(err, "error copying %s to %s", keystorePath, m.DataDir("keystore", minerFile)) + //} + //err = file.WriteFile(pwFile, []byte(KeystorePassword)) + //if err != nil { + // return nil, err + //} runCmd := exec.CommandContext(ctx, binaryPath, args...) // #nosec G204 -- Safe // redirect miner stderr to a log file diff --git a/testing/endtoend/mainnet_e2e_test.go b/testing/endtoend/mainnet_e2e_test.go index 409b6bf8d6ee..feaa908b56c6 100644 --- a/testing/endtoend/mainnet_e2e_test.go +++ b/testing/endtoend/mainnet_e2e_test.go @@ -10,10 +10,10 @@ import ( // Run mainnet e2e config with the current release validator against latest beacon node. func TestEndToEnd_MainnetConfig_ValidatorAtCurrentRelease(t *testing.T) { - r := e2eMainnet(t, true, false, types.InitForkCfg(version.Phase0, version.Deneb, params.E2EMainnetTestConfig())) + r := e2eMainnet(t, true, false, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig())) r.run() } func TestEndToEnd_MainnetConfig_MultiClient(t *testing.T) { - e2eMainnet(t, false, true, types.InitForkCfg(version.Phase0, version.Deneb, params.E2EMainnetTestConfig()), types.WithValidatorCrossClient()).run() + e2eMainnet(t, false, true, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig()), types.WithValidatorCrossClient()).run() } diff --git a/testing/endtoend/mainnet_scenario_e2e_test.go b/testing/endtoend/mainnet_scenario_e2e_test.go index 956dc9991278..0c41a2cfc468 100644 --- a/testing/endtoend/mainnet_scenario_e2e_test.go +++ b/testing/endtoend/mainnet_scenario_e2e_test.go @@ -9,7 +9,7 @@ import ( ) func TestEndToEnd_MultiScenarioRun_Multiclient(t *testing.T) { - runner := e2eMainnet(t, false, true, types.InitForkCfg(version.Phase0, version.Deneb, params.E2EMainnetTestConfig()), types.WithEpochs(24)) + runner := e2eMainnet(t, false, true, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig()), types.WithEpochs(24)) runner.config.Evaluators = scenarioEvalsMulti() runner.config.EvalInterceptor = runner.multiScenarioMulticlient runner.scenarioRunner() diff --git a/testing/endtoend/minimal_builder_e2e_test.go b/testing/endtoend/minimal_builder_e2e_test.go index 600adbcbd8f7..f47677505463 100644 --- a/testing/endtoend/minimal_builder_e2e_test.go +++ b/testing/endtoend/minimal_builder_e2e_test.go @@ -9,11 +9,11 @@ import ( ) func TestEndToEnd_MinimalConfig_WithBuilder(t *testing.T) { - r := e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder()) + r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder()) r.run() } func TestEndToEnd_MinimalConfig_WithBuilder_ValidatorRESTApi(t *testing.T) { - r := e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder(), types.WithValidatorRESTApi()) + r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder(), types.WithValidatorRESTApi()) r.run() } diff --git a/testing/endtoend/minimal_e2e_test.go b/testing/endtoend/minimal_e2e_test.go index 0fedd8680c8c..bddc3ae9e65b 100644 --- a/testing/endtoend/minimal_e2e_test.go +++ b/testing/endtoend/minimal_e2e_test.go @@ -9,6 +9,6 @@ import ( ) func TestEndToEnd_MinimalConfig(t *testing.T) { - r := e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync()) + r := e2eMinimal(t, types.InitForkCfg(version.Deneb, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync()) r.run() } diff --git a/testing/endtoend/minimal_scenario_e2e_test.go b/testing/endtoend/minimal_scenario_e2e_test.go index 33628927a709..e542859fe053 100644 --- a/testing/endtoend/minimal_scenario_e2e_test.go +++ b/testing/endtoend/minimal_scenario_e2e_test.go @@ -9,7 +9,7 @@ import ( ) func TestEndToEnd_MultiScenarioRun(t *testing.T) { - runner := e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithEpochs(26)) + runner := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithEpochs(26)) runner.config.Evaluators = scenarioEvals() runner.config.EvalInterceptor = runner.multiScenario @@ -17,20 +17,20 @@ func TestEndToEnd_MultiScenarioRun(t *testing.T) { } func TestEndToEnd_MinimalConfig_Web3Signer(t *testing.T) { - e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithRemoteSigner()).run() + e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithRemoteSigner()).run() } func TestEndToEnd_MinimalConfig_Web3Signer_PersistentKeys(t *testing.T) { - e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithRemoteSignerAndPersistentKeysFile()).run() + e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithRemoteSignerAndPersistentKeysFile()).run() } func TestEndToEnd_MinimalConfig_ValidatorRESTApi(t *testing.T) { - e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithValidatorRESTApi()).run() + e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithValidatorRESTApi()).run() } func TestEndToEnd_ScenarioRun_EEOffline(t *testing.T) { t.Skip("TODO(#10242) Prysm is current unable to handle an offline e2e") - runner := e2eMinimal(t, types.InitForkCfg(version.Phase0, version.Deneb, params.E2ETestConfig())) + runner := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig())) runner.config.Evaluators = scenarioEvals() runner.config.EvalInterceptor = runner.eeOffline From d1fbd2c4293d419d7ce3b373c16504816af17494 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 30 Oct 2024 10:10:01 -0500 Subject: [PATCH 39/49] wip getting a little further on e2e runs --- beacon-chain/execution/engine_client.go | 3 +++ runtime/interop/genesis.go | 11 ++++++---- runtime/interop/premine-state.go | 23 ++++++++++---------- testing/endtoend/components/eth1/miner.go | 26 +++++++++++------------ testing/endtoend/endtoend_setup_test.go | 8 +++---- testing/endtoend/minimal_e2e_test.go | 2 +- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go index 6acb0eafd7d1..22216a448c46 100644 --- a/beacon-chain/execution/engine_client.go +++ b/beacon-chain/execution/engine_client.go @@ -216,6 +216,7 @@ func (s *Service) ForkchoiceUpdated( } switch attrs.Version() { case version.Bellatrix: + log.Error("NOT BELLATRIX!!!!!!") a, err := attrs.PbV1() if err != nil { return nil, nil, err @@ -225,6 +226,7 @@ func (s *Service) ForkchoiceUpdated( return nil, nil, handleRPCError(err) } case version.Capella: + log.Error("NOT CAPELLLAAAAAAA") a, err := attrs.PbV2() if err != nil { return nil, nil, err @@ -234,6 +236,7 @@ func (s *Service) ForkchoiceUpdated( return nil, nil, handleRPCError(err) } case version.Deneb, version.Electra: + log.Error("AHHHHHHHHHHHHHHHHHHHH THIS SHOULD BE CALLED!!!!!!!!!!!!") a, err := attrs.PbV3() if err != nil { return nil, nil, err diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index 345c6171e15d..3df4798a379a 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -132,7 +132,9 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co //} //shanghaiTime := GethShanghaiTime(genesisTime, cfg) - //cancunTime := GethCancunTime(genesisTime, cfg) + cancunTime := GethCancunTime(genesisTime, cfg) + shanghaiTime := uint64(0) + //cancunTime := uint64(0) pragueTime := GethPragueTime(genesisTime, cfg) cc := ¶ms.ChainConfig{ ChainID: big.NewInt(defaultTestChainId), @@ -152,13 +154,14 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co GrayGlacierBlock: bigz, MergeNetsplitBlock: bigz, //TerminalTotalDifficulty: ttd, - //TerminalTotalDifficultyPassed: false, + TerminalTotalDifficulty: bigz, + TerminalTotalDifficultyPassed: true, //Clique: ¶ms.CliqueConfig{ // Period: cfg.SecondsPerETH1Block, // Epoch: 20000, //}, - ShanghaiTime: &genesisTime, - CancunTime: &genesisTime, + ShanghaiTime: &shanghaiTime, + CancunTime: cancunTime, PragueTime: pragueTime, } da := defaultDepositContractAllocation(cfg.DepositContractAddress) diff --git a/runtime/interop/premine-state.go b/runtime/interop/premine-state.go index b34445a0076a..339454c9dc59 100644 --- a/runtime/interop/premine-state.go +++ b/runtime/interop/premine-state.go @@ -620,17 +620,18 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error { } case version.Capella: payload := &enginev1.ExecutionPayloadCapella{ - ParentHash: gb.ParentHash().Bytes(), - FeeRecipient: gb.Coinbase().Bytes(), - StateRoot: gb.Root().Bytes(), - ReceiptsRoot: gb.ReceiptHash().Bytes(), - LogsBloom: gb.Bloom().Bytes(), - PrevRandao: params.BeaconConfig().ZeroHash[:], - BlockNumber: gb.NumberU64(), - GasLimit: gb.GasLimit(), - GasUsed: gb.GasUsed(), - Timestamp: gb.Time(), - ExtraData: gb.Extra()[:32], + ParentHash: gb.ParentHash().Bytes(), + FeeRecipient: gb.Coinbase().Bytes(), + StateRoot: gb.Root().Bytes(), + ReceiptsRoot: gb.ReceiptHash().Bytes(), + LogsBloom: gb.Bloom().Bytes(), + PrevRandao: params.BeaconConfig().ZeroHash[:], + BlockNumber: gb.NumberU64(), + GasLimit: gb.GasLimit(), + GasUsed: gb.GasUsed(), + Timestamp: gb.Time(), + //ExtraData: gb.Extra()[:32], + ExtraData: gb.Extra(), BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength), BlockHash: gb.Hash().Bytes(), Transactions: make([][]byte, 0), diff --git a/testing/endtoend/components/eth1/miner.go b/testing/endtoend/components/eth1/miner.go index 2ae2c58551fb..e7ca99ce8fe6 100644 --- a/testing/endtoend/components/eth1/miner.go +++ b/testing/endtoend/components/eth1/miner.go @@ -121,7 +121,7 @@ func (m *Miner) initAttempt(ctx context.Context, attempt int) (*os.File, error) return nil, err } - //pwFile := m.DataDir("keystore", minerPasswordFile) + pwFile := m.DataDir("keystore", minerPasswordFile) args := []string{ "--nat=none", // disable nat traversal in e2e, it is failure prone and not needed fmt.Sprintf("--datadir=%s", m.DataDir()), @@ -149,20 +149,20 @@ func (m *Miner) initAttempt(ctx context.Context, attempt int) (*os.File, error) "--syncmode=full", //fmt.Sprintf("--miner.etherbase=%s", EthAddress), fmt.Sprintf("--txpool.locals=%s", EthAddress), - //fmt.Sprintf("--password=%s", pwFile), + fmt.Sprintf("--password=%s", pwFile), } - //keystorePath, err := e2e.TestParams.Paths.MinerKeyPath() - //if err != nil { - // return nil, err - //} - //if err = file.CopyFile(keystorePath, m.DataDir("keystore", minerFile)); err != nil { - // return nil, errors.Wrapf(err, "error copying %s to %s", keystorePath, m.DataDir("keystore", minerFile)) - //} - //err = file.WriteFile(pwFile, []byte(KeystorePassword)) - //if err != nil { - // return nil, err - //} + keystorePath, err := e2e.TestParams.Paths.MinerKeyPath() + if err != nil { + return nil, err + } + if err = file.CopyFile(keystorePath, m.DataDir("keystore", minerFile)); err != nil { + return nil, errors.Wrapf(err, "error copying %s to %s", keystorePath, m.DataDir("keystore", minerFile)) + } + err = file.WriteFile(pwFile, []byte(KeystorePassword)) + if err != nil { + return nil, err + } runCmd := exec.CommandContext(ctx, binaryPath, args...) // #nosec G204 -- Safe // redirect miner stderr to a log file diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index 7d1de12653e6..834825c9f84e 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -53,10 +53,10 @@ func e2eMinimal(t *testing.T, cfg *params.BeaconChainConfig, cfgo ...types.E2ECo ev.DepositedValidatorsAreActive, ev.ValidatorsVoteWithTheMajority, ev.ColdStateCheckpoint, - ev.AltairForkTransition, - ev.BellatrixForkTransition, - ev.CapellaForkTransition, - ev.DenebForkTransition, + //ev.AltairForkTransition, + //ev.BellatrixForkTransition, + //ev.CapellaForkTransition, + //ev.DenebForkTransition, ev.FinishedSyncing, ev.AllNodesHaveSameHead, ev.ValidatorSyncParticipation, diff --git a/testing/endtoend/minimal_e2e_test.go b/testing/endtoend/minimal_e2e_test.go index bddc3ae9e65b..57473cfc01b1 100644 --- a/testing/endtoend/minimal_e2e_test.go +++ b/testing/endtoend/minimal_e2e_test.go @@ -9,6 +9,6 @@ import ( ) func TestEndToEnd_MinimalConfig(t *testing.T) { - r := e2eMinimal(t, types.InitForkCfg(version.Deneb, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync()) + r := e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync()) r.run() } From 6d62bbfd18b734088ea22d1582b40ff24de8ccd9 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 30 Oct 2024 10:37:05 -0500 Subject: [PATCH 40/49] getting a little further --- beacon-chain/execution/engine_client.go | 6 +++--- runtime/interop/genesis.go | 8 ++++---- runtime/interop/premine-state.go | 25 ++++++++++++------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go index 22216a448c46..5215dba78cf4 100644 --- a/beacon-chain/execution/engine_client.go +++ b/beacon-chain/execution/engine_client.go @@ -216,7 +216,7 @@ func (s *Service) ForkchoiceUpdated( } switch attrs.Version() { case version.Bellatrix: - log.Error("NOT BELLATRIX!!!!!!") + log.Error("BELLATRIX!!!!!!") a, err := attrs.PbV1() if err != nil { return nil, nil, err @@ -226,7 +226,7 @@ func (s *Service) ForkchoiceUpdated( return nil, nil, handleRPCError(err) } case version.Capella: - log.Error("NOT CAPELLLAAAAAAA") + log.Error("CAPELLLAAAAAAA") a, err := attrs.PbV2() if err != nil { return nil, nil, err @@ -236,7 +236,7 @@ func (s *Service) ForkchoiceUpdated( return nil, nil, handleRPCError(err) } case version.Deneb, version.Electra: - log.Error("AHHHHHHHHHHHHHHHHHHHH THIS SHOULD BE CALLED!!!!!!!!!!!!") + log.Error("DENEBBBB") a, err := attrs.PbV3() if err != nil { return nil, nil, err diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index 3df4798a379a..c3e7d94672f4 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -171,14 +171,14 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co // panic(fmt.Sprintf("unable to decode DefaultCliqueSigner, with error %v", err.Error())) //} return &core.Genesis{ - Config: cc, - //Nonce: 0, // overridden for authorized signer votes in clique, so we should leave it empty? + Config: cc, + Nonce: 0, // overridden for authorized signer votes in clique, so we should leave it empty? Timestamp: genesisTime, //ExtraData: extra, GasLimit: cfg.DefaultBuilderGasLimit, Difficulty: common.HexToHash(defaultDifficulty).Big(), - //Mixhash: common.HexToHash(defaultMixhash), - //Coinbase: common.HexToAddress(defaultCoinbase), + Mixhash: common.HexToHash(defaultMixhash), + Coinbase: common.HexToAddress(defaultCoinbase), Alloc: types.GenesisAlloc{ da.Address: da.Account, ma.Address: ma.Account, diff --git a/runtime/interop/premine-state.go b/runtime/interop/premine-state.go index 339454c9dc59..b5a097a84c02 100644 --- a/runtime/interop/premine-state.go +++ b/runtime/interop/premine-state.go @@ -601,7 +601,7 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error { GasLimit: gb.GasLimit(), GasUsed: gb.GasUsed(), Timestamp: gb.Time(), - ExtraData: gb.Extra()[:32], + ExtraData: gb.Extra(), BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength), BlockHash: gb.Hash().Bytes(), Transactions: make([][]byte, 0), @@ -620,17 +620,16 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error { } case version.Capella: payload := &enginev1.ExecutionPayloadCapella{ - ParentHash: gb.ParentHash().Bytes(), - FeeRecipient: gb.Coinbase().Bytes(), - StateRoot: gb.Root().Bytes(), - ReceiptsRoot: gb.ReceiptHash().Bytes(), - LogsBloom: gb.Bloom().Bytes(), - PrevRandao: params.BeaconConfig().ZeroHash[:], - BlockNumber: gb.NumberU64(), - GasLimit: gb.GasLimit(), - GasUsed: gb.GasUsed(), - Timestamp: gb.Time(), - //ExtraData: gb.Extra()[:32], + ParentHash: gb.ParentHash().Bytes(), + FeeRecipient: gb.Coinbase().Bytes(), + StateRoot: gb.Root().Bytes(), + ReceiptsRoot: gb.ReceiptHash().Bytes(), + LogsBloom: gb.Bloom().Bytes(), + PrevRandao: params.BeaconConfig().ZeroHash[:], + BlockNumber: gb.NumberU64(), + GasLimit: gb.GasLimit(), + GasUsed: gb.GasUsed(), + Timestamp: gb.Time(), ExtraData: gb.Extra(), BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength), BlockHash: gb.Hash().Bytes(), @@ -661,7 +660,7 @@ func (s *PremineGenesisConfig) setExecutionPayload(g state.BeaconState) error { GasLimit: gb.GasLimit(), GasUsed: gb.GasUsed(), Timestamp: gb.Time(), - ExtraData: gb.Extra()[:32], + ExtraData: gb.Extra(), BaseFeePerGas: bytesutil.PadTo(bytesutil.ReverseByteOrder(gb.BaseFee().Bytes()), fieldparams.RootLength), BlockHash: gb.Hash().Bytes(), Transactions: make([][]byte, 0), From 229254e939cb0102350bbed1a8b8cb9f32b93411 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 30 Oct 2024 13:34:21 -0500 Subject: [PATCH 41/49] getting a little further --- runtime/interop/genesis.go | 2 +- testing/endtoend/params/params.go | 3 ++- time/slots/slottime.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index c3e7d94672f4..bd9a510e0569 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -133,7 +133,7 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co //shanghaiTime := GethShanghaiTime(genesisTime, cfg) cancunTime := GethCancunTime(genesisTime, cfg) - shanghaiTime := uint64(0) + shanghaiTime := genesisTime //cancunTime := uint64(0) pragueTime := GethPragueTime(genesisTime, cfg) cc := ¶ms.ChainConfig{ diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go index ea58554f33f8..d537d022fa9e 100644 --- a/testing/endtoend/params/params.go +++ b/testing/endtoend/params/params.go @@ -209,7 +209,8 @@ func Init(t *testing.T, beaconNodeCount int) error { return err } - genTime := uint64(time.Now().Unix()) + startupBufferSecs + //genTime := uint64(time.Now().Unix()) + startupBufferSecs + genTime := uint64(time.Now().Unix()) TestParams = ¶ms{ TestPath: filepath.Join(testPath, fmt.Sprintf("shard-%d", testShardIndex)), LogPath: logPath, diff --git a/time/slots/slottime.go b/time/slots/slottime.go index 273b0f5f95fc..4c5f97bf021b 100644 --- a/time/slots/slottime.go +++ b/time/slots/slottime.go @@ -265,7 +265,7 @@ func SyncCommitteePeriodStartEpoch(e primitives.Epoch) (primitives.Epoch, error) // given slot start time func SecondsSinceSlotStart(s primitives.Slot, genesisTime, timeStamp uint64) (uint64, error) { if timeStamp < genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot { - return 0, errors.New("could not compute seconds since slot start: invalid timestamp") + return 0, fmt.Errorf("could not compute seconds since slot start: invalid timestamp. got %d, want %d", timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot) } return timeStamp - genesisTime - uint64(s)*params.BeaconConfig().SecondsPerSlot, nil } From c83cd7614730aa1a1bd61af6d3cb5be7af14e3db Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 30 Oct 2024 15:12:41 -0500 Subject: [PATCH 42/49] setting everything to capella --- testing/endtoend/mainnet_e2e_test.go | 4 ++-- testing/endtoend/mainnet_scenario_e2e_test.go | 2 +- testing/endtoend/minimal_builder_e2e_test.go | 4 ++-- testing/endtoend/minimal_scenario_e2e_test.go | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/endtoend/mainnet_e2e_test.go b/testing/endtoend/mainnet_e2e_test.go index feaa908b56c6..24336b03bd0a 100644 --- a/testing/endtoend/mainnet_e2e_test.go +++ b/testing/endtoend/mainnet_e2e_test.go @@ -10,10 +10,10 @@ import ( // Run mainnet e2e config with the current release validator against latest beacon node. func TestEndToEnd_MainnetConfig_ValidatorAtCurrentRelease(t *testing.T) { - r := e2eMainnet(t, true, false, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig())) + r := e2eMainnet(t, true, false, types.InitForkCfg(version.Capella, version.Deneb, params.E2EMainnetTestConfig())) r.run() } func TestEndToEnd_MainnetConfig_MultiClient(t *testing.T) { - e2eMainnet(t, false, true, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig()), types.WithValidatorCrossClient()).run() + e2eMainnet(t, false, true, types.InitForkCfg(version.Capella, version.Deneb, params.E2EMainnetTestConfig()), types.WithValidatorCrossClient()).run() } diff --git a/testing/endtoend/mainnet_scenario_e2e_test.go b/testing/endtoend/mainnet_scenario_e2e_test.go index 0c41a2cfc468..abe66c0858f8 100644 --- a/testing/endtoend/mainnet_scenario_e2e_test.go +++ b/testing/endtoend/mainnet_scenario_e2e_test.go @@ -9,7 +9,7 @@ import ( ) func TestEndToEnd_MultiScenarioRun_Multiclient(t *testing.T) { - runner := e2eMainnet(t, false, true, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig()), types.WithEpochs(24)) + runner := e2eMainnet(t, false, true, types.InitForkCfg(version.Capella, version.Deneb, params.E2EMainnetTestConfig()), types.WithEpochs(24)) runner.config.Evaluators = scenarioEvalsMulti() runner.config.EvalInterceptor = runner.multiScenarioMulticlient runner.scenarioRunner() diff --git a/testing/endtoend/minimal_builder_e2e_test.go b/testing/endtoend/minimal_builder_e2e_test.go index f47677505463..e95cf238f483 100644 --- a/testing/endtoend/minimal_builder_e2e_test.go +++ b/testing/endtoend/minimal_builder_e2e_test.go @@ -9,11 +9,11 @@ import ( ) func TestEndToEnd_MinimalConfig_WithBuilder(t *testing.T) { - r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder()) + r := e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder()) r.run() } func TestEndToEnd_MinimalConfig_WithBuilder_ValidatorRESTApi(t *testing.T) { - r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder(), types.WithValidatorRESTApi()) + r := e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithBuilder(), types.WithValidatorRESTApi()) r.run() } diff --git a/testing/endtoend/minimal_scenario_e2e_test.go b/testing/endtoend/minimal_scenario_e2e_test.go index e542859fe053..10f5caf00f34 100644 --- a/testing/endtoend/minimal_scenario_e2e_test.go +++ b/testing/endtoend/minimal_scenario_e2e_test.go @@ -9,7 +9,7 @@ import ( ) func TestEndToEnd_MultiScenarioRun(t *testing.T) { - runner := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithEpochs(26)) + runner := e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithEpochs(26)) runner.config.Evaluators = scenarioEvals() runner.config.EvalInterceptor = runner.multiScenario @@ -17,20 +17,20 @@ func TestEndToEnd_MultiScenarioRun(t *testing.T) { } func TestEndToEnd_MinimalConfig_Web3Signer(t *testing.T) { - e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithRemoteSigner()).run() + e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithRemoteSigner()).run() } func TestEndToEnd_MinimalConfig_Web3Signer_PersistentKeys(t *testing.T) { - e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithRemoteSignerAndPersistentKeysFile()).run() + e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithRemoteSignerAndPersistentKeysFile()).run() } func TestEndToEnd_MinimalConfig_ValidatorRESTApi(t *testing.T) { - e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithValidatorRESTApi()).run() + e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithValidatorRESTApi()).run() } func TestEndToEnd_ScenarioRun_EEOffline(t *testing.T) { t.Skip("TODO(#10242) Prysm is current unable to handle an offline e2e") - runner := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2ETestConfig())) + runner := e2eMinimal(t, types.InitForkCfg(version.Capella, version.Deneb, params.E2ETestConfig())) runner.config.Evaluators = scenarioEvals() runner.config.EvalInterceptor = runner.eeOffline From d0a2e1085266910a3eed2ececc01f3c98dbb7cde Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 30 Oct 2024 16:49:56 -0500 Subject: [PATCH 43/49] more partial fixes --- testing/endtoend/components/eth1/transactions.go | 11 +++++++++-- testing/endtoend/params/params.go | 5 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index 6fe40529245c..c36993a2e435 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -265,8 +265,15 @@ func RandomBlobTx(rpc *rpc.Client, f *filler.Filler, sender common.Address, nonc } return New4844Tx(nonce, &to, gas, chainID, tip, feecap, value, code, big.NewInt(1000000), data, make(types.AccessList, 0)), nil case 1: - // 4844 transaction with AL - tx := types.NewTransaction(nonce, to, value, gas, gasPrice, code) + // 4844 transaction with AL nonce, to, value, gas, gasPrice, code + tx := types.NewTx(&types.AccessListTx{ + Nonce: nonce, + To: &to, + Value: value, + Gas: gas, + GasPrice: gasPrice, + Data: code, + }) al, err := txfuzz.CreateAccessList(rpc, tx, sender) if err != nil { return nil, err diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go index d537d022fa9e..3246110edd7c 100644 --- a/testing/endtoend/params/params.go +++ b/testing/endtoend/params/params.go @@ -159,7 +159,7 @@ const ( jaegerTracingPort = 9150 - startupBufferSecs = 15 + startupBufferSecs = 5 ) func logDir() string { @@ -209,8 +209,7 @@ func Init(t *testing.T, beaconNodeCount int) error { return err } - //genTime := uint64(time.Now().Unix()) + startupBufferSecs - genTime := uint64(time.Now().Unix()) + genTime := uint64(time.Now().Unix()) + startupBufferSecs TestParams = ¶ms{ TestPath: filepath.Join(testPath, fmt.Sprintf("shard-%d", testShardIndex)), LogPath: logPath, From e80f522aad179ebce0c22e2bb169ef5134daf434 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 1 Nov 2024 16:03:07 -0500 Subject: [PATCH 44/49] more fixes but still WIP --- beacon-chain/execution/engine_client.go | 3 --- testing/endtoend/component_handler_test.go | 3 +++ .../endtoend/components/eth1/transactions.go | 22 +++++++++---------- testing/endtoend/params/params.go | 2 +- time/slots/slottime.go | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go index 5215dba78cf4..6acb0eafd7d1 100644 --- a/beacon-chain/execution/engine_client.go +++ b/beacon-chain/execution/engine_client.go @@ -216,7 +216,6 @@ func (s *Service) ForkchoiceUpdated( } switch attrs.Version() { case version.Bellatrix: - log.Error("BELLATRIX!!!!!!") a, err := attrs.PbV1() if err != nil { return nil, nil, err @@ -226,7 +225,6 @@ func (s *Service) ForkchoiceUpdated( return nil, nil, handleRPCError(err) } case version.Capella: - log.Error("CAPELLLAAAAAAA") a, err := attrs.PbV2() if err != nil { return nil, nil, err @@ -236,7 +234,6 @@ func (s *Service) ForkchoiceUpdated( return nil, nil, handleRPCError(err) } case version.Deneb, version.Electra: - log.Error("DENEBBBB") a, err := attrs.PbV3() if err != nil { return nil, nil, err diff --git a/testing/endtoend/component_handler_test.go b/testing/endtoend/component_handler_test.go index 11a1ece74424..b1bd682aeae9 100644 --- a/testing/endtoend/component_handler_test.go +++ b/testing/endtoend/component_handler_test.go @@ -169,6 +169,9 @@ func (c *componentHandler) setup() { c.eth1Proxy = proxies } + // timeout while we wait for the eth1 client to sync + time.Sleep(10 * time.Second) + // Beacon nodes. beaconNodes := components.NewBeaconNodes(config) g.Go(func() error { diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index c36993a2e435..929521e73cd8 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -257,34 +257,34 @@ func RandomBlobTx(rpc *rpc.Client, f *filler.Filler, sender common.Address, nonc // 4844 transaction without AL tip, feecap, err := getCaps(rpc, gasPrice) if err != nil { - return nil, err + return nil, errors.Wrap(err, "getCaps") } data, err := randomBlobData() if err != nil { - return nil, err + return nil, errors.Wrap(err, "randomBlobData") } return New4844Tx(nonce, &to, gas, chainID, tip, feecap, value, code, big.NewInt(1000000), data, make(types.AccessList, 0)), nil case 1: // 4844 transaction with AL nonce, to, value, gas, gasPrice, code tx := types.NewTx(&types.AccessListTx{ - Nonce: nonce, - To: &to, - Value: value, - Gas: gas, - GasPrice: gasPrice, - Data: code, + Nonce: nonce, + To: &to, + Value: value, + Gas: gas, + //GasPrice: gasPrice, + Data: code, }) al, err := txfuzz.CreateAccessList(rpc, tx, sender) if err != nil { - return nil, err + return nil, errors.Wrap(err, "CreateAccessList") } tip, feecap, err := getCaps(rpc, gasPrice) if err != nil { - return nil, err + return nil, errors.Wrap(err, "getCaps") } data, err := randomBlobData() if err != nil { - return nil, err + return nil, errors.Wrap(err, "randomBlobData") } return New4844Tx(nonce, &to, gas, chainID, tip, feecap, value, code, big.NewInt(1000000), data, *al), nil } diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go index 3246110edd7c..df3a2d4818e6 100644 --- a/testing/endtoend/params/params.go +++ b/testing/endtoend/params/params.go @@ -159,7 +159,7 @@ const ( jaegerTracingPort = 9150 - startupBufferSecs = 5 + startupBufferSecs = 35 ) func logDir() string { diff --git a/time/slots/slottime.go b/time/slots/slottime.go index 4c5f97bf021b..ba065e1cc3bb 100644 --- a/time/slots/slottime.go +++ b/time/slots/slottime.go @@ -265,7 +265,7 @@ func SyncCommitteePeriodStartEpoch(e primitives.Epoch) (primitives.Epoch, error) // given slot start time func SecondsSinceSlotStart(s primitives.Slot, genesisTime, timeStamp uint64) (uint64, error) { if timeStamp < genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot { - return 0, fmt.Errorf("could not compute seconds since slot start: invalid timestamp. got %d, want %d", timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot) + return 0, fmt.Errorf("could not compute seconds since slot start: invalid timestamp.slot%d got %d, want %d", s, timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot) } return timeStamp - genesisTime - uint64(s)*params.BeaconConfig().SecondsPerSlot, nil } From 9d891bb0f411aea39e68ee61ef7d25b1a5012a7c Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 4 Nov 2024 14:59:00 -0600 Subject: [PATCH 45/49] fixing access list transactions" --- beacon-chain/sync/subscriber_beacon_blocks.go | 4 +++ testing/endtoend/components/eth1/BUILD.bazel | 2 ++ .../endtoend/components/eth1/transactions.go | 30 ++++++++++++++----- time/slots/slottime.go | 2 +- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/beacon-chain/sync/subscriber_beacon_blocks.go b/beacon-chain/sync/subscriber_beacon_blocks.go index 45e8608449cb..02378d077503 100644 --- a/beacon-chain/sync/subscriber_beacon_blocks.go +++ b/beacon-chain/sync/subscriber_beacon_blocks.go @@ -12,6 +12,7 @@ import ( "github.com/prysmaticlabs/prysm/v5/consensus-types/blocks" "github.com/prysmaticlabs/prysm/v5/consensus-types/interfaces" "github.com/prysmaticlabs/prysm/v5/io/file" + "github.com/prysmaticlabs/prysm/v5/runtime/version" "github.com/prysmaticlabs/prysm/v5/time/slots" "google.golang.org/protobuf/proto" ) @@ -62,6 +63,9 @@ func (s *Service) beaconBlockSubscriber(ctx context.Context, msg proto.Message) // This function reconstructs the blob sidecars from the EL using the block's KZG commitments, // broadcasts the reconstructed blobs over P2P, and saves them into the blob storage. func (s *Service) reconstructAndBroadcastBlobs(ctx context.Context, block interfaces.ReadOnlySignedBeaconBlock) { + if block.Version() < version.Deneb { + return + } startTime, err := slots.ToTime(uint64(s.cfg.chain.GenesisTime().Unix()), block.Block().Slot()) if err != nil { log.WithError(err).Error("Failed to convert slot to time") diff --git a/testing/endtoend/components/eth1/BUILD.bazel b/testing/endtoend/components/eth1/BUILD.bazel index 46bc9c0a7c92..93facd8b3be1 100644 --- a/testing/endtoend/components/eth1/BUILD.bazel +++ b/testing/endtoend/components/eth1/BUILD.bazel @@ -28,12 +28,14 @@ go_library( "//testing/endtoend/types:go_default_library", "//testing/middleware/engine-api-proxy:go_default_library", "//testing/util:go_default_library", + "@com_github_ethereum_go_ethereum//:go_default_library", "@com_github_ethereum_go_ethereum//accounts/abi/bind:go_default_library", "@com_github_ethereum_go_ethereum//accounts/keystore:go_default_library", "@com_github_ethereum_go_ethereum//common:go_default_library", "@com_github_ethereum_go_ethereum//core/types:go_default_library", "@com_github_ethereum_go_ethereum//crypto/kzg4844:go_default_library", "@com_github_ethereum_go_ethereum//ethclient:go_default_library", + "@com_github_ethereum_go_ethereum//ethclient/gethclient:go_default_library", "@com_github_ethereum_go_ethereum//rpc:go_default_library", "@com_github_holiman_uint256//:go_default_library", "@com_github_mariusvanderwijden_fuzzyvm//filler:go_default_library", diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go index 929521e73cd8..33601d97b62b 100644 --- a/testing/endtoend/components/eth1/transactions.go +++ b/testing/endtoend/components/eth1/transactions.go @@ -12,11 +12,13 @@ import ( "github.com/MariusVanDerWijden/FuzzyVM/filler" txfuzz "github.com/MariusVanDerWijden/tx-fuzz" + "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/accounts/keystore" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/ethereum/go-ethereum/ethclient" + "github.com/ethereum/go-ethereum/ethclient/gethclient" "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" "github.com/pkg/errors" @@ -266,15 +268,27 @@ func RandomBlobTx(rpc *rpc.Client, f *filler.Filler, sender common.Address, nonc return New4844Tx(nonce, &to, gas, chainID, tip, feecap, value, code, big.NewInt(1000000), data, make(types.AccessList, 0)), nil case 1: // 4844 transaction with AL nonce, to, value, gas, gasPrice, code - tx := types.NewTx(&types.AccessListTx{ - Nonce: nonce, - To: &to, - Value: value, - Gas: gas, - //GasPrice: gasPrice, - Data: code, + tx := types.NewTx(&types.LegacyTx{ + Nonce: nonce, + To: &to, + Value: value, + Gas: gas, + GasPrice: gasPrice, + Data: code, }) - al, err := txfuzz.CreateAccessList(rpc, tx, sender) + + // TODO: replace call with al, err := txfuzz.CreateAccessList(rpc, tx, sender) when txfuzz is fixed in new release + msg := ethereum.CallMsg{ + From: sender, + To: tx.To(), + Gas: tx.Gas(), + GasPrice: tx.GasPrice(), + Value: tx.Value(), + Data: tx.Data(), + AccessList: nil, + } + geth := gethclient.New(rpc) + al, _, _, err := geth.CreateAccessList(context.Background(), msg) if err != nil { return nil, errors.Wrap(err, "CreateAccessList") } diff --git a/time/slots/slottime.go b/time/slots/slottime.go index ba065e1cc3bb..3950094bf390 100644 --- a/time/slots/slottime.go +++ b/time/slots/slottime.go @@ -265,7 +265,7 @@ func SyncCommitteePeriodStartEpoch(e primitives.Epoch) (primitives.Epoch, error) // given slot start time func SecondsSinceSlotStart(s primitives.Slot, genesisTime, timeStamp uint64) (uint64, error) { if timeStamp < genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot { - return 0, fmt.Errorf("could not compute seconds since slot start: invalid timestamp.slot%d got %d, want %d", s, timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot) + return 0, fmt.Errorf("could not compute seconds since slot %d start: invalid timestamp, got %d < want %d", s, timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot) } return timeStamp - genesisTime - uint64(s)*params.BeaconConfig().SecondsPerSlot, nil } From 608eb1a20e7e8396d7f8d0514431e3f9662a212d Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 4 Nov 2024 17:12:56 -0600 Subject: [PATCH 46/49] some cleanup --- runtime/interop/genesis.go | 61 +++++++++-------------- testing/endtoend/components/eth1/miner.go | 2 - testing/endtoend/endtoend_setup_test.go | 10 ++-- 3 files changed, 28 insertions(+), 45 deletions(-) diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index bd9a510e0569..6b165c86f081 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -126,55 +126,40 @@ func GethPragueTime(genesisTime uint64, cfg *clparams.BeaconChainConfig) *uint64 // like in an e2e test. The parameters are minimal but the full value is returned unmarshaled so that it can be // customized as desired. func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *core.Genesis { - //ttd, ok := big.NewInt(0).SetString(clparams.BeaconConfig().TerminalTotalDifficulty, 10) - //if !ok { - // panic(fmt.Sprintf("unable to parse TerminalTotalDifficulty as an integer = %s", clparams.BeaconConfig().TerminalTotalDifficulty)) - //} - //shanghaiTime := GethShanghaiTime(genesisTime, cfg) + // TODO: make these times dynamic... cancunTime := GethCancunTime(genesisTime, cfg) shanghaiTime := genesisTime - //cancunTime := uint64(0) pragueTime := GethPragueTime(genesisTime, cfg) cc := ¶ms.ChainConfig{ - ChainID: big.NewInt(defaultTestChainId), - HomesteadBlock: bigz, - DAOForkBlock: bigz, - EIP150Block: bigz, - EIP155Block: bigz, - EIP158Block: bigz, - ByzantiumBlock: bigz, - ConstantinopleBlock: bigz, - PetersburgBlock: bigz, - IstanbulBlock: bigz, - MuirGlacierBlock: bigz, - BerlinBlock: bigz, - LondonBlock: bigz, - ArrowGlacierBlock: bigz, - GrayGlacierBlock: bigz, - MergeNetsplitBlock: bigz, - //TerminalTotalDifficulty: ttd, + ChainID: big.NewInt(defaultTestChainId), + HomesteadBlock: bigz, + DAOForkBlock: bigz, + EIP150Block: bigz, + EIP155Block: bigz, + EIP158Block: bigz, + ByzantiumBlock: bigz, + ConstantinopleBlock: bigz, + PetersburgBlock: bigz, + IstanbulBlock: bigz, + MuirGlacierBlock: bigz, + BerlinBlock: bigz, + LondonBlock: bigz, + ArrowGlacierBlock: bigz, + GrayGlacierBlock: bigz, + MergeNetsplitBlock: bigz, TerminalTotalDifficulty: bigz, TerminalTotalDifficultyPassed: true, - //Clique: ¶ms.CliqueConfig{ - // Period: cfg.SecondsPerETH1Block, - // Epoch: 20000, - //}, - ShanghaiTime: &shanghaiTime, - CancunTime: cancunTime, - PragueTime: pragueTime, + ShanghaiTime: &shanghaiTime, + CancunTime: cancunTime, + PragueTime: pragueTime, } da := defaultDepositContractAllocation(cfg.DepositContractAddress) ma := minerAllocation() - //extra, err := hexutil.Decode(DefaultCliqueSigner) - //if err != nil { - // panic(fmt.Sprintf("unable to decode DefaultCliqueSigner, with error %v", err.Error())) - //} return &core.Genesis{ - Config: cc, - Nonce: 0, // overridden for authorized signer votes in clique, so we should leave it empty? - Timestamp: genesisTime, - //ExtraData: extra, + Config: cc, + Nonce: 0, // overridden for authorized signer votes in clique, so we should leave it empty? + Timestamp: genesisTime, GasLimit: cfg.DefaultBuilderGasLimit, Difficulty: common.HexToHash(defaultDifficulty).Big(), Mixhash: common.HexToHash(defaultMixhash), diff --git a/testing/endtoend/components/eth1/miner.go b/testing/endtoend/components/eth1/miner.go index e7ca99ce8fe6..461c293993c3 100644 --- a/testing/endtoend/components/eth1/miner.go +++ b/testing/endtoend/components/eth1/miner.go @@ -143,11 +143,9 @@ func (m *Miner) initAttempt(ctx context.Context, attempt int) (*os.File, error) "--ws.origins=\"*\"", "--ipcdisable", "--verbosity=4", - //"--mine", fmt.Sprintf("--unlock=%s", EthAddress), "--allow-insecure-unlock", "--syncmode=full", - //fmt.Sprintf("--miner.etherbase=%s", EthAddress), fmt.Sprintf("--txpool.locals=%s", EthAddress), fmt.Sprintf("--password=%s", pwFile), } diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index 834825c9f84e..7cd3984b9503 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -53,10 +53,10 @@ func e2eMinimal(t *testing.T, cfg *params.BeaconChainConfig, cfgo ...types.E2ECo ev.DepositedValidatorsAreActive, ev.ValidatorsVoteWithTheMajority, ev.ColdStateCheckpoint, - //ev.AltairForkTransition, + //ev.AltairForkTransition, TODO: Re-enable if able to start from older fork. //ev.BellatrixForkTransition, //ev.CapellaForkTransition, - //ev.DenebForkTransition, + ev.DenebForkTransition, ev.FinishedSyncing, ev.AllNodesHaveSameHead, ev.ValidatorSyncParticipation, @@ -128,9 +128,9 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfg *params.Beaco ev.ValidatorsHaveWithdrawn, ev.DepositedValidatorsAreActive, ev.ColdStateCheckpoint, - ev.AltairForkTransition, - ev.BellatrixForkTransition, - ev.CapellaForkTransition, + //ev.AltairForkTransition, TODO: Re-enable if able to start from older fork. + //ev.BellatrixForkTransition, + //ev.CapellaForkTransition, ev.DenebForkTransition, ev.FinishedSyncing, ev.AllNodesHaveSameHead, From 2939be1904dd66de49321f4878115aa905adefd5 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 5 Nov 2024 10:59:27 -0600 Subject: [PATCH 47/49] making configs dynamic --- runtime/interop/genesis.go | 15 ++++++++--- testing/endtoend/endtoend_setup_test.go | 33 +++++++++++++++++++------ 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index 6b165c86f081..d9bfb167bac2 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -126,11 +126,18 @@ func GethPragueTime(genesisTime uint64, cfg *clparams.BeaconChainConfig) *uint64 // like in an e2e test. The parameters are minimal but the full value is returned unmarshaled so that it can be // customized as desired. func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *core.Genesis { - //shanghaiTime := GethShanghaiTime(genesisTime, cfg) - // TODO: make these times dynamic... + shanghaiTime := GethShanghaiTime(genesisTime, cfg) + if cfg.CapellaForkEpoch == 0 { + shanghaiTime = &genesisTime + } cancunTime := GethCancunTime(genesisTime, cfg) - shanghaiTime := genesisTime + if cfg.DenebForkEpoch == 0 { + cancunTime = &genesisTime + } pragueTime := GethPragueTime(genesisTime, cfg) + if cfg.ElectraForkEpoch == 0 { + pragueTime = &genesisTime + } cc := ¶ms.ChainConfig{ ChainID: big.NewInt(defaultTestChainId), HomesteadBlock: bigz, @@ -150,7 +157,7 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co MergeNetsplitBlock: bigz, TerminalTotalDifficulty: bigz, TerminalTotalDifficultyPassed: true, - ShanghaiTime: &shanghaiTime, + ShanghaiTime: shanghaiTime, CancunTime: cancunTime, PragueTime: pragueTime, } diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index 7cd3984b9503..81ef7c300a84 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -53,16 +53,25 @@ func e2eMinimal(t *testing.T, cfg *params.BeaconChainConfig, cfgo ...types.E2ECo ev.DepositedValidatorsAreActive, ev.ValidatorsVoteWithTheMajority, ev.ColdStateCheckpoint, - //ev.AltairForkTransition, TODO: Re-enable if able to start from older fork. - //ev.BellatrixForkTransition, - //ev.CapellaForkTransition, - ev.DenebForkTransition, ev.FinishedSyncing, ev.AllNodesHaveSameHead, ev.ValidatorSyncParticipation, ev.FeeRecipientIsPresent, //ev.TransactionsPresent, TODO: Re-enable Transaction evaluator once it tx pool issues are fixed. } + if cfg.AltairForkEpoch != 0 && cfg.AltairForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.AltairForkTransition) + } + if cfg.BellatrixForkEpoch != 0 && cfg.BellatrixForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.BellatrixForkTransition) + } + if cfg.CapellaForkEpoch != 0 && cfg.CapellaForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.CapellaForkTransition) + } + if cfg.DenebForkEpoch != 0 && cfg.DenebForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.DenebForkTransition) + } + testConfig := &types.E2EConfig{ BeaconFlags: []string{ fmt.Sprintf("--slots-per-archive-point=%d", params.BeaconConfig().SlotsPerEpoch*16), @@ -128,15 +137,23 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfg *params.Beaco ev.ValidatorsHaveWithdrawn, ev.DepositedValidatorsAreActive, ev.ColdStateCheckpoint, - //ev.AltairForkTransition, TODO: Re-enable if able to start from older fork. - //ev.BellatrixForkTransition, - //ev.CapellaForkTransition, - ev.DenebForkTransition, ev.FinishedSyncing, ev.AllNodesHaveSameHead, ev.FeeRecipientIsPresent, //ev.TransactionsPresent, TODO: Re-enable Transaction evaluator once it tx pool issues are fixed. } + if cfg.AltairForkEpoch != 0 && cfg.AltairForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.AltairForkTransition) + } + if cfg.BellatrixForkEpoch != 0 && cfg.BellatrixForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.BellatrixForkTransition) + } + if cfg.CapellaForkEpoch != 0 && cfg.CapellaForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.CapellaForkTransition) + } + if cfg.DenebForkEpoch != 0 && cfg.DenebForkEpoch != params.BeaconConfig().FarFutureEpoch { + evals = append(evals, ev.DenebForkTransition) + } testConfig := &types.E2EConfig{ BeaconFlags: []string{ fmt.Sprintf("--slots-per-archive-point=%d", params.BeaconConfig().SlotsPerEpoch*16), From f94cc3bb8d2d024f2eaade2b69f05d066bed11a0 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 5 Nov 2024 11:20:53 -0600 Subject: [PATCH 48/49] reverting time --- testing/endtoend/params/params.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go index df3a2d4818e6..ea58554f33f8 100644 --- a/testing/endtoend/params/params.go +++ b/testing/endtoend/params/params.go @@ -159,7 +159,7 @@ const ( jaegerTracingPort = 9150 - startupBufferSecs = 35 + startupBufferSecs = 15 ) func logDir() string { From 92b03a3cf315d01719de90b995e4789ba0f53cdf Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 5 Nov 2024 16:21:40 -0600 Subject: [PATCH 49/49] skip lower bound in builder --- testing/endtoend/component_handler_test.go | 6 +++--- testing/endtoend/evaluators/builder.go | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/testing/endtoend/component_handler_test.go b/testing/endtoend/component_handler_test.go index b1bd682aeae9..7ba54da3bd84 100644 --- a/testing/endtoend/component_handler_test.go +++ b/testing/endtoend/component_handler_test.go @@ -139,6 +139,9 @@ func (c *componentHandler) setup() { appendDebugEndpoints(config) } + // timeout while we wait for the eth1 client to sync + time.Sleep(10 * time.Second) + var builders *components.BuilderSet var proxies *eth1.ProxySet if config.UseBuilder { @@ -169,9 +172,6 @@ func (c *componentHandler) setup() { c.eth1Proxy = proxies } - // timeout while we wait for the eth1 client to sync - time.Sleep(10 * time.Second) - // Beacon nodes. beaconNodes := components.NewBeaconNodes(config) g.Go(func() error { diff --git a/testing/endtoend/evaluators/builder.go b/testing/endtoend/evaluators/builder.go index e9a7f8ebc21b..c696e8982da9 100644 --- a/testing/endtoend/evaluators/builder.go +++ b/testing/endtoend/evaluators/builder.go @@ -3,11 +3,13 @@ package evaluators import ( "context" + "github.com/ethereum/go-ethereum/common/hexutil" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v5/config/params" "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives" "github.com/prysmaticlabs/prysm/v5/encoding/ssz" ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1" + "github.com/prysmaticlabs/prysm/v5/runtime/version" "github.com/prysmaticlabs/prysm/v5/testing/endtoend/policies" e2etypes "github.com/prysmaticlabs/prysm/v5/testing/endtoend/types" "github.com/prysmaticlabs/prysm/v5/time/slots" @@ -64,7 +66,7 @@ func builderActive(_ *e2etypes.EvaluationContext, conns ...*grpc.ClientConn) err if err != nil { return err } - if forkStartSlot == b.Block().Slot() || forkStartSlot+1 == b.Block().Slot() { + if forkStartSlot == b.Block().Slot() || forkStartSlot+1 == b.Block().Slot() || lowestBound <= 1 { // Skip fork slot and the next one, as we don't send FCUs yet. continue } @@ -82,10 +84,10 @@ func builderActive(_ *e2etypes.EvaluationContext, conns ...*grpc.ClientConn) err continue } if string(execPayload.ExtraData()) != "prysm-builder" { - return errors.Errorf("block with slot %d was not built by the builder. It has an extra data of %s", b.Block().Slot(), string(execPayload.ExtraData())) + return errors.Errorf("%s block with slot %d was not built by the builder. It has an extra data of %s and txRoot of %s", version.String(b.Version()), b.Block().Slot(), string(execPayload.ExtraData()), hexutil.Encode(txRoot)) } if execPayload.GasLimit() == 0 { - return errors.Errorf("block with slot %d has a gas limit of 0, when it should be in the 30M range", b.Block().Slot()) + return errors.Errorf("%s block with slot %d has a gas limit of 0, when it should be in the 30M range", version.String(b.Version()), b.Block().Slot()) } } if lowestBound == currEpoch { @@ -107,7 +109,7 @@ func builderActive(_ *e2etypes.EvaluationContext, conns ...*grpc.ClientConn) err if err != nil { return err } - if forkStartSlot == b.Block().Slot() || forkStartSlot+1 == b.Block().Slot() { + if forkStartSlot == b.Block().Slot() || forkStartSlot+1 == b.Block().Slot() || lowestBound <= 1 { // Skip fork slot and the next one, as we don't send FCUs yet. continue } @@ -125,10 +127,10 @@ func builderActive(_ *e2etypes.EvaluationContext, conns ...*grpc.ClientConn) err continue } if string(execPayload.ExtraData()) != "prysm-builder" { - return errors.Errorf("block with slot %d was not built by the builder. It has an extra data of %s", b.Block().Slot(), string(execPayload.ExtraData())) + return errors.Errorf("%s block with slot %d was not built by the builder. It has an extra data of %s and txRoot of %s", version.String(b.Version()), b.Block().Slot(), string(execPayload.ExtraData()), hexutil.Encode(txRoot)) } if execPayload.GasLimit() == 0 { - return errors.Errorf("block with slot %d has a gas limit of 0, when it should be in the 30M range", b.Block().Slot()) + return errors.Errorf("%s block with slot %d has a gas limit of 0, when it should be in the 30M range", version.String(b.Version()), b.Block().Slot()) } } return nil