chore: merge with master

packages/client/package.json

@@ -88,6 +88,7 @@
     "mcl-wasm": "^1.5.0",
     "memory-level": "^1.0.0",
     "prom-client": "^15.1.0",
+    "rustbn-wasm": "^0.4.0",
     "verkle-cryptography-wasm": "^0.4.5",
     "winston": "^3.3.3",
     "winston-daily-rotate-file": "^4.5.5",

packages/client/src/execution/vmexecution.ts

@@ -4,8 +4,8 @@ import {
   DBSetHashToNumber,
   DBSetTD,
 } from '@ethereumjs/blockchain'
-import { ConsensusType, Hardfork } from '@ethereumjs/common'
-import { MCLBLS } from '@ethereumjs/evm'
+import { CacheType, ConsensusType, Hardfork } from '@ethereumjs/common'
+import { MCLBLS, RustBN254 } from '@ethereumjs/evm'
 import { getGenesis } from '@ethereumjs/genesis'
 import {
   CacheType,
@@ -25,6 +25,7 @@ import {
 import { VM, runBlock, runTx } from '@ethereumjs/vm'
 import { writeFileSync } from 'fs'
 import * as mcl from 'mcl-wasm'
+import { initRustBN } from 'rustbn-wasm'
 import { loadVerkleCrypto } from 'verkle-cryptography-wasm'
 
 import { Event } from '../types.js'
@@ -182,12 +183,14 @@ export class VMExecution extends Execution {
     })
 
     await mcl.init(mcl.BLS12_381)
+    const rustBN = await initRustBN()
     this.merkleVM = await VM.create({
       common: this.config.execCommon,
       blockchain: this.chain.blockchain,
       stateManager,
       evmOpts: {
         bls: new MCLBLS(mcl),
+        bn254: new RustBN254(rustBN),
       },
       profilerOpts: this.config.vmProfilerOpts,
     })
@@ -205,12 +208,14 @@ export class VMExecution extends Execution {
       verkleCrypto,
     })
     await mcl.init(mcl.BLS12_381)
+    const rustBN = await initRustBN()
     this.verkleVM = await VM.create({
       common: this.config.execCommon,
       blockchain: this.chain.blockchain,
       stateManager,
       evmOpts: {
         bls: new MCLBLS(mcl),
+        bn254: new RustBN254(rustBN),
       },
       profilerOpts: this.config.vmProfilerOpts,
     })

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

@@ -6,6 +6,7 @@ import { middleware } from '../validation.js'
 
 import type { Chain } from '../../blockchain/index.js'
 import type { EthereumClient } from '../../client.js'
+import type { RlpxPeer } from '../../net/peer/rlpxpeer.js'
 import type { Service } from '../../service/index.js'
 
 /**
@@ -28,14 +29,14 @@ export class Admin {
     this._rpcDebug = rpcDebug
 
     this.nodeInfo = middleware(callWithStackTrace(this.nodeInfo.bind(this), this._rpcDebug), 0, [])
+    this.peers = middleware(callWithStackTrace(this.peers.bind(this), this._rpcDebug), 0, [])
   }
 
   /**
    * Returns information about the currently running node.
-   * see for reference: https://geth.ethereum.org/docs/rpc/ns-admin#admin_nodeinfo
-   * @param params An empty array
+   * see for reference: https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-admin#admin_peers
    */
