2024-05-19 03:08:05 +00:00
|
|
|
# Nimbus
|
|
|
|
# Copyright (c) 2024 Status Research & Development GmbH
|
|
|
|
# Licensed under either of
|
|
|
|
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0)
|
|
|
|
# * MIT license ([LICENSE-MIT](LICENSE-MIT) or
|
|
|
|
# http://opensource.org/licenses/MIT)
|
|
|
|
# at your option. This file may not be copied, modified, or distributed except
|
|
|
|
# according to those terms.
|
|
|
|
|
|
|
|
import
|
|
|
|
../../../nimbus/[
|
|
|
|
utils/utils,
|
|
|
|
common/common,
|
|
|
|
constants,
|
|
|
|
db/ledger,
|
|
|
|
transaction,
|
2024-06-17 07:56:39 +00:00
|
|
|
evm/state,
|
|
|
|
evm/types,
|
2024-05-19 03:08:05 +00:00
|
|
|
core/dao,
|
|
|
|
core/validate,
|
|
|
|
core/chain/chain_desc,
|
|
|
|
core/executor/calculate_reward,
|
|
|
|
core/executor/process_transaction,
|
|
|
|
core/executor/process_block
|
|
|
|
],
|
|
|
|
chronicles,
|
|
|
|
results
|
|
|
|
|
|
|
|
{.push raises: [].}
|
|
|
|
|
|
|
|
proc processBlock(
|
|
|
|
vmState: BaseVMState; ## Parent environment of header/body block
|
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
|
|
|
blk: EthBlock; ## Header/body block to add to the blockchain
|
2024-06-11 15:50:22 +00:00
|
|
|
): Result[void, string] =
|
2024-05-19 03:08:05 +00:00
|
|
|
## Generalised function to processes `(header,body)` pair for any network,
|
|
|
|
## regardless of PoA or not.
|
|
|
|
##
|
|
|
|
## Rather than calculating the PoA state change here, it is done with the
|
|
|
|
## verification in the `chain/persist_blocks.persistBlocks()` method. So
|
|
|
|
## the `poa` descriptor is currently unused and only provided for later
|
|
|
|
## implementations (but can be savely removed, as well.)
|
|
|
|
## variant of `processBlock()` where the `header` argument is explicitely set.
|
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
|
|
|
template header: BlockHeader = blk.header
|
2024-07-10 12:19:35 +00:00
|
|
|
var dbTx = vmState.com.db.ctx.newTransaction()
|
2024-05-19 03:08:05 +00:00
|
|
|
defer: dbTx.dispose()
|
|
|
|
|
2024-07-04 13:48:36 +00:00
|
|
|
let com = vmState.com
|
|
|
|
if com.daoForkSupport and
|
|
|
|
com.daoForkBlock.get == header.number:
|
2024-05-19 03:08:05 +00:00
|
|
|
vmState.mutateStateDB:
|
|
|
|
db.applyDAOHardFork()
|
|
|
|
|
|
|
|
if header.parentBeaconBlockRoot.isSome:
|
2024-06-11 15:50:22 +00:00
|
|
|
? vmState.processBeaconBlockRoot(header.parentBeaconBlockRoot.get)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
? processTransactions(vmState, header, blk.transactions)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-07-04 13:48:36 +00:00
|
|
|
if com.isShanghaiOrLater(header.timestamp):
|
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
|
|
|
for withdrawal in blk.withdrawals.get:
|
2024-05-19 03:08:05 +00:00
|
|
|
vmState.stateDB.addBalance(withdrawal.address, withdrawal.weiAmount)
|
|
|
|
|
|
|
|
if header.ommersHash != EMPTY_UNCLE_HASH:
|
2024-07-04 13:48:36 +00:00
|
|
|
discard com.db.persistUncles(blk.uncles)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
|
|
|
# EIP-3675: no reward for miner in POA/POS
|
2024-07-04 13:48:36 +00:00
|
|
|
if com.consensus == ConsensusType.POW:
|
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
|
|
|
vmState.calculateReward(header, blk.uncles)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
|
|
|
vmState.mutateStateDB:
|
2024-07-04 13:48:36 +00:00
|
|
|
let clearEmptyAccount = com.isSpuriousOrLater(header.number)
|
2024-06-02 19:21:29 +00:00
|
|
|
db.persist(clearEmptyAccount)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-06-05 20:52:04 +00:00
|
|
|
dbTx.commit()
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
ok()
|
2024-05-19 03:08:05 +00:00
|
|
|
|
|
|
|
proc getVmState(c: ChainRef, header: BlockHeader):
|
2024-05-31 07:13:56 +00:00
|
|
|
Result[BaseVMState, void] =
|
2024-05-19 03:08:05 +00:00
|
|
|
if c.vmState.isNil.not:
|
|
|
|
return ok(c.vmState)
|
|
|
|
|
|
|
|
let vmState = BaseVMState()
|
2024-08-16 06:22:51 +00:00
|
|
|
if not vmState.init(header, c.com, storeSlotHash = storeSlotHash):
|
2024-05-19 03:08:05 +00:00
|
|
|
debug "Cannot initialise VmState",
|
2024-06-14 07:31:08 +00:00
|
|
|
number = header.number
|
2024-05-19 03:08:05 +00:00
|
|
|
return err()
|
2024-05-31 07:13:56 +00:00
|
|
|
|
2024-05-19 03:08:05 +00:00
|
|
|
return ok(vmState)
|
|
|
|
|
|
|
|
# A stripped down version of persistBlocks without validation
|
|
|
|
# intended to accepts invalid block
|
2024-06-11 15:50:22 +00:00
|
|
|
proc setBlock*(c: ChainRef; blk: EthBlock): Result[void, string] =
|
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
|
|
|
template header: BlockHeader = blk.header
|
2024-07-10 12:19:35 +00:00
|
|
|
let dbTx = c.db.ctx.newTransaction()
|
2024-05-19 03:08:05 +00:00
|
|
|
defer: dbTx.dispose()
|
|
|
|
|
|
|
|
c.com.hardForkTransition(header)
|
|
|
|
|
|
|
|
# Needed for figuring out whether KVT cleanup is due (see at the end)
|
|
|
|
let
|
|
|
|
vmState = c.getVmState(header).valueOr:
|
2024-06-11 15:50:22 +00:00
|
|
|
return err("no vmstate")
|
2024-05-19 03:08:05 +00:00
|
|
|
stateRootChpt = vmState.parent.stateRoot # Check point
|
2024-06-11 15:50:22 +00:00
|
|
|
? vmState.processBlock(blk)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-06-14 05:10:00 +00:00
|
|
|
if not c.db.persistHeader(
|
|
|
|
header, c.com.consensus == ConsensusType.POS, c.com.startOfHistory):
|
|
|
|
return err("Could not persist header")
|
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
try:
|
2024-06-29 05:43:17 +00:00
|
|
|
c.db.persistTransactions(header.number, header.txRoot, blk.transactions)
|
|
|
|
c.db.persistReceipts(header.receiptsRoot, vmState.receipts)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
if blk.withdrawals.isSome:
|
2024-06-29 05:43:17 +00:00
|
|
|
c.db.persistWithdrawals(header.withdrawalsRoot, blk.withdrawals.get)
|
2024-06-11 15:50:22 +00:00
|
|
|
except CatchableError as exc:
|
|
|
|
return err(exc.msg)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
|
|
|
# update currentBlock *after* we persist it
|
|
|
|
# so the rpc return consistent result
|
|
|
|
# between eth_blockNumber and eth_syncing
|
2024-06-14 07:31:08 +00:00
|
|
|
c.com.syncCurrent = header.number
|
2024-05-19 03:08:05 +00:00
|
|
|
|
|
|
|
dbTx.commit()
|
|
|
|
|
|
|
|
# The `c.db.persistent()` call is ignored by the legacy DB which
|
|
|
|
# automatically saves persistently when reaching the zero level transaction.
|
|
|
|
#
|
|
|
|
# For the `Aristo` database, this code position is only reached if the
|
|
|
|
# the parent state of the first block (as registered in `headers[0]`) was
|
|
|
|
# the canonical state before updating. So this state will be saved with
|
|
|
|
# `persistent()` together with the respective block number.
|
2024-06-14 07:31:08 +00:00
|
|
|
c.db.persistent(header.number - 1)
|
2024-05-19 03:08:05 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
ok()
|
2024-05-19 03:08:05 +00:00
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# End
|
|
|
|
# ------------------------------------------------------------------------------
|