@lodestar/beacon-node 1.49.0-dev.b27f498c2c → 1.49.0-dev.c256679454

package/lib/sync/unknownBlock.d.ts

@@ -6,6 +6,10 @@ import { INetwork } from "../network/index.js";
 import { PeerSyncMeta } from "../network/peers/peersData.js";
 import { PeerIdStr } from "../util/peerId.js";
 import { SyncOptions } from "./options.js";
+/**
+ * Poll pending payloads of the current slot this often, between PAYLOAD_DUE and the end of the slot.
+ */
+export declare const PAYLOAD_POLL_INTERVAL_MS = 1000;
 /**
  * BlockInputSync is a class that handles ReqResp to find blocks and data related to a specific blockRoot.  The
  * blockRoot may have been found via object gossip, or the API.  Gossip objects that can trigger a search are block,
@@ -55,6 +59,11 @@ export declare class BlockInputSync {
     private subscribedToNetworkEvents;
     private peerBalancer;
     private rateLimitBackoffTimeout;
+    /**
+     * Search unknown payload starting at PAYLOAD_DUE_BPS.
+     */
+    private readonly deferredPayloadRoots;
+    private payloadPollAbortController;
     constructor(config: ChainForkConfig, network: INetwork, chain: IBeaconChain, logger: Logger, metrics: Metrics | null, opts?: SyncOptions | undefined);
     subscribeToNetwork(): void;
     unsubscribeFromNetwork(): void;
