diff --git a/tests/test_execution_types.nim b/tests/test_execution_types.nim index 13093f0..c64b0f2 100644 --- a/tests/test_execution_types.nim +++ b/tests/test_execution_types.nim @@ -180,12 +180,12 @@ suite "Execution types tests": check bad42.version == Version.V4 let v41 = bad41.V4 - check v41.depositReceipts == newSeq[DepositReceiptV1]() - check v41.exits == v4.exits.get + check v41.depositRequests == newSeq[DepositReceiptV1]() + check v41.withdrawalRequests == v4.exits.get let v42 = bad42.V4 - check v42.depositReceipts == v4.depositReceipts.get - check v42.exits == newSeq[WithdrawalRequestV1]() + check v42.depositRequests == v4.depositReceipts.get + check v42.withdrawalRequests == newSeq[WithdrawalRequestV1]() # roundtrip let v4p = v4.V4 diff --git a/web3/engine_api_types.nim b/web3/engine_api_types.nim index 1b69cb9..91332c4 100644 --- a/web3/engine_api_types.nim +++ b/web3/engine_api_types.nim @@ -143,8 +143,13 @@ type withdrawals*: seq[WithdrawalV1] blobGasUsed*: Quantity excessBlobGas*: Quantity - depositReceipts*: seq[DepositReceiptV1] - exits*: seq[WithdrawalRequestV1] + + # https://github.com/ethereum/consensus-specs/pull/3757 + # https://github.com/ethereum/execution-apis/pull/544 + # mainly for devnet-0 + depositRequests*: seq[DepositReceiptV1] + + withdrawalRequests*: seq[WithdrawalRequestV1] SomeExecutionPayload* = ExecutionPayloadV1 | diff --git a/web3/execution_types.nim b/web3/execution_types.nim index e93c65f..d2cdc7c 100644 --- a/web3/execution_types.nim +++ b/web3/execution_types.nim @@ -272,8 +272,8 @@ func V4*(p: ExecutionPayload): ExecutionPayloadV4 = withdrawals: p.withdrawals.get, blobGasUsed: p.blobGasUsed.get(0.Quantity), excessBlobGas: p.excessBlobGas.get(0.Quantity), - depositReceipts: p.depositReceipts.get(newSeq[DepositReceiptV1]()), - exits: p.exits.get(newSeq[WithdrawalRequestV1]()) + depositRequests: p.depositReceipts.get(newSeq[DepositReceiptV1]()), + withdrawalRequests: p.exits.get(newSeq[WithdrawalRequestV1]()) ) func V1*(p: ExecutionPayloadV1OrV2): ExecutionPayloadV1 = @@ -390,8 +390,8 @@ func executionPayload*(p: ExecutionPayloadV4): ExecutionPayload = withdrawals: some(p.withdrawals), blobGasUsed: some(p.blobGasUsed), excessBlobGas: some(p.excessBlobGas), - depositReceipts: some(p.depositReceipts), - exits: some(p.exits) + depositReceipts: some(p.depositRequests), + exits: some(p.withdrawalRequests) ) func executionPayload*(p: ExecutionPayloadV1OrV2): ExecutionPayload =