2 files changed, 50 insertions, 70 deletions
diff --git a/packages/contract-wrappers/src/contract_wrappers.ts b/packages/contract-wrappers/src/contract_wrappers.ts
index 2ef050f27..aa7931285 100644
--- a/packages/contract-wrappers/src/contract_wrappers.ts
+++ b/packages/contract-wrappers/src/contract_wrappers.ts
@@ -1,13 +1,13 @@
-import { Provider } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Provider } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import { artifacts } from './artifacts';
+import { ERC20ProxyWrapper } from './contract_wrappers/erc20_proxy_wrapper';
+import { ERC20TokenWrapper } from './contract_wrappers/erc20_token_wrapper';
+import { ERC721ProxyWrapper } from './contract_wrappers/erc721_proxy_wrapper';
+import { ERC721TokenWrapper } from './contract_wrappers/erc721_token_wrapper';
 import { EtherTokenWrapper } from './contract_wrappers/ether_token_wrapper';
-import { ExchangeWrapper } from './contract_wrappers/exchange_wrapper';
-import { TokenRegistryWrapper } from './contract_wrappers/token_registry_wrapper';
-import { TokenTransferProxyWrapper } from './contract_wrappers/token_transfer_proxy_wrapper';
-import { TokenWrapper } from './contract_wrappers/token_wrapper';
 import { ContractWrappersConfigSchema } from './schemas/contract_wrappers_config_schema';
 import { contractWrappersPrivateNetworkConfigSchema } from './schemas/contract_wrappers_private_network_config_schema';
 import { contractWrappersPublicNetworkConfigSchema } from './schemas/contract_wrappers_public_network_config_schema';
