eip6110: Queue deposit requests and apply them during epoch processing

presets/mainnet/electra.yaml

@@ -10,7 +10,7 @@ MAX_EFFECTIVE_BALANCE_ELECTRA: 2048000000000
 # State list lengths
 # ---------------------------------------------------------------
 # `uint64(2**27)` (= 134,217,728)
-PENDING_BALANCE_DEPOSITS_LIMIT: 134217728
+PENDING_DEPOSITS_LIMIT: 134217728
 # `uint64(2**27)` (= 134,217,728)
 PENDING_PARTIAL_WITHDRAWALS_LIMIT: 134217728
 # `uint64(2**18)` (= 262,144)
@@ -43,3 +43,8 @@ MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 16
 # ---------------------------------------------------------------
 # 2**3 ( = 8) pending withdrawals
 MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: 8
+
+# Pending deposits processing
+# ---------------------------------------------------------------
+# 2**4 ( = 4) pending deposits
+MAX_PENDING_DEPOSITS_PER_EPOCH_PROCESSING: 16

presets/minimal/electra.yaml

@@ -10,7 +10,7 @@ MAX_EFFECTIVE_BALANCE_ELECTRA: 2048000000000
 # State list lengths
 # ---------------------------------------------------------------
 # `uint64(2**27)` (= 134,217,728)
-PENDING_BALANCE_DEPOSITS_LIMIT: 134217728
+PENDING_DEPOSITS_LIMIT: 134217728
 # [customized] `uint64(2**6)` (= 64)
 PENDING_PARTIAL_WITHDRAWALS_LIMIT: 64
 # [customized] `uint64(2**6)` (= 64)
@@ -43,3 +43,8 @@ MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD: 2
 # ---------------------------------------------------------------
 # 2**0 ( = 1) pending withdrawals
 MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: 1
+
+# Pending deposits processing
+# ---------------------------------------------------------------
+# 2**4 ( = 4) pending deposits
+MAX_PENDING_DEPOSITS_PER_EPOCH_PROCESSING: 16

specs/electra/fork.md

@@ -154,7 +154,7 @@ def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
         earliest_exit_epoch=earliest_exit_epoch,
         consolidation_balance_to_consume=0,
         earliest_consolidation_epoch=compute_activation_exit_epoch(get_current_epoch(pre)),
-        pending_balance_deposits=[],
+        pending_deposits=[],
         pending_partial_withdrawals=[],
         pending_consolidations=[],
     )

tests/core/pyspec/eth2spec/test/capella/block_processing/test_process_deposit.py

@@ -32,10 +32,13 @@ def test_success_top_up_to_withdrawn_validator(spec, state):
     yield from run_deposit_processing(spec, state, deposit, validator_index)
 
     if is_post_electra(spec):
-        pending_balance_deposits_len = len(state.pending_balance_deposits)
-        pending_balance_deposit = state.pending_balance_deposits[pending_balance_deposits_len - 1]
-        assert pending_balance_deposit.amount == amount
-        assert pending_balance_deposit.index == validator_index
+        pending_deposits_len = len(state.pending_deposits)
+        pending_deposit = state.pending_deposits[pending_deposits_len - 1]
+        assert pending_deposit.pubkey == deposit.data.pubkey
+        assert pending_deposit.withdrawal_credentials == deposit.data.withdrawal_credentials
+        assert pending_deposit.amount == deposit.data.amount
+        assert pending_deposit.signature == deposit.data.signature
+        assert pending_deposit.slot == spec.GENESIS_SLOT
     else:
         assert state.balances[validator_index] == amount
         assert state.validators[validator_index].effective_balance == 0
@@ -47,7 +50,7 @@ def test_success_top_up_to_withdrawn_validator(spec, state):
     if is_post_electra(spec):
         has_execution_withdrawal = spec.has_execution_withdrawal_credential(validator)
         is_withdrawable = validator.withdrawable_epoch <= current_epoch
-        has_non_zero_balance = pending_balance_deposit.amount > 0
+        has_non_zero_balance = pending_deposit.amount > 0
         # NOTE: directly compute `is_fully_withdrawable_validator` conditions here
         # to work around how the epoch processing changed balance updates
         assert has_execution_withdrawal and is_withdrawable and has_non_zero_balance

tests/core/pyspec/eth2spec/test/capella/sanity/test_blocks.py

