From 0f659a0c1ffe6b77a0f1c718d85de5b0ad28bba2 Mon Sep 17 00:00:00 2001 From: Agnish Ghosh Date: Tue, 12 Nov 2024 15:18:12 +0700 Subject: [PATCH] revert to reconstructing from gossip first --- beacon_chain/gossip_processing/eth2_processor.nim | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/beacon_chain/gossip_processing/eth2_processor.nim b/beacon_chain/gossip_processing/eth2_processor.nim index 1160980e4..d49a33e0a 100644 --- a/beacon_chain/gossip_processing/eth2_processor.nim +++ b/beacon_chain/gossip_processing/eth2_processor.nim @@ -418,10 +418,6 @@ proc processDataColumnSidecar*( elif self.dataColumnQuarantine[].hasEnoughDataColumns(forkyBlck): let columns = self.dataColumnQuarantine[].gatherDataColumns(block_root) - self.blockProcessor[].enqueueBlock( - MsgSource.gossip, columnless, - Opt.none(BlobSidecars), - Opt.some(self.dataColumnQuarantine[].popDataColumns(block_root, forkyBlck))) if columns.len >= (NUMBER_OF_COLUMNS div 2) and self.dataColumnQuarantine[].supernode: let @@ -430,7 +426,10 @@ proc processDataColumnSidecar*( for rc in reconstructed_columns.get: if rc notin self.dataColumnQuarantine[].gatherDataColumns(block_root).mapIt(it[]): self.dataColumnQuarantine[].put(newClone(rc)) - + self.blockProcessor[].enqueueBlock( + MsgSource.gossip, columnless, + Opt.none(BlobSidecars), + Opt.some(self.dataColumnQuarantine[].popDataColumns(block_root, forkyBlck))) else: discard self.quarantine[].addColumnless( self.dag.finalizedHead.slot, forkyBlck)