mirror of
https://github.com/status-im/nimbus-eth1.git
synced 2025-01-12 21:34:33 +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%
```
69 lines
2.3 KiB
Nim
69 lines
2.3 KiB
Nim
# Nimbus
|
|
# Copyright (c) 2023-2024 Status Research & Development GmbH
|
|
# Licensed and distributed under either of
|
|
# * MIT license (license terms in the root directory or at
|
|
# https://opensource.org/licenses/MIT).
|
|
# * Apache v2 license (license terms in the root directory or at
|
|
# https://www.apache.org/licenses/LICENSE-2.0).
|
|
# at your option. This file may not be copied, modified, or distributed
|
|
# except according to those terms.
|
|
|
|
import
|
|
unittest2,
|
|
./setup_env,
|
|
../../nimbus/sync/beacon/skeleton_main,
|
|
../../nimbus/sync/beacon/skeleton_utils,
|
|
../../nimbus/sync/beacon/skeleton_db
|
|
|
|
proc test5*() =
|
|
suite "should fill the canonical chain after being linked to a canonical block past genesis":
|
|
let env = setupEnv()
|
|
let skel = SkeletonRef.new(env.chain)
|
|
|
|
test "skel open ok":
|
|
let res = skel.open()
|
|
check res.isOk
|
|
if res.isErr:
|
|
debugEcho res.error
|
|
check false
|
|
break
|
|
|
|
let
|
|
genesis = env.chain.com.genesisHeader
|
|
block1 = header(1, genesis, genesis, 100)
|
|
block2 = header(2, genesis, block1, 100)
|
|
block3 = header(3, genesis, block2, 100)
|
|
block4 = header(4, genesis, block3, 100)
|
|
block5 = header(5, genesis, block4, 100)
|
|
emptyBody = emptyBody()
|
|
|
|
test "put body":
|
|
for header in [block1, block2, block3, block4, block5]:
|
|
let res = skel.putBody(header, emptyBody)
|
|
check res.isOk
|
|
|
|
test "canonical height should be at block 2":
|
|
let r = skel.insertBlocks([
|
|
EthBlock.init(block1, emptyBody), EthBlock.init(block2, emptyBody)], false)
|
|
check r.isOk
|
|
check r.get == 2
|
|
|
|
skel.initSyncT(block4, true)
|
|
check skel.blockHeight == 2
|
|
|
|
test "canonical height should update after being linked":
|
|
skel.putBlocksT([block3], 1, {FillCanonical})
|
|
check skel.blockHeight == 4
|
|
|
|
test "canonical height should not change when setHead with force=false":
|
|
skel.setHeadT(block5, false, false, {})
|
|
check skel.blockHeight == 4
|
|
|
|
test "canonical height should change when setHead with force=true":
|
|
skel.setHeadT(block5, true, false, {FillCanonical})
|
|
check skel.blockHeight == 5
|
|
|
|
test "skel header should be cleaned up after filling canonical chain":
|
|
let headers = [block3, block4, block5]
|
|
skel.getHeaderClean(headers)
|