aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-05-30 15:54:52 +0800
committerFabio Berger <me@fabioberger.com>2017-05-30 15:54:52 +0800
commitec379cc3504ff0f6e8a6213bbb79fbd60734e993 (patch)
treed9c530edeffe1eda3ec559184e442efc03792cd9
parent6cb9bd4426bff5885f3b453d60a6a00f048abb6b (diff)
parentc9111aea382806db1b2ed64f0e075e4193ceb63a (diff)
downloaddexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.tar
dexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.tar.gz
dexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.tar.bz2
dexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.tar.lz
dexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.tar.xz
dexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.tar.zst
dexon-sol-tools-ec379cc3504ff0f6e8a6213bbb79fbd60734e993.zip
Merge branch 'master' into removeSrcFilesNotUsedByTests
-rw-r--r--src/web3_wrapper.ts2
-rw-r--r--test/exchange_wrapper.ts (renamed from test/contract_wrapper_test.ts)0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index 3b460e4da..97d04db8c 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -50,7 +50,7 @@ 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\{0,40\}$/i;
+ const zeroHexAddressRegex = /^0x0*$/i;
const didFindCode = _.isNull(code.match(zeroHexAddressRegex));
return didFindCode;
}
diff --git a/test/contract_wrapper_test.ts b/test/exchange_wrapper.ts
index 4bfc49374..4bfc49374 100644
--- a/test/contract_wrapper_test.ts
+++ b/test/exchange_wrapper.ts