Merge pull request #3640 from ethereum/eip7549-tests

EIP-7549: Enable EIP-7549 on CI

.circleci/config.yml

@@ -181,6 +181,19 @@ jobs:
           command: make citest fork=eip7002
       - store_test_results:
           path: tests/core/pyspec/test-reports
+  test-eip7549:
+    docker:
+      - image: circleci/python:3.9
+    working_directory: ~/specs-repo
+    steps:
+      - restore_cache:
+          key: v3-specs-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_pyspec_cached_venv
+      - run:
+          name: Run py-tests
+          command: make citest fork=eip7549
+      - store_test_results:
+          path: tests/core/pyspec/test-reports
   test-whisk:
     docker:
       - image: circleci/python:3.9
@@ -333,6 +346,9 @@ workflows:
       - test-eip7002:
           requires:
             - install_pyspec_test
+      - test-eip7549:
+          requires:
+            - install_pyspec_test
       - test-whisk:
           requires:
             - install_pyspec_test

.github/workflows/run-tests.yml

@@ -71,7 +71,7 @@ jobs:
     needs: [preclear,lint,codespell,table_of_contents]
     strategy:
       matrix:
-        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110", "eip7002", "whisk", "eip7594"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb", "eip6110", "eip7002", "eip7549", "whisk", "eip7594"]
     steps:
       - name: Checkout this repo
         uses: actions/checkout@v3.2.0

Makefile

