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

head_shard_root -> shard_head_root

Browse Source
This commit is contained in:
Hsiao-Wei Wang
2020-06-04 01:00:52 +08:00
parent 58e75c27ed
commit e1981a7bfd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
specs/phase1/fork-choice.md
View File

@@ -51,7 +51,7 @@ def update_latest_messages(store: Store, attesting_indices: Sequence[ValidatorIn
for i in attesting_indices:
if i not in store.latest_messages or target.epoch > store.latest_messages[i].epoch:
store.latest_messages[i] = LatestMessage(
epoch=target.epoch, root=beacon_block_root, shard=shard, shard_root=attestation.data.head_shard_root
epoch=target.epoch, root=beacon_block_root, shard=shard, shard_root=attestation.data.shard_head_root
)
```

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

@@ -76,20 +76,20 @@ def get_shard_head(store: Store, shard_store: ShardStore) -> Root:
shard_blocks = shard_store.blocks
head_beacon_root = get_head(store)
head_shard_state = store.block_states[head_beacon_root].shard_states[shard_store.shard]
head_shard_root = head_shard_state.latest_block_root
shard_head_root = head_shard_state.latest_block_root
while True:
# Find the valid child block roots
children = [
root for root in shard_store.blocks.keys()
if (
shard_blocks[root].shard_parent_root == head_shard_root
shard_blocks[root].shard_parent_root == shard_head_root
and shard_blocks[root].slot > head_shard_state.slot
)
]
if len(children) == 0:
return head_shard_root
return shard_head_root
# Sort by latest attesting balance with ties broken lexicographically
head_shard_root = max(
shard_head_root = max(
children, key=lambda root: (get_shard_latest_attesting_balance(store, shard_store, root), root)
)
```

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

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