Refactor networkId out of web3Wrapper

1 files changed, 10 insertions, 3 deletions

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 1cbfaed0c..935e4ac1a 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -179,24 +179,31 @@ export class ZeroEx {
         const defaults = {
             gasPrice: config.gasPrice,
         };
-        this._web3Wrapper = new Web3Wrapper(provider, config.networkId, defaults);
+        this._web3Wrapper = new Web3Wrapper(provider, defaults);
         this.proxy = new TokenTransferProxyWrapper(
             this._web3Wrapper,
+            config.networkId,
             config.tokenTransferProxyContractAddress,
         );
         this.token = new TokenWrapper(
             this._web3Wrapper,
+            config.networkId,
             this._abiDecoder,
             this.proxy,
         );
         this.exchange = new ExchangeWrapper(
             this._web3Wrapper,
+            config.networkId,
             this._abiDecoder,
             this.token,
             config.exchangeContractAddress,
         );
-        this.tokenRegistry = new TokenRegistryWrapper(this._web3Wrapper, config.tokenRegistryContractAddress);
-        this.etherToken = new EtherTokenWrapper(this._web3Wrapper, this.token, config.etherTokenContractAddress);
+        this.tokenRegistry = new TokenRegistryWrapper(
+            this._web3Wrapper, config.networkId, config.tokenRegistryContractAddress,
+        );
+        this.etherToken = new EtherTokenWrapper(
+            this._web3Wrapper, config.networkId, this.token, config.etherTokenContractAddress,
+        );
         this.orderStateWatcher = new OrderStateWatcher(
             this._web3Wrapper, this._abiDecoder, this.token, this.exchange, config.orderWatcherConfig,
         );