diff --git a/beacon_chain/spec/presets.nim b/beacon_chain/spec/presets.nim index d8785505e..ddd3b3f95 100644 --- a/beacon_chain/spec/presets.nim +++ b/beacon_chain/spec/presets.nim @@ -444,6 +444,13 @@ elif const_preset == "gnosis": MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 16384, # `6` # TODO BLOB_SIDECAR_SUBNET_COUNT: 6, + # EIP-7594 + # `2**7` (=128) + # TODO MAX_REQUEST_BLOCKS_DENEB: 128, + # MAX_REQUEST_BLOCKS_DENEB * NUMBER_OF_COLUMNS + # TODO MAX_REQUEST_BLOB_SIDECARS: 768, + # `2**12` (= 4096 epochs, ~18 days) + MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 16384 ) elif const_preset == "minimal": diff --git a/beacon_chain/sync/sync_manager.nim b/beacon_chain/sync/sync_manager.nim index 31d36c213..43764ebab 100644 --- a/beacon_chain/sync/sync_manager.nim +++ b/beacon_chain/sync/sync_manager.nim @@ -195,8 +195,8 @@ proc shouldGetBlobs[A, B](man: SyncManager[A, B], e: Epoch): bool = proc shouldGetDataColumns[A, B](man: SyncManager[A, B], e: Epoch): bool = let wallEpoch = man.getLocalWallSlot().epoch e >= man.DENEB_FORK_EPOCH and - (wallEpoch < man.MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS or - e >= wallEpoch - man.MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS) + (wallEpoch < man.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS or + e >= wallEpoch - man.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS) proc getBlobSidecars[A, B](man: SyncManager[A, B], peer: A, req: SyncRequest): Future[BlobSidecarsRes] @@ -641,6 +641,9 @@ proc syncStep[A, B](man: SyncManager[A, B], index: int, peer: A) break hasColumns + debugEcho "Has Columns" + debugEcho hasColumns + let dataColumnData = if shouldGetDataColumns and man.filterCustodyPeersBeforeColumnSync(peer): let data_columns = await man.getDataColumnSidecars(peer, req) @@ -688,6 +691,8 @@ proc syncStep[A, B](man: SyncManager[A, B], index: int, peer: A) else: Opt.none(seq[DataColumnSidecars]) + debugEcho "Data column while syncing" + debugEcho dataColumnData.get.mapIt(it[]) if len(blockData) == 0 and man.direction == SyncQueueKind.Backward and req.contains(man.getSafeSlot()): diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index b5fb7b3a9..21cbe3a91 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit b5fb7b3a97d8977d969d786633f70c4094cd0eaf +Subproject commit 21cbe3a91a70811522554e89e6a791172cebfef2