From 49977242bd44490f6f626028e53b71ad916d9a49 Mon Sep 17 00:00:00 2001 From: Agnish Ghosh Date: Sat, 5 Oct 2024 02:03:50 +0530 Subject: [PATCH] gossip and polling fixes --- beacon_chain/gossip_processing/gossip_validation.nim | 2 -- beacon_chain/sync/request_manager.nim | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/beacon_chain/gossip_processing/gossip_validation.nim b/beacon_chain/gossip_processing/gossip_validation.nim index f304529b0..c959dbcb3 100644 --- a/beacon_chain/gossip_processing/gossip_validation.nim +++ b/beacon_chain/gossip_processing/gossip_validation.nim @@ -522,8 +522,6 @@ proc validateDataColumnSidecar*( # (block_header.slot, block_header.proposer_index, blob_sidecar.index) # with valid header signature, sidecar inclusion proof, and kzg proof. let block_root = hash_tree_root(block_header) - if dag.getBlockRef(block_root).isSome(): - return errIgnore("DataColumnSidecar: already have block") if dataColumnQuarantine[].hasDataColumn( block_header.slot, block_header.proposer_index, data_column_sidecar.index): return errIgnore("DataColumnSidecar: already have valid data column from same proposer") diff --git a/beacon_chain/sync/request_manager.nim b/beacon_chain/sync/request_manager.nim index 58dc94f85..6882d0bbd 100644 --- a/beacon_chain/sync/request_manager.nim +++ b/beacon_chain/sync/request_manager.nim @@ -38,10 +38,9 @@ const BLOB_GOSSIP_WAIT_TIME_NS* = 2 * 1_000_000_000 ## How long to wait for blobs to arrive over gossip before fetching. - DATA_COLUMN_GOSSIP_WAIT_TIME_NS* = 5 * 1_000_000_000 + DATA_COLUMN_GOSSIP_WAIT_TIME_NS* = 2 * 1_000_000_000 POLL_INTERVAL = 1.seconds - POLL_INTERVAL_FOR_DATA_COLUMNS = 60.seconds type @@ -532,7 +531,6 @@ proc getMissingDataColumns(rman: RequestManager): seq[DataColumnIdentifier] = fetches: seq[DataColumnIdentifier] ready: seq[Eth2Digest] - return fetches for columnless in rman.quarantine[].peekColumnless(): withBlck(columnless): when consensusFork >= ConsensusFork.Deneb: @@ -577,7 +575,7 @@ proc requestManagerDataColumnLoop( rman: RequestManager) {.async: (raises: [CancelledError]).} = while true: - await sleepAsync(POLL_INTERVAL_FOR_DATA_COLUMNS) + await sleepAsync(POLL_INTERVAL) if rman.inhibit(): continue