Merge pull request #3396 from ethereum/dev

release v1.4.0-alpha.1
ethereum · Jun 2, 2023 · 2c3a47e · 2c3a47e
2 parents 0ffb4e0 + 468b5be
commit 2c3a47e
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 512 deletions.
diff --git a/setup.py b/setup.py
@@ -1101,10 +1101,6 @@ def finalize_options(self):
                 """
             if self.spec_fork == EIP6110:
                 self.md_doc_paths += """
-                    specs/_features/eip6110/light-client/fork.md
-                    specs/_features/eip6110/light-client/full-node.md
-                    specs/_features/eip6110/light-client/p2p-interface.md
-                    specs/_features/eip6110/light-client/sync-protocol.md
                     specs/_features/eip6110/beacon-chain.md
                     specs/_features/eip6110/fork.md
                 """

diff --git a/specs/_features/eip6110/beacon-chain.md b/specs/_features/eip6110/beacon-chain.md
@@ -91,7 +91,8 @@ class ExecutionPayload(Container):
     block_hash: Hash32
     transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
     withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
-    excess_data_gas: uint256
+    data_gas_used: uint64
+    excess_data_gas: uint64
     deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD]  # [New in EIP6110]
 ```
 
@@ -116,7 +117,8 @@ class ExecutionPayloadHeader(Container):
     block_hash: Hash32
     transactions_root: Root
     withdrawals_root: Root
-    excess_data_gas: uint256
+    data_gas_used: uint64
+    excess_data_gas: uint64
     deposit_receipts_root: Root  # [New in EIP6110]
 ```
 
@@ -268,6 +270,7 @@ def process_execution_payload(state: BeaconState, body: BeaconBlockBody, executi
         block_hash=payload.block_hash,
         transactions_root=hash_tree_root(payload.transactions),
         withdrawals_root=hash_tree_root(payload.withdrawals),
+        data_gas_used=payload.data_gas_used,
         excess_data_gas=payload.excess_data_gas,
         deposit_receipts_root=hash_tree_root(payload.deposit_receipts),  # [New in EIP6110]
     )

diff --git a/specs/_features/eip6110/fork.md b/specs/_features/eip6110/fork.md
@@ -88,7 +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,
-        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/_features/eip6110/light-client/fork.md b/specs/_features/eip6110/light-client/fork.md
diff --git a/specs/_features/eip6110/light-client/full-node.md b/specs/_features/eip6110/light-client/full-node.md
diff --git a/specs/_features/eip6110/light-client/p2p-interface.md b/specs/_features/eip6110/light-client/p2p-interface.md