2021-07-14 15:13:27 +00:00
|
|
|
# Nimbus
|
2024-02-13 09:49:41 +00:00
|
|
|
# Copyright (c) 2018-2024 Status Research & Development GmbH
|
2021-07-14 15:13:27 +00:00
|
|
|
# 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.
|
|
|
|
|
2023-02-14 20:27:17 +00:00
|
|
|
{.push raises: [].}
|
|
|
|
|
2021-07-14 15:13:27 +00:00
|
|
|
import
|
2024-05-31 07:13:56 +00:00
|
|
|
results,
|
2023-12-12 19:12:56 +00:00
|
|
|
../../db/ledger,
|
2021-07-14 15:13:27 +00:00
|
|
|
../../vm_state,
|
2022-01-18 16:19:32 +00:00
|
|
|
../../vm_types,
|
2021-07-14 15:13:27 +00:00
|
|
|
../executor,
|
|
|
|
../validate,
|
|
|
|
./chain_desc,
|
|
|
|
chronicles,
|
|
|
|
stint
|
|
|
|
|
|
|
|
when not defined(release):
|
2021-07-30 14:06:51 +00:00
|
|
|
import
|
2024-06-05 20:52:04 +00:00
|
|
|
#../../tracer,
|
2022-12-06 17:35:56 +00:00
|
|
|
../../utils/utils
|
2021-07-14 15:13:27 +00:00
|
|
|
|
2024-05-31 07:13:56 +00:00
|
|
|
export results
|
|
|
|
|
2022-07-04 12:31:41 +00:00
|
|
|
type
|
2024-06-15 09:22:37 +00:00
|
|
|
PersistBlockFlag* = enum
|
|
|
|
NoFullValidation # Validate the batch instead of validating each block in it
|
2022-07-04 12:31:41 +00:00
|
|
|
NoPersistHeader
|
2024-06-15 09:22:37 +00:00
|
|
|
NoPersistTransactions
|
|
|
|
NoPersistUncles
|
|
|
|
NoPersistWithdrawals
|
|
|
|
NoPersistReceipts
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
PersistBlockFlags* = set[PersistBlockFlag]
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
PersistStats = tuple[blocks: int, txs: int, gas: GasInt]
|
2024-05-31 07:13:56 +00:00
|
|
|
|
2024-06-14 07:31:08 +00:00
|
|
|
const
|
2024-06-15 09:22:37 +00:00
|
|
|
NoPersistBodies* = {NoPersistTransactions, NoPersistUncles, NoPersistWithdrawals}
|
|
|
|
|
2024-06-14 07:31:08 +00:00
|
|
|
CleanUpEpoch = 30_000.BlockNumber
|
|
|
|
## 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.
|
2024-04-26 13:43:52 +00:00
|
|
|
|
2021-07-14 15:13:27 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Private
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
proc getVmState(c: ChainRef, header: BlockHeader): Result[BaseVMState, string] =
|
2024-06-13 09:19:07 +00:00
|
|
|
if not c.vmState.isNil:
|
|
|
|
return ok(c.vmState)
|
|
|
|
|
2023-10-05 03:04:12 +00:00
|
|
|
let vmState = BaseVMState()
|
2024-06-07 08:24:32 +00:00
|
|
|
if not vmState.init(header, c.com):
|
|
|
|
return err("Could not initialise VMState")
|
2024-05-31 07:13:56 +00:00
|
|
|
ok(vmState)
|
2024-05-22 21:01:19 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
proc purgeOlderBlocksFromHistory(db: CoreDbRef, bn: BlockNumber) =
|
2024-04-26 13:43:52 +00:00
|
|
|
## Remove non-reachable blocks from KVT database
|
2024-05-31 17:32:22 +00:00
|
|
|
if 0 < bn:
|
|
|
|
var blkNum = bn - 1
|
2024-04-26 13:43:52 +00:00
|
|
|
while 0 < blkNum:
|
2024-06-11 15:50:22 +00:00
|
|
|
try:
|
|
|
|
if not db.forgetHistory blkNum:
|
|
|
|
break
|
|
|
|
except RlpError as exc:
|
|
|
|
warn "Error forgetting history", err = exc.msg
|
2024-04-26 13:43:52 +00:00
|
|
|
blkNum = blkNum - 1
|
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
proc persistBlocksImpl(
|
|
|
|
c: ChainRef, blocks: openArray[EthBlock], flags: PersistBlockFlags = {}
|
|
|
|
): Result[PersistStats, string] =
|
2024-06-05 20:52:04 +00:00
|
|
|
let dbTx = c.db.newTransaction()
|
2024-06-11 15:50:22 +00:00
|
|
|
defer:
|
|
|
|
dbTx.dispose()
|
2021-07-14 15:13:27 +00:00
|
|
|
|
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
|
|
|
c.com.hardForkTransition(blocks[0].header)
|
2022-12-02 04:35:41 +00:00
|
|
|
|
2022-01-18 16:19:32 +00:00
|
|
|
# Note that `0 < headers.len`, assured when called from `persistBlocks()`
|
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
|
|
|
let
|
2024-06-14 13:56:56 +00:00
|
|
|
vmState = ?c.getVmState(blocks[0].header)
|
2024-06-14 07:31:08 +00:00
|
|
|
fromBlock = blocks[0].header.number
|
|
|
|
toBlock = blocks[blocks.high()].header.number
|
2024-04-26 13:43:52 +00:00
|
|
|
trace "Persisting blocks", fromBlock, toBlock
|
2024-05-22 21:01:19 +00:00
|
|
|
|
2024-06-14 05:10:00 +00:00
|
|
|
var
|
2024-06-14 13:56:56 +00:00
|
|
|
blks = 0
|
2024-06-14 05:10:00 +00:00
|
|
|
txs = 0
|
|
|
|
gas = GasInt(0)
|
2024-06-14 13:56:56 +00:00
|
|
|
parentHash: Hash256 # only needed after the first 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
|
|
|
for blk in blocks:
|
2024-06-11 15:50:22 +00:00
|
|
|
template header(): BlockHeader =
|
|
|
|
blk.header
|
2022-01-18 16:19:32 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
# Full validation means validating the state root at every block and
|
|
|
|
# performing the more expensive hash computations on the block itself, ie
|
|
|
|
# verifying that the transaction and receipts roots are valid - when not
|
|
|
|
# doing full validation, we skip these expensive checks relying instead
|
|
|
|
# on the source of the data to have performed them previously or because
|
|
|
|
# the cost of failure is low.
|
|
|
|
# TODO Figure out the right balance for header fields - in particular, if
|
|
|
|
# we receive instruction from the CL while syncing that a block is
|
|
|
|
# CL-valid, do we skip validation while "far from head"? probably yes.
|
|
|
|
# This requires performing a header-chain validation from that CL-valid
|
|
|
|
# block which the current code doesn't express.
|
|
|
|
# Also, the potential avenues for corruption should be described with
|
|
|
|
# more rigor, ie if the txroot doesn't match but everything else does,
|
|
|
|
# can the state root of the last block still be correct? Dubious, but
|
|
|
|
# what would be the consequences? We would roll back the full set of
|
|
|
|
# blocks which is fairly low-cost.
|
|
|
|
let skipValidation = NoFullValidation in flags and header.number != toBlock
|
|
|
|
|
2022-12-05 08:46:37 +00:00
|
|
|
c.com.hardForkTransition(header)
|
2022-12-02 04:35:41 +00:00
|
|
|
|
2024-06-14 13:56:56 +00:00
|
|
|
if blks > 0:
|
2024-06-15 09:22:37 +00:00
|
|
|
template parent(): BlockHeader =
|
|
|
|
blocks[blks - 1].header
|
|
|
|
|
2024-06-14 13:56:56 +00:00
|
|
|
let updated =
|
|
|
|
if header.number == parent.number + 1 and header.parentHash == parentHash:
|
|
|
|
vmState.reinit(parent = parent, header = header, linear = true)
|
|
|
|
else:
|
|
|
|
# TODO remove this code path and process only linear histories in this
|
|
|
|
# function
|
|
|
|
vmState.reinit(header = header)
|
|
|
|
|
|
|
|
if not updated:
|
|
|
|
debug "Cannot update VmState", blockNumber = header.number
|
|
|
|
return err("Cannot update VmState to block " & $header.number)
|
|
|
|
else:
|
|
|
|
# TODO weirdly, some tests depend on this reinit being called, even though
|
|
|
|
# in theory it's a fresh instance that should not need it (?)
|
|
|
|
doAssert vmState.reinit(header = header)
|
2022-01-18 16:19:32 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
# TODO even if we're skipping validation, we should perform basic sanity
|
|
|
|
# checks on the block and header - that fields are sanely set for the
|
|
|
|
# given hard fork and similar path-independent checks - these same
|
|
|
|
# sanity checks should be performed early in the processing pipeline no
|
|
|
|
# matter their provenance.
|
|
|
|
if not skipValidation and c.extraValidation and c.verifyFrom <= header.number:
|
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
|
|
|
# TODO: how to checkseal from here
|
2024-06-15 09:22:37 +00:00
|
|
|
?c.com.validateHeaderAndKinship(blk, vmState.parent, checkSealOK = false)
|
|
|
|
|
|
|
|
# Generate receipts for storage or validation but skip them otherwise
|
|
|
|
?vmState.processBlock(
|
|
|
|
blk,
|
|
|
|
skipValidation,
|
|
|
|
skipReceipts = skipValidation and NoPersistReceipts in flags,
|
|
|
|
skipUncles = NoPersistUncles in flags,
|
|
|
|
)
|
2024-06-01 12:34:28 +00:00
|
|
|
|
2024-06-05 20:52:04 +00:00
|
|
|
# when defined(nimbusDumpDebuggingMetaData):
|
|
|
|
# if validationResult == ValidationResult.Error and
|
|
|
|
# body.transactions.calcTxRoot == header.txRoot:
|
|
|
|
# vmState.dumpDebuggingMetaData(header, body)
|
|
|
|
# warn "Validation error. Debugging metadata dumped."
|
2024-06-15 09:22:37 +00:00
|
|
|
|
2024-06-14 13:56:56 +00:00
|
|
|
let blockHash = header.blockHash()
|
2024-06-14 05:10:00 +00:00
|
|
|
if NoPersistHeader notin flags:
|
|
|
|
if not c.db.persistHeader(
|
2024-06-15 09:22:37 +00:00
|
|
|
blockHash, header, c.com.consensus == ConsensusType.POS, c.com.startOfHistory
|
2024-06-14 05:10:00 +00:00
|
|
|
):
|
|
|
|
return err("Could not persist header")
|
2022-03-11 08:13:59 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
if NoPersistTransactions notin flags:
|
2024-06-14 07:31:08 +00:00
|
|
|
c.db.persistTransactions(header.number, blk.transactions)
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
if NoPersistReceipts notin flags:
|
2024-06-14 05:10:00 +00:00
|
|
|
c.db.persistReceipts(vmState.receipts)
|
2021-07-14 15:13:27 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
if NoPersistWithdrawals notin flags and blk.withdrawals.isSome:
|
2024-06-14 05:10:00 +00:00
|
|
|
c.db.persistWithdrawals(blk.withdrawals.get)
|
2023-05-23 05:25:42 +00:00
|
|
|
|
2021-07-14 15:13:27 +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
|
2022-03-11 08:13:59 +00:00
|
|
|
|
2024-06-14 13:56:56 +00:00
|
|
|
blks += 1
|
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
|
|
|
txs += blk.transactions.len
|
2024-06-14 05:10:00 +00:00
|
|
|
gas += blk.header.gasUsed
|
2024-06-14 13:56:56 +00:00
|
|
|
parentHash = blockHash
|
2023-10-05 03:04:12 +00:00
|
|
|
dbTx.commit()
|
2021-07-14 15:13:27 +00:00
|
|
|
|
2024-05-31 09:43:31 +00:00
|
|
|
# Save and record the block number before the last saved block state.
|
2024-06-13 18:15:11 +00:00
|
|
|
c.db.persistent(toBlock).isOkOr:
|
|
|
|
return err("Failed to save state: " & $$error)
|
2024-04-26 13:43:52 +00:00
|
|
|
|
2024-05-22 21:01:19 +00:00
|
|
|
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.
|
2024-05-31 17:32:22 +00:00
|
|
|
let n = fromBlock div CleanUpEpoch
|
|
|
|
if 0 < n and n < (toBlock div CleanUpEpoch):
|
|
|
|
# Starts at around `2 * CleanUpEpoch`
|
2024-06-11 15:50:22 +00:00
|
|
|
try:
|
|
|
|
c.db.purgeOlderBlocksFromHistory(fromBlock - CleanUpEpoch)
|
|
|
|
except CatchableError as exc:
|
|
|
|
warn "Could not clean up old blocks from history", err = exc.msg
|
2024-04-26 13:43:52 +00:00
|
|
|
|
2024-06-14 13:56:56 +00:00
|
|
|
ok((blks, txs, gas))
|
2024-04-19 18:37:27 +00:00
|
|
|
|
2022-03-11 08:13:59 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# Public `ChainDB` methods
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
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
|
|
|
proc insertBlockWithoutSetHead*(c: ChainRef, blk: EthBlock): Result[void, string] =
|
2024-06-15 09:22:37 +00:00
|
|
|
discard ?c.persistBlocksImpl([blk], {NoPersistHeader, NoPersistReceipts})
|
2024-05-31 07:13:56 +00:00
|
|
|
|
2024-06-14 05:10:00 +00:00
|
|
|
if not c.db.persistHeader(blk.header.blockHash, blk.header, c.com.startOfHistory):
|
|
|
|
return err("Could not persist header")
|
|
|
|
|
|
|
|
ok()
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-05-31 07:13:56 +00:00
|
|
|
proc setCanonical*(c: ChainRef, header: BlockHeader): Result[void, string] =
|
2024-06-11 15:50:22 +00:00
|
|
|
if header.parentHash == Hash256():
|
|
|
|
try:
|
|
|
|
if not c.db.setHead(header.blockHash):
|
|
|
|
return err("setHead failed")
|
|
|
|
except RlpError as exc:
|
|
|
|
# TODO fix exception+bool error return
|
|
|
|
return err(exc.msg)
|
|
|
|
return ok()
|
|
|
|
|
|
|
|
var body: BlockBody
|
2024-05-31 07:13:56 +00:00
|
|
|
try:
|
|
|
|
if not c.db.getBlockBody(header, body):
|
2024-06-11 15:50:22 +00:00
|
|
|
debug "Failed to get BlockBody", hash = header.blockHash
|
2024-05-31 07:13:56 +00:00
|
|
|
return err("Could not get block body")
|
2024-06-11 15:50:22 +00:00
|
|
|
except RlpError as exc:
|
|
|
|
return err(exc.msg)
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
discard
|
|
|
|
?c.persistBlocksImpl(
|
2024-06-15 09:22:37 +00:00
|
|
|
[EthBlock.init(header, move(body))], {NoPersistHeader, NoPersistTransactions}
|
2024-06-11 15:50:22 +00:00
|
|
|
)
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-06-11 15:50:22 +00:00
|
|
|
try:
|
2023-02-14 20:27:17 +00:00
|
|
|
discard c.db.setHead(header.blockHash)
|
2024-06-11 15:50:22 +00:00
|
|
|
except RlpError as exc:
|
|
|
|
return err(exc.msg)
|
|
|
|
ok()
|
2022-07-04 12:31:41 +00:00
|
|
|
|
2024-05-31 07:13:56 +00:00
|
|
|
proc setCanonical*(c: ChainRef, blockHash: Hash256): Result[void, string] =
|
2022-07-04 12:31:41 +00:00
|
|
|
var header: BlockHeader
|
|
|
|
if not c.db.getBlockHeader(blockHash, header):
|
2024-06-11 15:50:22 +00:00
|
|
|
debug "Failed to get BlockHeader", hash = blockHash
|
2024-05-31 07:13:56 +00:00
|
|
|
return err("Could not get block header")
|
2022-07-04 12:31:41 +00:00
|
|
|
|
|
|
|
setCanonical(c, header)
|
2022-03-11 08:13:59 +00:00
|
|
|
|
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
|
|
|
proc persistBlocks*(
|
2024-06-15 09:22:37 +00:00
|
|
|
c: ChainRef, blocks: openArray[EthBlock], flags: PersistBlockFlags = {}
|
2024-06-11 15:50:22 +00:00
|
|
|
): Result[PersistStats, string] =
|
2021-07-14 15:13:27 +00:00
|
|
|
# Run the VM here
|
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
|
|
|
if blocks.len == 0:
|
2021-07-14 15:13:27 +00:00
|
|
|
debug "Nothing to do"
|
2024-05-31 07:13:56 +00:00
|
|
|
return ok(default(PersistStats)) # TODO not nice to return nil
|
2021-07-14 15:13:27 +00:00
|
|
|
|
2024-06-15 09:22:37 +00:00
|
|
|
c.persistBlocksImpl(blocks, flags)
|
2021-07-14 15:13:27 +00:00
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# End
|
|
|
|
# ------------------------------------------------------------------------------
|