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

Per #1704 discussion, remove `on_time_slot`: the given `beacon_state` 

should be transitioned.
This commit is contained in:
Hsiao-Wei Wang 2020-06-06 02:35:46 +08:00
parent 2afa315cb3
commit a71c0a5ccc
No known key found for this signature in database
GPG Key ID: 95B070122902DEA4
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
specs/phase1/shard-transition.md
View File

@ -280,8 +280,8 @@ Suppose you are a committee member on shard `shard` at slot `current_slot` and y
```python ```python
def get_shard_transition(beacon_state: BeaconState, def get_shard_transition(beacon_state: BeaconState,
shard: Shard, shard: Shard,
shard_blocks: Sequence[SignedShardBlock], shard_blocks: Sequence[SignedShardBlock]) -> ShardTransition:
on_time_slot: Slot) -> ShardTransition: on_time_slot = Slot(beacon_state.slot + 1)
offset_slots = compute_offset_slots(get_latest_slot_for_shard(beacon_state, shard), on_time_slot) offset_slots = compute_offset_slots(get_latest_slot_for_shard(beacon_state, shard), on_time_slot)
proposals, shard_states, shard_data_roots = get_shard_state_transition_result( proposals, shard_states, shard_data_roots = get_shard_state_transition_result(
beacon_state, shard, shard_blocks, on_time_slot beacon_state, shard, shard_blocks, on_time_slot

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

@ -85,7 +85,7 @@ def build_attestation_data(spec, state, slot, index, shard_transition=None, on_t
# No shard transition -> no shard block # No shard transition -> no shard block
shard = spec.get_shard(state, spec.Attestation(data=attestation_data)) shard = spec.get_shard(state, spec.Attestation(data=attestation_data))
if on_time: if on_time:
shard_transition = spec.get_shard_transition(state, shard, shard_blocks=[], on_time_slot=slot + 1) shard_transition = spec.get_shard_transition(state, shard, shard_blocks=[])
lastest_shard_data_root_index = len(shard_transition.shard_data_roots) - 1 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_head_root = shard_transition.shard_data_roots[lastest_shard_data_root_index]
attestation_data.shard_transition_root = shard_transition.hash_tree_root() attestation_data.shard_transition_root = shard_transition.hash_tree_root()
@ -318,9 +318,7 @@ def next_epoch_with_attestations(spec,
for index in range(committees_per_slot): for index in range(committees_per_slot):
if spec.fork == PHASE1: if spec.fork == PHASE1:
shard = spec.compute_shard_from_committee_index(post_state, index, slot_to_attest) shard = spec.compute_shard_from_committee_index(post_state, index, slot_to_attest)
shard_transition = get_shard_transition_of_committee( shard_transition = get_shard_transition_of_committee(spec, post_state, index)
spec, post_state, index, slot=slot_to_attest
)
block.body.shard_transitions[shard] = shard_transition block.body.shard_transitions[shard] = shard_transition
else: else:
shard_transition = None shard_transition = None

2
tests/core/pyspec/eth2spec/test/helpers/shard_block.py
View File

@ -61,7 +61,7 @@ def build_shard_transitions_till_slot(spec, parent_beacon_state, shard_blocks):
on_time_slot, on_time_slot,
) )
len_offset_slots = len(offset_slots) len_offset_slots = len(offset_slots)
shard_transition = spec.get_shard_transition(parent_beacon_state, shard, blocks, on_time_slot) shard_transition = spec.get_shard_transition(parent_beacon_state, shard, blocks)
if len(blocks) > 0: if len(blocks) > 0:
shard_block_root = blocks[-1].message.hash_tree_root() shard_block_root = blocks[-1].message.hash_tree_root()

7
tests/core/pyspec/eth2spec/test/helpers/shard_transitions.py
View File

@ -28,13 +28,10 @@ def run_shard_transitions_processing(spec, state, shard_transitions, attestation
yield 'post', state yield 'post', state
def get_shard_transition_of_committee(spec, state, committee_index, slot=None, shard_blocks=None): def get_shard_transition_of_committee(spec, state, committee_index, shard_blocks=None):
if shard_blocks is None: if shard_blocks is None:
shard_blocks = [] shard_blocks = []
if slot is None:
slot = state.slot
shard = spec.compute_shard_from_committee_index(state, committee_index, state.slot) shard = spec.compute_shard_from_committee_index(state, committee_index, state.slot)
shard_transition = spec.get_shard_transition(state, shard, shard_blocks=shard_blocks, on_time_slot=slot + 1) shard_transition = spec.get_shard_transition(state, shard, shard_blocks=shard_blocks)
return shard_transition return shard_transition