@lodestar/beacon-node 1.43.0-dev.abc719ddc1 → 1.43.0-dev.ac258a8def

package/lib/sync/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/sync/constants.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC,8FAA8F;AAC9F,eAAO,MAAM,oCAAoC,KAAK,CAAC;AAEvD,2EAA2E;AAI3E,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C;;;;;IAKI;AACJ,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,4CAA4C;AAC5C,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,QAAmC,CAAC;AAElE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,IAAI,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/sync/constants.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC,8FAA8F;AAC9F,eAAO,MAAM,oCAAoC,KAAK,CAAC;AAEvD,2EAA2E;AAC3E,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAE7C;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,OAAQ,CAAC;AAElD;;;;;IAKI;AACJ,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,4CAA4C;AAC5C,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,QAAmC,CAAC;AAElE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,IAAI,CAAC;AAEzC;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,IAAI,CAAC"}

package/lib/sync/constants.js

@@ -3,10 +3,13 @@ export const PARALLEL_HEAD_CHAINS = 2;
 /** Minimum work we require a finalized chain to do before picking a chain with more peers. */
 export const MIN_FINALIZED_CHAIN_VALIDATED_EPOCHS = 10;
 /** The number of times to retry a batch before it is considered failed. */
-// export const MAX_BATCH_DOWNLOAD_ATTEMPTS = 5;
-// this constant is increased a lot for peerDAS because we may have many failed download due to rate limit not implemented yet
-// TODO: change it back to 5 when this issue is implemented https://github.com/ChainSafe/lodestar/issues/8033
-export const MAX_BATCH_DOWNLOAD_ATTEMPTS = 20;
+export const MAX_BATCH_DOWNLOAD_ATTEMPTS = 5;
+/**
+ * Backoff before assigning more range-sync batches to a peer that rate-limited us.
+ *
+ * Note: this is used when rate limited due to MAX_CONCURRENT_REQUESTS
+ */
+export const RATE_LIMITED_PEER_BACKOFF_MS = 5_000;
 /**
  * Consider batch faulty after downloading and processing this number of times
  * as in https://github.com/ChainSafe/lodestar/issues/8147 we cannot proceed the sync chain if there is unknown parent

package/lib/sync/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/sync/constants.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC,8FAA8F;AAC9F,MAAM,CAAC,MAAM,oCAAoC,GAAG,EAAE,CAAC;AAEvD,2EAA2E;AAC3E,gDAAgD;AAChD,8HAA8H;AAC9H,6GAA6G;AAC7G,MAAM,CAAC,MAAM,2BAA2B,GAAG,EAAE,CAAC;AAE9C;;;;;IAKI;AACJ,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC,4CAA4C;AAC5C,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,gBAAgB,CAAC,CAAC;AAElE;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/sync/constants.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC,8FAA8F;AAC9F,MAAM,CAAC,MAAM,oCAAoC,GAAG,EAAE,CAAC;AAEvD,2EAA2E;AAC3E,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAE7C;;;;GAIG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAC;AAElD;;;;;IAKI;AACJ,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC,4CAA4C;AAC5C,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,gBAAgB,CAAC,CAAC;AAElE;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC"}

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

@@ -1,13 +1,14 @@
 import { ChainForkConfig } from "@lodestar/config";
 import { ForkName } from "@lodestar/params";
-import { Epoch, RootHex, Slot } from "@lodestar/types";
+import { Epoch, RootHex, Slot, gloas } from "@lodestar/types";
 import { LodestarError } from "@lodestar/utils";
 import { IBlockInput } from "../../chain/blocks/blockInput/types.js";
+import { PayloadEnvelopeInput } from "../../chain/blocks/payloadEnvelopeInput/payloadEnvelopeInput.js";
 import { PeerSyncMeta } from "../../network/peers/peersData.js";
 import { IClock } from "../../util/clock.js";
 import { CustodyConfig } from "../../util/dataColumns.js";
 import { PeerIdStr } from "../../util/peerId.js";
-import { DownloadByRangeRequests } from "../utils/downloadByRange.js";
+import { DownloadByRangeRequests, ParentPayloadCommitments } from "../utils/downloadByRange.js";
 /**
  * Current state of a batch
  */
