Add support for Pectra ExecutionPayload representations (#6158)
This commit is contained in:
parent
54ccb24782
commit
4457334dd0
|
@ -459,8 +459,9 @@ OK: 5/5 Fail: 0/5 Skip: 0/5
|
||||||
+ Roundtrip engine RPC V1 and bellatrix ExecutionPayload representations OK
|
+ Roundtrip engine RPC V1 and bellatrix ExecutionPayload representations OK
|
||||||
+ Roundtrip engine RPC V2 and capella ExecutionPayload representations OK
|
+ Roundtrip engine RPC V2 and capella ExecutionPayload representations OK
|
||||||
+ Roundtrip engine RPC V3 and deneb ExecutionPayload representations OK
|
+ Roundtrip engine RPC V3 and deneb ExecutionPayload representations OK
|
||||||
|
+ Roundtrip engine RPC V4 and electra ExecutionPayload representations OK
|
||||||
```
|
```
|
||||||
OK: 5/5 Fail: 0/5 Skip: 0/5
|
OK: 6/6 Fail: 0/6 Skip: 0/6
|
||||||
## Eth2 specific discovery tests
|
## Eth2 specific discovery tests
|
||||||
```diff
|
```diff
|
||||||
+ Invalid attnets field OK
|
+ Invalid attnets field OK
|
||||||
|
@ -1018,4 +1019,4 @@ OK: 2/2 Fail: 0/2 Skip: 0/2
|
||||||
OK: 9/9 Fail: 0/9 Skip: 0/9
|
OK: 9/9 Fail: 0/9 Skip: 0/9
|
||||||
|
|
||||||
---TOTAL---
|
---TOTAL---
|
||||||
OK: 683/688 Fail: 0/688 Skip: 5/688
|
OK: 684/689 Fail: 0/689 Skip: 5/689
|
||||||
|
|
|
@ -482,6 +482,54 @@ func asConsensusType*(payload: engine_api.GetPayloadV3Response):
|
||||||
blobs: Blobs.init(
|
blobs: Blobs.init(
|
||||||
payload.blobsBundle.blobs.mapIt(it.bytes))))
|
payload.blobsBundle.blobs.mapIt(it.bytes))))
|
||||||
|
|
||||||
|
func asConsensusType*(rpcExecutionPayload: ExecutionPayloadV4):
|
||||||
|
electra.ExecutionPayload =
|
||||||
|
template getTransaction(tt: TypedTransaction): bellatrix.Transaction =
|
||||||
|
bellatrix.Transaction.init(tt.distinctBase)
|
||||||
|
|
||||||
|
template getDepositReceipt(dr: DepositReceiptV1): DepositReceipt =
|
||||||
|
DepositReceipt(
|
||||||
|
pubkey: ValidatorPubKey(blob: dr.pubkey.distinctBase),
|
||||||
|
withdrawal_credentials: dr.withdrawalCredentials.asEth2Digest,
|
||||||
|
amount: dr.amount.Gwei,
|
||||||
|
signature: ValidatorSig(blob: dr.signature.distinctBase),
|
||||||
|
index: dr.index.uint64)
|
||||||
|
|
||||||
|
template getExecutionLayerExit(ele: ExitV1): ExecutionLayerExit =
|
||||||
|
ExecutionLayerExit(
|
||||||
|
source_address: ExecutionAddress(data: ele.sourceAddress.distinctBase),
|
||||||
|
validator_pubkey: ValidatorPubKey(
|
||||||
|
blob: ele.validatorPublicKey.distinctBase))
|
||||||
|
|
||||||
|
electra.ExecutionPayload(
|
||||||
|
parent_hash: rpcExecutionPayload.parentHash.asEth2Digest,
|
||||||
|
feeRecipient:
|
||||||
|
ExecutionAddress(data: rpcExecutionPayload.feeRecipient.distinctBase),
|
||||||
|
state_root: rpcExecutionPayload.stateRoot.asEth2Digest,
|
||||||
|
receipts_root: rpcExecutionPayload.receiptsRoot.asEth2Digest,
|
||||||
|
logs_bloom: BloomLogs(data: rpcExecutionPayload.logsBloom.distinctBase),
|
||||||
|
prev_randao: rpcExecutionPayload.prevRandao.asEth2Digest,
|
||||||
|
block_number: rpcExecutionPayload.blockNumber.uint64,
|
||||||
|
gas_limit: rpcExecutionPayload.gasLimit.uint64,
|
||||||
|
gas_used: rpcExecutionPayload.gasUsed.uint64,
|
||||||
|
timestamp: rpcExecutionPayload.timestamp.uint64,
|
||||||
|
extra_data: List[byte, MAX_EXTRA_DATA_BYTES].init(
|
||||||
|
rpcExecutionPayload.extraData.bytes),
|
||||||
|
base_fee_per_gas: rpcExecutionPayload.baseFeePerGas,
|
||||||
|
block_hash: rpcExecutionPayload.blockHash.asEth2Digest,
|
||||||
|
transactions: List[bellatrix.Transaction, MAX_TRANSACTIONS_PER_PAYLOAD].init(
|
||||||
|
mapIt(rpcExecutionPayload.transactions, it.getTransaction)),
|
||||||
|
withdrawals: List[capella.Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD].init(
|
||||||
|
mapIt(rpcExecutionPayload.withdrawals, it.asConsensusWithdrawal)),
|
||||||
|
blob_gas_used: rpcExecutionPayload.blobGasUsed.uint64,
|
||||||
|
excess_blob_gas: rpcExecutionPayload.excessBlobGas.uint64,
|
||||||
|
deposit_receipts:
|
||||||
|
List[electra.DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD].init(
|
||||||
|
mapIt(rpcExecutionPayload.depositReceipts, it.getDepositReceipt)),
|
||||||
|
exits:
|
||||||
|
List[electra.ExecutionLayerExit, MAX_EXECUTION_LAYER_EXITS_PER_PAYLOAD].init(
|
||||||
|
mapIt(rpcExecutionPayload.exits, it.getExecutionLayerExit)))
|
||||||
|
|
||||||
func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload):
|
func asEngineExecutionPayload*(executionPayload: bellatrix.ExecutionPayload):
|
||||||
ExecutionPayloadV1 =
|
ExecutionPayloadV1 =
|
||||||
template getTypedTransaction(tt: bellatrix.Transaction): TypedTransaction =
|
template getTypedTransaction(tt: bellatrix.Transaction): TypedTransaction =
|
||||||
|
@ -558,6 +606,47 @@ func asEngineExecutionPayload*(executionPayload: deneb.ExecutionPayload):
|
||||||
blobGasUsed: Quantity(executionPayload.blob_gas_used),
|
blobGasUsed: Quantity(executionPayload.blob_gas_used),
|
||||||
excessBlobGas: Quantity(executionPayload.excess_blob_gas))
|
excessBlobGas: Quantity(executionPayload.excess_blob_gas))
|
||||||
|
|
||||||
|
func asEngineExecutionPayload*(executionPayload: electra.ExecutionPayload):
|
||||||
|
ExecutionPayloadV4 =
|
||||||
|
template getTypedTransaction(tt: bellatrix.Transaction): TypedTransaction =
|
||||||
|
TypedTransaction(tt.distinctBase)
|
||||||
|
|
||||||
|
template getDepositReceipt(dr: DepositReceipt): DepositReceiptV1 =
|
||||||
|
DepositReceiptV1(
|
||||||
|
pubkey: FixedBytes[RawPubKeySize](dr.pubkey.blob),
|
||||||
|
withdrawalCredentials: FixedBytes[32](dr.withdrawal_credentials.data),
|
||||||
|
amount: dr.amount.Quantity,
|
||||||
|
signature: FixedBytes[RawSigSize](dr.signature.blob),
|
||||||
|
index: dr.index.Quantity)
|
||||||
|
|
||||||
|
template getExecutionLayerExit(ele: ExecutionLayerExit): ExitV1 =
|
||||||
|
ExitV1(
|
||||||
|
sourceAddress: Address(ele.source_address.data),
|
||||||
|
validatorPublicKey: FixedBytes[RawPubKeySize](ele.validator_pubkey.blob))
|
||||||
|
|
||||||
|
engine_api.ExecutionPayloadV4(
|
||||||
|
parentHash: executionPayload.parent_hash.asBlockHash,
|
||||||
|
feeRecipient: Address(executionPayload.fee_recipient.data),
|
||||||
|
stateRoot: executionPayload.state_root.asBlockHash,
|
||||||
|
receiptsRoot: executionPayload.receipts_root.asBlockHash,
|
||||||
|
logsBloom:
|
||||||
|
FixedBytes[BYTES_PER_LOGS_BLOOM](executionPayload.logs_bloom.data),
|
||||||
|
prevRandao: executionPayload.prev_randao.asBlockHash,
|
||||||
|
blockNumber: Quantity(executionPayload.block_number),
|
||||||
|
gasLimit: Quantity(executionPayload.gas_limit),
|
||||||
|
gasUsed: Quantity(executionPayload.gas_used),
|
||||||
|
timestamp: Quantity(executionPayload.timestamp),
|
||||||
|
extraData: DynamicBytes[0, MAX_EXTRA_DATA_BYTES](executionPayload.extra_data),
|
||||||
|
baseFeePerGas: executionPayload.base_fee_per_gas,
|
||||||
|
blockHash: executionPayload.block_hash.asBlockHash,
|
||||||
|
transactions: mapIt(executionPayload.transactions, it.getTypedTransaction),
|
||||||
|
withdrawals: mapIt(executionPayload.withdrawals, it.asEngineWithdrawal),
|
||||||
|
blobGasUsed: Quantity(executionPayload.blob_gas_used),
|
||||||
|
excessBlobGas: Quantity(executionPayload.excess_blob_gas),
|
||||||
|
depositReceipts: mapIt(
|
||||||
|
executionPayload.deposit_receipts, it.getDepositReceipt),
|
||||||
|
exits: mapIt(executionPayload.exits, it.getExecutionLayerExit))
|
||||||
|
|
||||||
func isConnected(connection: ELConnection): bool =
|
func isConnected(connection: ELConnection): bool =
|
||||||
connection.web3.isSome
|
connection.web3.isSome
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,27 @@ from ./deneb import Blobs, BlobsBundle, KzgCommitments, KzgProofs
|
||||||
|
|
||||||
export json_serialization, base, kzg4844
|
export json_serialization, base, kzg4844
|
||||||
|
|
||||||
|
const
|
||||||
|
# Keep these here for now, since things still in flux
|
||||||
|
# https://github.com/ethereum/consensus-specs/pull/3615
|
||||||
|
MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD* = 8192
|
||||||
|
MAX_EXECUTION_LAYER_EXITS_PER_PAYLOAD* = 16 # there's a discrepancy here, _PER_PAYLOAD or not
|
||||||
|
|
||||||
type
|
type
|
||||||
# https://github.com/ethereum/consensus-specs/blob/v1.4.0/specs/deneb/beacon-chain.md#executionpayload
|
# https://github.com/ethereum/consensus-specs/pull/3615
|
||||||
|
DepositReceipt* = object
|
||||||
|
pubkey*: ValidatorPubKey
|
||||||
|
withdrawal_credentials*: Eth2Digest
|
||||||
|
amount*: Gwei
|
||||||
|
signature*: ValidatorSig
|
||||||
|
index*: uint64
|
||||||
|
|
||||||
|
# https://github.com/ethereum/consensus-specs/pull/3615
|
||||||
|
ExecutionLayerExit* = object
|
||||||
|
source_address*: ExecutionAddress
|
||||||
|
validator_pubkey*: ValidatorPubKey
|
||||||
|
|
||||||
|
# https://github.com/ethereum/consensus-specs/pull/3615
|
||||||
ExecutionPayload* = object
|
ExecutionPayload* = object
|
||||||
# Execution block header fields
|
# Execution block header fields
|
||||||
parent_hash*: Eth2Digest
|
parent_hash*: Eth2Digest
|
||||||
|
@ -54,8 +73,10 @@ type
|
||||||
block_hash*: Eth2Digest # Hash of execution block
|
block_hash*: Eth2Digest # 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]
|
||||||
blob_gas_used*: uint64 # [New in Deneb]
|
blob_gas_used*: uint64
|
||||||
excess_blob_gas*: uint64 # [New in Deneb]
|
excess_blob_gas*: uint64
|
||||||
|
deposit_receipts*: List[DepositReceipt, MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD]
|
||||||
|
exits*: List[ExecutionLayerExit, MAX_EXECUTION_LAYER_EXITS_PER_PAYLOAD]
|
||||||
|
|
||||||
ExecutionPayloadForSigning* = object
|
ExecutionPayloadForSigning* = object
|
||||||
executionPayload*: ExecutionPayload
|
executionPayload*: ExecutionPayload
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue