lux/evm
2
0
Fork 0
mirror of https://github.com/luxfi/evm.git synced 2026-09-24 00:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(evm): fix snapshot-recovery prepare for non-empty (genesis-active) genesis

Browse Source 
GenerateChain forcibly uses a hash-scheme trie db to read parent state, but the
snapshot suite runs the chain under both hash and path schemes. With an empty
genesis (pre genesis-active) parent.Root() is the empty root -- readable in any
scheme -- so block generation worked. With the genesis-active 0x9999 marker the
genesis state is non-empty, and a path-scheme chain commits its genesis nodes in
path format, invisible to GenerateChain's hash-scheme reader. state.New then
errored and GenerateChain returned 0 blocks (the error was discarded), so prepare
built an empty chain and restart recovered to genesis (head 0) instead of C4.

Generate blocks on a dedicated hash-scheme genDb via GenerateChainWithGenesis
(the pattern used by the rest of core's tests); the scheme-agnostic block
structures are re-executed into the chain's own db by InsertChain. The gapped and
wipe-crash variants source their extra blocks from genDb too.

The recovery engine is unchanged and verified correct for a non-empty genesis
under both hash and path schemes: on restart driven by lastAcceptedHash=C4 the
head, header and snapshot disk layer all land at C4 and block[4] is present.
This commit is contained in:
zeekay
2026-06-26 20:03:13 -07:00
parent 1c691fb210
commit 5fa8db6037
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/blockchain_snapshot_test.go
+17 -8
View File
@@ -95,12 +95,22 @@ func (basic *snapshotTestBasic) prepare(t *testing.T) (*BlockChain, []*types.Blo
t.Fatalf("Failed to create chain: %v", err)
}
// Now generate blocks using the chain's genesis and database
// This ensures blocks are compatible with the chain
blocks, _, _ := GenerateChain(gspec.Config, chain.Genesis(), engine, db, basic.chainBlocks, 10, func(i int, b *BlockGen) {})
// Generate blocks on a dedicated hash-scheme database (genDb) so that block
// production can always read the genesis state, even when it is non-empty
// (e.g. a genesis-active precompile marker). GenerateChain forcibly uses a
// hash-scheme trie database to retain all nodes; if it shared the chain's
// path-scheme db, the non-empty genesis nodes would be unreadable and no
// blocks would be produced. The block structures are scheme-agnostic and are
// re-executed into the chain's own (basic.scheme) database via InsertChain
// below, so this matches the GenerateChainWithGenesis pattern used by the
// rest of the core test suite.
genDb, blocks, _, err := GenerateChainWithGenesis(gspec, engine, basic.chainBlocks, 10, func(i int, b *BlockGen) {})
if err != nil {
t.Fatalf("Failed to generate chain: %v", err)
}
// Store the database for later use
basic.genDb = db
// Store the databases for later use
basic.genDb = genDb
basic.db = db
// genesis as last accepted
@@ -136,7 +146,6 @@ func (basic *snapshotTestBasic) prepare(t *testing.T) (*BlockChain, []*types.Blo
// Set runtime fields
basic.datadir = datadir
basic.ancient = ancient
basic.db = basic.genDb // Using same database now
basic.engine = engine
basic.gspec = gspec
return chain, blocks
@@ -296,7 +305,7 @@ func (snaptest *gappedSnapshotTest) test(t *testing.T) {
// Insert blocks without enabling snapshot if gapping is required.
chain.Stop()
gappedBlocks, _, _ := GenerateChain(snaptest.gspec.Config, blocks[len(blocks)-1], snaptest.engine, snaptest.db, snaptest.gapped, 10, func(i int, b *BlockGen) {})
gappedBlocks, _, _ := GenerateChain(snaptest.gspec.Config, blocks[len(blocks)-1], snaptest.engine, snaptest.genDb, snaptest.gapped, 10, func(i int, b *BlockGen) {})
// Insert a few more blocks without enabling snapshot
var cacheConfig = &CacheConfig{
@@ -358,7 +367,7 @@ func (snaptest *wipeCrashSnapshotTest) test(t *testing.T) {
if err != nil {
t.Fatalf("Failed to recreate chain: %v", err)
}
newBlocks, _, _ := GenerateChain(snaptest.gspec.Config, blocks[len(blocks)-1], snaptest.engine, snaptest.db, snaptest.newBlocks, 10, func(i int, b *BlockGen) {})
newBlocks, _, _ := GenerateChain(snaptest.gspec.Config, blocks[len(blocks)-1], snaptest.engine, snaptest.genDb, snaptest.newBlocks, 10, func(i int, b *BlockGen) {})
newchain.InsertChain(newBlocks)
newchain.Stop()