@lodestar/beacon-node 1.35.0-dev.8cacf063da → 1.35.0-dev.8ea34e52ba

package/lib/sync/range/batch.d.ts

@@ -1,9 +1,13 @@
 import { ChainForkConfig } from "@lodestar/config";
-import { Epoch, RootHex, phase0 } from "@lodestar/types";
+import { ForkName } from "@lodestar/params";
+import { Epoch, RootHex, Slot } from "@lodestar/types";
 import { LodestarError } from "@lodestar/utils";
-import { BlockInput } from "../../chain/blocks/types.js";
-import { PartialDownload } from "../../network/reqresp/beaconBlocksMaybeBlobsByRange.js";
+import { IBlockInput } from "../../chain/blocks/blockInput/types.js";
+import { CustodyConfig } from "../../util/dataColumns.js";
 import { PeerIdStr } from "../../util/peerId.js";
+import { DownloadByRangeRequests } from "../utils/downloadByRange.js";
+import { PeerSyncMeta } from "../../network/peers/peersData.js";
+import { IClock } from "../../util/clock.js";
 /**
  * Current state of a batch
  */
@@ -27,39 +31,35 @@ export declare enum BatchStatus {
 }
 export type Attempt = {
     /** The peer that made the attempt */
-    peer: PeerIdStr;
+    peers: PeerIdStr[];
     /** The hash of the blocks of the attempt */
     hash: RootHex;
 };
