Post-rebase fixes.

Author: cheatfate

beacon_chain/sync/sync_overseer2.nim

@@ -563,7 +563,11 @@ proc createQueues(
           cres =
             if commitmentsLen > 0:
               if overseer.shouldGetColumns(forkyBlck.message.slot):
-                let res = overseer.columnQuarantine[].popSidecars(forkyBlck)
+                let res =
+                  if len(forkyBlck.message.body.blob_kzg_commitments) == 0:
+                    Opt.some(default(fulu.DataColumnSidecars))
+                  else:
+                    overseer.columnQuarantine[].popSidecars(forkyBlck.root)
                 if res.isNone():
                   debug "Block verification failed, because sidecars missing",
                     fork = consensusFork,
@@ -947,7 +951,10 @@ proc verifyBlock(
     elif consensusFork == ConsensusFork.Fulu:
       if overseer.shouldGetColumns(forkyBlck.message.slot):
         let cres =
-          overseer.columnQuarantine[].popSidecars(forkyBlck.root, forkyBlck)
+          if len(forkyBlck.message.body.blob_kzg_commitments) == 0:
+            Opt.some(default(fulu.DataColumnSidecars))
+          else:
+            overseer.columnQuarantine[].popSidecars(forkyBlck.root)
         if cres.isSome():
           let res =
             await overseer.blockProcessor.addBlock(