From 501ec74a4827eaf2c6b25d14ff90231b6e3ce0a5 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 14 Feb 2025 22:59:51 +0800 Subject: [PATCH] Fix Deposit Evaluator in E2E (#14933) * fix evaluator in electra * remove function * Fix evaluator --------- Co-authored-by: james-prysm <90280386+james-prysm@users.noreply.github.com> --- changelog/nisdas_fix_process_deposit_evaluator.md | 3 +++ testing/endtoend/evaluators/operations.go | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 changelog/nisdas_fix_process_deposit_evaluator.md diff --git a/changelog/nisdas_fix_process_deposit_evaluator.md b/changelog/nisdas_fix_process_deposit_evaluator.md new file mode 100644 index 0000000000..a02fc9721d --- /dev/null +++ b/changelog/nisdas_fix_process_deposit_evaluator.md @@ -0,0 +1,3 @@ +### Fixed + +- Fix E2E Process Deposit Evaluator for Electra. \ No newline at end of file diff --git a/testing/endtoend/evaluators/operations.go b/testing/endtoend/evaluators/operations.go index 5e32f49328..f5e7a84a3b 100644 --- a/testing/endtoend/evaluators/operations.go +++ b/testing/endtoend/evaluators/operations.go @@ -230,10 +230,16 @@ func activatesDepositedValidators(ec *e2etypes.EvaluationContext, conns ...*grpc continue } delete(expected, key) - if v.ActivationEpoch != epoch { + // Validator can't be activated yet . + if v.ActivationEligibilityEpoch > chainHead.FinalizedEpoch { continue } - deposits++ + if v.ActivationEpoch < epoch { + continue + } + if v.ActivationEpoch == epoch { + deposits++ + } if v.EffectiveBalance < params.BeaconConfig().MaxEffectiveBalance { lowBalance++ } @@ -250,7 +256,7 @@ func activatesDepositedValidators(ec *e2etypes.EvaluationContext, conns ...*grpc return fmt.Errorf("missing %d validators for post-genesis deposits", len(expected)) } - if uint64(deposits) != params.BeaconConfig().MinPerEpochChurnLimit { + if deposits > 0 && uint64(deposits) != params.BeaconConfig().MinPerEpochChurnLimit { return fmt.Errorf("expected %d deposits to be processed in epoch %d, received %d", params.BeaconConfig().MinPerEpochChurnLimit, epoch, deposits) }