-export type BatchState = {
+export type AwaitingDownloadState = {
     status: BatchStatus.AwaitingDownload;
-    partialDownload: PartialDownload;
-} | {
-    status: BatchStatus.Downloading;
-    peer: PeerIdStr;
-    partialDownload: PartialDownload;
-} | {
+    blocks: IBlockInput[];
+};
+export type DownloadSuccessState = {
     status: BatchStatus.AwaitingProcessing;
+    blocks: IBlockInput[];
+};
+export type BatchState = AwaitingDownloadState | {
+    status: BatchStatus.Downloading;
     peer: PeerIdStr;
-    blocks: BlockInput[];
-} | {
+    blocks: IBlockInput[];
+} | DownloadSuccessState | {
     status: BatchStatus.Processing;
+    blocks: IBlockInput[];
     attempt: Attempt;
 } | {
     status: BatchStatus.AwaitingValidation;
+    blocks: IBlockInput[];
     attempt: Attempt;
 };
 export type BatchMetadata = {
     startEpoch: Epoch;
     status: BatchStatus;
 };
-export type DownloadSuccessOutput = {
-    status: BatchStatus.AwaitingProcessing;
-    blocks: BlockInput[];
-} | {
-    status: BatchStatus.AwaitingDownload;
-    pendingDataColumns: number[];
-};
 /**
  * Batches are downloaded at the first block of the epoch.
  *
@@ -72,11 +72,16 @@ export type DownloadSuccessOutput = {
  * Jul2022: Offset changed from 1 to 0, see rationale in {@link BATCH_SLOT_OFFSET}
  */
 export declare class Batch {
+    readonly forkName: ForkName;
     readonly startEpoch: Epoch;
+    readonly startSlot: Slot;
+    readonly count: number;
+    /** Block, blob and column requests that are used to determine the best peer and are used in downloadByRange */
+    requests: DownloadByRangeRequests;
     /** State of the batch. */
     state: BatchState;
-    /** BeaconBlocksByRangeRequest */
-    readonly request: phase0.BeaconBlocksByRangeRequest;
+    /** Peers that provided good data */
+    goodPeers: PeerIdStr[];
     /** The `Attempts` that have been made and failed to send us this batch. */
     readonly failedProcessingAttempts: Attempt[];
     /** The `Attempts` that have been made and failed because of execution malfunction. */
@@ -84,32 +89,39 @@ export declare class Batch {
     /** The number of download retries this batch has undergone due to a failed request. */
     private readonly failedDownloadAttempts;
     private readonly config;
-    constructor(startEpoch: Epoch, config: ChainForkConfig);
+    private readonly clock;
+    private readonly custodyConfig;
+    constructor(startEpoch: Epoch, config: ChainForkConfig, clock: IClock, custodyConfig: CustodyConfig);
+    /**
+     * Builds ByRange requests for block, blobs and columns
+     */
+    private getRequests;
+    /**
+     * Post-fulu we should only get columns that peer has advertised
+     */
+    getRequestsForPeer(peer: PeerSyncMeta): DownloadByRangeRequests;
     /**
      * Gives a list of peers from which this batch has had a failed download or processing attempt.
      */
     getFailedPeers(): PeerIdStr[];
     getMetadata(): BatchMetadata;
+    getBlocks(): IBlockInput[];
     /**
      * AwaitingDownload -> Downloading
      */
-    startDownloading(peer: PeerIdStr): PartialDownload;
+    startDownloading(peer: PeerIdStr): void;
     /**
      * Downloading -> AwaitingProcessing
-     * pendingDataColumns is null when a complete download is done, otherwise it contains the columns that are still pending
      */
-    downloadingSuccess(downloadResult: {
-        blocks: BlockInput[];
-        pendingDataColumns: null | number[];
-    }): DownloadSuccessOutput;
+    downloadingSuccess(peer: PeerIdStr, blocks: IBlockInput[]): DownloadSuccessState;
     /**
      * Downloading -> AwaitingDownload
      */
-    downloadingError(): void;
+    downloadingError(peer: PeerIdStr): void;
     /**
      * AwaitingProcessing -> Processing
      */
-    startProcessing(): BlockInput[];
+    startProcessing(): IBlockInput[];
     /**
      * Processing -> AwaitingValidation
      */
@@ -126,7 +138,6 @@ export declare class Batch {
      * AwaitingValidation -> Done
      */
     validationSuccess(): Attempt;
-    isPostFulu(): boolean;
     private onExecutionEngineError;
     private onProcessingError;
     /** Helper to construct typed BatchError. Stack traces are correct as the error is thrown above */
@@ -135,6 +146,7 @@ export declare class Batch {
 }
 export declare enum BatchErrorCode {
     WRONG_STATUS = "BATCH_ERROR_WRONG_STATUS",
+    INVALID_COUNT = "BATCH_ERROR_INVALID_COUNT",
     MAX_DOWNLOAD_ATTEMPTS = "BATCH_ERROR_MAX_DOWNLOAD_ATTEMPTS",
     MAX_PROCESSING_ATTEMPTS = "BATCH_ERROR_MAX_PROCESSING_ATTEMPTS",
     MAX_EXECUTION_ENGINE_ERROR_ATTEMPTS = "MAX_EXECUTION_ENGINE_ERROR_ATTEMPTS"
@@ -142,6 +154,10 @@ export declare enum BatchErrorCode {
 type BatchErrorType = {
     code: BatchErrorCode.WRONG_STATUS;
     expectedStatus: BatchStatus;
+} | {
+    code: BatchErrorCode.INVALID_COUNT;
+    count: number;
+    expected: number;
 } | {
     code: BatchErrorCode.MAX_DOWNLOAD_ATTEMPTS;
 } | {

package/lib/sync/range/batch.js

@@ -1,8 +1,10 @@
-import { ForkSeq } from "@lodestar/params";
+import { isForkPostDeneb, isForkPostFulu } from "@lodestar/params";
 import { LodestarError } from "@lodestar/utils";
+import { isBlockInputColumns } from "../../chain/blocks/blockInput/blockInput.js";
 import { BlockError, BlockErrorCode } from "../../chain/errors/index.js";
 import { MAX_BATCH_DOWNLOAD_ATTEMPTS, MAX_BATCH_PROCESSING_ATTEMPTS } from "../constants.js";
 import { getBatchSlotRange, hashBlocks } from "./utils/index.js";
+import { isDaOutOfRange } from "../../chain/blocks/blockInput/utils.js";
 /**
  * Current state of a batch
  */
@@ -37,33 +39,172 @@ export var BatchStatus;
  * Jul2022: Offset changed from 1 to 0, see rationale in {@link BATCH_SLOT_OFFSET}
  */
 export class Batch {
-    constructor(startEpoch, config) {
-        /** State of the batch. */
-        this.state = { status: BatchStatus.AwaitingDownload, partialDownload: null };
-        /** The `Attempts` that have been made and failed to send us this batch. */
-        this.failedProcessingAttempts = [];
-        /** The `Attempts` that have been made and failed because of execution malfunction. */
-        this.executionErrorAttempts = [];
-        /** The number of download retries this batch has undergone due to a failed request. */
-        this.failedDownloadAttempts = [];
-        const { startSlot, count } = getBatchSlotRange(startEpoch);
+    forkName;
+    startEpoch;
+    startSlot;
+    count;
+    /** Block, blob and column requests that are used to determine the best peer and are used in downloadByRange */
+    requests;
+    /** State of the batch. */
+    state = { status: BatchStatus.AwaitingDownload, blocks: [] };
+    /** Peers that provided good data */
+    goodPeers = [];
+    /** The `Attempts` that have been made and failed to send us this batch. */
+    failedProcessingAttempts = [];
+    /** The `Attempts` that have been made and failed because of execution malfunction. */
+    executionErrorAttempts = [];
+    /** The number of download retries this batch has undergone due to a failed request. */
+    failedDownloadAttempts = [];
+    config;
+    clock;
+    custodyConfig;
+    constructor(startEpoch, config, clock, custodyConfig) {
         this.config = config;
+        this.clock = clock;
+        this.custodyConfig = custodyConfig;
+        const { startSlot, count } = getBatchSlotRange(startEpoch);
+        this.forkName = this.config.getForkName(startSlot);
         this.startEpoch = startEpoch;
-        this.request = {
-            startSlot,
-            count,
-            step: 1,
+        this.startSlot = startSlot;
+        this.count = count;
+        this.requests = this.getRequests([]);
+    }
+    /**
+     * Builds ByRange requests for block, blobs and columns
+     */
+    getRequests(blocks) {
+        const withinValidRequestWindow = !isDaOutOfRange(this.config, this.forkName, this.startSlot, this.clock.currentEpoch);
+        // fresh request where no blocks have started to be pulled yet
+        if (!blocks.length) {
+            const blocksRequest = {
+                startSlot: this.startSlot,
+                count: this.count,
+                step: 1,
+            };
+            if (isForkPostFulu(this.forkName) && withinValidRequestWindow) {
+                return {
+                    blocksRequest,
+                    columnsRequest: {
+                        startSlot: this.startSlot,
+                        count: this.count,
+                        columns: this.custodyConfig.sampledColumns,
+                    },
+                };
+            }
+            if (isForkPostDeneb(this.forkName) && withinValidRequestWindow) {
+                return {
+                    blocksRequest,
+                    blobsRequest: {
+                        startSlot: this.startSlot,
+                        count: this.count,
+                    },
+                };
+            }
+            return {
+                blocksRequest,
+            };
+        }
+        // subsequent request where part of the epoch has already been downloaded. Need to figure out what is the beginning
+        // of the range where download needs to resume
+        let blockStartSlot = this.startSlot;
+        let dataStartSlot = this.startSlot;
+        const neededColumns = new Set();
+        // ensure blocks are in slot-wise order
+        for (const blockInput of blocks) {
+            const blockSlot = blockInput.slot;
+            // check if block/data is present (hasBlock/hasAllData). If present then check if startSlot is the same as
+            // blockSlot. If it is then do not need to pull that slot so increment startSlot by 1. check will fail
+            // if there is a gap and then the blocks/data is present again. to simplify the request just re-pull remainder
+            // of range.
+            //
+            // ie startSlot = 32 and count = 32. so for slots = [32, 33, 34, 35, 36, _, 38, 39, _, _, ... _endSlot=63_]
+            // will return an updated startSlot of 37 and pull range 37-63 on the next request.
+            //
+            // if all slot have already been pulled then the startSlot will eventually get incremented to the slot after
+            // the desired end slot
+            if (blockInput.hasBlock() && blockStartSlot === blockSlot) {
+                blockStartSlot = blockSlot + 1;
+            }
+            if (!blockInput.hasAllData()) {
+                if (isBlockInputColumns(blockInput)) {
+                    for (const index of blockInput.getMissingSampledColumnMeta().missing) {
+                        neededColumns.add(index);
+                    }
+                }
+            }
+            else if (dataStartSlot === blockSlot) {
+                dataStartSlot = blockSlot + 1;
+            }
+        }
+        // if the blockStartSlot or dataStartSlot is after the desired endSlot then no request will be made for the batch
+        // because it is complete
+        const endSlot = this.startSlot + this.count - 1;
+        const requests = {};
+        if (blockStartSlot <= endSlot) {
+            requests.blocksRequest = {
+                startSlot: blockStartSlot,
+                // range of 40 - 63, startSlot will be inclusive but subtraction will exclusive so need to + 1
+                count: endSlot - blockStartSlot + 1,
+                step: 1,
+            };
+        }
+        if (dataStartSlot <= endSlot) {
+            // range of 40 - 63, startSlot will be inclusive but subtraction will exclusive so need to + 1
+            const count = endSlot - dataStartSlot + 1;
+            if (isForkPostFulu(this.forkName) && withinValidRequestWindow) {
+                requests.columnsRequest = {
+                    count,
+                    startSlot: dataStartSlot,
+                    columns: Array.from(neededColumns),
+                };
+            }
+            else if (isForkPostDeneb(this.forkName) && withinValidRequestWindow) {
+                requests.blobsRequest = {
+                    count,
+                    startSlot: dataStartSlot,
+                };
+            }
+            // dataSlot will still have a value but do not create a request for preDeneb forks
+        }
+        return requests;
+    }
+    /**
+     * Post-fulu we should only get columns that peer has advertised
+     */
+    getRequestsForPeer(peer) {
+        if (!isForkPostFulu(this.forkName)) {
+            return this.requests;
+        }
+        // post-fulu we need to ensure that we only request columns that the peer has advertised
+        const { columnsRequest } = this.requests;
+        if (columnsRequest == null) {
+            return this.requests;
+        }
+        const peerColumns = new Set(peer.custodyColumns ?? []);
+        const requestedColumns = columnsRequest.columns.filter((c) => peerColumns.has(c));
+        if (requestedColumns.length === columnsRequest.columns.length) {
+            return this.requests;
+        }
+        return {
+            ...this.requests,
+            columnsRequest: {
+                ...columnsRequest,
+                columns: requestedColumns,
+            },
         };
     }
     /**
      * Gives a list of peers from which this batch has had a failed download or processing attempt.
      */
     getFailedPeers() {
-        return [...this.failedDownloadAttempts, ...this.failedProcessingAttempts.map((a) => a.peer)];
+        return [...this.failedDownloadAttempts, ...this.failedProcessingAttempts.flatMap((a) => a.peers)];
     }
     getMetadata() {
         return { startEpoch: this.startEpoch, status: this.state.status };
     }
+    getBlocks() {
+        return this.state.blocks;
+    }
     /**
      * AwaitingDownload -> Downloading
      */
@@ -71,57 +212,56 @@ export class Batch {
         if (this.state.status !== BatchStatus.AwaitingDownload) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.AwaitingDownload));
         }
-        const { partialDownload } = this.state;
-        this.state = { status: BatchStatus.Downloading, peer, partialDownload };
-        return partialDownload;
+        this.state = { status: BatchStatus.Downloading, peer, blocks: this.state.blocks };
     }
     /**
      * Downloading -> AwaitingProcessing
-     * pendingDataColumns is null when a complete download is done, otherwise it contains the columns that are still pending
      */
-    downloadingSuccess(downloadResult) {
+    downloadingSuccess(peer, blocks) {
         if (this.state.status !== BatchStatus.Downloading) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.Downloading));
         }
-        let updatedPendingDataColumns = this.state.partialDownload?.pendingDataColumns ?? null;
-        const { blocks, pendingDataColumns } = downloadResult;
-        if (updatedPendingDataColumns == null) {
-            // state pendingDataColumns is null as initial value, just update it to pendingDataColumns in this case
-            updatedPendingDataColumns = pendingDataColumns;
+        // ensure that blocks are always sorted before getting stored on the batch.state or being used to getRequests
+        blocks.sort((a, b) => a.slot - b.slot);
+        this.goodPeers.push(peer);
+        let allComplete = true;
+        const slots = new Set();
+        for (const block of blocks) {
+            slots.add(block.slot);
+            if (!block.hasBlockAndAllData()) {
+                allComplete = false;
+            }
+        }
+        if (slots.size > this.count) {
+            throw new BatchError({
+                code: BatchErrorCode.INVALID_COUNT,
+                startEpoch: this.startEpoch,
+                count: slots.size,
+                expected: this.count,
+                status: this.state.status,
+            });
+        }
+        if (allComplete) {
+            this.state = { status: BatchStatus.AwaitingProcessing, blocks };
         }
         else {
-            updatedPendingDataColumns =
-                // pendingDataColumns = null means a complete download
-                pendingDataColumns == null
-                    ? null
-                    : // if not state pendingDataColumns should be reduced over time, see see https://github.com/ChainSafe/lodestar/issues/8036
-                        updatedPendingDataColumns.filter((column) => pendingDataColumns.includes(column));
-        }
-        if (updatedPendingDataColumns === null) {
-            // complete download
-            this.state = { status: BatchStatus.AwaitingProcessing, peer: this.state.peer, blocks };
-            return { status: BatchStatus.AwaitingProcessing, blocks };
-        }
-        // partial download, track updatedPendingDataColumns in state
-        this.state = {
-            status: BatchStatus.AwaitingDownload,
-            partialDownload: blocks.length === 0 ? null : { blocks, pendingDataColumns: updatedPendingDataColumns },
-        };
-        return { status: BatchStatus.AwaitingDownload, pendingDataColumns: updatedPendingDataColumns };
+            this.requests = this.getRequests(blocks);
+            this.state = { status: BatchStatus.AwaitingDownload, blocks };
+        }
+        return this.state;
     }
     /**
      * Downloading -> AwaitingDownload
      */
-    downloadingError() {
+    downloadingError(peer) {
         if (this.state.status !== BatchStatus.Downloading) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.Downloading));
         }
-        this.failedDownloadAttempts.push(this.state.peer);
+        this.failedDownloadAttempts.push(peer);
         if (this.failedDownloadAttempts.length > MAX_BATCH_DOWNLOAD_ATTEMPTS) {
             throw new BatchError(this.errorType({ code: BatchErrorCode.MAX_DOWNLOAD_ATTEMPTS }));
         }
-        const { partialDownload } = this.state;
-        this.state = { status: BatchStatus.AwaitingDownload, partialDownload };
+        this.state = { status: BatchStatus.AwaitingDownload, blocks: this.state.blocks };
     }
     /**
      * AwaitingProcessing -> Processing
@@ -132,7 +272,11 @@ export class Batch {
         }
         const blocks = this.state.blocks;
         const hash = hashBlocks(blocks, this.config); // tracks blocks to report peer on processing error
-        this.state = { status: BatchStatus.Processing, attempt: { peer: this.state.peer, hash } };
+        // Reset goodPeers in case another download attempt needs to be made.  When Attempt is successful or not the peers
+        // that the data came from will be handled by the Attempt that goes for processing
+        const peers = this.goodPeers;
+        this.goodPeers = [];
+        this.state = { status: BatchStatus.Processing, blocks, attempt: { peers, hash } };
         return blocks;
     }
     /**
@@ -142,7 +286,7 @@ export class Batch {
         if (this.state.status !== BatchStatus.Processing) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.Processing));
         }
-        this.state = { status: BatchStatus.AwaitingValidation, attempt: this.state.attempt };
+        this.state = { status: BatchStatus.AwaitingValidation, blocks: this.state.blocks, attempt: this.state.attempt };
     }
     /**
      * Processing -> AwaitingDownload
@@ -181,22 +325,23 @@ export class Batch {
         }
         return this.state.attempt;
     }
-    isPostFulu() {
-        return this.config.getForkSeq(this.request.startSlot) >= ForkSeq.fulu;
-    }
     onExecutionEngineError(attempt) {
         this.executionErrorAttempts.push(attempt);
         if (this.executionErrorAttempts.length > MAX_BATCH_PROCESSING_ATTEMPTS) {
             throw new BatchError(this.errorType({ code: BatchErrorCode.MAX_EXECUTION_ENGINE_ERROR_ATTEMPTS }));
         }
-        this.state = { status: BatchStatus.AwaitingDownload, partialDownload: null };
+        // remove any downloaded blocks and re-attempt
+        // TODO(fulu): need to remove the bad blocks from the SeenBlockInputCache
+        this.state = { status: BatchStatus.AwaitingDownload, blocks: [] };
     }
     onProcessingError(attempt) {
         this.failedProcessingAttempts.push(attempt);
         if (this.failedProcessingAttempts.length > MAX_BATCH_PROCESSING_ATTEMPTS) {
             throw new BatchError(this.errorType({ code: BatchErrorCode.MAX_PROCESSING_ATTEMPTS }));
         }
-        this.state = { status: BatchStatus.AwaitingDownload, partialDownload: null };
+        // remove any downloaded blocks and re-attempt
+        // TODO(fulu): need to remove the bad blocks from the SeenBlockInputCache
+        this.state = { status: BatchStatus.AwaitingDownload, blocks: [] };
     }
     /** Helper to construct typed BatchError. Stack traces are correct as the error is thrown above */
     errorType(type) {
@@ -209,6 +354,7 @@ export class Batch {
 export var BatchErrorCode;
 (function (BatchErrorCode) {
     BatchErrorCode["WRONG_STATUS"] = "BATCH_ERROR_WRONG_STATUS";
+    BatchErrorCode["INVALID_COUNT"] = "BATCH_ERROR_INVALID_COUNT";
     BatchErrorCode["MAX_DOWNLOAD_ATTEMPTS"] = "BATCH_ERROR_MAX_DOWNLOAD_ATTEMPTS";
     BatchErrorCode["MAX_PROCESSING_ATTEMPTS"] = "BATCH_ERROR_MAX_PROCESSING_ATTEMPTS";
     BatchErrorCode["MAX_EXECUTION_ENGINE_ERROR_ATTEMPTS"] = "MAX_EXECUTION_ENGINE_ERROR_ATTEMPTS";

package/lib/sync/range/batch.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/sync/range/batch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"batch.js","sourceRoot":"","sources":["../../../src/sync/range/batch.ts"],"names":[],"mappings":"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"}

package/lib/sync/range/chain.d.ts

@@ -1,17 +1,20 @@
 import { ChainForkConfig } from "@lodestar/config";
-import { Epoch, Root, Slot, phase0 } from "@lodestar/types";
+import { Epoch, Root, Slot } from "@lodestar/types";
 import { Logger } from "@lodestar/utils";
-import { BlockInput } from "../../chain/blocks/types.js";
+import { IBlockInput } from "../../chain/blocks/blockInput/types.js";
 import { Metrics } from "../../metrics/metrics.js";
 import { PeerAction } from "../../network/index.js";
 import { PeerSyncMeta } from "../../network/peers/peersData.js";
-import { PartialDownload } from "../../network/reqresp/beaconBlocksMaybeBlobsByRange.js";
 import { CustodyConfig } from "../../util/dataColumns.js";
 import { PeerIdStr } from "../../util/peerId.js";
+import { WarnResult } from "../../util/wrapError.js";
+import { DownloadByRangeError } from "../utils/downloadByRange.js";
 import { RangeSyncType } from "../utils/remoteSyncType.js";
-import { BatchErrorCode, BatchMetadata } from "./batch.js";
+import { Batch, BatchErrorCode, BatchMetadata } from "./batch.js";
+import { IClock } from "../../util/clock.js";
 export type SyncChainModules = {
     config: ChainForkConfig;
+    clock: IClock;
     custodyConfig: CustodyConfig;
     logger: Logger;
     metrics: Metrics | null;
@@ -21,18 +24,17 @@ export type SyncChainFns = {
      * Must return if ALL blocks are processed successfully
      * If SOME blocks are processed must throw BlockProcessorError()
      */
-    processChainSegment: (blocks: BlockInput[], syncType: RangeSyncType) => Promise<void>;
+    processChainSegment: (blocks: IBlockInput[], syncType: RangeSyncType) => Promise<void>;
     /** Must download blocks, and validate their range */
-    downloadBeaconBlocksByRange: (peer: PeerSyncMeta, request: phase0.BeaconBlocksByRangeRequest, partialDownload: PartialDownload, syncType: RangeSyncType) => Promise<{
-        blocks: BlockInput[];
-        pendingDataColumns: null | number[];
-    }>;
+    downloadByRange: (peer: PeerSyncMeta, batch: Batch, syncType: RangeSyncType) => Promise<WarnResult<IBlockInput[], DownloadByRangeError>>;
     /** Report peer for negative actions. Decouples from the full network instance */
     reportPeer: (peer: PeerIdStr, action: PeerAction, actionName: string) => void;
     /** Gets current peer custodyColumns and earliestAvailableSlot */
     getConnectedPeerSyncMeta: (peerId: string) => PeerSyncMeta;
     /** Hook called when Chain state completes */
     onEnd: (err: Error | null, target: ChainTarget | null) => void;
+    /** Deletes an array of BlockInputs from the BlockInputCache */
+    pruneBlockInputs: (blockInputs: IBlockInput[]) => void;
 };
 /**
  * Sync this up to this target. Uses slot instead of epoch to re-use logic for finalized sync
@@ -86,9 +88,10 @@ export declare class SyncChain {
     private lastEpochWithProcessBlocks;
     private status;
     private readonly processChainSegment;
-    private readonly downloadBeaconBlocksByRange;
+    private readonly downloadByRange;
     private readonly reportPeer;
     private readonly getConnectedPeerSyncMeta;
+    private readonly pruneBlockInputs;
     /** AsyncIterable that guarantees processChainSegment is run only at once at anytime */
     private readonly batchProcessor;
     /** Sorted map of batches undergoing some kind of processing. */
@@ -96,6 +99,8 @@ export declare class SyncChain {
     private readonly peerset;
     private readonly logger;
     private readonly config;
+    private readonly clock;
+    private readonly metrics;
     private readonly custodyConfig;
     constructor(initialBatchEpoch: Epoch, initialTarget: ChainTarget, syncType: RangeSyncType, fns: SyncChainFns, modules: SyncChainModules);
     /**