From 04fd58efbf65ef79a594d3148617b12f6442e69a Mon Sep 17 00:00:00 2001 From: Agnish Ghosh Date: Sun, 18 Aug 2024 04:11:39 +0530 Subject: [PATCH] disable valid csc set experimentally --- beacon_chain/sync/request_manager.nim | 58 +++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/beacon_chain/sync/request_manager.nim b/beacon_chain/sync/request_manager.nim index e305ac71e..6be20a4ef 100644 --- a/beacon_chain/sync/request_manager.nim +++ b/beacon_chain/sync/request_manager.nim @@ -349,37 +349,37 @@ proc fetchDataColumnsFromNetwork(rman: RequestManager, try: peer = await rman.network.peerPool.acquire() - # Create a peer list, which shall be later trimmed off as to which - # of the peers have the valid custody columns - peers.add(peer) - let validPeers = rman.constructValidCustodyPeers(peers) - if peer in validPeers: - debug "Requesting data columns by root", peer = peer, columns = shortLog(colIdList), - peer_score = peer.getScore() - let columns = await dataColumnSidecarsByRoot(peer, DataColumnIdentifierList colIdList) + # # Create a peer list, which shall be later trimmed off as to which + # # of the peers have the valid custody columns + # peers.add(peer) + # let validPeers = rman.constructValidCustodyPeers(peers) + # if peer in validPeers: + debug "Requesting data columns by root", peer = peer, columns = shortLog(colIdList), + peer_score = peer.getScore() + let columns = await dataColumnSidecarsByRoot(peer, DataColumnIdentifierList colIdList) - if columns.isOk: - let ucolumns = columns.get() - if not checkResponse(colIdList, ucolumns.asSeq()): - debug "Mismatched response to data columns by root", - peer = peer, columns = shortLog(colIdList), ucolumns = len(ucolumns) - # peer.updateScore(PeerScoreBadResponse) - return + if columns.isOk: + let ucolumns = columns.get() + if not checkResponse(colIdList, ucolumns.asSeq()): + debug "Mismatched response to data columns by root", + peer = peer, columns = shortLog(colIdList), ucolumns = len(ucolumns) + # peer.updateScore(PeerScoreBadResponse) + return - for col in ucolumns: - rman.dataColumnQuarantine[].put(col) - var curRoot: Eth2Digest - for col in ucolumns: - let block_root = hash_tree_root(col.signed_block_header.message) - if block_root != curRoot: - curRoot = block_root - if (let o = rman.quarantine[].popColumnless(curRoot); o.isSome): - let col = o.unsafeGet() - discard await rman.blockVerifier(col, false) - else: - debug "Data columns by root request failed", - peer = peer, columns = shortLog(colIdList), err = columns.error() - # peer.updateScore(PeerScoreNoValues) + for col in ucolumns: + rman.dataColumnQuarantine[].put(col) + var curRoot: Eth2Digest + for col in ucolumns: + let block_root = hash_tree_root(col.signed_block_header.message) + if block_root != curRoot: + curRoot = block_root + if (let o = rman.quarantine[].popColumnless(curRoot); o.isSome): + let col = o.unsafeGet() + discard await rman.blockVerifier(col, false) + else: + debug "Data columns by root request failed", + peer = peer, columns = shortLog(colIdList), err = columns.error() + # peer.updateScore(PeerScoreNoValues) finally: if not(isNil(peer)):