From 5f8da19505c8c05cde7682b8ad52f1e1ba3f5755 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Fri, 29 Mar 2019 18:38:14 -0400
Subject: [PATCH] refactor (@embark/embark-utils): add ZERO_ADDRESS to
 embark-utils

refactor (@embark/embark-utils): add ZERO_ADDRESS to embark-utils

fix utils
---
 packages/embark-utils/src/index.js               | 5 ++++-
 packages/embark/src/lib/modules/codeRunner/vm.ts | 4 +++-
 packages/embark/src/lib/modules/ens/index.js     | 3 +--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/embark-utils/src/index.js b/packages/embark-utils/src/index.js
index d9f73ff2a..8c1e0b828 100644
--- a/packages/embark-utils/src/index.js
+++ b/packages/embark-utils/src/index.js
@@ -4,6 +4,8 @@ const https = require('follow-redirects').https;
 const {canonicalHost, defaultCorsHost, defaultHost, dockerHostSwap, isDocker} = require('./host');
 const {findNextPort} = require('./network');
 
+const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+
 function checkIsAvailable(url, callback) {
   const protocol = url.split(':')[0];
   const httpObj = (protocol === 'https') ? https : http;
@@ -58,7 +60,8 @@ const Utils = {
   hashTo32ByteHexString,
   isHex,
   soliditySha3,
-  recursiveMerge
+  recursiveMerge,
+  ZERO_ADDRESS
 };
 
 module.exports = Utils;
diff --git a/packages/embark/src/lib/modules/codeRunner/vm.ts b/packages/embark/src/lib/modules/codeRunner/vm.ts
index 51e0c1ca3..1acf7ef95 100644
--- a/packages/embark/src/lib/modules/codeRunner/vm.ts
+++ b/packages/embark/src/lib/modules/codeRunner/vm.ts
@@ -2,9 +2,11 @@ import { each } from "async";
 import { Callback, Logger } from "embark";
 import { NodeVM, NodeVMOptions } from "vm2";
 
+import {recursiveMerge} from "embark-utils";
+
 const fs = require("./fs");
 const path = require("path");
-const { recursiveMerge, isEs6Module, compact } = require("../../utils/utils");
+const { isEs6Module, compact } = require("../../utils/utils");
 
 const WEB3_INVALID_RESPONSE_ERROR: string = "Invalid JSON RPC response";
 
diff --git a/packages/embark/src/lib/modules/ens/index.js b/packages/embark/src/lib/modules/ens/index.js
index 663f3e671..d9a43f336 100644
--- a/packages/embark/src/lib/modules/ens/index.js
+++ b/packages/embark/src/lib/modules/ens/index.js
@@ -1,11 +1,10 @@
-import {joinPath, hashTo32ByteHexString, soliditySha3, recursiveMerge} from 'embark-utils';
+import {joinPath, hashTo32ByteHexString, soliditySha3, recursiveMerge, ZERO_ADDRESS} from 'embark-utils';
 const namehash = require('eth-ens-namehash');
 const async = require('async');
 const embarkJsUtils = require('embarkjs').Utils;
 const reverseAddrSuffix = '.addr.reverse';
 const ENSFunctions = require('./ENSFunctions');
 const secureSend = embarkJsUtils.secureSend;
-import {ZERO_ADDRESS} from '../../utils/addressUtils';
 import EmbarkJS from 'embarkjs';
 
 const ENS_WHITELIST = ["eth", "xyz"];