status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-19 19:09:08 +00:00
Code Issues Projects Releases Wiki Activity

fixes related to reconstruction

Browse Source
This commit is contained in:
Agnish Ghosh 2024-08-19 01:23:37 +05:30
parent 831089825c
commit 15a302cea2
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
beacon_chain/gossip_processing/block_processor.nim
View File

@ -487,9 +487,17 @@ proc storeBlock(
signature = shortLog(signedBlock.signature), signature = shortLog(signedBlock.signature),
err = r.error() err = r.error()
else: else:
if blobsOpt.isSome: # if blobsOpt.isSome:
for blobSidecar in blobsOpt.get: # for blobSidecar in blobsOpt.get:
self.blobQuarantine[].put(blobSidecar) # self.blobQuarantine[].put(blobSidecar)
# debug "Block quarantined",
# blockRoot = shortLog(signedBlock.root),
# blck = shortLog(signedBlock.message),
# signature = shortLog(signedBlock.signature)
if dataColumnsOpt.isSome:
for dataColumnSidecar in dataColumnsOpt.get:
self.dataColumnQuarantine[].put(dataColumnSidecar)
debug "Block quarantined", debug "Block quarantined",
blockRoot = shortLog(signedBlock.root), blockRoot = shortLog(signedBlock.root),
blck = shortLog(signedBlock.message), blck = shortLog(signedBlock.message),

10
beacon_chain/nimbus_beacon_node.nim
View File

@ -1538,6 +1538,12 @@ proc reconstructAndSendDataColumns*(node: BeaconNode) {.async.} =
db = node.db db = node.db
root = node.dag.head.root root = node.dag.head.root
let localCustodySubnetCount =
if self.config.subscribeAllSubnets:
DATA_COLUMN_SIDECAR_SUBNET_COUNT.uint64
else:
CUSTODY_REQUIREMENT
let blck = getForkedBlock(db, root).valueOr: return let blck = getForkedBlock(db, root).valueOr: return
withBlck(blck): withBlck(blck):
when typeof(forkyBlck).kind < ConsensusFork.Deneb: return when typeof(forkyBlck).kind < ConsensusFork.Deneb: return
@ -1548,7 +1554,7 @@ proc reconstructAndSendDataColumns*(node: BeaconNode) {.async.} =
let custody_columns = get_custody_columns( let custody_columns = get_custody_columns(
node.network.nodeId, node.network.nodeId,
CUSTODY_REQUIREMENT) localCustodySubnetCount)
var var
data_column_sidecars: DataColumnSidecars data_column_sidecars: DataColumnSidecars
columnsOk = true columnsOk = true
@ -1613,7 +1619,7 @@ proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} =
# the pruning for later # the pruning for later
node.dag.pruneHistory() node.dag.pruneHistory()
node.pruneBlobs(slot) node.pruneBlobs(slot)
# node.pruneDataColumns(slot) node.pruneDataColumns(slot)
when declared(GC_fullCollect): when declared(GC_fullCollect):
# The slots in the beacon node work as frames in a game: we want to make # The slots in the beacon node work as frames in a game: we want to make