Engine-api: blobs (4844) fixes

.github/workflows/browser.yml

@@ -45,8 +45,7 @@ jobs:
 #     No browser tests for ethash
       - run: npm run test:browser -w=@ethereumjs/wallet
       - run: cd ../statemanager && npm run test:browser
-#     EVM: several tests not passing yet
-#     - run: cd ../evm && npm run test:browser
+      - run: cd ../evm && npm run test:browser
 
 #     VM: several tests not passing yet
 #     - run: npm run test:browser -w=@ethereumjs/vm

packages/client/src/rpc/modules/engine.ts

@@ -668,6 +668,7 @@ export class Engine {
 
   async newPayloadV2(params: [ExecutionPayloadV2 | ExecutionPayloadV1]): Promise<PayloadStatusV1> {
     const shanghaiTimestamp = this.chain.config.chainCommon.hardforkTimestamp(Hardfork.Shanghai)
+    const cancunTimestamp = this.chain.config.chainCommon.hardforkTimestamp(Hardfork.Cancun)
     const withdrawals = (params[0] as ExecutionPayloadV2).withdrawals
 
     if (shanghaiTimestamp === null || parseInt(params[0].timestamp) < shanghaiTimestamp) {
@@ -684,6 +685,11 @@ export class Engine {
           message: 'ExecutionPayloadV2 MUST be used after Shanghai is activated',
         }
       }
+    } else if (cancunTimestamp === null || parseInt(params[0].timestamp) >= cancunTimestamp) {
+      throw {
+        code: INVALID_PARAMS,
+        message: 'ExecutionPayloadV3 MUST be used after Cancun is activated',
+      }
     }
     const newPayload = await this.newPayload(params)
     if (newPayload.status === Status.INVALID_BLOCK_HASH) {

packages/evm/.eslintignore

@@ -0,0 +1 @@
+vite.config.ts

packages/evm/package.json

@@ -57,7 +57,7 @@
     "debug": "^4.3.3",
     "ethereum-cryptography": "^2.0.0",
     "mcl-wasm": "^0.7.1",
-    "rustbn.wasm": "^0.1.0"
+    "rustbn-wasm": "^0.1.0"
   },
   "devDependencies": {
     "@ethereumjs/statemanager": "^1.0.5",

packages/evm/src/evm.ts

@@ -15,6 +15,7 @@ import {
   zeros,
 } from '@ethereumjs/util'
 import { debug as createDebugLogger } from 'debug'
+import * as mcl from 'mcl-wasm'
 
 import { EOF, getEOFCode } from './eof.js'
 import { ERROR, EvmError } from './exceptions.js'
@@ -49,11 +50,9 @@ const debugPrecompiles = createDebugLogger('evm:precompiles')
 
 // very ugly way to detect if we are running in a browser
 const isBrowser = new Function('try {return this===window;}catch(e){ return false;}')
-let mcl: any
 let mclInitPromise: any
 
 if (isBrowser() === false) {
-  mcl = require('mcl-wasm')
   mclInitPromise = mcl.init(mcl.BLS12_381)
 }
 

packages/evm/src/precompiles/06-ecadd.ts

@@ -1,6 +1,6 @@
 import { short } from '@ethereumjs/util'
 import { bytesToHex, hexToBytes } from 'ethereum-cryptography/utils.js'
-import { ec_add } from 'rustbn.wasm'
+import { ec_add } from 'rustbn-wasm'
 
 import { OOGResult } from '../evm.js'
 

packages/evm/src/precompiles/07-ecmul.ts

@@ -1,6 +1,6 @@
 import { short } from '@ethereumjs/util'
 import { bytesToHex, hexToBytes } from 'ethereum-cryptography/utils.js'
-import { ec_mul } from 'rustbn.wasm'
+import { ec_mul } from 'rustbn-wasm'
 
 import { OOGResult } from '../evm.js'
 

packages/evm/src/precompiles/08-ecpairing.ts

@@ -1,6 +1,6 @@
 import { short } from '@ethereumjs/util'
 import { bytesToHex, hexToBytes } from 'ethereum-cryptography/utils.js'
-import { ec_pairing } from 'rustbn.wasm'
+import { ec_pairing } from 'rustbn-wasm'
 
 import { OOGResult } from '../evm.js'
 

packages/evm/vite.config.ts

@@ -0,0 +1,7 @@
+import wasm from 'vite-plugin-wasm'
+import topLevelAwait from 'vite-plugin-top-level-await'
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  plugins: [wasm(), topLevelAwait()],
+})

