Merge pull request #3392 from ethereum/excess_data_gas-type
Change `ExecutionPayload.excess_data_gas` type from `uint256` to `uint64`
This commit is contained in:
commit
5c5c3bdc2d
|
@ -91,8 +91,8 @@ class ExecutionPayload(Container):
|
||||||
block_hash: Hash32
|
block_hash: Hash32
|
||||||
transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
|
transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
|
||||||
withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
|
withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
|
||||||
data_gas_used: uint256
|
data_gas_used: uint64
|
||||||
excess_data_gas: uint256
|
excess_data_gas: uint64
|
||||||
deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD] # [New in EIP6110]
|
deposit_receipts: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD] # [New in EIP6110]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -117,8 +117,8 @@ class ExecutionPayloadHeader(Container):
|
||||||
block_hash: Hash32
|
block_hash: Hash32
|
||||||
transactions_root: Root
|
transactions_root: Root
|
||||||
withdrawals_root: Root
|
withdrawals_root: Root
|
||||||
data_gas_used: uint256
|
data_gas_used: uint64
|
||||||
excess_data_gas: uint256
|
excess_data_gas: uint64
|
||||||
deposit_receipts_root: Root # [New in EIP6110]
|
deposit_receipts_root: Root # [New in EIP6110]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -88,8 +88,8 @@ def upgrade_to_eip6110(pre: deneb.BeaconState) -> BeaconState:
|
||||||
block_hash=pre.latest_execution_payload_header.block_hash,
|
block_hash=pre.latest_execution_payload_header.block_hash,
|
||||||
transactions_root=pre.latest_execution_payload_header.transactions_root,
|
transactions_root=pre.latest_execution_payload_header.transactions_root,
|
||||||
withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
|
withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
|
||||||
data_gas_used=uint256(0),
|
data_gas_used=uint64(0),
|
||||||
excess_data_gas=uint256(0),
|
excess_data_gas=uint64(0),
|
||||||
deposit_receipts_root=Root(), # [New in EIP-6110]
|
deposit_receipts_root=Root(), # [New in EIP-6110]
|
||||||
)
|
)
|
||||||
post = BeaconState(
|
post = BeaconState(
|
||||||
|
|
|
@ -126,8 +126,8 @@ class ExecutionPayload(Container):
|
||||||
block_hash: Hash32 # Hash of execution block
|
block_hash: Hash32 # Hash of execution block
|
||||||
transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
|
transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
|
||||||
withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
|
withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
|
||||||
data_gas_used: uint256 # [New in Deneb]
|
data_gas_used: uint64 # [New in Deneb]
|
||||||
excess_data_gas: uint256 # [New in Deneb]
|
excess_data_gas: uint64 # [New in Deneb]
|
||||||
```
|
```
|
||||||
|
|
||||||
#### `ExecutionPayloadHeader`
|
#### `ExecutionPayloadHeader`
|
||||||
|
@ -151,8 +151,8 @@ class ExecutionPayloadHeader(Container):
|
||||||
block_hash: Hash32 # Hash of execution block
|
block_hash: Hash32 # Hash of execution block
|
||||||
transactions_root: Root
|
transactions_root: Root
|
||||||
withdrawals_root: Root
|
withdrawals_root: Root
|
||||||
data_gas_used: uint256 # [New in Deneb]
|
data_gas_used: uint64 # [New in Deneb]
|
||||||
excess_data_gas: uint256 # [New in Deneb]
|
excess_data_gas: uint64 # [New in Deneb]
|
||||||
```
|
```
|
||||||
|
|
||||||
## Helper functions
|
## Helper functions
|
||||||
|
|
|
@ -83,8 +83,8 @@ def upgrade_to_deneb(pre: capella.BeaconState) -> BeaconState:
|
||||||
block_hash=pre.latest_execution_payload_header.block_hash,
|
block_hash=pre.latest_execution_payload_header.block_hash,
|
||||||
transactions_root=pre.latest_execution_payload_header.transactions_root,
|
transactions_root=pre.latest_execution_payload_header.transactions_root,
|
||||||
withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
|
withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
|
||||||
data_gas_used=uint256(0), # [New in Deneb]
|
data_gas_used=uint64(0), # [New in Deneb]
|
||||||
excess_data_gas=uint256(0), # [New in Deneb]
|
excess_data_gas=uint64(0), # [New in Deneb]
|
||||||
)
|
)
|
||||||
post = BeaconState(
|
post = BeaconState(
|
||||||
# Versioning
|
# Versioning
|
||||||
|
|
|
@ -41,8 +41,8 @@ def upgrade_lc_header_to_deneb(pre: capella.LightClientHeader) -> LightClientHea
|
||||||
block_hash=pre.execution.block_hash,
|
block_hash=pre.execution.block_hash,
|
||||||
transactions_root=pre.execution.transactions_root,
|
transactions_root=pre.execution.transactions_root,
|
||||||
withdrawals_root=pre.execution.withdrawals_root,
|
withdrawals_root=pre.execution.withdrawals_root,
|
||||||
data_gas_used=uint256(0), # [New in Deneb]
|
data_gas_used=uint64(0), # [New in Deneb]
|
||||||
excess_data_gas=uint256(0), # [New in Deneb]
|
excess_data_gas=uint64(0), # [New in Deneb]
|
||||||
),
|
),
|
||||||
execution_branch=pre.execution_branch,
|
execution_branch=pre.execution_branch,
|
||||||
)
|
)
|
||||||
|
|
|
@ -68,7 +68,7 @@ def is_valid_light_client_header(header: LightClientHeader) -> bool:
|
||||||
|
|
||||||
# [New in Deneb]
|
# [New in Deneb]
|
||||||
if epoch < DENEB_FORK_EPOCH:
|
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
|
return False
|
||||||
|
|
||||||
if epoch < CAPELLA_FORK_EPOCH:
|
if epoch < CAPELLA_FORK_EPOCH:
|
||||||
|
|
Loading…
Reference in New Issue