diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/0x.js.ts | 2 | ||||
| -rw-r--r-- | src/web3_wrapper.ts | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts index 7e48bc0a5..f3da005f8 100644 --- a/src/0x.js.ts +++ b/src/0x.js.ts @@ -18,9 +18,9 @@ import {SolidityTypes, ECSignature, ZeroExError} from './types'; const MAX_DIGITS_IN_UNSIGNED_256_INT = 78; export class ZeroEx { - public web3Wrapper: Web3Wrapper; public exchange: ExchangeWrapper; public tokenRegistry: TokenRegistryWrapper; + private web3Wrapper: Web3Wrapper; /** * Computes the orderHash given the order parameters and returns it as a hex encoded string. */ diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts index 97d04db8c..a915a89e8 100644 --- a/src/web3_wrapper.ts +++ b/src/web3_wrapper.ts @@ -49,10 +49,9 @@ export class Web3Wrapper { } public async doesContractExistAtAddressAsync(address: string): Promise<boolean> { const code = await promisify(this.web3.eth.getCode)(address); - // Regex matches 0x0, 0x00, 0x in order to accomodate poorly implemented clients - const zeroHexAddressRegex = /^0x0*$/i; - const didFindCode = _.isNull(code.match(zeroHexAddressRegex)); - return didFindCode; + // Regex matches 0x0, 0x00, 0x in order to accommodate poorly implemented clients + const codeIsEmpty = /^0x0{0,40}$/i.test(code); + return !codeIsEmpty; } public async signTransactionAsync(address: string, message: string): Promise<string> { const signData = await promisify(this.web3.eth.sign)(address, message); |