Merge branch 'master' into client/prepare-kaustinen-7

.gitignore

@@ -109,5 +109,9 @@ Temporary Items
 # ethereumjs 
 datadir*
 
+## Vite
+stats.html
+*bundle*.js
+
 ## Vitest
 __snapshots__

README.md

@@ -43,12 +43,13 @@ Below you can find a list of the packages included in this repository.
 
 The following are our currently active branches:
 
-| Branch                                                                                  | Release Series | Status        |  Description                       |
-| --------------------------------------------------------------------------------------- | -------------- | ------------- | ---------------------------------- |
-| [master](https://github.com/ethereumjs/ethereumjs-monorepo)                             | v7             | `Active`      | Current release and working branch |
-| [maintenance-v6](https://github.com/ethereumjs/ethereumjs-monorepo/tree/maintenance-v6) | v6             | `Maintenance` | Maintenance for v6 releases        |
+| Branch                                                                                  | Release Series         | Status        |  Description                                   |
+| --------------------------------------------------------------------------------------- | ---------------------- | ------------- | ---------------------------------------------- |
+| [master](https://github.com/ethereumjs/ethereumjs-monorepo)                             | Upcoming (Autumn 2024) | `Develop`     | Breaking release work                          |
+| [maintenance-v8](https://github.com/ethereumjs/ethereumjs-monorepo/tree/maintenance-v8) | v7/v8                  | `Maintenance` | Maintenance for v8 releases (v7 also included) |
+| [maintenance-v6](https://github.com/ethereumjs/ethereumjs-monorepo/tree/maintenance-v6) | v6                     | `Maintenance` | Maintenance for v6 releases                    |
 
-Breaking releases are done in sync for all libraries, and release cycles are named after the `@ethereumjs/vm` version. In most cases PRs should be opened towards the current working branch.
+Breaking releases are mostly done in sync for all libraries (latest exceptions: VM v8, EVM v3), and release cycles are currently named after the `@ethereumjs/vm` version. In most cases PRs should be opened towards the current working branch. If there is no current working branch, please ask! 🙂
 
 To inspect code related to a specific package version, refer to the [tags](https://github.com/ethereumjs/ethereumjs-monorepo/tags).
 

config/tsconfig.json

@@ -3,8 +3,8 @@
     "sourceMap": true,
     "declaration": true,
     "declarationMap": true,
-    "module": "Node16",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "esModuleInterop": false,

config/tsconfig.prod.cjs.json

@@ -1,3 +1,7 @@
 {
-  "extends": "./tsconfig.json"
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "Node16",
+    "moduleResolution": "node"
+  }
 }

config/tsconfig.prod.esm.json

@@ -1,6 +1,3 @@
 {
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "esnext"
-  }
+  "extends": "./tsconfig.json"
 }

packages/block/examples/1559.ts

@@ -1,8 +1,8 @@
-import { Block } from '@ethereumjs/block'
+import { Block, createBlockFromBlockData } from '@ethereumjs/block'
 import { Chain, Common, Hardfork } from '@ethereumjs/common'
 const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.London })
 
-const block = Block.fromBlockData(
+const block = createBlockFromBlockData(
   {
     header: {
       baseFeePerGas: BigInt(10),
@@ -19,7 +19,7 @@ console.log(Number(block.header.calcNextBaseFee())) // 11
 
 // So for creating a block with a matching base fee in a certain
 // chain context you can do:
-const blockWithMatchingBaseFee = Block.fromBlockData(
+const blockWithMatchingBaseFee = createBlockFromBlockData(
   {
     header: {
       baseFeePerGas: block.header.calcNextBaseFee(),

packages/block/examples/4844.ts

@@ -1,5 +1,5 @@
 import { Common, Chain, Hardfork } from '@ethereumjs/common'
-import { Block } from '@ethereumjs/block'
+import { Block, createBlockFromBlockData } from '@ethereumjs/block'
 import { BlobEIP4844Transaction } from '@ethereumjs/tx'
 import { Address } from '@ethereumjs/util'
 import { loadKZG } from 'kzg-wasm'
@@ -20,7 +20,7 @@ const main = async () => {
     { common }
   )
 
-  const block = Block.fromBlockData(
+  const block = createBlockFromBlockData(
     {
       header: {
         excessBlobGas: 0n,

packages/block/examples/clique.ts

@@ -1,10 +1,10 @@
-import { Block } from '@ethereumjs/block'
+import { Block, createBlockFromBlockData } from '@ethereumjs/block'
 import { Chain, Common, Hardfork } from '@ethereumjs/common'
 
 const common = new Common({ chain: Chain.Goerli, hardfork: Hardfork.Chainstart })
 
 console.log(common.consensusType()) // 'poa'
 console.log(common.consensusAlgorithm()) // 'clique'
 
-Block.fromBlockData({ header: { extraData: new Uint8Array(97) } }, { common })
+createBlockFromBlockData({ header: { extraData: new Uint8Array(97) } }, { common })
 console.log(`Old Clique Proof-of-Authority block created`)

packages/block/examples/pos.ts

@@ -1,9 +1,9 @@
-import { Block } from '@ethereumjs/block'
+import { Block, createBlockFromBlockData } from '@ethereumjs/block'
 import { Chain, Common } from '@ethereumjs/common'
 
 const common = new Common({ chain: Chain.Mainnet })
 
-const block = Block.fromBlockData(
+const block = createBlockFromBlockData(
   {
     // Provide your block data here or use default values
   },

packages/block/examples/pow.ts

@@ -1,10 +1,10 @@
-import { Block } from '@ethereumjs/block'
+import { Block, createBlockFromBlockData } from '@ethereumjs/block'
 import { Chain, Common, Hardfork } from '@ethereumjs/common'
 
 const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Chainstart })
 
 console.log(common.consensusType()) // 'pow'
 console.log(common.consensusAlgorithm()) // 'ethash'
 
-Block.fromBlockData({}, { common })
+createBlockFromBlockData({}, { common })
 console.log(`Old Proof-of-Work block created`)

packages/block/examples/withdrawals.ts

@@ -1,4 +1,4 @@
-import { Block } from '@ethereumjs/block'
+import { Block, createBlockFromBlockData } from '@ethereumjs/block'
 import { Common, Chain } from '@ethereumjs/common'
 import { Address, hexToBytes } from '@ethereumjs/util'
 import type { WithdrawalData } from '@ethereumjs/util'
@@ -12,7 +12,7 @@ const withdrawal = <WithdrawalData>{
   amount: BigInt(1000),
 }
 
-const block = Block.fromBlockData(
+const block = createBlockFromBlockData(
   {
     header: {
       withdrawalsRoot: hexToBytes(

packages/block/package.json

@@ -16,7 +16,8 @@
   },
   "license": "MPL-2.0",
   "author": "mjbecze ([email protected])",
-  "type": "commonjs",
+  "type": "module",
+  "sideEffects": false,
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "exports": {