Implement EIP-4844

config/cli/coverage.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 set -o xtrace
-exec c8 --all --reporter=lcov --reporter=text --reporter=text-lcov npm run test
+exec c8 --all --reporter=lcov --reporter=text npm run test

packages/block/package.json

@@ -47,7 +47,8 @@
     "ethers": "^5.7.1"
   },
   "devDependencies": {
-    "@types/lru-cache": "^5.1.0"
+    "@types/lru-cache": "^5.1.0",
+    "c-kzg": "^1.0.8"
   },
   "engines": {
     "node": ">=14"

packages/block/src/block.ts

@@ -1,7 +1,7 @@
 import { ConsensusType } from '@ethereumjs/common'
 import { RLP } from '@ethereumjs/rlp'
 import { Trie } from '@ethereumjs/trie'
-import { Capability, TransactionFactory } from '@ethereumjs/tx'
+import { BlobEIP4844Transaction, Capability, TransactionFactory } from '@ethereumjs/tx'
 import {
   KECCAK256_RLP,
   Withdrawal,
@@ -17,6 +17,7 @@ import { ethers } from 'ethers'
 
 import { blockFromRpc } from './from-rpc'
 import { BlockHeader } from './header'
+import { getDataGasPrice } from './helpers'
 
 import type { BlockBuffer, BlockData, BlockOptions, JsonBlock, JsonRpcBlock } from './types'
 import type { Common } from '@ethereumjs/common'
@@ -382,6 +383,7 @@ export class Block {
           }
         }
       }
+
       if (errs.length > 0) {
         errors.push(`errors at tx ${i}: ${errs.join(', ')}`)
       }
@@ -427,6 +429,25 @@ export class Block {
     }
   }
 
+  /**
+   * Validates that data gas fee for each transaction
+   * @param parentHeader header of parent block
+   */
+  validateBlobTransactions(parentHeader: BlockHeader) {
+    for (const tx of this.transactions) {
+      if (tx instanceof BlobEIP4844Transaction) {
+        const dataGasPrice = getDataGasPrice(parentHeader)
+        if (tx.maxFeePerDataGas < dataGasPrice) {
+          throw new Error(
+            `blob transaction maxFeePerDataGas ${
+              tx.maxFeePerDataGas
+            } < than block data gas price ${dataGasPrice} - ${this.errorStr()}`
+          )
+        }
+      }
+    }
+  }
+
   /**
    * Validates the uncle's hash.
    */

packages/block/src/header.ts

@@ -52,6 +52,7 @@ export class BlockHeader {
   public readonly nonce: Buffer
   public readonly baseFeePerGas?: bigint
   public readonly withdrawalsRoot?: Buffer
+  public readonly excessDataGas?: bigint
 
   public readonly _common: Common
 
@@ -138,6 +139,7 @@ export class BlockHeader {
     }
 
     const skipValidateConsensusFormat = options.skipConsensusFormatValidation ?? false
+
     const defaults = {
       parentHash: zeros(32),
       uncleHash: KECCAK256_RLP_ARRAY,
@@ -188,12 +190,15 @@ export class BlockHeader {
           : BigInt(7)
         : undefined,
       withdrawalsRoot: this._common.isActivatedEIP(4895) ? KECCAK256_RLP : undefined,
+      excessDataGas: this._common.isActivatedEIP(4844) ? BigInt(0) : undefined,
     }
 
     const baseFeePerGas =
       toType(headerData.baseFeePerGas, TypeOutput.BigInt) ?? hardforkDefaults.baseFeePerGas
     const withdrawalsRoot =
       toType(headerData.withdrawalsRoot, TypeOutput.Buffer) ?? hardforkDefaults.withdrawalsRoot
+    const excessDataGas =
+      toType(headerData.excessDataGas, TypeOutput.BigInt) ?? hardforkDefaults.excessDataGas
 
     if (!this._common.isActivatedEIP(1559) && baseFeePerGas !== undefined) {
       throw new Error('A base fee for a block can only be set with EIP1559 being activated')
@@ -205,6 +210,10 @@ export class BlockHeader {
       )
     }
 
+    if (!this._common.isActivatedEIP(4844) && headerData.excessDataGas !== undefined) {
+      throw new Error('excess data gas can only be provided with EIP4844 activated')
+    }
+
     this.parentHash = parentHash
     this.uncleHash = uncleHash
     this.coinbase = coinbase
@@ -222,7 +231,7 @@ export class BlockHeader {
     this.nonce = nonce
     this.baseFeePerGas = baseFeePerGas
     this.withdrawalsRoot = withdrawalsRoot
-
+    this.excessDataGas = excessDataGas
     this._genericFormatValidation()
     this._validateDAOExtraData()
 
@@ -534,6 +543,9 @@ export class BlockHeader {
     if (this._common.isActivatedEIP(4895) === true) {
       rawItems.push(this.withdrawalsRoot!)
     }
+    if (this._common.isActivatedEIP(4844) === true) {
+      rawItems.push(bigIntToUnpaddedBuffer(this.excessDataGas!))
+    }
 
     return rawItems
   }
@@ -797,6 +809,9 @@ export class BlockHeader {
     if (this._common.isActivatedEIP(1559) === true) {
       jsonDict.baseFeePerGas = bigIntToHex(this.baseFeePerGas!)
     }
+    if (this._common.isActivatedEIP(4844) === true) {
+      jsonDict.excessDataGas = bigIntToHex(this.excessDataGas!)
+    }
     return jsonDict
   }