-  async nodeInfo(_params: []) {
+  async nodeInfo() {
     const rlpxInfo = this._client.config.server!.getRlpxInfo()
     const { enode, id, ip, listenAddr, ports } = rlpxInfo
     const { discovery, listener } = ports
@@ -68,4 +69,34 @@ export class Admin {
     }
     return nodeInfo
   }
+
+  /**
+   * Returns information about currently connected peers
+   * @returns an array of objects containing information about peers (including id, eth protocol versions supported, client name, etc.)
+   */
+  async peers() {
+    const peers = this._client.services.filter((serv) => serv.name === 'eth')[0]?.pool
+      .peers as RlpxPeer[]
+
+    return peers?.map((peer) => {
+      return {
+        id: peer.id,
+        // Typescript complains about the typing of `_hello` if we make rlpxPeer possibly null
+        name: (peer.rlpxPeer as any)['_hello'].clientId ?? null,
+        protocols: {
+          eth: {
+            head: peer.eth?.updatedBestHeader
+              ? bytesToHex(peer.eth.updatedBestHeader?.hash())
+              : bytesToHex(peer.eth?.status.bestHash),
+            difficulty: peer.eth?.status.td.toString(10),
+            version: peer.eth?.['versions'].slice(-1)[0] ?? null,
+          },
+        },
+        caps: peer.eth?.['versions'].map((ver) => 'eth/' + ver),
+        network: {
+          remoteAddress: peer.address,
+        },
+      }
+    })
+  }
 }

packages/client/test/rpc/admin/peers.spec.ts

@@ -0,0 +1,38 @@
+import { randomBytes } from 'crypto'
+import { assert, describe, it } from 'vitest'
+
+import { createClient, createManager, getRpcClient, startRPC } from '../helpers.js'
+
+const method = 'admin_peers'
+
+describe(method, () => {
+  it('works', async () => {
+    const manager = createManager(await createClient({ opened: true, noPeers: true }))
+    const rpc = getRpcClient(startRPC(manager.getMethods()))
+
+    console.log(manager['_client'].services[0].pool)
+    //@ts-ignore
+    manager['_client'].services[0].pool.peers = [
+      {
+        id: 'abcd',
+        eth: {
+          versions: ['68'],
+          status: {
+            td: 1n,
+            bestHash: randomBytes(32),
+          },
+        },
+        rlpxPeer: {
+          _hello: {
+            clientId: 'fakeClient',
+          },
+        },
+        address: '127.0.0.1:8545',
+      },
+    ]
+    const res = await rpc.request(method, [])
+    const { result } = res
+    console.log(res)
+    assert.notEqual(result, undefined, 'admin_peers returns a value')
+  })
+})

packages/evm/package.json

@@ -60,11 +60,10 @@
     "@ethereumjs/statemanager": "^2.3.0",
     "@ethereumjs/tx": "^5.3.0",
     "@ethereumjs/util": "^9.0.3",
-    "@noble/curves": "^1.4.2",
+    "@noble/curves": "^1.5.0",
     "@types/debug": "^4.1.9",
     "debug": "^4.3.3",
-    "ethereum-cryptography": "^2.2.1",
-    "rustbn-wasm": "^0.4.0"
+    "ethereum-cryptography": "^2.2.1"
   },
   "devDependencies": {
     "@ethersproject/abi": "^5.0.12",
@@ -81,6 +80,7 @@
     "minimist": "^1.2.5",
     "node-dir": "^0.1.17",
     "rollup-plugin-visualizer": "^5.12.0",
+    "rustbn-wasm": "^0.4.0",
     "solc": "^0.8.1",
     "split": "^1.0.1"
   },

packages/evm/src/constructors.ts

@@ -1,14 +1,12 @@
 import { Common, Mainnet } from '@ethereumjs/common'
 import { SimpleStateManager } from '@ethereumjs/statemanager'
-import { initRustBN } from 'rustbn-wasm'
 
+import { NobleBN254 } from './precompiles/index.js'
 import { DefaultBlockchain } from './types.js'
 
 import { EVM } from './index.js'
 
