do not request blobs if no blocks in range

ChainSafe · Jan 25, 2023 · e252d89 · e252d89
1 parent 606312a
commit e252d89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/beacon-node/src/network/nodejs/bundle.ts b/packages/beacon-node/src/network/nodejs/bundle.ts
@@ -9,8 +9,8 @@ import type {PeerDiscovery} from "@libp2p/interface-peer-discovery";
 import type {Components} from "libp2p/components";
 import {prometheusMetrics} from "@libp2p/prometheus-metrics";
 import {Registry} from "prom-client";
-import {Libp2p} from "../interface.js";
 import {yamux} from "@chainsafe/libp2p-yamux";
+import {Libp2p} from "../interface.js";
 import {createNoise} from "./noise.js";
 
 export interface ILibp2pOptions {
@@ -46,7 +46,7 @@ export async function createNodejsLibp2p(options: ILibp2pOptions): Promise<Libp2
   const yamuxInstance = yamux();
   const mplexInstance = mplex({maxInboundStreams: 256});
 
-  return await createLibp2p({
+  return (await createLibp2p({
     peerId: options.peerId,
     addresses: {
       listen: options.addresses.listen,
@@ -123,5 +123,5 @@ export async function createNodejsLibp2p(options: ILibp2pOptions): Promise<Libp2
         agentVersion: options.lodestarVersion ? `lodestar/${options.lodestarVersion}` : "lodestar",
       },
     },
-  }) as Libp2p;
+  })) as Libp2p;
 }
diff --git a/packages/beacon-node/src/network/reqresp/doBeaconBlocksMaybeBlobsByRange.ts b/packages/beacon-node/src/network/reqresp/doBeaconBlocksMaybeBlobsByRange.ts
@@ -26,7 +26,7 @@ export async function doBeaconBlocksMaybeBlobsByRange(
   else if (computeEpochAtSlot(request.startSlot) >= currentEpoch - config.MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS) {
     // TODO EIP-4844: Do two requests at once for blocks and blobs
     const blocks = await reqResp.beaconBlocksByRange(peerId, request);
-    const blobsSidecars = await reqResp.blobsSidecarsByRange(peerId, request);
+    const blobsSidecars = blocks.length > 0 ? await reqResp.blobsSidecarsByRange(peerId, request) : [];
 
     const blockInputs: BlockInput[] = [];
     let blobSideCarIndex = 0;