Merge pull request ethereum#3999 from jtraglia/simplify-apply-deposit

Deduplicate code in `apply_deposit`
SherfeyInv · Nov 4, 2024 · 17feed7 · 17feed7
2 parents 1b408e9 + 410b14f
commit 17feed7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/specs/electra/beacon-chain.md b/specs/electra/beacon-chain.md
@@ -856,7 +856,6 @@ def apply_pending_deposit(state: BeaconState, deposit: PendingDeposit) -> None:
             add_validator_to_registry(state, deposit.pubkey, deposit.withdrawal_credentials, deposit.amount)
     else:
         validator_index = ValidatorIndex(validator_pubkeys.index(deposit.pubkey))
-        # Increase balance
         increase_balance(state, validator_index, deposit.amount)
 ```
 
@@ -1356,24 +1355,18 @@ def apply_deposit(state: BeaconState,
         # Verify the deposit signature (proof of possession) which is not checked by the deposit contract
         if is_valid_deposit_signature(pubkey, withdrawal_credentials, amount, signature):
             add_validator_to_registry(state, pubkey, withdrawal_credentials, Gwei(0))  # [Modified in Electra:EIP7251]
-            # [New in Electra:EIP7251]
-            state.pending_deposits.append(PendingDeposit(
-                pubkey=pubkey,
-                withdrawal_credentials=withdrawal_credentials,
-                amount=amount,
-                signature=signature,
-                slot=GENESIS_SLOT,  # Use GENESIS_SLOT to distinguish from a pending deposit request
-            ))
-    else:
-        # Increase balance by deposit amount
-        # [Modified in Electra:EIP7251]
-        state.pending_deposits.append(PendingDeposit(
-            pubkey=pubkey,
-            withdrawal_credentials=withdrawal_credentials,
-            amount=amount,
-            signature=signature,
-            slot=GENESIS_SLOT  # Use GENESIS_SLOT to distinguish from a pending deposit request
-        ))
+        else:
+            return
+
+    # Increase balance by deposit amount
+    # [Modified in Electra:EIP7251]
+    state.pending_deposits.append(PendingDeposit(
+        pubkey=pubkey,
+        withdrawal_credentials=withdrawal_credentials,
+        amount=amount,
+        signature=signature,
+        slot=GENESIS_SLOT  # Use GENESIS_SLOT to distinguish from a pending deposit request
+    ))
 ```
 
 ###### New `is_valid_deposit_signature`

diff --git a/tests/core/pyspec/eth2spec/test/helpers/deposits.py b/tests/core/pyspec/eth2spec/test/helpers/deposits.py
@@ -271,7 +271,7 @@ def run_deposit_processing(spec, state, deposit, validator_index, valid=True, ef
         pre_effective_balance = state.validators[validator_index].effective_balance
 
     if is_post_electra(spec):
-        pre_pending_deposits = len(state.pending_deposits)
+        pre_pending_deposits_count = len(state.pending_deposits)
 
     yield 'pre', state
     yield 'deposit', deposit
@@ -290,6 +290,8 @@ def run_deposit_processing(spec, state, deposit, validator_index, valid=True, ef
         assert len(state.balances) == pre_validator_count
         if is_top_up:
             assert get_balance(state, validator_index) == pre_balance
+        if is_post_electra(spec):
+            assert len(state.pending_deposits) == pre_pending_deposits_count
     else:
         if is_top_up:
             # Top-ups don't add validators
@@ -313,13 +315,13 @@ def run_deposit_processing(spec, state, deposit, validator_index, valid=True, ef
             assert get_balance(state, validator_index) == pre_balance
             assert state.validators[validator_index].effective_balance == pre_effective_balance
             # new correct balance deposit queued up
-            assert len(state.pending_deposits) == pre_pending_deposits + 1
-            assert state.pending_deposits[pre_pending_deposits].pubkey == deposit.data.pubkey
+            assert len(state.pending_deposits) == pre_pending_deposits_count + 1
+            assert state.pending_deposits[pre_pending_deposits_count].pubkey == deposit.data.pubkey
             assert state.pending_deposits[
-                pre_pending_deposits].withdrawal_credentials == deposit.data.withdrawal_credentials
-            assert state.pending_deposits[pre_pending_deposits].amount == deposit.data.amount
-            assert state.pending_deposits[pre_pending_deposits].signature == deposit.data.signature
-            assert state.pending_deposits[pre_pending_deposits].slot == spec.GENESIS_SLOT
+                pre_pending_deposits_count].withdrawal_credentials == deposit.data.withdrawal_credentials
+            assert state.pending_deposits[pre_pending_deposits_count].amount == deposit.data.amount
+            assert state.pending_deposits[pre_pending_deposits_count].signature == deposit.data.signature
+            assert state.pending_deposits[pre_pending_deposits_count].slot == spec.GENESIS_SLOT
 
     assert state.eth1_deposit_index == state.eth1_data.deposit_count