deprecate the max blob gas checks as per 7742

ethereumjs · Dec 8, 2024 · 7e2d406 · 7e2d406
1 parent 3bd746f
commit 7e2d406
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/packages/block/src/block/block.ts b/packages/block/src/block/block.ts
@@ -249,16 +249,19 @@ export class Block {
         }
       }
       if (this.common.isActivatedEIP(4844)) {
-        const blobGasLimit = this.common.param('maxblobGasPerBlock')
         const blobGasPerBlob = this.common.param('blobGasPerBlob')
         if (tx instanceof Blob4844Tx) {
           blobGasUsed += BigInt(tx.numBlobs()) * blobGasPerBlob
-          if (blobGasUsed > blobGasLimit) {
+          // max blob gas check is deprecated with 7742
+          if(!this.common.isActivatedEIP(7742)){
+            const blobGasLimit = this.common.param('maxblobGasPerBlock')
+            if (blobGasUsed > blobGasLimit) {
             errs.push(
               `tx causes total blob gas of ${blobGasUsed} to exceed maximum blob gas per block of ${blobGasLimit}`,
             )
           }
         }
+        }
       }
       if (errs.length > 0) {
         errors.push(`errors at tx ${i}: ${errs.join(', ')}`)
@@ -354,7 +357,6 @@ export class Block {
    */
   validateBlobTransactions(parentHeader: BlockHeader) {
     if (this.common.isActivatedEIP(4844)) {
-      const blobGasLimit = this.common.param('maxblobGasPerBlock')
       const blobGasPerBlob = this.common.param('blobGasPerBlob')
       let blobGasUsed = BIGINT_0
 
@@ -380,10 +382,14 @@ export class Block {
 
           blobGasUsed += BigInt(tx.blobVersionedHashes.length) * blobGasPerBlob
 
-          if (blobGasUsed > blobGasLimit) {
-            throw new Error(
-              `tx causes total blob gas of ${blobGasUsed} to exceed maximum blob gas per block of ${blobGasLimit}`,
-            )
+          // max blob gas check is deprecated with 7742
+          if(!this.common.isActivatedEIP(7742)){
+            const blobGasLimit = this.common.param('maxblobGasPerBlock')
+            if (blobGasUsed > blobGasLimit) {
+              throw new Error(
+                `tx causes total blob gas of ${blobGasUsed} to exceed maximum blob gas per block of ${blobGasLimit}`,
+              )
+            }
           }
         }
       }

diff --git a/packages/client/src/miner/pendingBlock.ts b/packages/client/src/miner/pendingBlock.ts
@@ -364,6 +364,7 @@ export class PendingBlock {
     try {
       await builder.addTransaction(tx, {
         skipHardForkValidation: this.skipHardForkValidation,
+        maxBlobsPerBlock: this.maxBlobsPerBlock,
       })
       addTxResult = AddTxResult.Success
     } catch (error: any) {

diff --git a/packages/client/src/rpc/modules/eth.ts b/packages/client/src/rpc/modules/eth.ts
@@ -1175,6 +1175,8 @@ export class Eth {
         // Blob Transactions sent over RPC are expected to be in Network Wrapper format
         tx = createBlob4844TxFromSerializedNetworkWrapper(txBuf, { common })
 
+        // max blob gas check is deprecated with 7742
+        if(!tx.common.isActivatedEIP(7742)){
         const blobGasLimit = tx.common.param('maxblobGasPerBlock')
         const blobGasPerBlob = tx.common.param('blobGasPerBlob')
 
@@ -1185,6 +1187,7 @@ export class Eth {
             }`,
           )
         }
+      }
       } else {
         tx = createTxFromRLP(txBuf, { common })
       }
@@ -1416,7 +1419,10 @@ export class Eth {
 
         let baseFeePerBlobGas = BIGINT_0
         let blobGasUsedRatio = 0
-        if (b.header.excessBlobGas !== undefined) {
+
+        // max blob gas checks is deprecated with 7742
+        // TODO: figure out what max to use for ratio
+        if (b.header.excessBlobGas !== undefined && !b.common.isActivatedEIP(7742)) {
           baseFeePerBlobGas = b.header.getBlobGasPrice()
           const max = b.common.param('maxblobGasPerBlock')
           blobGasUsedRatio = Number(blobGasUsed) / Number(max)

diff --git a/packages/client/src/service/txpool.ts b/packages/client/src/service/txpool.ts
@@ -399,6 +399,8 @@ export class TxPool {
   }
 
   pruneBlobsAndProofsCache() {
+    // TODO figure out how to get this param for purning may be should be done by slot or just take
+    // a high target of 128 blobs that ethereum eventually intends to achieve
     const blobGasLimit = this.config.chainCommon.param('maxblobGasPerBlock')
     const blobGasPerBlob = this.config.chainCommon.param('blobGasPerBlob')
     const allowedBlobsPerBlock = Number(blobGasLimit / blobGasPerBlob)

diff --git a/packages/vm/src/buildBlock.ts b/packages/vm/src/buildBlock.ts
@@ -219,7 +219,8 @@ export class BlockBuilder {
     {
       skipHardForkValidation,
       allowNoBlobs,
-    }: { skipHardForkValidation?: boolean; allowNoBlobs?: boolean } = {},
+      maxBlobsPerBlock,
+    }: { skipHardForkValidation?: boolean; allowNoBlobs?: boolean,maxBlobsPerBlock?: number },
   ) {
     this.checkStatus()
 
@@ -231,8 +232,6 @@ export class BlockBuilder {
     // According to the Yellow Paper, a transaction's gas limit
     // cannot be greater than the remaining gas in the block
     const blockGasLimit = toType(this.headerData.gasLimit, TypeOutput.BigInt)
-
-    const blobGasLimit = this.vm.common.param('maxblobGasPerBlock')
     const blobGasPerBlob = this.vm.common.param('blobGasPerBlob')
 
     const blockGasRemaining = blockGasLimit - this.gasUsed
@@ -255,6 +254,7 @@ export class BlockBuilder {
         }
       }
 
+      const blobGasLimit = maxBlobsPerBlock!==undefined ? BigInt(maxBlobsPerBlock)*blobGasPerBlob:this.vm.common.param('maxblobGasPerBlock')
       if (this.blobGasUsed + BigInt(blobTx.numBlobs()) * blobGasPerBlob > blobGasLimit) {
         throw new Error('block blob gas limit reached')
       }