aboutsummaryrefslogtreecommitdiffstats
path: root/packages/assert
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-12-11 19:43:19 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-12-11 19:43:19 +0800
commita14424ae5f45784db5e75c2d6a9098dc96914c9e (patch)
treee0cc054713cc7fff81269c4065883629f117a590 /packages/assert
parentf1e7ea118b0c8c9a9a013b09d0e63bdd3694b21a (diff)
downloaddexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.tar
dexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.tar.gz
dexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.tar.bz2
dexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.tar.lz
dexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.tar.xz
dexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.tar.zst
dexon-sol-tools-a14424ae5f45784db5e75c2d6a9098dc96914c9e.zip
Move isAddress to shared utils and remove all dependencies on ethereum-address
Diffstat (limited to 'packages/assert')
-rw-r--r--packages/assert/package.json3
-rw-r--r--packages/assert/src/address_utils.ts34
-rw-r--r--packages/assert/src/globals.d.ts4
-rw-r--r--packages/assert/src/index.ts3
4 files changed, 4 insertions, 40 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/address_utils.ts b/packages/assert/src/address_utils.ts
deleted file mode 100644
index bdbcd3a89..000000000
--- a/packages/assert/src/address_utils.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as jsSHA3 from 'js-sha3';
-
-const BASIC_ADDRESS_REGEX = /^(0x)?[0-9a-f]{40}$/i;
-const SAME_CASE_ADDRESS_REGEX = /^(0x)?([0-9a-f]{40}|[0-9A-F]{40})$/;
-
-export const addressUtils = {
- isChecksumAddress(address: string): boolean {
- // Check each case
- const unprefixedAddress = address.replace('0x', '');
- const addressHash = jsSHA3.keccak256(unprefixedAddress.toLowerCase());
-
- for (let i = 0; i < 40; i++) {
- // The nth letter should be uppercase if the nth digit of casemap is 1
- if ((parseInt(addressHash[i], 16) > 7 && unprefixedAddress[i].toUpperCase() !== unprefixedAddress[i]) ||
- (parseInt(addressHash[i], 16) <= 7 && unprefixedAddress[i].toLowerCase() !== unprefixedAddress[i])) {
- return false;
- }
- }
- return true;
- },
- isAddress(address: string): boolean {
- if (!BASIC_ADDRESS_REGEX.test(address)) {
- // Check if it has the basic requirements of an address
- return false;
- } else if (SAME_CASE_ADDRESS_REGEX.test(address)) {
- // If it's all small caps or all all caps, return true
- return true;
- } else {
- // Otherwise check each case
- const isValidChecksummedAddress = addressUtils.isChecksumAddress(address);
- return isValidChecksummedAddress;
- }
- },
-};
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 = {