Merge branch 'master' into subscribe-token

1 files changed, 8 insertions, 4 deletions

diff --git a/src/0x.ts b/src/0x.ts
index e266eff7d..1b9334942 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -52,7 +52,11 @@ export class ZeroEx {
      * wrapped ETH ERC20 token smart contract.
      */
     public etherToken: EtherTokenWrapper;
-    private _proxyWrapper: ProxyWrapper;
+    /**
+     * An instance of the ProxyWrapper class containing methods for interacting with the
+     * proxy smart contract.
+     */
+    public proxy: ProxyWrapper;
     private _web3Wrapper: Web3Wrapper;
     /**
      * Verifies that the elliptic curve signature `signature` was generated
@@ -150,8 +154,8 @@ export class ZeroEx {
     constructor(provider: Web3Provider) {
         this._web3Wrapper = new Web3Wrapper(provider);
         this.token = new TokenWrapper(this._web3Wrapper);
-        this._proxyWrapper = new ProxyWrapper(this._web3Wrapper);
-        this.exchange = new ExchangeWrapper(this._web3Wrapper, this.token, this._proxyWrapper);
+        this.proxy = new ProxyWrapper(this._web3Wrapper);
+        this.exchange = new ExchangeWrapper(this._web3Wrapper, this.token, this.proxy);
         this.tokenRegistry = new TokenRegistryWrapper(this._web3Wrapper);
         this.etherToken = new EtherTokenWrapper(this._web3Wrapper, this.token);
     }
@@ -164,8 +168,8 @@ export class ZeroEx {
         this._web3Wrapper.setProvider(provider);
         await this.exchange.invalidateContractInstancesAsync();
         this.tokenRegistry.invalidateContractInstance();
-        this._proxyWrapper.invalidateContractInstance();
         await this.token.invalidateContractInstancesAsync();
+        this.proxy.invalidateContractInstance();
     }
     /**
      * Get user Ethereum addresses available through the supplied web3 instance available for sending transactions.