github/consensus-specs
1
1
Fork 0
mirror of https://github.com/ethereum/consensus-specs.git synced 2026-02-02 17:35:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add shard: Shard field to AttestationData

Browse Source
This commit is contained in:
Hsiao-Wei Wang
2020-06-16 00:16:39 +08:00
parent e955e6f6e1
commit 3ee0761d17
6 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/core/pyspec/eth2spec/test/fork_choice/test_on_attestation.py
View File

@@ -31,7 +31,7 @@ def run_on_attestation(spec, state, store, attestation, valid=True):
latest_message = spec.LatestMessage(
epoch=attestation.data.target.epoch,
root=attestation.data.beacon_block_root,
shard=spec.get_shard(state, attestation),
shard=attestation.data.shard,
shard_root=attestation.data.shard_head_root,
)

2
tests/core/pyspec/eth2spec/test/fork_choice/test_on_shard_head.py
View File

@@ -82,7 +82,7 @@ def apply_shard_and_beacon(spec, state, store, shard_store, shard_blocks_buffer)
shard_transition=shard_transition,
signed=False,
)
assert spec.get_shard(state, attestation) == shard
assert attestation.data.shard == shard
beacon_block.body.attestations = [attestation]
beacon_block.body.shard_transitions = shard_transitions

10
tests/core/pyspec/eth2spec/test/helpers/attestations.py
View File

@@ -45,7 +45,7 @@ def run_attestation_processing(spec, state, attestation, valid=True):
yield 'post', state
def build_attestation_data(spec, state, slot, index, shard_transition=None, on_time=True):
def build_attestation_data(spec, state, slot, index, shard=None, shard_transition=None, on_time=True):
assert state.slot >= slot
if slot == state.slot:
@@ -77,13 +77,15 @@ def build_attestation_data(spec, state, slot, index, shard_transition=None, on_t
)
if spec.fork == PHASE1:
if shard is None:
shard = spec.compute_shard_from_committee_index(state, attestation_data.index, attestation_data.slot)
attestation_data.shard = shard
if shard_transition is not None:
lastest_shard_data_root_index = len(shard_transition.shard_data_roots) - 1
attestation_data.shard_head_root = shard_transition.shard_data_roots[lastest_shard_data_root_index]
attestation_data.shard_transition_root = shard_transition.hash_tree_root()
else:
# No shard transition -> no shard block
shard = spec.get_shard(state, spec.Attestation(data=attestation_data))
if on_time:
shard_transition = spec.get_shard_transition(state, shard, shard_blocks=[])
lastest_shard_data_root_index = len(shard_transition.shard_data_roots) - 1
@@ -96,7 +98,7 @@ def build_attestation_data(spec, state, slot, index, shard_transition=None, on_t
def convert_to_valid_on_time_attestation(spec, state, attestation, signed=False):
shard = spec.get_shard(state, attestation)
shard = spec.compute_shard_from_committee_index(state, attestation.data.index, attestation.data.slot)
offset_slots = spec.compute_offset_slots(
spec.get_latest_slot_for_shard(state, shard),
attestation.data.slot + spec.MIN_ATTESTATION_INCLUSION_DELAY,