Update remaining pachages

2019-01-20 21:22:36 -08:00
parent 4a4c26a2e3
commit 43de20930b
52 changed files with 87 additions and 92 deletions
--- a/contracts/examples/contracts/ExchangeWrapper/ExchangeWrapper.sol
+++ b/contracts/examples/contracts/ExchangeWrapper/ExchangeWrapper.sol
@@ -20,7 +20,7 @@ pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";


 contract ExchangeWrapper {
--- a/contracts/examples/contracts/Validator/Validator.sol
+++ b/contracts/examples/contracts/Validator/Validator.sol
--- a/contracts/examples/contracts/examples/Wallet.sol
+++ b/contracts/examples/contracts/examples/Wallet.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.4.24;

 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IWallet.sol";
-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";


 contract Wallet is 
--- a/contracts/examples/contracts/Whitelist/Whitelist.sol
+++ b/contracts/examples/contracts/Whitelist/Whitelist.sol
@@ -20,8 +20,8 @@ pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";


 contract Whitelist is
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -60,8 +60,7 @@
    "dependencies": {
        "@0x/base-contract": "^3.0.13",
        "@0x/contracts-interfaces": "^1.0.6",
-        "@0x/contracts-libs": "^1.0.6",
-        "@0x/contracts-multisig": "^1.0.6",
+        "@0x/contracts-exchange-libs": "^1.0.6",
        "@0x/contracts-tokens": "^1.0.6",
        "@0x/contracts-utils": "^1.0.6",
        "@0x/order-utils": "^3.1.2",
--- a/contracts/exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibAssetProxyErrors.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibAssetProxyErrors.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibConstants.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibConstants.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibEIP712.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibEIP712.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibExchangeErrors.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibExchangeErrors.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibFillResults.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibFillResults.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibMath.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibMath.sol
--- a/contracts/exchange-libs/contracts/exchange-libs/LibOrder.sol
+++ b/contracts/exchange-libs/contracts/exchange-libs/LibOrder.sol
--- a/contracts/exchange-libs/contracts/test/TestLibs.sol
+++ b/contracts/exchange-libs/contracts/test/TestLibs.sol
@@ -16,13 +16,13 @@

 */

-pragma solidity ^0.4.24;
+pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

-import "../libs/LibMath.sol";
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-import "../libs/LibAbiEncoder.sol";
+import "../exchange-libs/LibMath.sol";
+import "../exchange-libs/LibOrder.sol";
+import "../exchange-libs/LibFillResults.sol";
+import "../exchange-libs/LibAbiEncoder.sol";


 contract TestLibs is 
--- a/contracts/exchange-libs/package.json
+++ b/contracts/exchange-libs/package.json
@@ -70,7 +70,6 @@
    },
    "dependencies": {
        "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-multisig": "^1.0.6",
        "@0x/contracts-utils": "^1.0.6",
        "@0x/order-utils": "^3.1.2",
        "@0x/types": "^1.5.2",
--- a/contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
+++ b/contracts/extensions/contracts/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol
@@ -18,8 +18,8 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-libs/contracts/libs/LibExchangeSelectors.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibExchangeSelectors.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
 import "./mixins/MBalanceThresholdFilterCore.sol";
 import "./MixinExchangeCalldata.sol";

--- a/contracts/extensions/contracts/BalanceThresholdFilter/MixinExchangeCalldata.sol
+++ b/contracts/extensions/contracts/BalanceThresholdFilter/MixinExchangeCalldata.sol
@@ -20,7 +20,7 @@
 pragma solidity ^0.4.24;

 import "./mixins/MExchangeCalldata.sol";
-import "@0x/contracts-libs/contracts/libs/LibAddressArray.sol";
+import "@0x/contracts-utils/contracts/utils/LibAddressArray.sol";


 contract MixinExchangeCalldata is 
--- a/contracts/extensions/contracts/DutchAuction/DutchAuction.sol
+++ b/contracts/extensions/contracts/DutchAuction/DutchAuction.sol
@@ -20,10 +20,10 @@ pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/SafeMath.sol";


 contract DutchAuction is
--- a/contracts/extensions/contracts/Forwarder/MixinAssets.sol
+++ b/contracts/extensions/contracts/Forwarder/MixinAssets.sol
@@ -18,8 +18,8 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
 import "./libs/LibConstants.sol";
--- a/contracts/extensions/contracts/Forwarder/MixinExchangeWrapper.sol
+++ b/contracts/extensions/contracts/Forwarder/MixinExchangeWrapper.sol
@@ -21,10 +21,10 @@ pragma experimental ABIEncoderV2;

 import "./libs/LibConstants.sol";
 import "./mixins/MExchangeWrapper.sol";
-import "@0x/contracts-libs/contracts/libs/LibAbiEncoder.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
-import "@0x/contracts-libs/contracts/libs/LibMath.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibAbiEncoder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol";


 contract MixinExchangeWrapper is
--- a/contracts/extensions/contracts/Forwarder/MixinForwarderCore.sol
+++ b/contracts/extensions/contracts/Forwarder/MixinForwarderCore.sol
@@ -24,10 +24,10 @@ import "./mixins/MWeth.sol";
 import "./mixins/MAssets.sol";
 import "./mixins/MExchangeWrapper.sol";
 import "./interfaces/IForwarderCore.sol";
-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
-import "@0x/contracts-libs/contracts/libs/LibMath.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol";


 contract MixinForwarderCore is
--- a/contracts/extensions/contracts/Forwarder/MixinWeth.sol
+++ b/contracts/extensions/contracts/Forwarder/MixinWeth.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-libs/contracts/libs/LibMath.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibMath.sol";
 import "./libs/LibConstants.sol";
 import "./mixins/MWeth.sol";

--- a/contracts/extensions/contracts/Forwarder/interfaces/IForwarderCore.sol
+++ b/contracts/extensions/contracts/Forwarder/interfaces/IForwarderCore.sol
@@ -19,8 +19,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";


 contract IForwarderCore {
--- a/contracts/extensions/contracts/Forwarder/libs/LibConstants.sol
+++ b/contracts/extensions/contracts/Forwarder/libs/LibConstants.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
 import "@0x/contracts-tokens/contracts/tokens/EtherToken/IEtherToken.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
--- a/contracts/extensions/contracts/Forwarder/mixins/MExchangeWrapper.sol
+++ b/contracts/extensions/contracts/Forwarder/mixins/MExchangeWrapper.sol
@@ -19,8 +19,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";


 contract MExchangeWrapper {
--- a/contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
+++ b/contracts/extensions/contracts/OrderMatcher/MixinAssets.sol
@@ -18,8 +18,8 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
 import "./mixins/MAssets.sol";
--- a/contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
+++ b/contracts/extensions/contracts/OrderMatcher/MixinMatchOrders.sol
@@ -20,9 +20,9 @@ pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

 import "./libs/LibConstants.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";


 contract MixinMatchOrders is
--- a/contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
+++ b/contracts/extensions/contracts/OrderMatcher/OrderMatcher.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";
 import "./libs/LibConstants.sol";
 import "./MixinMatchOrders.sol";
 import "./MixinAssets.sol";
--- a/contracts/extensions/contracts/OrderMatcher/interfaces/IMatchOrders.sol
+++ b/contracts/extensions/contracts/OrderMatcher/interfaces/IMatchOrders.sol
@@ -19,7 +19,7 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";


 contract IMatchOrders {
--- a/contracts/extensions/contracts/OrderValidator/OrderValidator.sol
+++ b/contracts/extensions/contracts/OrderValidator/OrderValidator.sol
@@ -20,10 +20,10 @@ pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
 import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";


 contract OrderValidator {
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -71,9 +71,10 @@
    },
    "dependencies": {
        "@0x/base-contract": "^3.0.13",
+        "@0x/contracts-asset-proxy": "^2.2.3",
        "@0x/contracts-interfaces": "^1.0.6",
-        "@0x/contracts-libs": "^1.0.6",
-        "@0x/contracts-protocol": "^2.2.3",
+        "@0x/contracts-exchange-libs": "^1.0.6",
+        "@0x/contracts-exchange": "^2.2.3",
        "@0x/contracts-tokens": "^1.0.6",
        "@0x/contracts-utils": "^1.0.6",
        "@0x/order-utils": "^3.1.2",
--- a/contracts/extensions/test/extensions/balance_threshold_filter.ts
+++ b/contracts/extensions/test/extensions/balance_threshold_filter.ts
@@ -8,12 +8,12 @@ import { TransactionReceiptWithDecodedLogs } from 'ethereum-types';
 import * as _ from 'lodash';

 import {
-    artifacts as protocolArtifacts,
+    artifacts as exchangeArtifacts,
    ERC20Wrapper,
    ERC721Wrapper,
    ExchangeContract,
    ExchangeWrapper,
-} from '@0x/contracts-protocol';
+} from '@0x/contracts-exchange';
 import {
    chaiSetup,
    constants,
@@ -134,7 +134,7 @@ describe(ContractName.BalanceThresholdFilter, () => {
        await erc20Wrapper.setBalancesAndAllowancesAsync();
        // Deploy Exchange contract
        exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
+            exchangeArtifacts.Exchange,
            provider,
            txDefaults,
            zrxAssetData,
--- a/contracts/extensions/test/extensions/dutch_auction.ts
+++ b/contracts/extensions/test/extensions/dutch_auction.ts
@@ -1,11 +1,11 @@
 import { DutchAuctionWrapper } from '@0x/contract-wrappers';
 import {
-    artifacts as protocolArtifacts,
+    artifacts as exchangeArtifacts,
    ERC20Wrapper,
    ERC721Wrapper,
    ExchangeContract,
    ExchangeWrapper,
-} from '@0x/contracts-protocol';
+} from '@0x/contracts-exchange';
 import {
    chaiSetup,
    constants,
@@ -98,7 +98,7 @@ describe(ContractName.DutchAuction, () => {

        const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
        const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
+            exchangeArtifacts.Exchange,
            provider,
            txDefaults,
            zrxAssetData,
--- a/contracts/extensions/test/extensions/forwarder.ts
+++ b/contracts/extensions/test/extensions/forwarder.ts
@@ -1,10 +1,10 @@
 import {
-    artifacts as protocolArtifacts,
+    artifacts as exchangeArtifacts,
    ERC20Wrapper,
    ERC721Wrapper,
    ExchangeContract,
    ExchangeWrapper,
-} from '@0x/contracts-protocol';
+} from '@0x/contracts-exchange';
 import {
    chaiSetup,
    constants,
@@ -107,7 +107,7 @@ describe(ContractName.Forwarder, () => {
        wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
        zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
        const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
+            exchangeArtifacts.Exchange,
            provider,
            txDefaults,
            zrxAssetData,
@@ -178,7 +178,7 @@ describe(ContractName.Forwarder, () => {
    describe('constructor', () => {
        it('should revert if assetProxy is unregistered', async () => {
            const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-                protocolArtifacts.Exchange,
+                exchangeArtifacts.Exchange,
                provider,
                txDefaults,
                zrxAssetData,
--- a/contracts/extensions/test/extensions/order_matcher.ts
+++ b/contracts/extensions/test/extensions/order_matcher.ts
@@ -1,12 +1,11 @@
+import { artifacts as proxyArtifacts, ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
 import {
-    artifacts as protocolArtifacts,
-    ERC20ProxyContract,
+    artifacts as exchangeArtifacts,
    ERC20Wrapper,
-    ERC721ProxyContract,
    ExchangeContract,
    ExchangeFillEventArgs,
    ExchangeWrapper,
-} from '@0x/contracts-protocol';
+} from '@0x/contracts-exchange';
 import {
    chaiSetup,
    constants,
@@ -102,13 +101,13 @@ describe('OrderMatcher', () => {
        await erc20Wrapper.setBalancesAndAllowancesAsync();
        // Deploy ERC721 proxy
        erc721Proxy = await ERC721ProxyContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.ERC721Proxy,
+            proxyArtifacts.ERC721Proxy,
            provider,
            txDefaults,
        );
        // Depoy exchange
        exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
+            exchangeArtifacts.Exchange,
            provider,
            txDefaults,
            assetDataUtils.encodeERC20AssetData(zrxToken.address),
@@ -197,7 +196,7 @@ describe('OrderMatcher', () => {
    describe('constructor', () => {
        it('should revert if assetProxy is unregistered', async () => {
            const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-                protocolArtifacts.Exchange,
+                exchangeArtifacts.Exchange,
                provider,
                txDefaults,
                constants.NULL_BYTES,
@@ -451,7 +450,7 @@ describe('OrderMatcher', () => {
                signedOrderLeft.signature,
                signedOrderRight.signature,
            );
-            const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...protocolArtifacts });
+            const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...exchangeArtifacts });
            const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
                await web3Wrapper.sendTransactionAsync({
                    data,
@@ -489,7 +488,7 @@ describe('OrderMatcher', () => {
                signedOrderLeft.signature,
                signedOrderRight.signature,
            );
-            const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...protocolArtifacts });
+            const logDecoder = new LogDecoder(web3Wrapper, { ...artifacts, ...tokenArtifacts, ...exchangeArtifacts });
            const txReceipt = await logDecoder.getTxWithDecodedLogsAsync(
                await web3Wrapper.sendTransactionAsync({
                    data,
--- a/contracts/extensions/test/extensions/order_validator.ts
+++ b/contracts/extensions/test/extensions/order_validator.ts
@@ -1,12 +1,11 @@
+import { ERC20ProxyContract, ERC721ProxyContract } from '@0x/contracts-asset-proxy';
 import {
-    artifacts as protocolArtifacts,
-    ERC20ProxyContract,
+    artifacts as exchangeArtifacts,
    ERC20Wrapper,
-    ERC721ProxyContract,
    ERC721Wrapper,
    ExchangeContract,
    ExchangeWrapper,
-} from '@0x/contracts-protocol';
+} from '@0x/contracts-exchange';
 import {
    chaiSetup,
    constants,
@@ -81,7 +80,7 @@ describe('OrderValidator', () => {

        const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
        exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
+            exchangeArtifacts.Exchange,
            provider,
            txDefaults,
            zrxAssetData,
--- a/contracts/extensions/test/utils/balance_threshold_wrapper.ts
+++ b/contracts/extensions/test/utils/balance_threshold_wrapper.ts
@@ -1,4 +1,4 @@
-import { artifacts as protocolArtifacts, ExchangeContract } from '@0x/contracts-protocol';
+import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-exchange';
 import {
    FillResults,
    formatters,
@@ -36,7 +36,7 @@ export class BalanceThresholdWrapper {
        this._logDecoder = new LogDecoder(this._web3Wrapper, {
            ...artifacts,
            ...tokensArtifacts,
-            ...protocolArtifacts,
+            ...exchangeArtifacts,
        });
    }
    public async fillOrderAsync(
--- a/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts
+++ b/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts
@@ -1,4 +1,4 @@
-import { artifacts as protocolArtifacts } from '@0x/contracts-protocol';
+import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
 import { LogDecoder } from '@0x/contracts-test-utils';
 import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { DutchAuctionDetails, SignedOrder } from '@0x/types';
@@ -20,7 +20,7 @@ export class DutchAuctionTestWrapper {
        this._logDecoder = new LogDecoder(this._web3Wrapper, {
            ...artifacts,
            ...tokensArtifacts,
-            ...protocolArtifacts,
+            ...exchangeArtifacts,
        });
    }
    /**
--- a/contracts/extensions/test/utils/forwarder_wrapper.ts
+++ b/contracts/extensions/test/utils/forwarder_wrapper.ts
@@ -1,4 +1,4 @@
-import { artifacts as protocolArtifacts } from '@0x/contracts-protocol';
+import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
 import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils';
 import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { SignedOrder } from '@0x/types';
@@ -63,7 +63,7 @@ export class ForwarderWrapper {
        this._logDecoder = new LogDecoder(this._web3Wrapper, {
            ...artifacts,
            ...tokensArtifacts,
-            ...protocolArtifacts,
+            ...exchangeArtifacts,
        });
    }
    public async marketSellOrdersWithEthAsync(
--- a/contracts/interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol
+++ b/contracts/interfaces/contracts/protocol/AssetProxy/IAuthorizable.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/Ownable/IOwnable.sol";
+import "@0x/contracts-utils/contracts/utils/interfaces/IOwnable.sol";


 contract IAuthorizable is
--- a/contracts/interfaces/contracts/protocol/Exchange/IExchangeCore.sol
+++ b/contracts/interfaces/contracts/protocol/Exchange/IExchangeCore.sol
@@ -19,8 +19,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";


 contract IExchangeCore {
--- a/contracts/interfaces/contracts/protocol/Exchange/IMatchOrders.sol
+++ b/contracts/interfaces/contracts/protocol/Exchange/IMatchOrders.sol
@@ -18,8 +18,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";


 contract IMatchOrders {
--- a/contracts/interfaces/contracts/protocol/Exchange/IWrapperFunctions.sol
+++ b/contracts/interfaces/contracts/protocol/Exchange/IWrapperFunctions.sol
@@ -19,8 +19,8 @@
 pragma solidity ^0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
-import "@0x/contracts-libs/contracts/libs/LibFillResults.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibFillResults.sol";


 contract IWrapperFunctions {
--- a/contracts/interfaces/package.json
+++ b/contracts/interfaces/package.json
@@ -42,7 +42,7 @@
    },
    "dependencies": {
        "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-libs": "^1.0.6",
+        "@0x/contracts-exchange-libs": "^1.0.6",
        "@0x/contracts-utils": "^1.0.6",
        "@0x/types": "^1.5.2",
        "@0x/typescript-typings": "^3.0.8",
--- a/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
@@ -18,7 +18,7 @@

 pragma solidity 0.4.24;

-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";
 import "../../tokens/ERC20Token/MintableERC20Token.sol";


--- a/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
@@ -19,7 +19,7 @@
 pragma solidity 0.4.24;

 import "../../tokens/ERC721Token/MintableERC721Token.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable/Ownable.sol";
+import "@0x/contracts-utils/contracts/utils/Ownable.sol";


 // solhint-disable no-empty-blocks
--- a/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
+++ b/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
@@ -19,10 +19,10 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;

-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
+import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
 import "../../tokens/ERC20Token/ERC20Token.sol";
 import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-libs/contracts/libs/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";


 // solhint-disable no-unused-vars
--- a/contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol
@@ -18,7 +18,7 @@

 pragma solidity ^0.4.24;

-import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol";
+import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
 import "./UnlimitedAllowanceERC20Token.sol";


--- a/contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol
+++ b/contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol
@@ -20,7 +20,7 @@ pragma solidity ^0.4.24;

 import "./IERC721Token.sol";
 import "./IERC721Receiver.sol";
-import "@0x/contracts-utils/contracts/utils/SafeMath/SafeMath.sol";
+import "@0x/contracts-utils/contracts/utils/SafeMath.sol";


 contract ERC721Token is
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -71,8 +71,7 @@
    "dependencies": {
        "@0x/base-contract": "^3.0.13",
        "@0x/contracts-interfaces": "^1.0.6",
-        "@0x/contracts-libs": "^1.0.6",
-        "@0x/contracts-multisig": "^1.0.6",
+        "@0x/contracts-exchange-libs": "^1.0.6",
        "@0x/contracts-utils": "^1.0.6",
        "@0x/order-utils": "^3.1.2",
        "@0x/types": "^1.5.2",
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -71,7 +71,6 @@
    },
    "dependencies": {
        "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-multisig": "^1.0.6",
        "@0x/order-utils": "^3.1.2",
        "@0x/types": "^1.5.2",
        "@0x/typescript-typings": "^3.0.8",