@@ -365,8 +365,11 @@ def test_top_up_and_partial_withdrawable_validator(spec, state):
     yield 'post', state
 
     if is_post_electra(spec):
-        assert state.pending_balance_deposits[0].amount == amount
-        assert state.pending_balance_deposits[0].index == validator_index
+        assert state.pending_deposits[0].pubkey == deposit.data.pubkey
+        assert state.pending_deposits[0].withdrawal_credentials == deposit.data.withdrawal_credentials
+        assert state.pending_deposits[0].amount == deposit.data.amount
+        assert state.pending_deposits[0].signature == deposit.data.signature
+        assert state.pending_deposits[0].slot == spec.GENESIS_SLOT
     else:
         # Since withdrawals happen before deposits, it becomes partially withdrawable after state transition.
         validator = state.validators[validator_index]
@@ -405,7 +408,7 @@ def test_top_up_to_fully_withdrawn_validator(spec, state):
 
     balance = state.balances[validator_index]
     if is_post_electra(spec):
-        balance += state.pending_balance_deposits[0].amount
+        balance += state.pending_deposits[0].amount
 
     assert spec.is_fully_withdrawable_validator(
         state.validators[validator_index],

tests/core/pyspec/eth2spec/test/electra/block_processing/test_process_deposit_request.py

@@ -122,8 +122,8 @@ def test_top_up__max_effective_balance(spec, state):
 
     yield from run_deposit_request_processing(spec, state, deposit_request, validator_index)
 
-    deposits_len = len(state.pending_balance_deposits)
-    assert state.pending_balance_deposits[deposits_len - 1].amount == amount
+    deposits_len = len(state.pending_deposits)
+    assert state.pending_deposits[deposits_len - 1].amount == amount
     assert state.validators[validator_index].effective_balance == spec.MAX_EFFECTIVE_BALANCE
 
 
@@ -141,8 +141,8 @@ def test_top_up__less_effective_balance(spec, state):
 
     yield from run_deposit_request_processing(spec, state, deposit_request, validator_index)
 
-    deposits_len = len(state.pending_balance_deposits)
-    assert state.pending_balance_deposits[deposits_len - 1].amount == amount
+    deposits_len = len(state.pending_deposits)
+    assert state.pending_deposits[deposits_len - 1].amount == amount
     # unchanged effective balance
     assert state.validators[validator_index].effective_balance == initial_effective_balance
 
@@ -161,8 +161,8 @@ def test_top_up__zero_balance(spec, state):
 
     yield from run_deposit_request_processing(spec, state, deposit_request, validator_index)
 
-    deposits_len = len(state.pending_balance_deposits)
-    assert state.pending_balance_deposits[deposits_len - 1].amount == amount
+    deposits_len = len(state.pending_deposits)
+    assert state.pending_deposits[deposits_len - 1].amount == amount
     # unchanged effective balance
     assert state.validators[validator_index].effective_balance == initial_effective_balance
 
@@ -276,18 +276,18 @@ def test_success_top_up_to_withdrawn_validator(spec, state):
 
     yield from run_deposit_request_processing(spec, state, deposit_request, validator_index)
 
-    deposits_len = len(state.pending_balance_deposits)
-    assert state.pending_balance_deposits[deposits_len - 1].amount == amount
+    deposits_len = len(state.pending_deposits)
+    assert state.pending_deposits[deposits_len - 1].amount == amount
     assert state.validators[validator_index].effective_balance == 0
 
     validator = state.validators[validator_index]
 
-    pending_balance_deposits_len = len(state.pending_balance_deposits)
-    pending_balance_deposit = state.pending_balance_deposits[pending_balance_deposits_len - 1]
+    pending_deposits_len = len(state.pending_deposits)
+    pending_deposit = state.pending_deposits[pending_deposits_len - 1]
     current_epoch = spec.get_current_epoch(state)
     has_execution_withdrawal = spec.has_execution_withdrawal_credential(validator)
     is_withdrawable = validator.withdrawable_epoch <= current_epoch
-    has_non_zero_balance = pending_balance_deposit.amount > 0
+    has_non_zero_balance = pending_deposit.amount > 0
     # NOTE: directly compute `is_fully_withdrawable_validator` conditions here
     # to work around how the epoch processing changed balance updates
     assert has_execution_withdrawal and is_withdrawable and has_non_zero_balance