mirror of
https://github.com/status-im/nimbus-eth1.git
synced 2025-01-09 20:06:52 +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%
```
119 lines
3.8 KiB
Nim
119 lines
3.8 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.
|
|
|
|
import
|
|
std/[json, os, sets, tables, strutils],
|
|
chronicles,
|
|
unittest2,
|
|
stew/byteutils,
|
|
results,
|
|
./test_helpers,
|
|
../nimbus/sync/protocol/snap/snap_types,
|
|
../nimbus/db/aristo/aristo_merge,
|
|
../nimbus/db/kvt/kvt_utils,
|
|
../nimbus/db/aristo,
|
|
../nimbus/[tracer, vm_types],
|
|
../nimbus/common/common
|
|
|
|
proc setErrorLevel {.used.} =
|
|
when defined(chronicles_runtime_filtering) and loggingEnabled:
|
|
setLogLevel(LogLevel.ERROR)
|
|
|
|
proc preLoadAristoDb(cdb: CoreDbRef; jKvp: JsonNode; num: BlockNumber) =
|
|
## Hack for `Aristo` pre-lading using the `snap` protocol proof-loader
|
|
var
|
|
proof: seq[SnapProof] # for pre-loading MPT
|
|
predRoot: Hash256 # from predecessor header
|
|
txRoot: Hash256 # header with block number `num`
|
|
rcptRoot: Hash256 # ditto
|
|
let
|
|
adb = cdb.ctx.getMpt(CtGeneric).backend.toAristo
|
|
kdb = cdb.newKvt.backend.toAristo
|
|
|
|
# Fill KVT and collect `proof` data
|
|
for (k,v) in jKvp.pairs:
|
|
let
|
|
key = hexToSeqByte(k)
|
|
val = hexToSeqByte(v.getStr())
|
|
if key.len == 32:
|
|
doAssert key == val.keccakHash.data
|
|
if val != @[0x80u8]: # Exclude empty item
|
|
proof.add SnapProof(val)
|
|
else:
|
|
if key[0] == 0:
|
|
try:
|
|
# Pull our particular header fields (if possible)
|
|
let header = rlp.decode(val, BlockHeader)
|
|
if header.blockNumber == num:
|
|
txRoot = header.txRoot
|
|
rcptRoot = header.receiptRoot
|
|
elif header.blockNumber == num-1:
|
|
predRoot = header.stateRoot
|
|
except RlpError:
|
|
discard
|
|
check kdb.put(key, val).isOk
|
|
|
|
# Install sub-trie roots onto production db
|
|
if txRoot.isValid:
|
|
doAssert adb.mergeProof(txRoot, VertexID(CtTxs)).isOk
|
|
if rcptRoot.isValid:
|
|
doAssert adb.mergeProof(rcptRoot, VertexID(CtReceipts)).isOk
|
|
doAssert adb.mergeProof(predRoot, VertexID(CtAccounts)).isOk
|
|
|
|
# Set up production MPT
|
|
doAssert adb.mergeProof(proof).isOk
|
|
|
|
# Remove locks so that hashify can re-assign changed nodes
|
|
adb.top.final.pPrf.clear
|
|
adb.top.final.fRpp.clear
|
|
|
|
|
|
# use tracerTestGen.nim to generate additional test data
|
|
proc testFixtureImpl(node: JsonNode, testStatusIMPL: var TestStatus, memoryDB: CoreDbRef) =
|
|
setErrorLevel()
|
|
|
|
var
|
|
blockNumber = UInt256.fromHex(node["blockNumber"].getStr())
|
|
com = CommonRef.new(memoryDB, chainConfigForNetwork(MainNet))
|
|
state = node["state"]
|
|
receipts = node["receipts"]
|
|
|
|
# disable POS/post Merge feature
|
|
com.setTTD none(DifficultyInt)
|
|
|
|
# Import raw data into database
|
|
# Some hack for `Aristo` using the `snap` protocol proof-loader
|
|
memoryDB.preLoadAristoDb(state, blockNumber)
|
|
|
|
var blk = com.db.getEthBlock(blockNumber)
|
|
|
|
let txTraces = traceTransactions(com, blk.header, blk.transactions)
|
|
let stateDump = dumpBlockState(com, blk)
|
|
let blockTrace = traceBlock(com, blk, {DisableState})
|
|
|
|
check node["txTraces"] == txTraces
|
|
check node["stateDump"] == stateDump
|
|
check node["blockTrace"] == blockTrace
|
|
for i in 0 ..< receipts.len:
|
|
let receipt = receipts[i]
|
|
let stateDiff = txTraces[i]["stateDiff"]
|
|
check receipt["root"].getStr().toLowerAscii() == stateDiff["afterRoot"].getStr().toLowerAscii()
|
|
|
|
|
|
proc testFixtureAristo(node: JsonNode, testStatusIMPL: var TestStatus) =
|
|
node.testFixtureImpl(testStatusIMPL, newCoreDbRef AristoDbMemory)
|
|
|
|
proc tracerJsonMain*() =
|
|
suite "tracer json tests for Aristo DB":
|
|
jsonTest("TracerTests", testFixtureAristo)
|
|
|
|
when isMainModule:
|
|
tracerJsonMain()
|