@@ -35,7 +35,7 @@ MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
                  $(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
                  $(wildcard $(SSZ_DIR)/*.md)
 
-ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb eip6110 eip7002 whisk
+ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb eip6110 eip7002 eip7549 whisk
 # The parameters for commands. Use `foreach` to avoid listing specs again.
 COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
 PYLINT_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), ./eth2spec/$S)

configs/mainnet.yaml

@@ -62,6 +62,9 @@ EIP7002_FORK_EPOCH: 18446744073709551615
 # EIP7251
 EIP7251_FORK_VERSION: 0x06000000  # temporary stub
 EIP7251_FORK_EPOCH: 18446744073709551615
+# EIP7549
+EIP7549_FORK_VERSION: 0x06000000  # temporary stub
+EIP7549_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000000  # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615

configs/minimal.yaml

@@ -59,8 +59,11 @@ EIP6110_FORK_EPOCH: 18446744073709551615
 EIP7002_FORK_VERSION: 0x07000001
 EIP7002_FORK_EPOCH: 18446744073709551615
 # EIP7251
-EIP7251_FORK_VERSION: 0x06000000  # temporary stub
+EIP7251_FORK_VERSION: 0x06000001  # temporary stub
 EIP7251_FORK_EPOCH: 18446744073709551615
+# EIP7549
+EIP7549_FORK_VERSION: 0x06000001  # temporary stub
+EIP7549_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000001
 WHISK_FORK_EPOCH: 18446744073709551615

presets/mainnet/eip7549.yaml

@@ -0,0 +1,8 @@
+# Mainnet preset - EIP7594
+
+# # Max operations per block
+# ---------------------------------------------------------------
+# `uint64(2**0)` (= 1)
+MAX_ATTESTER_SLASHINGS_EIP7549: 1
+# `uint64(2 * 3)` (= 8)
+MAX_ATTESTATIONS_EIP7549: 8

presets/minimal/eip7549.yaml

@@ -0,0 +1,8 @@
+# Minimal preset - EIP7594
+
+# # Max operations per block
+# ---------------------------------------------------------------
+# `uint64(2**0)` (= 1)
+MAX_ATTESTER_SLASHINGS_EIP7549: 1
+# `uint64(2 * 3)` (= 8)
+MAX_ATTESTATIONS_EIP7549: 8

specs/_features/eip7549/beacon-chain.md

@@ -12,6 +12,7 @@
   - [Modified containers](#modified-containers)
     - [`Attestation`](#attestation)
     - [`IndexedAttestation`](#indexedattestation)
+    - [`BeaconBlockBody`](#beaconblockbody)
 - [Helper functions](#helper-functions)
   - [Misc](#misc)
     - [`get_committee_indices`](#get_committee_indices)
@@ -33,8 +34,8 @@ This is the beacon chain specification to move the attestation committee index o
 
 | Name | Value | Description |
 | - | - | - |
-| `MAX_ATTESTER_SLASHINGS` | `2**0` (= 1) |
-| `MAX_ATTESTATIONS`       | `2**3` (= 8) |
+| `MAX_ATTESTER_SLASHINGS_EIP7549`   | `2**0` (= 1) |
+| `MAX_ATTESTATIONS_EIP7549` | `2**3` (= 8) |
 
 ## Containers
 
@@ -60,15 +61,35 @@ class IndexedAttestation(Container):
     signature: BLSSignature
 ```
 
+#### `BeaconBlockBody`
+
+```python
+class BeaconBlockBody(Container):
+    randao_reveal: BLSSignature
+    eth1_data: Eth1Data  # Eth1 data vote
+    graffiti: Bytes32  # Arbitrary data
+    # Operations
+    proposer_slashings: List[ProposerSlashing, MAX_PROPOSER_SLASHINGS]
+    attester_slashings: List[AttesterSlashing, MAX_ATTESTER_SLASHINGS_EIP7549]  # [Modified in EIP7549]
+    attestations: List[Attestation, MAX_ATTESTATIONS_EIP7549]  # [Modified in EIP7549]
+    deposits: List[Deposit, MAX_DEPOSITS]
+    voluntary_exits: List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]
+    sync_aggregate: SyncAggregate
+    # Execution
+    execution_payload: ExecutionPayload
+    bls_to_execution_changes: List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]
+    blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
+```
+
 ## Helper functions
 
 ### Misc
 
 #### `get_committee_indices`
 
 ```python
-def get_committee_indices(commitee_bits: Bitvector) -> List[CommitteeIndex]:
-    return [CommitteeIndex(index) for bit, index in enumerate(commitee_bits) if bit]
+def get_committee_indices(commitee_bits: Bitvector) -> Sequence[CommitteeIndex]:
+    return [CommitteeIndex(index) for index, bit in enumerate(commitee_bits) if bit]
 ```
 
 ### Beacon state accessors
@@ -80,8 +101,7 @@ def get_attesting_indices(state: BeaconState, attestation: Attestation) -> Set[V
     """
     Return the set of attesting indices corresponding to ``aggregation_bits`` and ``committee_bits``.
     """
-
-    output = set()
+    output: Set[ValidatorIndex] = set()
     committee_indices = get_committee_indices(attestation.committee_bits)
     committee_offset = 0
     for index in committee_indices:

specs/_features/eip7549/fork.md

@@ -0,0 +1,141 @@
+# EIP-7549 -- Fork Logic
+
+**Notice**: This document is a work-in-progress for researchers and implementers.
+
+## Table of contents
+
+<!-- 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)
+- [Configuration](#configuration)
+- [Helper functions](#helper-functions)
+  - [Misc](#misc)
+    - [Modified `compute_fork_version`](#modified-compute_fork_version)
+- [Fork to EIP-7549](#fork-to-eip-7549)
+  - [Fork trigger](#fork-trigger)
+  - [Upgrading the state](#upgrading-the-state)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+## Introduction
+
+This document describes the process of EIP-7549 upgrade.
+
+## Configuration
+
+Warning: this configuration is not definitive.
+
+| Name | Value |
+| - | - |
+| `EIP7549_FORK_VERSION` | `Version('0x06000000')` |
+| `EIP7549_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** |
+
+## Helper functions
+
+### Misc
+
+#### Modified `compute_fork_version`
+
+```python
+def compute_fork_version(epoch: Epoch) -> Version:
+    """
+    Return the fork version at the given ``epoch``.
+    """
+    if epoch >= EIP7549_FORK_EPOCH:
+        return EIP7549_FORK_VERSION
+    if epoch >= DENEB_FORK_EPOCH:
+        return DENEB_FORK_VERSION
+    if epoch >= CAPELLA_FORK_EPOCH:
+        return CAPELLA_FORK_VERSION
+    if epoch >= BELLATRIX_FORK_EPOCH:
+        return BELLATRIX_FORK_VERSION
+    if epoch >= ALTAIR_FORK_EPOCH:
+        return ALTAIR_FORK_VERSION
+    return GENESIS_FORK_VERSION
+```
+
+## Fork to EIP-7549
+
+### Fork trigger
+
+TBD. This fork is defined for testing purposes, the EIP may be combined with other consensus-layer upgrade.
+For now, we assume the condition will be triggered at epoch `EIP7549_FORK_EPOCH`.
+
+Note that for the pure EIP-7549 networks, we don't apply `upgrade_to_eip7549` since it starts with EIP-7549 version logic.
+
+### Upgrading the state
+
+If `state.slot % SLOTS_PER_EPOCH == 0` and `compute_epoch_at_slot(state.slot) == EIP7549_FORK_EPOCH`,
+an irregular state change is made to upgrade to EIP-7549.
+
+```python
+def upgrade_to_eip7549(pre: capella.BeaconState) -> BeaconState:
+    epoch = capella.get_current_epoch(pre)
+    latest_execution_payload_header = ExecutionPayloadHeader(
+        parent_hash=pre.latest_execution_payload_header.parent_hash,
+        fee_recipient=pre.latest_execution_payload_header.fee_recipient,
+        state_root=pre.latest_execution_payload_header.state_root,
+        receipts_root=pre.latest_execution_payload_header.receipts_root,
+        logs_bloom=pre.latest_execution_payload_header.logs_bloom,
+        prev_randao=pre.latest_execution_payload_header.prev_randao,
+        block_number=pre.latest_execution_payload_header.block_number,
+        gas_limit=pre.latest_execution_payload_header.gas_limit,
+        gas_used=pre.latest_execution_payload_header.gas_used,
+        timestamp=pre.latest_execution_payload_header.timestamp,
+        extra_data=pre.latest_execution_payload_header.extra_data,
+        base_fee_per_gas=pre.latest_execution_payload_header.base_fee_per_gas,
+        block_hash=pre.latest_execution_payload_header.block_hash,
+        transactions_root=pre.latest_execution_payload_header.transactions_root,
+        withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
+    )
+    post = BeaconState(
+        # Versioning
+        genesis_time=pre.genesis_time,
+        genesis_validators_root=pre.genesis_validators_root,
+        slot=pre.slot,
+        fork=Fork(
+            previous_version=pre.fork.current_version,
+            current_version=EIP7549_FORK_VERSION,  # [Modified in EIP-7549]
+            epoch=epoch,
+        ),
+        # History
+        latest_block_header=pre.latest_block_header,
+        block_roots=pre.block_roots,
+        state_roots=pre.state_roots,
+        historical_roots=pre.historical_roots,
+        # Eth1
+        eth1_data=pre.eth1_data,
+        eth1_data_votes=pre.eth1_data_votes,
+        eth1_deposit_index=pre.eth1_deposit_index,
+        # Registry
+        validators=pre.validators,
+        balances=pre.balances,
+        # Randomness
+        randao_mixes=pre.randao_mixes,
+        # Slashings
+        slashings=pre.slashings,
+        # Participation
+        previous_epoch_participation=pre.previous_epoch_participation,
+        current_epoch_participation=pre.current_epoch_participation,
+        # Finality
+        justification_bits=pre.justification_bits,
+        previous_justified_checkpoint=pre.previous_justified_checkpoint,
+        current_justified_checkpoint=pre.current_justified_checkpoint,
+        finalized_checkpoint=pre.finalized_checkpoint,
+        # Inactivity
+        inactivity_scores=pre.inactivity_scores,
+        # Sync
+        current_sync_committee=pre.current_sync_committee,
+        next_sync_committee=pre.next_sync_committee,
+        # Execution-layer
+        latest_execution_payload_header=latest_execution_payload_header,
+        # Withdrawals
+        next_withdrawal_index=pre.next_withdrawal_index,
+        next_withdrawal_validator_index=pre.next_withdrawal_validator_index,
+        # Deep history valid from Capella onwards
+        historical_summaries=pre.historical_summaries,
+    )
+
+    return post
+```

specs/_features/eip7549/validator.md

@@ -9,6 +9,7 @@
 - [Modifications in EIP-7549](#modifications-in-eip-7549)
   - [Block proposal](#block-proposal)
     - [Constructing the `BeaconBlockBody`](#constructing-the-beaconblockbody)
+      - [Attester slashings](#attester-slashings)
       - [Attestations](#attestations)
   - [Attesting](#attesting)
     - [Construct attestation](#construct-attestation)
@@ -24,14 +25,18 @@
 
 #### Constructing the `BeaconBlockBody`
 
+##### Attester slashings
+
+Changed the max attestations size to `MAX_ATTESTER_SLASHINGS_EIP7549`.
+
 ##### Attestations
 
 The network attestation aggregates contain only the assigned committee attestations.
 Attestation aggregates received by the block proposer from the committee aggregators with disjoint `committee_bits` sets and equal `AttestationData` SHOULD be consolidated into a single `Attestation` object.
 The proposer should run the following function to construct an on chain final aggregate form a list of network aggregates with equal `AttestationData`:
 
 ```python
-def compute_on_chain_aggregate(network_aggregates: List[Attestation]) -> Attestation:
+def compute_on_chain_aggregate(network_aggregates: Sequence[Attestation]) -> Attestation:
     aggregates = sorted(network_aggregates, key=lambda a: get_committee_indices(a.committee_bits)[0])
 
     data = aggregates[0].data

tests/core/pyspec/eth2spec/test/context.py

@@ -8,8 +8,8 @@
 from .exceptions import SkippedTest
 from .helpers.constants import (
     PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB,
-    EIP6110, EIP7002, EIP7594,
-    WHISK, EIP7251,
+    EIP6110, EIP7002, EIP7251, EIP7549, EIP7594,
+    WHISK,
     MINIMAL,
     ALL_PHASES,
     POST_FORK_OF,
@@ -521,6 +521,7 @@ def wrapper(*args, spec: Spec, **kw):
 with_deneb_and_later = with_all_phases_from(DENEB)
 with_eip6110_and_later = with_all_phases_from(EIP6110)
 with_eip7002_and_later = with_all_phases_from(EIP7002)
+with_eip7549_and_later = with_all_phases_from(EIP7549)
 with_whisk_and_later = with_all_phases_from(WHISK, all_phases=ALLOWED_TEST_RUNNER_FORKS)
 with_eip7594_and_later = with_all_phases_from(EIP7594, all_phases=ALLOWED_TEST_RUNNER_FORKS)
 with_eip7251_and_later = with_all_phases_from(EIP7251, all_phases=ALLOWED_TEST_RUNNER_FORKS)