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 #2564 from ericsson49/ericsson49/fix_merge_on_block 

Fix typing problem in `merge:on_block`: `is_merge_block` expects `BeaconBlockBody`
This commit is contained in:
Hsiao-Wei Wang 2021-08-24 01:04:27 +08:00 committed by GitHub
parent 15a6c48a46 96c05adcf8
commit cfd6136ee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock, transition_store: Tr
assert get_ancestor(store, block.parent_root, finalized_slot) == store.finalized_checkpoint.root assert get_ancestor(store, block.parent_root, finalized_slot) == store.finalized_checkpoint.root
# [New in Merge] # [New in Merge]
if (transition_store is not None) and is_merge_block(pre_state, block): if (transition_store is not None) and is_merge_block(pre_state, block.body):
# Delay consideration of block until PoW block is processed by the PoW node # Delay consideration of block until PoW block is processed by the PoW node
pow_block = get_pow_block(block.body.execution_payload.parent_hash) pow_block = get_pow_block(block.body.execution_payload.parent_hash)
pow_parent = get_pow_block(pow_block.parent_hash) pow_parent = get_pow_block(pow_block.parent_hash)