packages/statemanager/examples/browser.html

@@ -6,11 +6,11 @@
     <script type="module">
         import { Account, Address } from '@ethereumjs/util'
         import { DefaultStateManager } from '@ethereumjs/statemanager'
-        import { hexStringToBytes } from '@ethereumjs/util'
+        import { prefixedHexStringToBytes } from '@ethereumjs/util'
 
         const run = async () => {
             const stateManager = new DefaultStateManager()
-            const address = new Address(hexStringToBytes('a94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
+            const address = new Address(prefixedHexStringToBytes('0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b'))
             const account = new Account(BigInt(0), BigInt(1000))
             await stateManager.checkpoint()
             await stateManager.putAccount(address, account)

packages/vm/.eslintignore

@@ -0,0 +1 @@
+vite.config.ts

packages/vm/examples/browser.html

@@ -0,0 +1,52 @@
+<!doctype html>
+<html>
+
+<head>
+    <title>EthereumJS Browser Examples</title>
+    <script type="module">
+        import { Address } from '@ethereumjs/util'
+        import { Chain, Common, Hardfork } from '@ethereumjs/common'
+        import { LegacyTransaction } from '@ethereumjs/tx'
+        import { VM } from '@ethereumjs/vm'
+
+        const common = new Common({ chain: Chain.Mainnet, hardfork: Hardfork.Berlin })
+        const vm = await VM.create({ common })
+
+        const tx = LegacyTransaction.fromTxData({
+            gasLimit: BigInt(21000),
+            value: BigInt(1),
+            to: Address.zero(),
+            v: BigInt(37),
+            r: BigInt('62886504200765677832366398998081608852310526822767264927793100349258111544447'),
+            s: BigInt('21948396863567062449199529794141973192314514851405455194940751428901681436138'),
+        })
+        const res = await vm.runTx({ tx, skipBalance: true })
+        console.log(res)
+    </script>
+
+</head>
+
+<body style="padding:50px; font-family: Arial, Helvetica, sans-serif;">
+    <h1>VM | @ethereumjs/vm</h1>
+    Basic usage of this library in the browser (using <a href="https://github.com/vitejs/vite" target="_blank">Vite</a>)
+
+    <h3>Run the Example</h3>
+    <ol>
+        <li>Go to the library root directory (packages/[LIBRARY_NAME]/)</li>
+        <li>Build "dist" folder with: npm run build</li>
+        <li>Start Vite development server with: npx vite</li>
+        <li>Open the example URL in the browser (http://localhost:5173/examples/browser.html)</li>
+        <li>Open the development console (e.g. Chrome Developer Tools)</li>
+        <li>See example results and play with the code</li>
+    </ol>
+
+    <h3>Interactive CLI</h3>
+    <ol>
+        <li>Open the "Sources -> Page" tab in the Chrome Developer Tools</li>
+        <li>Set a breakpoint within the original "browser.html" file (so not the one generated by Vite)</li>
+        <li>Now you can use and play with the imports dynamically</li>
+    </ol>
+
+</body>
+
+</html>

packages/vm/src/vm.ts

@@ -127,7 +127,9 @@ export class VM {
     }
 
     // Skip DEBUG calls unless 'ethjs' included in environmental DEBUG variables
-    this.DEBUG = process?.env?.DEBUG?.includes('ethjs') ?? false
+    // Additional window check is to prevent vite browser bundling (and potentially other) to break
+    this.DEBUG =
+      typeof window === 'undefined' ? process?.env?.DEBUG?.includes('ethjs') ?? false : false
   }
 
   async init(): Promise<void> {

packages/vm/vite.config.ts

@@ -0,0 +1,7 @@
+import wasm from 'vite-plugin-wasm'
+import topLevelAwait from 'vite-plugin-top-level-await'
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  plugins: [wasm(), topLevelAwait()],
+})