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 #1927 from ethereum/hwwhww/signed-shard-block 

Make `get_pending_shard_blocks` return `Sequence[SignedShardBlock]` instead of `Sequence[ShardBlock]`
This commit is contained in:
Danny Ryan 2020-06-24 09:31:43 -06:00 committed by GitHub
parent 24b9221e8d c4973792e2
commit cf916dc147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
specs/phase1/shard-fork-choice.md
View File

@ -36,7 +36,7 @@ This document is the shard chain fork choice spec for part of Ethereum 2.0 Phase
@dataclass @dataclass
class ShardStore: class ShardStore:
shard: Shard shard: Shard
blocks: Dict[Root, ShardBlock] = field(default_factory=dict) signed_blocks: Dict[Root, SignedShardBlock] = field(default_factory=dict)
block_states: Dict[Root, ShardState] = field(default_factory=dict) block_states: Dict[Root, ShardState] = field(default_factory=dict)
``` ```
@ -46,7 +46,11 @@ class ShardStore:
def get_forkchoice_shard_store(anchor_state: BeaconState, shard: Shard) -> ShardStore: def get_forkchoice_shard_store(anchor_state: BeaconState, shard: Shard) -> ShardStore:
return ShardStore( return ShardStore(
shard=shard, shard=shard,
blocks={anchor_state.shard_states[shard].latest_block_root: ShardBlock(slot=anchor_state.slot, shard=shard)}, signed_blocks={
anchor_state.shard_states[shard].latest_block_root: SignedShardBlock(
message=ShardBlock(slot=anchor_state.slot, shard=shard)
)
},
block_states={anchor_state.shard_states[shard].latest_block_root: anchor_state.copy().shard_states[shard]}, block_states={anchor_state.shard_states[shard].latest_block_root: anchor_state.copy().shard_states[shard]},
) )
``` ```
@ -65,7 +69,7 @@ def get_shard_latest_attesting_balance(store: Store, shard_store: ShardStore, ro
# would be ignored once their newer vote is accepted. Check if it makes sense. # would be ignored once their newer vote is accepted. Check if it makes sense.
and store.latest_messages[i].shard == shard_store.shard and store.latest_messages[i].shard == shard_store.shard
and get_shard_ancestor( and get_shard_ancestor(
store, shard_store, store.latest_messages[i].shard_root, shard_store.blocks[root].slot store, shard_store, store.latest_messages[i].shard_root, shard_store.signed_blocks[root].message.slot
) == root ) == root
) )
)) ))
@ -80,8 +84,8 @@ def get_shard_head(store: Store, shard_store: ShardStore) -> Root:
shard_head_state = store.block_states[beacon_head_root].shard_states[shard_store.shard] shard_head_state = store.block_states[beacon_head_root].shard_states[shard_store.shard]
shard_head_root = shard_head_state.latest_block_root shard_head_root = shard_head_state.latest_block_root
shard_blocks = { shard_blocks = {
root: shard_block for root, shard_block in shard_store.blocks.items() root: signed_shard_block.message for root, signed_shard_block in shard_store.signed_blocks.items()
if shard_block.slot > shard_head_state.slot if signed_shard_block.message.slot > shard_head_state.slot
} }
while True: while True:
# Find the valid child block roots # Find the valid child block roots
@ -101,7 +105,7 @@ def get_shard_head(store: Store, shard_store: ShardStore) -> Root:
```python ```python
def get_shard_ancestor(store: Store, shard_store: ShardStore, root: Root, slot: Slot) -> Root: def get_shard_ancestor(store: Store, shard_store: ShardStore, root: Root, slot: Slot) -> Root:
block = shard_store.blocks[root] block = shard_store.signed_blocks[root].message
if block.slot > slot: if block.slot > slot:
return get_shard_ancestor(store, shard_store, block.shard_parent_root, slot) return get_shard_ancestor(store, shard_store, block.shard_parent_root, slot)
elif block.slot == slot: elif block.slot == slot:
@ -114,7 +118,7 @@ def get_shard_ancestor(store: Store, shard_store: ShardStore, root: Root, slot:
#### `get_pending_shard_blocks` #### `get_pending_shard_blocks`
```python ```python
def get_pending_shard_blocks(store: Store, shard_store: ShardStore) -> Sequence[ShardBlock]: def get_pending_shard_blocks(store: Store, shard_store: ShardStore) -> Sequence[SignedShardBlock]:
""" """
Return the canonical shard block branch that has not yet been crosslinked. Return the canonical shard block branch that has not yet been crosslinked.
""" """
@ -126,14 +130,14 @@ def get_pending_shard_blocks(store: Store, shard_store: ShardStore) -> Sequence[
shard_head_root = get_shard_head(store, shard_store) shard_head_root = get_shard_head(store, shard_store)
root = shard_head_root root = shard_head_root
shard_blocks = [] signed_shard_blocks = []
while root != latest_shard_block_root: while root != latest_shard_block_root:
shard_block = shard_store.blocks[root] signed_shard_block = shard_store.signed_blocks[root]
shard_blocks.append(shard_block) signed_shard_blocks.append(signed_shard_block)
root = shard_block.shard_parent_root root = signed_shard_block.message.shard_parent_root
shard_blocks.reverse() signed_shard_blocks.reverse()
return shard_blocks return signed_shard_blocks
``` ```
### Handlers ### Handlers
@ -175,7 +179,8 @@ def on_shard_block(store: Store, shard_store: ShardStore, signed_shard_block: Si
validate=True, beacon_parent_state=beacon_parent_state) validate=True, beacon_parent_state=beacon_parent_state)
# Add new block to the store # Add new block to the store
shard_store.blocks[hash_tree_root(shard_block)] = shard_block # Note: storing `SignedShardBlock` format for computing `ShardTransition.proposer_signature_aggregate`
shard_store.signed_blocks[hash_tree_root(shard_block)] = signed_shard_block
# Add new state for this block to the store # Add new state for this block to the store
shard_store.block_states[hash_tree_root(shard_block)] = shard_state shard_store.block_states[hash_tree_root(shard_block)] = shard_state

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

@ -22,7 +22,7 @@ def run_on_shard_block(spec, store, shard_store, signed_block, valid=True):
assert False assert False
spec.on_shard_block(store, shard_store, signed_block) spec.on_shard_block(store, shard_store, signed_block)
assert shard_store.blocks[hash_tree_root(signed_block.message)] == signed_block.message assert shard_store.signed_blocks[hash_tree_root(signed_block.message)] == signed_block
def apply_shard_block(spec, store, shard_store, beacon_parent_state, shard_blocks_buffer): def apply_shard_block(spec, store, shard_store, beacon_parent_state, shard_blocks_buffer):
@ -41,10 +41,7 @@ def apply_shard_block(spec, store, shard_store, beacon_parent_state, shard_block
def check_pending_shard_blocks(spec, store, shard_store, shard_blocks_buffer): def check_pending_shard_blocks(spec, store, shard_store, shard_blocks_buffer):
pending_shard_blocks = [ pending_shard_blocks = spec.get_pending_shard_blocks(store, shard_store)
spec.SignedShardBlock(message=b)
for b in spec.get_pending_shard_blocks(store, shard_store)
]
assert pending_shard_blocks == shard_blocks_buffer assert pending_shard_blocks == shard_blocks_buffer