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

Merge branch 'dev' into list-rework

This commit is contained in:
Danny Ryan 2019-06-24 13:29:55 -06:00
parent 1408a1ee0d b007d5aa92
commit 1972ccaaf3
No known key found for this signature in database
GPG Key ID: 2765A792E42CE07A
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
specs/core/0_beacon-chain.md
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
@ -299,6 +297,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`
@ -1597,6 +1597,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