From 6374c9f66dc27122c8209fb0566b1b48e99324e7 Mon Sep 17 00:00:00 2001
From: jangko <jangko128@gmail.com>
Date: Mon, 14 Feb 2022 21:22:39 +0700
Subject: [PATCH] fixes regression caused by #962

---
 fluffy/tests/test_state_network.nim | 2 +-
 nimbus/genesis.nim                  | 6 +++---
 nimbus/vm/state.nim                 | 2 +-
 nimbus/vm2/state.nim                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fluffy/tests/test_state_network.nim b/fluffy/tests/test_state_network.nim
index f7431c3a3..52b85bf52 100644
--- a/fluffy/tests/test_state_network.nim
+++ b/fluffy/tests/test_state_network.nim
@@ -30,7 +30,7 @@ proc genesisToTrie(filePath: string): HexaryTrie =
   )
   # TODO: this actually also creates a HexaryTrie and AccountStateDB, which we
   # could skip
-  let header = toBlock(cn.genesis, chainDB)
+  let header = toGenesisHeader(chainDB)
 
   # Trie exists already in flat db, but need to provide the root
   initHexaryTrie(chainDB.db, header.stateRoot, chainDB.pruneTrie)
diff --git a/nimbus/genesis.nim b/nimbus/genesis.nim
index 6c8e03d9a..a399e9220 100644
--- a/nimbus/genesis.nim
+++ b/nimbus/genesis.nim
@@ -90,11 +90,11 @@ proc initDbAccounts(db: BaseChainDB): BlockHeader
 # Public functions
 # ------------------------------------------------------------------------------
 
-proc toGenesisHeader*(params: NetworkParams): BlockHeader
+proc toGenesisHeader*(params: NetworkParams, db = newMemoryDb()): BlockHeader
     {.raises: [Defect, RlpError].} =
   ## Generate the genesis block header from the `params` argument value.
   newBaseChainDB(
-    newMemoryDb(),
+    db        = db,
     id        = params.config.chainID.NetworkId,
     params    = params,
     pruneTrie = true).initDbAccounts
@@ -105,7 +105,7 @@ proc toGenesisHeader*(db: BaseChainDB): BlockHeader
   ## fields of the argument `db` descriptor.
   NetworkParams(
     config:  db.config,
-    genesis: db.genesis).toGenesisHeader
+    genesis: db.genesis).toGenesisHeader(db.db)
 
 proc initializeEmptyDb*(db: BaseChainDB)
     {.raises: [Defect, CatchableError].} =
diff --git a/nimbus/vm/state.nim b/nimbus/vm/state.nim
index 8e556cf5c..2154f2e7d 100644
--- a/nimbus/vm/state.nim
+++ b/nimbus/vm/state.nim
@@ -341,7 +341,7 @@ method baseFee*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =
 when defined(geth):
   import db/geth_db
 
-method getAncestorHash*(vmState: BaseVMState, blockNumber: BlockNumber): Hash256 {.base, gcsafe, raises: [Defect,CatchableError].} =
+method getAncestorHash*(vmState: BaseVMState, blockNumber: BlockNumber): Hash256 {.base, gcsafe, raises: [Defect,CatchableError,Exception].} =
   var ancestorDepth = vmState.blockNumber - blockNumber - 1
   if ancestorDepth >= constants.MAX_PREV_HEADER_DEPTH:
     return
diff --git a/nimbus/vm2/state.nim b/nimbus/vm2/state.nim
index 4be05a783..33010f20d 100644
--- a/nimbus/vm2/state.nim
+++ b/nimbus/vm2/state.nim
@@ -328,7 +328,7 @@ method baseFee*(vmState: BaseVMState): UInt256 {.base, gcsafe.} =
 when defined(geth):
   import db/geth_db
 
-method getAncestorHash*(vmState: BaseVMState, blockNumber: BlockNumber): Hash256 {.base, gcsafe, raises: [Defect,CatchableError].} =
+method getAncestorHash*(vmState: BaseVMState, blockNumber: BlockNumber): Hash256 {.base, gcsafe, raises: [Defect,CatchableError,Exception].} =
   var ancestorDepth = vmState.blockNumber - blockNumber - 1
   if ancestorDepth >= constants.MAX_PREV_HEADER_DEPTH:
     return