@@ -18,28 +18,28 @@ import { assert } from './utils/assert';
  */
 export class ContractWrappers {
     /**
-     * An instance of the ExchangeWrapper class containing methods for interacting with the 0x Exchange smart contract.
+     * An instance of the ERC20TokenWrapper class containing methods for interacting with any ERC20 token smart contract.
      */
-    public exchange: ExchangeWrapper;
+    public erc20Token: ERC20TokenWrapper;
     /**
-     * An instance of the TokenRegistryWrapper class containing methods for interacting with the 0x
-     * TokenRegistry smart contract.
+     * An instance of the ERC721TokenWrapper class containing methods for interacting with any ERC721 token smart contract.
      */
-    public tokenRegistry: TokenRegistryWrapper;
-    /**
-     * An instance of the TokenWrapper class containing methods for interacting with any ERC20 token smart contract.
-     */
-    public token: TokenWrapper;
+    public erc721Token: ERC721TokenWrapper;
     /**
      * An instance of the EtherTokenWrapper class containing methods for interacting with the
      * wrapped ETH ERC20 token smart contract.
      */
     public etherToken: EtherTokenWrapper;
     /**
-     * An instance of the TokenTransferProxyWrapper class containing methods for interacting with the
-     * tokenTransferProxy smart contract.
+     * An instance of the ERC20ProxyWrapper class containing methods for interacting with the
+     * erc20Proxy smart contract.
+     */
+    public erc20Proxy: ERC20ProxyWrapper;
+    /**
+     * An instance of the ERC721ProxyWrapper class containing methods for interacting with the
+     * erc721Proxy smart contract.
      */
-    public proxy: TokenTransferProxyWrapper;
+    public erc721Proxy: ERC721ProxyWrapper;
     private _web3Wrapper: Web3Wrapper;
     /**
      * Instantiates a new ContractWrappers instance.
@@ -55,7 +55,7 @@ export class ContractWrappers {
             contractWrappersPublicNetworkConfigSchema,
         ]);
         const artifactJSONs = _.values(artifacts);
-        const abiArrays = _.map(artifactJSONs, artifact => artifact.abi);
+        const abiArrays = _.map(artifactJSONs, artifact => artifact.compilerOutput.abi);
         const txDefaults = {
             gasPrice: config.gasPrice,
         };
@@ -63,25 +63,19 @@ export class ContractWrappers {
         _.forEach(abiArrays, abi => {
             this._web3Wrapper.abiDecoder.addABI(abi);
         });
-        this.proxy = new TokenTransferProxyWrapper(
+        this.erc20Proxy = new ERC20ProxyWrapper(
             this._web3Wrapper,
             config.networkId,
             config.tokenTransferProxyContractAddress,
         );
-        this.token = new TokenWrapper(this._web3Wrapper, config.networkId, this.proxy);
-        this.exchange = new ExchangeWrapper(
+        this.erc721Proxy = new ERC721ProxyWrapper(
             this._web3Wrapper,
             config.networkId,
-            this.token,
-            config.exchangeContractAddress,
-            config.zrxContractAddress,
-        );
-        this.tokenRegistry = new TokenRegistryWrapper(
-            this._web3Wrapper,
-            config.networkId,
-            config.tokenRegistryContractAddress,
+            config.tokenTransferProxyContractAddress,
         );
-        this.etherToken = new EtherTokenWrapper(this._web3Wrapper, config.networkId, this.token);
+        this.erc20Token = new ERC20TokenWrapper(this._web3Wrapper, config.networkId, this.erc20Proxy);
+        this.erc721Token = new ERC721TokenWrapper(this._web3Wrapper, config.networkId, this.erc721Proxy);
+        this.etherToken = new EtherTokenWrapper(this._web3Wrapper, config.networkId, this.erc20Token);
     }
     /**
      * Sets a new web3 provider for 0x.js. Updating the provider will stop all
@@ -91,14 +85,10 @@ export class ContractWrappers {
      */
     public setProvider(provider: Provider, networkId: number): void {
         this._web3Wrapper.setProvider(provider);
-        (this.exchange as any)._invalidateContractInstances();
-        (this.exchange as any)._setNetworkId(networkId);
-        (this.tokenRegistry as any)._invalidateContractInstance();
-        (this.tokenRegistry as any)._setNetworkId(networkId);
-        (this.token as any)._invalidateContractInstances();
-        (this.token as any)._setNetworkId(networkId);
-        (this.proxy as any)._invalidateContractInstance();
-        (this.proxy as any)._setNetworkId(networkId);
+        (this.erc20Token as any)._invalidateContractInstances();
+        (this.erc20Token as any)._setNetworkId(networkId);
+        (this.erc20Proxy as any)._invalidateContractInstance();
+        (this.erc20Proxy as any)._setNetworkId(networkId);
         (this.etherToken as any)._invalidateContractInstance();
         (this.etherToken as any)._setNetworkId(networkId);
     }
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 45af8a707..200ad7676 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -1,9 +1,7 @@
 export { ContractWrappers } from './contract_wrappers';
-export { ExchangeWrapper } from './contract_wrappers/exchange_wrapper';
-export { TokenWrapper } from './contract_wrappers/token_wrapper';
-export { TokenRegistryWrapper } from './contract_wrappers/token_registry_wrapper';
+export { ERC20TokenWrapper } from './contract_wrappers/erc20_token_wrapper';
 export { EtherTokenWrapper } from './contract_wrappers/ether_token_wrapper';
-export { TokenTransferProxyWrapper } from './contract_wrappers/token_transfer_proxy_wrapper';
+export { ERC20ProxyWrapper } from './contract_wrappers/erc20_proxy_wrapper';
 
 export {
     ContractWrappersError,
@@ -12,7 +10,6 @@ export {
     Token,
     IndexedFilterValues,
     BlockRange,
-    OrderCancellationRequest,
     OrderFillRequest,
     ContractEventArgs,
     ContractWrappersConfig,
@@ -24,45 +21,38 @@ export {
     OnOrderStateChangeCallback,
 } from './types';
 
+export { Order, SignedOrder, ECSignature, OrderStateValid, OrderStateInvalid, OrderState } from '@0xproject/types';
+
 export {
     BlockParamLiteral,
     FilterObject,
     BlockParam,
     ContractEventArg,
-    ExchangeContractErrs,
     LogWithDecodedArgs,
-    Order,
     Provider,
-    SignedOrder,
-    ECSignature,
-    OrderStateValid,
-    OrderStateInvalid,
-    OrderState,
     TransactionReceipt,
     TransactionReceiptWithDecodedLogs,
-} from '@0xproject/types';
+} from 'ethereum-types';
 
 export {
-    EtherTokenContractEventArgs,
-    WithdrawalContractEventArgs,
-    DepositContractEventArgs,
-    EtherTokenEvents,
-} from './contract_wrappers/generated/ether_token';
+    WETH9Events,
+    WETH9WithdrawalEventArgs,
+    WETH9ApprovalEventArgs,
+    WETH9EventArgs,
+    WETH9DepositEventArgs,
+    WETH9TransferEventArgs,
+} from './contract_wrappers/generated/weth9';
 
 export {
-    TransferContractEventArgs,
-    ApprovalContractEventArgs,
-    TokenContractEventArgs,
-    TokenEvents,
-} from './contract_wrappers/generated/token';
+    ERC20TokenTransferEventArgs,
+    ERC20TokenApprovalEventArgs,
+    ERC20TokenEvents,
+    ERC20TokenEventArgs,
+} from './contract_wrappers/generated/erc20_token';
 
 export {
-    LogErrorContractEventArgs,
-    LogCancelContractEventArgs,
-    LogFillContractEventArgs,
-    ExchangeContractEventArgs,
-    ExchangeEvents,
-} from './contract_wrappers/generated/exchange';
-
-export { BalanceAndProxyAllowanceLazyStore } from './stores/balance_proxy_allowance_lazy_store';
-export { OrderFilledCancelledLazyStore } from './stores/order_filled_cancelled_lazy_store';
+    ERC721TokenApprovalEventArgs,
+    ERC721TokenApprovalForAllEventArgs,
+    ERC721TokenTransferEventArgs,
+    ERC721TokenEvents,
+} from './contract_wrappers/generated/erc721_token';