Move isAddress to shared utils and remove all dependencies on ethereum-address

11 files changed, 8 insertions, 21 deletions

diff --git a/packages/assert/package.json b/packages/assert/package.json
index 800207ae6..d69241f60 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -22,6 +22,9 @@
     "url": "https://github.com/0xProject/0x.js/issues"
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md",
+  "dependencies": {
+    "@0xProject/utils": "^0.0.1"
+  },
   "devDependencies": {
     "@0xproject/tslint-config": "^0.2.1",
     "@types/lodash": "^4.14.86",
diff --git a/packages/assert/src/globals.d.ts b/packages/assert/src/globals.d.ts
index cc47f3113..91ed2021e 100644
--- a/packages/assert/src/globals.d.ts
+++ b/packages/assert/src/globals.d.ts
@@ -1,5 +1 @@
 declare module 'dirty-chai';
-
-declare module 'ethereum-address' {
-    const isAddress: (arg: any) => boolean;
-}
diff --git a/packages/assert/src/index.ts b/packages/assert/src/index.ts
index 94900074a..fadc31d09 100644
--- a/packages/assert/src/index.ts
+++ b/packages/assert/src/index.ts
@@ -2,12 +2,11 @@ import {
     Schema,
     SchemaValidator,
 } from '@0xproject/json-schemas';
+import {addressUtils} from '@0xproject/utils';
 import BigNumber from 'bignumber.js';
 import * as _ from 'lodash';
 import * as validUrl from 'valid-url';
 
-import {addressUtils} from './address_utils';
-
 const HEX_REGEX = /^0x[0-9A-F]*$/i;
 
 export const assert = {
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index b724e5dae..5256f336e 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -20,7 +20,6 @@
     "@0xproject/assert": "^0.0.7",
     "bn.js": "^4.11.8",
     "es6-promisify": "^5.0.0",
-    "ethereum-address": "^0.0.4",
     "ethereumjs-tx": "^1.3.3",
     "ethereumjs-util": "^5.1.1",
     "ledgerco": "0xProject/ledger-node-js-api",
diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts
index 520ca9232..400bbef5b 100644
--- a/packages/subproviders/src/globals.d.ts
+++ b/packages/subproviders/src/globals.d.ts
@@ -54,11 +54,6 @@ declare module 'ledgerco' {
     }
 }
 
-// ethereum-address declarations
-declare module 'ethereum-address' {
-    export const isAddress: (address: string) => boolean;
-}
-
 // Semaphore-async-await declarations
 declare module 'semaphore-async-await' {
     class Semaphore {
diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts
index e0a08f792..578f6ff6f 100644
--- a/packages/subproviders/src/subproviders/ledger.ts
+++ b/packages/subproviders/src/subproviders/ledger.ts
@@ -1,6 +1,6 @@
 import {assert} from '@0xproject/assert';
+import {addressUtils} from '@0xproject/utils';
 import promisify = require('es6-promisify');
-import {isAddress} from 'ethereum-address';
 import EthereumTx = require('ethereumjs-tx');
 import ethUtil = require('ethereumjs-util');
 import * as ledger from 'ledgerco';
@@ -47,7 +47,7 @@ export class LedgerSubprovider extends Subprovider {
         return isValid;
     }
     private static validateSender(sender: string) {
-        if (_.isUndefined(sender) || !isAddress(sender)) {
+        if (_.isUndefined(sender) || !addressUtils.isAddress(sender)) {
             throw new Error(LedgerSubproviderErrors.SenderInvalidOrNotSupplied);
         }
     }
diff --git a/packages/assert/src/address_utils.ts b/packages/utils/src/address_utils.ts
index bdbcd3a89..bdbcd3a89 100644
--- a/packages/assert/src/address_utils.ts
+++ b/packages/utils/src/address_utils.ts
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index a61f04ad2..edfd192b2 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -1 +1,2 @@
 export {promisify} from './promisify';
+export {addressUtils} from './address_utils';
diff --git a/packages/website/package.json b/packages/website/package.json
index 95e060552..9b261c76c 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -28,7 +28,6 @@
     "dateformat": "^2.0.0",
     "deep-equal": "^1.0.1",
     "dharma-loan-frame": "^0.0.12",
-    "ethereum-address": "^0.0.4",
     "ethereumjs-tx": "^1.3.3",
     "ethereumjs-util": "^5.1.1",
     "find-versions": "^2.0.0",
diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx
index 8b03b8d12..832324fda 100644
--- a/packages/website/ts/components/inputs/address_input.tsx
+++ b/packages/website/ts/components/inputs/address_input.tsx
@@ -1,4 +1,4 @@
-import {isAddress} from 'ethereum-address';
+import {addressUtils} from '@0xproject/utils';
 import * as _ from 'lodash';
 import {colors} from 'material-ui/styles';
 import TextField from 'material-ui/TextField';
diff --git a/packages/website/ts/globals.d.ts b/packages/website/ts/globals.d.ts
index b4611f583..3144d7eb5 100644
--- a/packages/website/ts/globals.d.ts
+++ b/packages/website/ts/globals.d.ts
@@ -55,11 +55,6 @@ interface System {
 }
 declare var System: System;
 
-// ethereum-address declarations
-declare module 'ethereum-address' {
-    export const isAddress: (address: string) => boolean;
-}
-
 // jsonschema declarations
 // Source: https://github.com/tdegrunt/jsonschema/blob/master/lib/index.d.ts
 declare interface Schema {