@@ -472,21 +472,8 @@ proc initFullNode(
472
472
maybeFinalized: bool ):
473
473
Future [Result [void , VerifierError ]] {.async : (raises: [CancelledError ]).} =
474
474
withBlck (signedBlock):
475
- when consensusFork >= ConsensusFork .Deneb :
476
- if not blobQuarantine[].hasBlobs (forkyBlck):
477
- # We don't have all the blobs for this block, so we have
478
- # to put it in blobless quarantine.
479
- if not quarantine[].addBlobless (dag.finalizedHead.slot, forkyBlck):
480
- err (VerifierError .UnviableFork )
481
- else :
482
- err (VerifierError .MissingParent )
483
- else :
484
- let blobs = blobQuarantine[].popBlobs (forkyBlck.root, forkyBlck)
485
- await blockProcessor[].addBlock (MsgSource .gossip, signedBlock,
486
- Opt .some (blobs), Opt .none (DataColumnSidecars ),
487
- maybeFinalized = maybeFinalized)
488
-
489
- elif consensusFork >= ConsensusFork .Fulu :
475
+ # Keeping Fulu first else >= Deneb means Fulu case never hits
476
+ when consensusFork >= ConsensusFork .Fulu :
490
477
if not dataColumnQuarantine[].supernode and
491
478
not dataColumnQuarantine[].hasMissingDataColumns (forkyBlck):
492
479
if not quarantine[].addColumnless (dag.finalizedHead.slot, forkyBlck):
@@ -505,6 +492,19 @@ proc initFullNode(
505
492
await blockProcessor[].addBlock (MsgSource .gossip, signedBlock,
506
493
Opt .none (BlobSidecars ), Opt .some (dataColumns),
507
494
maybeFinalized = maybeFinalized)
495
+ elif consensusFork >= ConsensusFork .Deneb :
496
+ if not blobQuarantine[].hasBlobs (forkyBlck):
497
+ # We don't have all the blobs for this block, so we have
498
+ # to put it in blobless quarantine.
499
+ if not quarantine[].addBlobless (dag.finalizedHead.slot, forkyBlck):
500
+ err (VerifierError .UnviableFork )
501
+ else :
502
+ err (VerifierError .MissingParent )
503
+ else :
504
+ let blobs = blobQuarantine[].popBlobs (forkyBlck.root, forkyBlck)
505
+ await blockProcessor[].addBlock (MsgSource .gossip, signedBlock,
506
+ Opt .some (blobs), Opt .none (DataColumnSidecars ),
507
+ maybeFinalized = maybeFinalized)
508
508
509
509
else :
510
510
await blockProcessor[].addBlock (MsgSource .gossip, signedBlock,
0 commit comments