From d0889b9001e006173dfe3679196efd5abf7fd7cb Mon Sep 17 00:00:00 2001 From: Mikhail Kalinin Date: Fri, 17 Sep 2021 16:20:25 +0600 Subject: [PATCH 1/6] Hardcode terminal total difficulty --- configs/mainnet.yaml | 3 --- configs/minimal.yaml | 3 --- specs/merge/beacon-chain.md | 7 +++++++ specs/merge/client-settings.md | 9 ++------- specs/merge/fork-choice.md | 21 ++++++-------------- specs/merge/fork.md | 35 ---------------------------------- specs/merge/validator.md | 5 ++--- 7 files changed, 17 insertions(+), 66 deletions(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index dd5b394af..aa1858b69 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -31,9 +31,6 @@ MERGE_FORK_EPOCH: 18446744073709551615 SHARDING_FORK_VERSION: 0x03000000 SHARDING_FORK_EPOCH: 18446744073709551615 -# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D. -MIN_ANCHOR_POW_BLOCK_DIFFICULTY: 4294967296 - # Time parameters # --------------------------------------------------------------- diff --git a/configs/minimal.yaml b/configs/minimal.yaml index b067f222f..9f5cdbe32 100644 --- a/configs/minimal.yaml +++ b/configs/minimal.yaml @@ -30,9 +30,6 @@ MERGE_FORK_EPOCH: 18446744073709551615 SHARDING_FORK_VERSION: 0x03000001 SHARDING_FORK_EPOCH: 18446744073709551615 -# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D. -MIN_ANCHOR_POW_BLOCK_DIFFICULTY: 4294967296 - # Time parameters # --------------------------------------------------------------- diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 2e7d26954..75a667b34 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -14,6 +14,7 @@ - [Execution](#execution) - [Configuration](#configuration) - [Genesis testing settings](#genesis-testing-settings) + - [Transition](#transition) - [Containers](#containers) - [Extended containers](#extended-containers) - [`BeaconBlockBody`](#beaconblockbody) @@ -76,6 +77,12 @@ This patch adds transaction execution to the beacon chain as part of the Merge f | `GENESIS_GAS_LIMIT` | `uint64(30000000)` (= 30,000,000) | | `GENESIS_BASE_FEE_PER_GAS` | `Bytes32('0x00ca9a3b00000000000000000000000000000000000000000000000000000000')` (= 1,000,000,000) | +### Transition settings + +| Name | Value | +| - | - | +| `TERMINAL_TOTAL_DIFFICULTY` | `uint256(2**256 - 1)` | + ## Containers ### Extended containers diff --git a/specs/merge/client-settings.md b/specs/merge/client-settings.md index a8ca633ff..64b2b20e6 100644 --- a/specs/merge/client-settings.md +++ b/specs/merge/client-settings.md @@ -15,12 +15,7 @@ This document specifies configurable settings that clients must implement for th ### Override terminal total difficulty -To coordinate manual overrides to [`terminal_total_difficulty`](fork-choice.md#transitionstore), clients -must provide `--terminal-total-difficulty-override` as a configurable setting. +To coordinate manual overrides to [`TERMINAL_TOTAL_DIFFICULTY`](./beacon-chain.md#Transition-settings) parameter, clients must provide `--terminal-total-difficulty-override` as a configurable setting. The value provided by this setting must take precedence over pre-configured `TERMINAL_TOTAL_DIFFICULTY` parameter. -If `TransitionStore` has already [been initialized](./fork.md#initializing-transition-store), this alters the previously initialized value of -`TransitionStore.terminal_total_difficulty`, otherwise this setting initializes `TransitionStore` with the specified, bypassing `compute_terminal_total_difficulty` and the use of an `anchor_pow_block`. -`terminal_total_difficulty`. +Except under exceptional scenarios, this setting is expected to not be used. Sufficient warning to the user about this exceptional configurable setting should be provided. -Except under exceptional scenarios, this setting is expected to not be used, and `terminal_total_difficulty` will operate with [default functionality](./fork.md#initializing-transition-store). Sufficient warning to the user about this exceptional configurable setting should be provided. -[here](fork.md#initializing-transition-store). diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md index 84be0f1ce..8051ab3eb 100644 --- a/specs/merge/fork-choice.md +++ b/specs/merge/fork-choice.md @@ -13,7 +13,6 @@ - [`set_head`](#set_head) - [`finalize_block`](#finalize_block) - [Helpers](#helpers) - - [`TransitionStore`](#transitionstore) - [`PowBlock`](#powblock) - [`get_pow_block`](#get_pow_block) - [`is_valid_terminal_pow_block`](#is_valid_terminal_pow_block) @@ -68,14 +67,6 @@ def finalize_block(self: ExecutionEngine, block_hash: Hash32) -> bool: ## Helpers -### `TransitionStore` - -```python -@dataclass -class TransitionStore(object): - terminal_total_difficulty: uint256 -``` - ### `PowBlock` ```python @@ -98,9 +89,9 @@ Let `get_pow_block(block_hash: Hash32) -> PowBlock` be the function that given t Used by fork-choice handler, `on_block`. ```python -def is_valid_terminal_pow_block(transition_store: TransitionStore, block: PowBlock, parent: PowBlock) -> bool: - is_total_difficulty_reached = block.total_difficulty >= transition_store.terminal_total_difficulty - is_parent_total_difficulty_valid = parent.total_difficulty < transition_store.terminal_total_difficulty +def is_valid_terminal_pow_block(block: PowBlock, parent: PowBlock) -> bool: + is_total_difficulty_reached = block.total_difficulty >= TERMINAL_TOTAL_DIFFICULTY + is_parent_total_difficulty_valid = parent.total_difficulty < TERMINAL_TOTAL_DIFFICULTY return is_total_difficulty_reached and is_parent_total_difficulty_valid ``` @@ -111,7 +102,7 @@ def is_valid_terminal_pow_block(transition_store: TransitionStore, block: PowBlo *Note*: The only modification is the addition of the verification of transition block conditions. ```python -def on_block(store: Store, signed_block: SignedBeaconBlock, transition_store: TransitionStore=None) -> None: +def on_block(store: Store, signed_block: SignedBeaconBlock) -> None: block = signed_block.message # Parent block must be known assert block.parent_root in store.block_states @@ -131,10 +122,10 @@ def on_block(store: Store, signed_block: SignedBeaconBlock, transition_store: Tr state_transition(state, signed_block, True) # [New in Merge] - if (transition_store is not None) and is_merge_block(pre_state, block.body): + if is_merge_block(pre_state, block.body): pow_block = get_pow_block(block.body.execution_payload.parent_hash) pow_parent = get_pow_block(pow_block.parent_hash) - assert is_valid_terminal_pow_block(transition_store, pow_block, pow_parent) + assert is_valid_terminal_pow_block(pow_block, pow_parent) # Add new block to the store store.blocks[hash_tree_root(block)] = block diff --git a/specs/merge/fork.md b/specs/merge/fork.md index f2547758d..eb0ca91c6 100644 --- a/specs/merge/fork.md +++ b/specs/merge/fork.md @@ -12,7 +12,6 @@ - [Fork to Merge](#fork-to-merge) - [Fork trigger](#fork-trigger) - [Upgrading the state](#upgrading-the-state) - - [Initializing transition store](#initializing-transition-store) @@ -28,8 +27,6 @@ Warning: this configuration is not definitive. | - | - | | `MERGE_FORK_VERSION` | `Version('0x02000000')` | | `MERGE_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** | -| `MIN_ANCHOR_POW_BLOCK_DIFFICULTY` | **TBD** | -| `TARGET_SECONDS_TO_MERGE` | `uint64(7 * 86400)` = (604,800) | ## Fork to Merge @@ -37,8 +34,6 @@ Warning: this configuration is not definitive. TBD. Social consensus, along with state conditions such as epoch boundary, finality, deposits, active validator count, etc. may be part of the decision process to trigger the fork. For now we assume the condition will be triggered at epoch `MERGE_FORK_EPOCH`. -Since the Merge transition process relies on `Eth1Data` in the beacon state we do want to make sure that this data is fresh. This is achieved by forcing `MERGE_FORK_EPOCH` to point to eth1 voting period boundary, i.e. `MERGE_FORK_EPOCH` should satisfy the following condition `MERGE_FORK_EPOCH % EPOCHS_PER_ETH1_VOTING_PERIOD == 0`. - Note that for the pure Merge networks, we don't apply `upgrade_to_merge` since it starts with Merge version logic. ### Upgrading the state @@ -100,33 +95,3 @@ def upgrade_to_merge(pre: altair.BeaconState) -> BeaconState: return post ``` - -### Initializing transition store - -If `state.slot % SLOTS_PER_EPOCH == 0`, `compute_epoch_at_slot(state.slot) == MERGE_FORK_EPOCH`, and the transition store has not already been initialized, a transition store is initialized to be further utilized by the transition process of the Merge. - -Transition store initialization occurs after the state has been modified by corresponding `upgrade_to_merge` function. - -```python -def compute_terminal_total_difficulty(anchor_pow_block: PowBlock) -> uint256: - seconds_per_voting_period = EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH * SECONDS_PER_SLOT - pow_blocks_per_voting_period = seconds_per_voting_period // SECONDS_PER_ETH1_BLOCK - pow_blocks_to_merge = TARGET_SECONDS_TO_MERGE // SECONDS_PER_ETH1_BLOCK - pow_blocks_after_anchor_block = ETH1_FOLLOW_DISTANCE + pow_blocks_per_voting_period + pow_blocks_to_merge - anchor_difficulty = max(MIN_ANCHOR_POW_BLOCK_DIFFICULTY, anchor_pow_block.difficulty) - - return anchor_pow_block.total_difficulty + anchor_difficulty * pow_blocks_after_anchor_block - - -def get_transition_store(anchor_pow_block: PowBlock) -> TransitionStore: - terminal_total_difficulty = compute_terminal_total_difficulty(anchor_pow_block) - return TransitionStore(terminal_total_difficulty=terminal_total_difficulty) - - -def initialize_transition_store(state: BeaconState) -> TransitionStore: - pow_block = get_pow_block(state.eth1_data.block_hash) - return get_transition_store(pow_block) -``` - -*Note*: Transition store can also be initialized at client startup by [overriding terminal total -difficulty](client_settings.md#override-terminal-total-difficulty). diff --git a/specs/merge/validator.md b/specs/merge/validator.md index b7a2860fd..645e1967b 100644 --- a/specs/merge/validator.md +++ b/specs/merge/validator.md @@ -62,7 +62,7 @@ All validator responsibilities remain unchanged other than those noted below. Na ##### Execution Payload -* Set `block.body.execution_payload = get_execution_payload(state, transition_store, execution_engine, pow_chain)` where: +* Set `block.body.execution_payload = get_execution_payload(state, execution_engine, pow_chain)` where: ```python def get_pow_block_at_total_difficulty(total_difficulty: uint256, pow_chain: Sequence[PowBlock]) -> Optional[PowBlock]: @@ -84,11 +84,10 @@ def produce_execution_payload(state: BeaconState, def get_execution_payload(state: BeaconState, - transition_store: TransitionStore, execution_engine: ExecutionEngine, pow_chain: Sequence[PowBlock]) -> ExecutionPayload: if not is_merge_complete(state): - terminal_pow_block = get_pow_block_at_total_difficulty(transition_store.terminal_total_difficulty, pow_chain) + terminal_pow_block = get_pow_block_at_total_difficulty(TERMINAL_TOTAL_DIFFICULTY, pow_chain) if terminal_pow_block is None: # Pre-merge, empty payload return ExecutionPayload() From a48ea83ab80f270e729c3d57b68d38080889d4fe Mon Sep 17 00:00:00 2001 From: Mikhail Kalinin Date: Fri, 17 Sep 2021 16:54:06 +0600 Subject: [PATCH 2/6] Fix toc --- specs/merge/beacon-chain.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 75a667b34..a9eea2f4a 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -14,7 +14,7 @@ - [Execution](#execution) - [Configuration](#configuration) - [Genesis testing settings](#genesis-testing-settings) - - [Transition](#transition) + - [Transition settings](#transition-settings) - [Containers](#containers) - [Extended containers](#extended-containers) - [`BeaconBlockBody`](#beaconblockbody) From 9ca8c592c5b7074b8fa2cea6cf14b63bea46f360 Mon Sep 17 00:00:00 2001 From: Mikhail Kalinin Date: Sat, 18 Sep 2021 12:39:54 +0600 Subject: [PATCH 3/6] Add TBD for TTD and add the value to the configs --- configs/mainnet.yaml | 6 ++++++ configs/minimal.yaml | 6 ++++++ specs/merge/beacon-chain.md | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml index aa1858b69..6f2f582fa 100644 --- a/configs/mainnet.yaml +++ b/configs/mainnet.yaml @@ -3,6 +3,12 @@ # Extends the mainnet preset PRESET_BASE: 'mainnet' +# Transition +# --------------------------------------------------------------- +# TBD, 2**256-1 is a placeholder +TERMINAL_TOTAL_DIFFICULTY: 115792089237316195423570985008687907853269984665640564039457584007913129639935 + + # Genesis # --------------------------------------------------------------- # `2**14` (= 16,384) diff --git a/configs/minimal.yaml b/configs/minimal.yaml index 9f5cdbe32..8da3260f5 100644 --- a/configs/minimal.yaml +++ b/configs/minimal.yaml @@ -3,6 +3,12 @@ # Extends the minimal preset PRESET_BASE: 'minimal' +# Transition +# --------------------------------------------------------------- +# TBD, 2**256-1 is a placeholder +TERMINAL_TOTAL_DIFFICULTY: 115792089237316195423570985008687907853269984665640564039457584007913129639935 + + # Genesis # --------------------------------------------------------------- # [customized] diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index a9eea2f4a..03bf01155 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -81,7 +81,7 @@ This patch adds transaction execution to the beacon chain as part of the Merge f | Name | Value | | - | - | -| `TERMINAL_TOTAL_DIFFICULTY` | `uint256(2**256 - 1)` | +| `TERMINAL_TOTAL_DIFFICULTY` | **TBD** | ## Containers From cb9e65ab85602661d9625af002247f772453581b Mon Sep 17 00:00:00 2001 From: Mikhail Kalinin Date: Fri, 17 Sep 2021 18:23:21 +0600 Subject: [PATCH 4/6] Bring on extra_data field --- specs/merge/beacon-chain.md | 4 ++++ tests/core/pyspec/eth2spec/test/helpers/execution_payload.py | 2 ++ 2 files changed, 6 insertions(+) diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 03bf01155..4f89908fd 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -65,6 +65,7 @@ This patch adds transaction execution to the beacon chain as part of the Merge f | `BYTES_PER_LOGS_BLOOM` | `uint64(2**8)` (= 256) | | `GAS_LIMIT_DENOMINATOR` | `uint64(2**10)` (= 1,024) | | `MIN_GAS_LIMIT` | `uint64(5000)` (= 5,000) | +| `MAX_EXTRA_DATA_BYTES` | `2**5` (= 32) | ## Configuration @@ -166,6 +167,7 @@ class ExecutionPayload(Container): gas_limit: uint64 gas_used: uint64 timestamp: uint64 + extra_data: ByteList[MAX_EXTRA_DATA_BYTES] base_fee_per_gas: Bytes32 # base fee introduced in EIP-1559, little-endian serialized # Extra payload fields block_hash: Hash32 # Hash of execution block @@ -187,6 +189,7 @@ class ExecutionPayloadHeader(Container): gas_limit: uint64 gas_used: uint64 timestamp: uint64 + extra_data: ByteList[MAX_EXTRA_DATA_BYTES] base_fee_per_gas: Bytes32 # Extra payload fields block_hash: Hash32 # Hash of execution block @@ -317,6 +320,7 @@ def process_execution_payload(state: BeaconState, payload: ExecutionPayload, exe gas_limit=payload.gas_limit, gas_used=payload.gas_used, timestamp=payload.timestamp, + extra_data=payload.extra_data, base_fee_per_gas=payload.base_fee_per_gas, block_hash=payload.block_hash, transactions_root=hash_tree_root(payload.transactions), diff --git a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py index 43be965a5..6126346a9 100644 --- a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py +++ b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py @@ -20,6 +20,7 @@ def build_empty_execution_payload(spec, state, randao_mix=None): gas_limit=latest.gas_limit, # retain same limit gas_used=0, # empty block, 0 gas timestamp=timestamp, + extra_data=spec.ByteList[spec.MAX_EXTRA_DATA_BYTES](), base_fee_per_gas=latest.base_fee_per_gas, # retain same base_fee block_hash=spec.Hash32(), transactions=empty_txs, @@ -42,6 +43,7 @@ def get_execution_payload_header(spec, execution_payload): gas_limit=execution_payload.gas_limit, gas_used=execution_payload.gas_used, timestamp=execution_payload.timestamp, + extra_data=execution_payload.extra_data, base_fee_per_gas=execution_payload.base_fee_per_gas, block_hash=execution_payload.block_hash, transactions_root=spec.hash_tree_root(execution_payload.transactions) From 731bcad3175f36d1d99d1343b49e0584cae1ad8e Mon Sep 17 00:00:00 2001 From: ethDreamer <37123614+ethDreamer@users.noreply.github.com> Date: Wed, 15 Sep 2021 18:47:44 -0500 Subject: [PATCH 5/6] fixed client-settings.md link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b5a898d37..9e5d7dc42 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ The merge is still actively in development. The exact specification has not been * [Merge fork](specs/merge/fork.md) * [Fork Choice changes](specs/merge/fork-choice.md) * [Validator additions](specs/merge/validator.md) - * [Client settings](specs/merge/client_settings.md) + * [Client settings](specs/merge/client-settings.md) ### Sharding From e2af59c8cd5557de68d0dd890f04e337cd58e7d3 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Fri, 17 Sep 2021 11:00:32 -0600 Subject: [PATCH 6/6] ensure random is validated for all payloads including transition --- specs/merge/beacon-chain.md | 6 ++-- .../test_process_execution_payload.py | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 4f89908fd..39f457252 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -298,12 +298,14 @@ def is_valid_gas_limit(payload: ExecutionPayload, parent: ExecutionPayloadHeader ```python def process_execution_payload(state: BeaconState, payload: ExecutionPayload, execution_engine: ExecutionEngine) -> None: - # Verify consistency of the parent hash, block number, random, base fee per gas and gas limit + # Verify consistency of the parent hash, block number, base fee per gas and gas limit + # with respect to the previous execution payload header if is_merge_complete(state): assert payload.parent_hash == state.latest_execution_payload_header.block_hash assert payload.block_number == state.latest_execution_payload_header.block_number + uint64(1) - assert payload.random == get_randao_mix(state, get_current_epoch(state)) assert is_valid_gas_limit(payload, state.latest_execution_payload_header) + # Verify random + assert payload.random == get_randao_mix(state, get_current_epoch(state)) # Verify timestamp assert payload.timestamp == compute_timestamp_at_slot(state, state.slot) # Verify the execution payload is valid diff --git a/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py b/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py index 4c68034d4..9c5ed6712 100644 --- a/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py +++ b/tests/core/pyspec/eth2spec/test/merge/block_processing/test_process_execution_payload.py @@ -144,6 +144,34 @@ def test_bad_parent_hash_regular_payload(spec, state): yield from run_execution_payload_processing(spec, state, execution_payload, valid=False) +@with_merge_and_later +@spec_state_test +def test_bad_random_first_payload(spec, state): + # pre-state + state = build_state_with_incomplete_transition(spec, state) + next_slot(spec, state) + + # execution payload + execution_payload = build_empty_execution_payload(spec, state) + execution_payload.random = b'\x42' * 32 + + yield from run_execution_payload_processing(spec, state, execution_payload, valid=False) + + +@with_merge_and_later +@spec_state_test +def test_bad_random_regular_payload(spec, state): + # pre-state + state = build_state_with_complete_transition(spec, state) + next_slot(spec, state) + + # execution payload + execution_payload = build_empty_execution_payload(spec, state) + execution_payload.random = b'\x04' * 32 + + yield from run_execution_payload_processing(spec, state, execution_payload, valid=False) + + @with_merge_and_later @spec_state_test def test_bad_number_regular_payload(spec, state):