Fix smartHead usage

status-im · Sep 2, 2024 · 45574f7 · 45574f7
1 parent 4067c84
commit 45574f7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/hive_integration/nodocker/engine/engine_env.nim b/hive_integration/nodocker/engine/engine_env.nim
@@ -100,7 +100,7 @@ proc newEngineEnv*(conf: var NimbusConf, chainFile: string, enableAuth: bool): E
 
   # txPool must be informed of active head
   # so it can know the latest account state
-  doAssert txPool.smartHead(head)
+  doAssert txPool.smartHead(head, chain)
 
   var key: JwtSharedKey
   key.fromHex(jwtSecret).isOkOr:

diff --git a/hive_integration/nodocker/graphql/graphql_sim.nim b/hive_integration/nodocker/graphql/graphql_sim.nim
@@ -94,7 +94,8 @@ proc main() =
   # so it can know the latest account state
   # e.g. "sendRawTransaction Nonce too low" case
   let head = com.db.getCanonicalHead()
-  doAssert txPool.smartHead(head)
+  let chainRef = newForkedChain(com, head)
+  doAssert txPool.smartHead(head, chainRef)
 
   for fileName in walkDirRec(
                  caseFolder, yieldFilter = {pcFile,pcLinkToFile}):

diff --git a/hive_integration/nodocker/rpc/test_env.nim b/hive_integration/nodocker/rpc/test_env.nim
@@ -82,13 +82,13 @@ proc setupEnv*(): TestEnv =
 
   manageAccounts(ethCtx, conf)
 
-  let chainRef = newChain(com)
+  let head = com.db.getCanonicalHead()
+  let chainRef = newForkedChain(com, head)
   let txPool = TxPoolRef.new(com)
 
   # txPool must be informed of active head
   # so it can know the latest account state
-  let head = com.db.getCanonicalHead()
-  doAssert txPool.smartHead(head)
+  doAssert txPool.smartHead(head, chainRef)
 
   let rpcServer = setupRpcServer(ethCtx, com, ethNode, txPool, conf)
   let rpcClient = newRpcHttpClient()

diff --git a/nimbus/beacon/beacon_engine.nim b/nimbus/beacon/beacon_engine.nim
@@ -225,7 +225,7 @@ proc generatePayload*(ben: BeaconEngineRef,
 
     if headBlock.blockHash != xp.head.blockHash:
        # reorg
-       discard xp.smartHead(headBlock)
+       discard xp.smartHead(headBlock, ben.chain)
 
     if pos.timestamp <= headBlock.timestamp:
       return err "timestamp must be strictly later than parent"

diff --git a/nimbus/nimbus.nim b/nimbus/nimbus.nim
@@ -45,14 +45,8 @@ proc basicServices(nimbus: NimbusNode,
   # so it can know the latest account state
   # e.g. sender nonce, etc
   let head = com.db.getCanonicalHead()
-  doAssert nimbus.txPool.smartHead(head)
-
-  # chainRef: some name to avoid module-name/filed/function misunderstandings
   nimbus.chainRef = newForkedChain(com, head)
-  #if conf.verifyFrom.isSome:
-  #  let verifyFrom = conf.verifyFrom.get()
-  #  nimbus.chainRef.extraValidation = 0 < verifyFrom
-  #  nimbus.chainRef.verifyFrom = verifyFrom
+  doAssert nimbus.txPool.smartHead(head, nimbus.chainRef)
 
   nimbus.beaconEngine = BeaconEngineRef.new(nimbus.txPool, nimbus.chainRef)
 

diff --git a/tests/test_ledger.nim b/tests/test_ledger.nim
@@ -42,7 +42,7 @@ type
     nonce   : uint64
     chainId : ChainId
     xp      : TxPoolRef
-    chain   : ChainRef
+    chain   : ForkedChainRef
 
 # ------------------------------------------------------------------------------
 # Helpers
@@ -110,7 +110,7 @@ proc initEnv(): TestEnv =
     nonce   : 0'u64,
     chainId : conf.networkParams.config.chainId,
     xp      : TxPoolRef.new(com),
-    chain   : newChain(com),
+    chain   : newForkedChain(com, com.genesisHeader),
   )
 
 func makeTx(
@@ -140,8 +140,8 @@ func initAddr(z: int): EthAddress =
   const L = sizeof(result)
   result[L-sizeof(uint32)..^1] = toBytesBE(z.uint32)
 
-proc importBlocks(env: TestEnv; blk: EthBlock) =
-  env.chain.persistBlocks([blk]).isOkOr:
+proc importBlock(env: TestEnv; blk: EthBlock) =
+  env.chain.importBlock(blk).isOkOr:
     raiseAssert "persistBlocks() failed at block #" &
       $blk.header.number & " msg: " & error
 
@@ -333,9 +333,9 @@ proc runLedgerTransactionTests(noisy = true) =
           uncles: blk.uncles,
           withdrawals: Opt.some(newSeq[Withdrawal]())
         )
-        env.importBlocks(EthBlock.init(blk.header, body))
+        env.importBlock(EthBlock.init(blk.header, body))
 
-        check env.xp.smartHead(blk.header)
+        check env.xp.smartHead(blk.header, env.chain)
         for tx in body.transactions:
           env.txs.add tx