From 1c6cbc574e9ea5cd6255fb7c2a965e5ad3103d9e Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Thu, 25 Aug 2022 21:55:01 +0800 Subject: [PATCH] Update Geth Version In Prysm (#11308) * clean up * clean up --- deps.bzl | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- testing/endtoend/components/eth1/miner.go | 1 + testing/endtoend/components/eth1/node.go | 6 +----- testing/endtoend/evaluators/fork.go | 7 +++++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deps.bzl b/deps.bzl index 6b453dbda..638363e78 100644 --- a/deps.bzl +++ b/deps.bzl @@ -932,8 +932,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4=", - version = "v1.10.20", + sum = "h1:Xk8XAT4/UuqcjMLIMF+7imjkg32kfVFKoeyQDaO2yWM=", + version = "v1.10.23", ) go_repository( diff --git a/go.mod b/go.mod index 9dadc2d77..ec893a204 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,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.10.20 + github.com/ethereum/go-ethereum v1.10.23 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 github.com/fsnotify/fsnotify v1.5.4 github.com/ghodss/yaml v1.0.0 diff --git a/go.sum b/go.sum index 0b996be67..abd09228d 100644 --- a/go.sum +++ b/go.sum @@ -311,8 +311,8 @@ github.com/ethereum/go-ethereum v1.10.1/go.mod h1:E5e/zvdfUVr91JZ0AwjyuJM3x+no51 github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg= github.com/ethereum/go-ethereum v1.10.11/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= github.com/ethereum/go-ethereum v1.10.14-0.20211214103450-fc01a7ce8e4f/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= -github.com/ethereum/go-ethereum v1.10.20 h1:75IW830ClSS40yrQC1ZCMZCt5I+zU16oqId2SiQwdQ4= -github.com/ethereum/go-ethereum v1.10.20/go.mod h1:LWUN82TCHGpxB3En5HVmLLzPD7YSrEUFmFfN1nKkVN0= +github.com/ethereum/go-ethereum v1.10.23 h1:Xk8XAT4/UuqcjMLIMF+7imjkg32kfVFKoeyQDaO2yWM= +github.com/ethereum/go-ethereum v1.10.23/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= diff --git a/testing/endtoend/components/eth1/miner.go b/testing/endtoend/components/eth1/miner.go index 53d4b19d7..e18de68b0 100644 --- a/testing/endtoend/components/eth1/miner.go +++ b/testing/endtoend/components/eth1/miner.go @@ -133,6 +133,7 @@ func (m *Miner) Start(ctx context.Context) error { "--mine", fmt.Sprintf("--unlock=%s", EthAddress), "--allow-insecure-unlock", + "--syncmode=full", fmt.Sprintf("--txpool.locals=%s", EthAddress), fmt.Sprintf("--password=%s", eth1Path+"/keystore/"+minerPasswordFile), } diff --git a/testing/endtoend/components/eth1/node.go b/testing/endtoend/components/eth1/node.go index 54674af89..37740f1ba 100644 --- a/testing/endtoend/components/eth1/node.go +++ b/testing/endtoend/components/eth1/node.go @@ -90,13 +90,9 @@ func (node *Node) Start(ctx context.Context) error { "--ws.origins=\"*\"", "--ipcdisable", "--verbosity=4", + "--syncmode=full", fmt.Sprintf("--txpool.locals=%s", EthAddress), } - // If we are testing sync, geth needs to be run via full sync as snap sync does not - // work in our setup. - if node.index == e2e.TestParams.BeaconNodeCount+e2e.TestParams.LighthouseBeaconNodeCount { - args = append(args, []string{"--syncmode=full"}...) - } runCmd := exec.CommandContext(ctx, binaryPath, args...) // #nosec G204 -- Safe file, err := os.Create(path.Join(e2e.TestParams.LogPath, "eth1_"+strconv.Itoa(node.index)+".log")) if err != nil { diff --git a/testing/endtoend/evaluators/fork.go b/testing/endtoend/evaluators/fork.go index 3c07bfc4e..8f1dfa6d1 100644 --- a/testing/endtoend/evaluators/fork.go +++ b/testing/endtoend/evaluators/fork.go @@ -2,6 +2,7 @@ package evaluators import ( "context" + "time" "github.com/pkg/errors" "github.com/prysmaticlabs/prysm/v3/consensus-types/blocks" @@ -13,6 +14,8 @@ import ( "google.golang.org/grpc" ) +var streamDeadline = 1 * time.Minute + // AltairForkTransition ensures that the Altair hard fork has occurred successfully. var AltairForkTransition = types.Evaluator{ Name: "altair_fork_transition_%d", @@ -30,7 +33,7 @@ var BellatrixForkTransition = types.Evaluator{ func altairForkOccurs(conns ...*grpc.ClientConn) error { conn := conns[0] client := ethpb.NewBeaconNodeValidatorClient(conn) - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithTimeout(context.Background(), streamDeadline) defer cancel() stream, err := client.StreamBlocksAltair(ctx, ðpb.StreamBlocksRequest{VerifiedOnly: true}) if err != nil { @@ -72,7 +75,7 @@ func altairForkOccurs(conns ...*grpc.ClientConn) error { func bellatrixForkOccurs(conns ...*grpc.ClientConn) error { conn := conns[0] client := ethpb.NewBeaconNodeValidatorClient(conn) - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithTimeout(context.Background(), streamDeadline) defer cancel() stream, err := client.StreamBlocksAltair(ctx, ðpb.StreamBlocksRequest{VerifiedOnly: true}) if err != nil {