[VM] add Berlin state tests, add empty input test

ethereumjs · Sep 6, 2020 · 2f24bf9 · 2f24bf9
1 parent c39856d
commit 2f24bf9
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 1,970 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/vm/karma.conf.js b/packages/vm/karma.conf.js
@@ -22,6 +22,10 @@ module.exports = function(config) {
       './tests/api/**/*.js': ['browserify'],
     },
 
+    proxies: {
+      '/mcl_c384_256.wasm': '../../node_modules/mcl-wasm/mcl_c384_256.wasm'
+    },
+
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://www.npmjs.com/browse/keyword/karma-reporter

diff --git a/packages/vm/lib/evm/precompiles/0c-bls12-g1multiexp.ts b/packages/vm/lib/evm/precompiles/0c-bls12-g1multiexp.ts
@@ -17,7 +17,7 @@ export default async function (opts: PrecompileInput): Promise<ExecResult> {
   let inputData = opts.data
 
   if (inputData.length == 0) {
-    return VmErrorResult(new VmError(ERROR.BLS_12_381_INPUT_EMPTY), new BN(0)) // follow Geths implementation
+    return VmErrorResult(new VmError(ERROR.BLS_12_381_INPUT_EMPTY), opts.gasLimit) // follow Geths implementation
   }
 
   const numPairs = Math.floor(inputData.length / 160)

diff --git a/packages/vm/lib/evm/precompiles/0f-bls12-g2multiexp.ts b/packages/vm/lib/evm/precompiles/0f-bls12-g2multiexp.ts
@@ -17,7 +17,7 @@ export default async function (opts: PrecompileInput): Promise<ExecResult> {
   let inputData = opts.data
 
   if (inputData.length == 0) {
-    return VmErrorResult(new VmError(ERROR.BLS_12_381_INPUT_EMPTY), new BN(0)) // follow Geths implementation
+    return VmErrorResult(new VmError(ERROR.BLS_12_381_INPUT_EMPTY), opts.gasLimit) // follow Geths implementation
   }
 
   const numPairs = Math.floor(inputData.length / 288)

diff --git a/packages/vm/lib/index.ts b/packages/vm/lib/index.ts
@@ -14,7 +14,11 @@ import { precompiles } from './evm/precompiles'
 import runBlockchain from './runBlockchain'
 const AsyncEventEmitter = require('async-eventemitter')
 const promisify = require('util.promisify')
-const mcl = require('mcl-wasm')
+let mcl = require('mcl-wasm')
+if (Object.keys(mcl).length == 0) {
+  mcl = (<any>globalThis).window.mcl
+}
+
 const mclInitPromise = mcl.init(mcl.BLS12_381) // We can use the same instance of mcl for all VMs. The methods are static.
 
 /**

diff --git a/packages/vm/package.json b/packages/vm/package.json
@@ -55,7 +55,7 @@
     "safe-buffer": "^5.1.1",
     "util.promisify": "^1.0.1",
     "util-callbackify": "^1.0.0",
-    "mcl-wasm": "^0.4.3"
+    "mcl-wasm": "^0.4.5"
   },
   "devDependencies": {
     "@ethereumjs/config-nyc": "^1.1.1",