crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leonid Logvinov
2017-12-11 12:43:19 +01:00
parent f1e7ea118b
commit a14424ae5f
12 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/assert/src/address_utils.ts
View File

@@ -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;
}
},
};

4
packages/assert/src/globals.d.ts vendored
View File

@@ -1,5 +1 @@
declare module 'dirty-chai';
declare module 'ethereum-address' {
const isAddress: (arg: any) => boolean;
}

3
packages/assert/src/index.ts
View File

@@ -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 = {