feat: envelope backfilling

Author: ahshum

beacon_chain/consensus_object_pools/block_clearance.nim

@@ -532,6 +532,60 @@ proc addHeadExecutionPayload*(
 
   ok(blck)
 
+proc addBackfillExecutionPayload*(
+    dag: ChainDAGRef,
+    signedEnvelope: gloas.SignedExecutionPayloadEnvelope,
+                    # gloas.TrustedSignedExecutionPayloadEnvelope,
+): Result[void, VerifierError] =
+  template blockRoot(): auto = signedEnvelope.message.beacon_block_root
+  template envelope(): auto = signedEnvelope.message
+
+  logScope:
+    blockRoot = shortLog(blockRoot)
+    slot = envelope.slot
+    signature = shortLog(signedEnvelope.signature)
+    backfill = shortLog(dag.backfill)
+
+  let startTick = Moment.now()
+
+  # When a valid block is backfilled, dag.backfill has already moved to next
+  # parent. So we need to check with finalizedHead and database.
+  if envelope.slot > dag.finalizedHead.slot:
+    return err(VerifierError.Invalid)
+  let bsi = dag.getBlockIdAtSlot(envelope.slot).valueOr:
+    # This should not be happening as we backfill envelope after the block is
+    # backfilled successfully.
+    return err(VerifierError.Invalid)
+  if blockRoot != bsi.bid.root:
+    return err(VerifierError.Invalid)
+  if dag.db.containsExecutionPayloadEnvelope(blockRoot):
+    return err(VerifierError.Duplicate)
+
+  # Verify signature
+  when signedEnvelope.signature isnot TrustedSig:
+    let builderKey = dag.validatorKey(envelope.builder_index).valueOr:
+      fatal "Invalid builder in backfill envelope - checkpoint state corrupt?",
+        head = shortLog(dag.head), tail = shortLog(dag.tail)
+      quit 1
+    if not verify_execution_payload_envelope_signature(
+        dag.forkAtEpoch(envelope.slot.epoch),
+        dag.genesis_validators_root,
+        envelope.slot.epoch,
+        envelope,
+        builderKey,
+        signedEnvelope.signature):
+      return err(VerifierError.Invalid)
+  let sigVerifyTick = Moment.now
+
+  dag.db.putExecutionPayloadEnvelope(signedEnvelope)
+  let putBlockTick = Moment.now
+
+  debug "Envelope backfilled",
+    sigVerifyDur = sigVerifyTick - startTick,
+    putBlockDur = putBlockTick - sigVerifyTick
+
+  ok()
+
 proc verifyBlockSignatures*(
     verifier: var BatchVerifier,
     fork: Fork,

beacon_chain/gossip_processing/block_processor.nim

@@ -186,7 +186,8 @@ proc dumpBlock(
       discard
 
 from ../consensus_object_pools/block_clearance import
-  addBackfillBlock, addHeadBlockWithParent, checkHeadBlock, verifyBlockProposer
+  addBackfillBlock, addBackfillExecutionPayload,
+  addHeadBlockWithParent, checkHeadBlock, verifyBlockProposer
 
 proc verifySidecars(
     signedBlock: ForkySignedBeaconBlock,
@@ -890,6 +891,22 @@ proc addBlock*(
     of VerifierError.Duplicate:
       err(res.error())
 
+proc storeBackfillPayload(
+    self: ref BlockProcessor,
+    signedBlock: gloas.SignedBeaconBlock,
+    signedEnvelope: gloas.SignedExecutionPayloadEnvelope,
+    sidecarsOpt: Opt[gloas.DataColumnSidecars],
+): Result[void, VerifierError] =
+  self.envelopeQuarantine[].remove(signedEnvelope.message.beacon_block_root)
+
+  ?verifySidecars(signedBlock, signedEnvelope, sidecarsOpt)
+
+  self.consensusManager.dag.addBackfillExecutionPayload(signedEnvelope).isOkOr:
+    return err(error)
+
+  self[].storeSidecars(sidecarsOpt)
+  ok()
+
 proc storePayload(
     self: ref BlockProcessor,
     signedBlock: gloas.SignedBeaconBlock,