status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Polishing as per code review

This commit is contained in:
Mikhail Kalinin 2021-08-10 17:15:07 +06:00
parent f1982d4fc3
commit ef71a4af1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
specs/merge/beacon-chain.md
View File

@ -13,7 +13,7 @@
- [Constants](#constants) - [Constants](#constants)
- [Execution](#execution) - [Execution](#execution)
- [Configuration](#configuration) - [Configuration](#configuration)
- [Genesis settings](#genesis-settings) - [Genesis testing settings](#genesis-testing-settings)
- [Containers](#containers) - [Containers](#containers)
- [Extended containers](#extended-containers) - [Extended containers](#extended-containers)
- [`BeaconBlockBody`](#beaconblockbody) - [`BeaconBlockBody`](#beaconblockbody)
@ -70,7 +70,7 @@ This patch adds transaction execution to the beacon chain as part of the Merge f
## Configuration ## Configuration
### Genesis settings ### Genesis testing settings
*Note*: These configuration settings do not apply to the mainnet and are utilized only by pure Merge testing. *Note*: These configuration settings do not apply to the mainnet and are utilized only by pure Merge testing.
@ -314,7 +314,7 @@ def compute_base_fee_per_gas(payload: ExecutionPayload, parent: ExecutionPayload
```python ```python
def process_execution_payload(state: BeaconState, payload: ExecutionPayload, execution_engine: ExecutionEngine) -> None: def process_execution_payload(state: BeaconState, payload: ExecutionPayload, execution_engine: ExecutionEngine) -> None:
# Verify consistency of the parent hash, block number and random # Verify consistency of the parent hash, block number, random, base fee per gas and gas limit
if is_merge_complete(state): if is_merge_complete(state):
assert payload.parent_hash == state.latest_execution_payload_header.block_hash 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.block_number == state.latest_execution_payload_header.block_number + uint64(1)