@@ -69,6 +78,7 @@ export declare class BlockInputSync {
      */
     private onIncompleteBlockInput;
     private onUnknownEnvelopeBlockRoot;
+    private onUnknownEnvelopeBlockRootSlot;
     private onIncompletePayloadEnvelope;
     /**
      * Process an unknownBlockParent event and register the block in `pendingBlocks` Map.
@@ -104,6 +114,16 @@ export declare class BlockInputSync {
     private triggerUnknownBlockSearch;
     private scheduleRateLimitBackoffRetry;
     private clearRateLimitBackoffTimer;
+    /**
+     * Start this slot's payload poll: end the previous slot's loop, move roots it never got to
+     * into pendingPayloads, then poll from PAYLOAD_DUE to the end of the slot.
+     */
+    private startPayloadPollAtSlot;
+    /**
+     * Poll unknown payloads of the current slot.
+     */
+    private pollPayloadsAtSlot;
+    private addDeferredPayloadRoot;
     private downloadBlock;
     /**
      * Import a block that has already passed the local dependency checks in BlockInputSync.

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

@@ -1 +1 @@
-{"version":3,"file":"unknownBlock.d.ts","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAAC,MAAM,EAA+D,MAAM,iBAAiB,CAAC;AAMrG,OAAO,EAA6B,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAG3E,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAC,QAAQ,EAAuD,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAK5C,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAiDzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,qBAAa,cAAc;IAcvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IAlBxB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+C;IAE7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAClC,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,uBAAuB,CAA6B;IAE5D,YACmB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,IAAI,CAAC,EAAE,WAAW,YAAA,EAgBpC;IAED,kBAAkB,IAAI,IAAI,CA+BzB;IAED,sBAAsB,IAAI,IAAI,CAe7B;IAED,KAAK,IAAI,IAAI,CAEZ;IAED,qBAAqB,IAAI,OAAO,CAE/B;IAED;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAWxB;IAEF;;OAEG;IACH,OAAO,CAAC,sBAAsB,CAS5B;IAEF,OAAO,CAAC,0BAA0B,CAWhC;IAEF,OAAO,CAAC,2BAA2B,CASjC;IAEF;;OAEG;IACH,OAAO,CAAC,eAAe,CA+BrB;IAEF,OAAO,CAAC,eAAe,CAIrB;IAEF,OAAO,CAAC,iBAAiB,CAKvB;IAEF;;;OAGG;IACH,OAAO,CAAC,cAAc,CAoEpB;IAEF,OAAO,CAAC,YAAY,CAiClB;IAEF,OAAO,CAAC,eAAe,CAkCrB;IAEF,OAAO,CAAC,mBAAmB,CAuCzB;IAEF;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,iBAAiB,CA4BvB;IAEF,OAAO,CAAC,eAAe,CASrB;IAEF,OAAO,CAAC,kBAAkB,CAIxB;IAEF;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAmCjC,OAAO,CAAC,mBAAmB;IAuC3B,OAAO,CAAC,qBAAqB;IA0B7B;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAwF/B;IAEF,OAAO,CAAC,6BAA6B;IAuBrC,OAAO,CAAC,0BAA0B;YAOpB,aAAa;IA0F3B;;;OAGG;YACW,iBAAiB;IA4H/B;;;;OAIG;YACW,wBAAwB;YAqExB,eAAe;YAmEf,cAAc;IA0F5B;;;;OAIG;YACW,iBAAiB;YAkLjB,6BAA6B;YAmB7B,mBAAmB;IAwCjC;;;;;;;;OAQG;YACW,eAAe;IAqK7B;;;;;OAKG;IACH,OAAO,CAAC,gCAAgC;IA6BxC,OAAO,CAAC,kCAAkC;IAyB1C,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,sBAAsB;CAY/B;AAED;;GAEG;AACH,qBAAa,wBAAwB;IACnC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACjD,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAExD,cAIC;IAED,qCAAqC;IACrC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAM/D;IAED,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAI1C;IAED,4FAA4F;IAC5F,KAAK,IAAI,IAAI,CAIZ;IAED,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAEjE;IAED,uBAAuB,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI,CA4BnG;IAED;;;;;;OAMG;IACH,yBAAyB,CACvB,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,cAAc,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC9B,YAAY,GAAG,IAAI,CAiBrB;IAED;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAEjC;IAED;;OAEG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAE1C;IAED,sBAAsB,IAAI,MAAM,CAM/B;IAED,OAAO,CAAC,WAAW;IA8DnB,OAAO,CAAC,qBAAqB;CAO9B"}
+{"version":3,"file":"unknownBlock.d.ts","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"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"}

package/lib/sync/unknownBlock.js

@@ -2,7 +2,7 @@ import { routes } from "@lodestar/api";
 import { ForkSeq, SLOTS_PER_EPOCH, isForkPostGloas } from "@lodestar/params";
 import { RequestError, RequestErrorCode } from "@lodestar/reqresp";
 import { computeTimeAtSlot } from "@lodestar/state-transition";
-import { fromHex, prettyPrintIndices, pruneSetToMax, sleep, toRootHex } from "@lodestar/utils";
+import { fromHex, isErrorAborted, prettyPrintIndices, pruneSetToMax, sleep, toRootHex } from "@lodestar/utils";
 import { isBlockInputBlobs, isBlockInputColumns } from "../chain/blocks/blockInput/blockInput.js";
 import { BlockInputSource } from "../chain/blocks/blockInput/types.js";
 import { PayloadError, PayloadErrorCode } from "../chain/blocks/importExecutionPayload.js";
@@ -13,11 +13,12 @@ import { validateGloasBlockDataColumnSidecars } from "../chain/validation/dataCo
 import { validateGossipExecutionPayloadEnvelope } from "../chain/validation/executionPayloadEnvelope.js";
 import { NetworkEvent, prettyPrintPeerIdStr } from "../network/index.js";
 import { MAX_PEERS_PER_ROOT } from "../network/processor/constants.js";
+import { ClockEvent } from "../util/clock.js";
 import { shuffle } from "../util/shuffle.js";
 import { sortBy } from "../util/sortBy.js";
 import { wrapError } from "../util/wrapError.js";
 import { MAX_CONCURRENT_REQUESTS } from "./constants.js";
-import { DownloadResult, DroppedItemReason, FetchResult, PendingBlockInputStatus, PendingBlockType, PendingPayloadInputStatus, getBlockInputSyncCacheItemRootHex, getBlockInputSyncCacheItemSlot, getPayloadSyncCacheItemRootHex, getPayloadSyncCacheItemSlot, isPendingBlockInput, isPendingPayloadEnvelope, isPendingPayloadInput, } from "./types.js";
+import { DeferredPayloadResult, DownloadResult, DroppedItemReason, FetchResult, PendingBlockInputStatus, PendingBlockType, PendingPayloadInputStatus, getBlockInputSyncCacheItemRootHex, getBlockInputSyncCacheItemSlot, getPayloadSyncCacheItemRootHex, getPayloadSyncCacheItemSlot, isPendingBlockInput, isPendingPayloadEnvelope, isPendingPayloadInput, } from "./types.js";
 import { DownloadByRootError, downloadByRoot } from "./utils/downloadByRoot.js";
 import { getAllDescendantBlocks, getUnknownAndAncestorBlocks } from "./utils/pendingBlocksTree.js";
 import { getRateLimitedUntilMs } from "./utils/rateLimit.js";
@@ -28,6 +29,10 @@ const MAX_PENDING_BLOCKS = 100;
  * A pending payload without slot can only stay at most 2 epochs.
  */
 const PRUNE_UNRESOLVED_SLOT_EPOCHS = 2;
+/**
+ * Poll pending payloads of the current slot this often, between PAYLOAD_DUE and the end of the slot.
+ */
+export const PAYLOAD_POLL_INTERVAL_MS = 1_000;
 class UnknownBlockRateLimitedError extends Error {
     constructor(message) {
         super(message);
@@ -84,6 +89,11 @@ export class BlockInputSync {
     subscribedToNetworkEvents = false;
     peerBalancer;
     rateLimitBackoffTimeout;
+    /**
+     * Search unknown payload starting at PAYLOAD_DUE_BPS.
+     */
+    deferredPayloadRoots = new Map();
+    payloadPollAbortController;
     constructor(config, network, chain, logger, metrics, opts) {
         this.config = config;
         this.network = network;
@@ -109,6 +119,7 @@ export class BlockInputSync {
             this.logger.verbose("BlockInputSync enabled.");
             this.chain.emitter.on(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
             this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
+            this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
             this.chain.emitter.on(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
             this.chain.emitter.on(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
             this.chain.emitter.on(ChainEvent.blockUnknownParent, this.onUnknownParent);
@@ -117,6 +128,7 @@ export class BlockInputSync {
             this.chain.emitter.on(routes.events.EventType.executionPayload, this.onPayloadImported);
             this.network.events.on(NetworkEvent.peerConnected, this.onPeerConnected);
             this.network.events.on(NetworkEvent.peerDisconnected, this.onPeerDisconnected);
+            this.chain.clock.on(ClockEvent.slot, this.startPayloadPollAtSlot);
             // Seed the balancer with peers that connected before we subscribed
             for (const peerId of this.network.getConnectedPeers()) {
                 try {
@@ -127,13 +139,21 @@ export class BlockInputSync {
                 }
             }
             this.subscribedToNetworkEvents = true;
+            // we subscribe mid-slot, and a root can be deferred at any point in the slot, so start this
+            // slot's loop now instead of waiting for the next ClockEvent.slot
+            this.startPayloadPollAtSlot(this.chain.clock.currentSlot);
         }
     }
     unsubscribeFromNetwork() {
         this.logger.verbose("BlockInputSync disabled.");
         this.clearRateLimitBackoffTimer();
+        this.chain.clock.off(ClockEvent.slot, this.startPayloadPollAtSlot);
+        this.payloadPollAbortController?.abort();
+        this.payloadPollAbortController = undefined;
+        this.deferredPayloadRoots.clear();
         this.chain.emitter.off(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
         this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
+        this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
         this.chain.emitter.off(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
         this.chain.emitter.off(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
         this.chain.emitter.off(ChainEvent.blockUnknownParent, this.onUnknownParent);
@@ -157,8 +177,11 @@ export class BlockInputSync {
     onUnknownBlockRoot = (data) => {
         try {
             const isNewRoot = this.addByRootHex(data.rootHex, data.peer);
-            if (isNewRoot) {
+            // A retained entry (an earlier download failed, #10018) is not new but still needs a retry pass.
+            if (this.pendingBlocks.get(data.rootHex)?.status === PendingBlockInputStatus.pending) {
                 this.triggerUnknownBlockSearch();
+            }
+            if (isNewRoot) {
                 this.metrics?.blockInputSync.requests.inc({ type: PendingBlockType.UNKNOWN_BLOCK_ROOT });
                 this.metrics?.blockInputSync.source.inc({ source: data.source });
             }
@@ -194,6 +217,33 @@ export class BlockInputSync {
             this.logger.debug("Error handling unknownEnvelopeBlockRoot event", {}, e);
         }
     };
+    onUnknownEnvelopeBlockRootSlot = (data) => {
+        try {
+            if (data.slot === this.chain.clock.currentSlot) {
+                // we receive the optimistic search, the poll loop searches it at PAYLOAD_DUE or on its next
+                // tick. If that loop already returned - every root it watched was imported - this root waits
+                // for the next slot, where startPayloadPollAtSlot moves it to pendingPayloads. That is not the normal
+                // scenario, and in a forking condition it only delays the search of the extra root
+                const deferred = this.deferredPayloadRoots.get(data.rootHex);
+                if (deferred === undefined) {
+                    this.deferredPayloadRoots.set(data.rootHex, { slot: data.slot, source: data.source, peer: data.peer });
+                }
+                else if (deferred.peer === undefined) {
+                    deferred.peer = data.peer;
+                }
+                return;
+            }
+            const isNewRoot = this.addByPayloadRootHex(data.rootHex, data.peer, data.slot);
+            if (isNewRoot) {
+                this.triggerUnknownBlockSearch();
+                this.metrics?.blockInputSync.requests.inc({ type: PendingBlockType.UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT });
+                this.metrics?.blockInputSync.payloadSource.inc({ source: data.source });
+            }
+        }
+        catch (e) {
+            this.logger.debug("Error handling unknownEnvelopeBlockRootSlot event", {}, e);
+        }
+    };
     onIncompletePayloadEnvelope = (data) => {
         try {
             this.addByPayloadInput(data.payloadInput, data.peer);
@@ -288,12 +338,21 @@ export class BlockInputSync {
                 belowFinalizedPayloads++;
             }
         }
-        let deletedBlocks = 0;
+        let belowFinalizedBlocks = 0;
+        let agedOutBlocks = 0;
         for (const [rootHex, block] of this.pendingBlocks) {
             const slot = getBlockInputSyncCacheItemSlot(block);
-            if (typeof slot === "number" && slot < finalizedSlot) {
+            if (typeof slot !== "number") {
+                // we may not be able to download a root, hence there is no slot for it
+                if (nowSec - block.timeAddedSec > maxSecInCache) {
+                    this.pendingBlocks.delete(rootHex);
+                    agedOutBlocks++;
+                }
+                continue;
+            }
+            if (slot < finalizedSlot) {
                 this.pendingBlocks.delete(rootHex);
-                deletedBlocks++;
+                belowFinalizedBlocks++;
             }
         }
         if (belowFinalizedPayloads > 0) {
@@ -302,15 +361,19 @@ export class BlockInputSync {
         if (agedOutPayloads > 0) {
             this.metrics?.blockInputSync.removedPayloads.inc({ reason: DroppedItemReason.agedOut }, agedOutPayloads);
         }
-        if (deletedBlocks > 0) {
-            this.metrics?.blockInputSync.removedBlocks.inc({ reason: DroppedItemReason.belowFinalized }, deletedBlocks);
+        if (belowFinalizedBlocks > 0) {
+            this.metrics?.blockInputSync.removedBlocks.inc({ reason: DroppedItemReason.belowFinalized }, belowFinalizedBlocks);
+        }
+        if (agedOutBlocks > 0) {
+            this.metrics?.blockInputSync.removedBlocks.inc({ reason: DroppedItemReason.agedOut }, agedOutBlocks);
         }
-        this.logger.debug("BlockInputSync.pruneFinalized dropped pre-finalized pending items", {
+        this.logger.debug("BlockInputSync.pruneFinalized dropped stale pending items", {
             finalizedSlot,
             finalizedRoot: checkpoint.rootHex,
             belowFinalizedPayloads,
             agedOutPayloads,
-            deletedBlocks,
+            belowFinalizedBlocks,
+            agedOutBlocks,
             unresolvedSlotPayloads,
         });
     };
@@ -652,6 +715,115 @@ export class BlockInputSync {
             this.rateLimitBackoffTimeout = undefined;
         }
     }
+    /**
+     * Start this slot's payload poll: end the previous slot's loop, move roots it never got to
+     * into pendingPayloads, then poll from PAYLOAD_DUE to the end of the slot.
+     */
+    startPayloadPollAtSlot = (slot) => {
+        if (!isForkPostGloas(this.config.getForkName(slot))) {
+            return;
+        }
+        // end the previous slot's loop, wherever it is: its sleep is bound to this same controller
+        this.payloadPollAbortController?.abort();
+        this.payloadPollAbortController = new AbortController();
+        // entries from an earlier slot is not polled
+        for (const [rootHex, { slot: deferredSlot, source, peer }] of this.deferredPayloadRoots) {
+            if (deferredSlot < slot) {
+                if (!this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
+                    this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
+                }
+                this.deferredPayloadRoots.delete(rootHex);
+            }
+        }
+        this.pollPayloadsAtSlot(slot, this.payloadPollAbortController.signal).catch((e) => {
+            if (!isErrorAborted(e)) {
+                this.logger.debug("Error polling payloads", { slot }, e);
+            }
+        });
+    };
+    /**
+     * Poll unknown payloads of the current slot.
+     */
+    async pollPayloadsAtSlot(slot, signal) {
+        // fixed tick count so the loop cannot outlive its slot: for mainnet, it's 6 ticks
+        const tickCount = Math.floor((this.config.SLOT_DURATION_MS - this.config.getPayloadDueMs()) / PAYLOAD_POLL_INTERVAL_MS);
+        // a root still missing on several ticks is searched on each of them, recorded once
+        const searchedRoots = new Set();
+        let polls = 0;
+        try {
+            await sleep(Math.max(0, this.config.getPayloadDueMs() - this.chain.clock.msFromSlot(slot)), signal);
+            for (polls = 0; polls < tickCount; polls++) {
+                let importedCount = 0;
+                for (const [rootHex, { slot: deferredSlot, source, peer }] of this.deferredPayloadRoots) {
+                    if (this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
+                        importedCount++;
+                        continue;
+                    }
+                    // copy to the regular pendingPayloads so that we can search
+                    this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
+                    searchedRoots.add(rootHex);
+                }
+                // an empty deferredPayloadRoots means there is no optimistic search comes before PAYLOAD_DUE
+                // we have to poll until the payload of current slot is imported or slot end
+                if (this.deferredPayloadRoots.size > 0 && importedCount === this.deferredPayloadRoots.size) {
+                    if (searchedRoots.size > 0) {
+                        // the backup search was needed
+                        this.metrics?.blockInputSync.deferredPayloadResult.inc({
+                            result: DeferredPayloadResult.ImportedAfterSearch,
+                        });
+                        this.metrics?.blockInputSync.deferredPayloadPolls.observe(polls);
+                        this.logger.verbose("Payload imported after unknown sync search", {
+                            slot,
+                            roots: Array.from(searchedRoots).join(","),
+                            polls,
+                        });
+                    }
+                    else {
+                        // this happens most of the time on devnet
+                        // gossip delivered everything before PAYLOAD_DUE
+                        this.metrics?.blockInputSync.deferredPayloadResult.inc({
+                            result: DeferredPayloadResult.ImportedBeforeSearch,
+                        });
+                    }
+                    return;
+                }
+                this.triggerUnknownBlockSearch();
+                if (polls < tickCount - 1) {
+                    // no sleep after the last tick: the loop would otherwise end right at the slot boundary,
+                    // where startPayloadPollAtSlot aborts it
+                    await sleep(PAYLOAD_POLL_INTERVAL_MS, signal);
+                }
+            }
+            // reaching here means the early return never fired
+            if (this.deferredPayloadRoots.size > 0) {
+                this.metrics?.blockInputSync.deferredPayloadResult.inc({ result: DeferredPayloadResult.Unresolved });
+                this.logger.debug("Deferred payloads still missing at end of slot", {
+                    slot,
+                    roots: Array.from(this.deferredPayloadRoots.keys()).join(","),
+                });
+            }
+            else {
+                // no optimistic search and no payload import ended the loop, eg a skipped slot
+                this.metrics?.blockInputSync.deferredPayloadResult.inc({ result: DeferredPayloadResult.ResolvedNoRoot });
+                this.logger.debug("No deferred payloads at slot", {
+                    slot,
+                });
+            }
+        }
+        catch (e) {
+            if (!isErrorAborted(e)) {
+                throw e;
+            }
+            this.logger.verbose("Payload poll aborted", { slot, polls, msIntoSlot: this.chain.clock.msFromSlot(slot) });
+        }
+    }
+    addDeferredPayloadRoot(rootHex, slot, source, peer) {
+        const isNewRoot = this.addByPayloadRootHex(rootHex, peer, slot);
+        if (isNewRoot) {
+            this.metrics?.blockInputSync.requests.inc({ type: PendingBlockType.DEFERRED_PAYLOAD_BLOCK_ROOT });
+            this.metrics?.blockInputSync.payloadSource.inc({ source });
+        }
+    }
     async downloadBlock(block) {
         if (block.status !== PendingBlockInputStatus.pending) {
             return;
@@ -670,7 +842,12 @@ export class BlockInputSync {
         if (!res.err) {
             this.metrics?.blockInputSync.downloadedBlocksSuccess.inc();
             const pending = res.result;
-            this.pendingBlocks.set(pending.blockInput.blockRootHex, pending);
+            // pruning may have deleted this entry while we were awaiting the network, do not resurrect it via the set below
+            if (!this.pendingBlocks.has(rootHex)) {
+                this.logger.verbose("Dropping downloaded block, entry pruned during fetch", logCtx);
+                return;
+            }
+            this.pendingBlocks.set(rootHex, pending);
             const blockSlot = pending.blockInput.slot;
             const finalizedSlot = this.chain.forkChoice.getFinalizedBlock().slot;
             const delaySec = Date.now() / 1000 - computeTimeAtSlot(this.config, blockSlot, this.chain.genesisTime);
@@ -730,8 +907,11 @@ export class BlockInputSync {
                 return;
             }
             this.metrics?.blockInputSync.downloadedBlocksError.inc();
-            this.logger.debug("Ignoring unknown block root after many failed downloads", logCtx, res.err);
-            this.removeAndDownScoreAllDescendants(block, DroppedItemReason.unavailable);
+            this.logger.debug("Failed to download unknown block root, retained for retry", logCtx, res.err);
+            const pendingBlock = this.pendingBlocks.get(rootHex);
+            if (pendingBlock && pendingBlock.status === PendingBlockInputStatus.fetching) {
+                pendingBlock.status = PendingBlockInputStatus.pending;
+            }
         }
     }
     /**
@@ -954,7 +1134,7 @@ export class BlockInputSync {
             return;
         }
         this.metrics?.blockInputSync.downloadedPayloadsResult.inc({ result: DownloadResult.Failed });
-        this.logger.debug("Ignoring unknown payload root after failed download", logCtx, res.err);
+        this.logger.debug("Failed to download unknown payload root, retained for retry", logCtx, res.err);
         if (!isPendingPayloadEnvelope(payload)) {
             payload.status = PendingPayloadInputStatus.pending;
         }
@@ -1322,7 +1502,11 @@ export class BlockInputSync {
             finally {
                 this.peerBalancer.onRequestCompleted(peerId);
             }
-            this.pendingBlocks.set(getBlockInputSyncCacheItemRootHex(cacheItem), cacheItem);
+            const cacheItemRootHex = getBlockInputSyncCacheItemRootHex(cacheItem);
+            // pruning may have dropped it mid-fetch
+            if (this.pendingBlocks.has(cacheItemRootHex)) {
+                this.pendingBlocks.set(cacheItemRootHex, cacheItem);
+            }
             if (cacheItem.status === PendingBlockInputStatus.downloaded) {
                 // download was successful, no need to go with another peer, return
                 const result = this.chain.forkChoice.hasBlockHex(cacheItem.blockInput.blockRootHex)