Merge pull request #3504 from ethereum/dev

release v1.4.0-beta.2
ethereum · Sep 18, 2023 · ff9963f · ff9963f
2 parents 4149133 + ce240ca
commit ff9963f
Show file tree

Hide file tree

Showing 41 changed files with 619 additions and 116 deletions.
diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -87,7 +87,8 @@ EJECTION_BALANCE: 16000000000
 MIN_PER_EPOCH_CHURN_LIMIT: 4
 # 2**16 (= 65,536)
 CHURN_LIMIT_QUOTIENT: 65536
-
+# [New in Deneb:EIP7514] 2**3 (= 8)
+MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 8
 
 # Fork choice
 # ---------------------------------------------------------------
@@ -140,3 +141,9 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+
+# Whisk
+# `Epoch(2**8)`
+WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
+# `Epoch(2)`
+WHISK_PROPOSER_SELECTION_GAP: 2
diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -82,10 +82,12 @@ INACTIVITY_SCORE_BIAS: 4
 INACTIVITY_SCORE_RECOVERY_RATE: 16
 # 2**4 * 10**9 (= 16,000,000,000) Gwei
 EJECTION_BALANCE: 16000000000
-# 2**2 (= 4)
-MIN_PER_EPOCH_CHURN_LIMIT: 4
+# [customized] more easily demonstrate the difference between this value and the activation churn limit
+MIN_PER_EPOCH_CHURN_LIMIT: 2
 # [customized] scale queue churn at much lower validator counts for testing
 CHURN_LIMIT_QUOTIENT: 32
+# [New in Deneb:EIP7514] [customized]
+MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT: 4
 
 
 # Fork choice
@@ -141,3 +143,7 @@ MAX_REQUEST_BLOB_SIDECARS: 768
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
 # `6`
 BLOB_SIDECAR_SUBNET_COUNT: 6
+
+# Whisk
+WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
+WHISK_PROPOSER_SELECTION_GAP: 1
diff --git a/presets/mainnet/whisk.yaml b/presets/mainnet/whisk.yaml
@@ -8,12 +8,8 @@ CURDLEPROOFS_N_BLINDERS: 4
 WHISK_CANDIDATE_TRACKERS_COUNT: 16384
 # `uint64(2**13)` must be < WHISK_CANDIDATE_TRACKERS_COUNT
 WHISK_PROPOSER_TRACKERS_COUNT: 8192
-# `Epoch(2**8)`
-WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
 # `uint64(2**7 - CURDLEPROOFS_N_BLINDERS)`
 WHISK_VALIDATORS_PER_SHUFFLE: 124
-# `Epoch(2)`
-WHISK_PROPOSER_SELECTION_GAP: 2
 # `uint64(2**15)` TODO: will be replaced by a fix format once there's a serialized format
 WHISK_MAX_SHUFFLE_PROOF_SIZE: 32768
 # `uint64(2**10)` TODO: will be replaced by a fix format once there's a serialized format

diff --git a/presets/minimal/whisk.yaml b/presets/minimal/whisk.yaml
@@ -9,11 +9,7 @@ WHISK_CANDIDATE_TRACKERS_COUNT: 32
 # [customized]
 WHISK_PROPOSER_TRACKERS_COUNT: 16
 # [customized]
-WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
-# [customized]
 WHISK_VALIDATORS_PER_SHUFFLE: 4
-# [customized]
-WHISK_PROPOSER_SELECTION_GAP: 1
 # `uint64(2**15)` TODO: will be replaced by a fix format once there's a serialized format
 WHISK_MAX_SHUFFLE_PROOF_SIZE: 32768
 # `uint64(2**10)` TODO: will be replaced by a fix format once there's a serialized format

