Add EIP-7547

.gitignore

@@ -24,6 +24,7 @@ tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/eip6110/
 tests/core/pyspec/eth2spec/eip7002/
 tests/core/pyspec/eth2spec/whisk/
+tests/core/pyspec/eth2spec/eip7547/
 tests/core/pyspec/eth2spec/eip7594/
 
 # coverage reports

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 whisk eip7547
 # 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

@@ -56,6 +56,9 @@ EIP6110_FORK_EPOCH: 18446744073709551615
 # EIP7002
 EIP7002_FORK_VERSION: 0x05000000  # temporary stub
 EIP7002_FORK_EPOCH: 18446744073709551615
+# EIP7547
+EIP7547_FORK_VERSION: 0x06000000  # temporary stub
+EIP7547_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x06000000  # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615

configs/minimal.yaml

@@ -55,6 +55,9 @@ EIP6110_FORK_EPOCH: 18446744073709551615
 # EIP7002
 EIP7002_FORK_VERSION: 0x05000001
 EIP7002_FORK_EPOCH: 18446744073709551615
+# EIP7547
+EIP7547_FORK_VERSION: 0x06000001
+EIP7547_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x06000001
 WHISK_FORK_EPOCH: 18446744073709551615

pysetup/constants.py

@@ -7,10 +7,10 @@
 EIP6110 = 'eip6110'
 EIP7002 = 'eip7002'
 WHISK = 'whisk'
+EIP7547 = 'eip7547'
 EIP7594 = 'eip7594'
 
 
