Split tokens package into erc20 and erc721

16 files changed, 66 insertions, 496 deletions

diff --git a/contracts/exchange/test/core.ts b/contracts/exchange/test/core.ts
index 294976bf6..74161cc73 100644
--- a/contracts/exchange/test/core.ts
+++ b/contracts/exchange/test/core.ts
@@ -1,10 +1,20 @@
 import {
     artifacts as proxyArtifacts,
     ERC20ProxyContract,
+    ERC20Wrapper,
     ERC721ProxyContract,
+    ERC721Wrapper,
     MultiAssetProxyContract,
 } from '@0x/contracts-asset-proxy';
 import {
+    artifacts as erc20Artifacts,
+    DummyERC20TokenContract,
+    DummyERC20TokenTransferEventArgs,
+    DummyNoReturnERC20TokenContract,
+    ReentrantERC20TokenContract,
+} from '@0x/contracts-erc20';
+import { DummyERC721TokenContract } from '@0x/contracts-erc721';
+import {
     chaiSetup,
     constants,
     ERC20BalancesByOwner,
@@ -17,14 +27,6 @@ import {
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
-import {
-    artifacts as tokensArtifacts,
-    DummyERC20TokenContract,
-    DummyERC20TokenTransferEventArgs,
-    DummyERC721TokenContract,
-    DummyNoReturnERC20TokenContract,
-    ReentrantERC20TokenContract,
-} from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
 import { RevertReason, SignatureType, SignedOrder } from '@0x/types';
@@ -35,13 +37,13 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
-import { ExchangeCancelEventArgs, ExchangeContract } from '../generated-wrappers/exchange';
-import { TestStaticCallReceiverContract } from '../generated-wrappers/test_static_call_receiver';
-import { artifacts } from '../src/artifacts';
-
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ERC721Wrapper } from './utils/erc721_wrapper';
-import { ExchangeWrapper } from './utils/exchange_wrapper';
+import {
+    artifacts,
+    ExchangeCancelEventArgs,
+    ExchangeContract,
+    ExchangeWrapper,
+    TestStaticCallReceiverContract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -118,7 +120,7 @@ describe('Exchange core', () => {
             txDefaults,
         );
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
-            tokensArtifacts.ReentrantERC20Token,
+            erc20Artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
             exchange.address,
@@ -343,7 +345,7 @@ describe('Exchange core', () => {
     describe('Testing exchange of ERC20 tokens with no return values', () => {
         before(async () => {
             noReturnErc20Token = await DummyNoReturnERC20TokenContract.deployFrom0xArtifactAsync(
-                tokensArtifacts.DummyNoReturnERC20Token,
+                erc20Artifacts.DummyNoReturnERC20Token,
                 provider,
                 txDefaults,
                 constants.DUMMY_TOKEN_NAME,
diff --git a/contracts/exchange/test/dispatcher.ts b/contracts/exchange/test/dispatcher.ts
index 36d263bf4..a25755936 100644
--- a/contracts/exchange/test/dispatcher.ts
+++ b/contracts/exchange/test/dispatcher.ts
@@ -1,4 +1,11 @@
-import { artifacts as proxyArtifacts, ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
+import {
+    artifacts as proxyArtifacts,
+    ERC20ProxyContract,
+    ERC20Wrapper,
+    ERC721ProxyContract,
+    ERC721Wrapper,
+} from '@0x/contracts-asset-proxy';
+import { DummyERC20TokenContract } from '@0x/contracts-erc20';
 import {
     chaiSetup,
     constants,
@@ -8,7 +15,6 @@ import {
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
-import { DummyERC20TokenContract } from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { AssetProxyId, RevertReason } from '@0x/types';
@@ -18,13 +24,10 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import {
+    artifacts,
     TestAssetProxyDispatcherAssetProxyRegisteredEventArgs,
     TestAssetProxyDispatcherContract,
-} from '../generated-wrappers/test_asset_proxy_dispatcher';
-import { artifacts } from '../src/artifacts';
-
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ERC721Wrapper } from './utils/erc721_wrapper';
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/exchange/test/fill_order.ts b/contracts/exchange/test/fill_order.ts
index fee39db53..3f54091d4 100644
--- a/contracts/exchange/test/fill_order.ts
+++ b/contracts/exchange/test/fill_order.ts
@@ -16,10 +16,7 @@ import {
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import * as _ from 'lodash';
 
-import {
-    FillOrderCombinatorialUtils,
-    fillOrderCombinatorialUtilsFactoryAsync,
-} from './utils/fill_order_combinatorial_utils';
+import { FillOrderCombinatorialUtils, fillOrderCombinatorialUtilsFactoryAsync } from '../src';
 
 chaiSetup.configure();
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
diff --git a/contracts/exchange/test/internal.ts b/contracts/exchange/test/internal.ts
index 3a7f0cff2..7a1e12a7a 100644
--- a/contracts/exchange/test/internal.ts
+++ b/contracts/exchange/test/internal.ts
@@ -16,8 +16,7 @@ import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { TestExchangeInternalsContract } from '../generated-wrappers/test_exchange_internals';
-import { artifacts } from '../src/artifacts';
+import { artifacts, TestExchangeInternalsContract } from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/exchange/test/match_orders.ts b/contracts/exchange/test/match_orders.ts
index 346ee42a9..d17025ddd 100644
--- a/contracts/exchange/test/match_orders.ts
+++ b/contracts/exchange/test/match_orders.ts
@@ -1,4 +1,6 @@
-import { ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
+import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
+import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20';
+import { DummyERC721TokenContract } from '@0x/contracts-erc721';
 import {
     chaiSetup,
     constants,
@@ -10,12 +12,6 @@ import {
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
-import {
-    artifacts as tokensArtifacts,
-    DummyERC20TokenContract,
-    DummyERC721TokenContract,
-    ReentrantERC20TokenContract,
-} from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils } from '@0x/order-utils';
 import { RevertReason } from '@0x/types';
@@ -24,14 +20,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { ExchangeContract } from '../generated-wrappers/exchange';
-import { TestExchangeInternalsContract } from '../generated-wrappers/test_exchange_internals';
-import { artifacts } from '../src/artifacts';
-
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ERC721Wrapper } from './utils/erc721_wrapper';
-import { ExchangeWrapper } from './utils/exchange_wrapper';
-import { MatchOrderTester } from './utils/match_order_tester';
+import { artifacts, ExchangeContract, ExchangeWrapper, MatchOrderTester, TestExchangeInternalsContract } from '../src';
 
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
 chaiSetup.configure();
@@ -142,7 +131,7 @@ describe('matchOrders', () => {
         );
 
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
-            tokensArtifacts.ReentrantERC20Token,
+            erc20Artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
             exchange.address,
diff --git a/contracts/exchange/test/signature_validator.ts b/contracts/exchange/test/signature_validator.ts
index 33b15b394..89eac4ddb 100644
--- a/contracts/exchange/test/signature_validator.ts
+++ b/contracts/exchange/test/signature_validator.ts
@@ -1,3 +1,4 @@
+import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
 import {
     addressUtils,
     chaiSetup,
@@ -9,7 +10,6 @@ import {
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
-import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils, signatureUtils } from '@0x/order-utils';
 import { RevertReason, SignatureType, SignedOrder } from '@0x/types';
@@ -78,7 +78,7 @@ describe('MixinSignatureValidator', () => {
             provider,
             txDefaults,
         );
-        signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokensArtifacts });
+        signatureValidatorLogDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...erc20Artifacts });
         await web3Wrapper.awaitTransactionSuccessAsync(
             await signatureValidator.setSignatureValidatorApproval.sendTransactionAsync(testValidator.address, true, {
                 from: signerAddress,
diff --git a/contracts/exchange/test/transactions.ts b/contracts/exchange/test/transactions.ts
index a1d855631..613953493 100644
--- a/contracts/exchange/test/transactions.ts
+++ b/contracts/exchange/test/transactions.ts
@@ -1,4 +1,5 @@
-import { ERC20ProxyContract } from '@0x/contracts-asset-proxy';
+import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
+import { DummyERC20TokenContract } from '@0x/contracts-erc20';
 import {
     chaiSetup,
     constants,
@@ -12,7 +13,6 @@ import {
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
-import { DummyERC20TokenContract } from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
 import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types';
@@ -20,11 +20,7 @@ import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { ExchangeContract } from '../generated-wrappers/exchange';
-import { artifacts, ExchangeWrapperContract, WhitelistContract } from '../src/';
-
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ExchangeWrapper } from './utils/exchange_wrapper';
+import { artifacts, ExchangeContract, ExchangeWrapper, ExchangeWrapperContract, WhitelistContract } from '../src/';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/exchange/test/utils/asset_wrapper.ts b/contracts/exchange/test/utils/asset_wrapper.ts
index e4090ad74..e5a5205f5 100644
--- a/contracts/exchange/test/utils/asset_wrapper.ts
+++ b/contracts/exchange/test/utils/asset_wrapper.ts
@@ -4,8 +4,7 @@ import { AssetProxyId } from '@0x/types';
 import { BigNumber, errorUtils } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { ERC20Wrapper } from './erc20_wrapper';
-import { ERC721Wrapper } from './erc721_wrapper';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 
 interface ProxyIdToAssetWrappers {
     [proxyId: string]: AbstractAssetWrapper;
@@ -28,11 +27,13 @@ export class AssetWrapper {
         const proxyId = assetDataUtils.decodeAssetProxyId(assetData);
         switch (proxyId) {
             case AssetProxyId.ERC20: {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const erc20Wrapper = this._proxyIdToAssetWrappers[proxyId] as ERC20Wrapper;
                 const balance = await erc20Wrapper.getBalanceAsync(userAddress, assetData);
                 return balance;
             }
             case AssetProxyId.ERC721: {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const assetWrapper = this._proxyIdToAssetWrappers[proxyId] as ERC721Wrapper;
                 const assetProxyData = assetDataUtils.decodeERC721AssetData(assetData);
                 const isOwner = await assetWrapper.isOwnerAsync(
@@ -51,6 +52,7 @@ export class AssetWrapper {
         const proxyId = assetDataUtils.decodeAssetProxyId(assetData);
         switch (proxyId) {
             case AssetProxyId.ERC20: {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const erc20Wrapper = this._proxyIdToAssetWrappers[proxyId] as ERC20Wrapper;
                 await erc20Wrapper.setBalanceAsync(userAddress, assetData, desiredBalance);
                 return;
@@ -59,6 +61,7 @@ export class AssetWrapper {
                 if (!desiredBalance.eq(0) && !desiredBalance.eq(1)) {
                     throw new Error(`Balance for ERC721 token can only be set to 0 or 1. Got: ${desiredBalance}`);
                 }
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const erc721Wrapper = this._proxyIdToAssetWrappers[proxyId] as ERC721Wrapper;
                 const assetProxyData = assetDataUtils.decodeERC721AssetData(assetData);
                 const doesTokenExist = erc721Wrapper.doesTokenExistAsync(
@@ -109,11 +112,13 @@ export class AssetWrapper {
         const proxyId = assetDataUtils.decodeAssetProxyId(assetData);
         switch (proxyId) {
             case AssetProxyId.ERC20: {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const erc20Wrapper = this._proxyIdToAssetWrappers[proxyId] as ERC20Wrapper;
                 const allowance = await erc20Wrapper.getProxyAllowanceAsync(userAddress, assetData);
                 return allowance;
             }
             case AssetProxyId.ERC721: {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const assetWrapper = this._proxyIdToAssetWrappers[proxyId] as ERC721Wrapper;
                 const erc721ProxyData = assetDataUtils.decodeERC721AssetData(assetData);
                 const isProxyApprovedForAll = await assetWrapper.isProxyApprovedForAllAsync(
@@ -143,6 +148,7 @@ export class AssetWrapper {
         const proxyId = assetDataUtils.decodeAssetProxyId(assetData);
         switch (proxyId) {
             case AssetProxyId.ERC20: {
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const erc20Wrapper = this._proxyIdToAssetWrappers[proxyId] as ERC20Wrapper;
                 await erc20Wrapper.setAllowanceAsync(userAddress, assetData, desiredAllowance);
                 return;
@@ -157,6 +163,7 @@ export class AssetWrapper {
                         `Allowance for ERC721 token can only be set to 0, 1 or 2^256-1. Got: ${desiredAllowance}`,
                     );
                 }
+                // tslint:disable-next-line:no-unnecessary-type-assertion
                 const erc721Wrapper = this._proxyIdToAssetWrappers[proxyId] as ERC721Wrapper;
                 const assetProxyData = assetDataUtils.decodeERC721AssetData(assetData);
 
diff --git a/contracts/exchange/test/utils/erc20_wrapper.ts b/contracts/exchange/test/utils/erc20_wrapper.ts
deleted file mode 100644
index 3fe21ff96..000000000
--- a/contracts/exchange/test/utils/erc20_wrapper.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import { artifacts as proxyArtifacts, ERC20ProxyContract } from '@0x/contracts-asset-proxy';
-import { constants, ERC20BalancesByOwner, txDefaults } from '@0x/contracts-test-utils';
-import { artifacts as tokensArtifacts, DummyERC20TokenContract } from '@0x/contracts-tokens';
-import { assetDataUtils } from '@0x/order-utils';
-import { BigNumber } from '@0x/utils';
-import { Web3Wrapper } from '@0x/web3-wrapper';
-import { Provider } from 'ethereum-types';
-import * as _ from 'lodash';
-
-export class ERC20Wrapper {
-    private readonly _tokenOwnerAddresses: string[];
-    private readonly _contractOwnerAddress: string;
-    private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _provider: Provider;
-    private readonly _dummyTokenContracts: DummyERC20TokenContract[];
-    private _proxyContract?: ERC20ProxyContract;
-    private _proxyIdIfExists?: string;
-    /**
-     * Instanitates an ERC20Wrapper
-     * @param provider Web3 provider to use for all JSON RPC requests
-     * @param tokenOwnerAddresses Addresses that we want to endow as owners for dummy ERC20 tokens
-     * @param contractOwnerAddress Desired owner of the contract
-     * Instance of ERC20Wrapper
-     */
-    constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
-        this._dummyTokenContracts = [];
-        this._web3Wrapper = new Web3Wrapper(provider);
-        this._provider = provider;
-        this._tokenOwnerAddresses = tokenOwnerAddresses;
-        this._contractOwnerAddress = contractOwnerAddress;
-    }
-    public async deployDummyTokensAsync(
-        numberToDeploy: number,
-        decimals: BigNumber,
-    ): Promise<DummyERC20TokenContract[]> {
-        for (let i = 0; i < numberToDeploy; i++) {
-            this._dummyTokenContracts.push(
-                await DummyERC20TokenContract.deployFrom0xArtifactAsync(
-                    tokensArtifacts.DummyERC20Token,
-                    this._provider,
-                    txDefaults,
-                    constants.DUMMY_TOKEN_NAME,
-                    constants.DUMMY_TOKEN_SYMBOL,
-                    decimals,
-                    constants.DUMMY_TOKEN_TOTAL_SUPPLY,
-                ),
-            );
-        }
-        return this._dummyTokenContracts;
-    }
-    public async deployProxyAsync(): Promise<ERC20ProxyContract> {
-        this._proxyContract = await ERC20ProxyContract.deployFrom0xArtifactAsync(
-            proxyArtifacts.ERC20Proxy,
-            this._provider,
-            txDefaults,
-        );
-        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
-        return this._proxyContract;
-    }
-    public getProxyId(): string {
-        this._validateProxyContractExistsOrThrow();
-        return this._proxyIdIfExists as string;
-    }
-    public async setBalancesAndAllowancesAsync(): Promise<void> {
-        this._validateDummyTokenContractsExistOrThrow();
-        this._validateProxyContractExistsOrThrow();
-        for (const dummyTokenContract of this._dummyTokenContracts) {
-            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
-                await this._web3Wrapper.awaitTransactionSuccessAsync(
-                    await dummyTokenContract.setBalance.sendTransactionAsync(
-                        tokenOwnerAddress,
-                        constants.INITIAL_ERC20_BALANCE,
-                        { from: this._contractOwnerAddress },
-                    ),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                await this._web3Wrapper.awaitTransactionSuccessAsync(
-                    await dummyTokenContract.approve.sendTransactionAsync(
-                        (this._proxyContract as ERC20ProxyContract).address,
-                        constants.INITIAL_ERC20_ALLOWANCE,
-                        { from: tokenOwnerAddress },
-                    ),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-            }
-        }
-    }
-    public async getBalanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
-        const tokenContract = this._getTokenContractFromAssetData(assetData);
-        const balance = new BigNumber(await tokenContract.balanceOf.callAsync(userAddress));
-        return balance;
-    }
-    public async setBalanceAsync(userAddress: string, assetData: string, amount: BigNumber): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(assetData);
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.setBalance.sendTransactionAsync(userAddress, amount, {
-                from: this._contractOwnerAddress,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async getProxyAllowanceAsync(userAddress: string, assetData: string): Promise<BigNumber> {
-        const tokenContract = this._getTokenContractFromAssetData(assetData);
-        const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
-        const allowance = new BigNumber(await tokenContract.allowance.callAsync(userAddress, proxyAddress));
-        return allowance;
-    }
-    public async setAllowanceAsync(userAddress: string, assetData: string, amount: BigNumber): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(assetData);
-        const proxyAddress = (this._proxyContract as ERC20ProxyContract).address;
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.approve.sendTransactionAsync(proxyAddress, amount, {
-                from: userAddress,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async getBalancesAsync(): Promise<ERC20BalancesByOwner> {
-        this._validateDummyTokenContractsExistOrThrow();
-        const balancesByOwner: ERC20BalancesByOwner = {};
-        const balances: BigNumber[] = [];
-        const balanceInfo: Array<{ tokenOwnerAddress: string; tokenAddress: string }> = [];
-        for (const dummyTokenContract of this._dummyTokenContracts) {
-            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
-                balances.push(await dummyTokenContract.balanceOf.callAsync(tokenOwnerAddress));
-                balanceInfo.push({
-                    tokenOwnerAddress,
-                    tokenAddress: dummyTokenContract.address,
-                });
-            }
-        }
-        _.forEach(balances, (balance, balanceIndex) => {
-            const tokenAddress = balanceInfo[balanceIndex].tokenAddress;
-            const tokenOwnerAddress = balanceInfo[balanceIndex].tokenOwnerAddress;
-            if (_.isUndefined(balancesByOwner[tokenOwnerAddress])) {
-                balancesByOwner[tokenOwnerAddress] = {};
-            }
-            const wrappedBalance = new BigNumber(balance);
-            balancesByOwner[tokenOwnerAddress][tokenAddress] = wrappedBalance;
-        });
-        return balancesByOwner;
-    }
-    public addDummyTokenContract(dummy: DummyERC20TokenContract): void {
-        if (!_.isUndefined(this._dummyTokenContracts)) {
-            this._dummyTokenContracts.push(dummy);
-        }
-    }
-    public addTokenOwnerAddress(address: string): void {
-        this._tokenOwnerAddresses.push(address);
-    }
-    public getTokenOwnerAddresses(): string[] {
-        return this._tokenOwnerAddresses;
-    }
-    public getTokenAddresses(): string[] {
-        const tokenAddresses = _.map(this._dummyTokenContracts, dummyTokenContract => dummyTokenContract.address);
-        return tokenAddresses;
-    }
-    private _getTokenContractFromAssetData(assetData: string): DummyERC20TokenContract {
-        const erc20ProxyData = assetDataUtils.decodeERC20AssetData(assetData);
-        const tokenAddress = erc20ProxyData.tokenAddress;
-        const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
-        if (_.isUndefined(tokenContractIfExists)) {
-            throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
-        }
-        return tokenContractIfExists;
-    }
-    private _validateDummyTokenContractsExistOrThrow(): void {
-        if (_.isUndefined(this._dummyTokenContracts)) {
-            throw new Error('Dummy ERC20 tokens not yet deployed, please call "deployDummyTokensAsync"');
-        }
-    }
-    private _validateProxyContractExistsOrThrow(): void {
-        if (_.isUndefined(this._proxyContract)) {
-            throw new Error('ERC20 proxy contract not yet deployed, please call "deployProxyAsync"');
-        }
-    }
-}
diff --git a/contracts/exchange/test/utils/erc721_wrapper.ts b/contracts/exchange/test/utils/erc721_wrapper.ts
deleted file mode 100644
index 021c75ef2..000000000
--- a/contracts/exchange/test/utils/erc721_wrapper.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-import { artifacts as proxyArtifacts, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
-import { constants, ERC721TokenIdsByOwner, txDefaults } from '@0x/contracts-test-utils';
-import { artifacts as tokensArtifacts, DummyERC721TokenContract } from '@0x/contracts-tokens';
-import { generatePseudoRandomSalt } from '@0x/order-utils';
-import { BigNumber } from '@0x/utils';
-import { Web3Wrapper } from '@0x/web3-wrapper';
-import { Provider } from 'ethereum-types';
-import * as _ from 'lodash';
-
-export class ERC721Wrapper {
-    private readonly _tokenOwnerAddresses: string[];
-    private readonly _contractOwnerAddress: string;
-    private readonly _web3Wrapper: Web3Wrapper;
-    private readonly _provider: Provider;
-    private readonly _dummyTokenContracts: DummyERC721TokenContract[];
-    private _proxyContract?: ERC721ProxyContract;
-    private _proxyIdIfExists?: string;
-    private _initialTokenIdsByOwner: ERC721TokenIdsByOwner = {};
-    constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
-        this._web3Wrapper = new Web3Wrapper(provider);
-        this._provider = provider;
-        this._dummyTokenContracts = [];
-        this._tokenOwnerAddresses = tokenOwnerAddresses;
-        this._contractOwnerAddress = contractOwnerAddress;
-    }
-    public async deployDummyTokensAsync(): Promise<DummyERC721TokenContract[]> {
-        // tslint:disable-next-line:no-unused-variable
-        for (const i of _.times(constants.NUM_DUMMY_ERC721_TO_DEPLOY)) {
-            this._dummyTokenContracts.push(
-                await DummyERC721TokenContract.deployFrom0xArtifactAsync(
-                    tokensArtifacts.DummyERC721Token,
-                    this._provider,
-                    txDefaults,
-                    constants.DUMMY_TOKEN_NAME,
-                    constants.DUMMY_TOKEN_SYMBOL,
-                ),
-            );
-        }
-        return this._dummyTokenContracts;
-    }
-    public async deployProxyAsync(): Promise<ERC721ProxyContract> {
-        this._proxyContract = await ERC721ProxyContract.deployFrom0xArtifactAsync(
-            proxyArtifacts.ERC721Proxy,
-            this._provider,
-            txDefaults,
-        );
-        this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
-        return this._proxyContract;
-    }
-    public getProxyId(): string {
-        this._validateProxyContractExistsOrThrow();
-        return this._proxyIdIfExists as string;
-    }
-    public async setBalancesAndAllowancesAsync(): Promise<void> {
-        this._validateDummyTokenContractsExistOrThrow();
-        this._validateProxyContractExistsOrThrow();
-        this._initialTokenIdsByOwner = {};
-        for (const dummyTokenContract of this._dummyTokenContracts) {
-            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
-                // tslint:disable-next-line:no-unused-variable
-                for (const i of _.times(constants.NUM_ERC721_TOKENS_TO_MINT)) {
-                    const tokenId = generatePseudoRandomSalt();
-                    await this.mintAsync(dummyTokenContract.address, tokenId, tokenOwnerAddress);
-                    if (_.isUndefined(this._initialTokenIdsByOwner[tokenOwnerAddress])) {
-                        this._initialTokenIdsByOwner[tokenOwnerAddress] = {
-                            [dummyTokenContract.address]: [],
-                        };
-                    }
-                    if (_.isUndefined(this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address])) {
-                        this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address] = [];
-                    }
-                    this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address].push(tokenId);
-
-                    await this.approveProxyAsync(dummyTokenContract.address, tokenId);
-                }
-            }
-        }
-    }
-    public async doesTokenExistAsync(tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const owner = await tokenContract.ownerOf.callAsync(tokenId);
-        const doesExist = owner !== constants.NULL_ADDRESS;
-        return doesExist;
-    }
-    public async approveProxyAsync(tokenAddress: string, tokenId: BigNumber): Promise<void> {
-        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
-        await this.approveAsync(proxyAddress, tokenAddress, tokenId);
-    }
-    public async approveProxyForAllAsync(tokenAddress: string, tokenId: BigNumber, isApproved: boolean): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
-        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.setApprovalForAll.sendTransactionAsync(proxyAddress, isApproved, {
-                from: tokenOwner,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async approveAsync(to: string, tokenAddress: string, tokenId: BigNumber): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.approve.sendTransactionAsync(to, tokenId, {
-                from: tokenOwner,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async transferFromAsync(
-        tokenAddress: string,
-        tokenId: BigNumber,
-        currentOwner: string,
-        userAddress: string,
-    ): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.transferFrom.sendTransactionAsync(currentOwner, userAddress, tokenId, {
-                from: currentOwner,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async mintAsync(tokenAddress: string, tokenId: BigNumber, userAddress: string): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.mint.sendTransactionAsync(userAddress, tokenId, {
-                from: this._contractOwnerAddress,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async burnAsync(tokenAddress: string, tokenId: BigNumber, owner: string): Promise<void> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await tokenContract.burn.sendTransactionAsync(owner, tokenId, {
-                from: this._contractOwnerAddress,
-            }),
-            constants.AWAIT_TRANSACTION_MINED_MS,
-        );
-    }
-    public async ownerOfAsync(tokenAddress: string, tokenId: BigNumber): Promise<string> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const owner = await tokenContract.ownerOf.callAsync(tokenId);
-        return owner;
-    }
-    public async isOwnerAsync(userAddress: string, tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const tokenOwner = await tokenContract.ownerOf.callAsync(tokenId);
-        const isOwner = tokenOwner === userAddress;
-        return isOwner;
-    }
-    public async isProxyApprovedForAllAsync(userAddress: string, tokenAddress: string): Promise<boolean> {
-        this._validateProxyContractExistsOrThrow();
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const operator = (this._proxyContract as ERC721ProxyContract).address;
-        const didApproveAll = await tokenContract.isApprovedForAll.callAsync(userAddress, operator);
-        return didApproveAll;
-    }
-    public async isProxyApprovedAsync(tokenAddress: string, tokenId: BigNumber): Promise<boolean> {
-        this._validateProxyContractExistsOrThrow();
-        const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const approvedAddress = await tokenContract.getApproved.callAsync(tokenId);
-        const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
-        const isProxyAnApprovedOperator = approvedAddress === proxyAddress;
-        return isProxyAnApprovedOperator;
-    }
-    public async getBalancesAsync(): Promise<ERC721TokenIdsByOwner> {
-        this._validateDummyTokenContractsExistOrThrow();
-        this._validateBalancesAndAllowancesSetOrThrow();
-        const tokenIdsByOwner: ERC721TokenIdsByOwner = {};
-        const tokenOwnerAddresses: string[] = [];
-        const tokenInfo: Array<{ tokenId: BigNumber; tokenAddress: string }> = [];
-        for (const dummyTokenContract of this._dummyTokenContracts) {
-            for (const tokenOwnerAddress of this._tokenOwnerAddresses) {
-                const initialTokenOwnerIds = this._initialTokenIdsByOwner[tokenOwnerAddress][
-                    dummyTokenContract.address
-                ];
-                for (const tokenId of initialTokenOwnerIds) {
-                    tokenOwnerAddresses.push(await dummyTokenContract.ownerOf.callAsync(tokenId));
-                    tokenInfo.push({
-                        tokenId,
-                        tokenAddress: dummyTokenContract.address,
-                    });
-                }
-            }
-        }
-        _.forEach(tokenOwnerAddresses, (tokenOwnerAddress, ownerIndex) => {
-            const tokenAddress = tokenInfo[ownerIndex].tokenAddress;
-            const tokenId = tokenInfo[ownerIndex].tokenId;
-            if (_.isUndefined(tokenIdsByOwner[tokenOwnerAddress])) {
-                tokenIdsByOwner[tokenOwnerAddress] = {
-                    [tokenAddress]: [],
-                };
-            }
-            if (_.isUndefined(tokenIdsByOwner[tokenOwnerAddress][tokenAddress])) {
-                tokenIdsByOwner[tokenOwnerAddress][tokenAddress] = [];
-            }
-            tokenIdsByOwner[tokenOwnerAddress][tokenAddress].push(tokenId);
-        });
-        return tokenIdsByOwner;
-    }
-    public getTokenOwnerAddresses(): string[] {
-        return this._tokenOwnerAddresses;
-    }
-    public getTokenAddresses(): string[] {
-        const tokenAddresses = _.map(this._dummyTokenContracts, dummyTokenContract => dummyTokenContract.address);
-        return tokenAddresses;
-    }
-    private _getTokenContractFromAssetData(tokenAddress: string): DummyERC721TokenContract {
-        const tokenContractIfExists = _.find(this._dummyTokenContracts, c => c.address === tokenAddress);
-        if (_.isUndefined(tokenContractIfExists)) {
-            throw new Error(`Token: ${tokenAddress} was not deployed through ERC20Wrapper`);
-        }
-        return tokenContractIfExists;
-    }
-    private _validateDummyTokenContractsExistOrThrow(): void {
-        if (_.isUndefined(this._dummyTokenContracts)) {
-            throw new Error('Dummy ERC721 tokens not yet deployed, please call "deployDummyTokensAsync"');
-        }
-    }
-    private _validateProxyContractExistsOrThrow(): void {
-        if (_.isUndefined(this._proxyContract)) {
-            throw new Error('ERC721 proxy contract not yet deployed, please call "deployProxyAsync"');
-        }
-    }
-    private _validateBalancesAndAllowancesSetOrThrow(): void {
-        if (_.keys(this._initialTokenIdsByOwner).length === 0) {
-            throw new Error(
-                'Dummy ERC721 balances and allowances not yet set, please call "setBalancesAndAllowancesAsync"',
-            );
-        }
-    }
-}
diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts
index 437882b41..eca535c65 100644
--- a/contracts/exchange/test/utils/exchange_wrapper.ts
+++ b/contracts/exchange/test/utils/exchange_wrapper.ts
@@ -1,3 +1,5 @@
+import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
+import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
 import {
     FillResults,
     formatters,
@@ -6,15 +8,13 @@ import {
     orderUtils,
     SignedTransaction,
 } from '@0x/contracts-test-utils';
-import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { SignedOrder } from '@0x/types';
 import { AbiEncoder, BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { ExchangeContract } from '../../generated-wrappers/exchange';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, ExchangeContract } from '../../src';
 
 import { AbiDecodedFillOrderData } from './types';
 
@@ -25,7 +25,7 @@ export class ExchangeWrapper {
     constructor(exchangeContract: ExchangeContract, provider: Provider) {
         this._exchange = exchangeContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...tokensArtifacts });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...erc721Artifacts });
     }
     public async fillOrderAsync(
         signedOrder: SignedOrder,
diff --git a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
index c2f530e5b..26b168909 100644
--- a/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
+++ b/contracts/exchange/test/utils/fill_order_combinatorial_utils.ts
@@ -1,4 +1,5 @@
-import { artifacts as libsArtifacts, TestLibsContract } from '@0x/contracts-libs';
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
+import { artifacts as libsArtifacts, TestLibsContract } from '@0x/contracts-exchange-libs';
 import {
     AllowanceAmountScenario,
     AssetDataScenario,
@@ -32,12 +33,9 @@ import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 
-import { ExchangeContract, ExchangeFillEventArgs } from '../../generated-wrappers/exchange';
-import { artifacts } from '../../src/artifacts';
+import { artifacts, ExchangeContract, ExchangeFillEventArgs } from '../../src';
 
 import { AssetWrapper } from './asset_wrapper';
-import { ERC20Wrapper } from './erc20_wrapper';
-import { ERC721Wrapper } from './erc721_wrapper';
 import { ExchangeWrapper } from './exchange_wrapper';
 import { OrderFactoryFromScenario } from './order_factory_from_scenario';
 import { SimpleAssetBalanceAndProxyAllowanceFetcher } from './simple_asset_balance_and_proxy_allowance_fetcher';
diff --git a/contracts/exchange/test/utils/index.ts b/contracts/exchange/test/utils/index.ts
index 75cd88666..d88a38266 100644
--- a/contracts/exchange/test/utils/index.ts
+++ b/contracts/exchange/test/utils/index.ts
@@ -1,3 +1,3 @@
 export * from './exchange_wrapper';
-export * from './erc20_wrapper';
-export * from './erc721_wrapper';
+export * from './fill_order_combinatorial_utils';
+export * from './match_order_tester';
diff --git a/contracts/exchange/test/utils/match_order_tester.ts b/contracts/exchange/test/utils/match_order_tester.ts
index 0ba8017c5..680ff13ac 100644
--- a/contracts/exchange/test/utils/match_order_tester.ts
+++ b/contracts/exchange/test/utils/match_order_tester.ts
@@ -1,3 +1,4 @@
+import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
 import {
     chaiSetup,
     ERC20BalancesByOwner,
@@ -15,8 +16,6 @@ import * as _ from 'lodash';
 
 import { TransactionReceiptWithDecodedLogs } from '../../../../node_modules/ethereum-types';
 
-import { ERC20Wrapper } from './erc20_wrapper';
-import { ERC721Wrapper } from './erc721_wrapper';
 import { ExchangeWrapper } from './exchange_wrapper';
 
 chaiSetup.configure();
diff --git a/contracts/exchange/test/utils/order_factory_from_scenario.ts b/contracts/exchange/test/utils/order_factory_from_scenario.ts
index ecb4b2e28..6f5645906 100644
--- a/contracts/exchange/test/utils/order_factory_from_scenario.ts
+++ b/contracts/exchange/test/utils/order_factory_from_scenario.ts
@@ -1,3 +1,4 @@
+import { DummyERC721TokenContract } from '@0x/contracts-erc721';
 import {
     AssetDataScenario,
     constants,
@@ -8,7 +9,6 @@ import {
     OrderScenario,
     TakerScenario,
 } from '@0x/contracts-test-utils';
-import { DummyERC721TokenContract } from '@0x/contracts-tokens';
 import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
 import { Order } from '@0x/types';
 import { BigNumber, errorUtils } from '@0x/utils';
diff --git a/contracts/exchange/test/wrapper.ts b/contracts/exchange/test/wrapper.ts
index 6211682b1..62a0d426f 100644
--- a/contracts/exchange/test/wrapper.ts
+++ b/contracts/exchange/test/wrapper.ts
@@ -1,4 +1,6 @@
-import { ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
+import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy';
+import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20';
+import { DummyERC721TokenContract } from '@0x/contracts-erc721';
 import {
     chaiSetup,
     constants,
@@ -12,12 +14,6 @@ import {
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
-import {
-    artifacts as tokensArtifacts,
-    DummyERC20TokenContract,
-    DummyERC721TokenContract,
-    ReentrantERC20TokenContract,
-} from '@0x/contracts-tokens';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
 import { RevertReason, SignedOrder } from '@0x/types';
@@ -26,12 +22,7 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { ExchangeContract } from '../generated-wrappers/exchange';
-import { artifacts } from '../src/artifacts';
-
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ERC721Wrapper } from './utils/erc721_wrapper';
-import { ExchangeWrapper } from './utils/exchange_wrapper';
+import { artifacts, ExchangeContract, ExchangeWrapper } from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -116,7 +107,7 @@ describe('Exchange wrappers', () => {
         );
 
         reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
-            tokensArtifacts.ReentrantERC20Token,
+            erc20Artifacts.ReentrantERC20Token,
             provider,
             txDefaults,
             exchange.address,