diff --git a/pysetup/spec_builders/deneb.py b/pysetup/spec_builders/deneb.py
@@ -21,9 +21,9 @@ def preparations(cls):
     @classmethod
     def sundry_functions(cls) -> str:
         return '''
-def retrieve_blobs_and_proofs(beacon_block_root: Root) -> PyUnion[Tuple[Blob, KZGProof], Tuple[str, str]]:
+def retrieve_blobs_and_proofs(beacon_block_root: Root) -> Tuple[Sequence[Blob], Sequence[KZGProof]]:
     # pylint: disable=unused-argument
-    return ("TEST", "TEST")'''
+    return [], []'''
 
     @classmethod
     def execution_engine_cls(cls) -> str:

diff --git a/setup.py b/setup.py
@@ -519,6 +519,6 @@ def run(self):
         "lru-dict==1.2.0",
         MARKO_VERSION,
         "py_arkworks_bls12381==0.3.4",
-        "curdleproofs @ git+https://github.com/nalinbhardwaj/curdleproofs.pie@805d06785b6ff35fde7148762277dd1ae678beeb#egg=curdleproofs&subdirectory=curdleproofs",
+        "curdleproofs==0.1.1",
     ]
 )
diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md
@@ -12,6 +12,7 @@
 - [Constants](#constants)
   - [Domain types](#domain-types)
 - [Preset](#preset)
+- [Configuration](#configuration)
 - [Cryptography](#cryptography)
   - [BLS](#bls)
   - [Curdleproofs and opening proofs](#curdleproofs-and-opening-proofs)
@@ -52,12 +53,17 @@ This document details the beacon chain additions and changes of to support the W
 | `CURDLEPROOFS_N_BLINDERS`          | `uint64(4)`                | number of blinders for curdleproofs                         |
 | `WHISK_CANDIDATE_TRACKERS_COUNT`   | `uint64(2**14)` (= 16,384) | number of candidate trackers                                |
 | `WHISK_PROPOSER_TRACKERS_COUNT`    | `uint64(2**13)` (= 8,192)  | number of proposer trackers                                 |
-| `WHISK_EPOCHS_PER_SHUFFLING_PHASE` | `Epoch(2**8)` (= 256)      | epochs per shuffling phase                                  |
 | `WHISK_VALIDATORS_PER_SHUFFLE`     | `uint64(2**7 - 4)` (= 124) | number of validators shuffled per shuffle step              |
-| `WHISK_PROPOSER_SELECTION_GAP`     | `Epoch(2)`                 | gap between proposer selection and the block proposal phase |
 | `WHISK_MAX_SHUFFLE_PROOF_SIZE`     | `uint64(2**15)`            | max size of a shuffle proof                                 |
 | `WHISK_MAX_OPENING_PROOF_SIZE`     | `uint64(2**10)`            | max size of a opening proof                                 |
 
+## Configuration
+
+| Name                               | Value                      | Description                                                 |
+| ---------------------------------- | -------------------------- | ----------------------------------------------------------- |
+| `WHISK_EPOCHS_PER_SHUFFLING_PHASE` | `Epoch(2**8)` (= 256)      | epochs per shuffling phase                                  |
+| `WHISK_PROPOSER_SELECTION_GAP`     | `Epoch(2)`                 | gap between proposer selection and the block proposal phase |
+
 ## Cryptography
 
 ### BLS
@@ -318,30 +324,25 @@ def get_shuffle_indices(randao_reveal: BLSSignature) -> Sequence[uint64]:
 
 ```python
 def process_shuffled_trackers(state: BeaconState, body: BeaconBlockBody) -> None:
-    # Check the shuffle proof
-    shuffle_indices = get_shuffle_indices(body.randao_reveal)
-    pre_shuffle_trackers = [state.whisk_candidate_trackers[i] for i in shuffle_indices]
-
     shuffle_epoch = get_current_epoch(state) % WHISK_EPOCHS_PER_SHUFFLING_PHASE
     if shuffle_epoch + WHISK_PROPOSER_SELECTION_GAP + 1 >= WHISK_EPOCHS_PER_SHUFFLING_PHASE:
         # Require trackers set to zero during cooldown
         assert body.whisk_post_shuffle_trackers == Vector[WhiskTracker, WHISK_VALIDATORS_PER_SHUFFLE]()
         assert body.whisk_shuffle_proof_M_commitment == BLSG1Point()
         assert body.whisk_shuffle_proof == WhiskShuffleProof()
-        post_shuffle_trackers = pre_shuffle_trackers
     else:
         # Require shuffled trackers during shuffle
+        shuffle_indices = get_shuffle_indices(body.randao_reveal)
+        pre_shuffle_trackers = [state.whisk_candidate_trackers[i] for i in shuffle_indices]
         assert IsValidWhiskShuffleProof(
             pre_shuffle_trackers,
             body.whisk_post_shuffle_trackers,
             body.whisk_shuffle_proof_M_commitment,
             body.whisk_shuffle_proof,
         )
-        post_shuffle_trackers = body.whisk_post_shuffle_trackers
-
-    # Shuffle candidate trackers
-    for i, shuffle_index in enumerate(shuffle_indices):
-        state.whisk_candidate_trackers[shuffle_index] = post_shuffle_trackers[i]
+        # Shuffle candidate trackers
+        for i, shuffle_index in enumerate(shuffle_indices):
+            state.whisk_candidate_trackers[shuffle_index] = body.whisk_post_shuffle_trackers[i]
 ```
 
 ```python

diff --git a/specs/altair/fork.md b/specs/altair/fork.md
@@ -22,8 +22,6 @@ This document describes the process of the first upgrade of the beacon chain: th
 
 ## Configuration
 
-Warning: this configuration is not definitive.
-
 | Name | Value |
 | - | - |
 | `ALTAIR_FORK_VERSION` | `Version('0x01000000')` |

diff --git a/specs/altair/p2p-interface.md b/specs/altair/p2p-interface.md
@@ -13,7 +13,6 @@ Altair adds new messages, topics and data to the Req-Resp, Gossip and Discovery
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
-- [Warning](#warning)
 - [Modifications in Altair](#modifications-in-altair)
   - [MetaData](#metadata)
   - [The gossip domain: gossipsub](#the-gossip-domain-gossipsub)
@@ -38,11 +37,6 @@ Altair adds new messages, topics and data to the Req-Resp, Gossip and Discovery
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- /TOC -->
 
-## Warning
-
-This document is currently illustrative for early Altair testnets and some parts are subject to change.
-Refer to the note in the [validator guide](./validator.md) for further details.
-
 ## Modifications in Altair
 
 ### MetaData

diff --git a/specs/altair/validator.md b/specs/altair/validator.md
@@ -10,7 +10,6 @@ This is an accompanying document to [Altair -- The Beacon Chain](./beacon-chain.
 
 - [Introduction](#introduction)
 - [Prerequisites](#prerequisites)
-- [Warning](#warning)
 - [Constants](#constants)
   - [Misc](#misc)
 - [Containers](#containers)
@@ -63,10 +62,6 @@ Block proposers incorporate the (aggregated) sync committee signatures into each
 All terminology, constants, functions, and protocol mechanics defined in the [Altair -- The Beacon Chain](./beacon-chain.md) doc are requisite for this document and used throughout.
 Please see this document before continuing and use as a reference throughout.
 
-## Warning
-
-This document is currently illustrative for early Altair testnets and some parts are subject to change, especially pending implementation and profiling of Altair testnets.
-
 ## Constants
 
 ### Misc

diff --git a/specs/bellatrix/fork-choice.md b/specs/bellatrix/fork-choice.md
@@ -194,7 +194,8 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Add proposer score boost if the block is timely
     time_into_slot = (store.time - store.genesis_time) % SECONDS_PER_SLOT
     is_before_attesting_interval = time_into_slot < SECONDS_PER_SLOT // INTERVALS_PER_SLOT
-    if get_current_slot(store) == block.slot and is_before_attesting_interval:
+    is_first_block = store.proposer_boost_root == Root()
+    if get_current_slot(store) == block.slot and is_before_attesting_interval and is_first_block:
         store.proposer_boost_root = hash_tree_root(block)
 
     # Update checkpoints in store if necessary

diff --git a/specs/bellatrix/fork.md b/specs/bellatrix/fork.md
@@ -22,8 +22,6 @@ This document describes the process of Bellatrix upgrade.
 
 ## Configuration
 
-Warning: this configuration is not definitive.
-
 | Name | Value |
 | - | - |
 | `BELLATRIX_FORK_VERSION` | `Version('0x02000000')` |

diff --git a/specs/bellatrix/p2p-interface.md b/specs/bellatrix/p2p-interface.md
@@ -12,7 +12,6 @@ Readers should understand the Phase 0 and Altair documents and use them as a bas
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
-  - [Warning](#warning)
   - [Modifications in Bellatrix](#modifications-in-bellatrix)
     - [The gossip domain: gossipsub](#the-gossip-domain-gossipsub)
       - [Topics and messages](#topics-and-messages)
@@ -33,11 +32,6 @@ Readers should understand the Phase 0 and Altair documents and use them as a bas
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- /TOC -->
 
-## Warning
-
-This document is currently illustrative for early Bellatrix testnets and some parts are subject to change.
-Refer to the note in the [validator guide](./validator.md) for further details.
-
 ## Modifications in Bellatrix
 
 ### The gossip domain: gossipsub

diff --git a/specs/capella/fork-choice.md b/specs/capella/fork-choice.md
@@ -106,7 +106,8 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Add proposer score boost if the block is timely
     time_into_slot = (store.time - store.genesis_time) % SECONDS_PER_SLOT
     is_before_attesting_interval = time_into_slot < SECONDS_PER_SLOT // INTERVALS_PER_SLOT
-    if get_current_slot(store) == block.slot and is_before_attesting_interval:
+    is_first_block = store.proposer_boost_root == Root()
+    if get_current_slot(store) == block.slot and is_before_attesting_interval and is_first_block:
         store.proposer_boost_root = hash_tree_root(block)
 
     # Update checkpoints in store if necessary

diff --git a/specs/capella/fork.md b/specs/capella/fork.md
@@ -22,8 +22,6 @@ This document describes the process of the Capella upgrade.
 
 ## Configuration
 
-Warning: this configuration is not definitive.
-
 | Name | Value |
 | - | - |
 | `CAPELLA_FORK_VERSION` | `Version('0x03000000')` |

diff --git a/specs/deneb/beacon-chain.md b/specs/deneb/beacon-chain.md
@@ -16,6 +16,7 @@
 - [Preset](#preset)
   - [Execution](#execution)
 - [Configuration](#configuration)
+  - [Validator cycle](#validator-cycle)
 - [Containers](#containers)
   - [Extended containers](#extended-containers)
     - [`BeaconBlockBody`](#beaconblockbody)
@@ -26,6 +27,7 @@
     - [`kzg_commitment_to_versioned_hash`](#kzg_commitment_to_versioned_hash)
   - [Beacon state accessors](#beacon-state-accessors)
     - [Modified `get_attestation_participation_flag_indices`](#modified-get_attestation_participation_flag_indices)
+    - [New `get_validator_activation_churn_limit`](#new-get_validator_activation_churn_limit)
 - [Beacon chain state transition function](#beacon-chain-state-transition-function)
   - [Execution engine](#execution-engine)
     - [Request data](#request-data)
@@ -40,6 +42,8 @@
     - [Execution payload](#execution-payload)
       - [Modified `process_execution_payload`](#modified-process_execution_payload)
     - [Modified `process_voluntary_exit`](#modified-process_voluntary_exit)
+  - [Epoch processing](#epoch-processing)
+    - [Registry updates](#registry-updates)
 - [Testing](#testing)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -50,8 +54,9 @@
 Deneb is a consensus-layer upgrade containing a number of features. Including:
 * [EIP-4788](https://eips.ethereum.org/EIPS/eip-4788): Beacon block root in the EVM
 * [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844): Shard Blob Transactions scale data-availability of Ethereum in a simple, forwards-compatible manner
-* [EIP-7044](https://github.com/ethereum/EIPs/pull/7044): Perpetually Valid Signed Voluntary Exits
+* [EIP-7044](https://eips.ethereum.org/EIPS/eip-7044): Perpetually Valid Signed Voluntary Exits
 * [EIP-7045](https://eips.ethereum.org/EIPS/eip-7045): Increase Max Attestation Inclusion Slot
+* [EIP-7514](https://eips.ethereum.org/EIPS/eip-7514): Add Max Epoch Churn Limit
 
 ## Custom types
 
@@ -89,6 +94,12 @@ and are limited by `MAX_BLOB_GAS_PER_BLOCK // GAS_PER_BLOB`. However the CL limi
 
 ## Configuration
 
+### Validator cycle
+
+| Name | Value |
+| - | - |
+| `MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT` | `uint64(2**3)` (= 8) |
+
 ## Containers
 
 ### Extended containers
@@ -211,6 +222,16 @@ def get_attestation_participation_flag_indices(state: BeaconState,
     return participation_flag_indices
 ```
 
+#### New `get_validator_activation_churn_limit`
+
+```python
+def get_validator_activation_churn_limit(state: BeaconState) -> uint64:
+    """
+    Return the validator activation churn limit for the current epoch.
+    """
+    return min(MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT, get_validator_churn_limit(state))
+```
+
 ## Beacon chain state transition function
 
 ### Execution engine
@@ -415,6 +436,38 @@ def process_voluntary_exit(state: BeaconState, signed_voluntary_exit: SignedVolu
     initiate_validator_exit(state, voluntary_exit.validator_index)
 ```
 
+### Epoch processing
+
+#### Registry updates
+
+*Note*: The function `process_registry_updates` is modified to utilize `get_validator_activation_churn_limit()` to rate limit the activation queue for EIP-7514.
+
+```python
+def process_registry_updates(state: BeaconState) -> None:
+    # Process activation eligibility and ejections
+    for index, validator in enumerate(state.validators):
+        if is_eligible_for_activation_queue(validator):
+            validator.activation_eligibility_epoch = get_current_epoch(state) + 1
+
+        if (
+            is_active_validator(validator, get_current_epoch(state))
+            and validator.effective_balance <= EJECTION_BALANCE
+        ):
+            initiate_validator_exit(state, ValidatorIndex(index))
+
+    # Queue validators eligible for activation and not yet dequeued for activation
+    activation_queue = sorted([
+        index for index, validator in enumerate(state.validators)
+        if is_eligible_for_activation(state, validator)
+        # Order by the sequence of activation_eligibility_epoch setting and then index
+    ], key=lambda index: (state.validators[index].activation_eligibility_epoch, index))
+    # Dequeued validators for activation up to activation churn limit
+    # [Modified in Deneb:EIP7514]
+    for index in activation_queue[:get_validator_activation_churn_limit(state)]:
+        validator = state.validators[index]
+        validator.activation_epoch = compute_activation_exit_epoch(get_current_epoch(state))
+```
+
 ## Testing
 
 *Note*: The function `initialize_beacon_state_from_eth1` is modified for pure Deneb testing only.

diff --git a/specs/deneb/fork-choice.md b/specs/deneb/fork-choice.md
@@ -55,11 +55,6 @@ def is_data_available(beacon_block_root: Root, blob_kzg_commitments: Sequence[KZ
     # `MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS`
     blobs, proofs = retrieve_blobs_and_proofs(beacon_block_root)
 
-    # For testing, `retrieve_blobs_and_proofs` returns ("TEST", "TEST").
-    # TODO: Remove it once we have a way to inject `BlobSidecar` into tests.
-    if isinstance(blobs, str) or isinstance(proofs, str):
-        return True
-
     return verify_blob_kzg_proof_batch(blobs, blob_kzg_commitments, proofs)
 ```
 
@@ -111,7 +106,8 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Add proposer score boost if the block is timely
     time_into_slot = (store.time - store.genesis_time) % SECONDS_PER_SLOT
     is_before_attesting_interval = time_into_slot < SECONDS_PER_SLOT // INTERVALS_PER_SLOT
-    if get_current_slot(store) == block.slot and is_before_attesting_interval:
+    is_first_block = store.proposer_boost_root == Root()
+    if get_current_slot(store) == block.slot and is_before_attesting_interval and is_first_block:
         store.proposer_boost_root = hash_tree_root(block)
 
     # Update checkpoints in store if necessary

diff --git a/specs/phase0/fork-choice.md b/specs/phase0/fork-choice.md
@@ -539,7 +539,8 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Add proposer score boost if the block is timely
     time_into_slot = (store.time - store.genesis_time) % SECONDS_PER_SLOT
     is_before_attesting_interval = time_into_slot < SECONDS_PER_SLOT // INTERVALS_PER_SLOT
-    if get_current_slot(store) == block.slot and is_before_attesting_interval:
+    is_first_block = store.proposer_boost_root == Root()
+    if get_current_slot(store) == block.slot and is_before_attesting_interval and is_first_block:
         store.proposer_boost_root = hash_tree_root(block)
 
     # Update checkpoints in store if necessary