From 220f92541545851abda885df196be790e08fe040 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 30 May 2017 10:21:48 +0200
Subject: Fix the empty code regex

---
 src/web3_wrapper.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/web3_wrapper.ts')

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);
-- 
cgit v1.2.3


From 55b00ab3809973e385b6baffd9c44d6db5540b12 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 30 May 2017 12:28:07 +0200
Subject: Add setProvider method to 0x.js that updates the web3 provider and
 invalidates any contractInstances instantiated with the old provider

---
 src/web3_wrapper.ts | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/web3_wrapper.ts')

diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index 97d04db8c..a532085ce 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -9,6 +9,9 @@ export class Web3Wrapper {
         this.web3 = new Web3();
         this.web3.setProvider(web3.currentProvider);
     }
+    public setProvider(provider: Web3.Provider) {
+        this.web3.setProvider(provider);
+    }
     public isAddress(address: string): boolean {
         return this.web3.isAddress(address);
     }
-- 
cgit v1.2.3