2018-12-12 15:18:46 +00:00
|
|
|
# Nimbus
|
2024-04-03 15:48:35 +00:00
|
|
|
# Copyright (c) 2018-2024 Status Research & Development GmbH
|
2018-12-12 15:18:46 +00:00
|
|
|
# Licensed under either of
|
2024-04-03 15:48:35 +00:00
|
|
|
# * 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.
|
2018-12-12 15:18:46 +00:00
|
|
|
|
|
|
|
import
|
2024-08-01 10:41:20 +00:00
|
|
|
std/[json, os, tables, strutils],
|
2024-06-14 07:31:08 +00:00
|
|
|
stew/byteutils,
|
2024-04-03 15:48:35 +00:00
|
|
|
chronicles,
|
2022-12-02 04:39:12 +00:00
|
|
|
unittest2,
|
2024-04-03 15:48:35 +00:00
|
|
|
results,
|
2022-12-02 04:39:12 +00:00
|
|
|
./test_helpers,
|
2024-04-03 15:48:35 +00:00
|
|
|
../nimbus/db/aristo,
|
2024-08-01 10:41:20 +00:00
|
|
|
../nimbus/db/aristo/[aristo_desc, aristo_layers, aristo_nearby, aristo_part],
|
|
|
|
../nimbus/db/aristo/aristo_part/part_debug,
|
|
|
|
../nimbus/db/kvt/kvt_utils,
|
2024-06-17 07:56:39 +00:00
|
|
|
../nimbus/[tracer, evm/types],
|
2022-12-02 04:39:12 +00:00
|
|
|
../nimbus/common/common
|
2018-12-12 15:18:46 +00:00
|
|
|
|
2024-04-03 15:48:35 +00:00
|
|
|
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
|
2024-08-01 10:41:20 +00:00
|
|
|
const
|
|
|
|
info = "preLoadAristoDb"
|
2024-04-03 15:48:35 +00:00
|
|
|
var
|
2024-10-01 21:03:10 +00:00
|
|
|
proof: seq[seq[byte]] # for pre-loading MPT
|
|
|
|
predRoot: Hash32 # from predecessor header
|
|
|
|
txRoot: Hash32 # header with block number `num`
|
|
|
|
rcptRoot: Hash32 # ditto
|
2024-04-03 15:48:35 +00:00
|
|
|
let
|
2024-08-01 10:41:20 +00:00
|
|
|
adb = cdb.ctx.mpt # `Aristo` db
|
|
|
|
kdb = cdb.ctx.kvt # `Kvt` db
|
|
|
|
ps = PartStateRef.init adb # Partial DB descriptor
|
2024-04-03 15:48:35 +00:00
|
|
|
|
|
|
|
# Fill KVT and collect `proof` data
|
|
|
|
for (k,v) in jKvp.pairs:
|
|
|
|
let
|
|
|
|
key = hexToSeqByte(k)
|
|
|
|
val = hexToSeqByte(v.getStr())
|
|
|
|
if key.len == 32:
|
2024-10-16 01:34:12 +00:00
|
|
|
doAssert key == val.keccak256.data
|
2024-04-03 15:48:35 +00:00
|
|
|
if val != @[0x80u8]: # Exclude empty item
|
2024-08-01 10:41:20 +00:00
|
|
|
proof.add val
|
2024-04-03 15:48:35 +00:00
|
|
|
else:
|
|
|
|
if key[0] == 0:
|
|
|
|
try:
|
|
|
|
# Pull our particular header fields (if possible)
|
2024-10-01 21:03:10 +00:00
|
|
|
let header = rlp.decode(val, Header)
|
2024-06-14 07:31:08 +00:00
|
|
|
if header.number == num:
|
2024-04-03 15:48:35 +00:00
|
|
|
txRoot = header.txRoot
|
2024-06-14 07:31:08 +00:00
|
|
|
rcptRoot = header.receiptsRoot
|
|
|
|
elif header.number == num-1:
|
2024-04-03 15:48:35 +00:00
|
|
|
predRoot = header.stateRoot
|
|
|
|
except RlpError:
|
|
|
|
discard
|
|
|
|
check kdb.put(key, val).isOk
|
|
|
|
|
2024-08-01 10:41:20 +00:00
|
|
|
# Set up production MPT
|
|
|
|
ps.partPut(proof, AutomaticPayload).isOkOr:
|
|
|
|
raiseAssert info & ": partPut => " & $error
|
2024-07-10 12:19:35 +00:00
|
|
|
|
2024-11-02 09:29:16 +00:00
|
|
|
# TODO code needs updating after removal of generic payloads
|
|
|
|
# # Handle transaction sub-tree
|
|
|
|
# if txRoot.isValid:
|
|
|
|
# var txs: seq[Transaction]
|
|
|
|
# for (key,pyl) in adb.rightPairs LeafTie(root: ps.partGetSubTree txRoot):
|
|
|
|
# let
|
|
|
|
# inx = key.path.to(UInt256).truncate(uint)
|
|
|
|
# tx = rlp.decode(pyl.rawBlob, Transaction)
|
|
|
|
# #
|
|
|
|
# # FIXME: Is this might be a bug in the test data?
|
|
|
|
# #
|
|
|
|
# # The single item test key is always `128`. For non-single test
|
|
|
|
# # lists, the keys are `1`,`2`, ..,`N`, `128` (some single digit
|
|
|
|
# # number `N`.)
|
|
|
|
# #
|
|
|
|
# # Unless the `128` item value is put at the start of the argument
|
|
|
|
# # list `txs[]` for `persistTransactions()`, the `tracer` module
|
|
|
|
# # will throw an exception at
|
|
|
|
# # `doAssert(transactions.calcTxRoot == header.txRoot)` in the
|
|
|
|
# # function `traceTransactionImpl()`.
|
|
|
|
# #
|
|
|
|
# if (inx and 0x80) != 0:
|
|
|
|
# txs = @[tx] & txs
|
|
|
|
# else:
|
|
|
|
# txs.add tx
|
|
|
|
# cdb.persistTransactions(num, txRoot, txs)
|
|
|
|
|
|
|
|
# # Handle receipts sub-tree
|
|
|
|
# if rcptRoot.isValid:
|
|
|
|
# var rcpts: seq[Receipt]
|
|
|
|
# for (key,pyl) in adb.rightPairs LeafTie(root: ps.partGetSubTree rcptRoot):
|
|
|
|
# let
|
|
|
|
# inx = key.path.to(UInt256).truncate(uint)
|
|
|
|
# rcpt = rlp.decode(pyl.rawBlob, Receipt)
|
|
|
|
# # FIXME: See comment at `txRoot` section.
|
|
|
|
# if (inx and 0x80) != 0:
|
|
|
|
# rcpts = @[rcpt] & rcpts
|
|
|
|
# else:
|
|
|
|
# rcpts.add rcpt
|
|
|
|
# cdb.persistReceipts(rcptRoot, rcpts)
|
2024-08-01 10:41:20 +00:00
|
|
|
|
|
|
|
# Save keys to database
|
|
|
|
for (rvid,key) in ps.vkPairs:
|
|
|
|
adb.layersPutKey(rvid, key)
|
|
|
|
|
|
|
|
ps.check().isOkOr:
|
|
|
|
raiseAssert info & ": check => " & $error
|
|
|
|
|
|
|
|
#echo ">>> preLoadAristoDb (9)",
|
|
|
|
# "\n ps\n ", ps.pp(byKeyOk=false,byVidOk=false),
|
|
|
|
# ""
|
|
|
|
# -----------
|
|
|
|
#if true: quit()
|
2024-04-03 15:48:35 +00:00
|
|
|
|
2018-12-12 15:18:46 +00:00
|
|
|
# use tracerTestGen.nim to generate additional test data
|
2024-11-02 09:29:16 +00:00
|
|
|
proc testFixtureImpl(node: JsonNode, testStatusIMPL: var TestStatus, memoryDB: CoreDbRef) {.deprecated: "needs fixing for non-generic payloads".} =
|
|
|
|
block:
|
|
|
|
return
|
2024-04-03 15:48:35 +00:00
|
|
|
setErrorLevel()
|
|
|
|
|
2018-12-12 15:18:46 +00:00
|
|
|
var
|
2024-06-14 07:31:08 +00:00
|
|
|
blockNumberHex = node["blockNumber"].getStr()
|
|
|
|
blockNumber = parseHexInt(blockNumberHex).uint64
|
2022-12-02 04:39:12 +00:00
|
|
|
com = CommonRef.new(memoryDB, chainConfigForNetwork(MainNet))
|
2018-12-12 15:18:46 +00:00
|
|
|
state = node["state"]
|
2018-12-25 10:31:51 +00:00
|
|
|
receipts = node["receipts"]
|
2018-12-12 15:18:46 +00:00
|
|
|
|
2022-11-12 04:12:17 +00:00
|
|
|
# disable POS/post Merge feature
|
2024-06-14 07:31:08 +00:00
|
|
|
com.setTTD Opt.none(DifficultyInt)
|
2022-11-12 04:12:17 +00:00
|
|
|
|
2024-04-03 15:48:35 +00:00
|
|
|
# Import raw data into database
|
2024-05-20 10:17:51 +00:00
|
|
|
# Some hack for `Aristo` using the `snap` protocol proof-loader
|
|
|
|
memoryDB.preLoadAristoDb(state, blockNumber)
|
2018-12-12 15:18:46 +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
|
|
|
var blk = com.db.getEthBlock(blockNumber)
|
2018-12-12 15:18:46 +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
|
|
|
let txTraces = traceTransactions(com, blk.header, blk.transactions)
|
|
|
|
let stateDump = dumpBlockState(com, blk)
|
|
|
|
let blockTrace = traceBlock(com, blk, {DisableState})
|
2018-12-12 15:18:46 +00:00
|
|
|
|
2024-08-01 10:41:20 +00:00
|
|
|
# Fix hex representation
|
|
|
|
for inx in 0 ..< node["txTraces"].len:
|
|
|
|
for key in ["beforeRoot", "afterRoot"]:
|
|
|
|
# Here, `node["txTraces"]` stores a string while `txTraces` uses a
|
2024-10-01 21:03:10 +00:00
|
|
|
# `Hash32` which might expand to a didfferent upper/lower case.
|
2024-08-01 10:41:20 +00:00
|
|
|
var strHash = txTraces[inx]["stateDiff"][key].getStr.toUpperAscii
|
|
|
|
if strHash.len < 64:
|
|
|
|
strHash = '0'.repeat(64 - strHash.len) & strHash
|
|
|
|
txTraces[inx]["stateDiff"][key] = %(strHash)
|
|
|
|
|
2018-12-25 10:31:51 +00:00
|
|
|
check node["txTraces"] == txTraces
|
2018-12-12 15:18:46 +00:00
|
|
|
check node["stateDump"] == stateDump
|
|
|
|
check node["blockTrace"] == blockTrace
|
2024-08-01 10:41:20 +00:00
|
|
|
|
2018-12-25 10:31:51 +00:00
|
|
|
for i in 0 ..< receipts.len:
|
|
|
|
let receipt = receipts[i]
|
|
|
|
let stateDiff = txTraces[i]["stateDiff"]
|
|
|
|
check receipt["root"].getStr().toLowerAscii() == stateDiff["afterRoot"].getStr().toLowerAscii()
|
2020-01-22 07:45:00 +00:00
|
|
|
|
2024-04-03 15:48:35 +00:00
|
|
|
proc testFixtureAristo(node: JsonNode, testStatusIMPL: var TestStatus) =
|
|
|
|
node.testFixtureImpl(testStatusIMPL, newCoreDbRef AristoDbMemory)
|
|
|
|
|
|
|
|
proc tracerJsonMain*() =
|
|
|
|
suite "tracer json tests for Aristo DB":
|
|
|
|
jsonTest("TracerTests", testFixtureAristo)
|
|
|
|
|
2020-01-22 07:45:00 +00:00
|
|
|
when isMainModule:
|
|
|
|
tracerJsonMain()
|