@lodestar/beacon-node 1.33.0-peerDAS.e03bda542e → 1.33.0-rc.0

package/lib/sync/range/utils/peerBalancer.js

@@ -6,11 +6,9 @@ import { BatchStatus } from "../batch.js";
  * Shuffles peers only once on instantiation
  */
 export class ChainPeersBalancer {
-    // TODO: @matthewkeil check if this needs to be updated for custody groups
-    constructor(peers, batches, custodyConfig) {
+    constructor(peers, batches) {
         this.activeRequestsByPeer = new Map();
         this.peers = shuffle(peers);
-        this.custodyConfig = custodyConfig;
         // Compute activeRequestsByPeer from all batches internal states
         for (const batch of batches) {
             if (batch.state.status === BatchStatus.Downloading) {
@@ -23,77 +21,20 @@ export class ChainPeersBalancer {
      * Sort peers by (1) no failed request (2) less active requests, then pick first
      */
     bestPeerToRetryBatch(batch) {
-        if (batch.state.status !== BatchStatus.AwaitingDownload) {
-            return;
-        }
-        const { partialDownload } = batch.state;
-        const pendingDataColumns = partialDownload?.pendingDataColumns ?? this.custodyConfig.sampledColumns;
-        const eligiblePeers = this.filterPeers(batch, pendingDataColumns, false);
         const failedPeers = new Set(batch.getFailedPeers());
-        const sortedBestPeers = sortBy(eligiblePeers, ({ syncInfo }) => (failedPeers.has(syncInfo.peerId) ? 1 : 0), // prefer peers without failed requests
-        ({ syncInfo }) => this.activeRequestsByPeer.get(syncInfo.peerId) ?? 0, // prefer peers with least active req
-        ({ hasEarliestAvailableSlots }) => (hasEarliestAvailableSlots ? 0 : 1), // prefer peers with earliestAvailableSlots defined
-        ({ columns }) => -1 * columns // prefer peers with the most columns
+        const sortedBestPeers = sortBy(this.peers, (peer) => (failedPeers.has(peer) ? 1 : 0), // Sort by no failed first = 0
+        (peer) => this.activeRequestsByPeer.get(peer) ?? 0 // Sort by least active req
         );
-        return sortedBestPeers.length > 0 ? sortedBestPeers[0].syncInfo : undefined;
+        return sortedBestPeers[0];
     }
     /**
-     * Return peers with 0 or no active requests that has a higher target slot than this batch and has columns we need.
+     * Return peers with 0 or no active requests
      */
-    idlePeerForBatch(batch) {
-        const eligiblePeers = this.filterPeers(batch, this.custodyConfig.sampledColumns, true);
-        // pick idle peer that has (for pre-fulu they are the same)
-        // - earliestAvailableSlot defined
-        // - the most columns we need
-        const sortedBestPeers = sortBy(eligiblePeers, ({ hasEarliestAvailableSlots }) => (hasEarliestAvailableSlots ? 0 : 1), // prefer peers with earliestAvailableSlots defined
-        ({ columns }) => -1 * columns // prefer peers with most columns we need
-        );
-        const bestPeer = sortedBestPeers[0];
-        if (bestPeer != null) {
-            // we will use this peer for batch in SyncChain right after this call
-            this.activeRequestsByPeer.set(bestPeer.syncInfo.peerId, 1);
-            return bestPeer.syncInfo;
-        }
-        return undefined;
-    }
-    filterPeers(batch, requestColumns, checkActiveRequest) {
-        const eligiblePeers = [];
-        for (const peer of this.peers) {
-            const { earliestAvailableSlot, custodyGroups, target, peerId } = peer;
-            const activeRequest = this.activeRequestsByPeer.get(peerId) ?? 0;
-            if (checkActiveRequest && activeRequest > 0) {
-                continue;
-            }
-            if (target.slot < batch.request.startSlot) {
-                continue;
-            }
-            if (!batch.isFulu()) {
-                // pre-fulu logic, we don't care columns and earliestAvailableSlot
-                eligiblePeers.push({ syncInfo: peer, columns: 0, hasEarliestAvailableSlots: false });
-                continue;
-            }
-            // for devnet, we optimistically assume peers without earliestAvailableSlot, but don't prioritize them
-            // TODO(fulu): consider do not accept these peers
-            const earliestSlot = earliestAvailableSlot ?? 0;
-            const peerColumns = custodyGroups;
-            if (earliestSlot > batch.request.startSlot) {
-                continue;
-            }
-            const columns = peerColumns.reduce((acc, elem) => {
-                if (requestColumns.includes(elem)) {
-                    acc.push(elem);
-                }
-                return acc;
-            }, []);
-            if (columns.length > 0) {
-                eligiblePeers.push({
-                    syncInfo: peer,
-                    columns: columns.length,
-                    hasEarliestAvailableSlots: earliestAvailableSlot != null,
-                });
-            }
-        }
-        return eligiblePeers;
+    idlePeers() {
+        return this.peers.filter((peer) => {
+            const activeRequests = this.activeRequestsByPeer.get(peer);
+            return activeRequests === undefined || activeRequests === 0;
+        });
     }
 }
 //# sourceMappingURL=peerBalancer.js.map

package/lib/sync/range/utils/peerBalancer.js.map

@@ -1 +1 @@
-{"version":3,"file":"peerBalancer.js","sourceRoot":"","sources":["../../../../src/sync/range/utils/peerBalancer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"peerBalancer.js","sourceRoot":"","sources":["../../../../src/sync/range/utils/peerBalancer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAQ,WAAW,EAAC,MAAM,aAAa,CAAC;AAE/C;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAI7B,YAAY,KAAkB,EAAE,OAAgB;QAFxC,yBAAoB,GAAG,IAAI,GAAG,EAAqB,CAAC;QAG1D,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAE5B,gEAAgE;QAChE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,WAAW,EAAE,CAAC;gBACnD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9G,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,KAAY;QAC/B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,MAAM,CAC5B,IAAI,CAAC,KAAK,EACV,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,8BAA8B;QACzE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,2BAA2B;SAC/E,CAAC;QACF,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAChC,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3D,OAAO,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/sync/unknownBlock.d.ts

@@ -58,19 +58,12 @@ export declare class UnknownBlockSync {
      */
     private processBlock;
     /**
-     * From a set of shuffled peers:
-     *   - fetch the block
-     *   - from deneb, fetch all missing blobs
-     *   - from peerDAS, fetch sampled colmns
-     * TODO: this means we only have block root, and nothing else. Consider to reflect this in the function name
+     * Fetches the parent of a block by root from a set of shuffled peers.
      * Will attempt a max of `MAX_ATTEMPTS_PER_BLOCK` on different peers if connectPeers.length > MAX_ATTEMPTS_PER_BLOCK.
      * Also verifies the received block root + returns the peer that provided the block for future downscoring.
      */
     private fetchUnknownBlockRoot;
     /**
-     * We have partial block input:
-     * - we have block but not have all blobs (deneb) or needed columns (fulu)
-     * - we don't have block and have some blobs (deneb) or some columns (fulu)
      * Fetches missing blobs for the blockinput, in future can also pull block is thats also missing
      * along with the blobs (i.e. only some blobs are available)
      */

package/lib/sync/unknownBlock.js

@@ -1,10 +1,9 @@
-import { fromHexString, toHexString } from "@chainsafe/ssz";
-import { ForkName, INTERVALS_PER_SLOT, NUMBER_OF_COLUMNS } from "@lodestar/params";
+import { INTERVALS_PER_SLOT } from "@lodestar/params";
 import { fromHex, pruneSetToMax, toRootHex } from "@lodestar/utils";
 import { sleep } from "@lodestar/utils";
 import { BlockInputType } from "../chain/blocks/types.js";
 import { BlockError, BlockErrorCode } from "../chain/errors/index.js";
-import { NetworkEvent } from "../network/index.js";
+import { NetworkEvent, PeerAction } from "../network/index.js";
 import { beaconBlocksMaybeBlobsByRoot, unavailableBeaconBlobsByRoot, } from "../network/reqresp/beaconBlocksMaybeBlobsByRoot.js";
 import { byteArrayEquals } from "../util/bytes.js";
 import { shuffle } from "../util/shuffle.js";
@@ -194,8 +193,8 @@ export class UnknownBlockSync {
         else {
             if (blockInputOrRootHex.block !== null) {
                 const { block } = blockInputOrRootHex;
-                blockRootHex = toHexString(this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message));
-                unknownBlockType = PendingBlockType.UNKNOWN_DATA;
+                blockRootHex = toRootHex(this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message));
+                unknownBlockType = PendingBlockType.UNKNOWN_BLOBS;
             }
             else {
                 unknownBlockType = PendingBlockType.UNKNOWN_BLOCKINPUT;
@@ -231,70 +230,23 @@ export class UnknownBlockSync {
         }
         return unknownBlockType;
     }
-    async downloadBlock(block, allPeers) {
+    async downloadBlock(block, connectedPeers) {
         if (block.status !== PendingBlockStatus.pending) {
             return;
         }
         const unknownBlockType = block.unknownBlockType;
-        const logCtx = {
+        this.logger.verbose("Downloading unknown block", {
             root: block.blockRootHex,
             pendingBlocks: this.pendingBlocks.size,
             slot: block.blockInput?.block?.message.slot ?? "unknown",
             unknownBlockType,
-        };
-        this.logger.verbose("Downloading unknown block", logCtx);
+        });
         block.status = PendingBlockStatus.fetching;
         let res;
-        let connectedPeers;
         if (block.blockInput === null) {
-            connectedPeers = allPeers;
-            // we only have block root, and nothing else
-            res = await wrapError(this.fetchUnknownBlockRoot(fromHexString(block.blockRootHex), connectedPeers));
+            res = await wrapError(this.fetchUnknownBlockRoot(fromHex(block.blockRootHex), connectedPeers));
         }
         else {
-            const { cachedData } = block.blockInput;
-            if (cachedData.fork === ForkName.fulu) {
-                const { dataColumnsCache } = cachedData;
-                const sampledColumns = this.network.custodyConfig.sampledColumns;
-                const neededColumns = sampledColumns.reduce((acc, elem) => {
-                    if (dataColumnsCache.get(elem) === undefined) {
-                        acc.push(elem);
-                    }
-                    return acc;
-                }, []);
-                connectedPeers =
-                    neededColumns.length <= 0
-                        ? allPeers
-                        : allPeers.filter((peer) => {
-                            const { custodyGroups: peerColumns } = this.network.getConnectedPeerSyncMeta(peer);
-                            const columns = peerColumns.reduce((acc, elem) => {
-                                if (neededColumns.includes(elem)) {
-                                    acc.push(elem);
-                                }
-                                return acc;
-                            }, []);
-                            return columns.length > 0;
-                        });
-                if (connectedPeers.length > 0) {
-                    this.logger.debug("Filtered peers to those having relevant columns for downloading data", {
-                        ...logCtx,
-                        allPeers: allPeers.length,
-                        connectedPeers: connectedPeers.length,
-                    });
-                }
-                else {
-                    this.logger.debug("Skipping download as no filtered peers having relevant data", {
-                        ...logCtx,
-                        allPeers: allPeers.length,
-                        connectedPeers: connectedPeers.length,
-                        neededColumns: neededColumns.join(" "),
-                    });
-                    return;
-                }
-            }
-            else {
-                connectedPeers = allPeers;
-            }
             res = await wrapError(this.fetchUnavailableBlockInput(block.blockInput, connectedPeers));
         }
         if (res.err)
@@ -303,73 +255,48 @@ export class UnknownBlockSync {
             this.metrics?.syncUnknownBlock.downloadedBlocksSuccess.inc();
         if (!res.err) {
             const { blockInput, peerIdStr } = res.result;
-            if (blockInput.type === BlockInputType.dataPromise) {
-                // if there were any peers who would have had the missing datacolumns, it would have resulted in err
-                block = {
-                    ...block,
-                    blockInput,
-                    unknownBlockType: PendingBlockType.UNKNOWN_DATA,
-                };
-                block.blockInput = blockInput;
-                this.pendingBlocks.set(block.blockRootHex, block);
-                block.status = PendingBlockStatus.pending;
-                // parentSlot > finalizedSlot, continue downloading parent of parent
-                block.downloadAttempts += this.config.CUSTODY_REQUIREMENT / NUMBER_OF_COLUMNS;
-                const errorData = { root: block.blockRootHex, attempts: block.downloadAttempts, unknownBlockType };
-                if (block.downloadAttempts > MAX_ATTEMPTS_PER_BLOCK) {
-                    // Give up on this block and assume it does not exist, penalizing all peers as if it was a bad block
-                    this.logger.debug("Ignoring unknown block after many failed downloads", errorData);
-                    this.removeAndDownscoreAllDescendants(block);
-                }
-                else {
-                    // Try again when a new peer connects, its status changes, or a new unknownBlockParent event happens
-                    this.logger.debug("Error downloading full unknown block", errorData);
-                }
+            block = {
+                ...block,
+                status: PendingBlockStatus.downloaded,
+                blockInput,
+                parentBlockRootHex: toRootHex(blockInput.block.message.parentRoot),
+            };
+            this.pendingBlocks.set(block.blockRootHex, block);
+            const blockSlot = blockInput.block.message.slot;
+            const finalizedSlot = this.chain.forkChoice.getFinalizedBlock().slot;
+            const delaySec = Date.now() / 1000 - (this.chain.genesisTime + blockSlot * this.config.SECONDS_PER_SLOT);
+            this.metrics?.syncUnknownBlock.elapsedTimeTillReceived.observe(delaySec);
+            const parentInForkchoice = this.chain.forkChoice.hasBlock(blockInput.block.message.parentRoot);
+            this.logger.verbose("Downloaded unknown block", {
+                root: block.blockRootHex,
+                pendingBlocks: this.pendingBlocks.size,
+                parentInForkchoice,
+                blockInputType: blockInput.type,
+                unknownBlockType,
+            });
+            if (parentInForkchoice) {
+                // Bingo! Process block. Add to pending blocks anyway for recycle the cache that prevents duplicate processing
+                this.processBlock(block).catch((e) => {
+                    this.logger.debug("Unexpected error - process newly downloaded block", {}, e);
+                });
             }
-            else {
-                block = {
-                    ...block,
-                    status: PendingBlockStatus.downloaded,
-                    blockInput,
-                    parentBlockRootHex: toHexString(blockInput.block.message.parentRoot),
-                };
-                this.pendingBlocks.set(block.blockRootHex, block);
-                const blockSlot = blockInput.block.message.slot;
-                const finalizedSlot = this.chain.forkChoice.getFinalizedBlock().slot;
-                const delaySec = Date.now() / 1000 - (this.chain.genesisTime + blockSlot * this.config.SECONDS_PER_SLOT);
-                this.metrics?.syncUnknownBlock.elapsedTimeTillReceived.observe(delaySec);
-                const parentInForkchoice = this.chain.forkChoice.hasBlock(blockInput.block.message.parentRoot);
-                this.logger.verbose("Downloaded unknown block", {
-                    root: block.blockRootHex,
-                    pendingBlocks: this.pendingBlocks.size,
-                    parentInForkchoice,
-                    blockInputType: blockInput.type,
+            else if (blockSlot <= finalizedSlot) {
+                // the common ancestor of the downloading chain and canonical chain should be at least the finalized slot and
+                // we should found it through forkchoice. If not, we should penalize all peers sending us this block chain
+                // 0 - 1 - ... - n - finalizedSlot
+                //                \
+                //                parent 1 - parent 2 - ... - unknownParent block
+                const blockRoot = this.config.getForkTypes(blockSlot).BeaconBlock.hashTreeRoot(blockInput.block.message);
+                this.logger.debug("Downloaded block is before finalized slot", {
+                    finalizedSlot,
+                    blockSlot,
+                    parentRoot: toRootHex(blockRoot),
                     unknownBlockType,
                 });
-                if (parentInForkchoice) {
-                    // Bingo! Process block. Add to pending blocks anyway for recycle the cache that prevents duplicate processing
-                    this.processBlock(block).catch((e) => {
-                        this.logger.debug("Unexpected error - process newly downloaded block", {}, e);
-                    });
-                }
-                else if (blockSlot <= finalizedSlot) {
-                    // the common ancestor of the downloading chain and canonical chain should be at least the finalized slot and
-                    // we should found it through forkchoice. If not, we should penalize all peers sending us this block chain
-                    // 0 - 1 - ... - n - finalizedSlot
-                    //                \
-                    //                parent 1 - parent 2 - ... - unknownParent block
-                    const blockRoot = this.config.getForkTypes(blockSlot).BeaconBlock.hashTreeRoot(blockInput.block.message);
-                    this.logger.debug("Downloaded block is before finalized slot", {
-                        finalizedSlot,
-                        blockSlot,
-                        parentRoot: toHexString(blockRoot),
-                        unknownBlockType,
-                    });
-                    this.removeAndDownscoreAllDescendants(block);
-                }
-                else {
-                    this.onUnknownParent({ blockInput, peer: peerIdStr });
-                }
+                this.removeAndDownscoreAllDescendants(block);
+            }
+            else {
+                this.onUnknownParent({ blockInput, peer: peerIdStr });
             }
         }
         else {
@@ -476,11 +403,7 @@ export class UnknownBlockSync {
         }
     }
     /**
-     * From a set of shuffled peers:
-     *   - fetch the block
-     *   - from deneb, fetch all missing blobs
-     *   - from peerDAS, fetch sampled colmns
-     * TODO: this means we only have block root, and nothing else. Consider to reflect this in the function name
+     * Fetches the parent of a block by root from a set of shuffled peers.
      * Will attempt a max of `MAX_ATTEMPTS_PER_BLOCK` on different peers if connectPeers.length > MAX_ATTEMPTS_PER_BLOCK.
      * Also verifies the received block root + returns the peer that provided the block for future downscoring.
      */
@@ -488,58 +411,24 @@ export class UnknownBlockSync {
         const shuffledPeers = shuffle(connectedPeers);
         const blockRootHex = toRootHex(blockRoot);
         let lastError = null;
-        let partialDownload = null;
-        let fetchedPeerId = null;
         for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
-            const peerId = shuffledPeers[i % shuffledPeers.length];
-            const { custodyGroups: peerColumns, client: peerClient } = this.network.getConnectedPeerSyncMeta(peerId);
-            if (partialDownload !== null) {
-                const [prevBlockInput] = partialDownload.blocks;
-                if (prevBlockInput === undefined || prevBlockInput.type !== BlockInputType.dataPromise) {
-                    throw Error(`prevBlockInput=${prevBlockInput?.type} in partialDownload`);
-                }
-                const { cachedData } = prevBlockInput;
-                if (cachedData.fork === ForkName.fulu) {
-                    const { dataColumnsCache } = cachedData;
-                    const sampledColumns = this.network.custodyConfig.sampledColumns;
-                    const neededColumns = sampledColumns.reduce((acc, elem) => {
-                        if (dataColumnsCache.get(elem) === undefined) {
-                            acc.push(elem);
-                        }
-                        return acc;
-                    }, []);
-                    const columns = peerColumns.reduce((acc, elem) => {
-                        if (neededColumns.includes(elem)) {
-                            acc.push(elem);
-                        }
-                        return acc;
-                    }, []);
-                    if (columns.length === 0) {
-                        continue;
-                    }
-                }
-            }
+            const peer = shuffledPeers[i % shuffledPeers.length];
             try {
-                const { blocks: [blockInput], pendingDataColumns, } = await beaconBlocksMaybeBlobsByRoot(this.config, this.network, peerId, [blockRoot], partialDownload, peerClient, this.metrics, this.logger);
+                const [blockInput] = await beaconBlocksMaybeBlobsByRoot(this.config, this.network, peer, [blockRoot]);
                 // Peer does not have the block, try with next peer
                 if (blockInput === undefined) {
                     continue;
                 }
-                if (pendingDataColumns !== null) {
-                    partialDownload = { blocks: [blockInput], pendingDataColumns };
-                    fetchedPeerId = peerId;
-                    continue;
-                }
                 // Verify block root is correct
                 const block = blockInput.block.message;
                 const receivedBlockRoot = this.config.getForkTypes(block.slot).BeaconBlock.hashTreeRoot(block);
                 if (!byteArrayEquals(receivedBlockRoot, blockRoot)) {
                     throw Error(`Wrong block received by peer, got ${toRootHex(receivedBlockRoot)} expected ${blockRootHex}`);
                 }
-                return { blockInput, peerIdStr: peerId };
+                return { blockInput, peerIdStr: peer };
             }
             catch (e) {
-                this.logger.debug("Error fetching UnknownBlockRoot", { attempt: i, blockRootHex, peer: peerId }, e);
+                this.logger.debug("Error fetching UnknownBlockRoot", { attempt: i, blockRootHex, peer }, e);
                 lastError = e;
             }
         }
@@ -547,16 +436,9 @@ export class UnknownBlockSync {
             lastError.message = `Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK} attempts: ${lastError.message}`;
             throw lastError;
         }
-        if (partialDownload !== null && fetchedPeerId !== null) {
-            const { blocks: [blockInput], } = partialDownload;
-            return { blockInput, peerIdStr: fetchedPeerId };
-        }
-        throw Error(`Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK}: unknown error because either partialDownload is null=${partialDownload === null} or fetchedPeerId is null=${fetchedPeerId === null} `);
+        throw Error(`Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK}: unknown error`);
     }
     /**
-     * We have partial block input:
-     * - we have block but not have all blobs (deneb) or needed columns (fulu)
-     * - we don't have block and have some blobs (deneb) or some columns (fulu)
      * Fetches missing blobs for the blockinput, in future can also pull block is thats also missing
      * along with the blobs (i.e. only some blobs are available)
      */
@@ -566,74 +448,37 @@ export class UnknownBlockSync {
         }
         const shuffledPeers = shuffle(connectedPeers);
         let blockRootHex;
+        let pendingBlobs;
         let blobKzgCommitmentsLen;
         let blockRoot;
-        const dataMeta = {};
-        let sampledColumns = [];
         if (unavailableBlockInput.block === null) {
             blockRootHex = unavailableBlockInput.blockRootHex;
             blockRoot = fromHex(blockRootHex);
         }
         else {
-            const { cachedData, block: unavailableBlock } = unavailableBlockInput;
+            const unavailableBlock = unavailableBlockInput.block;
             blockRoot = this.config
                 .getForkTypes(unavailableBlock.message.slot)
                 .BeaconBlock.hashTreeRoot(unavailableBlock.message);
             blockRootHex = toRootHex(blockRoot);
             blobKzgCommitmentsLen = unavailableBlock.message.body.blobKzgCommitments.length;
-            if (cachedData.fork === ForkName.deneb || cachedData.fork === ForkName.electra) {
-                const pendingBlobs = blobKzgCommitmentsLen - cachedData.blobsCache.size;
-                Object.assign(dataMeta, { pendingBlobs });
-            }
-            else if (cachedData.fork === ForkName.fulu) {
-                sampledColumns = this.network.custodyConfig.sampledColumns;
-                const pendingColumns = sampledColumns.length - cachedData.dataColumnsCache.size;
-                Object.assign(dataMeta, { pendingColumns });
-            }
+            pendingBlobs = blobKzgCommitmentsLen - unavailableBlockInput.cachedData.blobsCache.size;
         }
         let lastError = null;
         for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
-            const peerId = shuffledPeers[i % shuffledPeers.length];
-            const { custodyGroups: peerColumns, client: peerClient } = this.network.getConnectedPeerSyncMeta(peerId);
-            if (unavailableBlockInput.block !== null) {
-                const { cachedData } = unavailableBlockInput;
-                if (cachedData.fork === ForkName.fulu) {
-                    const { dataColumnsCache } = cachedData;
-                    const neededColumns = sampledColumns.reduce((acc, elem) => {
-                        if (dataColumnsCache.get(elem) === undefined) {
-                            acc.push(elem);
-                        }
-                        return acc;
-                    }, []);
-                    const columns = peerColumns.reduce((acc, elem) => {
-                        if (neededColumns.includes(elem)) {
-                            acc.push(elem);
-                        }
-                        return acc;
-                    }, []);
-                    if (columns.length === 0) {
-                        continue;
-                    }
-                }
-            }
+            const peer = shuffledPeers[i % shuffledPeers.length];
             try {
-                const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peerId, peerClient, unavailableBlockInput, {
+                const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peer, unavailableBlockInput, {
                     metrics: this.metrics,
-                    logger: this.logger,
-                    executionEngine: this.chain.executionEngine,
                     emitter: this.chain.emitter,
-                    blockInputsRetryTrackerCache: this.blockInputsRetryTrackerCache,
+                    executionEngine: this.chain.executionEngine,
                     engineGetBlobsCache: this.engineGetBlobsCache,
+                    blockInputsRetryTrackerCache: this.blockInputsRetryTrackerCache,
                 });
                 // Peer does not have the block, try with next peer
                 if (blockInput === undefined) {
                     continue;
                 }
-                if (unavailableBlockInput.block !== null && blockInput.type === BlockInputType.dataPromise) {
-                    // all datacolumns were not downloaded we can continue with other peers
-                    // as unavailableBlockInput.block's dataColumnsCache would be updated
-                    continue;
-                }
                 // Verify block root is correct
                 const block = blockInput.block.message;
                 const receivedBlockRoot = this.config.getForkTypes(block.slot).BeaconBlock.hashTreeRoot(block);
@@ -644,12 +489,12 @@ export class UnknownBlockSync {
                     this.logger.debug("Fetched  NullBlockInput", { attempts: i, blockRootHex });
                 }
                 else {
-                    this.logger.debug("Fetched UnavailableBlockInput", { attempts: i, ...dataMeta, blobKzgCommitmentsLen });
+                    this.logger.debug("Fetched UnavailableBlockInput", { attempts: i, pendingBlobs, blobKzgCommitmentsLen });
                 }
-                return { blockInput, peerIdStr: peerId };
+                return { blockInput, peerIdStr: peer };
             }
             catch (e) {
-                this.logger.debug("Error fetching UnavailableBlockInput", { attempt: i, blockRootHex, peer: peerId }, e);
+                this.logger.debug("Error fetching UnavailableBlockInput", { attempt: i, blockRootHex, peer }, e);
                 lastError = e;
             }
         }
@@ -668,15 +513,13 @@ export class UnknownBlockSync {
     removeAndDownscoreAllDescendants(block) {
         // Get all blocks that are a descendant of this one
         const badPendingBlocks = this.removeAllDescendants(block);
-        // just console log and do not penalize on pending/bad blocks for debugging
-        // console.log("removeAndDownscoreAllDescendants", {block});
         for (const block of badPendingBlocks) {
-            //   this.knownBadBlocks.add(block.blockRootHex);
-            //   for (const peerIdStr of block.peerIdStrs) {
-            //     // TODO: Refactor peerRpcScores to work with peerIdStr only
-            //     this.network.reportPeer(peerIdStr, PeerAction.LowToleranceError, "BadBlockByRoot");
-            //   }
-            this.logger.debug("ignored Banning unknown block", {
+            this.knownBadBlocks.add(block.blockRootHex);
+            for (const peerIdStr of block.peerIdStrs) {
+                // TODO: Refactor peerRpcScores to work with peerIdStr only
+                this.network.reportPeer(peerIdStr, PeerAction.LowToleranceError, "BadBlockByRoot");
+            }
+            this.logger.debug("Banning unknown block", {
                 root: block.blockRootHex,
                 peerIdStrs: Array.from(block.peerIdStrs).join(","),
             });