debug and fix pending block spec and add assertions there as well

ethereumjs · Oct 1, 2024 · fa12d79 · fa12d79
1 parent d5bad1d
commit fa12d79
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 19 deletions.
diff --git a/packages/client/src/service/txpool.ts b/packages/client/src/service/txpool.ts
@@ -383,12 +383,14 @@ export class TxPool {
       }
       if (isBlob4844Tx(tx)) {
         // add to blobs and proofs cache
-        for (const [i, versionedHash] of tx.blobVersionedHashes.entries()) {
-          const blob = tx.blobs![i]
-          const proof = tx.kzgProofs![i]
-          this.blobsAndProofsByHash.set(versionedHash, { blob, proof })
+        if (tx.blobs !== undefined && tx.kzgProofs !== undefined) {
+          for (const [i, versionedHash] of tx.blobVersionedHashes.entries()) {
+            const blob = tx.blobs![i]
+            const proof = tx.kzgProofs![i]
+            this.blobsAndProofsByHash.set(versionedHash, { blob, proof })
+          }
+          this.pruneBlobsAndProofsCache()
         }
-        this.pruneBlobsAndProofsCache()
 
         this.config.metrics?.blobEIP4844TxGauge?.inc()
       }

diff --git a/packages/client/test/miner/pendingBlock.spec.ts b/packages/client/test/miner/pendingBlock.spec.ts
@@ -28,7 +28,9 @@ import { mockBlockchain } from '../rpc/mockBlockchain.js'
 
 import type { Blockchain } from '@ethereumjs/blockchain'
 import type { TypedTransaction } from '@ethereumjs/tx'
+import type { PrefixedHexString } from '@ethereumjs/util'
 import type { VM } from '@ethereumjs/vm'
+
 const kzg = new microEthKZG(trustedSetup)
 
 const A = {
@@ -354,23 +356,28 @@ describe('[PendingBlock]', async () => {
 
     const { txPool } = setup()
 
-    const blobs = getBlobs('hello world')
-    const commitments = blobsToCommitments(kzg, blobs)
-    const blobVersionedHashes = commitmentsToVersionedHashes(commitments)
-    const proofs = blobsToProofs(kzg, blobs, commitments)
-
-    // Create 3 txs with 2 blobs each so that only 2 of them can be included in a build
+    // Create 2 txs with 3 blobs each so that only 2 of them can be included in a build
+    let blobs: PrefixedHexString = [],
+      proofs: PrefixedHexString[] = [],
+      versionedHashes: PrefixedHexString[] = []
     for (let x = 0; x <= 2; x++) {
+      // generate unique blobs
+      const txBlobs = [
+        ...getBlobs(`hello world-${x}1`),
+        ...getBlobs(`hello world-${x}2`),
+        ...getBlobs(`hello world-${x}3`),
+      ]
+      assert.equal(txBlobs.length, 3, '3 blobs should be created')
+      const txCommitments = blobsToCommitments(kzg, txBlobs)
+      const txBlobVersionedHashes = commitmentsToVersionedHashes(txCommitments)
+      const txProofs = blobsToProofs(kzg, txBlobs, txCommitments)
+
       const txA01 = createBlob4844Tx(
         {
-          blobVersionedHashes: [
-            ...blobVersionedHashes,
-            ...blobVersionedHashes,
-            ...blobVersionedHashes,
-          ],
-          blobs: [...blobs, ...blobs, ...blobs],
-          kzgCommitments: [...commitments, ...commitments, ...commitments],
-          kzgProofs: [...proofs, ...proofs, ...proofs],
+          blobVersionedHashes: txBlobVersionedHashes,
+          blobs: txBlobs,
+          kzgCommitments: txCommitments,
+          kzgProofs: txProofs,
           maxFeePerBlobGas: 100000000n,
           gasLimit: 0xffffffn,
           maxFeePerGas: 1000000000n,
@@ -381,6 +388,22 @@ describe('[PendingBlock]', async () => {
         { common },
       ).sign(A.privateKey)
       await txPool.add(txA01)
+
+      // accumulate for verification
+      blobs = [...blobs, ...txBlobs]
+      proofs = [...proofs, ...txProofs]
+      versionedHashes = [...versionedHashes, ...txBlobVersionedHashes]
+    }
+
+    // check if blobs and proofs are added in txpool by versioned hashes
+    for (let i = 0; i < versionedHashes.length; i++) {
+      const versionedHash = versionedHashes[i]
+      const blob = blobs[i]
+      const proof = proofs[i]
+
+      const blobAndProof = txPool.blobsAndProofsByHash.get(versionedHash) ?? {}
+      assert.equal(blob, blobAndProof.blob, 'blob should match')
+      assert.equal(proof, blobAndProof.proof, 'proof should match')
     }
 
     // Add one other normal tx for nonce 3 which should also be not included in the build