Merge branch 'master' into chore/upgrade-noble-2.0.1

Author: holgerd77

packages/block/README.md

@@ -9,10 +9,11 @@
 | Implements schema and functions related to Ethereum blocks. |
 | ----------------------------------------------------------- |
 
-- 🦄 All block features till **Pectra**
+- 🦄 All block features till **Osaka**
 - 🌴 Tree-shakeable API
 - 👷🏼 Controlled dependency set (4 external + `@noble` crypto)
 - 🔮 `EIP-4844` Shard Blob Txs
+- 🔮 `EIP-7594` PeerDAS Blob Transactions
 - 💸 `EIP-4895` Beacon Chain Withdrawals
 - 📨 `EIP-7685` Consensus Layer Requests
 - 🛵 324KB bundle size (81KB gzipped)

packages/client/test/net/peer/rlpxpeer.spec.ts

@@ -7,16 +7,19 @@ import { Event } from '../../../src/types.ts'
 describe('[RlpxPeer]', async () => {
   vi.mock('@ethereumjs/devp2p', async () => {
     const devp2p = await vi.importActual<any>('@ethereumjs/devp2p')
-    const RLPx = vi.fn().mockImplementation(() => {
-      return {
-        events: new EventEmitter(),
-        connect: vi.fn(),
+
+    // Create a proper constructor mock for RLPx
+    class RLPxMock {
+      events = new EventEmitter()
+      connect = vi.fn()
+      constructor() {
+        // Constructor can be empty, properties are initialized above
       }
-    })
+    }
 
     return {
       ...devp2p,
-      RLPx,
+      RLPx: RLPxMock,
     }
   })
 

packages/evm/README.md

@@ -9,7 +9,7 @@
 | TypeScript implementation of the Ethereum EVM. |
 | ---------------------------------------------- |
 
-- 🦄 All hardforks up to **Pectra**
+- 🦄 All hardforks up to **Osaka**
 - 🌴 Tree-shakeable API
 - 👷🏼 Controlled dependency set (7 external + `@Noble` crypto)
 - 🧩 Flexible EIP on/off engine

packages/evm/src/evm.ts

@@ -499,7 +499,11 @@ export class EVM implements EVMInterface {
       if (this.DEBUG) {
         debug(`Start bytecode processing...`)
       }
-      result = await this.runInterpreter({ ...message, gasLimit } as Message)
+      result = await this.runInterpreter({
+        ...{ codeAddress: message.codeAddress },
+        ...message,
+        gasLimit,
+      } as Message)
     }
 
     if (message.depth === 0) {

packages/evm/test/asyncEvents.spec.ts

@@ -1,5 +1,5 @@
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
-import { Address, hexToBytes } from '@ethereumjs/util'
+import { Address, createAddressFromBigInt, hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
 import { createEVM } from '../src/index.ts'
@@ -11,18 +11,25 @@ describe('async events', () => {
     const evm = await createEVM({
       common,
     })
+    const to = createAddressFromBigInt(BigInt(123456))
+    await evm.stateManager.putCode(to, hexToBytes('0x6001'))
+    let didTimeOut = false
     evm.events.on('step', async (event, next) => {
+      assert.isTrue(event.codeAddress !== undefined)
       const startTime = Date.now()
       setTimeout(() => {
         assert.isTrue(Date.now() > startTime + 999, 'evm paused on step function for one second')
+        didTimeOut = true
         next?.()
       }, 1000)
     })
     const runCallArgs = {
       caller, // call address
       gasLimit: BigInt(0xffffffffff),
       data: hexToBytes('0x600000'),
+      to,
     }
     await evm.runCall(runCallArgs)
+    assert.isTrue(didTimeOut)
   })
 })

packages/tx/README.md

@@ -9,11 +9,12 @@
 | Implements schema and functions for the different Ethereum transaction types |
 | ---------------------------------------------------------------------------- |
 
-- 🦄 All tx types up to **Pectra**
+- 🦄 All tx types up to **Osaka**
 - 🌴 Tree-shakeable API
 - 👷🏼 Controlled dependency set (1 external + `@Noble` crypto)
 - 🎼 Unified tx type API
 - 📲 New type for **EIP-7702** account abstraction
+- 🔮 `EIP-7594` PeerDAS Blob Transactions
 - 🛵 190KB bundle size (all tx types) (47KB gzipped)
 - 🏄🏾‍♂️ WASM-free default + Fully browser ready
 
@@ -25,7 +26,7 @@
 - [Transaction Types](#transaction-types)
   - [Gas Fee Market Transactions (EIP-1559)](#gas-fee-market-transactions-eip-1559)
   - [Access List Transactions (EIP-2930)](#access-list-transactions-eip-2930)
-  - [Blob Transactions (EIP-4844)](#blob-transactions-eip-4844)
+  - [Blob Transactions (EIP-4844 / EIP-7594)](#blob-transactions-eip-4844--eip-7594)
   - [EOA Code Transaction (EIP-7702)](#eoa-code-transaction-eip-7702)
   - [Legacy Transactions](#legacy-transactions)
 - [Transaction Factory](#transaction-factory)
@@ -183,18 +184,25 @@ console.log(bytesToHex(tx.hash())) // 0x9150cdebad74e88b038e6c6b964d99af705f9c08
 For generating access lists from tx data based on a certain network state there is a `reportAccessList` option
 on the `VM.runTx()` method of the `@ethereumjs/vm` `TypeScript` VM implementation.
 
-### Blob Transactions (EIP-4844)
+### Blob Transactions (EIP-4844 / EIP-7594)
 
 - Class: `BlobEIP4844Tx`
-- EIP: [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844)
-- Activation: `cancun`
+- EIPs: [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844), [EIP-7594](https://eips.ethereum.org/EIPS/eip-7594)
+- Activation: `cancun` (EIP-4844), `osaka` (EIP-7594)
 - Type: `3`
 
+#### Introduction
+
 This library supports the blob transaction type introduced with [EIP-4844](https://eips.ethereum.org/EIPS/eip-4844).
+Additionally it is able to process blobs in the "PeerDAS way" - introduced with [EIP-7594](https://eips.ethereum.org/EIPS/eip-7594) along the
+`osaka` hardfork and generate cell proofs instead of blob proofs.
 
 **Note:** This functionality needs a manual KZG library installation and global initialization, see [KZG Setup](https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/tx/README.md#kzg-setup) for instructions.
 
-See the following code snippet for an example on how to instantiate:
+#### Example
+
+See the following code snippet for an example on how to create a blob transaction, one for EIP-4844 only 
+and one taking EIP-7594 into the mix:
 
 ```ts
 // ./examples/blobTx.ts
@@ -208,15 +216,46 @@ import { KZG as microEthKZG } from 'micro-eth-signer/kzg.js'
 
 const main = async () => {
   const kzg = new microEthKZG(trustedSetup)
-  const common = new Common({
+  // EIP-4844 only
+  const common4844 = new Common({
     chain: Mainnet,
     hardfork: Hardfork.Cancun,
     customCrypto: { kzg },
   })
 
+  // EIP-4844 and EIP-7594
+  const common4844and7594 = new Common({
+    chain: Mainnet,
+    hardfork: Hardfork.Osaka,
+    customCrypto: { kzg },
+  })
+  const setups = [
+    {
+      title: 'Blob transaction (EIP-4844 only)',
+      common: common4844,
+      proofAmountComment: 'one proof per blob'
+    },
+    {
+      title: 'Blob transaction (EIP-4844 + EIP-7594)',
+    common: common4844and7594,
+    proofAmountComment: '128 cells per blob + one proof per cell -> NUM_BLOBS * 128 proofs'
+  },
+]
+
+for (const setup of setups) {
+  console.log(`\n${setup.title}:`)
+  console.log('---------------------------------------')
+
+  const blobsData = ['blob 1', 'blob 2', 'blob 3']  
+  console.log(`Blobs (Data) : "${blobsData.join('", "')}"`)
+  // Final format, filled with a lot of 0s, added marker
+  const blobs = getBlobs(blobsData)
+
+  console.log('Generating tx...')
+
   const txData: BlobEIP4844TxData = {
     data: '0x1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-    gasLimit: '0x02625a00',
+    gasLimit: 16_000_000n,
     maxPriorityFeePerGas: '0x01',
     maxFeePerGas: '0xff',
     maxFeePerBlobGas: '0xfff',
@@ -229,18 +268,24 @@ const main = async () => {
     chainId: '0x01',
     accessList: [],
     type: '0x05',
-    blobs: getBlobs(['blob 1', 'blob 2']),
+    blobs,
   }
 
-  const tx = createBlob4844Tx(txData, { common })
+  const tx = createBlob4844Tx(txData, { common: setup.common })
 
-  console.log(`Blob tx created with hash: ${bytesToHex(tx.hash())}`)
-  console.log(`Tx contains ${tx.numBlobs()} blob`)
-  console.log(`Blob versioned hashes: ${tx.blobVersionedHashes.join(', ')}`)
+  console.log(`Tx hash               : ${bytesToHex(tx.hash())}`)
+  console.log(`Num blobs             : ${tx.numBlobs()}`)
+  console.log(`Blob versioned hashes : ${tx.blobVersionedHashes.join(', ')}`)
+  console.log(`KZG commitments       : ${tx.kzgCommitments!.join(', ')}`)
+  console.log(`First KZG (cell) proof: ${tx.kzgProofs![0]}`)
+  console.log(`Num KZG (cell) proofs : ${tx.kzgProofs!.length} (${setup.proofAmountComment})`)
+  }
 
-  // To send a transaction via RPC, you can do something like this:
+  // To send a transaction via RPC, you can something like this:
   // const rawTx = tx.sign(privateKeyBytes).serializeNetworkWrapper()
   // myRPCClient.request('eth_sendRawTransaction', [rawTx]) // submits a transaction via RPC
+  //
+  // Also see ./sendRawSepoliaTx.ts example
 }
 
 void main()
@@ -249,15 +294,19 @@ void main()
 
 **Note:** `versionedHashes` and `kzgCommitments` have a real length of 32 bytes, `blobs` have a real length of `4096` bytes and values are trimmed here for brevity.
 
-You can either pass in blobs as the initial `blobsData` - and the final `blobs` format will be derived for you - or you can pass in the final `blobs` format directly as bytes. `versionedHashes`, `kzgCommitments` and `kzgProofs` are either derived or taken from the values passed in.
+You can either pass in blobs as the initial `blobsData` (the data you want to store in the blob) - and the final `blobs` format (filled with a lot of 0s, added marker) will be derived for you - or you can pass in the final `blobs` format directly as bytes. `versionedHashes`, `kzgCommitments` and `kzgProofs` are either derived or taken from the values passed in.
+
+The `kzgProofs` field is used for both blob proofs (EIP-4844) and cell proofs (EIP-7594). Note that the amount of proofs increases by a factor of 128 when EIP-7594 is activated, since proofs are then computed per cell instead of per blob (128 cells per blob).
 
 For manually deriving commitments, proofs and versioned hashes, there are dedicated helpers available in the [@ethereumjs/util](https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/util) package.
 
 #### Serialization
 
 Blob transactions can be serialized in two ways.
 1) `tx.serialize()` - the standard serialization returns an RLP-encoded `Uint8Array` that conforms to the transaction as represented after it is included in a block 
-2) `tx.serializeNetworkWrapper()` - this serialization format includes the `blobs` in the encoded data and is the format specified for transactions that are being submitted to/gossipped around the mempool.  If you are constructing a transaction to submit via JSON-RPC, use this format.
+2) `tx.serializeNetworkWrapper()` - this serialization format includes the `blobs` in the encoded data and is the format specified for transactions that are being submitted to/gossipped around the mempool.  **If you are constructing a transaction to submit via JSON-RPC, use this format.**
+
+See the [Send Raw Sepolia Tx](./examples/sendRawSepoliaTx.ts) example for a detailed example on how to send a blob transaction via JSON-RPC.
 
 See the [Blob Transaction Tests](./test/eip4844.spec.ts) for additional examples of usage in instantiating, serializing, and deserializing these transactions.
 

packages/tx/examples/blobTx.ts

@@ -7,39 +7,76 @@ import { KZG as microEthKZG } from 'micro-eth-signer/kzg.js'
 
 const main = async () => {
   const kzg = new microEthKZG(trustedSetup)
-  const common = new Common({
+  // EIP-4844 only
+  const common4844 = new Common({
     chain: Mainnet,
     hardfork: Hardfork.Cancun,
     customCrypto: { kzg },
   })
 
-  const txData: BlobEIP4844TxData = {
-    data: '0x1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-    gasLimit: '0x02625a00',
-    maxPriorityFeePerGas: '0x01',
-    maxFeePerGas: '0xff',
-    maxFeePerBlobGas: '0xfff',
-    nonce: '0x00',
-    to: '0xcccccccccccccccccccccccccccccccccccccccc',
-    value: '0x0186a0',
-    v: '0x01',
-    r: '0xafb6e247b1c490e284053c87ab5f6b59e219d51f743f7a4d83e400782bc7e4b9',
-    s: '0x479a268e0e0acd4de3f1e28e4fac2a6b32a4195e8dfa9d19147abe8807aa6f64',
-    chainId: '0x01',
-    accessList: [],
-    type: '0x05',
-    blobs: getBlobs(['blob 1', 'blob 2']),
-  }
+  // EIP-4844 and EIP-7594
+  const common4844and7594 = new Common({
+    chain: Mainnet,
+    hardfork: Hardfork.Osaka,
+    customCrypto: { kzg },
+  })
+  const setups = [
+    {
+      title: 'Blob transaction (EIP-4844 only)',
+      common: common4844,
+      proofAmountComment: 'one proof per blob',
+    },
+    {
+      title: 'Blob transaction (EIP-4844 + EIP-7594)',
+      common: common4844and7594,
+      proofAmountComment: '128 cells per blob + one proof per cell -> NUM_BLOBS * 128 proofs',
+    },
+  ]
+
+  for (const setup of setups) {
+    console.log(`\n${setup.title}:`)
+    console.log('---------------------------------------')
 
-  const tx = createBlob4844Tx(txData, { common })
+    const blobsData = ['blob 1', 'blob 2', 'blob 3']
+    console.log(`Blobs (Data) : "${blobsData.join('", "')}"`)
+    // Final format, filled with a lot of 0s, added marker
+    const blobs = getBlobs(blobsData)
 
-  console.log(`Blob tx created with hash: ${bytesToHex(tx.hash())}`)
-  console.log(`Tx contains ${tx.numBlobs()} blob`)
-  console.log(`Blob versioned hashes: ${tx.blobVersionedHashes.join(', ')}`)
+    console.log('Generating tx...')
+
+    const txData: BlobEIP4844TxData = {
+      data: '0x1a8451e600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+      gasLimit: 16_000_000n,
+      maxPriorityFeePerGas: '0x01',
+      maxFeePerGas: '0xff',
+      maxFeePerBlobGas: '0xfff',
+      nonce: '0x00',
+      to: '0xcccccccccccccccccccccccccccccccccccccccc',
+      value: '0x0186a0',
+      v: '0x01',
+      r: '0xafb6e247b1c490e284053c87ab5f6b59e219d51f743f7a4d83e400782bc7e4b9',
+      s: '0x479a268e0e0acd4de3f1e28e4fac2a6b32a4195e8dfa9d19147abe8807aa6f64',
+      chainId: '0x01',
+      accessList: [],
+      type: '0x05',
+      blobs,
+    }
+
+    const tx = createBlob4844Tx(txData, { common: setup.common })
+
+    console.log(`Tx hash               : ${bytesToHex(tx.hash())}`)
+    console.log(`Num blobs             : ${tx.numBlobs()}`)
+    console.log(`Blob versioned hashes : ${tx.blobVersionedHashes.join(', ')}`)
+    console.log(`KZG commitments       : ${tx.kzgCommitments!.join(', ')}`)
+    console.log(`First KZG (cell) proof: ${tx.kzgProofs![0]}`)
+    console.log(`Num KZG (cell) proofs : ${tx.kzgProofs!.length} (${setup.proofAmountComment})`)
+  }
 
   // To send a transaction via RPC, you can something like this:
   // const rawTx = tx.sign(privateKeyBytes).serializeNetworkWrapper()
   // myRPCClient.request('eth_sendRawTransaction', [rawTx]) // submits a transaction via RPC
+  //
+  // Also see ./sendRawSepoliaTx.ts example
 }
 
 void main()

packages/vm/README.md

@@ -13,7 +13,7 @@ Ethereum `mainnet` compatible execution context for
 [@ethereumjs/evm](https://github.com/ethereumjs/ethereumjs-monorepo/tree/master/packages/evm)
 to build and run blocks and txs and update state.
 
-- 🦄 All hardforks up till **Pectra**
+- 🦄 All hardforks up till **Osaka**
 - 🌴 Tree-shakeable API
 - 👷🏼 Controlled dependency set (7 external + `@Noble` crypto)
 - 🧩 Flexible EIP on/off engine