From fa7bff34eccc3c895defff1ebcca415a604a08bf Mon Sep 17 00:00:00 2001
From: Grandschtroumpf <francois.guezengar@hotmail.fr>
Date: Mon, 15 Jul 2019 13:03:30 +0200
Subject: [PATCH] Switch back to node 10

---
 .circleci/config.yml           | 14 +++++++-------
 remix-lib/src/universalDapp.js | 15 +++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad4ae4d882..6f2bd099f0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2
 jobs:
   remix-lib:
     docker:
-        - image: circleci/node:12
+        - image: circleci/node:10
     environment:
     working_directory: ~/repo
     steps:
@@ -16,7 +16,7 @@ jobs:
 
   remix-debug:
      docker:
-        - image: circleci/node:12
+        - image: circleci/node:10
      environment:
      working_directory: ~/repo
      steps:
@@ -26,7 +26,7 @@ jobs:
 
   remix-analyzer:
     docker:
-        - image: circleci/node:12
+        - image: circleci/node:10
     environment:
     working_directory: ~/repo
     steps:
@@ -36,7 +36,7 @@ jobs:
 
   remix-tests:
     docker:
-        - image: circleci/node:12
+        - image: circleci/node:10
     environment:
     working_directory: ~/repo
     steps:
@@ -46,7 +46,7 @@ jobs:
 
   remix-astwalker:
     docker:
-        - image: circleci/node:12
+        - image: circleci/node:10
     environment:
     working_directory: ~/repo
     steps:
@@ -56,7 +56,7 @@ jobs:
 
   remix-simulator:
     docker:
-        - image: circleci/node:12
+        - image: circleci/node:10
     environment:
     working_directory: ~/repo
     steps:
@@ -66,7 +66,7 @@ jobs:
 
   remix-url-resolver:
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:10
     environment:
     working_directory: ~/repo
     steps:
diff --git a/remix-lib/src/universalDapp.js b/remix-lib/src/universalDapp.js
index 26980b8b8a..56b716f3ef 100644
--- a/remix-lib/src/universalDapp.js
+++ b/remix-lib/src/universalDapp.js
@@ -1,8 +1,7 @@
 const async = require('async')
-const ethJSUtil = require('ethereumjs-util')
-const { BN, privateToAddress, isValidPrivate, stripHexPrefix } = ethJSUtil
+const { BN, privateToAddress, isValidPrivate, stripHexPrefix } = require('ethereumjs-util')
 const crypto = require('crypto')
-import { EventEmitter } from 'events';
+const { EventEmitter } = require('events');
 
 const TxRunner = require('./execution/txRunner')
 const txHelper = require('./execution/txHelper')
@@ -81,7 +80,7 @@ module.exports = class UniversalDApp {
     }
     this._addAccount(privateKey, balance)
     const privKey = Buffer.from(privateKey, 'hex')
-    return '0x' + ethJSUtil.privateToAddress(privKey).toString('hex')
+    return '0x' + privateToAddress(privKey).toString('hex')
   }
 
   newAccount (password, passwordPromptCb, cb) {
@@ -96,9 +95,9 @@ module.exports = class UniversalDApp {
       let privateKey
       do {
         privateKey = crypto.randomBytes(32)
-      } while (!ethJSUtil.isValidPrivate(privateKey))
+      } while (!isValidPrivate(privateKey))
       this._addAccount(privateKey, '0x56BC75E2D63100000')
-      cb(null, '0x' + ethJSUtil.privateToAddress(privateKey).toString('hex'))
+      cb(null, '0x' + privateToAddress(privateKey).toString('hex'))
     }
   }
 
@@ -110,7 +109,7 @@ module.exports = class UniversalDApp {
 
     if (this.accounts) {
       privateKey = Buffer.from(privateKey, 'hex')
-      const address = ethJSUtil.privateToAddress(privateKey)
+      const address = privateToAddress(privateKey)
 
       // FIXME: we don't care about the callback, but we should still make this proper
       let stateManager = executionContext.vm().stateManager
@@ -170,7 +169,7 @@ module.exports = class UniversalDApp {
 
   /** Get the balance of an address */
   getBalance (address, cb) {
-    address = ethJSUtil.stripHexPrefix(address)
+    address = stripHexPrefix(address)
 
     if (!executionContext.isVM()) {
       executionContext.web3().eth.getBalance(address, (err, res) => {