aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-05-30 18:36:28 +0800
committerFabio Berger <me@fabioberger.com>2017-05-30 18:36:28 +0800
commit02d7f808ab0a38e145c619b360738dc976898d54 (patch)
tree658094383e06e2b4df944486f7caeb54550007ea /src
parent4d63a4d02a68974df75c9cae85d43c0ba628c740 (diff)
parent73ae3df172b1fdb7e6a3f5cbb866b09fb5f9d032 (diff)
downloaddexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.tar
dexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.tar.gz
dexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.tar.bz2
dexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.tar.lz
dexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.tar.xz
dexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.tar.zst
dexon-sol-tools-02d7f808ab0a38e145c619b360738dc976898d54.zip
Merge branch 'master' into tokenRegistry
# Conflicts: # src/0x.js.ts
Diffstat (limited to 'src')
-rw-r--r--src/0x.js.ts2
-rw-r--r--src/web3_wrapper.ts7
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);