Use Gwei for Withdrawal amount in mock-EE

Updates the EL block hash computation for pytests to match latest spec.
Notably, use `Gwei` for `Withdrawal` amount consistently.
Also fix `excess_data_gas` not being correctly accounted for.

https://github.com/ethereum/execution-apis/pull/354
https://github.com/ethereum/EIPs/pull/6325
This commit is contained in:
Etan Kissling 2023-01-15 12:13:35 +01:00
parent 496e1d86c9
commit 52d978b12e
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D

View File

@ -26,6 +26,8 @@ def get_execution_payload_header(spec, execution_payload):
)
if is_post_capella(spec):
payload_header.withdrawals_root = spec.hash_tree_root(execution_payload.withdrawals)
if is_post_eip4844(spec):
payload_header.excess_data_gas = execution_payload.excess_data_gas
return payload_header
@ -108,7 +110,7 @@ def get_withdrawal_rlp(spec, withdrawal):
# address
(Binary(20, 20), withdrawal.address),
# amount
(big_endian_int, spec.uint256(withdrawal.amount) * (10**9)),
(big_endian_int, withdrawal.amount),
]
sedes = List([schema for schema, _ in withdrawal_rlp])