EIP6914 - Reuse indexes with full sweep

specs/_features/reuse_indexes/beacon-chain.md

@@ -0,0 +1,65 @@
+# Reuse indexes -- The Beacon Chain
+
+## Table of contents
+
+<!-- TOC -->
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+- [Introduction](#introduction)
+- [Preset](#preset)
+  - [Time parameters](#time-parameters)
+- [Helpers](#helpers)
+  - [Predicates](#predicates)
+    - [`is_reusable_validator`](#is_reusable_validator)
+- [Beacon chain state transition function](#beacon-chain-state-transition-function)
+  - [Block processing](#block-processing)
+    - [Modified `get_index_for_new_validator`](#modified-get_index_for_new_validator)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+<!-- /TOC -->
+
+## Introduction
+
+This is the beacon chain specification to assign new deposits to existing validator records that have withdrawn long ago.
+
+*Note:* This specification is built upon [Capella](../../capella/beacon_chain.md) and is under active development.
+
+## Preset
+
+### Time parameters
+
+| Name | Value | Unit | Duration |
+| - | - | - |
+| `REUSE_VALIDATOR_INDEX_DELAY` | `uint64(2**16)` (= 65,536) | epochs | ~1 year |
+
+## Helper functions
+
+### Predicates
+
+#### `is_reusable_validator`
+
+```python
+def is_reusable_validator(validator: Validator, balance: Gwei, epoch: Epoch) -> bool:
+    """
+    Check if ``validator`` index can be re-assigned to a new deposit.
+    """
+    return (
+      validator.withdrawable_epoch < epoch - REUSE_VALIDATOR_INDEX_DELAY
+      and balance == 0
+    )
+```
+
+## Beacon chain state transition function
+
+### Block processing
+
+#### Modified `get_index_for_new_validator`
+
+```python
+def get_index_for_new_validator(state: BeaconState) -> int:
+    for index, validator in enumerate(state.validators):
+        if is_reusable_validator(validator, state.balances[index], get_current_epoch(state)):
+            return index
+    return len(state.validators)
+```

specs/altair/beacon-chain.md

@@ -511,16 +511,28 @@ def apply_deposit(state: BeaconState,
         signing_root = compute_signing_root(deposit_message, domain)
         # Initialize validator if the deposit signature is valid
         if bls.Verify(pubkey, signing_root, signature):
-            state.validators.append(get_validator_from_deposit(pubkey, withdrawal_credentials, amount))
-            state.balances.append(amount)
+            index = get_index_for_new_validator(state)
+            update_or_append_to_list(state.validators, index, get_validator_from_deposit(pubkey, withdrawal_credentials, amount))
+            update_or_append_to_list(state.balances, index, amount)
             # [New in Altair]
-            state.previous_epoch_participation.append(ParticipationFlags(0b0000_0000))
-            state.current_epoch_participation.append(ParticipationFlags(0b0000_0000))
-            state.inactivity_scores.append(uint64(0))
+            update_or_append_to_list(state.previous_epoch_participation, index, ParticipationFlags(0b0000_0000))
+            update_or_append_to_list(state.current_epoch_participation, index, ParticipationFlags(0b0000_0000))
+            update_or_append_to_list(state.inactivity_scores, index, uint64(0))
     else:
         # Increase balance by deposit amount
         index = ValidatorIndex(validator_pubkeys.index(pubkey))
         increase_balance(state, index, amount)
+
+
+def get_index_for_new_validator(state: BeaconState) -> int:
+    return len(state.validators)
+
+
+def update_or_append_to_list(list: List, index: int, value: Any) -> None:
+    if index == len(list):
+        list.append(value)
+    else:
+        list[index] = value
 ```
 
 #### Sync aggregate processing