Merge pull request #3392 from ethereum/excess_data_gas-type

Change `ExecutionPayload.excess_data_gas` type from `uint256` to `uint64`
ethereum · Jun 1, 2023 · 5c5c3bd · 5c5c3bd
2 parents a965ca7 + 69ce4bb
commit 5c5c3bd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/specs/_features/eip6110/beacon-chain.md b/specs/_features/eip6110/beacon-chain.md
@@ -91,8 +91,8 @@ class ExecutionPayload(Container):
     block_hash: Hash32
     transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
     withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
-    data_gas_used: uint256
-    excess_data_gas: uint256
+    data_gas_used: uint64
+    excess_data_gas: uint64
     deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD]  # [New in EIP6110]
 ```
 
@@ -117,8 +117,8 @@ class ExecutionPayloadHeader(Container):
     block_hash: Hash32
     transactions_root: Root
     withdrawals_root: Root
-    data_gas_used: uint256
-    excess_data_gas: uint256
+    data_gas_used: uint64
+    excess_data_gas: uint64
     deposit_receipts_root: Root  # [New in EIP6110]
 ```
 

diff --git a/specs/_features/eip6110/fork.md b/specs/_features/eip6110/fork.md
@@ -88,8 +88,8 @@ def upgrade_to_eip6110(pre: deneb.BeaconState) -> BeaconState:
         block_hash=pre.latest_execution_payload_header.block_hash,
         transactions_root=pre.latest_execution_payload_header.transactions_root,
         withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
-        data_gas_used=uint256(0),
-        excess_data_gas=uint256(0),
+        data_gas_used=uint64(0),
+        excess_data_gas=uint64(0),
         deposit_receipts_root=Root(),  # [New in EIP-6110]
     )
     post = BeaconState(

diff --git a/specs/deneb/beacon-chain.md b/specs/deneb/beacon-chain.md
@@ -126,8 +126,8 @@ class ExecutionPayload(Container):
     block_hash: Hash32  # Hash of execution block
     transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
     withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
-    data_gas_used: uint256  # [New in Deneb]
-    excess_data_gas: uint256  # [New in Deneb]
+    data_gas_used: uint64  # [New in Deneb]
+    excess_data_gas: uint64  # [New in Deneb]
 ```
 
 #### `ExecutionPayloadHeader`
@@ -151,8 +151,8 @@ class ExecutionPayloadHeader(Container):
     block_hash: Hash32  # Hash of execution block
     transactions_root: Root
     withdrawals_root: Root
-    data_gas_used: uint256  # [New in Deneb]
-    excess_data_gas: uint256  # [New in Deneb]
+    data_gas_used: uint64  # [New in Deneb]
+    excess_data_gas: uint64  # [New in Deneb]
 ```
 
 ## Helper functions

diff --git a/specs/deneb/fork.md b/specs/deneb/fork.md
@@ -83,8 +83,8 @@ def upgrade_to_deneb(pre: capella.BeaconState) -> BeaconState:
         block_hash=pre.latest_execution_payload_header.block_hash,
         transactions_root=pre.latest_execution_payload_header.transactions_root,
         withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
-        data_gas_used=uint256(0),  # [New in Deneb]
-        excess_data_gas=uint256(0),  # [New in Deneb]
+        data_gas_used=uint64(0),  # [New in Deneb]
+        excess_data_gas=uint64(0),  # [New in Deneb]
     )
     post = BeaconState(
         # Versioning

diff --git a/specs/deneb/light-client/fork.md b/specs/deneb/light-client/fork.md
@@ -41,8 +41,8 @@ def upgrade_lc_header_to_deneb(pre: capella.LightClientHeader) -> LightClientHea
             block_hash=pre.execution.block_hash,
             transactions_root=pre.execution.transactions_root,
             withdrawals_root=pre.execution.withdrawals_root,
-            data_gas_used=uint256(0),  # [New in Deneb]
-            excess_data_gas=uint256(0),  # [New in Deneb]
+            data_gas_used=uint64(0),  # [New in Deneb]
+            excess_data_gas=uint64(0),  # [New in Deneb]
         ),
         execution_branch=pre.execution_branch,
     )

diff --git a/specs/deneb/light-client/sync-protocol.md b/specs/deneb/light-client/sync-protocol.md
@@ -68,7 +68,7 @@ def is_valid_light_client_header(header: LightClientHeader) -> bool:
 
     # [New in Deneb]
     if epoch < DENEB_FORK_EPOCH:
-        if header.execution.excess_data_gas != uint256(0) or header.execution.data_gas_used != uint256(0):
+        if header.execution.data_gas_used != uint64(0) or header.execution.excess_data_gas != uint64(0):
             return False
 
     if epoch < CAPELLA_FORK_EPOCH: