diff --git a/beacon_chain/spec/eip7594_helpers.nim b/beacon_chain/spec/eip7594_helpers.nim index 9005942de..33277ff48 100644 --- a/beacon_chain/spec/eip7594_helpers.nim +++ b/beacon_chain/spec/eip7594_helpers.nim @@ -241,8 +241,8 @@ proc get_data_column_sidecars*(signed_block: deneb.SignedBeaconBlock | electra.S column: column, kzgCommitments: blck.body.blob_kzg_commitments, kzgProofs: kzgProofOfColumn, - signed_block_header: signed_block_header - + signed_block_header: signed_block_header, + kzg_commitments_inclusion_proof: kzg_incl_proof ) ok(sidecars) diff --git a/beacon_chain/sync/request_manager.nim b/beacon_chain/sync/request_manager.nim index 29f8cb489..53ce48d4f 100644 --- a/beacon_chain/sync/request_manager.nim +++ b/beacon_chain/sync/request_manager.nim @@ -31,11 +31,13 @@ const ## `beaconBlocksByRoot` invocation. PARALLEL_REQUESTS* = 8 ## Number of peers we using to resolve our request. + + PARALLEL_REQUESTS_DATA_COLUMNS* = 50 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* = 8 * 1_000_000_000 + DATA_COLUMN_GOSSIP_WAIT_TIME_NS* = 500_000_000 POLL_INTERVAL = 1.seconds @@ -563,8 +565,8 @@ proc requestManagerDataColumnLoop( debug "Requesting detected missing data columns", columns = shortLog(columnIds) let start = SyncMoment.now(0) var workers: - array[PARALLEL_REQUESTS, Future[void].Raising([CancelledError])] - for i in 0..