Merge branch 'master' into tape-to-vitest-refactor-vm-testrunners

Author: am1r021

Dockerfile

@@ -1,5 +1,5 @@
-FROM node:22-alpine
-RUN apk update && apk add --no-cache bash git g++ make python3 && rm -rf /var/cache/apk/*
+FROM node:22.4-slim
+RUN apt-get update && apt-get install -y git g++ make python3 python3-setuptools && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /ethereumjs-monorepo
 

config/cspell-ts.json

@@ -640,6 +640,7 @@
     "blobschedule",
     "hoodi",
     "peerdas",
-    "getpayload"
+    "getpayload",
+    "ckzg"
   ]
 }

package-lock.json

@@ -215,9 +215,9 @@ import { createBlock } from '@ethereumjs/block'
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { createBlob4844Tx } from '@ethereumjs/tx'
 import { createAddressFromPrivateKey } from '@ethereumjs/util'
-import { trustedSetup } from '@paulmillr/trusted-setups/fast.js'
+import { trustedSetup } from '@paulmillr/trusted-setups/fast-peerdas.js'
 import { randomBytes } from 'crypto'
-import { KZG as microEthKZG } from 'micro-eth-signer/kzg'
+import { KZG as microEthKZG } from 'micro-eth-signer/kzg.js'
 
 const main = async () => {
   const kzg = new microEthKZG(trustedSetup)

packages/block/README.md

@@ -3,8 +3,8 @@ import { createBlock } from '@ethereumjs/block'
 import { Common, Hardfork, Mainnet } from '@ethereumjs/common'
 import { createBlob4844Tx } from '@ethereumjs/tx'
 import { createAddressFromPrivateKey } from '@ethereumjs/util'
-import { trustedSetup } from '@paulmillr/trusted-setups/fast.js'
-import { KZG as microEthKZG } from 'micro-eth-signer/kzg'
+import { trustedSetup } from '@paulmillr/trusted-setups/fast-peerdas.js'
+import { KZG as microEthKZG } from 'micro-eth-signer/kzg.js'
 
 const main = async () => {
   const kzg = new microEthKZG(trustedSetup)

packages/block/examples/4844.ts

@@ -59,8 +59,8 @@
   },
   "devDependencies": {
     "@ethereumjs/testdata": "1.0.0",
-    "@paulmillr/trusted-setups": "^0.1.2",
-    "micro-eth-signer": "^0.14.0"
+    "@paulmillr/trusted-setups": "^0.2.0",
+    "micro-eth-signer": "^0.15.0"
   },
   "engines": {
     "node": ">=18"

packages/block/package.json

@@ -6,8 +6,8 @@ import {
   getBlobs,
   randomBytes,
 } from '@ethereumjs/util'
-import { trustedSetup } from '@paulmillr/trusted-setups/fast.js'
-import { KZG as microEthKZG } from 'micro-eth-signer/kzg'
+import { trustedSetup } from '@paulmillr/trusted-setups/fast-peerdas.js'
+import { KZG as microEthKZG } from 'micro-eth-signer/kzg.js'
 import { assert, describe, it } from 'vitest'
 
 import { fakeExponential, getNumBlobs } from '../src/helpers.ts'