Lable Added/Remove notes with Merge explicitly

status-im · Mar 17, 2021 · a368f5d · a368f5d
1 parent 3c9cd85
commit a368f5d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md
@@ -66,7 +66,7 @@ order and append any additional fields to the end.
 
 ```python
 class BeaconBlockBody(phase0.BeaconBlockBody):
-    application_payload: ApplicationPayload  # [Added] application payload
+    application_payload: ApplicationPayload  # [Added in Merge] application payload
 ```
 
 #### `BeaconState`
@@ -88,11 +88,11 @@ class BeaconState(Container):
     historical_roots: List[Root, HISTORICAL_ROOTS_LIMIT]
     # Eth1
     eth1_data: Eth1Data
-    # [Removed] eth1_data_votes
+    # [Removed in Merge] eth1_data_votes
     eth1_deposit_index: uint64
-    # [Added] hash of the root of application state
+    # [Added in Merge] hash of the root of application state
     application_state_root: Bytes32
-    # [Added] hash of recent application block
+    # [Added in Merge] hash of recent application block
     application_block_hash: Bytes32
     # Registry
     validators: List[Validator, VALIDATOR_REGISTRY_LIMIT]
@@ -193,9 +193,9 @@ def get_evm_beacon_block_roots(state: BeaconState) -> Sequence[Bytes32]:
 def process_block(state: BeaconState, block: BeaconBlock) -> None:
     process_block_header(state, block)
     process_randao(state, block.body)
-    process_eth1_data(state, block.body)  # [Modified in The Merge]
+    process_eth1_data(state, block.body)  # [Modified in Merge]
     process_operations(state, block.body)
-    process_application_payload(state, block.body)  # [New in The Merge]
+    process_application_payload(state, block.body)  # [New in Merge]
 ```
 
 #### Modified `process_eth1_data`

diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md
@@ -69,7 +69,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Check block is a descendant of the finalized block at the checkpoint finalized slot
     assert get_ancestor(store, block.parent_root, finalized_slot) == store.finalized_checkpoint.root
 
-    # [Added] Check that Eth1 data is correct
+    # [Added in Merge] Check that Eth1 data is correct
     assert is_valid_eth1_data(store, block)
 
     # Check the block is valid and compute the post-state