small cleanups (#2526)

* remove some redundant EH
* avoid pessimising move (introduces a copy in this case!)
* shift less data around when reading era files (reduces stack usage)

nimbus/core/chain/forked_chain.nim

@@ -357,12 +357,9 @@ proc setHead(c: ForkedChainRef,
              headHash: Hash256,
              number: BlockNumber) =
   # TODO: db.setHead should not read from db anymore
-  # and raise RlpError, all canonical chain marking
+  # all canonical chain marking
   # should be done from here.
-  try:
+  discard c.db.setHead(headHash)
-    discard c.db.setHead(headHash)
-  except RlpError as exc:
-    raiseAssert(exc.msg)
 
   # update global syncHighest
   c.com.syncHighest = number

nimbus/core/chain/persist_blocks.nim

@@ -201,10 +201,7 @@ proc persistBlocksImpl(
     let n = fromBlock div CleanUpEpoch
     if 0 < n and n < (toBlock div CleanUpEpoch):
       # Starts at around `2 * CleanUpEpoch`
-      try:
+      c.db.purgeOlderBlocksFromHistory(fromBlock - CleanUpEpoch)
-        c.db.purgeOlderBlocksFromHistory(fromBlock - CleanUpEpoch)
-      except CatchableError as exc:
-        warn "Could not clean up old blocks from history", err = exc.msg
 
   ok((blks, txs, gas))
 
@@ -222,31 +219,22 @@ proc insertBlockWithoutSetHead*(c: ChainRef, blk: EthBlock): Result[void, string
 
 proc setCanonical*(c: ChainRef, header: BlockHeader): Result[void, string] =
   if header.parentHash == Hash256():
-    try:
+    if not c.db.setHead(header):
-      if not c.db.setHead(header.blockHash):
+      return err("setHead failed")
-        return err("setHead failed")
-    except RlpError as exc:
-      # TODO fix exception+bool error return
-      return err(exc.msg)
     return ok()
 
   var body: BlockBody
-  try:
+  if not c.db.getBlockBody(header, body):
-    if not c.db.getBlockBody(header, body):
+    debug "Failed to get BlockBody", hash = header.blockHash
-      debug "Failed to get BlockBody", hash = header.blockHash
+    return err("Could not get block body")
-      return err("Could not get block body")
-  except RlpError as exc:
-    return err(exc.msg)
 
   discard
     ?c.persistBlocksImpl(
       [EthBlock.init(header, move(body))], {NoPersistHeader, NoPersistTransactions}
     )
 
-  try:
+  if not c.db.setHead(header):
-    discard c.db.setHead(header.blockHash)
+    return err("setHead failed")
-  except RlpError as exc:
-    return err(exc.msg)
   ok()
 
 proc setCanonical*(c: ChainRef, blockHash: Hash256): Result[void, string] =

nimbus/core/executor/process_transaction.nim

@@ -11,7 +11,7 @@
 {.push raises: [].}
 
 import
-  std/strutils,
+  std/strformat,
   results,
   ../../common/common,
   ../../db/ledger,
@@ -48,12 +48,8 @@ proc commitOrRollbackDependingOnGasUsed(
   # an early stop. It would rather detect differing values for the  block
   # header `gasUsed` and the `vmState.cumulativeGasUsed` at a later stage.
   if header.gasLimit < vmState.cumulativeGasUsed + gasBurned:
-    try:
+    vmState.stateDB.rollback(accTx)
-      vmState.stateDB.rollback(accTx)
+    return err(&"invalid tx: block header gasLimit reached. gasLimit={header.gasLimit}, gasUsed={vmState.cumulativeGasUsed}, addition={gasBurned}")
-      return err("invalid tx: block header gasLimit reached. gasLimit=$1, gasUsed=$2, addition=$3" % [
-        $header.gasLimit, $vmState.cumulativeGasUsed, $gasBurned])
-    except ValueError as ex:
-      return err(ex.msg)
   else:
     # Accept transaction and collect mining fee.
     vmState.stateDB.commit(accTx)

nimbus/core/gaslimit.nim

@@ -32,11 +32,7 @@ proc validateGasLimit(header: BlockHeader; limit: GasInt): Result[void,string] =
   let upperLimit = limit div GAS_LIMIT_ADJUSTMENT_FACTOR
 
   if diff >= upperLimit:
-    try:
+    return err(&"invalid gas limit: have {header.gasLimit}, want {limit} +-= {upperLimit-1}")
-      return err(&"invalid gas limit: have {header.gasLimit}, want {limit} +-= {upperLimit-1}")
-    except ValueError:
-      # TODO deprecate-strformat
-      raiseAssert "strformat cannot fail"
   if header.gasLimit < GAS_LIMIT_MINIMUM:
     return err("invalid gas limit below 5000")
   ok()
@@ -77,14 +73,10 @@ proc verifyEip1559Header(com: CommonRef;
   # Verify the baseFee is correct based on the parent header.
   var expectedBaseFee = com.calcEip1599BaseFee(parent)
   if headerBaseFee != expectedBaseFee:
-    try:
+    return err(&"invalid baseFee: have {expectedBaseFee}, "&
-      return err(&"invalid baseFee: have {expectedBaseFee}, "&
+                &"want {header.baseFeePerGas}, " &
-                 &"want {header.baseFeePerGas}, " &
+                &"parent.baseFee {parent.baseFeePerGas}, "&
-                 &"parent.baseFee {parent.baseFeePerGas}, "&
+                &"parent.gasUsed {parent.gasUsed}")
-                 &"parent.gasUsed {parent.gasUsed}")
-    except ValueError:
-      # TODO deprecate-strformat
-      raiseAssert "strformat cannot fail"
 
   return ok()
 

nimbus/core/tx_pool/tx_tasks/tx_head.nim

@@ -47,7 +47,7 @@ logScope:
 
 # use it as a stack/lifo as the ordering is reversed
 proc insert(xp: TxPoolRef; kq: TxHeadDiffRef; blockHash: Hash256)
-    {.gcsafe,raises: [CatchableError].} =
+    {.raises: [BlockNotFound].} =
   let db = xp.chain.com.db
   for tx in db.getBlockBody(blockHash).transactions:
     if tx.versionedHashes.len > 0:
@@ -59,7 +59,7 @@ proc insert(xp: TxPoolRef; kq: TxHeadDiffRef; blockHash: Hash256)
     kq.addTxs[tx.itemID] = PooledTransaction(tx: tx)
 
 proc remove(xp: TxPoolRef; kq: TxHeadDiffRef; blockHash: Hash256)
-    {.gcsafe,raises: [CatchableError].} =
+    {.gcsafe,raises: [BlockNotFound].} =
   let db = xp.chain.com.db
   for tx in db.getBlockBody(blockHash).transactions:
     kq.remTxs[tx.itemID] = true

nimbus/db/core_db/core_apps.nim

@@ -241,8 +241,7 @@ proc markCanonicalChain(
     db: CoreDbRef;
     header: BlockHeader;
     headerHash: Hash256;
-      ): bool
+      ): bool =
-      {.gcsafe, raises: [RlpError].} =
   ## mark this chain as canonical by adding block number to hash lookup
   ## down to forking point
   var
@@ -266,6 +265,13 @@ proc markCanonicalChain(
   if not db.getBlockHeader(currHeader.parentHash, currHeader):
     return false
 
+  template rlpDecodeOrZero(data: openArray[byte]): Hash256 =
+    try:
+      rlp.decode(data, Hash256)
+    except RlpError as exc:
+      warn logTxt "markCanonicalChain()", key, action="put()", error=exc.msg
+      Hash256()
+
   while currHash != Hash256():
     let key = blockNumberToHashKey(currHeader.number)
     let data = kvt.getOrEmpty(key.toOpenArray).valueOr:
@@ -275,7 +281,7 @@ proc markCanonicalChain(
       # not marked, mark it
       kvt.put(key.toOpenArray, rlp.encode(currHash)).isOkOr:
         warn logTxt "markCanonicalChain()", key, action="put()", error=($$error)
-    elif rlp.decode(data, Hash256) != currHash:
+    elif rlpDecodeOrZero(data) != currHash:
       # replace prev chain
       kvt.put(key.toOpenArray, rlp.encode(currHash)).isOkOr:
         warn logTxt "markCanonicalChain()", key, action="put()", error=($$error)
@@ -653,22 +659,22 @@ proc getBlockBody*(
     db: CoreDbRef;
     header: BlockHeader;
     output: var BlockBody;
-      ): bool
+      ): bool =
-      {.gcsafe, raises: [RlpError].} =
+  try:
-  output.transactions = db.getTransactions(header.txRoot)
+    output.transactions = db.getTransactions(header.txRoot)
-  output.uncles = db.getUncles(header.ommersHash)
+    output.uncles = db.getUncles(header.ommersHash)
 
-  if header.withdrawalsRoot.isSome:
+    if header.withdrawalsRoot.isSome:
-    output.withdrawals = Opt.some(db.getWithdrawals(header.withdrawalsRoot.get))
+      output.withdrawals = Opt.some(db.getWithdrawals(header.withdrawalsRoot.get))
-
+    true
-  true
+  except RlpError:
+    false
 
 proc getBlockBody*(
     db: CoreDbRef;
     blockHash: Hash256;
     output: var BlockBody;
-      ): bool
+      ): bool =
-      {.gcsafe, raises: [RlpError].} =
   var header: BlockHeader
   if db.getBlockHeader(blockHash, header):
     return db.getBlockBody(header, output)
@@ -677,15 +683,15 @@ proc getBlockBody*(
     db: CoreDbRef;
     hash: Hash256;
       ): BlockBody
-      {.gcsafe, raises: [RlpError,ValueError].} =
+      {.gcsafe, raises: [BlockNotFound].} =
   if not db.getBlockBody(hash, result):
-    raise newException(ValueError, "Error when retrieving block body")
+    raise newException(BlockNotFound, "Error when retrieving block body")
 
 proc getEthBlock*(
     db: CoreDbRef;
     hash: Hash256;
       ): EthBlock
-      {.gcsafe, raises: [BlockNotFound, RlpError,ValueError].} =
+      {.gcsafe, raises: [BlockNotFound].} =
   var
     header = db.getBlockHeader(hash)
     blockBody = db.getBlockBody(hash)
@@ -695,7 +701,7 @@ proc getEthBlock*(
     db: CoreDbRef;
     blockNumber: BlockNumber;
       ): EthBlock
-      {.gcsafe, raises: [BlockNotFound, RlpError,ValueError].} =
+      {.gcsafe, raises: [BlockNotFound].} =
   var
     header = db.getBlockHeader(blockNumber)
     headerHash = header.blockHash
@@ -706,7 +712,7 @@ proc getUncleHashes*(
     db: CoreDbRef;
     blockHashes: openArray[Hash256];
       ): seq[Hash256]
-      {.gcsafe, raises: [RlpError,ValueError].} =
+      {.gcsafe, raises: [BlockNotFound].} =
   for blockHash in blockHashes:
     result &= db.getBlockBody(blockHash).uncles.mapIt(it.rlpHash)
 
@@ -749,8 +755,7 @@ proc headerExists*(db: CoreDbRef; blockHash: Hash256): bool =
 proc setHead*(
     db: CoreDbRef;
     blockHash: Hash256;
-      ): bool
+      ): bool =
-      {.gcsafe, raises: [RlpError].} =
   var header: BlockHeader
   if not db.getBlockHeader(blockHash, header):
     return false
@@ -767,8 +772,7 @@ proc setHead*(
     db: CoreDbRef;
     header: BlockHeader;
     writeHeader = false;
-      ): bool
+      ): bool =
-      {.gcsafe, raises: [RlpError].} =
   var headerHash = rlpHash(header)
   let kvt = db.ctx.getKvt()
   if writeHeader:

nimbus/db/kvt/kvt_delta.nim

@@ -13,7 +13,7 @@
 ##
 
 import
-  std/[sequtils, tables],
+  std/tables,
   results,
   ./kvt_desc,
   ./kvt_desc/desc_backend,
@@ -78,7 +78,8 @@ proc deltaPersistent*(
 
   # Store structural single trie entries
   let writeBatch = ? be.putBegFn()
-  be.putKvpFn(writeBatch, db.balancer.sTab.pairs.toSeq)
+  for k,v in db.balancer.sTab:
+    be.putKvpFn(writeBatch, k, v)
   ? be.putEndFn writeBatch
 
   # Done with balancer, all saved to backend

nimbus/db/kvt/kvt_desc/desc_backend.nim

@@ -40,7 +40,7 @@ type
       ## Generic transaction initialisation function
 
   PutKvpFn* =
-    proc(hdl: PutHdlRef; kvps: openArray[(Blob,Blob)]) {.gcsafe, raises: [].}
+    proc(hdl: PutHdlRef; k, v: openArray[byte]) {.gcsafe, raises: [].}
       ## Generic backend database bulk storage function.
 
   PutEndFn* =

nimbus/db/kvt/kvt_init/memory_db.nim

@@ -101,14 +101,13 @@ proc putBegFn(db: MemBackendRef): PutBegFn =
 
 proc putKvpFn(db: MemBackendRef): PutKvpFn =
   result =
-    proc(hdl: PutHdlRef; kvps: openArray[(Blob,Blob)]) =
+    proc(hdl: PutHdlRef; k, v: openArray[byte]) =
       let hdl = hdl.getSession db
       if hdl.error == KvtError(0):
-        for (k,v) in kvps:
+        if k.len > 0:
-          if k.isValid:
+          hdl.tab[@k] = @v
-            hdl.tab[k] = v
+        else:
-          else:
+          hdl.tab.del @k
-            hdl.error = KeyInvalid
 
 proc putEndFn(db: MemBackendRef): PutEndFn =
   result =

nimbus/db/kvt/kvt_init/rocks_db.nim

@@ -119,14 +119,14 @@ proc putBegFn(db: RdbBackendRef): PutBegFn =
 
 proc putKvpFn(db: RdbBackendRef): PutKvpFn =
   result =
-    proc(hdl: PutHdlRef; kvps: openArray[(Blob,Blob)]) =
+    proc(hdl: PutHdlRef; k, v: openArray[byte]) =
       let hdl = hdl.getSession db
       if hdl.error == KvtError(0):
 
         # Collect batch session arguments
-        db.rdb.put(kvps).isOkOr:
+        db.rdb.put(k, v).isOkOr:
-          hdl.error = error[1]
+          hdl.error = error[0]
-          hdl.info = error[2]
+          hdl.info = error[1]
           return
 
 

nimbus/db/kvt/kvt_init/rocks_db/rdb_put.nim

@@ -68,21 +68,20 @@ proc commit*(rdb: var RdbInst): Result[void,(KvtError,string)] =
 
 proc put*(
     rdb: RdbInst;
-    data: openArray[(Blob,Blob)];
+    key, val: openArray[byte];
-      ): Result[void,(Blob,KvtError,string)] =
+      ): Result[void,(KvtError,string)] =
-  for (key,val) in data:
+  if val.len == 0:
-    if val.len == 0:
+    rdb.session.delete(key, rdb.store[KvtGeneric].handle()).isOkOr:
-      rdb.session.delete(key, rdb.store[KvtGeneric].handle()).isOkOr:
+      const errSym = RdbBeDriverDelError
-        const errSym = RdbBeDriverDelError
+      when extraTraceMessages:
-        when extraTraceMessages:
+        trace logTxt "del", key, error=errSym, info=error
-          trace logTxt "del", key, error=errSym, info=error
+      return err((errSym,error))
-        return err((key,errSym,error))
+  else:
-    else:
+    rdb.session.put(key, val, rdb.store[KvtGeneric].handle()).isOkOr:
-      rdb.session.put(key, val, rdb.store[KvtGeneric].handle()).isOkOr:
+      const errSym = RdbBeDriverPutError
-        const errSym = RdbBeDriverPutError
+      when extraTraceMessages:
-        when extraTraceMessages:
+        trace logTxt "put", key, error=errSym, info=error
-          trace logTxt "put", key, error=errSym, info=error
+      return err((errSym,error))
-        return err((key,errSym,error))
   ok()
 
 # ------------------------------------------------------------------------------

nimbus/nimbus_import.nim

@@ -240,13 +240,13 @@ proc importBlocks*(conf: NimbusConf, com: CommonRef) =
       var clNum = 0'u64
 
       while clNum < blockNumber:
-        let clBlock = getBlockFromEra(
+        let blk = getEthBlockFromEra(
           era, historical_roots, historical_summaries, Slot(importedSlot), clConfig.cfg
         ).valueOr:
           importedSlot += 1
           continue
 
-        clNum = getEth1BlockNumber(clBlock)
+        clNum = blk.header.number
         # decreasing the lower bound with each iteration
         importedSlot += blockNumber - clNum
 
@@ -273,7 +273,7 @@ proc importBlocks*(conf: NimbusConf, com: CommonRef) =
           break
 
         imported += 1
-        blocks.add move(blk)
+        blocks.add blk
 
         if blocks.lenu64 mod conf.chunkSize == 0:
           process()
@@ -304,7 +304,7 @@ proc importBlocks*(conf: NimbusConf, com: CommonRef) =
         importedSlot = firstSlotAfterMerge
 
       while running and imported < conf.maxBlocks and importedSlot < endSlot:
-        let clblock = getBlockFromEra(
+        var blk = getEthBlockFromEra(
           eraDB,
           historical_roots.asSeq(),
           historical_summaries.asSeq(),
@@ -314,7 +314,7 @@ proc importBlocks*(conf: NimbusConf, com: CommonRef) =
           importedSlot += 1
           continue
 
-        blocks.add getEth1Block(clblock)
+        blocks.add blk
         imported += 1
 
         importedSlot += 1

nimbus/rpc/p2p.nim

@@ -519,7 +519,7 @@ proc setupEthRpc*(
       hash: Hash256,
       header: BlockHeader,
       opts: FilterOptions): seq[FilterLog]
-        {.gcsafe, raises: [RlpError,ValueError].} =
+        {.gcsafe, raises: [RlpError,BlockNotFound].} =
     if headerBloomFilter(header, opts.address, opts.topics):
       let blockBody = chain.getBlockBody(hash)
       let receipts = chain.getReceipts(header.receiptsRoot)
@@ -538,7 +538,7 @@ proc setupEthRpc*(
       start: common.BlockNumber,
       finish: common.BlockNumber,
       opts: FilterOptions): seq[FilterLog]
-        {.gcsafe, raises: [RlpError,ValueError].} =
+        {.gcsafe, raises: [RlpError,BlockNotFound].} =
     var logs = newSeq[FilterLog]()
     var i = start
     while i <= finish:

nimbus/sync/handlers/eth.nim

@@ -405,19 +405,16 @@ method getBlockBodies*(ctx: EthWireRef,
                        hashes: openArray[Hash256]):
                         Result[seq[BlockBody], string]
     {.gcsafe.} =
-  try:
+  let db = ctx.db
-    let db = ctx.db
+  var body: BlockBody
-    var body: BlockBody
+  var list: seq[BlockBody]
-    var list: seq[BlockBody]
+  for blockHash in hashes:
-    for blockHash in hashes:
+    if db.getBlockBody(blockHash, body):
-      if db.getBlockBody(blockHash, body):
+      list.add body
-        list.add body
+    else:
-      else:
+      list.add BlockBody()
-        list.add BlockBody()
+      trace "handlers.getBlockBodies: blockBody not found", blockHash
-        trace "handlers.getBlockBodies: blockBody not found", blockHash
+  return ok(list)
-    return ok(list)
-  except RlpError as exc:
-    return err(exc.msg)
 
 method getBlockHeaders*(ctx: EthWireRef,
                         req: BlocksRequest):

nimbus/utils/era_helpers.nim

@@ -95,23 +95,6 @@ proc loadHistoricalRootsFromEra*(
         )
       )
 
-proc getBlockFromEra*(
-    db: EraDB,
-    historical_roots: openArray[Eth2Digest],
-    historical_summaries: openArray[HistoricalSummary],
-    slot: Slot,
-    cfg: RuntimeConfig,
-): Opt[ForkedTrustedSignedBeaconBlock] =
-  let fork = cfg.consensusForkAtEpoch(slot.epoch)
-  result.ok(ForkedTrustedSignedBeaconBlock(kind: fork))
-  withBlck(result.get()):
-    type T = type(forkyBlck)
-    forkyBlck = db.getBlock(
-      historical_roots, historical_summaries, slot, Opt[Eth2Digest].err(), T
-    ).valueOr:
-      result.err()
-      return
-
 proc getTxs*(txs: seq[bellatrix.Transaction]): seq[common.Transaction] =
   var transactions = newSeqOfCap[common.Transaction](txs.len)
   for tx in txs:
@@ -134,17 +117,7 @@ proc getWithdrawals*(x: seq[capella.Withdrawal]): seq[common.Withdrawal] =
     )
   return withdrawals
 
-# This is a helper function to get the eth1 block number 
+proc getEthBlock*(blck: ForkedTrustedSignedBeaconBlock): Opt[EthBlock] =
-# from a beacon block in slot finding process
-proc getEth1BlockNumber*(blck: ForkedTrustedSignedBeaconBlock): uint64 =
-  ## Get the eth1 block number from a beacon block.
-  ## This does not check for pre/post merge, despite having only 
-  ## post merge meaning
-  withBlck(blck):
-    when consensusFork >= ConsensusFork.Bellatrix:
-      return forkyBlck.message.body.execution_payload.block_number
-
-proc getEth1Block*(blck: ForkedTrustedSignedBeaconBlock): EthBlock =
   ## Convert a beacon block to an eth1 block.
   withBlck(blck):
     when consensusFork >= ConsensusFork.Bellatrix:
@@ -199,6 +172,23 @@ proc getEth1Block*(blck: ForkedTrustedSignedBeaconBlock): EthBlock =
         excessBlobGas: excessBlobGas,
         parentBeaconBlockRoot: parentBeaconBlockRoot,
       )
-      return EthBlock(
+      return Opt.some EthBlock(
         header: header, transactions: txs, uncles: @[], withdrawals: ethWithdrawals
       )
+
+proc getEthBlockFromEra*(
+    db: EraDB,
+    historical_roots: openArray[Eth2Digest],
+    historical_summaries: openArray[HistoricalSummary],
+    slot: Slot,
+    cfg: RuntimeConfig,
+): Opt[EthBlock] =
+  let fork = cfg.consensusForkAtEpoch(slot.epoch)
+  var tmp = ForkedTrustedSignedBeaconBlock(kind: fork)
+  withBlck(tmp):
+    type T = type(forkyBlck)
+    forkyBlck = db.getBlock(
+      historical_roots, historical_summaries, slot, Opt[Eth2Digest].err(), T
+    ).valueOr:
+      return Opt.none(EthBlock)
+  getEthBlock(tmp)