Apply changes from #6337

ChainSafe · Jan 30, 2024 · 19282ff · 19282ff
1 parent bd8ce9b
commit 19282ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/api/src/beacon/routes/beacon/block.ts b/packages/api/src/beacon/routes/beacon/block.ts
@@ -209,12 +209,12 @@ export type Endpoints = {
    *
    * param blockId Block identifier.
    * Can be one of: "head" (canonical head in node's view), "genesis", "finalized", \<slot\>, \<hex encoded blockRoot with 0x prefix\>.
-   * @param indices Array of indices for blob sidecars to request for in the specified block. Returns all blob sidecars in the block if not specified.
+   * indices Array of indices for blob sidecars to request for in the specified block. Returns all blob sidecars in the block if not specified.
    */
   getBlobSidecars: Endpoint<
     "GET",
-    {blockId: BlockId},
-    {params: {block_id: string}},
+    {blockId: BlockId; indices?: number[]},
+    {params: {block_id: string}; query: {indices?: number[]}},
     deneb.BlobSidecars,
     ExecutionOptimisticMeta
   >;
@@ -524,7 +524,11 @@ export function getDefinitions(config: ChainForkConfig): RouteDefinitions<Endpoi
     getBlobSidecars: {
       url: "/eth/v1/beacon/blob_sidecars/{block_id}",
       method: "GET",
-      req: blockIdOnlyReq,
+      req: {
+        writeReq: ({blockId, indices}) => ({params: {block_id: String(blockId)}, query: {indices}}),
+        parseReq: ({params, query}) => ({blockId: params.block_id, indices: query.indices}),
+        schema: {params: {block_id: Schema.StringRequired}, query: {indices: Schema.UintArray}},
+      },
       resp: {
         data: ssz.deneb.BlobSidecars,
         meta: ExecutionOptimisticCodec,

diff --git a/packages/beacon-node/src/api/impl/beacon/blocks/index.ts b/packages/beacon-node/src/api/impl/beacon/blocks/index.ts
@@ -400,7 +400,7 @@ export function getBeaconBlockApi({
       await publishBlock(signedBlockOrContents, opts);
     },
 
-    async getBlobSidecars({blockId}) {
+    async getBlobSidecars({blockId, indices}) {
       const {block, executionOptimistic} = await resolveBlockId(chain, blockId);
       const blockRoot = config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message);
 
@@ -414,7 +414,7 @@ export function getBeaconBlockApi({
       }
 
       return {
-        data: blobSidecars,
+        data: indices ? blobSidecars.filter(({index}) => indices.includes(index)) : blobSidecars,
         meta: {executionOptimistic},
       };
     },