status-im/eth2.0-specs
2
0
Fork 0
mirror of https://github.com/status-im/eth2.0-specs.git synced 2025-01-13 12:14:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1177 from ethereum/block-state-root-fix

Browse Source 
Fix #1146 block state root issue
This commit is contained in:
Diederik Loerakker 2019-06-14 02:47:41 +02:00 committed by GitHub
commit 7cf0dcd25d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test_libs/pyspec/eth2spec/test/helpers/state.py
View File

@ -1,3 +1,6 @@
from eth2spec.test.helpers.block import sign_block
def get_balance(state, index): def get_balance(state, index):
return state.balances[index] return state.balances[index]
@ -23,3 +26,13 @@ def get_state_root(spec, state, slot) -> bytes:
""" """
assert slot < state.slot <= slot + spec.SLOTS_PER_HISTORICAL_ROOT assert slot < state.slot <= slot + spec.SLOTS_PER_HISTORICAL_ROOT
return state.latest_state_roots[slot % spec.SLOTS_PER_HISTORICAL_ROOT] return state.latest_state_roots[slot % spec.SLOTS_PER_HISTORICAL_ROOT]
def state_transition_and_sign_block(spec, state, block):
"""
State transition via the provided ``block``
then package the block with the state root and signature.
"""
spec.state_transition(state, block)
block.state_root = state.hash_tree_root()
sign_block(spec, state, block)

8
test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_crosslinks.py
View File

