resolve availability when datacolumns are downloaded and matched

ChainSafe · Sep 7, 2024 · bf08852 · bf08852
1 parent 2833ac0
commit bf08852
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/packages/beacon-node/src/network/reqresp/beaconBlocksMaybeBlobsByRoot.ts b/packages/beacon-node/src/network/reqresp/beaconBlocksMaybeBlobsByRoot.ts
@@ -289,6 +289,15 @@ export async function unavailableBeaconBlobsByRoot(
           ? {blocks: [unavailableBlockInput], pendingDataColumns: neededColumns}
           : null
       );
+
+      // don't forget to resolve availability as the block may be stuck in availability wait
+      if (availableBlockInput !== undefined && availableBlockInput.type === BlockInputType.availableData) {
+        const {blockData} = availableBlockInput;
+        if (blockData.fork !== ForkName.peerdas) {
+          throw Error(`unexpected blockData fork=${blockData.fork} returned by matchBlockWithDataColumns`);
+        }
+        resolveAvailability(blockData);
+      }
     }
   } else {
     throw Error(`Invalid cachedData fork=${cachedData.fork} for unavailableBeaconBlobsByRoot`);