Merge branch 'master' into executable-networking-specs-is-future-epoch

Author: jtraglia

pysetup/spec_builders/phase0.py

@@ -38,7 +38,7 @@ def imports(cls, preset_name: str) -> str:
 from ssz.uint import BaseUint as Uint, Byte, Uint8, Uint16, Uint32, Uint64, Uint256
 from eth_consensus_specs.utils.ssz.bytes import (
     Bytes1, Bytes4, Bytes20, Bytes32, Bytes48, Bytes96)
-from eth_consensus_specs.utils.ssz.ssz_impl import copy, ssz_deserialize, ssz_serialize
+from eth_consensus_specs.utils.ssz.ssz_impl import ssz_deserialize, ssz_serialize
 from eth_consensus_specs.utils import bls
 """
 

specs/_features/eip8025/fork-choice.md

@@ -73,10 +73,10 @@ def get_forkchoice_store(anchor_state: BeaconState, anchor_block: BeaconBlock) -
         unrealized_finalized_checkpoint=finalized_checkpoint,
         proposer_boost_root=proposer_boost_root,
         equivocating_indices=set(),
-        blocks={anchor_root: copy(anchor_block)},
-        block_states={anchor_root: copy(anchor_state)},
+        blocks={anchor_root: anchor_block.copy()},
+        block_states={anchor_root: anchor_state.copy()},
         block_timeliness={anchor_root: [True, True]},
-        checkpoint_states={justified_checkpoint: copy(anchor_state)},
+        checkpoint_states={justified_checkpoint: anchor_state.copy()},
         latest_messages={},
         unrealized_justifications={anchor_root: justified_checkpoint},
         payloads={},

specs/altair/bls.md

@@ -46,7 +46,7 @@ def eth_aggregate_pubkeys(pubkeys: Sequence[BLSPubkey]) -> BLSPubkey:
     # Ensure that the given inputs are valid pubkeys
     assert all(bls.KeyValidate(pubkey) for pubkey in pubkeys)
 
-    result = copy(pubkeys[0])
+    result = pubkeys[0].copy()
     for pubkey in pubkeys[1:]:
         result += pubkey
     return result

specs/bellatrix/fork-choice.md

@@ -196,7 +196,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Parent block must be known
     assert block.parent_root in store.block_states
     # Make a copy of the state to avoid mutability issues
-    pre_state = copy(store.block_states[block.parent_root])
+    pre_state = store.block_states[block.parent_root].copy()
     # Blocks cannot be in the future. If they are, their consideration must be delayed until they are in the past.
     assert get_current_slot(store) >= block.slot
 

specs/capella/fork-choice.md

@@ -93,7 +93,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
 
     # Check the block is valid and compute the post-state
     # Make a copy of the state to avoid mutability issues
-    state = copy(store.block_states[block.parent_root])
+    state = store.block_states[block.parent_root].copy()
     state_transition(state, signed_block, validate_result=True)
 
     # Compute head before applying the block

specs/deneb/fork-choice.md

@@ -121,7 +121,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
 
     # Check the block is valid and compute the post-state
     # Make a copy of the state to avoid mutability issues
-    state = copy(store.block_states[block.parent_root])
+    state = store.block_states[block.parent_root].copy()
     state_transition(state, signed_block, validate_result=True)
 
     # Compute head before applying the block

specs/fulu/fork-choice.md

@@ -119,7 +119,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     # Parent block must be known
     assert block.parent_root in store.block_states
     # Make a copy of the state to avoid mutability issues
-    state = copy(store.block_states[block.parent_root])
+    state = store.block_states[block.parent_root].copy()
     # Blocks cannot be in the future. If they are, their consideration must be delayed until they are in the past.
     assert get_current_slot(store) >= block.slot
 

specs/gloas/fork-choice.md

@@ -230,11 +230,11 @@ def get_forkchoice_store(anchor_state: BeaconState, anchor_block: BeaconBlock) -
         unrealized_finalized_checkpoint=finalized_checkpoint,
         proposer_boost_root=proposer_boost_root,
         equivocating_indices=set(),
-        blocks={anchor_root: copy(anchor_block)},
-        block_states={anchor_root: copy(anchor_state)},
+        blocks={anchor_root: anchor_block.copy()},
+        block_states={anchor_root: anchor_state.copy()},
         # [New in Gloas:EIP7732]
         block_timeliness={anchor_root: [True, True]},
-        checkpoint_states={justified_checkpoint: copy(anchor_state)},
+        checkpoint_states={justified_checkpoint: anchor_state.copy()},
         latest_messages={},
         unrealized_justifications={anchor_root: justified_checkpoint},
         # [New in Gloas:EIP7732]
@@ -666,7 +666,7 @@ def verify_execution_payload_envelope(
     assert verify_execution_payload_envelope_signature(state, signed_envelope)
 
     # Verify consistency with the beacon block
-    header = copy(state.latest_block_header)
+    header = state.latest_block_header.copy()
     header.state_root = hash_tree_root(state)
     assert envelope.beacon_block_root == hash_tree_root(header)
     assert envelope.parent_beacon_block_root == state.latest_block_header.parent_root
@@ -1030,7 +1030,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     assert store.finalized_checkpoint.root == finalized_checkpoint_block
 
     # Make a copy of the state to avoid mutability issues
-    state = copy(store.block_states[block.parent_root])
+    state = store.block_states[block.parent_root].copy()
 
     # Check the block is valid and compute the post-state
     state_transition(state, signed_block, validate_result=True)

specs/gloas/validator.md

@@ -344,7 +344,7 @@ def prepare_execution_payload(
     if should_build_on_full(store, head, get_current_slot(store)):
         envelope = store.payloads[head.root]
         # Make a copy of the state to avoid mutability issues
-        state = copy(state)
+        state = state.copy()
         # Apply parent payload before computing withdrawals
         apply_parent_execution_payload(state, envelope.execution_requests)
         withdrawals = get_expected_withdrawals(state).withdrawals

specs/heze/fork-choice.md

@@ -152,10 +152,10 @@ def get_forkchoice_store(anchor_state: BeaconState, anchor_block: BeaconBlock) -
         unrealized_finalized_checkpoint=finalized_checkpoint,
         proposer_boost_root=proposer_boost_root,
         equivocating_indices=set(),
-        blocks={anchor_root: copy(anchor_block)},
-        block_states={anchor_root: copy(anchor_state)},
+        blocks={anchor_root: anchor_block.copy()},
+        block_states={anchor_root: anchor_state.copy()},
         block_timeliness={anchor_root: [True, True]},
-        checkpoint_states={justified_checkpoint: copy(anchor_state)},
+        checkpoint_states={justified_checkpoint: anchor_state.copy()},
         latest_messages={},
         unrealized_justifications={anchor_root: justified_checkpoint},
         payloads={},
@@ -284,7 +284,7 @@ def on_inclusion_list(store: Store, signed_inclusion_list: SignedInclusionList)
     assert inclusion_list.dependent_root in store.block_states
 
     # Verify the validator is in the inclusion list committee
-    dependent_state = copy(store.block_states[inclusion_list.dependent_root])
+    dependent_state = store.block_states[inclusion_list.dependent_root].copy()
     if dependent_state.slot < inclusion_list.slot:
         process_slots(dependent_state, inclusion_list.slot)
     committee = get_inclusion_list_committee(dependent_state, inclusion_list.slot)