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 #1853 from ethereum/hwwhww/shard_block 

Add `shard` field to `ShardBlock`
This commit is contained in:
Danny Ryan 2020-05-28 12:04:04 -06:00 committed by GitHub
parent 05b1d913cb c437578280
commit 4cbe51b958
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specs/phase1/beacon-chain.md
View File

@ -302,6 +302,7 @@ class ShardBlock(Container):
shard_parent_root: Root shard_parent_root: Root
beacon_parent_root: Root beacon_parent_root: Root
slot: Slot slot: Slot
shard: Shard
proposer_index: ValidatorIndex proposer_index: ValidatorIndex
body: ByteList[MAX_SHARD_BLOCK_SIZE] body: ByteList[MAX_SHARD_BLOCK_SIZE]
``` ```
@ -321,6 +322,7 @@ class ShardBlockHeader(Container):
shard_parent_root: Root shard_parent_root: Root
beacon_parent_root: Root beacon_parent_root: Root
slot: Slot slot: Slot
shard: Shard
proposer_index: ValidatorIndex proposer_index: ValidatorIndex
body_root: Root body_root: Root
``` ```
@ -781,8 +783,9 @@ def apply_shard_transition(state: BeaconState, shard: Shard, transition: ShardTr
header = ShardBlockHeader( header = ShardBlockHeader(
shard_parent_root=shard_parent_root, shard_parent_root=shard_parent_root,
beacon_parent_root=get_block_root_at_slot(state, offset_slots[i]), beacon_parent_root=get_block_root_at_slot(state, offset_slots[i]),
proposer_index=proposal_index,
slot=offset_slots[i], slot=offset_slots[i],
shard=shard,
proposer_index=proposal_index,
body_root=transition.shard_data_roots[i] body_root=transition.shard_data_roots[i]
) )
shard_parent_root = hash_tree_root(header) shard_parent_root = hash_tree_root(header)

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

@ -50,6 +50,7 @@ def verify_shard_block_message(beacon_state: BeaconState,
shard: Shard) -> bool: shard: Shard) -> bool:
assert block.shard_parent_root == shard_state.latest_block_root assert block.shard_parent_root == shard_state.latest_block_root
assert block.slot == slot assert block.slot == slot
assert block.shard == shard
assert block.proposer_index == get_shard_proposer_index(beacon_state, slot, shard) assert block.proposer_index == get_shard_proposer_index(beacon_state, slot, shard)
assert 0 < len(block.body) <= MAX_SHARD_BLOCK_SIZE assert 0 < len(block.body) <= MAX_SHARD_BLOCK_SIZE
return True return True

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

@ -38,6 +38,7 @@ def build_shard_block(spec,
shard_parent_root=shard_state.latest_block_root, shard_parent_root=shard_state.latest_block_root,
beacon_parent_root=beacon_parent_root, beacon_parent_root=beacon_parent_root,
slot=slot, slot=slot,
shard=shard,
proposer_index=proposer_index, proposer_index=proposer_index,
body=body, body=body,
) )