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 pull request #816 from ethereum/block-root-fix 

use signed_root for block id purposes in blocks/state
This commit is contained in:
Danny Ryan 2019-03-20 10:21:00 -06:00 committed by GitHub
parent ab197d9784 c10384d65f
commit bab36b5c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
specs/core/0_beacon-chain.md
View File

@ -684,7 +684,8 @@ def get_temporary_block_header(block: BeaconBlock) -> BeaconBlockHeader:
previous_block_root=block.previous_block_root, previous_block_root=block.previous_block_root,
state_root=ZERO_HASH, state_root=ZERO_HASH,
block_body_root=hash_tree_root(block.body), block_body_root=hash_tree_root(block.body),
signature=block.signature, # signed_root(block) is used for block id purposes so signature is a stub
signature=EMPTY_SIGNATURE,
) )
``` ```
@ -1689,7 +1690,7 @@ def cache_state(state: BeaconState) -> None:
state.latest_block_header.state_root = previous_slot_state_root state.latest_block_header.state_root = previous_slot_state_root
# store latest known block for previous slot # store latest known block for previous slot
state.latest_block_roots[state.slot % SLOTS_PER_HISTORICAL_ROOT] = hash_tree_root(state.latest_block_header) state.latest_block_roots[state.slot % SLOTS_PER_HISTORICAL_ROOT] = signed_root(state.latest_block_header)
``` ```
### Per-epoch processing ### Per-epoch processing
@ -2250,7 +2251,7 @@ def process_block_header(state: BeaconState, block: BeaconBlock) -> None:
# Verify that the slots match # Verify that the slots match
assert block.slot == state.slot assert block.slot == state.slot
# Verify that the parent matches # Verify that the parent matches
assert block.previous_block_root == hash_tree_root(state.latest_block_header) assert block.previous_block_root == signed_root(state.latest_block_header)
# Save current block as the new latest block # Save current block as the new latest block
state.latest_block_header = get_temporary_block_header(block) state.latest_block_header = get_temporary_block_header(block)
# Verify proposer signature # Verify proposer signature

2
tests/phase0/helpers.py
View File

@ -88,7 +88,7 @@ def build_empty_block_for_next_slot(state):
previous_block_header = deepcopy(state.latest_block_header) previous_block_header = deepcopy(state.latest_block_header)
if previous_block_header.state_root == spec.ZERO_HASH: if previous_block_header.state_root == spec.ZERO_HASH:
previous_block_header.state_root = state.hash_tree_root() previous_block_header.state_root = state.hash_tree_root()
empty_block.previous_block_root = previous_block_header.hash_tree_root() empty_block.previous_block_root = signed_root(previous_block_header)
return empty_block return empty_block