mirror of
https://github.com/status-im/nimbus-eth1.git
synced 2025-02-04 00:05:22 +00:00
0b32078c4b
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% ```
221 lines
6.7 KiB
Nim
221 lines
6.7 KiB
Nim
# Nimbus
|
|
# Copyright (c) 2018-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.
|
|
|
|
{.push raises: [].}
|
|
|
|
import
|
|
results,
|
|
../../db/ledger,
|
|
../../vm_state,
|
|
../../vm_types,
|
|
../executor,
|
|
../validate,
|
|
./chain_desc,
|
|
chronicles,
|
|
stint
|
|
|
|
when not defined(release):
|
|
import
|
|
#../../tracer,
|
|
../../utils/utils
|
|
|
|
export results
|
|
|
|
type
|
|
PersistBlockFlag = enum
|
|
NoPersistHeader
|
|
NoSaveTxs
|
|
NoSaveReceipts
|
|
NoSaveWithdrawals
|
|
|
|
PersistBlockFlags = set[PersistBlockFlag]
|
|
|
|
PersistStats = tuple
|
|
blocks: int
|
|
txs: int
|
|
gas: GasInt
|
|
|
|
const
|
|
CleanUpEpoch = 30_000.toBlockNumber
|
|
## Regular checks for history clean up (applies to single state DB). This
|
|
## is mainly a debugging/testing feature so that the database can be held
|
|
## a bit smaller. It is not applicable to a full node.
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Private
|
|
# ------------------------------------------------------------------------------
|
|
|
|
proc getVmState(c: ChainRef, header: BlockHeader):
|
|
Result[BaseVMState, string] =
|
|
let vmState = BaseVMState()
|
|
if not vmState.init(header, c.com):
|
|
return err("Could not initialise VMState")
|
|
ok(vmState)
|
|
|
|
proc purgeOlderBlocksFromHistory(
|
|
db: CoreDbRef;
|
|
bn: BlockNumber;
|
|
) {.inline, raises: [RlpError].} =
|
|
## Remove non-reachable blocks from KVT database
|
|
if 0 < bn:
|
|
var blkNum = bn - 1
|
|
while 0 < blkNum:
|
|
if not db.forgetHistory blkNum:
|
|
break
|
|
blkNum = blkNum - 1
|
|
|
|
proc persistBlocksImpl(c: ChainRef; blocks: openArray[EthBlock];
|
|
flags: PersistBlockFlags = {}): Result[PersistStats, string]
|
|
{.raises: [CatchableError] .} =
|
|
let dbTx = c.db.newTransaction()
|
|
defer: dbTx.dispose()
|
|
|
|
c.com.hardForkTransition(blocks[0].header)
|
|
|
|
# Note that `0 < headers.len`, assured when called from `persistBlocks()`
|
|
let vmState = ?c.getVmState(blocks[0].header)
|
|
|
|
let
|
|
fromBlock = blocks[0].header.blockNumber
|
|
toBlock = blocks[blocks.high()].header.blockNumber
|
|
trace "Persisting blocks", fromBlock, toBlock
|
|
|
|
var txs = 0
|
|
for blk in blocks:
|
|
template header: BlockHeader = blk.header
|
|
|
|
# # This transaction keeps the current state open for inspection
|
|
# # if an error occurs (as needed for `Aristo`.).
|
|
# let lapTx = c.db.newTransaction()
|
|
# defer: lapTx.dispose()
|
|
|
|
c.com.hardForkTransition(header)
|
|
|
|
if not vmState.reinit(header):
|
|
debug "Cannot update VmState", blockNumber = header.blockNumber
|
|
return err("Cannot update VmState to block " & $header.blockNumber)
|
|
|
|
if c.validateBlock and c.extraValidation and
|
|
c.verifyFrom <= header.blockNumber:
|
|
|
|
# TODO: how to checkseal from here
|
|
? c.com.validateHeaderAndKinship(blk, checkSealOK = false)
|
|
|
|
let
|
|
validationResult = if c.validateBlock:
|
|
vmState.processBlock(blk)
|
|
else:
|
|
ValidationResult.OK
|
|
|
|
# when defined(nimbusDumpDebuggingMetaData):
|
|
# if validationResult == ValidationResult.Error and
|
|
# body.transactions.calcTxRoot == header.txRoot:
|
|
# vmState.dumpDebuggingMetaData(header, body)
|
|
# warn "Validation error. Debugging metadata dumped."
|
|
|
|
if validationResult != ValidationResult.OK:
|
|
return err("Failed to validate block")
|
|
|
|
if NoPersistHeader notin flags:
|
|
c.db.persistHeaderToDb(
|
|
header, c.com.consensus == ConsensusType.POS, c.com.startOfHistory)
|
|
|
|
if NoSaveTxs notin flags:
|
|
discard c.db.persistTransactions(header.blockNumber, blk.transactions)
|
|
|
|
if NoSaveReceipts notin flags:
|
|
discard c.db.persistReceipts(vmState.receipts)
|
|
|
|
if NoSaveWithdrawals notin flags and blk.withdrawals.isSome:
|
|
discard c.db.persistWithdrawals(blk.withdrawals.get)
|
|
|
|
# update currentBlock *after* we persist it
|
|
# so the rpc return consistent result
|
|
# between eth_blockNumber and eth_syncing
|
|
c.com.syncCurrent = header.blockNumber
|
|
|
|
# Done with this block
|
|
# lapTx.commit()
|
|
|
|
txs += blk.transactions.len
|
|
|
|
dbTx.commit()
|
|
|
|
# Save and record the block number before the last saved block state.
|
|
c.db.persistent(toBlock)
|
|
|
|
if c.com.pruneHistory:
|
|
# There is a feature for test systems to regularly clean up older blocks
|
|
# from the database, not appicable to a full node set up.
|
|
let n = fromBlock div CleanUpEpoch
|
|
if 0 < n and n < (toBlock div CleanUpEpoch):
|
|
# Starts at around `2 * CleanUpEpoch`
|
|
c.db.purgeOlderBlocksFromHistory(fromBlock - CleanUpEpoch)
|
|
|
|
ok((blocks.len, txs, vmState.cumulativeGasUsed))
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# Public `ChainDB` methods
|
|
# ------------------------------------------------------------------------------
|
|
|
|
proc insertBlockWithoutSetHead*(c: ChainRef, blk: EthBlock): Result[void, string] =
|
|
try:
|
|
discard ? c.persistBlocksImpl(
|
|
[blk], {NoPersistHeader, NoSaveReceipts})
|
|
|
|
c.db.persistHeaderToDbWithoutSetHead(blk.header, c.com.startOfHistory)
|
|
ok()
|
|
except CatchableError as exc:
|
|
err(exc.msg)
|
|
|
|
proc setCanonical*(c: ChainRef, header: BlockHeader): Result[void, string] =
|
|
try:
|
|
if header.parentHash == Hash256():
|
|
discard c.db.setHead(header.blockHash)
|
|
return ok()
|
|
|
|
var body: BlockBody
|
|
if not c.db.getBlockBody(header, body):
|
|
debug "Failed to get BlockBody",
|
|
hash = header.blockHash
|
|
return err("Could not get block body")
|
|
|
|
discard ? c.persistBlocksImpl([EthBlock.init(header, move(body))], {NoPersistHeader, NoSaveTxs})
|
|
|
|
discard c.db.setHead(header.blockHash)
|
|
ok()
|
|
except CatchableError as exc:
|
|
err(exc.msg)
|
|
|
|
proc setCanonical*(c: ChainRef, blockHash: Hash256): Result[void, string] =
|
|
var header: BlockHeader
|
|
if not c.db.getBlockHeader(blockHash, header):
|
|
debug "Failed to get BlockHeader",
|
|
hash = blockHash
|
|
return err("Could not get block header")
|
|
|
|
setCanonical(c, header)
|
|
|
|
proc persistBlocks*(
|
|
c: ChainRef; blocks: openArray[EthBlock]): Result[PersistStats, string] =
|
|
# Run the VM here
|
|
if blocks.len == 0:
|
|
debug "Nothing to do"
|
|
return ok(default(PersistStats)) # TODO not nice to return nil
|
|
|
|
try:
|
|
c.persistBlocksImpl(blocks)
|
|
except CatchableError as exc:
|
|
err(exc.msg)
|
|
|
|
# ------------------------------------------------------------------------------
|
|
# End
|
|
# ------------------------------------------------------------------------------
|