@ -3,7 +3,8 @@ from copy import deepcopy
from eth2spec.test.context import spec_state_test, with_all_phases from eth2spec.test.context import spec_state_test, with_all_phases
from eth2spec.test.helpers.state import ( from eth2spec.test.helpers.state import (
next_epoch, next_epoch,
next_slot next_slot,
state_transition_and_sign_block,
) )
from eth2spec.test.helpers.block import apply_empty_block, sign_block from eth2spec.test.helpers.block import apply_empty_block, sign_block
from eth2spec.test.helpers.attestations import ( from eth2spec.test.helpers.attestations import (
@ -27,11 +28,14 @@ def run_process_crosslinks(spec, state, valid=True):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.slot = slot block.slot = slot
sign_block(spec, state, block) sign_block(spec, state, block)
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
# cache state before epoch transition # cache state before epoch transition
spec.process_slot(state) spec.process_slot(state)
# process components of epoch transition before processing crosslinks
spec.process_justification_and_finalization(state)
yield 'pre', state yield 'pre', state
spec.process_crosslinks(state) spec.process_crosslinks(state)
yield 'post', state yield 'post', state

5
test_libs/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_registry_updates.py
View File

@ -1,6 +1,5 @@
from eth2spec.phase0.spec import state_transition
from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block
from eth2spec.test.helpers.state import next_epoch from eth2spec.test.helpers.state import next_epoch, state_transition_and_sign_block
from eth2spec.test.context import spec_state_test, with_all_phases from eth2spec.test.context import spec_state_test, with_all_phases
@ -16,7 +15,7 @@ def run_process_registry_updates(spec, state, valid=True):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.slot = slot block.slot = slot
sign_block(spec, state, block) sign_block(spec, state, block)
state_transition(state, block) state_transition_and_sign_block(spec, state, block)
# cache state before epoch transition # cache state before epoch transition
spec.process_slot(state) spec.process_slot(state)

60
test_libs/pyspec/eth2spec/test/sanity/test_blocks.py
View File

@ -4,7 +4,7 @@ from typing import List
from eth2spec.utils.ssz.ssz_impl import signing_root from eth2spec.utils.ssz.ssz_impl import signing_root
from eth2spec.utils.bls import bls_sign from eth2spec.utils.bls import bls_sign
from eth2spec.test.helpers.state import get_balance from eth2spec.test.helpers.state import get_balance, state_transition_and_sign_block
# from eth2spec.test.helpers.transfers import get_valid_transfer # from eth2spec.test.helpers.transfers import get_valid_transfer
from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block from eth2spec.test.helpers.block import build_empty_block_for_next_slot, sign_block
from eth2spec.test.helpers.keys import privkeys, pubkeys from eth2spec.test.helpers.keys import privkeys, pubkeys
@ -25,9 +25,10 @@ def test_empty_block_transition(spec, state):
yield 'pre', state yield 'pre', state
block = build_empty_block_for_next_slot(spec, state, signed=True) block = build_empty_block_for_next_slot(spec, state, signed=True)
yield 'blocks', [block], List[spec.BeaconBlock]
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
assert len(state.eth1_data_votes) == pre_eth1_votes + 1 assert len(state.eth1_data_votes) == pre_eth1_votes + 1
@ -44,9 +45,10 @@ def test_skipped_slots(spec, state):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.slot += 3 block.slot += 3
sign_block(spec, state, block) sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
assert state.slot == block.slot assert state.slot == block.slot
@ -64,9 +66,10 @@ def test_empty_epoch_transition(spec, state):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.slot += spec.SLOTS_PER_EPOCH block.slot += spec.SLOTS_PER_EPOCH
sign_block(spec, state, block) sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
assert state.slot == block.slot assert state.slot == block.slot
@ -84,9 +87,10 @@ def test_empty_epoch_transition(spec, state):
# block = build_empty_block_for_next_slot(spec, state) # block = build_empty_block_for_next_slot(spec, state)
# block.slot += spec.SLOTS_PER_EPOCH * 5 # block.slot += spec.SLOTS_PER_EPOCH * 5
# sign_block(spec, state, block, proposer_index=0) # sign_block(spec, state, block, proposer_index=0)
# yield 'blocks', [block], List[spec.BeaconBlock]
# spec.state_transition(state, block) # state_transition_and_sign_block(spec, state, block)
# yield 'blocks', [block], List[spec.BeaconBlock]
# yield 'post', state # yield 'post', state
# assert state.slot == block.slot # assert state.slot == block.slot
@ -113,9 +117,10 @@ def test_proposer_slashing(spec, state):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.body.proposer_slashings.append(proposer_slashing) block.body.proposer_slashings.append(proposer_slashing)
sign_block(spec, state, block) sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
# check if slashed # check if slashed
@ -147,9 +152,10 @@ def test_attester_slashing(spec, state):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.body.attester_slashings.append(attester_slashing) block.body.attester_slashings.append(attester_slashing)
sign_block(spec, state, block) sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
slashed_validator = state.validator_registry[validator_index] slashed_validator = state.validator_registry[validator_index]
@ -185,9 +191,9 @@ def test_deposit_in_block(spec, state):
block.body.deposits.append(deposit) block.body.deposits.append(deposit)
sign_block(spec, state, block) sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] state_transition_and_sign_block(spec, state, block)
spec.state_transition(state, block) yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
assert len(state.validator_registry) == initial_registry_len + 1 assert len(state.validator_registry) == initial_registry_len + 1
@ -213,9 +219,9 @@ def test_deposit_top_up(spec, state):
block.body.deposits.append(deposit) block.body.deposits.append(deposit)
sign_block(spec, state, block) sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] state_transition_and_sign_block(spec, state, block)
spec.state_transition(state, block) yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
assert len(state.validator_registry) == initial_registry_len assert len(state.validator_registry) == initial_registry_len
@ -238,7 +244,7 @@ def test_attestation(spec, state):
attestation_block.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY attestation_block.slot += spec.MIN_ATTESTATION_INCLUSION_DELAY
attestation_block.body.attestations.append(attestation) attestation_block.body.attestations.append(attestation)
sign_block(spec, state, attestation_block) sign_block(spec, state, attestation_block)
spec.state_transition(state, attestation_block) state_transition_and_sign_block(spec, state, attestation_block)
assert len(state.current_epoch_attestations) == pre_current_attestations_len + 1 assert len(state.current_epoch_attestations) == pre_current_attestations_len + 1
@ -248,7 +254,7 @@ def test_attestation(spec, state):
epoch_block = build_empty_block_for_next_slot(spec, state) epoch_block = build_empty_block_for_next_slot(spec, state)
epoch_block.slot += spec.SLOTS_PER_EPOCH epoch_block.slot += spec.SLOTS_PER_EPOCH
sign_block(spec, state, epoch_block) sign_block(spec, state, epoch_block)
spec.state_transition(state, epoch_block) state_transition_and_sign_block(spec, state, epoch_block)
yield 'blocks', [attestation_block, epoch_block], List[spec.BeaconBlock] yield 'blocks', [attestation_block, epoch_block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
@ -287,7 +293,7 @@ def test_voluntary_exit(spec, state):
initiate_exit_block = build_empty_block_for_next_slot(spec, state) initiate_exit_block = build_empty_block_for_next_slot(spec, state)
initiate_exit_block.body.voluntary_exits.append(voluntary_exit) initiate_exit_block.body.voluntary_exits.append(voluntary_exit)
sign_block(spec, state, initiate_exit_block) sign_block(spec, state, initiate_exit_block)
spec.state_transition(state, initiate_exit_block) state_transition_and_sign_block(spec, state, initiate_exit_block)
assert state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH assert state.validator_registry[validator_index].exit_epoch < spec.FAR_FUTURE_EPOCH
@ -295,7 +301,7 @@ def test_voluntary_exit(spec, state):
exit_block = build_empty_block_for_next_slot(spec, state) exit_block = build_empty_block_for_next_slot(spec, state)
exit_block.slot += spec.SLOTS_PER_EPOCH exit_block.slot += spec.SLOTS_PER_EPOCH
sign_block(spec, state, exit_block) sign_block(spec, state, exit_block)
spec.state_transition(state, exit_block) state_transition_and_sign_block(spec, state, exit_block)
yield 'blocks', [initiate_exit_block, exit_block], List[spec.BeaconBlock] yield 'blocks', [initiate_exit_block, exit_block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
@ -326,9 +332,9 @@ def test_voluntary_exit(spec, state):
# block.body.transfers.append(transfer) # block.body.transfers.append(transfer)
# sign_block(spec, state, block) # sign_block(spec, state, block)
# yield 'blocks', [block], List[spec.BeaconBlock] # state_transition_and_sign_block(spec, state, block)
# spec.state_transition(state, block) # yield 'blocks', [block], List[spec.BeaconBlock]
# yield 'post', state # yield 'post', state
# sender_balance = get_balance(state, sender_index) # sender_balance = get_balance(state, sender_index)
@ -354,7 +360,7 @@ def test_balance_driven_status_transitions(spec, state):
block = build_empty_block_for_next_slot(spec, state) block = build_empty_block_for_next_slot(spec, state)
block.slot += spec.SLOTS_PER_EPOCH block.slot += spec.SLOTS_PER_EPOCH
sign_block(spec, state, block) sign_block(spec, state, block)
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
@ -371,7 +377,7 @@ def test_historical_batch(spec, state):
yield 'pre', state yield 'pre', state
block = build_empty_block_for_next_slot(spec, state, signed=True) block = build_empty_block_for_next_slot(spec, state, signed=True)
spec.state_transition(state, block) state_transition_and_sign_block(spec, state, block)
yield 'blocks', [block], List[spec.BeaconBlock] yield 'blocks', [block], List[spec.BeaconBlock]
yield 'post', state yield 'post', state
@ -392,7 +398,7 @@ def test_historical_batch(spec, state):
# blocks = [] # blocks = []
# for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1): # for _ in range(spec.SLOTS_PER_ETH1_VOTING_PERIOD - 1):
# block = build_empty_block_for_next_slot(spec, state) # block = build_empty_block_for_next_slot(spec, state)
# spec.state_transition(state, block) # state_transition_and_sign_block(spec, state, block)
# expected_votes += 1 # expected_votes += 1
# assert len(state.eth1_data_votes) == expected_votes # assert len(state.eth1_data_votes) == expected_votes
# blocks.append(block) # blocks.append(block)
@ -400,7 +406,7 @@ def test_historical_batch(spec, state):
# block = build_empty_block_for_next_slot(spec, state) # block = build_empty_block_for_next_slot(spec, state)
# blocks.append(block) # blocks.append(block)
# spec.state_transition(state, block) # state_transition_and_sign_block(spec, state, block)
# yield 'blocks', [block], List[spec.BeaconBlock] # yield 'blocks', [block], List[spec.BeaconBlock]
# yield 'post', state # yield 'post', state

4
test_libs/pyspec/eth2spec/test/test_finality.py
View File

@ -2,7 +2,7 @@ from copy import deepcopy
from typing import List from typing import List
from eth2spec.test.context import spec_state_test, never_bls, with_all_phases from eth2spec.test.context import spec_state_test, never_bls, with_all_phases
from eth2spec.test.helpers.state import next_epoch from eth2spec.test.helpers.state import next_epoch, state_transition_and_sign_block
from eth2spec.test.helpers.block import build_empty_block_for_next_slot, apply_empty_block from eth2spec.test.helpers.block import build_empty_block_for_next_slot, apply_empty_block
from eth2spec.test.helpers.attestations import get_valid_attestation from eth2spec.test.helpers.attestations import get_valid_attestation
@ -54,7 +54,7 @@ def next_epoch_with_attestations(spec,
prev_attestation = get_valid_attestation(spec, post_state, slot_to_attest) prev_attestation = get_valid_attestation(spec, post_state, slot_to_attest)
block.body.attestations.append(prev_attestation) block.body.attestations.append(prev_attestation)
spec.state_transition(post_state, block) state_transition_and_sign_block(spec, post_state, block)
blocks.append(block) blocks.append(block)
return state, blocks, post_state return state, blocks, post_state