@@ -38,27 +39,42 @@ export type Attempt = {
 export type AwaitingDownloadState = {
     status: BatchStatus.AwaitingDownload;
     blocks: IBlockInput[];
+    payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null;
 };
 export type DownloadSuccessState = {
     status: BatchStatus.AwaitingProcessing;
     blocks: IBlockInput[];
+    payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null;
 };
 export type BatchState = AwaitingDownloadState | {
     status: BatchStatus.Downloading;
     peer: PeerIdStr;
     blocks: IBlockInput[];
+    payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null;
 } | DownloadSuccessState | {
     status: BatchStatus.Processing;
     blocks: IBlockInput[];
+    payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null;
     attempt: Attempt;
 } | {
     status: BatchStatus.AwaitingValidation;
     blocks: IBlockInput[];
+    payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null;
     attempt: Attempt;
 };
 export type BatchMetadata = {
     startEpoch: Epoch;
+    startSlot: Slot;
+    count: number;
     status: BatchStatus;
+    blocksReq?: string;
+    blobsReq?: string;
+    columnsReq?: string;
+    envelopesReq?: string;
+    downloadAttempts: number;
+    processingAttempts: number;
+    failedDownloadPeers?: string;
+    failedProcessingPeers?: string;
 };
 /**
  * Batches are downloaded at the first block of the epoch.
@@ -91,7 +107,11 @@ export declare class Batch {
     private readonly config;
     private readonly clock;
     private readonly custodyConfig;
-    constructor(startEpoch: Epoch, config: ChainForkConfig, clock: IClock, custodyConfig: CustodyConfig);
+    private readonly isFirstBatchInChain;
+    private readonly latestBid;
+    constructor(startEpoch: Epoch, config: ChainForkConfig, clock: IClock, custodyConfig: CustodyConfig, isFirstBatchInChain: boolean, latestBid: gloas.ExecutionPayloadBid | undefined, targetSlot: Slot);
+    private shouldDownloadParentEnvelope;
+    getParentPayloadCommitments(parentBlockRoot: Uint8Array): ParentPayloadCommitments;
     /**
      * Builds ByRange requests for block, blobs and columns
      */
@@ -106,6 +126,7 @@ export declare class Batch {
     getFailedPeers(): PeerIdStr[];
     getMetadata(): BatchMetadata;
     getBlocks(): IBlockInput[];
+    getPayloadEnvelopes(): Map<Slot, PayloadEnvelopeInput> | null;
     /**
      * AwaitingDownload -> Downloading
      */
@@ -113,15 +134,24 @@ export declare class Batch {
     /**
      * Downloading -> AwaitingProcessing
      */
-    downloadingSuccess(peer: PeerIdStr, blocks: IBlockInput[]): DownloadSuccessState;
+    downloadingSuccess(peer: PeerIdStr, blocks: IBlockInput[], payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null): DownloadSuccessState;
     /**
      * Downloading -> AwaitingDownload
      */
     downloadingError(peer: PeerIdStr): void;
+    /**
+     * Downloading -> AwaitingDownload (without counting as a failed attempt).
+     * Used when the peer rate-limited us — the request was never actually served.
+     */
+    downloadingRateLimited(): void;
     /**
      * AwaitingProcessing -> Processing
      */
-    startProcessing(): IBlockInput[];
+    startProcessing(): {
+        blocks: IBlockInput[];
+        payloadEnvelopes: Map<Slot, PayloadEnvelopeInput> | null;
+        peers: PeerIdStr[];
+    };
     /**
      * Processing -> AwaitingValidation
      */

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

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

package/lib/sync/range/batch.js

@@ -1,8 +1,9 @@
-import { isForkPostDeneb, isForkPostFulu } from "@lodestar/params";
-import { LodestarError } from "@lodestar/utils";
+import { isForkPostDeneb, isForkPostFulu, isForkPostGloas } from "@lodestar/params";
+import { LodestarError, byteArrayEquals, prettyPrintIndices, toRootHex } from "@lodestar/utils";
 import { isBlockInputColumns } from "../../chain/blocks/blockInput/blockInput.js";
 import { isDaOutOfRange } from "../../chain/blocks/blockInput/utils.js";
 import { BlockError, BlockErrorCode } from "../../chain/errors/index.js";
+import { ZERO_HASH } from "../../constants/constants.js";
 import { MAX_BATCH_DOWNLOAD_ATTEMPTS, MAX_BATCH_PROCESSING_ATTEMPTS } from "../constants.js";
 import { getBatchSlotRange, hashBlocks } from "./utils/index.js";
 export { BatchStatus };
@@ -28,6 +29,12 @@ var BatchStatus;
      */
     BatchStatus["AwaitingValidation"] = "AwaitingValidation";
 })(BatchStatus || (BatchStatus = {}));
+function formatRangeReq(req) {
+    return `startSlot=${req.startSlot},count=${req.count}`;
+}
+function formatColumnsReq(req) {
+    return `startSlot=${req.startSlot},count=${req.count},cols=${prettyPrintIndices(req.columns)}`;
+}
 /**
  * Batches are downloaded at the first block of the epoch.
  *
@@ -47,7 +54,7 @@ export class Batch {
     /** 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: [] };
+    state = { status: BatchStatus.AwaitingDownload, blocks: [], payloadEnvelopes: null };
     /** Peers that provided good data */
     goodPeers = [];
     /** The `Attempts` that have been made and failed to send us this batch. */
@@ -59,7 +66,9 @@ export class Batch {
     config;
     clock;
     custodyConfig;
-    constructor(startEpoch, config, clock, custodyConfig) {
+    isFirstBatchInChain;
+    latestBid;
+    constructor(startEpoch, config, clock, custodyConfig, isFirstBatchInChain, latestBid, targetSlot) {
         this.config = config;
         this.clock = clock;
         this.custodyConfig = custodyConfig;
@@ -67,9 +76,36 @@ export class Batch {
         this.forkName = this.config.getForkName(startSlot);
         this.startEpoch = startEpoch;
         this.startSlot = startSlot;
-        this.count = count;
+        this.count = Math.min(count, targetSlot - startSlot + 1);
+        this.isFirstBatchInChain = isFirstBatchInChain;
+        this.latestBid = latestBid;
         this.requests = this.getRequests([]);
     }
+    shouldDownloadParentEnvelope(firstBlock) {
+        if (!this.isFirstBatchInChain)
+            return false;
+        if (this.startSlot === 0 || !isForkPostGloas(this.config.getForkName(this.startSlot - 1))) {
+            return false;
+        }
+        // we only know if we should download parent envelope if firstBlock is downloaded
+        if (firstBlock === undefined)
+            return false;
+        if (this.latestBid === undefined)
+            return false;
+        const firstBlockBidParentHash = firstBlock.message.body.signedExecutionPayloadBid.message
+            .parentBlockHash;
+        return byteArrayEquals(firstBlockBidParentHash, this.latestBid.blockHash);
+    }
+    getParentPayloadCommitments(parentBlockRoot) {
+        if (this.latestBid === undefined) {
+            throw new Error(`Coding error: getParentPayloadCommitments called without latestBid for parentBlockRoot=${toRootHex(parentBlockRoot)}`);
+        }
+        return {
+            blockRoot: parentBlockRoot,
+            blockRootHex: toRootHex(parentBlockRoot),
+            kzgCommitments: this.latestBid.blobKzgCommitments,
+        };
+    }
     /**
      * Builds ByRange requests for block, blobs and columns
      */
@@ -82,35 +118,32 @@ export class Batch {
                 count: this.count,
                 step: 1,
             };
+            const requests = { blocksRequest };
+            // Post-Gloas envelopes are required for block processing, independent of DA retention window.
+            if (isForkPostGloas(this.forkName)) {
+                requests.envelopesRequest = { startSlot: this.startSlot, count: this.count };
+            }
             if (isForkPostFulu(this.forkName) && withinValidRequestWindow) {
-                return {
-                    blocksRequest,
-                    columnsRequest: {
-                        startSlot: this.startSlot,
-                        count: this.count,
-                        columns: this.custodyConfig.sampledColumns,
-                    },
+                requests.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,
-                    },
-                };
+            else if (isForkPostDeneb(this.forkName) && withinValidRequestWindow) {
+                requests.blobsRequest = { startSlot: this.startSlot, count: this.count };
             }
-            return {
-                blocksRequest,
-            };
+            return requests;
         }
         // 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;
+        let envelopeStartSlot = this.startSlot;
         const neededColumns = new Set();
+        const envelopesBySlot = this.state.payloadEnvelopes ?? new Map();
         // ensure blocks are in slot-wise order
+        const isPostGloas = isForkPostGloas(this.forkName);
         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
@@ -126,15 +159,38 @@ export class Batch {
             if (blockInput.hasBlock() && blockStartSlot === blockSlot) {
                 blockStartSlot = blockSlot + 1;
             }
-            if (!blockInput.hasAllData()) {
-                if (isBlockInputColumns(blockInput)) {
-                    for (const index of blockInput.getMissingSampledColumnMeta().missing) {
+            // Range sync uses hasComputedAllData (all sampled columns physically present), not hasAllData
+            // which flips at the reconstruction threshold. Sync never triggers reconstruction, so accepting
+            // a half-downloaded block here makes writeBlockInputToDb later block on waitForComputedAllData.
+            if (isPostGloas) {
+                // Post-Gloas: column data lives on PayloadEnvelopeInput, not on BlockInputNoData.
+                const payloadInput = envelopesBySlot.get(blockSlot);
+                if (blockInput.hasBlock() && envelopeStartSlot === blockSlot && payloadInput?.hasPayloadEnvelope()) {
+                    envelopeStartSlot = blockSlot + 1;
+                }
+                if (payloadInput && !payloadInput.hasComputedAllData()) {
+                    for (const index of payloadInput.getMissingSampledColumnMeta().missing) {
                         neededColumns.add(index);
                     }
                 }
+                else if (payloadInput?.hasComputedAllData() && dataStartSlot === blockSlot) {
+                    // Only advance dataStartSlot when we know columns for this slot are complete. If
+                    // payloadInput is missing entirely we cannot tell, so stop here so the next round
+                    // re-requests columns (and envelopes) starting at this slot.
+                    dataStartSlot = blockSlot + 1;
+                }
             }
-            else if (dataStartSlot === blockSlot) {
-                dataStartSlot = blockSlot + 1;
+            else {
+                if (isBlockInputColumns(blockInput) ? !blockInput.hasComputedAllData() : !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
@@ -153,11 +209,15 @@ export class Batch {
             // 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),
-                };
+                // Skip the column re-request when we have no specific column indices outstanding.
+                // Peer rejects an empty `columns` list
+                if (neededColumns.size > 0) {
+                    requests.columnsRequest = {
+                        count,
+                        startSlot: dataStartSlot,
+                        columns: Array.from(neededColumns),
+                    };
+                }
             }
             else if (isForkPostDeneb(this.forkName) && withinValidRequestWindow) {
                 requests.blobsRequest = {
@@ -167,6 +227,39 @@ export class Batch {
             }
             // dataSlot will still have a value but do not create a request for preDeneb forks
         }
+        if (isForkPostGloas(this.forkName) && envelopeStartSlot <= endSlot) {
+            requests.envelopesRequest = {
+                startSlot: envelopeStartSlot,
+                count: endSlot - envelopeStartSlot + 1,
+            };
+        }
+        // Only the first batch of a SyncChain may need the dangling-parent payload by-root.
+        if (blocks.length > 0 && this.shouldDownloadParentEnvelope(blocks[0].getBlock())) {
+            // shouldDownloadParentEnvelope() = true means there are at least 1 block
+            const parentRoot = blocks[0].getBlock().message.parentRoot;
+            if (!byteArrayEquals(parentRoot, ZERO_HASH)) {
+                const parentRootHex = toRootHex(parentRoot);
+                let parentPayloadInput;
+                if (this.state.payloadEnvelopes) {
+                    for (const pi of this.state.payloadEnvelopes.values()) {
+                        if (pi.blockRootHex === parentRootHex) {
+                            parentPayloadInput = pi;
+                            break;
+                        }
+                    }
+                }
+                const needsEnvelope = !parentPayloadInput?.hasPayloadEnvelope();
+                const missingColumns = parentPayloadInput
+                    ? parentPayloadInput.getMissingSampledColumnMeta().missing
+                    : this.custodyConfig.sampledColumns;
+                if (needsEnvelope || missingColumns.length > 0) {
+                    requests.parentPayloadRequest = {
+                        ...(needsEnvelope ? { envelopeBlockRoot: parentRoot } : {}),
+                        ...(missingColumns.length > 0 ? { blockRoot: parentRoot, columns: missingColumns } : {}),
+                    };
+                }
+            }
+        }
         return requests;
     }
     /**
@@ -176,22 +269,22 @@ export class Batch {
         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;
-        }
+        // post-fulu we need to ensure that we only request columns that the peer has advertised.
+        const { columnsRequest, parentPayloadRequest } = 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;
-        }
+        const filteredColumnsRequest = columnsRequest != null ? columnsRequest.columns.filter((c) => peerColumns.has(c)) : null;
+        const parentColumns = parentPayloadRequest?.columns;
+        const filteredParentColumns = parentColumns != null ? parentColumns.filter((c) => peerColumns.has(c)) : null;
+        const updatedColumnRequest = columnsRequest != null && filteredColumnsRequest != null
+            ? { columnsRequest: { ...columnsRequest, columns: filteredColumnsRequest } }
+            : {};
+        const updatedParentPayloadRequest = parentPayloadRequest != null && filteredParentColumns != null
+            ? { parentPayloadRequest: { ...parentPayloadRequest, columns: filteredParentColumns } }
+            : {};
         return {
             ...this.requests,
-            columnsRequest: {
-                ...columnsRequest,
-                columns: requestedColumns,
-            },
+            ...updatedColumnRequest,
+            ...updatedParentPayloadRequest,
         };
     }
     /**
@@ -201,11 +294,33 @@ export class Batch {
         return [...this.failedDownloadAttempts, ...this.failedProcessingAttempts.flatMap((a) => a.peers)];
     }
     getMetadata() {
-        return { startEpoch: this.startEpoch, status: this.state.status };
+        const { blocksRequest, blobsRequest, columnsRequest, envelopesRequest } = this.requests;
+        const failedProcessingPeerList = this.failedProcessingAttempts.flatMap((a) => a.peers);
+        return {
+            startEpoch: this.startEpoch,
+            startSlot: this.startSlot,
+            count: this.count,
+            status: this.state.status,
+            ...(blocksRequest && { blocksReq: formatRangeReq(blocksRequest) }),
+            ...(blobsRequest && { blobsReq: formatRangeReq(blobsRequest) }),
+            ...(columnsRequest && { columnsReq: formatColumnsReq(columnsRequest) }),
+            ...(envelopesRequest && { envelopesReq: formatRangeReq(envelopesRequest) }),
+            downloadAttempts: this.failedDownloadAttempts.length,
+            processingAttempts: this.failedProcessingAttempts.length,
+            ...(this.failedDownloadAttempts.length > 0 && {
+                failedDownloadPeers: this.failedDownloadAttempts.join(","),
+            }),
+            ...(failedProcessingPeerList.length > 0 && {
+                failedProcessingPeers: failedProcessingPeerList.join(","),
+            }),
+        };
     }
     getBlocks() {
         return this.state.blocks;
     }
+    getPayloadEnvelopes() {
+        return this.state.payloadEnvelopes;
+    }
     /**
      * AwaitingDownload -> Downloading
      */
@@ -213,12 +328,17 @@ export class Batch {
         if (this.state.status !== BatchStatus.AwaitingDownload) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.AwaitingDownload));
         }
-        this.state = { status: BatchStatus.Downloading, peer, blocks: this.state.blocks };
+        this.state = {
+            status: BatchStatus.Downloading,
+            peer,
+            blocks: this.state.blocks,
+            payloadEnvelopes: this.state.payloadEnvelopes,
+        };
     }
     /**
      * Downloading -> AwaitingProcessing
      */
-    downloadingSuccess(peer, blocks) {
+    downloadingSuccess(peer, blocks, payloadEnvelopes) {
         if (this.state.status !== BatchStatus.Downloading) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.Downloading));
         }
@@ -229,7 +349,11 @@ export class Batch {
         const slots = new Set();
         for (const block of blocks) {
             slots.add(block.slot);
-            if (!block.hasBlockAndAllData()) {
+            const dataComplete = isBlockInputColumns(block)
+                ? // by_range needs to download all columns
+                    block.hasBlock() && block.hasComputedAllData()
+                : block.hasBlockAndAllData();
+            if (!dataComplete) {
                 allComplete = false;
             }
         }
@@ -242,12 +366,45 @@ export class Batch {
                 status: this.state.status,
             });
         }
+        const newPayloadEnvelopes = payloadEnvelopes ?? this.state.payloadEnvelopes;
+        if (allComplete && isForkPostGloas(this.forkName)) {
+            for (const block of blocks) {
+                const payloadInput = newPayloadEnvelopes?.get(block.slot);
+                // by_range needs every block's envelope and all sampled columns.
+                if (!payloadInput?.hasPayloadEnvelope() || !payloadInput.hasComputedAllData()) {
+                    allComplete = false;
+                    break;
+                }
+            }
+        }
+        // First batch of a sync chain must additionally have the dangling-parent payload fully
+        // present, otherwise `processBlocks` will throw PARENT_PAYLOAD_UNKNOWN. The parent's
+        // `PayloadEnvelopeInput` is identified by `blockRootHex` matching `blocks[0].parentRoot`.
+        if (allComplete && blocks.length > 0 && this.shouldDownloadParentEnvelope(blocks[0].getBlock())) {
+            const parentRoot = blocks[0].getBlock().message.parentRoot;
+            // Genesis has no parent payload — nothing to wait for.
+            if (!byteArrayEquals(parentRoot, ZERO_HASH)) {
+                const parentRootHex = toRootHex(parentRoot);
+                let parentPayloadComplete = false;
+                if (newPayloadEnvelopes) {
+                    for (const payloadInput of newPayloadEnvelopes.values()) {
+                        if (payloadInput.blockRootHex === parentRootHex) {
+                            parentPayloadComplete = payloadInput.hasPayloadEnvelope() && payloadInput.hasComputedAllData();
+                            break;
+                        }
+                    }
+                }
+                if (!parentPayloadComplete) {
+                    allComplete = false;
+                }
+            }
+        }
         if (allComplete) {
-            this.state = { status: BatchStatus.AwaitingProcessing, blocks };
+            this.state = { status: BatchStatus.AwaitingProcessing, blocks, payloadEnvelopes: newPayloadEnvelopes };
         }
         else {
+            this.state = { status: BatchStatus.AwaitingDownload, blocks, payloadEnvelopes: newPayloadEnvelopes };
             this.requests = this.getRequests(blocks);
-            this.state = { status: BatchStatus.AwaitingDownload, blocks };
         }
         return this.state;
     }
@@ -262,7 +419,25 @@ export class Batch {
         if (this.failedDownloadAttempts.length > MAX_BATCH_DOWNLOAD_ATTEMPTS) {
             throw new BatchError(this.errorType({ code: BatchErrorCode.MAX_DOWNLOAD_ATTEMPTS }));
         }
-        this.state = { status: BatchStatus.AwaitingDownload, blocks: this.state.blocks };
+        this.state = {
+            status: BatchStatus.AwaitingDownload,
+            blocks: this.state.blocks,
+            payloadEnvelopes: this.state.payloadEnvelopes,
+        };
+    }
+    /**
+     * Downloading -> AwaitingDownload (without counting as a failed attempt).
+     * Used when the peer rate-limited us — the request was never actually served.
+     */
+    downloadingRateLimited() {
+        if (this.state.status !== BatchStatus.Downloading) {
+            throw new BatchError(this.wrongStatusErrorType(BatchStatus.Downloading));
+        }
+        this.state = {
+            status: BatchStatus.AwaitingDownload,
+            blocks: this.state.blocks,
+            payloadEnvelopes: this.state.payloadEnvelopes,
+        };
     }
     /**
      * AwaitingProcessing -> Processing
@@ -272,13 +447,14 @@ export class Batch {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.AwaitingProcessing));
         }
         const blocks = this.state.blocks;
+        const payloadEnvelopes = this.state.payloadEnvelopes;
         const hash = hashBlocks(blocks, this.config); // tracks blocks to report peer on processing error
         // 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;
+        this.state = { status: BatchStatus.Processing, blocks, payloadEnvelopes, attempt: { peers, hash } };
+        return { blocks, payloadEnvelopes, peers };
     }
     /**
      * Processing -> AwaitingValidation
@@ -287,7 +463,12 @@ export class Batch {
         if (this.state.status !== BatchStatus.Processing) {
             throw new BatchError(this.wrongStatusErrorType(BatchStatus.Processing));
         }
-        this.state = { status: BatchStatus.AwaitingValidation, blocks: this.state.blocks, attempt: this.state.attempt };
+        this.state = {
+            status: BatchStatus.AwaitingValidation,
+            blocks: this.state.blocks,
+            payloadEnvelopes: this.state.payloadEnvelopes,
+            attempt: this.state.attempt,
+        };
     }
     /**
      * Processing -> AwaitingDownload
@@ -333,7 +514,7 @@ export class Batch {
         }
         // remove any downloaded blocks and re-attempt
         // TODO(fulu): need to remove the bad blocks from the SeenBlockInputCache
-        this.state = { status: BatchStatus.AwaitingDownload, blocks: [] };
+        this.state = { status: BatchStatus.AwaitingDownload, blocks: [], payloadEnvelopes: null };
     }
     onProcessingError(attempt) {
         this.failedProcessingAttempts.push(attempt);
@@ -342,11 +523,11 @@ export class Batch {
         }
         // remove any downloaded blocks and re-attempt
         // TODO(fulu): need to remove the bad blocks from the SeenBlockInputCache
-        this.state = { status: BatchStatus.AwaitingDownload, blocks: [] };
+        this.state = { status: BatchStatus.AwaitingDownload, blocks: [], payloadEnvelopes: null };
     }
     /** Helper to construct typed BatchError. Stack traces are correct as the error is thrown above */
     errorType(type) {
-        return { ...type, ...this.getMetadata() };
+        return { ...type, startEpoch: this.startEpoch, status: this.state.status };
     }
     wrongStatusErrorType(expectedStatus) {
         return this.errorType({ code: BatchErrorCode.WRONG_STATUS, expectedStatus });