From 7fe616aeb59b130e74f764cf9146cb97d00e4208 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 28 Jan 2025 11:07:48 -0600 Subject: [PATCH 01/27] wip electra e2e --- config/params/testnet_e2e_config.go | 2 +- go.mod | 3 ++ go.sum | 4 +- testing/endtoend/endtoend_setup_test.go | 6 ++- testing/endtoend/evaluators/fork.go | 54 +++++++++++++++++++++++++ testing/endtoend/minimal_e2e_test.go | 2 +- testing/endtoend/types/fork.go | 6 +++ 7 files changed, 72 insertions(+), 5 deletions(-) diff --git a/config/params/testnet_e2e_config.go b/config/params/testnet_e2e_config.go index 7ab00ef30d67..a3e829fd52b0 100644 --- a/config/params/testnet_e2e_config.go +++ b/config/params/testnet_e2e_config.go @@ -7,7 +7,7 @@ const ( BellatrixE2EForkEpoch = 8 CapellaE2EForkEpoch = 10 DenebE2EForkEpoch = 12 - ElectraE2EForkEpoch = math.MaxUint64 + ElectraE2EForkEpoch = 14 FuluE2EForkEpoch = math.MaxUint64 ) diff --git a/go.mod b/go.mod index ee8e7dc8ca0d..509545f0c67b 100644 --- a/go.mod +++ b/go.mod @@ -281,3 +281,6 @@ require ( ) replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b + +// devnet 5 version +replace github.com/ethereum/go-ethereum => github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4 diff --git a/go.sum b/go.sum index de0e6470d306..7db32e5bcd76 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,6 @@ 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.12 h1:8hl57x77HSUo+cXExrURjU/w1VhL+ShCTJrTwcCQSe4= -github.com/ethereum/go-ethereum v1.14.12/go.mod h1:RAC2gVMWJ6FkxSPESfbshrcKpIokgQKsVKmAuqdekDY= github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8= github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -930,6 +928,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4 h1:JhhUqdf0gf73zSdT76iXR5MUj9AcmCTYP0W26R4qRSg= +github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4/go.mod h1:Ea3S3NoPSF19zih+f6WCXDW/UUSHbSJd0/BMBnF3Z6o= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/progressbar/v3 v3.3.4 h1:nMinx+JaEm/zJz4cEyClQeAw5rsYSB5th3xv+5lV6Vg= diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index a29982ce5d97..ed46833953cf 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -22,7 +22,7 @@ func e2eMinimal(t *testing.T, cfg *params.BeaconChainConfig, cfgo ...types.E2ECo // Run for 12 epochs if not in long-running to confirm long-running has no issues. var err error - epochsToRun := 14 + epochsToRun := 16 epochStr, longRunning := os.LookupEnv("E2E_EPOCHS") if longRunning { epochsToRun, err = strconv.Atoi(epochStr) @@ -64,6 +64,7 @@ func e2eMinimal(t *testing.T, cfg *params.BeaconChainConfig, cfgo ...types.E2ECo evals = addIfForkSet(evals, cfg.BellatrixForkEpoch, ev.BellatrixForkTransition) evals = addIfForkSet(evals, cfg.CapellaForkEpoch, ev.CapellaForkTransition) evals = addIfForkSet(evals, cfg.DenebForkEpoch, ev.DenebForkTransition) + evals = addIfForkSet(evals, cfg.ElectraForkEpoch, ev.ElectraForkTransition) testConfig := &types.E2EConfig{ BeaconFlags: []string{ @@ -139,6 +140,7 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfg *params.Beaco evals = addIfForkSet(evals, cfg.BellatrixForkEpoch, ev.BellatrixForkTransition) evals = addIfForkSet(evals, cfg.CapellaForkEpoch, ev.CapellaForkTransition) evals = addIfForkSet(evals, cfg.DenebForkEpoch, ev.DenebForkTransition) + evals = addIfForkSet(evals, cfg.ElectraForkEpoch, ev.ElectraForkTransition) testConfig := &types.E2EConfig{ BeaconFlags: []string{ @@ -206,6 +208,7 @@ func scenarioEvals(cfg *params.BeaconChainConfig) []types.Evaluator { evals = addIfForkSet(evals, cfg.BellatrixForkEpoch, ev.BellatrixForkTransition) evals = addIfForkSet(evals, cfg.CapellaForkEpoch, ev.CapellaForkTransition) evals = addIfForkSet(evals, cfg.DenebForkEpoch, ev.DenebForkTransition) + evals = addIfForkSet(evals, cfg.ElectraForkEpoch, ev.ElectraForkTransition) return evals } @@ -226,5 +229,6 @@ func scenarioEvalsMulti(cfg *params.BeaconChainConfig) []types.Evaluator { evals = addIfForkSet(evals, cfg.BellatrixForkEpoch, ev.BellatrixForkTransition) evals = addIfForkSet(evals, cfg.CapellaForkEpoch, ev.CapellaForkTransition) evals = addIfForkSet(evals, cfg.DenebForkEpoch, ev.DenebForkTransition) + evals = addIfForkSet(evals, cfg.ElectraForkEpoch, ev.ElectraForkTransition) return evals } diff --git a/testing/endtoend/evaluators/fork.go b/testing/endtoend/evaluators/fork.go index 54463043585a..05942b8a36c4 100644 --- a/testing/endtoend/evaluators/fork.go +++ b/testing/endtoend/evaluators/fork.go @@ -53,6 +53,7 @@ var CapellaForkTransition = types.Evaluator{ Evaluation: capellaForkOccurs, } +// DenebForkTransition ensures that the Deneb hard fork has occured successfully var DenebForkTransition = types.Evaluator{ Name: "deneb_fork_transition_%d", Policy: func(e primitives.Epoch) bool { @@ -62,6 +63,16 @@ var DenebForkTransition = types.Evaluator{ Evaluation: denebForkOccurs, } +// ElectraForkTransition ensures that the electra hard fork has occured successfully +var ElectraForkTransition = types.Evaluator{ + Name: "electra_fork_transition_%d", + Policy: func(e primitives.Epoch) bool { + fEpoch := params.BeaconConfig().ElectraForkEpoch + return policies.OnEpoch(fEpoch)(e) + }, + Evaluation: electraForkOccurs, +} + func altairForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) error { conn := conns[0] client := ethpb.NewBeaconNodeValidatorClient(conn) @@ -234,3 +245,46 @@ func denebForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) erro } return nil } + +func electraForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) error { + conn := conns[0] + client := ethpb.NewBeaconNodeValidatorClient(conn) + ctx, cancel := context.WithTimeout(context.Background(), streamDeadline) + defer cancel() + stream, err := client.StreamBlocksAltair(ctx, ðpb.StreamBlocksRequest{VerifiedOnly: true}) + if err != nil { + return errors.Wrap(err, "failed to get stream") + } + fSlot, err := slots.EpochStart(params.BeaconConfig().ElectraForkEpoch) + if err != nil { + return err + } + if errors.Is(ctx.Err(), context.Canceled) { + return errors.New("context canceled prematurely") + } + res, err := stream.Recv() + if err != nil { + return err + } + if res == nil || res.Block == nil { + return errors.New("nil block returned by beacon node") + } + + if res.GetBlock() == nil { + return errors.New("nil block returned by beacon node") + } + if res.GetElectraBlock() == nil { + return errors.Errorf("non-deneb block returned after the fork with type %T", res.Block) + } + blk, err := blocks.NewSignedBeaconBlock(res.GetElectraBlock()) + if err != nil { + return err + } + if err := blocks.BeaconBlockIsNil(blk); err != nil { + return err + } + if blk.Block().Slot() < fSlot { + return errors.Errorf("wanted a block at slot >= %d but received %d", fSlot, blk.Block().Slot()) + } + return nil +} diff --git a/testing/endtoend/minimal_e2e_test.go b/testing/endtoend/minimal_e2e_test.go index 291c31f98cbd..3705991d3c17 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.Bellatrix, version.Deneb, params.E2ETestConfig()), types.WithCheckpointSync()) + r := e2eMinimal(t, types.InitForkCfg(version.Capella, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync()) r.run() } diff --git a/testing/endtoend/types/fork.go b/testing/endtoend/types/fork.go index 8e4a6cad92e7..775194f8e1ba 100644 --- a/testing/endtoend/types/fork.go +++ b/testing/endtoend/types/fork.go @@ -25,6 +25,12 @@ func InitForkCfg(start, end int, c *params.BeaconChainConfig) *params.BeaconChai if start >= version.Deneb { c.DenebForkEpoch = 0 } + if start >= version.Electra { + c.ElectraForkEpoch = 0 + } + if end < version.Electra { + c.ElectraForkEpoch = math.MaxUint64 + } if end < version.Deneb { c.DenebForkEpoch = math.MaxUint64 } From 3b61190477e14234a7522342e57e2e86ebe35c64 Mon Sep 17 00:00:00 2001 From: rkapka Date: Wed, 29 Jan 2025 12:08:59 +0100 Subject: [PATCH 02/27] add Deneb state to `validatorsParticipating` --- testing/endtoend/evaluators/validator.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testing/endtoend/evaluators/validator.go b/testing/endtoend/evaluators/validator.go index e4c5c20b2422..c340cf8c9579 100644 --- a/testing/endtoend/evaluators/validator.go +++ b/testing/endtoend/evaluators/validator.go @@ -172,6 +172,12 @@ func validatorsParticipating(_ *types.EvaluationContext, conns ...*grpc.ClientCo return err } respPrevEpochParticipation = st.PreviousEpochParticipation + case version.String(version.Deneb): + st := &structs.BeaconStateDeneb{} + if err = json.Unmarshal(resp.Data, st); err != nil { + return err + } + respPrevEpochParticipation = st.PreviousEpochParticipation default: return fmt.Errorf("unrecognized version %s", resp.Version) } From 92c8f97202f27a166ce1ce4a9c5ce1c137db2e3c Mon Sep 17 00:00:00 2001 From: terence tsao Date: Wed, 29 Jan 2025 06:59:27 -1000 Subject: [PATCH 03/27] Run bazel --- deps.bzl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deps.bzl b/deps.bzl index b9952c2956ff..b8fe6829343e 100644 --- a/deps.bzl +++ b/deps.bzl @@ -760,8 +760,9 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - sum = "h1:8hl57x77HSUo+cXExrURjU/w1VhL+ShCTJrTwcCQSe4=", - version = "v1.14.12", + replace = "github.com/s1na/go-ethereum", + sum = "h1:JhhUqdf0gf73zSdT76iXR5MUj9AcmCTYP0W26R4qRSg=", + version = "v1.8.4-0.20241219180720-88dadb7c83c4", ) go_repository( name = "com_github_ethereum_go_verkle", From ac321ad238c1deb1de3cd0efb06920964c8f391d Mon Sep 17 00:00:00 2001 From: rkapka Date: Wed, 29 Jan 2025 19:56:30 +0100 Subject: [PATCH 04/27] add Electra state to `validatorsParticipating` --- testing/endtoend/evaluators/validator.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testing/endtoend/evaluators/validator.go b/testing/endtoend/evaluators/validator.go index c340cf8c9579..2675c845b092 100644 --- a/testing/endtoend/evaluators/validator.go +++ b/testing/endtoend/evaluators/validator.go @@ -178,6 +178,12 @@ func validatorsParticipating(_ *types.EvaluationContext, conns ...*grpc.ClientCo return err } respPrevEpochParticipation = st.PreviousEpochParticipation + case version.String(version.Electra): + st := &structs.BeaconStateElectra{} + if err = json.Unmarshal(resp.Data, st); err != nil { + return err + } + respPrevEpochParticipation = st.PreviousEpochParticipation default: return fmt.Errorf("unrecognized version %s", resp.Version) } From d4410a89b70d984cb42217ebe5a4641621114195 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 29 Jan 2025 12:58:51 -0600 Subject: [PATCH 05/27] fixing some e2e issues --- beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go | 5 +++++ testing/endtoend/evaluators/validator.go | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go index c3c7fc226bcd..295ad73f0c46 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go @@ -39,6 +39,7 @@ func (bs *Server) ListBeaconBlocks( if err != nil { return nil, err } + // TODO: figure out a better way to do this or change this API. altCtrs, err := convertFromV1Containers(ctrs) if err != nil { return nil, err @@ -110,6 +111,10 @@ func convertToBlockContainer(blk interfaces.ReadOnlySignedBeaconBlock, root [32] ctr.Block = ðpb.BeaconBlockContainer_BlindedDenebBlock{BlindedDenebBlock: pbStruct} case *ethpb.SignedBeaconBlockDeneb: ctr.Block = ðpb.BeaconBlockContainer_DenebBlock{DenebBlock: pbStruct} + case *ethpb.SignedBlindedBeaconBlockElectra: + ctr.Block = ðpb.BeaconBlockContainer_BlindedElectraBlock{BlindedElectraBlock: pbStruct} + case *ethpb.SignedBeaconBlockElectra: + ctr.Block = ðpb.BeaconBlockContainer_ElectraBlock{ElectraBlock: pbStruct} default: return nil, errors.Errorf("block type is not recognized: %d", blk.Version()) } diff --git a/testing/endtoend/evaluators/validator.go b/testing/endtoend/evaluators/validator.go index 2675c845b092..874fff76436d 100644 --- a/testing/endtoend/evaluators/validator.go +++ b/testing/endtoend/evaluators/validator.go @@ -341,6 +341,12 @@ func syncCompatibleBlockFromCtr(container *ethpb.BeaconBlockContainer) (interfac if container.GetBlindedDenebBlock() != nil { return blocks.NewSignedBeaconBlock(container.GetBlindedDenebBlock()) } + if container.GetElectraBlock() != nil { + return blocks.NewSignedBeaconBlock(container.GetElectraBlock()) + } + if container.GetBlindedElectraBlock() != nil { + return blocks.NewSignedBeaconBlock(container.GetBlindedElectraBlock()) + } return nil, errors.New("no supported block type in container") } From 316ef0797a7a6439d06fb3801759b88ac10d74ad Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 29 Jan 2025 15:12:13 -0600 Subject: [PATCH 06/27] more evaluator fixes and changelog --- changelog/james-prysm_electra-e2e.md | 3 +++ consensus-types/blocks/factory.go | 4 ++++ testing/endtoend/endtoend_setup_test.go | 2 +- testing/endtoend/evaluators/operations.go | 10 +++++++++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 changelog/james-prysm_electra-e2e.md diff --git a/changelog/james-prysm_electra-e2e.md b/changelog/james-prysm_electra-e2e.md new file mode 100644 index 000000000000..f6bef5402280 --- /dev/null +++ b/changelog/james-prysm_electra-e2e.md @@ -0,0 +1,3 @@ +### Added + +- enable E2E for minimal and mainnet tests \ No newline at end of file diff --git a/consensus-types/blocks/factory.go b/consensus-types/blocks/factory.go index 0d8f61f9e30a..67749d0e3a6a 100644 --- a/consensus-types/blocks/factory.go +++ b/consensus-types/blocks/factory.go @@ -646,6 +646,10 @@ func BuildSignedBeaconBlockFromExecutionPayload(blk interfaces.ReadOnlySignedBea // This is particularly useful for using the values from API calls. func BeaconBlockContainerToSignedBeaconBlock(obj *eth.BeaconBlockContainer) (interfaces.ReadOnlySignedBeaconBlock, error) { switch obj.Block.(type) { + case *eth.BeaconBlockContainer_BlindedElectraBlock: + return NewSignedBeaconBlock(obj.GetBlindedElectraBlock()) + case *eth.BeaconBlockContainer_ElectraBlock: + return NewSignedBeaconBlock(obj.GetElectraBlock()) case *eth.BeaconBlockContainer_BlindedDenebBlock: return NewSignedBeaconBlock(obj.GetBlindedDenebBlock()) case *eth.BeaconBlockContainer_DenebBlock: diff --git a/testing/endtoend/endtoend_setup_test.go b/testing/endtoend/endtoend_setup_test.go index ed46833953cf..c54d6fb6dd2a 100644 --- a/testing/endtoend/endtoend_setup_test.go +++ b/testing/endtoend/endtoend_setup_test.go @@ -105,7 +105,7 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfg *params.Beaco } // Run for 10 epochs if not in long-running to confirm long-running has no issues. var err error - epochsToRun := 14 + epochsToRun := 16 epochStr, longRunning := os.LookupEnv("E2E_EPOCHS") if longRunning { epochsToRun, err = strconv.Atoi(epochStr) diff --git a/testing/endtoend/evaluators/operations.go b/testing/endtoend/evaluators/operations.go index 6b23b314da80..5e32f493283d 100644 --- a/testing/endtoend/evaluators/operations.go +++ b/testing/endtoend/evaluators/operations.go @@ -511,8 +511,16 @@ func validatorsVoteWithTheMajority(ec *e2etypes.EvaluationContext, conns ...*grp b := blk.GetBlindedDenebBlock().Message slot = b.Slot vote = b.Body.Eth1Data.BlockHash + case *ethpb.BeaconBlockContainer_ElectraBlock: + b := blk.GetElectraBlock().Block + slot = b.Slot + vote = b.Body.Eth1Data.BlockHash + case *ethpb.BeaconBlockContainer_BlindedElectraBlock: + b := blk.GetBlindedElectraBlock().Message + slot = b.Slot + vote = b.Body.Eth1Data.BlockHash default: - return errors.New("block neither phase0,altair or bellatrix") + return fmt.Errorf("block of type %T is unknown", blk.Block) } ec.SeenVotes[slot] = vote From 8a997e7c66b93f3a7b843ace677e9f214df38fe1 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 29 Jan 2025 16:53:37 -0600 Subject: [PATCH 07/27] adding in special condition to pass electra epoch participation --- testing/endtoend/evaluators/validator.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/endtoend/evaluators/validator.go b/testing/endtoend/evaluators/validator.go index 874fff76436d..25d9296030cd 100644 --- a/testing/endtoend/evaluators/validator.go +++ b/testing/endtoend/evaluators/validator.go @@ -126,6 +126,11 @@ func validatorsParticipating(_ *types.EvaluationContext, conns ...*grpc.ClientCo if e2eparams.TestParams.LighthouseBeaconNodeCount != 0 { expected = float32(expectedMulticlientParticipation) } + if participation.Epoch == params.BeaconConfig().ElectraForkEpoch { + // The first slot of Electra will be missed due to the switching of attestation types + // 5/6 slots =~0.83 + expected = 0.83 + } if participation.Epoch > 0 && participation.Epoch.Sub(1) == params.BeaconConfig().BellatrixForkEpoch { // Reduce Participation requirement to 95% to account for longer EE calls for // the merge block. Target and head will likely be missed for a few validators at From 4d9df052b6c4a801330f96ce27edec1ce2b86d92 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 29 Jan 2025 17:06:24 -0600 Subject: [PATCH 08/27] fixing typo --- testing/endtoend/evaluators/fork.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/endtoend/evaluators/fork.go b/testing/endtoend/evaluators/fork.go index 05942b8a36c4..a8bb0a6dcabf 100644 --- a/testing/endtoend/evaluators/fork.go +++ b/testing/endtoend/evaluators/fork.go @@ -53,7 +53,7 @@ var CapellaForkTransition = types.Evaluator{ Evaluation: capellaForkOccurs, } -// DenebForkTransition ensures that the Deneb hard fork has occured successfully +// DenebForkTransition ensures that the Deneb hard fork has occurred successfully var DenebForkTransition = types.Evaluator{ Name: "deneb_fork_transition_%d", Policy: func(e primitives.Epoch) bool { @@ -63,7 +63,7 @@ var DenebForkTransition = types.Evaluator{ Evaluation: denebForkOccurs, } -// ElectraForkTransition ensures that the electra hard fork has occured successfully +// ElectraForkTransition ensures that the electra hard fork has occurred successfully var ElectraForkTransition = types.Evaluator{ Name: "electra_fork_transition_%d", Policy: func(e primitives.Epoch) bool { From 650de0d721f99474cf6282ed84df9de6ca9f058c Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 29 Jan 2025 17:12:33 -0600 Subject: [PATCH 09/27] missed updating forks for e2e tests --- testing/endtoend/mainnet_e2e_test.go | 2 +- testing/endtoend/minimal_e2e_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/endtoend/mainnet_e2e_test.go b/testing/endtoend/mainnet_e2e_test.go index feaa908b56c6..eda402a15a04 100644 --- a/testing/endtoend/mainnet_e2e_test.go +++ b/testing/endtoend/mainnet_e2e_test.go @@ -10,7 +10,7 @@ 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.Bellatrix, version.Electra, params.E2EMainnetTestConfig())) r.run() } diff --git a/testing/endtoend/minimal_e2e_test.go b/testing/endtoend/minimal_e2e_test.go index 3705991d3c17..c24de5b014ad 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.Capella, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync()) + r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync()) r.run() } From 2e3433befd9d964c16799b0d927ef0f7f8a088ab Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 29 Jan 2025 17:56:44 -0600 Subject: [PATCH 10/27] reverting change current release fork --- testing/endtoend/mainnet_e2e_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/endtoend/mainnet_e2e_test.go b/testing/endtoend/mainnet_e2e_test.go index eda402a15a04..feaa908b56c6 100644 --- a/testing/endtoend/mainnet_e2e_test.go +++ b/testing/endtoend/mainnet_e2e_test.go @@ -10,7 +10,7 @@ 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.Electra, params.E2EMainnetTestConfig())) + r := e2eMainnet(t, true, false, types.InitForkCfg(version.Bellatrix, version.Deneb, params.E2EMainnetTestConfig())) r.run() } From 703b46de538bbf905259bde66223b7b95dca9bb8 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Thu, 30 Jan 2025 09:16:49 -0600 Subject: [PATCH 11/27] missed updating e2e config for test --- config/params/testdata/e2e_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/params/testdata/e2e_config.yaml b/config/params/testdata/e2e_config.yaml index 95b088b1d643..e67d85556507 100644 --- a/config/params/testdata/e2e_config.yaml +++ b/config/params/testdata/e2e_config.yaml @@ -46,7 +46,7 @@ DENEB_FORK_VERSION: 0x040000fd DENEB_FORK_EPOCH: 12 # Electra ELECTRA_FORK_VERSION: 0x050000fd -ELECTRA_FORK_EPOCH: 18446744073709551615 +ELECTRA_FORK_EPOCH: 14 # Fulu FULU_FORK_VERSION: 0x060000fd FULU_FORK_EPOCH: 18446744073709551615 From c227acf992319761e579b4ffbb42a35704dc410b Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 31 Jan 2025 14:47:29 -0600 Subject: [PATCH 12/27] updating to latest devnet 5 to fix unit tests --- deps.bzl | 192 ++++--------------------------------------------------- go.mod | 2 +- go.sum | 2 + 3 files changed, 15 insertions(+), 181 deletions(-) diff --git a/deps.bzl b/deps.bzl index b8fe6829343e..1935855079e0 100644 --- a/deps.bzl +++ b/deps.bzl @@ -169,80 +169,8 @@ def prysm_deps(): go_repository( name = "com_github_aws_aws_sdk_go_v2", importpath = "github.com/aws/aws-sdk-go-v2", - sum = "h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA=", - version = "v1.21.2", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_config", - importpath = "github.com/aws/aws-sdk-go-v2/config", - sum = "h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes=", - version = "v1.18.45", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_credentials", - importpath = "github.com/aws/aws-sdk-go-v2/credentials", - sum = "h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8=", - version = "v1.13.43", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_feature_ec2_imds", - importpath = "github.com/aws/aws-sdk-go-v2/feature/ec2/imds", - sum = "h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ=", - version = "v1.13.13", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_internal_configsources", - importpath = "github.com/aws/aws-sdk-go-v2/internal/configsources", - sum = "h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y=", - version = "v1.1.43", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_internal_endpoints_v2", - importpath = "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2", - sum = "h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc=", - version = "v2.4.37", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_internal_ini", - importpath = "github.com/aws/aws-sdk-go-v2/internal/ini", - sum = "h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4=", - version = "v1.3.45", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_internal_presigned_url", - importpath = "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url", - sum = "h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k=", - version = "v1.9.37", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_route53", - importpath = "github.com/aws/aws-sdk-go-v2/service/route53", - sum = "h1:/RPQNjh1sDIezpXaFIkZb7MlXnSyAqjVdAwcJuGYTqg=", - version = "v1.30.2", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_sso", - importpath = "github.com/aws/aws-sdk-go-v2/service/sso", - sum = "h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k=", - version = "v1.15.2", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_ssooidc", - importpath = "github.com/aws/aws-sdk-go-v2/service/ssooidc", - sum = "h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk=", - version = "v1.17.3", - ) - go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_sts", - importpath = "github.com/aws/aws-sdk-go-v2/service/sts", - sum = "h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU=", - version = "v1.23.2", - ) - go_repository( - name = "com_github_aws_smithy_go", - importpath = "github.com/aws/smithy-go", - sum = "h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8=", - version = "v1.15.0", + sum = "h1:qZ+woO4SamnH/eEbjM2IDLhRNwIwND/RQyVlBLp3Jqg=", + version = "v0.18.0", ) go_repository( name = "com_github_aymerick_douceur", @@ -250,24 +178,6 @@ def prysm_deps(): sum = "h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=", version = "v0.2.0", ) - go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_azcore", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/azcore", - sum = "h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ=", - version = "v1.7.0", - ) - go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_internal", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/internal", - sum = "h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=", - version = "v1.3.0", - ) - go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_storage_azblob", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob", - sum = "h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=", - version = "v1.2.0", - ) go_repository( name = "com_github_bazelbuild_rules_go", importpath = "github.com/bazelbuild/rules_go", @@ -412,12 +322,6 @@ def prysm_deps(): sum = "h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=", version = "v0.3.4", ) - go_repository( - name = "com_github_cloudflare_cloudflare_go", - importpath = "github.com/cloudflare/cloudflare-go", - sum = "h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M=", - version = "v0.79.0", - ) go_repository( name = "com_github_cloudykit_fastprinter", importpath = "github.com/CloudyKit/fastprinter", @@ -654,12 +558,6 @@ 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", @@ -761,8 +659,8 @@ def prysm_deps(): "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], replace = "github.com/s1na/go-ethereum", - sum = "h1:JhhUqdf0gf73zSdT76iXR5MUj9AcmCTYP0W26R4qRSg=", - version = "v1.8.4-0.20241219180720-88dadb7c83c4", + sum = "h1:hiOTcz2HB1uSxUgEWPhKM00UOUTbGEQ6PyVDOK/V3u8=", + version = "v1.8.4-0.20241126014253-770079f94e39", ) go_repository( name = "com_github_ethereum_go_verkle", @@ -800,12 +698,6 @@ def prysm_deps(): sum = "h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo=", version = "v0.1.3", ) - go_repository( - name = "com_github_fjl_gencodec", - importpath = "github.com/fjl/gencodec", - sum = "h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=", - version = "v0.0.0-20230517082657-f9840df7b83e", - ) go_repository( name = "com_github_flosch_pongo2_v4", importpath = "github.com/flosch/pongo2/v4", @@ -866,12 +758,6 @@ def prysm_deps(): sum = "h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA=", version = "v2.6.0", ) - go_repository( - name = "com_github_garslo_gogen", - importpath = "github.com/garslo/gogen", - sum = "h1:IZqZOB2fydHte3kUgxrzK5E1fW7RQGeDwE8F/ZZnUYc=", - version = "v0.0.0-20170306192744-1d203ffc1f61", - ) go_repository( name = "com_github_garyburd_redigo", importpath = "github.com/garyburd/redigo", @@ -1091,8 +977,8 @@ def prysm_deps(): go_repository( name = "com_github_goccy_go_json", importpath = "github.com/goccy/go-json", - sum = "h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=", - version = "v0.10.2", + sum = "h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=", + version = "v0.9.11", ) go_repository( name = "com_github_godbus_dbus_v5", @@ -1207,8 +1093,8 @@ def prysm_deps(): go_repository( name = "com_github_google_go_querystring", importpath = "github.com/google/go-querystring", - sum = "h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=", - version = "v1.1.0", + sum = "h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=", + version = "v1.0.0", ) go_repository( name = "com_github_google_gofuzz", @@ -1381,8 +1267,8 @@ def prysm_deps(): go_repository( name = "com_github_hashicorp_go_cleanhttp", importpath = "github.com/hashicorp/go-cleanhttp", - sum = "h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=", - version = "v0.5.2", + sum = "h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=", + version = "v0.5.1", ) go_repository( name = "com_github_hashicorp_go_immutable_radix", @@ -1408,12 +1294,6 @@ def prysm_deps(): sum = "h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw=", version = "v0.0.1", ) - go_repository( - name = "com_github_hashicorp_go_retryablehttp", - importpath = "github.com/hashicorp/go-retryablehttp", - sum = "h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=", - version = "v0.7.4", - ) go_repository( name = "com_github_hashicorp_go_rootcerts", importpath = "github.com/hashicorp/go-rootcerts", @@ -1667,12 +1547,6 @@ def prysm_deps(): sum = "h1:gOGo0613MoqUcf0xCj+h/V3sHDaZasfv152G6/5l91s=", version = "v6.5.4", ) - go_repository( - name = "com_github_jedisct1_go_minisign", - importpath = "github.com/jedisct1/go-minisign", - sum = "h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=", - version = "v0.0.0-20230811132847-661be99b8267", - ) go_repository( name = "com_github_jellevandenhooff_dkim", importpath = "github.com/jellevandenhooff/dkim", @@ -1682,8 +1556,8 @@ def prysm_deps(): go_repository( name = "com_github_jmespath_go_jmespath", importpath = "github.com/jmespath/go-jmespath", - sum = "h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=", - version = "v0.4.0", + sum = "h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=", + version = "v0.0.0-20180206201540-c2b33e8439af", ) go_repository( name = "com_github_joker_jade", @@ -1752,12 +1626,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", @@ -1794,12 +1662,6 @@ def prysm_deps(): sum = "h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA=", version = "v0.0.4", ) - go_repository( - name = "com_github_kilic_bls12_381", - importpath = "github.com/kilic/bls12-381", - sum = "h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4=", - version = "v0.1.0", - ) go_repository( name = "com_github_kisielk_errcheck", importpath = "github.com/kisielk/errcheck", @@ -2354,18 +2216,6 @@ def prysm_deps(): sum = "h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=", version = "v0.0.0-20140419014527-cca7078d478f", ) - go_repository( - name = "com_github_naoina_go_stringutil", - importpath = "github.com/naoina/go-stringutil", - sum = "h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=", - version = "v0.1.0", - ) - go_repository( - name = "com_github_naoina_toml", - importpath = "github.com/naoina/toml", - sum = "h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0=", - version = "v0.1.2-0.20170918210437-9fafd6967416", - ) go_repository( name = "com_github_nats_io_jwt", importpath = "github.com/nats-io/jwt", @@ -2780,24 +2630,6 @@ def prysm_deps(): sum = "h1:BlqrtbT9lLH3ZsOVhXPsHzFrApCTKRifB7gjJuypu6Y=", version = "v1.3.0", ) - go_repository( - name = "com_github_protolambda_bls12_381_util", - importpath = "github.com/protolambda/bls12-381-util", - 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", diff --git a/go.mod b/go.mod index 509545f0c67b..010618df07a4 100644 --- a/go.mod +++ b/go.mod @@ -283,4 +283,4 @@ require ( replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b // devnet 5 version -replace github.com/ethereum/go-ethereum => github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4 +replace github.com/ethereum/go-ethereum => github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39 diff --git a/go.sum b/go.sum index 7db32e5bcd76..697b2de56e0b 100644 --- a/go.sum +++ b/go.sum @@ -928,6 +928,8 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39 h1:hiOTcz2HB1uSxUgEWPhKM00UOUTbGEQ6PyVDOK/V3u8= +github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39/go.mod h1:RAC2gVMWJ6FkxSPESfbshrcKpIokgQKsVKmAuqdekDY= github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4 h1:JhhUqdf0gf73zSdT76iXR5MUj9AcmCTYP0W26R4qRSg= github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4/go.mod h1:Ea3S3NoPSF19zih+f6WCXDW/UUSHbSJd0/BMBnF3Z6o= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= From ecce0d472765a2996d2a2bf0d1f0bac0b424c1d7 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 31 Jan 2025 15:00:00 -0600 Subject: [PATCH 13/27] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 697b2de56e0b..bdf5bf479acc 100644 --- a/go.sum +++ b/go.sum @@ -930,8 +930,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39 h1:hiOTcz2HB1uSxUgEWPhKM00UOUTbGEQ6PyVDOK/V3u8= github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39/go.mod h1:RAC2gVMWJ6FkxSPESfbshrcKpIokgQKsVKmAuqdekDY= -github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4 h1:JhhUqdf0gf73zSdT76iXR5MUj9AcmCTYP0W26R4qRSg= -github.com/s1na/go-ethereum v1.8.4-0.20241219180720-88dadb7c83c4/go.mod h1:Ea3S3NoPSF19zih+f6WCXDW/UUSHbSJd0/BMBnF3Z6o= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/progressbar/v3 v3.3.4 h1:nMinx+JaEm/zJz4cEyClQeAw5rsYSB5th3xv+5lV6Vg= From 8fbd90b058ef453c43f3fe0ec9cb1ae389e0fdae Mon Sep 17 00:00:00 2001 From: james-prysm Date: Wed, 5 Feb 2025 17:33:34 -0600 Subject: [PATCH 14/27] fixing branch, temporary will need to update geth version later --- WORKSPACE | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++- deps.bzl | 20 +++--- go.mod | 2 +- go.sum | 2 - 4 files changed, 208 insertions(+), 14 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e99758d82fa3..c21ec1626d9c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -429,7 +429,203 @@ 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_aws_aws_sdk_go_v2_config", + importpath = "github.com/aws/aws-sdk-go-v2/config", + sum = "h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes=", + version = "v1.18.45", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_credentials", + importpath = "github.com/aws/aws-sdk-go-v2/credentials", + sum = "h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8=", + version = "v1.13.43", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_feature_ec2_imds", + importpath = "github.com/aws/aws-sdk-go-v2/feature/ec2/imds", + sum = "h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ=", + version = "v1.13.13", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_internal_configsources", + importpath = "github.com/aws/aws-sdk-go-v2/internal/configsources", + sum = "h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y=", + version = "v1.1.43", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_internal_endpoints_v2", + importpath = "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2", + sum = "h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc=", + version = "v2.4.37", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_internal_ini", + importpath = "github.com/aws/aws-sdk-go-v2/internal/ini", + sum = "h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4=", + version = "v1.3.45", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_internal_presigned_url", + importpath = "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url", + sum = "h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k=", + version = "v1.9.37", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_route53", + importpath = "github.com/aws/aws-sdk-go-v2/service/route53", + sum = "h1:/RPQNjh1sDIezpXaFIkZb7MlXnSyAqjVdAwcJuGYTqg=", + version = "v1.30.2", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_sso", + importpath = "github.com/aws/aws-sdk-go-v2/service/sso", + sum = "h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k=", + version = "v1.15.2", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_ssooidc", + importpath = "github.com/aws/aws-sdk-go-v2/service/ssooidc", + sum = "h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk=", + version = "v1.17.3", +) + +go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_sts", + importpath = "github.com/aws/aws-sdk-go-v2/service/sts", + sum = "h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU=", + version = "v1.23.2", +) + +go_repository( + name = "com_github_aws_smithy_go", + importpath = "github.com/aws/smithy-go", + sum = "h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8=", + version = "v1.15.0", +) + +go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_azcore", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/azcore", + sum = "h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ=", + version = "v1.7.0", +) + +go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_internal", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/internal", + sum = "h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=", + version = "v1.3.0", +) + +go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_storage_azblob", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob", + sum = "h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=", + version = "v1.2.0", +) + +go_repository( + name = "com_github_cloudflare_cloudflare_go", + importpath = "github.com/cloudflare/cloudflare-go", + sum = "h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M=", + version = "v0.79.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_fjl_gencodec", + importpath = "github.com/fjl/gencodec", + sum = "h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=", + version = "v0.0.0-20230517082657-f9840df7b83e", +) + +go_repository( + name = "com_github_garslo_gogen", + importpath = "github.com/garslo/gogen", + sum = "h1:IZqZOB2fydHte3kUgxrzK5E1fW7RQGeDwE8F/ZZnUYc=", + version = "v0.0.0-20170306192744-1d203ffc1f61", +) + +go_repository( + name = "com_github_hashicorp_go_retryablehttp", + importpath = "github.com/hashicorp/go-retryablehttp", + sum = "h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=", + version = "v0.7.4", +) + +go_repository( + name = "com_github_jedisct1_go_minisign", + importpath = "github.com/jedisct1/go-minisign", + sum = "h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=", + version = "v0.0.0-20230811132847-661be99b8267", +) + +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_kilic_bls12_381", + importpath = "github.com/kilic/bls12-381", + sum = "h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4=", + version = "v0.1.0", +) + +go_repository( + name = "com_github_naoina_go_stringutil", + importpath = "github.com/naoina/go-stringutil", + sum = "h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=", + version = "v0.1.0", +) + +go_repository( + name = "com_github_naoina_toml", + importpath = "github.com/naoina/toml", + sum = "h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0=", + version = "v0.1.2-0.20170918210437-9fafd6967416", +) + +go_repository( + name = "com_github_protolambda_bls12_381_util", + importpath = "github.com/protolambda/bls12-381-util", + 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", +) gazelle_dependencies() diff --git a/deps.bzl b/deps.bzl index 1935855079e0..6d4826a1bce2 100644 --- a/deps.bzl +++ b/deps.bzl @@ -169,8 +169,8 @@ def prysm_deps(): go_repository( name = "com_github_aws_aws_sdk_go_v2", importpath = "github.com/aws/aws-sdk-go-v2", - sum = "h1:qZ+woO4SamnH/eEbjM2IDLhRNwIwND/RQyVlBLp3Jqg=", - version = "v0.18.0", + sum = "h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA=", + version = "v1.21.2", ) go_repository( name = "com_github_aymerick_douceur", @@ -977,8 +977,8 @@ def prysm_deps(): go_repository( name = "com_github_goccy_go_json", importpath = "github.com/goccy/go-json", - sum = "h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk=", - version = "v0.9.11", + sum = "h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=", + version = "v0.10.2", ) go_repository( name = "com_github_godbus_dbus_v5", @@ -1093,8 +1093,8 @@ def prysm_deps(): go_repository( name = "com_github_google_go_querystring", importpath = "github.com/google/go-querystring", - sum = "h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=", - version = "v1.0.0", + sum = "h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=", + version = "v1.1.0", ) go_repository( name = "com_github_google_gofuzz", @@ -1267,8 +1267,8 @@ def prysm_deps(): go_repository( name = "com_github_hashicorp_go_cleanhttp", importpath = "github.com/hashicorp/go-cleanhttp", - sum = "h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=", - version = "v0.5.1", + sum = "h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=", + version = "v0.5.2", ) go_repository( name = "com_github_hashicorp_go_immutable_radix", @@ -1556,8 +1556,8 @@ def prysm_deps(): go_repository( name = "com_github_jmespath_go_jmespath", importpath = "github.com/jmespath/go-jmespath", - sum = "h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=", - version = "v0.0.0-20180206201540-c2b33e8439af", + sum = "h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=", + version = "v0.4.0", ) go_repository( name = "com_github_joker_jade", diff --git a/go.mod b/go.mod index b48502301f76..40585d3ccd98 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,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.13 + github.com/ethereum/go-ethereum v1.14.12 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 565202b72922..bdf5bf479acc 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,6 @@ 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.13 h1:L81Wmv0OUP6cf4CW6wtXsr23RUrDhKs2+Y9Qto+OgHU= -github.com/ethereum/go-ethereum v1.14.13/go.mod h1:RAC2gVMWJ6FkxSPESfbshrcKpIokgQKsVKmAuqdekDY= github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8= github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= From 6910b12a006e996067bb489372299c0c61c2c295 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Thu, 6 Feb 2025 17:02:17 -0600 Subject: [PATCH 15/27] update to goethereum v1.15.0 --- WORKSPACE | 11 +++++++++-- deps.bzl | 5 ++--- go.mod | 7 +++---- go.sum | 6 ++++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c21ec1626d9c..c2a1bdfcee3f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -553,8 +553,8 @@ go_repository( go_repository( name = "com_github_fjl_gencodec", importpath = "github.com/fjl/gencodec", - sum = "h1:bBLctRc7kr01YGvaDfgLbTwjFNW5jdp5y5rj8XXBHfY=", - version = "v0.0.0-20230517082657-f9840df7b83e", + sum = "h1:B3K0xPfc52cw52BBgUbSPxYo+HlLfAgWMVKRWXUXBcs=", + version = "v0.1.0", ) go_repository( @@ -627,6 +627,13 @@ go_repository( version = "v0.2.2", ) +go_repository( + name = "com_github_pion_stun_v2", + importpath = "github.com/pion/stun/v2", + sum = "h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=", + version = "v2.0.0", +) + gazelle_dependencies() load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") diff --git a/deps.bzl b/deps.bzl index 6d4826a1bce2..bd444ce41642 100644 --- a/deps.bzl +++ b/deps.bzl @@ -658,9 +658,8 @@ def prysm_deps(): patches = [ "//third_party:com_github_ethereum_go_ethereum_secp256k1.patch", ], - replace = "github.com/s1na/go-ethereum", - sum = "h1:hiOTcz2HB1uSxUgEWPhKM00UOUTbGEQ6PyVDOK/V3u8=", - version = "v1.8.4-0.20241126014253-770079f94e39", + sum = "h1:LLb2jCPsbJZcB4INw+E/MgzUX5wlR6SdwXcv09/1ME4=", + version = "v1.15.0", ) go_repository( name = "com_github_ethereum_go_verkle", diff --git a/go.mod b/go.mod index 40585d3ccd98..2d3f3d21150f 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,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.12 + github.com/ethereum/go-ethereum v1.15.0 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 github.com/go-yaml/yaml v2.1.0+incompatible @@ -221,7 +221,9 @@ require ( github.com/pion/sdp/v3 v3.0.9 // indirect github.com/pion/srtp/v2 v2.0.20 // indirect github.com/pion/stun v0.6.1 // indirect + github.com/pion/stun/v2 v2.0.0 // indirect github.com/pion/transport/v2 v2.2.10 // indirect + github.com/pion/transport/v3 v3.0.7 // indirect github.com/pion/turn/v2 v2.1.6 // indirect github.com/pion/webrtc/v3 v3.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -281,6 +283,3 @@ require ( ) replace github.com/json-iterator/go => github.com/prestonvanloon/go v1.1.7-0.20190722034630-4f2e55fcf87b - -// devnet 5 version -replace github.com/ethereum/go-ethereum => github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39 diff --git a/go.sum b/go.sum index bdf5bf479acc..e89f1a984c23 100644 --- a/go.sum +++ b/go.sum @@ -235,6 +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 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0= +github.com/ethereum/go-ethereum v1.15.0 h1:LLb2jCPsbJZcB4INw+E/MgzUX5wlR6SdwXcv09/1ME4= +github.com/ethereum/go-ethereum v1.15.0/go.mod h1:4q+4t48P2C03sjqGvTXix5lEOplf5dz4CTosbjt5tGs= github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8= github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -823,6 +825,8 @@ github.com/pion/srtp/v2 v2.0.20 h1:HNNny4s+OUmG280ETrCdgFndp4ufx3/uy85EawYEhTk= github.com/pion/srtp/v2 v2.0.20/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA= github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4= github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8= +github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0= +github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ= github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g= github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0= @@ -928,8 +932,6 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39 h1:hiOTcz2HB1uSxUgEWPhKM00UOUTbGEQ6PyVDOK/V3u8= -github.com/s1na/go-ethereum v1.8.4-0.20241126014253-770079f94e39/go.mod h1:RAC2gVMWJ6FkxSPESfbshrcKpIokgQKsVKmAuqdekDY= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/progressbar/v3 v3.3.4 h1:nMinx+JaEm/zJz4cEyClQeAw5rsYSB5th3xv+5lV6Vg= From fa9174d04256e9ea8cbfadc8356931056f83efab Mon Sep 17 00:00:00 2001 From: james-prysm Date: Thu, 6 Feb 2025 17:06:28 -0600 Subject: [PATCH 16/27] changing changelog to reflect update in geth dependency --- changelog/james-prysm_electra-e2e.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog/james-prysm_electra-e2e.md b/changelog/james-prysm_electra-e2e.md index f6bef5402280..b41c4cbdc40a 100644 --- a/changelog/james-prysm_electra-e2e.md +++ b/changelog/james-prysm_electra-e2e.md @@ -1,3 +1,7 @@ ### Added -- enable E2E for minimal and mainnet tests \ No newline at end of file +- enable E2E for minimal and mainnet tests + +### Changed + +- updates geth to 1.15.0 \ No newline at end of file From dec6a2911e855dac3a474a93811a891e1daf0dc6 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Fri, 7 Feb 2025 13:35:30 -0600 Subject: [PATCH 17/27] fixing test failures --- config/params/config.go | 4 ++-- runtime/interop/genesis.go | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/config/params/config.go b/config/params/config.go index 5c095faad4a7..cf7b915200a4 100644 --- a/config/params/config.go +++ b/config/params/config.go @@ -380,7 +380,7 @@ func (b *BeaconChainConfig) MaximumGossipClockDisparityDuration() time.Duration // TargetBlobsPerBlock returns the target number of blobs per block for the given slot, // accounting for changes introduced by the Electra fork. func (b *BeaconChainConfig) TargetBlobsPerBlock(slot primitives.Slot) int { - if primitives.Epoch(slot.DivSlot(32)) >= b.ElectraForkEpoch { + if primitives.Epoch(slot.DivSlot(b.SlotsPerEpoch)) >= b.ElectraForkEpoch { return b.DeprecatedTargetBlobsPerBlockElectra } return b.DeprecatedMaxBlobsPerBlock / 2 @@ -389,7 +389,7 @@ func (b *BeaconChainConfig) TargetBlobsPerBlock(slot primitives.Slot) int { // MaxBlobsPerBlock returns the maximum number of blobs per block for the given slot, // adjusting for the Electra fork. func (b *BeaconChainConfig) MaxBlobsPerBlock(slot primitives.Slot) int { - if primitives.Epoch(slot.DivSlot(32)) >= b.ElectraForkEpoch { + if primitives.Epoch(slot.DivSlot(b.SlotsPerEpoch)) >= b.ElectraForkEpoch { return b.DeprecatedMaxBlobsPerBlockElectra } return b.DeprecatedMaxBlobsPerBlock diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index 3a85b40b8673..c77af3e2a69c 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -159,6 +159,18 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co ShanghaiTime: shanghaiTime, CancunTime: cancunTime, PragueTime: pragueTime, + BlobScheduleConfig: ¶ms.BlobScheduleConfig{ + Cancun: ¶ms.BlobConfig{ + Target: 3, + Max: 6, + UpdateFraction: 3338477, + }, + Prague: ¶ms.BlobConfig{ + Target: 6, + Max: 9, + UpdateFraction: 3338477, // double check this field, this number might need to be updated + }, + }, } da := defaultDepositContractAllocation(cfg.DepositContractAddress) ma := minerAllocation() From 6bf7eddc4a0d1282b1439fbd990e54a38a5d993b Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 10 Feb 2025 21:52:25 -0600 Subject: [PATCH 18/27] adding fix for range request limit during transition period between forks --- beacon-chain/sync/rpc_send_request.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beacon-chain/sync/rpc_send_request.go b/beacon-chain/sync/rpc_send_request.go index 8e10f5b2d592..8329a4739268 100644 --- a/beacon-chain/sync/rpc_send_request.go +++ b/beacon-chain/sync/rpc_send_request.go @@ -169,9 +169,9 @@ func SendBlobsByRangeRequest(ctx context.Context, tor blockchain.TemporalOracle, } defer closeStream(stream, log) - maxBlobsPerBlock := uint64(params.BeaconConfig().MaxBlobsPerBlock(req.StartSlot)) + maxBlobsPerBlock := uint64(params.BeaconConfig().MaxBlobsPerBlock(req.StartSlot + primitives.Slot(req.Count))) max := params.BeaconConfig().MaxRequestBlobSidecars - if slots.ToEpoch(req.StartSlot) >= params.BeaconConfig().ElectraForkEpoch { + if slots.ToEpoch(req.StartSlot+primitives.Slot(req.Count)) >= params.BeaconConfig().ElectraForkEpoch { max = params.BeaconConfig().MaxRequestBlobSidecarsElectra } if max > req.Count*maxBlobsPerBlock { @@ -204,10 +204,10 @@ func SendBlobSidecarByRoot( defer closeStream(stream, log) max := params.BeaconConfig().MaxRequestBlobSidecars - if slots.ToEpoch(slot) >= params.BeaconConfig().ElectraForkEpoch { + if slots.ToEpoch(slot+primitives.Slot(len(*req))) >= params.BeaconConfig().ElectraForkEpoch { max = params.BeaconConfig().MaxRequestBlobSidecarsElectra } - maxBlobCount := params.BeaconConfig().MaxBlobsPerBlock(slot) + maxBlobCount := params.BeaconConfig().MaxBlobsPerBlock(slot + primitives.Slot(len(*req))) if max > uint64(len(*req)*maxBlobCount) { max = uint64(len(*req) * maxBlobCount) } @@ -331,7 +331,7 @@ func readChunkEncodedBlobs(stream network.Stream, encoding encoder.NetworkEncodi // We have read an extra sidecar beyond what the spec allows. Since this is a spec violation, we return // an error that wraps ErrInvalidFetchedData. The part of the state machine that handles rpc peer scoring // will downscore the peer if the request ends in an error that wraps that one. - return nil, errMaxRequestBlobSidecarsExceeded + return nil, errors.Wrap(errMaxRequestBlobSidecarsExceeded, fmt.Sprintf("max=%d", max)) } sidecars = append(sidecars, sc) } From 4582841e7583e2a85b68f6f09121d088234d3f9c Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 10 Feb 2025 21:55:50 -0600 Subject: [PATCH 19/27] enabling validator rest for Electra --- testing/endtoend/evaluators/validator.go | 3 ++- testing/endtoend/minimal_scenario_e2e_test.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/endtoend/evaluators/validator.go b/testing/endtoend/evaluators/validator.go index 25d9296030cd..07720bbc6113 100644 --- a/testing/endtoend/evaluators/validator.go +++ b/testing/endtoend/evaluators/validator.go @@ -129,7 +129,8 @@ func validatorsParticipating(_ *types.EvaluationContext, conns ...*grpc.ClientCo if participation.Epoch == params.BeaconConfig().ElectraForkEpoch { // The first slot of Electra will be missed due to the switching of attestation types // 5/6 slots =~0.83 - expected = 0.83 + // validator REST always is slightly reduced at ~0.82 + expected = 0.82 } if participation.Epoch > 0 && participation.Epoch.Sub(1) == params.BeaconConfig().BellatrixForkEpoch { // Reduce Participation requirement to 95% to account for longer EE calls for diff --git a/testing/endtoend/minimal_scenario_e2e_test.go b/testing/endtoend/minimal_scenario_e2e_test.go index 3eaed939080a..194e00c1224b 100644 --- a/testing/endtoend/minimal_scenario_e2e_test.go +++ b/testing/endtoend/minimal_scenario_e2e_test.go @@ -26,7 +26,7 @@ func TestEndToEnd_MinimalConfig_Web3Signer_PersistentKeys(t *testing.T) { } 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.Bellatrix, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithValidatorRESTApi()).run() } func TestEndToEnd_ScenarioRun_EEOffline(t *testing.T) { From 52bbc59ca8c48fa252ff3dc0f0510622d1e7d91f Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 10 Feb 2025 21:59:43 -0600 Subject: [PATCH 20/27] rolling back error message --- beacon-chain/sync/rpc_send_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beacon-chain/sync/rpc_send_request.go b/beacon-chain/sync/rpc_send_request.go index 8329a4739268..4500bf2c86e9 100644 --- a/beacon-chain/sync/rpc_send_request.go +++ b/beacon-chain/sync/rpc_send_request.go @@ -331,7 +331,7 @@ func readChunkEncodedBlobs(stream network.Stream, encoding encoder.NetworkEncodi // We have read an extra sidecar beyond what the spec allows. Since this is a spec violation, we return // an error that wraps ErrInvalidFetchedData. The part of the state machine that handles rpc peer scoring // will downscore the peer if the request ends in an error that wraps that one. - return nil, errors.Wrap(errMaxRequestBlobSidecarsExceeded, fmt.Sprintf("max=%d", max)) + return nil, errMaxRequestBlobSidecarsExceeded } sidecars = append(sidecars, sc) } From 1323aa6b011cb4167923fd0ffc2be39e65679210 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 10 Feb 2025 22:02:28 -0600 Subject: [PATCH 21/27] adding fixed change logs --- changelog/james-prysm_electra-e2e.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/changelog/james-prysm_electra-e2e.md b/changelog/james-prysm_electra-e2e.md index b41c4cbdc40a..30d52877a922 100644 --- a/changelog/james-prysm_electra-e2e.md +++ b/changelog/james-prysm_electra-e2e.md @@ -4,4 +4,9 @@ ### Changed -- updates geth to 1.15.0 \ No newline at end of file +- updates geth to 1.15.0 + +### Fixed + +- fixed rpc send request blobs per block limit to cover transition period between forks +- fixed hard coded slots per epoch while evaluating blobs limit by slot \ No newline at end of file From d4219692595a2ff19087f6feb4e1185d5d38d8c1 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Mon, 10 Feb 2025 23:01:49 -0600 Subject: [PATCH 22/27] fixing dependencies based on nishant's comments, deps.bzl should be updated not workspace --- WORKSPACE | 205 +----------------------------------------------------- deps.bzl | 174 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 204 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7836722c0f2b..ef4561bc3d29 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -429,210 +429,7 @@ load("@com_github_atlassian_bazel_tools//gometalinter:deps.bzl", "gometalinter_d gometalinter_dependencies() -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_config", - importpath = "github.com/aws/aws-sdk-go-v2/config", - sum = "h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes=", - version = "v1.18.45", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_credentials", - importpath = "github.com/aws/aws-sdk-go-v2/credentials", - sum = "h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8=", - version = "v1.13.43", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_feature_ec2_imds", - importpath = "github.com/aws/aws-sdk-go-v2/feature/ec2/imds", - sum = "h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ=", - version = "v1.13.13", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_internal_configsources", - importpath = "github.com/aws/aws-sdk-go-v2/internal/configsources", - sum = "h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y=", - version = "v1.1.43", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_internal_endpoints_v2", - importpath = "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2", - sum = "h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc=", - version = "v2.4.37", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_internal_ini", - importpath = "github.com/aws/aws-sdk-go-v2/internal/ini", - sum = "h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4=", - version = "v1.3.45", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_internal_presigned_url", - importpath = "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url", - sum = "h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k=", - version = "v1.9.37", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_route53", - importpath = "github.com/aws/aws-sdk-go-v2/service/route53", - sum = "h1:/RPQNjh1sDIezpXaFIkZb7MlXnSyAqjVdAwcJuGYTqg=", - version = "v1.30.2", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_sso", - importpath = "github.com/aws/aws-sdk-go-v2/service/sso", - sum = "h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k=", - version = "v1.15.2", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_ssooidc", - importpath = "github.com/aws/aws-sdk-go-v2/service/ssooidc", - sum = "h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk=", - version = "v1.17.3", -) - -go_repository( - name = "com_github_aws_aws_sdk_go_v2_service_sts", - importpath = "github.com/aws/aws-sdk-go-v2/service/sts", - sum = "h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU=", - version = "v1.23.2", -) - -go_repository( - name = "com_github_aws_smithy_go", - importpath = "github.com/aws/smithy-go", - sum = "h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8=", - version = "v1.15.0", -) - -go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_azcore", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/azcore", - sum = "h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ=", - version = "v1.7.0", -) - -go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_internal", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/internal", - sum = "h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=", - version = "v1.3.0", -) - -go_repository( - name = "com_github_azure_azure_sdk_for_go_sdk_storage_azblob", - importpath = "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob", - sum = "h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=", - version = "v1.2.0", -) - -go_repository( - name = "com_github_cloudflare_cloudflare_go", - importpath = "github.com/cloudflare/cloudflare-go", - sum = "h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M=", - version = "v0.79.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_fjl_gencodec", - importpath = "github.com/fjl/gencodec", - sum = "h1:B3K0xPfc52cw52BBgUbSPxYo+HlLfAgWMVKRWXUXBcs=", - version = "v0.1.0", -) - -go_repository( - name = "com_github_garslo_gogen", - importpath = "github.com/garslo/gogen", - sum = "h1:IZqZOB2fydHte3kUgxrzK5E1fW7RQGeDwE8F/ZZnUYc=", - version = "v0.0.0-20170306192744-1d203ffc1f61", -) - -go_repository( - name = "com_github_hashicorp_go_retryablehttp", - importpath = "github.com/hashicorp/go-retryablehttp", - sum = "h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=", - version = "v0.7.4", -) - -go_repository( - name = "com_github_jedisct1_go_minisign", - importpath = "github.com/jedisct1/go-minisign", - sum = "h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=", - version = "v0.0.0-20230811132847-661be99b8267", -) - -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_kilic_bls12_381", - importpath = "github.com/kilic/bls12-381", - sum = "h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4=", - version = "v0.1.0", -) - -go_repository( - name = "com_github_naoina_go_stringutil", - importpath = "github.com/naoina/go-stringutil", - sum = "h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=", - version = "v0.1.0", -) - -go_repository( - name = "com_github_naoina_toml", - importpath = "github.com/naoina/toml", - sum = "h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0=", - version = "v0.1.2-0.20170918210437-9fafd6967416", -) - -go_repository( - name = "com_github_protolambda_bls12_381_util", - importpath = "github.com/protolambda/bls12-381-util", - 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_pion_stun_v2", - importpath = "github.com/pion/stun/v2", - sum = "h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=", - version = "v2.0.0", -) +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() diff --git a/deps.bzl b/deps.bzl index 87644a69adc3..c17937cd341a 100644 --- a/deps.bzl +++ b/deps.bzl @@ -172,12 +172,102 @@ def prysm_deps(): sum = "h1:+LXZ0sgo8quN9UOKXXzAWRT3FWd4NxeXWOZom9pE7GA=", version = "v1.21.2", ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_config", + importpath = "github.com/aws/aws-sdk-go-v2/config", + sum = "h1:Aka9bI7n8ysuwPeFdm77nfbyHCAKQ3z9ghB3S/38zes=", + version = "v1.18.45", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_credentials", + importpath = "github.com/aws/aws-sdk-go-v2/credentials", + sum = "h1:LU8vo40zBlo3R7bAvBVy/ku4nxGEyZe9N8MqAeFTzF8=", + version = "v1.13.43", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_feature_ec2_imds", + importpath = "github.com/aws/aws-sdk-go-v2/feature/ec2/imds", + sum = "h1:PIktER+hwIG286DqXyvVENjgLTAwGgoeriLDD5C+YlQ=", + version = "v1.13.13", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_internal_configsources", + importpath = "github.com/aws/aws-sdk-go-v2/internal/configsources", + sum = "h1:nFBQlGtkbPzp/NjZLuFxRqmT91rLJkgvsEQs68h962Y=", + version = "v1.1.43", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_internal_endpoints_v2", + importpath = "github.com/aws/aws-sdk-go-v2/internal/endpoints/v2", + sum = "h1:JRVhO25+r3ar2mKGP7E0LDl8K9/G36gjlqca5iQbaqc=", + version = "v2.4.37", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_internal_ini", + importpath = "github.com/aws/aws-sdk-go-v2/internal/ini", + sum = "h1:hze8YsjSh8Wl1rYa1CJpRmXP21BvOBuc76YhW0HsuQ4=", + version = "v1.3.45", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_internal_presigned_url", + importpath = "github.com/aws/aws-sdk-go-v2/service/internal/presigned-url", + sum = "h1:WWZA/I2K4ptBS1kg0kV1JbBtG/umed0vwHRrmcr9z7k=", + version = "v1.9.37", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_route53", + importpath = "github.com/aws/aws-sdk-go-v2/service/route53", + sum = "h1:/RPQNjh1sDIezpXaFIkZb7MlXnSyAqjVdAwcJuGYTqg=", + version = "v1.30.2", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_sso", + importpath = "github.com/aws/aws-sdk-go-v2/service/sso", + sum = "h1:JuPGc7IkOP4AaqcZSIcyqLpFSqBWK32rM9+a1g6u73k=", + version = "v1.15.2", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_ssooidc", + importpath = "github.com/aws/aws-sdk-go-v2/service/ssooidc", + sum = "h1:HFiiRkf1SdaAmV3/BHOFZ9DjFynPHj8G/UIO1lQS+fk=", + version = "v1.17.3", + ) + go_repository( + name = "com_github_aws_aws_sdk_go_v2_service_sts", + importpath = "github.com/aws/aws-sdk-go-v2/service/sts", + sum = "h1:0BkLfgeDjfZnZ+MhB3ONb01u9pwFYTCZVhlsSSBvlbU=", + version = "v1.23.2", + ) + go_repository( + name = "com_github_aws_smithy_go", + importpath = "github.com/aws/smithy-go", + sum = "h1:PS/durmlzvAFpQHDs4wi4sNNP9ExsqZh6IlfdHXgKK8=", + version = "v1.15.0", + ) go_repository( name = "com_github_aymerick_douceur", importpath = "github.com/aymerick/douceur", sum = "h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=", version = "v0.2.0", ) + go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_azcore", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/azcore", + sum = "h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ=", + version = "v1.7.0", + ) + go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_internal", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/internal", + sum = "h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=", + version = "v1.3.0", + ) + go_repository( + name = "com_github_azure_azure_sdk_for_go_sdk_storage_azblob", + importpath = "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob", + sum = "h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=", + version = "v1.2.0", + ) go_repository( name = "com_github_bazelbuild_rules_go", importpath = "github.com/bazelbuild/rules_go", @@ -322,6 +412,12 @@ def prysm_deps(): sum = "h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=", version = "v0.3.4", ) + go_repository( + name = "com_github_cloudflare_cloudflare_go", + importpath = "github.com/cloudflare/cloudflare-go", + sum = "h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M=", + version = "v0.79.0", + ) go_repository( name = "com_github_cloudykit_fastprinter", importpath = "github.com/CloudyKit/fastprinter", @@ -558,6 +654,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", @@ -697,6 +799,12 @@ def prysm_deps(): sum = "h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo=", version = "v0.1.3", ) + go_repository( + name = "com_github_fjl_gencodec", + importpath = "github.com/fjl/gencodec", + sum = "h1:B3K0xPfc52cw52BBgUbSPxYo+HlLfAgWMVKRWXUXBcs=", + version = "v0.1.0", + ) go_repository( name = "com_github_flosch_pongo2_v4", importpath = "github.com/flosch/pongo2/v4", @@ -757,6 +865,12 @@ def prysm_deps(): sum = "h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA=", version = "v2.6.0", ) + go_repository( + name = "com_github_garslo_gogen", + importpath = "github.com/garslo/gogen", + sum = "h1:IZqZOB2fydHte3kUgxrzK5E1fW7RQGeDwE8F/ZZnUYc=", + version = "v0.0.0-20170306192744-1d203ffc1f61", + ) go_repository( name = "com_github_garyburd_redigo", importpath = "github.com/garyburd/redigo", @@ -1293,6 +1407,12 @@ def prysm_deps(): sum = "h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw=", version = "v0.0.1", ) + go_repository( + name = "com_github_hashicorp_go_retryablehttp", + importpath = "github.com/hashicorp/go-retryablehttp", + sum = "h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=", + version = "v0.7.4", + ) go_repository( name = "com_github_hashicorp_go_rootcerts", importpath = "github.com/hashicorp/go-rootcerts", @@ -1546,6 +1666,12 @@ def prysm_deps(): sum = "h1:gOGo0613MoqUcf0xCj+h/V3sHDaZasfv152G6/5l91s=", version = "v6.5.4", ) + go_repository( + name = "com_github_jedisct1_go_minisign", + importpath = "github.com/jedisct1/go-minisign", + sum = "h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=", + version = "v0.0.0-20230811132847-661be99b8267", + ) go_repository( name = "com_github_jellevandenhooff_dkim", importpath = "github.com/jellevandenhooff/dkim", @@ -1625,6 +1751,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_kataras_blocks", importpath = "github.com/kataras/blocks", @@ -1661,6 +1793,12 @@ def prysm_deps(): sum = "h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA=", version = "v0.0.4", ) + go_repository( + name = "com_github_kilic_bls12_381", + importpath = "github.com/kilic/bls12-381", + sum = "h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4=", + version = "v0.1.0", + ) go_repository( name = "com_github_kisielk_errcheck", importpath = "github.com/kisielk/errcheck", @@ -2215,6 +2353,18 @@ def prysm_deps(): sum = "h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=", version = "v0.0.0-20140419014527-cca7078d478f", ) + go_repository( + name = "com_github_naoina_go_stringutil", + importpath = "github.com/naoina/go-stringutil", + sum = "h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=", + version = "v0.1.0", + ) + go_repository( + name = "com_github_naoina_toml", + importpath = "github.com/naoina/toml", + sum = "h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0=", + version = "v0.1.2-0.20170918210437-9fafd6967416", + ) go_repository( name = "com_github_nats_io_jwt", importpath = "github.com/nats-io/jwt", @@ -2533,6 +2683,12 @@ def prysm_deps(): sum = "h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4=", version = "v0.6.1", ) + go_repository( + name = "com_github_pion_stun_v2", + importpath = "github.com/pion/stun/v2", + sum = "h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=", + version = "v2.0.0", + ) go_repository( name = "com_github_pion_transport_v2", importpath = "github.com/pion/transport/v2", @@ -2629,6 +2785,24 @@ def prysm_deps(): sum = "h1:BlqrtbT9lLH3ZsOVhXPsHzFrApCTKRifB7gjJuypu6Y=", version = "v1.3.0", ) + go_repository( + name = "com_github_protolambda_bls12_381_util", + importpath = "github.com/protolambda/bls12-381-util", + 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", From 5a5a960c773b343453e9347a90db142964d28cb2 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 11 Feb 2025 08:18:31 -0600 Subject: [PATCH 23/27] partially reverting incorrect change --- beacon-chain/sync/rpc_send_request.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beacon-chain/sync/rpc_send_request.go b/beacon-chain/sync/rpc_send_request.go index 4500bf2c86e9..4de42eb27ad9 100644 --- a/beacon-chain/sync/rpc_send_request.go +++ b/beacon-chain/sync/rpc_send_request.go @@ -171,7 +171,7 @@ func SendBlobsByRangeRequest(ctx context.Context, tor blockchain.TemporalOracle, maxBlobsPerBlock := uint64(params.BeaconConfig().MaxBlobsPerBlock(req.StartSlot + primitives.Slot(req.Count))) max := params.BeaconConfig().MaxRequestBlobSidecars - if slots.ToEpoch(req.StartSlot+primitives.Slot(req.Count)) >= params.BeaconConfig().ElectraForkEpoch { + if slots.ToEpoch(req.StartSlot) >= params.BeaconConfig().ElectraForkEpoch { max = params.BeaconConfig().MaxRequestBlobSidecarsElectra } if max > req.Count*maxBlobsPerBlock { @@ -204,10 +204,10 @@ func SendBlobSidecarByRoot( defer closeStream(stream, log) max := params.BeaconConfig().MaxRequestBlobSidecars - if slots.ToEpoch(slot+primitives.Slot(len(*req))) >= params.BeaconConfig().ElectraForkEpoch { + if slots.ToEpoch(slot) >= params.BeaconConfig().ElectraForkEpoch { max = params.BeaconConfig().MaxRequestBlobSidecarsElectra } - maxBlobCount := params.BeaconConfig().MaxBlobsPerBlock(slot + primitives.Slot(len(*req))) + maxBlobCount := params.BeaconConfig().MaxBlobsPerBlock(slot) if max > uint64(len(*req)*maxBlobCount) { max = uint64(len(*req) * maxBlobCount) } From 0234d6d3956351ad8d2ce983eb7a88756c42f596 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 11 Feb 2025 09:21:18 -0600 Subject: [PATCH 24/27] removing fixes from change log, handled in separate prs --- changelog/james-prysm_electra-e2e.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/changelog/james-prysm_electra-e2e.md b/changelog/james-prysm_electra-e2e.md index 30d52877a922..ec6de568cfda 100644 --- a/changelog/james-prysm_electra-e2e.md +++ b/changelog/james-prysm_electra-e2e.md @@ -5,8 +5,3 @@ ### Changed - updates geth to 1.15.0 - -### Fixed - -- fixed rpc send request blobs per block limit to cover transition period between forks -- fixed hard coded slots per epoch while evaluating blobs limit by slot \ No newline at end of file From 94963cb8621aca723540c45120d360afcd4a1476 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 11 Feb 2025 09:26:39 -0600 Subject: [PATCH 25/27] removing comment --- beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go | 1 - 1 file changed, 1 deletion(-) diff --git a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go index 295ad73f0c46..af8e4c659f93 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go +++ b/beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go @@ -39,7 +39,6 @@ func (bs *Server) ListBeaconBlocks( if err != nil { return nil, err } - // TODO: figure out a better way to do this or change this API. altCtrs, err := convertFromV1Containers(ctrs) if err != nil { return nil, err From 6dfa746c07b20d988c59e02b03f101fac65bbac9 Mon Sep 17 00:00:00 2001 From: james-prysm Date: Tue, 11 Feb 2025 22:42:04 -0600 Subject: [PATCH 26/27] updating update fraction field to the corrected spec value from prague --- runtime/interop/genesis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/interop/genesis.go b/runtime/interop/genesis.go index c77af3e2a69c..2803722b5830 100644 --- a/runtime/interop/genesis.go +++ b/runtime/interop/genesis.go @@ -168,7 +168,7 @@ func GethTestnetGenesis(genesisTime uint64, cfg *clparams.BeaconChainConfig) *co Prague: ¶ms.BlobConfig{ Target: 6, Max: 9, - UpdateFraction: 3338477, // double check this field, this number might need to be updated + UpdateFraction: 5007716, }, }, } From 9892237d8fa5ebca192e44da42134132c8e1279a Mon Sep 17 00:00:00 2001 From: james-prysm <90280386+james-prysm@users.noreply.github.com> Date: Tue, 11 Feb 2025 22:44:37 -0600 Subject: [PATCH 27/27] Update testing/endtoend/evaluators/fork.go Co-authored-by: Preston Van Loon --- testing/endtoend/evaluators/fork.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/endtoend/evaluators/fork.go b/testing/endtoend/evaluators/fork.go index a8bb0a6dcabf..1bf061ed6c58 100644 --- a/testing/endtoend/evaluators/fork.go +++ b/testing/endtoend/evaluators/fork.go @@ -274,7 +274,7 @@ func electraForkOccurs(_ *types.EvaluationContext, conns ...*grpc.ClientConn) er return errors.New("nil block returned by beacon node") } if res.GetElectraBlock() == nil { - return errors.Errorf("non-deneb block returned after the fork with type %T", res.Block) + return errors.Errorf("non-electra block returned after the fork with type %T", res.Block) } blk, err := blocks.NewSignedBeaconBlock(res.GetElectraBlock()) if err != nil {