Review PR

ChainSafe · Nov 17, 2022 · 864b7d3 · 864b7d3
1 parent 6963c1c
commit 864b7d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/beacon-node/src/network/gossip/handlers/index.ts b/packages/beacon-node/src/network/gossip/handlers/index.ts
@@ -167,6 +167,11 @@ export function getGossipHandlers(modules: ValidatorFnsModules, options: GossipH
       const {beaconBlock, blobsSidecar} = blockAndBlocks;
       const blockImport: BlockImport = {block: beaconBlock, blobs: blobsSidecar};
 
+      // TODO EIP-4844: Should throw for pre fork blocks?
+      if (config.getForkSeq(beaconBlock.message.slot) < ForkSeq.eip4844) {
+        throw new GossipActionError(GossipAction.REJECT, {code: "PRE_EIP4844_BLOCK"});
+      }
+
       // Validate block + blob. Then forward, then handle both
       await validateBeaconBlock(blockImport, topic.fork, peerIdStr);
       await validateGossipBlobsSidecar(beaconBlock, blobsSidecar);

diff --git a/packages/beacon-node/src/network/network.ts b/packages/beacon-node/src/network/network.ts
@@ -225,6 +225,7 @@ export class Network implements INetwork {
     request: phase0.BeaconBlocksByRangeRequest
   ): Promise<BlockImport[]> {
     // TODO EIP-4844: Assumes all blocks in the same epoch
+    // TODO EIP-4844: Ensure all blocks are in the same epoch
     if (this.config.getForkSeq(request.startSlot) >= ForkSeq.eip4844) {
       // TODO EIP-4844: Do two requests at once for blocks and blobs
       const blocks = await this.reqResp.beaconBlocksByRange(peerId, request);