vm: fixed Node 10 support being broken due to the usage of globalThis…

… for browser detection
ethereumjs · Mar 16, 2021 · da3a642 · da3a642
1 parent eb08be9
commit da3a642
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/vm/CHANGELOG.md b/packages/vm/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 - Fixes for [EIP2929](https://eips.ethereum.org/EIPS/eip-2929) (Gas cost increases for state access opcodes), PR [#1124](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1124)
 - Integration of [EIP2718](https://eips.ethereum.org/EIPS/eip-2718) (Typed Transactions) and [EIP2930](https://eips.ethereum.org/EIPS/eip-2930) (Access List Transaction), PR [#1048](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1048). VM now has support for access list transactions.
+- Fixes VM Node 10 support being broken due to the usage of `globalThis` for browser detection, PR [#1151](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1151)
 
 **CI and Test Improvements**
 

diff --git a/packages/vm/lib/index.ts b/packages/vm/lib/index.ts
@@ -14,12 +14,12 @@ import runBlockchain from './runBlockchain'
 const AsyncEventEmitter = require('async-eventemitter')
 const promisify = require('util.promisify')
 
-// eslint-disable-next-line no-undef
-const IS_BROWSER = typeof (<any>globalThis).window === 'object' // very ugly way to detect if we are running in a browser
+// 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 (!IS_BROWSER) {
+if (!isBrowser()) {
   mcl = require('mcl-wasm')
   mclInitPromise = mcl.init(mcl.BLS12_381)
 }
@@ -218,7 +218,7 @@ export default class VM extends AsyncEventEmitter {
     this._hardforkByBlockNumber = opts.hardforkByBlockNumber ?? false
 
     if (this._common.isActivatedEIP(2537)) {
-      if (IS_BROWSER) {
+      if (isBrowser()) {
         throw new Error('EIP-2537 is currently not supported in browsers')
       } else {
         this._mcl = mcl
@@ -252,7 +252,7 @@ export default class VM extends AsyncEventEmitter {
     }
 
     if (this._common.isActivatedEIP(2537)) {
-      if (IS_BROWSER) {
+      if (isBrowser()) {
         throw new Error('EIP-2537 is currently not supported in browsers')
       } else {
         const mcl = this._mcl