stop testing get_next_slot_expected_withdrawals() mechanism on Deneb (#7200)

tersec · web-flow · commit c54f87229718 · 2025-05-28T13:22:15.000+02:00
diff --git a/AllTests-mainnet.md b/AllTests-mainnet.md
@@ -776,7 +776,6 @@ AllTests-mainnet
 ```
 ## Nimbus remote signer/signing test (verifying-web3signer)
 ```diff
-+ Signing BeaconBlock (getBlockSignature(deneb))                                             OK
 + Signing BeaconBlock (getBlockSignature(electra))                                           OK
 + Waiting for signing node (/upcheck) test                                                   OK
 ```
@@ -785,7 +784,6 @@ AllTests-mainnet
 + Connection timeout test                                                                    OK
 + Public keys enumeration (/api/v1/eth2/publicKeys) test                                     OK
 + Public keys reload (/reload) test                                                          OK
-+ Signing BeaconBlock (getBlockSignature(deneb))                                             OK
 + Signing BeaconBlock (getBlockSignature(electra))                                           OK
 + Signing SC contribution and proof (getContributionAndProofSignature())                     OK
 + Signing SC message (getSyncCommitteeMessage())                                             OK
diff --git a/beacon_chain/nimbus_signing_node.nim b/beacon_chain/nimbus_signing_node.nim
@@ -238,12 +238,8 @@ proc installApiHandlers*(node: SigningNodeRef) =
 
         let (feeRecipientIndex, blockHeader) =
           case request.beaconBlockHeader.kind
-          of ConsensusFork.Phase0 .. ConsensusFork.Bellatrix:
-            # `phase0` and `altair` blocks do not have `fee_recipient`, so
-            # we return an error.
+          of ConsensusFork.Phase0 .. ConsensusFork.Capella:
             return errorResponse(Http400, BlockIncorrectFork)
-          of ConsensusFork.Capella:
-            (GeneralizedIndex(401), request.beaconBlockHeader.data)
           of ConsensusFork.Deneb:
             (GeneralizedIndex(801), request.beaconBlockHeader.data)
           of ConsensusFork.Electra:
diff --git a/beacon_chain/spec/state_transition_epoch.nim b/beacon_chain/spec/state_transition_epoch.nim
@@ -1583,8 +1583,7 @@ proc process_epoch*(
   ok()
 
 proc get_validator_balance_after_epoch*(
-    cfg: RuntimeConfig, state: deneb.BeaconState | electra.BeaconState |
-    fulu.BeaconState,
+    cfg: RuntimeConfig, state: electra.BeaconState | fulu.BeaconState,
     cache: var StateCache, info: var altair.EpochInfo,
     index: ValidatorIndex): Gwei =
   # Run a subset of process_epoch() which affects an individual validator,
@@ -1669,14 +1668,6 @@ proc get_validator_balance_after_epoch*(
 
   post_epoch_balance
 
-proc get_next_slot_expected_withdrawals*(
-    cfg: RuntimeConfig, state: deneb.BeaconState, cache: var StateCache,
-    info: var altair.EpochInfo): seq[Withdrawal] =
-  get_expected_withdrawals_aux(state, (state.slot + 1).epoch) do:
-    # validator_index is defined by an injected symbol within the template
-    get_validator_balance_after_epoch(
-      cfg, state, cache, info, validator_index.ValidatorIndex)
-
 proc get_next_slot_expected_withdrawals*(
     cfg: RuntimeConfig, state: electra.BeaconState, cache: var StateCache,
     info: var altair.EpochInfo): seq[Withdrawal] =
diff --git a/beacon_chain/validators/validator_pool.nim b/beacon_chain/validators/validator_pool.nim
@@ -632,36 +632,8 @@ proc getBlockSignature*(v: AttachedValidator, fork: Fork,
             proofs)
       elif blck is ForkedMaybeBlindedBeaconBlock:
         withForkyMaybeBlindedBlck(blck):
-          when consensusFork < ConsensusFork.Deneb:
+          when consensusFork < ConsensusFork.Electra:
             return SignatureResult.err("Invalid beacon block fork")
-          elif consensusFork == ConsensusFork.Deneb:
-            when isBlinded:
-              case v.data.remoteType
-              of RemoteSignerType.Web3Signer:
-                Web3SignerRequest.init(fork, genesis_validators_root,
-                  Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                    data: forkyMaybeBlindedBlck.toBeaconBlockHeader))
-              of RemoteSignerType.VerifyingWeb3Signer:
-                let proofs =
-                  blockPropertiesProofs(forkyMaybeBlindedBlck.body,
-                                        denebIndex)
-                Web3SignerRequest.init(fork, genesis_validators_root,
-                  Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                    data: forkyMaybeBlindedBlck.toBeaconBlockHeader), proofs)
-            else:
-              case v.data.remoteType
-              of RemoteSignerType.Web3Signer:
-                Web3SignerRequest.init(fork, genesis_validators_root,
-                  Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                    data: forkyMaybeBlindedBlck.`block`.toBeaconBlockHeader))
-              of RemoteSignerType.VerifyingWeb3Signer:
-                let proofs =
-                  blockPropertiesProofs(forkyMaybeBlindedBlck.`block`.body,
-                                        denebIndex)
-                Web3SignerRequest.init(fork, genesis_validators_root,
-                  Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                    data: forkyMaybeBlindedBlck.`block`.toBeaconBlockHeader),
-                      proofs)
           elif consensusFork == ConsensusFork.Electra:
             when isBlinded:
               case v.data.remoteType
@@ -720,21 +692,8 @@ proc getBlockSignature*(v: AttachedValidator, fork: Fork,
                       proofs)
       else:
         case blck.kind
-        of ConsensusFork.Phase0 .. ConsensusFork.Capella:
+        of ConsensusFork.Phase0 .. ConsensusFork.Deneb:
           return SignatureResult.err("Invalid beacon block fork")
-        of ConsensusFork.Deneb:
-          case v.data.remoteType
-          of RemoteSignerType.Web3Signer:
-            Web3SignerRequest.init(fork, genesis_validators_root,
-              Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                data: blck.denebData.toBeaconBlockHeader))
-          of RemoteSignerType.VerifyingWeb3Signer:
-            let proofs = blockPropertiesProofs(
-              blck.denebData.body, denebIndex)
-            Web3SignerRequest.init(fork, genesis_validators_root,
-              Web3SignerForkedBeaconBlock(kind: ConsensusFork.Deneb,
-                data: blck.denebData.toBeaconBlockHeader),
-              proofs)
         of ConsensusFork.Electra:
           case v.data.remoteType
           of RemoteSignerType.Web3Signer:
diff --git a/tests/consensus_spec/deneb/test_fixture_state_transition_epoch.nim b/tests/consensus_spec/deneb/test_fixture_state_transition_epoch.nim
@@ -1,5 +1,5 @@
 # beacon_chain
-# Copyright (c) 2022-2024 Status Research & Development GmbH
+# Copyright (c) 2022-2025 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -23,7 +23,6 @@ import
 from std/sequtils import mapIt, toSeq
 from std/strutils import rsplit
 from ../../../beacon_chain/spec/datatypes/deneb import BeaconState
-from ../../teststateutil import checkPerValidatorBalanceCalc
 
 const
   RootDir = SszTestsDir/const_preset/"deneb"/"epoch_processing"
@@ -75,15 +74,13 @@ template runSuite(
 # ---------------------------------------------------------------
 runSuite(JustificationFinalizationDir, "Justification & Finalization"):
   let info = altair.EpochInfo.init(state)
-  check checkPerValidatorBalanceCalc(state)
   process_justification_and_finalization(state, info.balances)
   Result[void, cstring].ok()
 
 # Inactivity updates
 # ---------------------------------------------------------------
 runSuite(InactivityDir, "Inactivity"):
   let info = altair.EpochInfo.init(state)
-  check checkPerValidatorBalanceCalc(state)
   process_inactivity_updates(cfg, state, info)
   Result[void, cstring].ok()
 
diff --git a/tests/consensus_spec/test_fixture_sanity_blocks.nim b/tests/consensus_spec/test_fixture_sanity_blocks.nim
@@ -21,7 +21,6 @@ from ../../beacon_chain/spec/presets import
 from ./fixtures_utils import
   SSZ, SszTestsDir, hash_tree_root, loadBlock, parseTest,
   readSszBytes, toSszType
-from ../teststateutil import checkPerValidatorBalanceCalc
 
 proc runTest(
     consensusFork: static ConsensusFork,
@@ -54,15 +53,6 @@ proc runTest(
         discard state_transition(
           defaultRuntimeConfig, fhPreState[], blck, cache, info, flags = {},
           noRollback).expect("should apply block")
-        withState(fhPreState[]):
-          when consensusFork == ConsensusFork.Deneb:
-            if unitTestName != "randomized_14":
-              # TODO this test as of v1.5.0-beta.2 breaks, but also probably
-              # just remove Deneb-only infrastructure of this sort, since it
-              # doesn't readily adapt to Electra regardless. For now keep to
-              # point to a potentially fixable/unexpected test case which is
-              # involves code not run outside the test suite to begin with.
-              check checkPerValidatorBalanceCalc(forkyState.data)
       else:
         let res = state_transition(
           defaultRuntimeConfig, fhPreState[], blck, cache, info, flags = {},
diff --git a/tests/test_signing_node.nim b/tests/test_signing_node.nim
diff --git a/tests/teststateutil.nim b/tests/teststateutil.nim