-
 # The helper functions that are used when defining constants
 CONSTANT_DEP_SUNDRY_CONSTANTS_FUNCTIONS = '''
 def ceillog2(x: int) -> uint64:

pysetup/md_doc_paths.py

@@ -9,6 +9,7 @@
     EIP6110,
     WHISK,
     EIP7002,
+    EIP7547,
     EIP7594,
 )
 
@@ -22,6 +23,7 @@
     EIP6110: DENEB,
     WHISK: CAPELLA,
     EIP7002: CAPELLA,
+    EIP7547: DENEB,
     EIP7594: DENEB,
 }
 

pysetup/spec_builders/__init__.py

@@ -7,12 +7,13 @@
 from .eip7002 import EIP7002SpecBuilder
 from .whisk import WhiskSpecBuilder
 from .eip7594 import EIP7594SpecBuilder
+from .eip7547 import EIP7547SpecBuilder
 
 
 spec_builders = {
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        EIP6110SpecBuilder, EIP7002SpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder,
+        EIP6110SpecBuilder, EIP7002SpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP7547SpecBuilder,
     )
 }

pysetup/spec_builders/eip7547.py

@@ -0,0 +1,63 @@
+from .base import BaseSpecBuilder
+from ..constants import EIP7547
+
+
+class EIP7547SpecBuilder(BaseSpecBuilder):
+    fork: str = EIP7547
+
+    @classmethod
+    def sundry_functions(cls) -> str:
+        return '''
+def retrieve_inclusion_list(slot: Slot, proposer_index: ValidatorIndex) -> InclusionList:
+    # pylint: disable=unused-argument
+    ...
+'''
+
+    @classmethod
+    def execution_engine_cls(cls) -> str:
+        return """
+class NoopExecutionEngine(ExecutionEngine):
+
+    def notify_new_payload(self: ExecutionEngine,
+                           execution_payload: ExecutionPayload,
+                           parent_beacon_block_root: Root) -> bool:
+        return True
+
+    def notify_forkchoice_updated(self: ExecutionEngine,
+                                  head_block_hash: Hash32,
+                                  safe_block_hash: Hash32,
+                                  finalized_block_hash: Hash32,
+                                  payload_attributes: Optional[PayloadAttributes]) -> Optional[PayloadId]:
+        pass
+
+    def get_payload(self: ExecutionEngine, payload_id: PayloadId) -> GetPayloadResponse:
+        # pylint: disable=unused-argument
+        raise NotImplementedError("no default block production")
+
+    def is_valid_block_hash(self: ExecutionEngine,
+                            execution_payload: ExecutionPayload,
+                            parent_beacon_block_root: Root) -> bool:
+        return True
+
+    def is_valid_versioned_hashes(self: ExecutionEngine, new_payload_request: NewPayloadRequest) -> bool:
+        return True
+
+    def verify_and_notify_new_payload(self: ExecutionEngine,
+                                      new_payload_request: NewPayloadRequest) -> bool:
+        return True
+
+    def notify_new_inclusion_list(self: ExecutionEngine,
+                                  inclusion_list_request: NewInclusionListRequest) -> bool:
+        return True
+
+    def get_execution_inclusion_list(self: ExecutionEngine, parent_block_hash: Root) -> GetInclusionListResponse:
+        return GetInclusionListResponse()
+
+
+EXECUTION_ENGINE = NoopExecutionEngine()"""
+
+    @classmethod
+    def imports(cls, preset_name: str):
+        return f'''
+from eth2spec.deneb import {preset_name} as deneb
+'''

specs/_features/eip7547/beacon-chain.md

@@ -0,0 +1,79 @@
+# EIP-7547 -- 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)
+  - [Execution](#execution)
+- [Containers](#containers)
+  - [New Containers](#new-containers)
+    - [`InclusionListSummaryEntry`](#inclusionlistsummaryentry)
+    - [`InclusionListSummary`](#inclusionlistsummary)
+  - [Extended containers](#extended-containers)
+    - [`BeaconBlockBody`](#beaconblockbody)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+<!-- /TOC -->
+
+## Introduction
+
+This is the beacon chain specification to add an inclusion list mechanism to allow forced transaction inclusion. Refers to [EIP-7547](https://eips.ethereum.org/EIPS/eip-7547).
+
+*Note:* This specification is built upon [Deneb](../../deneb/beacon_chain.md) and is under active development.
+
+## Preset
+
+### Execution
+
+| Name | Value |
+| - | - |
+| `MAX_TRANSACTIONS_PER_INCLUSION_LIST` |  `uint64(2**4)` (= 16) |
+| `MAX_GAS_PER_INCLUSION_LIST` | `uint64(2**21)` (= 2,097,152) |
+
+## Containers
+
+### New Containers
+
+#### `InclusionListSummaryEntry`
+
+```python
+class InclusionListSummaryEntry(Container):
+    address: ExecutionAddress
+    gas_limit: uint64
+```
+
+#### `InclusionListSummary`
+
+```python
+class InclusionListSummary(Container):
+    slot: Slot
+    proposer_index: ValidatorIndex
+    summary: List[InclusionListSummaryEntry, MAX_TRANSACTIONS_PER_INCLUSION_LIST]
+```
+
+### Extended containers
+
+#### `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]
+    attestations: List[Attestation, MAX_ATTESTATIONS]
+    deposits: List[Deposit, MAX_DEPOSITS]
+    voluntary_exits: List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]
+    sync_aggregate: SyncAggregate
+    # Execution
+    execution_payload: ExecutionPayload  # [Modified in Deneb:EIP4844]
+    bls_to_execution_changes: List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]
+    blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
+    inclusion_list_summary: InclusionListSummary  # [New in EIP7547]
+```

specs/_features/eip7547/fork-choice.md

@@ -0,0 +1,59 @@
+# EIP-7547 -- Fork Choice
+
+## 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)
+  - [Execution](#execution)
+- [Protocols](#protocols)
+  - [`ExecutionEngine`](#executionengine)
+    - [Request data](#request-data)
+      - [Extended `PayloadAttributes`](#extended-payloadattributes)
+    - [Engine APIs](#engine-apis)
+      - [Extended `notify_forkchoice_updated`](#extended-notify_forkchoice_updated)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+<!-- /TOC -->
+
+## Introduction
+
+This is the modification of the fork choice accompanying the EIP7547 upgrade.
+
+## Preset
+
+### Execution
+
+| Name | Value |
+| - | - |
+| `MAX_TRANSACTIONS_PER_INCLUSION_LIST` |  `uint64(2**4)` (= 16) |
+
+## Protocols
+
+### `ExecutionEngine`
+
+#### Request data
+
+##### Extended `PayloadAttributes`
+
+`PayloadAttributes` is extended with the inclusion list transactions that are passed from the CL to the EL when requesting block constructions. We change the content of `notify_forkchoice_updated` accordingly.
+
+```python
+@dataclass
+class PayloadAttributes(object):
+    timestamp: uint64
+    prev_randao: Bytes32
+    suggested_fee_recipient: ExecutionAddress
+    withdrawals: Sequence[Withdrawal]
+    parent_beacon_block_root: Root
+    inclusion_list_transactions: List[Transaction, MAX_TRANSACTIONS_PER_INCLUSION_LIST]  # [New in EIP7547]
+```
+
+#### Engine APIs
+
+##### Extended `notify_forkchoice_updated`
+
+The only change made is to the `PayloadAttributes` container with the extended `PayloadAttributes`.
+Otherwise, `notify_forkchoice_updated` inherits all prior functionality.