EIP-4844

packages/beacon-node/src/api/impl/beacon/blocks/index.ts

@@ -212,13 +212,8 @@ export function getBeaconBlockApi({
 
       metrics?.registerBeaconBlock(OpSource.api, seenTimestampSec, message);
 
-      console.log("BLOB SAVING 1. publishBlockWithBlobs is calling chain.processBlock");
-
-      // TODO EIP-4844 is it appropriate to do this here?
       await db.blobsSidecar.add(blobsSidecar);
 
-      console.log("Persisted blobsSidecar to the database", blobsSidecar.beaconBlockRoot);
-
       await Promise.all([
         network.gossip.publishSignedBeaconBlockAndBlobsSidecar(signedBeaconBlockAndBlobsSidecar),
         // TODO EIP-4844 processBlock for signedBeaconBlockAndBlobsSidecar

packages/beacon-node/src/chain/blocks/index.ts

@@ -51,8 +51,6 @@ export async function processBlocks(
   blocks: allForks.SignedBeaconBlock[],
   opts: BlockProcessOpts & ImportBlockOpts
 ): Promise<void> {
-  console.log("BLOB SAVING 3. the processBlocks job is running");
-
   if (blocks.length === 0) {
     return; // TODO: or throw?
   } else if (blocks.length > 1) {

packages/beacon-node/src/chain/blocks/verifyBlocksStateTransitionOnly.ts

@@ -42,14 +42,10 @@ export async function verifyBlocksStateTransitionOnly(
 
     let blobsSidecar: BlobsSidecar | undefined;
     if (verifyBlobs) {
-      console.log("verifyBlocksStateTransitionOnly is requiring blob verification");
-
       const id = blindedOrFullBlockHashTreeRoot(config, block.message);
-      console.log("Attempting to retrieve blob with id: ", id);
       // We fetch the blobsSidecar from the DB here,
       // instead of inside stateTransition as the consensus-spec indicates.
       blobsSidecar = (await db.blobsSidecar.get(id)) ?? undefined;
-      console.log("Retreived blobs sidecar from db!", blobsSidecar);
     }
 
     // STFN - per_slot_processing() + per_block_processing()

packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts

@@ -127,7 +127,6 @@ export async function produceBlockBody<T extends BlockType>(
 
     // Capella and later forks have blsToExecutionChanges on BeaconBlockBody
     if (forkSeq >= ForkSeq.capella) {
-      console.log("Building a block body for Capella or later -- assigning blsToExecutionChanges");
       // TODO EIP-4844 How should this actually be set? Capella
       (blockBody as capella.BeaconBlockBody).blsToExecutionChanges = [];
     }
@@ -210,12 +209,8 @@ export async function produceBlockBody<T extends BlockType>(
           if (forkSeq >= ForkSeq.eip4844) {
             const blobsBundle = await this.executionEngine.getBlobsBundle(payloadId);
 
-            try {
-              // These checks are described by the spec as optional
-              validateBlobsAndKzgCommitments(payload as eip4844.ExecutionPayload, blobsBundle.blobs, blobsBundle.kzgs);
-            } catch (e) {
-              console.log("validateBlobsAndKzgCommitments FAILED but we're ignoring that for now!", e);
-            }
+            // These checks are described by the spec as optional
+            validateBlobsAndKzgCommitments(payload as eip4844.ExecutionPayload, blobsBundle.blobs, blobsBundle.kzgs);
 
             (blockBody as eip4844.BeaconBlockBody).blobKzgCommitments = blobsBundle.kzgs;
             blobs = blobsBundle.blobs;

packages/beacon-node/src/chain/produceBlock/validateBlobsAndKzgCommitments.ts

@@ -3,6 +3,7 @@ import {eip4844} from "@lodestar/types";
 
 import {Blob, KZGCommitment} from "@lodestar/types/eip4844";
 import {verifyKzgCommitmentsAgainstTransactions} from "@lodestar/state-transition/block";
+import {typedArraysAreEqual} from "@lodestar/state-transition";
 
 /**
  * https://github.com/ethereum/consensus-specs/blob/dev/specs/eip4844/validator.md#blob-kzg-commitments
@@ -27,7 +28,7 @@ export function validateBlobsAndKzgCommitments(
   // assert [blob_to_kzg_commitment(blob) == commitment for blob, commitment in zip(blobs, blob_kzg_commitments)]
   blobs.forEach((blob, index) => {
     const computedCommitment = blobToKzgCommitment(blob);
-    if (computedCommitment !== blobKzgCommitments[index]) {
+    if (!typedArraysAreEqual(computedCommitment, blobKzgCommitments[index])) {
       throw new Error(
         `Error validating execution payload during block construction: KZG commitment supplied by execution client does not match that computed by Lodestar. At index ${index}. Computed: ${computedCommitment} but blobs bundle contained ${blobKzgCommitments[index]}`
       );

packages/beacon-node/src/execution/engine/mock.ts

@@ -242,7 +242,6 @@ export class ExecutionEngineMock implements IExecutionEngine {
       blockHash: new Uint8Array(),
       kzgs: [],
       blobs: [],
-      aggregatedProof: new Uint8Array(),
     };
   }
 

packages/state-transition/src/block/index.ts

@@ -56,7 +56,6 @@ export function processBlock(
   // https://github.com/ethereum/consensus-specs/blob/dev/specs/eip4844/beacon-chain.md#block-processing
   if (fork >= ForkSeq.eip4844 && verifyBlobs) {
     const body = block.body as eip4844.BeaconBlockBody;
-    console.log("Running state transition processBlock for block #", body.executionPayload.blockNumber);
     processBlobKzgCommitments(body);
 
     // New in EIP-4844, note: Can sync optimistically without this condition, see note on `is_data_available`

packages/state-transition/src/util/blobs/isDataAvailable.ts

@@ -26,7 +26,6 @@ export function isDataAvailable(
   beaconBlockRoot: Root,
   blobKzgCommitments: KZGCommitment[]
 ): boolean {
-  console.log("Running isDataAvailable");
   if (!sidecar) {
     return false;
   }
@@ -73,20 +72,10 @@ function validateBlobsSidecar(
     );
   }
 
-  // assert verify_aggregate_kzg_proof(blobs, expected_kzg_commitments, kzg_aggregated_proof)
-  let isProofValid = false;
-  try {
-    isProofValid = verifyAggregateKzgProof(blobs, expectedKzgCommitments, kzgAggregatedProof);
-  } catch (e) {
-    // Temporary -- we need to fix Geth's KZG to match C-KZG and the trusted setup used here
-    console.log("An exception was throw during verifyAggregateKzgProof. code 1 = bad arguments", e);
-    // throw e;
-    return;
-  }
-
-  // Temporary -- we need to fix Geth's KZG to match C-KZG and the trusted setup used here
-  if (!isProofValid) {
-    console.log("aggregate KZG proof was not valid", kzgAggregatedProof);
-    // throw new BlobsSidecarValidationError(`aggregate KZG proof was not valid ${kzgAggregatedProof}`);
+  // No need to verify the aggregate proof of zero blobs. Also c-kzg throws.
+  // https://github.com/dankrad/c-kzg/pull/12/files#r1025851956
+  if (blobs.length) {
+    // assert verify_aggregate_kzg_proof(blobs, expected_kzg_commitments, kzg_aggregated_proof)
+    verifyAggregateKzgProof(blobs, expectedKzgCommitments, kzgAggregatedProof);
   }
 }