Merge branch 'master' into faster-hashes

Author: advaita-saha

config.nims

@@ -165,9 +165,6 @@ switch("hintAsError", "DuplicateModuleImport:on")
 # `switch("warning[CaseTransition]", "off")` fails with "Error: invalid command line option: '--warning[CaseTransition]'"
 switch("warning", "CaseTransition:off")
 
-# Transitional for Nim v2.2, due to newSeqUninit replacing newSeqUninitialized.
-switch("warning", "Deprecated:off")
-
 # nim-kzg shipping their own blst, nimbus-eth1 too.
 # disable nim-kzg's blst
 switch("define", "kzgExternalBlst")

execution_chain/beacon/api_handler/api_newpayload.nim

@@ -233,7 +233,7 @@ proc newPayload*(ben: BeaconEngineRef,
   trace "Importing block without sethead",
     hash = blockHash, number = header.number
 
-  let vres = await chain.queueImportBlock(blk, finalized = false)
+  let vres = await chain.queueImportBlock(blk)
   if vres.isErr:
     warn "Error importing block",
       number = header.number,

execution_chain/config.nim

@@ -32,7 +32,7 @@ import
   ],
   toml_serialization,
   eth/[common, net/nat, net/nat_toml],
-  ./networking/[bootnodes, eth1_enr as enr],
+  ./networking/bootnodes,
   ./[constants, compile_info, version_info],
   ./common/chain_config,
   ./db/opts

execution_chain/core/block_import.nim

