Also bump EXECUTION_PAYLOAD_GINDEX

Author: etan-status

pysetup/spec_builders/capella.py

@@ -16,5 +16,5 @@ def imports(cls, preset_name: str):
     @classmethod
     def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
         return {
-            'EXECUTION_PAYLOAD_INDEX': 'GeneralizedIndex(25)',
+            'EXECUTION_PAYLOAD_GINDEX': 'GeneralizedIndex(25)',
         }

pysetup/spec_builders/whisk.py

@@ -27,6 +27,6 @@ def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
     @classmethod
     def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
         constants = {
-            'EXECUTION_PAYLOAD_INDEX': 'GeneralizedIndex(41)',
+            'EXECUTION_PAYLOAD_GINDEX': 'GeneralizedIndex(41)',
         }
         return {**super().hardcoded_ssz_dep_constants(), **constants}

specs/capella/light-client/full-node.md

@@ -47,7 +47,7 @@ def block_to_light_client_header(block: SignedBeaconBlock) -> LightClientHeader:
             withdrawals_root=hash_tree_root(payload.withdrawals),
         )
         execution_branch = ExecutionBranch(
-            compute_merkle_proof(block.message.body, EXECUTION_PAYLOAD_INDEX))
+            compute_merkle_proof(block.message.body, EXECUTION_PAYLOAD_GINDEX))
     else:
         # Note that during fork transitions, `finalized_header` may still point to earlier forks.
         # While Bellatrix blocks also contain an `ExecutionPayload` (minus `withdrawals_root`),

specs/capella/light-client/sync-protocol.md

@@ -32,13 +32,13 @@ Additional documents describes the impact of the upgrade on certain roles:
 
 | Name | SSZ equivalent | Description |
 | - | - | - |
-| `ExecutionBranch` | `Vector[Bytes32, floorlog2(EXECUTION_PAYLOAD_INDEX)]` | Merkle branch of `execution_payload` within `BeaconBlockBody` |
+| `ExecutionBranch` | `Vector[Bytes32, floorlog2(EXECUTION_PAYLOAD_GINDEX)]` | Merkle branch of `execution_payload` within `BeaconBlockBody` |
 
 ## Constants
 
 | Name | Value |
 | - | - |
-| `EXECUTION_PAYLOAD_INDEX` | `get_generalized_index(BeaconBlockBody, 'execution_payload')` (= 25) |
+| `EXECUTION_PAYLOAD_GINDEX` | `get_generalized_index(BeaconBlockBody, 'execution_payload')` (= 25) |
 
 ## Containers
 
@@ -82,8 +82,8 @@ def is_valid_light_client_header(header: LightClientHeader) -> bool:
     return is_valid_merkle_branch(
         leaf=get_lc_execution_root(header),
         branch=header.execution_branch,
-        depth=floorlog2(EXECUTION_PAYLOAD_INDEX),
-        index=get_subtree_index(EXECUTION_PAYLOAD_INDEX),
+        depth=floorlog2(EXECUTION_PAYLOAD_GINDEX),
+        index=get_subtree_index(EXECUTION_PAYLOAD_GINDEX),
         root=header.beacon.body_root,
     )
 ```

specs/deneb/light-client/full-node.md

@@ -53,7 +53,7 @@ def block_to_light_client_header(block: SignedBeaconBlock) -> LightClientHeader:
             execution_header.excess_blob_gas = payload.excess_blob_gas
 
         execution_branch = ExecutionBranch(
-            compute_merkle_proof(block.message.body, EXECUTION_PAYLOAD_INDEX))
+            compute_merkle_proof(block.message.body, EXECUTION_PAYLOAD_GINDEX))
     else:
         # Note that during fork transitions, `finalized_header` may still point to earlier forks.
         # While Bellatrix blocks also contain an `ExecutionPayload` (minus `withdrawals_root`),

specs/deneb/light-client/sync-protocol.md

@@ -80,8 +80,8 @@ def is_valid_light_client_header(header: LightClientHeader) -> bool:
     return is_valid_merkle_branch(
         leaf=get_lc_execution_root(header),
         branch=header.execution_branch,
-        depth=floorlog2(EXECUTION_PAYLOAD_INDEX),
-        index=get_subtree_index(EXECUTION_PAYLOAD_INDEX),
+        depth=floorlog2(EXECUTION_PAYLOAD_GINDEX),
+        index=get_subtree_index(EXECUTION_PAYLOAD_GINDEX),
         root=header.beacon.body_root,
     )
 ```

tests/core/pyspec/eth2spec/test/capella/light_client/test_single_merkle_proof.py

@@ -15,16 +15,16 @@ def test_execution_merkle_proof(spec, state):
     block = state_transition_with_full_block(spec, state, True, False)
 
     yield "object", block.message.body
-    execution_branch = spec.compute_merkle_proof(block.message.body, spec.EXECUTION_PAYLOAD_INDEX)
+    execution_branch = spec.compute_merkle_proof(block.message.body, spec.EXECUTION_PAYLOAD_GINDEX)
     yield "proof", {
         "leaf": "0x" + block.message.body.execution_payload.hash_tree_root().hex(),
-        "leaf_index": spec.EXECUTION_PAYLOAD_INDEX,
+        "leaf_index": spec.EXECUTION_PAYLOAD_GINDEX,
         "branch": ['0x' + root.hex() for root in execution_branch]
     }
     assert spec.is_valid_merkle_branch(
         leaf=block.message.body.execution_payload.hash_tree_root(),
         branch=execution_branch,
-        depth=spec.floorlog2(spec.EXECUTION_PAYLOAD_INDEX),
-        index=spec.get_subtree_index(spec.EXECUTION_PAYLOAD_INDEX),
+        depth=spec.floorlog2(spec.EXECUTION_PAYLOAD_GINDEX),
+        index=spec.get_subtree_index(spec.EXECUTION_PAYLOAD_GINDEX),
         root=block.message.body.hash_tree_root(),
     )