mirror of
https://github.com/status-im/nimbus-eth1.git
synced 2025-02-05 16:54:00 +00:00
c4c37302b1
* Introduce wrapper type for EIP-4844 transactions EIP-4844 blob sidecars are a concept that only exists in the mempool. After inclusion of a transaction into an execution block, only the versioned hash within the transaction remains. To improve type safety, replace the `Transaction.networkPayload` member with a wrapper type `PooledTransaction` that is used in contexts where blob sidecars exist. * Bump nimbus-eth2 to 87605d08a7f9cfc3b223bd32143e93a6cdf351ac * IPv6 'listen-address' in `nimbus_verified_proxy` * Bump nim-libp2p to 21cbe3a91a70811522554e89e6a791172cebfef2 * Fix beacon_lc_bridge payload conversion and conf.listenAddress type * Change nimbus_verified_proxy.asExecutionData param to SomeExecutionPayload * Rerun nph to fix asExecutionData style format * nimbus_verified_proxy listenAddress * Use PooledTransaction in nimbus-eth1 tests --------- Co-authored-by: jangko <jangko128@gmail.com>
125 lines
4.5 KiB
Nim
125 lines
4.5 KiB
Nim
# Nimbus
|
|
# Copyright (c) 2023-2024 Status Research & Development GmbH
|
|
# Licensed under either of
|
|
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
|
|
# * MIT license ([LICENSE-MIT](LICENSE-MIT))
|
|
# at your option.
|
|
# This file may not be copied, modified, or distributed except according to
|
|
# those terms.
|
|
|
|
import
|
|
./web3_eth_conv,
|
|
web3/execution_types,
|
|
../utils/utils,
|
|
eth/common
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Private helpers
|
|
# ------------------------------------------------------------------------------
|
|
|
|
func wdRoot(list: openArray[WithdrawalV1]): common.Hash256
|
|
{.gcsafe, raises:[].} =
|
|
{.noSideEffect.}:
|
|
calcWithdrawalsRoot(ethWithdrawals list)
|
|
|
|
func wdRoot(x: Option[seq[WithdrawalV1]]): Option[common.Hash256]
|
|
{.gcsafe, raises:[].} =
|
|
{.noSideEffect.}:
|
|
if x.isNone: none(common.Hash256)
|
|
else: some(wdRoot x.get)
|
|
|
|
func txRoot(list: openArray[Web3Tx]): common.Hash256
|
|
{.gcsafe, raises:[RlpError].} =
|
|
{.noSideEffect.}:
|
|
calcTxRoot(ethTxs(list))
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Public functions
|
|
# ------------------------------------------------------------------------------
|
|
|
|
{.push gcsafe, raises:[].}
|
|
|
|
func executionPayload*(blk: EthBlock): ExecutionPayload =
|
|
ExecutionPayload(
|
|
parentHash : w3Hash blk.header.parentHash,
|
|
feeRecipient : w3Addr blk.header.coinbase,
|
|
stateRoot : w3Hash blk.header.stateRoot,
|
|
receiptsRoot : w3Hash blk.header.receiptRoot,
|
|
logsBloom : w3Bloom blk.header.bloom,
|
|
prevRandao : w3PrevRandao blk.header.prevRandao,
|
|
blockNumber : w3Qty blk.header.blockNumber,
|
|
gasLimit : w3Qty blk.header.gasLimit,
|
|
gasUsed : w3Qty blk.header.gasUsed,
|
|
timestamp : w3Qty blk.header.timestamp,
|
|
extraData : w3ExtraData blk.header.extraData,
|
|
baseFeePerGas: blk.header.fee.get(0.u256),
|
|
blockHash : w3Hash blk.header,
|
|
transactions : w3Txs blk.txs,
|
|
withdrawals : w3Withdrawals blk.withdrawals,
|
|
blobGasUsed : w3Qty blk.header.blobGasUsed,
|
|
excessBlobGas: w3Qty blk.header.excessBlobGas
|
|
)
|
|
|
|
func executionPayloadV1V2*(blk: EthBlock): ExecutionPayloadV1OrV2 =
|
|
ExecutionPayloadV1OrV2(
|
|
parentHash : w3Hash blk.header.parentHash,
|
|
feeRecipient : w3Addr blk.header.coinbase,
|
|
stateRoot : w3Hash blk.header.stateRoot,
|
|
receiptsRoot : w3Hash blk.header.receiptRoot,
|
|
logsBloom : w3Bloom blk.header.bloom,
|
|
prevRandao : w3PrevRandao blk.header.prevRandao,
|
|
blockNumber : w3Qty blk.header.blockNumber,
|
|
gasLimit : w3Qty blk.header.gasLimit,
|
|
gasUsed : w3Qty blk.header.gasUsed,
|
|
timestamp : w3Qty blk.header.timestamp,
|
|
extraData : w3ExtraData blk.header.extraData,
|
|
baseFeePerGas: blk.header.fee.get(0.u256),
|
|
blockHash : w3Hash blk.header,
|
|
transactions : w3Txs blk.txs,
|
|
withdrawals : w3Withdrawals blk.withdrawals,
|
|
)
|
|
|
|
func blockHeader*(p: ExecutionPayload,
|
|
beaconRoot: Option[common.Hash256]):
|
|
common.BlockHeader {.gcsafe, raises:[CatchableError].} =
|
|
common.BlockHeader(
|
|
parentHash : ethHash p.parentHash,
|
|
ommersHash : EMPTY_UNCLE_HASH,
|
|
coinbase : ethAddr p.feeRecipient,
|
|
stateRoot : ethHash p.stateRoot,
|
|
txRoot : txRoot p.transactions,
|
|
receiptRoot : ethHash p.receiptsRoot,
|
|
bloom : ethBloom p.logsBloom,
|
|
difficulty : 0.u256,
|
|
blockNumber : u256 p.blockNumber,
|
|
gasLimit : ethGasInt p.gasLimit,
|
|
gasUsed : ethGasInt p.gasUsed,
|
|
timestamp : ethTime p.timestamp,
|
|
extraData : ethBlob p.extraData,
|
|
mixDigest : ethHash p.prevRandao,
|
|
nonce : default(BlockNonce),
|
|
fee : some(p.baseFeePerGas),
|
|
withdrawalsRoot: wdRoot p.withdrawals,
|
|
blobGasUsed : u64(p.blobGasUsed),
|
|
excessBlobGas : u64(p.excessBlobGas),
|
|
parentBeaconBlockRoot: beaconRoot
|
|
)
|
|
|
|
func blockBody*(p: ExecutionPayload):
|
|
common.BlockBody {.gcsafe, raises:[RlpError].} =
|
|
common.BlockBody(
|
|
uncles : @[],
|
|
transactions: ethTxs p.transactions,
|
|
withdrawals : ethWithdrawals p.withdrawals,
|
|
)
|
|
|
|
func ethBlock*(p: ExecutionPayload,
|
|
beaconRoot: Option[common.Hash256]):
|
|
common.EthBlock {.gcsafe, raises:[CatchableError].} =
|
|
common.EthBlock(
|
|
header : blockHeader(p, beaconRoot),
|
|
uncles : @[],
|
|
txs : ethTxs p.transactions,
|
|
withdrawals: ethWithdrawals p.withdrawals,
|
|
)
|