@@ -7,7 +7,7 @@
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   chronicles,
@@ -54,14 +54,14 @@ proc importRlpBlocks*(blocksRlp:seq[byte],
 
     if not printBanner:
       info "Start importing block",
-        hash=blk.header.blockHash.short,
+        hash=blk.header.computeBlockHash.short,
         number=blk.header.number
       printBanner = true
 
-    let res = await chain.importBlock(blk, finalized = false)
+    let res = await chain.importBlock(blk)
     if res.isErr:
       error "Error occured when importing block",
-        hash=blk.header.blockHash.short,
+        hash=blk.header.computeBlockHash.short,
         number=blk.header.number,
         msg=res.error
       if finalize:

execution_chain/core/chain/forked_chain.nim

@@ -329,6 +329,7 @@ Either the consensus client gave invalid information about finalized blocks or
 something else needs attention! Shutting down to preserve the database - restart
 with --debug-eager-state-root."""
 
+  base.txFrame.checkpoint(base.number, skipSnapshot = true)
   c.com.db.persist(base.txFrame)
 
   # Update baseTxFrame when we about to yield to the event loop
@@ -484,7 +485,7 @@ proc validateBlock(c: ForkedChainRef,
   # Update the snapshot before processing the block so that any vertexes in snapshots
   # from lower levels than the baseTxFrame are removed from the snapshot before running
   # the stateroot computation.
-  c.updateSnapshot(blk, txFrame)
+  c.updateSnapshot(parent.blk, parentFrame)
 
   var receipts = c.processBlock(parent, txFrame, blk, blkHash, finalized).valueOr:
     txFrame.dispose()
@@ -634,7 +635,7 @@ proc init*(
 
   fc
 
-proc importBlock*(c: ForkedChainRef, blk: Block, finalized = false):
+proc importBlock*(c: ForkedChainRef, blk: Block):
        Future[Result[void, string]] {.async: (raises: [CancelledError]).} =
   ## Try to import block to canonical or side chain.
   ## return error if the block is invalid
@@ -655,9 +656,13 @@ proc importBlock*(c: ForkedChainRef, blk: Block, finalized = false):
     # to a "staging area" or disk-backed memory but it must not afect `base`.
     # `base` is the point of no return, we only update it on finality.
 
-    let parent = ?(await c.validateBlock(parent, blk, finalized))
+    # Setting the finalized flag to true here has the effect of skipping the
+    # stateroot check for performance reasons.
+    let
+      isFinalized = blk.header.number <= c.latestFinalizedBlockNumber
+      parent = ?(await c.validateBlock(parent, blk, isFinalized))
     if c.quarantine.hasOrphans():
-      c.queueOrphan(parent, finalized)
+      c.queueOrphan(parent, isFinalized)
 
   else:
     # If its parent is an invalid block
@@ -730,9 +735,9 @@ proc stopProcessingQueue*(c: ForkedChainRef) {.async: (raises: []).} =
   # at the same time FC.serialize modify the state, crash can happen.
   await noCancel c.processingQueueLoop.cancelAndWait()
 
-template queueImportBlock*(c: ForkedChainRef, blk: Block, finalized = false): auto =
+template queueImportBlock*(c: ForkedChainRef, blk: Block): auto =
   proc asyncHandler(): Future[Result[void, string]] {.async: (raises: [CancelledError], raw: true).} =
-    c.importBlock(blk, finalized)
+    c.importBlock(blk)
 
   let item = QueueItem(
     responseFut: Future[Result[void, string]].Raising([CancelledError]).init(),

execution_chain/core/chain/forked_chain/chain_serialize.nim

@@ -124,14 +124,17 @@ proc replayBlock(fc: ForkedChainRef;
                  blk: BlockRef): Result[void, string] =
   let
     parentFrame = parent.txFrame
-    txFrame = parentFrame.txFrameBegin
+    txFrame = parentFrame.txFrameBegin()
 
   # Update the snapshot before processing the block so that any vertexes in snapshots
   # from lower levels than the baseTxFrame are removed from the snapshot before running
   # the stateroot computation.
-  fc.updateSnapshot(blk.blk, txFrame)
+  fc.updateSnapshot(parent.blk, parentFrame)
 
-  var receipts = fc.processBlock(parent, txFrame, blk.blk, blk.hash, false).valueOr:
+  # Set finalized to true in order to skip the stateroot check when replaying the
+  # block because the blocks should have already been checked previously during
+  # the initial block execution.
+  var receipts = fc.processBlock(parent, txFrame, blk.blk, blk.hash, finalized = true).valueOr:
     txFrame.dispose()
     return err(error)
 
@@ -315,6 +318,9 @@ proc deserialize*(fc: ForkedChainRef): Result[void, string] =
     ?txFrame.fcuSafe(fc.fcuSafe.hash, fc.fcuSafe.number)
 
   fc.hashToBlock.withValue(fc.pendingFCU, val) do:
+    # Restore finalized marker
+    for it in loopNotFinalized(val[]):
+      it.finalize()
     let txFrame = val[].txFrame
     ?txFrame.fcuFinalized(fc.pendingFCU, fc.latestFinalizedBlockNumber)
 

execution_chain/core/chain/persist_blocks.nim

@@ -8,7 +8,7 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   stew/assign2,
@@ -79,11 +79,11 @@ proc getVmState(
 
   ok(p.vmState)
 
-proc dispose*(p: var Persister) =
+func dispose*(p: var Persister) =
   p.vmState.ledger.txFrame.dispose()
   p.vmState = nil
 
-proc init*(T: type Persister, com: CommonRef, flags: PersistBlockFlags): T =
+func init*(T: type Persister, com: CommonRef, flags: PersistBlockFlags): T =
   T(com: com, flags: flags)
 
 proc checkpoint*(p: var Persister): Result[void, string] =
@@ -95,7 +95,7 @@ proc checkpoint*(p: var Persister): Result[void, string] =
       # TODO replace logging with better error
       debug "wrong state root in block",
         blockNumber = p.parent.number,
-        blockHash = p.parent.blockHash,
+        blockHash = p.parent.computeBlockHash,
         parentHash = p.parent.parentHash,
         expected = p.parent.stateRoot,
         actual = stateRoot

execution_chain/core/eip4844.nim

@@ -8,20 +8,23 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
+{.push raises: [], gcsafe.}
+
 import
   stew/arrayops,
   nimcrypto/sha2,
   results,
   stint,
+  kzg4844/kzg,
   ./eip7691,
   ./pooled_txs,
-  ./lazy_kzg as kzg,
   ../constants,
   ../common/common
 
 from std/sequtils import mapIt
 
-{.push raises: [].}
+export
+  kzg
 
 type
   Bytes64 = array[64, byte]
@@ -201,7 +204,7 @@ proc validateBlobTransactionWrapper4844*(tx: PooledTransaction):
 
   # Verify that commitments match the blobs by checking the KZG proof
   let res = kzg.verifyBlobKzgProofBatch(
-              tx.blobsBundle.blobs.mapIt(kzg.KzgBlob(bytes: it.bytes)),
+              tx.blobsBundle.blobs.mapIt(kzg.KzgBlob(bytes: it.data)),
               commitments,
               tx.blobsBundle.proofs.mapIt(kzg.KzgProof(bytes: it.data)))
 

execution_chain/core/eip7594.nim

@@ -12,8 +12,7 @@
 import
   ../constants,
   ./eip4844,
-  ./pooled_txs,
-  /lazy_kzg as kzg
+  ./pooled_txs
 
 from std/sequtils import mapIt
 

execution_chain/core/executor/process_block.nim

@@ -220,7 +220,7 @@ proc procBlkEpilogue(
       # TODO replace logging with better error
       debug "wrong state root in block",
         blockNumber = header.number,
-        blockHash = header.blockHash,
+        blockHash = header.computeBlockHash,
         parentHash = header.parentHash,
         expected = header.stateRoot,
         actual = stateRoot,
@@ -242,7 +242,7 @@ proc procBlkEpilogue(
         debug "wrong receiptRoot in block",
           blockNumber = header.number,
           parentHash = header.parentHash.short,
-          blockHash = header.blockHash.short,
+          blockHash = header.computeBlockHash.short,
           actual = receiptsRoot,
           expected = header.receiptsRoot
         return err("receiptRoot mismatch")
@@ -263,7 +263,7 @@ proc procBlkEpilogue(
         debug "wrong requestsHash in block",
           blockNumber = header.number,
           parentHash = header.parentHash.short,
-          blockHash = header.blockHash.short,
+          blockHash = header.computeBlockHash.short,
           actual = requestsHash,
           expected = header.requestsHash.get
         return err("requestsHash mismatch")