From f1e7ea118b0c8c9a9a013b09d0e63bdd3694b21a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 8 Dec 2017 13:58:33 +0300 Subject: [PATCH 1/7] Remove ethereum-address dependency and add this logic to the repo --- packages/assert/package.json | 2 +- packages/assert/src/address_utils.ts | 34 ++++++++++++++++++++++++++++ packages/assert/src/index.ts | 7 +++--- yarn.lock | 10 +++++++- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 packages/assert/src/address_utils.ts diff --git a/packages/assert/package.json b/packages/assert/package.json index 65b163c21c..800207ae6f 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -39,7 +39,7 @@ "dependencies": { "@0xproject/json-schemas": "^0.6.10", "bignumber.js": "~4.1.0", - "ethereum-address": "^0.0.4", + "js-sha3": "^0.7.0", "lodash": "^4.17.4", "valid-url": "^1.0.9" } diff --git a/packages/assert/src/address_utils.ts b/packages/assert/src/address_utils.ts new file mode 100644 index 0000000000..bdbcd3a89c --- /dev/null +++ b/packages/assert/src/address_utils.ts @@ -0,0 +1,34 @@ +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/index.ts b/packages/assert/src/index.ts index 92bcf6f032..94900074ab 100644 --- a/packages/assert/src/index.ts +++ b/packages/assert/src/index.ts @@ -3,10 +3,11 @@ import { SchemaValidator, } from '@0xproject/json-schemas'; import BigNumber from 'bignumber.js'; -import * as ethereum_address from 'ethereum-address'; 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 = { @@ -35,9 +36,9 @@ export const assert = { this.typeAssertionMessage(variableName, 'HexString', value)); }, isETHAddressHex(variableName: string, value: string): void { - this.assert(ethereum_address.isAddress(value), this.typeAssertionMessage(variableName, 'ETHAddressHex', value)); + this.assert(addressUtils.isAddress(value), this.typeAssertionMessage(variableName, 'ETHAddressHex', value)); this.assert( - ethereum_address.isAddress(value) && value.toLowerCase() === value, + addressUtils.isAddress(value) && value.toLowerCase() === value, `Checksummed addresses are not supported. Convert ${variableName} to lower case before passing`, ); }, diff --git a/yarn.lock b/yarn.lock index 3777c8ef23..64c89af308 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1281,6 +1281,10 @@ bignumber.js@^4.0.2, bignumber.js@^4.1.0, bignumber.js@~4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" +bignumber.js@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833" + "bignumber.js@git+https://github.com/debris/bignumber.js#master": version "2.0.7" resolved "git+https://github.com/debris/bignumber.js#c7a38de919ed75e6fb6ba38051986e294b328df9" @@ -4538,6 +4542,10 @@ js-sha3@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.6.1.tgz#5b89f77a7477679877f58c4a075240934b1f95c0" +js-sha3@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.7.0.tgz#0a5c57b36f79882573b2d84051f8bb85dd1bd63a" + js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -5625,7 +5633,7 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -npm-run-all@^4.1.2: +npm-run-all@^4.1.1, npm-run-all@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056" dependencies: From a14424ae5f45784db5e75c2d6a9098dc96914c9e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 11 Dec 2017 12:43:19 +0100 Subject: [PATCH 2/7] Move isAddress to shared utils and remove all dependencies on ethereum-address --- packages/assert/package.json | 3 +++ packages/assert/src/globals.d.ts | 4 ---- packages/assert/src/index.ts | 3 +-- packages/subproviders/package.json | 1 - packages/subproviders/src/globals.d.ts | 5 ----- packages/subproviders/src/subproviders/ledger.ts | 4 ++-- packages/{assert => utils}/src/address_utils.ts | 0 packages/utils/src/index.ts | 1 + packages/website/package.json | 1 - .../ts/components/inputs/address_input.tsx | 2 +- packages/website/ts/globals.d.ts | 5 ----- yarn.lock | 16 +++++++++++----- 12 files changed, 19 insertions(+), 26 deletions(-) rename packages/{assert => utils}/src/address_utils.ts (100%) diff --git a/packages/assert/package.json b/packages/assert/package.json index 800207ae6f..d69241f60a 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 cc47f3113b..91ed2021ef 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 94900074ab..fadc31d093 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 b724e5daeb..5256f336e7 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 520ca92322..400bbef5ba 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 e0a08f7922..578f6ff6f8 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 similarity index 100% rename from packages/assert/src/address_utils.ts rename to packages/utils/src/address_utils.ts diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index a61f04ad29..edfd192b2a 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 95e060552e..9b261c76cb 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 8b03b8d12d..832324fdab 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 b4611f5834..3144d7eb54 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 { diff --git a/yarn.lock b/yarn.lock index 64c89af308..be7824c930 100644 --- a/yarn.lock +++ b/yarn.lock @@ -47,6 +47,16 @@ uuid "^3.1.0" web3 "^0.20.0" +"@0xproject/assert@^0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@0xproject/assert/-/assert-0.0.6.tgz#773616620314f40ace11a9c4c65cc95398d2c178" + dependencies: + "@0xproject/json-schemas" "^0.6.9" + bignumber.js "~4.1.0" + ethereum-address "^0.0.4" + lodash "^4.17.4" + valid-url "^1.0.9" + "@types/accounting@^0.4.1": version "0.4.1" resolved "https://registry.yarnpkg.com/@types/accounting/-/accounting-0.4.1.tgz#865d9f5694fd7c438fba34eb4bc82eec6f34cdd5" @@ -1281,10 +1291,6 @@ bignumber.js@^4.0.2, bignumber.js@^4.1.0, bignumber.js@~4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" -bignumber.js@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833" - "bignumber.js@git+https://github.com/debris/bignumber.js#master": version "2.0.7" resolved "git+https://github.com/debris/bignumber.js#c7a38de919ed75e6fb6ba38051986e294b328df9" @@ -5633,7 +5639,7 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -npm-run-all@^4.1.1, npm-run-all@^4.1.2: +npm-run-all@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056" dependencies: From 3477a84bbd625f5a2f3176cecfe87473e9f45664 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 12 Dec 2017 13:54:10 +0100 Subject: [PATCH 3/7] Merge dependencies --- packages/assert/package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/assert/package.json b/packages/assert/package.json index d69241f60a..6349526a21 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -22,9 +22,6 @@ "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", @@ -41,6 +38,7 @@ }, "dependencies": { "@0xproject/json-schemas": "^0.6.10", + "@0xProject/utils": "^0.0.1", "bignumber.js": "~4.1.0", "js-sha3": "^0.7.0", "lodash": "^4.17.4", From 1647e45247cd224a00b39bb91db766bbf981b76f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 12 Dec 2017 13:55:34 +0100 Subject: [PATCH 4/7] Move dependency --- packages/assert/package.json | 1 - packages/utils/package.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/assert/package.json b/packages/assert/package.json index 6349526a21..4798d9f785 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -40,7 +40,6 @@ "@0xproject/json-schemas": "^0.6.10", "@0xProject/utils": "^0.0.1", "bignumber.js": "~4.1.0", - "js-sha3": "^0.7.0", "lodash": "^4.17.4", "valid-url": "^1.0.9" } diff --git a/packages/utils/package.json b/packages/utils/package.json index 1af8a7e11b..8f856d0a08 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -28,6 +28,7 @@ }, "dependencies": { "bignumber.js": "~4.1.0", + "js-sha3": "^0.7.0", "lodash": "^4.17.4" } } From 16a970b65d72a07ef4ebd9d0ec062f9323525f2e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 12 Dec 2017 13:56:19 +0100 Subject: [PATCH 5/7] Fix an invocation --- packages/website/ts/components/inputs/address_input.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx index 832324fdab..40ae722d9c 100644 --- a/packages/website/ts/components/inputs/address_input.tsx +++ b/packages/website/ts/components/inputs/address_input.tsx @@ -62,7 +62,7 @@ export class AddressInput extends React.Component Date: Tue, 12 Dec 2017 13:59:31 +0100 Subject: [PATCH 6/7] Fix a dependency --- packages/assert/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/assert/package.json b/packages/assert/package.json index 4798d9f785..2fb7746a8a 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@0xproject/json-schemas": "^0.6.10", - "@0xProject/utils": "^0.0.1", + "@0xproject/utils": "^0.1.0", "bignumber.js": "~4.1.0", "lodash": "^4.17.4", "valid-url": "^1.0.9" From d778378b37b0cbd77ecdf8d1cafc7720682064ec Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 12 Dec 2017 15:14:54 +0100 Subject: [PATCH 7/7] Add missing dependency --- packages/subproviders/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 5256f336e7..b0c5686a6c 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -18,6 +18,7 @@ }, "dependencies": { "@0xproject/assert": "^0.0.7", + "@0xproject/utils": "^0.1.0", "bn.js": "^4.11.8", "es6-promisify": "^5.0.0", "ethereumjs-tx": "^1.3.3",