2023-08-27 01:23:45 +00:00
|
|
|
# Nimbus
|
2024-02-20 03:07:38 +00:00
|
|
|
# Copyright (c) 2023-2024 Status Research & Development GmbH
|
2023-08-27 01:23:45 +00:00
|
|
|
# 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.
|
|
|
|
|
Consolidate block type for block processing (#2325)
This PR consolidates the split header-body sequences into a single EthBlock
sequence and cleans up the fallout from that which significantly reduces
block processing overhead during import thanks to less garbage collection
and fewer copies of things all around.
Notably, since the number of headers must always match the number of bodies,
we also get rid of a pointless degree of freedom that in the future could
introduce unnecessary bugs.
* only read header and body from era file
* avoid several unnecessary copies along the block processing way
* simplify signatures, cleaning up unused arguemnts and returns
* use `stew/assign2` in a few strategic places where the generated
nim assignent is slow and add a few `move` to work around poor
analysis in nim 1.6 (will need to be revisited for 2.0)
```
stats-20240607_2223-a814aa0b.csv vs stats-20240608_0714-21c1d0a9.csv
bps_x bps_y tps_x tps_y bpsd tpsd timed
block_number
(498305, 713245] 1,540.52 1,809.73 2,361.58 2775.340189 17.63% 17.63% -14.92%
(713245, 928185] 730.36 865.26 1,715.90 2028.973852 18.01% 18.01% -15.21%
(928185, 1143126] 663.03 789.10 2,529.26 3032.490771 19.79% 19.79% -16.28%
(1143126, 1358066] 393.46 508.05 2,152.50 2777.578119 29.13% 29.13% -22.50%
(1358066, 1573007] 370.88 440.72 2,351.31 2791.896052 18.81% 18.81% -15.80%
(1573007, 1787947] 283.65 335.11 2,068.93 2441.373402 17.60% 17.60% -14.91%
(1787947, 2002888] 287.29 342.11 2,078.39 2474.179448 18.99% 18.99% -15.91%
(2002888, 2217828] 293.38 343.16 2,208.83 2584.77457 17.16% 17.16% -14.61%
(2217828, 2432769] 140.09 167.86 1,081.87 1296.336926 18.82% 18.82% -15.80%
blocks: 1934464, baseline: 3h13m1s, contender: 2h43m47s
bpsd (mean): 19.55%
tpsd (mean): 19.55%
Time (total): -29m13s, -15.14%
```
2024-06-09 14:32:20 +00:00
|
|
|
{.push raises: [].}
|
|
|
|
|
2023-08-27 01:23:45 +00:00
|
|
|
import
|
|
|
|
./web3_eth_conv,
|
2023-12-08 09:35:50 +00:00
|
|
|
web3/execution_types,
|
2023-08-27 01:23:45 +00:00
|
|
|
../utils/utils,
|
|
|
|
eth/common
|
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Private helpers
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
func wdRoot(list: openArray[WithdrawalV1]): common.Hash256
|
2023-10-05 03:04:12 +00:00
|
|
|
{.gcsafe, raises:[].} =
|
2024-02-20 03:07:38 +00:00
|
|
|
{.noSideEffect.}:
|
2023-08-27 01:23:45 +00:00
|
|
|
calcWithdrawalsRoot(ethWithdrawals list)
|
|
|
|
|
2024-06-14 07:31:08 +00:00
|
|
|
func wdRoot(x: Opt[seq[WithdrawalV1]]): Opt[common.Hash256]
|
2023-10-05 03:04:12 +00:00
|
|
|
{.gcsafe, raises:[].} =
|
2024-02-20 03:07:38 +00:00
|
|
|
{.noSideEffect.}:
|
2024-06-14 07:31:08 +00:00
|
|
|
if x.isNone: Opt.none(common.Hash256)
|
|
|
|
else: Opt.some(wdRoot x.get)
|
2023-08-27 01:23:45 +00:00
|
|
|
|
2024-05-15 03:07:59 +00:00
|
|
|
func txRoot(list: openArray[Web3Tx]): common.Hash256
|
2023-10-05 03:04:12 +00:00
|
|
|
{.gcsafe, raises:[RlpError].} =
|
2024-02-20 03:07:38 +00:00
|
|
|
{.noSideEffect.}:
|
2024-05-15 03:07:59 +00:00
|
|
|
calcTxRoot(ethTxs(list))
|
2023-08-27 01:23:45 +00:00
|
|
|
|
2024-09-11 07:02:50 +00:00
|
|
|
func requestsRoot(p: ExecutionPayload): Opt[common.Hash256]
|
|
|
|
{.gcsafe, raises:[].} =
|
|
|
|
{.noSideEffect.}:
|
|
|
|
let reqs = ethRequests(p)
|
|
|
|
if reqs.isNone: Opt.none(common.Hash256)
|
|
|
|
else: Opt.some(calcRequestsRoot reqs.get)
|
|
|
|
|
2023-08-27 01:23:45 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# 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,
|
2024-06-14 07:31:08 +00:00
|
|
|
receiptsRoot : w3Hash blk.header.receiptsRoot,
|
|
|
|
logsBloom : w3Bloom blk.header.logsBloom,
|
2023-08-27 01:23:45 +00:00
|
|
|
prevRandao : w3PrevRandao blk.header.prevRandao,
|
2024-06-14 07:31:08 +00:00
|
|
|
blockNumber : w3Qty blk.header.number,
|
2023-08-27 01:23:45 +00:00
|
|
|
gasLimit : w3Qty blk.header.gasLimit,
|
|
|
|
gasUsed : w3Qty blk.header.gasUsed,
|
|
|
|
timestamp : w3Qty blk.header.timestamp,
|
|
|
|
extraData : w3ExtraData blk.header.extraData,
|
2024-06-14 07:31:08 +00:00
|
|
|
baseFeePerGas: blk.header.baseFeePerGas.get(0.u256),
|
2023-08-27 01:23:45 +00:00
|
|
|
blockHash : w3Hash blk.header,
|
|
|
|
transactions : w3Txs blk.txs,
|
|
|
|
withdrawals : w3Withdrawals blk.withdrawals,
|
|
|
|
blobGasUsed : w3Qty blk.header.blobGasUsed,
|
2024-09-11 07:02:50 +00:00
|
|
|
excessBlobGas: w3Qty blk.header.excessBlobGas,
|
|
|
|
depositRequests: w3DepositRequests blk.requests,
|
|
|
|
withdrawalRequests: w3WithdrawalRequests blk.requests,
|
|
|
|
consolidationRequests: w3ConsolidationRequests blk.requests,
|
2023-08-27 01:23:45 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func executionPayloadV1V2*(blk: EthBlock): ExecutionPayloadV1OrV2 =
|
|
|
|
ExecutionPayloadV1OrV2(
|
|
|
|
parentHash : w3Hash blk.header.parentHash,
|
|
|
|
feeRecipient : w3Addr blk.header.coinbase,
|
|
|
|
stateRoot : w3Hash blk.header.stateRoot,
|
2024-06-14 07:31:08 +00:00
|
|
|
receiptsRoot : w3Hash blk.header.receiptsRoot,
|
|
|
|
logsBloom : w3Bloom blk.header.logsBloom,
|
2023-08-27 01:23:45 +00:00
|
|
|
prevRandao : w3PrevRandao blk.header.prevRandao,
|
2024-06-14 07:31:08 +00:00
|
|
|
blockNumber : w3Qty blk.header.number,
|
2023-08-27 01:23:45 +00:00
|
|
|
gasLimit : w3Qty blk.header.gasLimit,
|
|
|
|
gasUsed : w3Qty blk.header.gasUsed,
|
|
|
|
timestamp : w3Qty blk.header.timestamp,
|
|
|
|
extraData : w3ExtraData blk.header.extraData,
|
2024-06-14 07:31:08 +00:00
|
|
|
baseFeePerGas: blk.header.baseFeePerGas.get(0.u256),
|
2023-08-27 01:23:45 +00:00
|
|
|
blockHash : w3Hash blk.header,
|
|
|
|
transactions : w3Txs blk.txs,
|
|
|
|
withdrawals : w3Withdrawals blk.withdrawals,
|
|
|
|
)
|
|
|
|
|
|
|
|
func blockHeader*(p: ExecutionPayload,
|
2024-06-14 07:31:08 +00:00
|
|
|
beaconRoot: Opt[common.Hash256]):
|
Consolidate block type for block processing (#2325)
This PR consolidates the split header-body sequences into a single EthBlock
sequence and cleans up the fallout from that which significantly reduces
block processing overhead during import thanks to less garbage collection
and fewer copies of things all around.
Notably, since the number of headers must always match the number of bodies,
we also get rid of a pointless degree of freedom that in the future could
introduce unnecessary bugs.
* only read header and body from era file
* avoid several unnecessary copies along the block processing way
* simplify signatures, cleaning up unused arguemnts and returns
* use `stew/assign2` in a few strategic places where the generated
nim assignent is slow and add a few `move` to work around poor
analysis in nim 1.6 (will need to be revisited for 2.0)
```
stats-20240607_2223-a814aa0b.csv vs stats-20240608_0714-21c1d0a9.csv
bps_x bps_y tps_x tps_y bpsd tpsd timed
block_number
(498305, 713245] 1,540.52 1,809.73 2,361.58 2775.340189 17.63% 17.63% -14.92%
(713245, 928185] 730.36 865.26 1,715.90 2028.973852 18.01% 18.01% -15.21%
(928185, 1143126] 663.03 789.10 2,529.26 3032.490771 19.79% 19.79% -16.28%
(1143126, 1358066] 393.46 508.05 2,152.50 2777.578119 29.13% 29.13% -22.50%
(1358066, 1573007] 370.88 440.72 2,351.31 2791.896052 18.81% 18.81% -15.80%
(1573007, 1787947] 283.65 335.11 2,068.93 2441.373402 17.60% 17.60% -14.91%
(1787947, 2002888] 287.29 342.11 2,078.39 2474.179448 18.99% 18.99% -15.91%
(2002888, 2217828] 293.38 343.16 2,208.83 2584.77457 17.16% 17.16% -14.61%
(2217828, 2432769] 140.09 167.86 1,081.87 1296.336926 18.82% 18.82% -15.80%
blocks: 1934464, baseline: 3h13m1s, contender: 2h43m47s
bpsd (mean): 19.55%
tpsd (mean): 19.55%
Time (total): -29m13s, -15.14%
```
2024-06-09 14:32:20 +00:00
|
|
|
common.BlockHeader {.gcsafe, raises:[RlpError].} =
|
2023-08-27 01:23:45 +00:00
|
|
|
common.BlockHeader(
|
|
|
|
parentHash : ethHash p.parentHash,
|
|
|
|
ommersHash : EMPTY_UNCLE_HASH,
|
|
|
|
coinbase : ethAddr p.feeRecipient,
|
|
|
|
stateRoot : ethHash p.stateRoot,
|
2024-09-29 12:37:09 +00:00
|
|
|
transactionsRoot: txRoot p.transactions,
|
2024-06-14 07:31:08 +00:00
|
|
|
receiptsRoot : ethHash p.receiptsRoot,
|
|
|
|
logsBloom : ethBloom p.logsBloom,
|
2023-08-27 01:23:45 +00:00
|
|
|
difficulty : 0.u256,
|
2024-06-14 07:31:08 +00:00
|
|
|
number : common.BlockNumber(p.blockNumber),
|
2023-08-27 01:23:45 +00:00
|
|
|
gasLimit : ethGasInt p.gasLimit,
|
|
|
|
gasUsed : ethGasInt p.gasUsed,
|
|
|
|
timestamp : ethTime p.timestamp,
|
|
|
|
extraData : ethBlob p.extraData,
|
2024-06-14 07:31:08 +00:00
|
|
|
mixHash : ethHash p.prevRandao,
|
2023-08-27 01:23:45 +00:00
|
|
|
nonce : default(BlockNonce),
|
2024-06-14 07:31:08 +00:00
|
|
|
baseFeePerGas : Opt.some(p.baseFeePerGas),
|
2023-08-27 01:23:45 +00:00
|
|
|
withdrawalsRoot: wdRoot p.withdrawals,
|
|
|
|
blobGasUsed : u64(p.blobGasUsed),
|
|
|
|
excessBlobGas : u64(p.excessBlobGas),
|
2024-09-11 07:02:50 +00:00
|
|
|
parentBeaconBlockRoot: beaconRoot,
|
|
|
|
requestsRoot : requestsRoot(p),
|
2023-08-27 01:23:45 +00:00
|
|
|
)
|
|
|
|
|
2024-05-15 03:07:59 +00:00
|
|
|
func blockBody*(p: ExecutionPayload):
|
|
|
|
common.BlockBody {.gcsafe, raises:[RlpError].} =
|
2023-08-27 01:23:45 +00:00
|
|
|
common.BlockBody(
|
|
|
|
uncles : @[],
|
2024-05-15 03:07:59 +00:00
|
|
|
transactions: ethTxs p.transactions,
|
2023-08-27 01:23:45 +00:00
|
|
|
withdrawals : ethWithdrawals p.withdrawals,
|
2024-09-11 07:02:50 +00:00
|
|
|
requests : ethRequests(p),
|
2023-08-27 01:23:45 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func ethBlock*(p: ExecutionPayload,
|
2024-06-14 07:31:08 +00:00
|
|
|
beaconRoot: Opt[common.Hash256]):
|
Consolidate block type for block processing (#2325)
This PR consolidates the split header-body sequences into a single EthBlock
sequence and cleans up the fallout from that which significantly reduces
block processing overhead during import thanks to less garbage collection
and fewer copies of things all around.
Notably, since the number of headers must always match the number of bodies,
we also get rid of a pointless degree of freedom that in the future could
introduce unnecessary bugs.
* only read header and body from era file
* avoid several unnecessary copies along the block processing way
* simplify signatures, cleaning up unused arguemnts and returns
* use `stew/assign2` in a few strategic places where the generated
nim assignent is slow and add a few `move` to work around poor
analysis in nim 1.6 (will need to be revisited for 2.0)
```
stats-20240607_2223-a814aa0b.csv vs stats-20240608_0714-21c1d0a9.csv
bps_x bps_y tps_x tps_y bpsd tpsd timed
block_number
(498305, 713245] 1,540.52 1,809.73 2,361.58 2775.340189 17.63% 17.63% -14.92%
(713245, 928185] 730.36 865.26 1,715.90 2028.973852 18.01% 18.01% -15.21%
(928185, 1143126] 663.03 789.10 2,529.26 3032.490771 19.79% 19.79% -16.28%
(1143126, 1358066] 393.46 508.05 2,152.50 2777.578119 29.13% 29.13% -22.50%
(1358066, 1573007] 370.88 440.72 2,351.31 2791.896052 18.81% 18.81% -15.80%
(1573007, 1787947] 283.65 335.11 2,068.93 2441.373402 17.60% 17.60% -14.91%
(1787947, 2002888] 287.29 342.11 2,078.39 2474.179448 18.99% 18.99% -15.91%
(2002888, 2217828] 293.38 343.16 2,208.83 2584.77457 17.16% 17.16% -14.61%
(2217828, 2432769] 140.09 167.86 1,081.87 1296.336926 18.82% 18.82% -15.80%
blocks: 1934464, baseline: 3h13m1s, contender: 2h43m47s
bpsd (mean): 19.55%
tpsd (mean): 19.55%
Time (total): -29m13s, -15.14%
```
2024-06-09 14:32:20 +00:00
|
|
|
common.EthBlock {.gcsafe, raises:[RlpError].} =
|
2024-05-15 03:07:59 +00:00
|
|
|
common.EthBlock(
|
Consolidate block type for block processing (#2325)
This PR consolidates the split header-body sequences into a single EthBlock
sequence and cleans up the fallout from that which significantly reduces
block processing overhead during import thanks to less garbage collection
and fewer copies of things all around.
Notably, since the number of headers must always match the number of bodies,
we also get rid of a pointless degree of freedom that in the future could
introduce unnecessary bugs.
* only read header and body from era file
* avoid several unnecessary copies along the block processing way
* simplify signatures, cleaning up unused arguemnts and returns
* use `stew/assign2` in a few strategic places where the generated
nim assignent is slow and add a few `move` to work around poor
analysis in nim 1.6 (will need to be revisited for 2.0)
```
stats-20240607_2223-a814aa0b.csv vs stats-20240608_0714-21c1d0a9.csv
bps_x bps_y tps_x tps_y bpsd tpsd timed
block_number
(498305, 713245] 1,540.52 1,809.73 2,361.58 2775.340189 17.63% 17.63% -14.92%
(713245, 928185] 730.36 865.26 1,715.90 2028.973852 18.01% 18.01% -15.21%
(928185, 1143126] 663.03 789.10 2,529.26 3032.490771 19.79% 19.79% -16.28%
(1143126, 1358066] 393.46 508.05 2,152.50 2777.578119 29.13% 29.13% -22.50%
(1358066, 1573007] 370.88 440.72 2,351.31 2791.896052 18.81% 18.81% -15.80%
(1573007, 1787947] 283.65 335.11 2,068.93 2441.373402 17.60% 17.60% -14.91%
(1787947, 2002888] 287.29 342.11 2,078.39 2474.179448 18.99% 18.99% -15.91%
(2002888, 2217828] 293.38 343.16 2,208.83 2584.77457 17.16% 17.16% -14.61%
(2217828, 2432769] 140.09 167.86 1,081.87 1296.336926 18.82% 18.82% -15.80%
blocks: 1934464, baseline: 3h13m1s, contender: 2h43m47s
bpsd (mean): 19.55%
tpsd (mean): 19.55%
Time (total): -29m13s, -15.14%
```
2024-06-09 14:32:20 +00:00
|
|
|
header : blockHeader(p, beaconRoot),
|
|
|
|
uncles : @[],
|
|
|
|
transactions: ethTxs p.transactions,
|
2024-09-11 07:02:50 +00:00
|
|
|
withdrawals : ethWithdrawals p.withdrawals,
|
|
|
|
requests : ethRequests(p),
|
2023-08-27 01:23:45 +00:00
|
|
|
)
|