Merge remote-tracking branch 'origin' into list-rework

This commit is contained in:
protolambda 2019-06-24 23:58:00 +02:00
commit 8b88c3f43c
No known key found for this signature in database
GPG Key ID: EC89FDBB2B4C7623
1 changed files with 4 additions and 3 deletions

View File

@ -180,9 +180,7 @@ The following values are (non-configurable) constants used throughout the specif
## Configuration ## Configuration
*Note*: The default mainnet configuration values are included here for spec-design purposes. *Note*: The default mainnet configuration values are included here for spec-design purposes. The different configurations for mainnet, testnets, and YAML-based testing can be found in the `configs/constant_presets/` directory. These configurations are updated for releases and may be out of sync during `dev` changes.
The different configurations for mainnet, testnets, and YAML-based testing can be found in the `configs/constant_presets/` directory.
These configurations are updated for releases, but may be out of sync during `dev` changes.
### Misc ### Misc
@ -296,6 +294,8 @@ The following types are [SimpleSerialize (SSZ)](../simple-serialize.md) containe
*Note*: The definitions are ordered topologically to facilitate execution of the spec. *Note*: The definitions are ordered topologically to facilitate execution of the spec.
*Note*: Fields missing in container instantiations default to their zero value.
### Misc dependencies ### Misc dependencies
#### `Fork` #### `Fork`
@ -1594,6 +1594,7 @@ def process_block_header(state: BeaconState, block: BeaconBlock) -> None:
state.latest_block_header = BeaconBlockHeader( state.latest_block_header = BeaconBlockHeader(
slot=block.slot, slot=block.slot,
parent_root=block.parent_root, parent_root=block.parent_root,
state_root=ZERO_HASH, # Overwritten in next `process_slot` call
body_root=hash_tree_root(block.body), body_root=hash_tree_root(block.body),
) )
# Verify proposer is not slashed # Verify proposer is not slashed