made some rebase related fixes

Author: agnxsh

beacon_chain/gossip_processing/eth2_processor.nim

@@ -254,10 +254,6 @@ proc processSignedBeaconBlock*(
     let blobs =
       when typeof(signedBlock).kind >= ConsensusFork.Deneb and
           typeof(signedBlock).kind < ConsensusFork.Fulu:
-        if self.blobQuarantine[].hasBlobs(signedBlock):
-          Opt.some(self.blobQuarantine[].popBlobs(signedBlock.root, signedBlock))
-      when typeof(signedBlock).kind >= ConsensusFork.Deneb and
-          typeof(signedBlock).kind < ConsensusFork.Fulu::
         let bres =
           self.blobQuarantine[].popSidecars(signedBlock.root, signedBlock)
         if bres.isSome():

beacon_chain/nimbus_beacon_node.nim

@@ -478,8 +478,6 @@ proc initFullNode(
                                              maybeFinalized = maybeFinalized)
         elif consensusFork >= ConsensusFork.Deneb and
             consensusFork < ConsensusFork.Fulu:
-          if not blobQuarantine[].hasBlobs(forkyBlck):
-        when consensusFork >= ConsensusFork.Deneb:
           let bres = blobQuarantine[].popSidecars(forkyBlck.root, forkyBlck)
           if bres.isSome():
             await blockProcessor[].addBlock(MsgSource.gossip, signedBlock, bres,

beacon_chain/rpc/rest_config_api.nim

@@ -300,11 +300,10 @@ proc installConfigApiHandlers*(router: var RestRouter, node: BeaconNode) =
             Base10.toString(cfg.VALIDATOR_CUSTODY_REQUIREMENT.uint64),
           BALANCE_PER_ADDITIONAL_CUSTODY_GROUP:
             Base10.toString(cfg.BALANCE_PER_ADDITIONAL_CUSTODY_GROUP),
-          # MAX_BLOBS_PER_BLOCK_FULU:
-          #   Base10.toString(cfg.MAX_BLOBS_PER_BLOCK_FULU),
-            Base10.toString(BALANCE_PER_ADDITIONAL_CUSTODY_GROUP),
-          # MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS:
-          #   Base10.toString(cfg.MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS),
+          MAX_BLOBS_PER_BLOCK_FULU:
+            Base10.toString(cfg.MAX_BLOBS_PER_BLOCK_FULU),
+          MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS:
+            Base10.toString(cfg.MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS),
 
           # https://github.com/ethereum/consensus-specs/blob/v1.4.0-alpha.3/specs/phase0/beacon-chain.md#constants
           # GENESIS_SLOT

beacon_chain/spec/presets.nim

@@ -328,7 +328,7 @@ when const_preset == "mainnet":
     VALIDATOR_CUSTODY_REQUIREMENT: 8,
     BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000'u64,
     MAX_BLOBS_PER_BLOCK_FULU: 12,
-    MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
+    MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096,
     # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/fulu/das-core.md#get_max_blobs_per_block
     # provides sorting rules.
     BLOB_SCHEDULE: @[
@@ -668,7 +668,7 @@ elif const_preset == "minimal":
     VALIDATOR_CUSTODY_REQUIREMENT: 8,
     BALANCE_PER_ADDITIONAL_CUSTODY_GROUP: 32000000000'u64,
     MAX_BLOBS_PER_BLOCK_FULU: 12,
-    MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
+    MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096,
     # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/fulu/das-core.md#get_max_blobs_per_block
     # provides sorting rules.
     BLOB_SCHEDULE: @[