-import type { EVMOpts, bn128 } from './index.js'
-
-let initializedRustBN: bn128 | undefined = undefined
+import type { EVMOpts } from './index.js'
 
 /**
  * Use this async static constructor for the initialization
@@ -19,8 +17,8 @@ let initializedRustBN: bn128 | undefined = undefined
  */
 export async function createEVM(createOpts?: EVMOpts) {
   const opts = createOpts ?? ({} as EVMOpts)
-  const bn128 = initializedRustBN ?? ((await initRustBN()) as bn128)
-  initializedRustBN = bn128
+
+  opts.bn254 = new NobleBN254()
 
   if (opts.common === undefined) {
     opts.common = new Common({ chain: Mainnet })
@@ -34,5 +32,5 @@ export async function createEVM(createOpts?: EVMOpts) {
     opts.stateManager = new SimpleStateManager()
   }
 
-  return new EVM(opts, bn128)
+  return new EVM(opts)
 }

packages/evm/src/evm.ts

@@ -42,14 +42,14 @@ import type {
   Blockchain,
   CustomOpcode,
   EVMBLSInterface,
+  EVMBN254Interface,
   EVMEvents,
   EVMInterface,
   EVMOpts,
   EVMResult,
   EVMRunCallOpts,
   EVMRunCodeOpts,
   ExecResult,
-  bn128,
 } from './types.js'
 import type { Common, StateManagerInterface } from '@ethereumjs/common'
 
@@ -143,7 +143,7 @@ export class EVM implements EVMInterface {
 
   protected readonly _emit: (topic: string, data: any) => Promise<void>
 
-  private _bn128: bn128
+  private _bn254: EVMBN254Interface
 
   /**
    *
@@ -156,7 +156,7 @@ export class EVM implements EVMInterface {
    * @param opts The EVM options
    * @param bn128 Initialized bn128 WASM object for precompile usage (internal)
    */
-  constructor(opts: EVMOpts, bn128: bn128) {
+  constructor(opts: EVMOpts) {
     this.common = opts.common!
     this.blockchain = opts.blockchain!
     this.stateManager = opts.stateManager!
@@ -172,7 +172,6 @@ export class EVM implements EVMInterface {
       }
     }
 
-    this._bn128 = bn128
     this.events = new AsyncEventEmitter()
     this._optsCached = opts
 
@@ -215,10 +214,12 @@ export class EVM implements EVMInterface {
     this.getActiveOpcodes()
     this._precompiles = getActivePrecompiles(this.common, this._customPrecompiles)
 
+    // Precompile crypto libraries
     if (this.common.isActivatedEIP(2537)) {
       this._bls = opts.bls ?? new NobleBLS()
       this._bls.init?.()
     }
+    this._bn254 = opts.bn254!
 
     this._emit = async (topic: string, data: any): Promise<void> => {
       return new Promise((resolve) => this.events.emit(topic as keyof EVMEvents, data, resolve))
@@ -1085,7 +1086,7 @@ export class EVM implements EVMInterface {
       stateManager: this.stateManager.shallowCopy(),
     }
     ;(opts.stateManager as any).common = common
-    return new EVM(opts, this._bn128)
+    return new EVM(opts)
   }
 
   public getPerformanceLogs() {

packages/evm/src/exceptions.ts

@@ -31,6 +31,9 @@ export enum ERROR {
   BLS_12_381_INPUT_EMPTY = 'input is empty',
   BLS_12_381_FP_NOT_IN_FIELD = 'fp point not in field',
 
+  // BN254 errors
+  BN254_FP_NOT_IN_FIELD = 'fp point not in field',
+
   // Point Evaluation Errors
   INVALID_COMMITMENT = 'kzg commitment does not match versioned hash',
   INVALID_INPUTS = 'kzg inputs invalid',

packages/evm/src/index.ts

@@ -6,25 +6,29 @@ import { getOpcodesForHF } from './opcodes/index.js'
 import {
   MCLBLS,
   NobleBLS,
+  NobleBN254,
   type PrecompileInput,
+  RustBN254,
   getActivePrecompiles,
 } from './precompiles/index.js'
 
 import type { InterpreterStep } from './interpreter.js'
 import type {
+  EVMBLSInterface,
+  EVMBN254Interface,
   EVMInterface,
   EVMOpts,
   EVMResult,
   EVMRunCallOpts,
   EVMRunCodeOpts,
   ExecResult,
   Log,
-  bn128,
 } from './types.js'
 export * from './logger.js'
 
 export type {
-  bn128,
+  EVMBLSInterface,
+  EVMBN254Interface,
   EVMInterface,
   EVMOpts,
   EVMResult,
@@ -46,6 +50,8 @@ export {
   MCLBLS,
   Message,
   NobleBLS,
+  NobleBN254,
+  RustBN254,
   validateEOF,
 }