Move OrderValidator to the protocol package

7 files changed, 3 insertions, 837 deletions

diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json
index 807429976..69d607b3e 100644
--- a/contracts/extensions/compiler.json
+++ b/contracts/extensions/compiler.json
@@ -18,5 +18,5 @@
             }
         }
     },
-    "contracts": ["DutchAuction", "Forwarder", "OrderValidator"]
+    "contracts": ["DutchAuction", "Forwarder"]
 }
diff --git a/contracts/extensions/contracts/OrderValidator/OrderValidator.sol b/contracts/extensions/contracts/OrderValidator/OrderValidator.sol
deleted file mode 100644
index 33dd1326c..000000000
--- a/contracts/extensions/contracts/OrderValidator/OrderValidator.sol
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-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-tokens/contracts/tokens/ERC20Token/IERC20Token.sol";
-import "@0x/contracts-tokens/contracts/tokens/ERC721Token/IERC721Token.sol";
-import "@0x/contracts-utils/contracts/utils/LibBytes/LibBytes.sol";
-
-
-contract OrderValidator {
-
-    using LibBytes for bytes;
-
-    bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
-    bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
-
-    struct TraderInfo {
-        uint256 makerBalance;       // Maker's balance of makerAsset
-        uint256 makerAllowance;     // Maker's allowance to corresponding AssetProxy
-        uint256 takerBalance;       // Taker's balance of takerAsset
-        uint256 takerAllowance;     // Taker's allowance to corresponding AssetProxy
-        uint256 makerZrxBalance;    // Maker's balance of ZRX
-        uint256 makerZrxAllowance;  // Maker's allowance of ZRX to ERC20Proxy
-        uint256 takerZrxBalance;    // Taker's balance of ZRX
-        uint256 takerZrxAllowance;  // Taker's allowance of ZRX to ERC20Proxy
-    }
-
-    // solhint-disable var-name-mixedcase
-    IExchange internal EXCHANGE;
-    bytes internal ZRX_ASSET_DATA;
-    // solhint-enable var-name-mixedcase
-
-    constructor (address _exchange, bytes memory _zrxAssetData)
-        public
-    {
-        EXCHANGE = IExchange(_exchange);
-        ZRX_ASSET_DATA = _zrxAssetData;
-    }
-
-    /// @dev Fetches information for order and maker/taker of order.
-    /// @param order The order structure.
-    /// @param takerAddress Address that will be filling the order.
-    /// @return OrderInfo and TraderInfo instances for given order.
-    function getOrderAndTraderInfo(LibOrder.Order memory order, address takerAddress)
-        public
-        view
-        returns (LibOrder.OrderInfo memory orderInfo, TraderInfo memory traderInfo)
-    {
-        orderInfo = EXCHANGE.getOrderInfo(order);
-        traderInfo = getTraderInfo(order, takerAddress);
-        return (orderInfo, traderInfo);
-    }
-
-    /// @dev Fetches information for all passed in orders and the makers/takers of each order.
-    /// @param orders Array of order specifications.
-    /// @param takerAddresses Array of taker addresses corresponding to each order.
-    /// @return Arrays of OrderInfo and TraderInfo instances that correspond to each order.
-    function getOrdersAndTradersInfo(LibOrder.Order[] memory orders, address[] memory takerAddresses)
-        public
-        view
-        returns (LibOrder.OrderInfo[] memory ordersInfo, TraderInfo[] memory tradersInfo)
-    {
-        ordersInfo = EXCHANGE.getOrdersInfo(orders);
-        tradersInfo = getTradersInfo(orders, takerAddresses);
-        return (ordersInfo, tradersInfo);
-    }
-
-    /// @dev Fetches balance and allowances for maker and taker of order.
-    /// @param order The order structure.
-    /// @param takerAddress Address that will be filling the order.
-    /// @return Balances and allowances of maker and taker of order.
-    function getTraderInfo(LibOrder.Order memory order, address takerAddress)
-        public
-        view
-        returns (TraderInfo memory traderInfo)
-    {
-        (traderInfo.makerBalance, traderInfo.makerAllowance) = getBalanceAndAllowance(order.makerAddress, order.makerAssetData);
-        (traderInfo.takerBalance, traderInfo.takerAllowance) = getBalanceAndAllowance(takerAddress, order.takerAssetData);
-        bytes memory zrxAssetData = ZRX_ASSET_DATA;
-        (traderInfo.makerZrxBalance, traderInfo.makerZrxAllowance) = getBalanceAndAllowance(order.makerAddress, zrxAssetData);
-        (traderInfo.takerZrxBalance, traderInfo.takerZrxAllowance) = getBalanceAndAllowance(takerAddress, zrxAssetData);
-        return traderInfo;
-    }
-
-    /// @dev Fetches balances and allowances of maker and taker for each provided order.
-    /// @param orders Array of order specifications.
-    /// @param takerAddresses Array of taker addresses corresponding to each order.
-    /// @return Array of balances and allowances for maker and taker of each order.
-    function getTradersInfo(LibOrder.Order[] memory orders, address[] memory takerAddresses)
-        public
-        view
-        returns (TraderInfo[] memory)
-    {
-        uint256 ordersLength = orders.length;
-        TraderInfo[] memory tradersInfo = new TraderInfo[](ordersLength);
-        for (uint256 i = 0; i != ordersLength; i++) {
-            tradersInfo[i] = getTraderInfo(orders[i], takerAddresses[i]);
-        }
-        return tradersInfo;
-    }
-
-    /// @dev Fetches token balances and allowances of an address to given assetProxy. Supports ERC20 and ERC721.
-    /// @param target Address to fetch balances and allowances of.
-    /// @param assetData Encoded data that can be decoded by a specified proxy contract when transferring asset.
-    /// @return Balance of asset and allowance set to given proxy of asset.
-    ///         For ERC721 tokens, these values will always be 1 or 0.
-    function getBalanceAndAllowance(address target, bytes memory assetData)
-        public
-        view
-        returns (uint256 balance, uint256 allowance)
-    {
-        bytes4 assetProxyId = assetData.readBytes4(0);
-        address token = assetData.readAddress(16);
-        address assetProxy = EXCHANGE.getAssetProxy(assetProxyId);
-
-        if (assetProxyId == ERC20_DATA_ID) {
-            // Query balance
-            balance = IERC20Token(token).balanceOf(target);
-
-            // Query allowance
-            allowance = IERC20Token(token).allowance(target, assetProxy);
-        } else if (assetProxyId == ERC721_DATA_ID) {
-            uint256 tokenId = assetData.readUint256(36);
-
-            // Query owner of tokenId
-            address owner = getERC721TokenOwner(token, tokenId);
-
-            // Set balance to 1 if tokenId is owned by target
-            balance = target == owner ? 1 : 0;
-
-            // Check if ERC721Proxy is approved to spend tokenId
-            bool isApproved = IERC721Token(token).isApprovedForAll(target, assetProxy);
-            
-            // Set alowance to 1 if ERC721Proxy is approved to spend tokenId
-            allowance = isApproved ? 1 : 0;
-        } else {
-            revert("UNSUPPORTED_ASSET_PROXY");
-        }
-        return (balance, allowance);
-    }
-
-    /// @dev Fetches token balances and allowances of an address for each given assetProxy. Supports ERC20 and ERC721.
-    /// @param target Address to fetch balances and allowances of.
-    /// @param assetData Array of encoded byte arrays that can be decoded by a specified proxy contract when transferring asset.
-    /// @return Balances and allowances of assets.
-    ///         For ERC721 tokens, these values will always be 1 or 0.
-    function getBalancesAndAllowances(address target, bytes[] memory assetData)
-        public
-        view
-        returns (uint256[] memory, uint256[] memory)
-    {
-        uint256 length = assetData.length;
-        uint256[] memory balances = new uint256[](length);
-        uint256[] memory allowances = new uint256[](length);
-        for (uint256 i = 0; i != length; i++) {
-            (balances[i], allowances[i]) = getBalanceAndAllowance(target, assetData[i]);
-        }
-        return (balances, allowances);
-    }
-
-    /// @dev Calls `token.ownerOf(tokenId)`, but returns a null owner instead of reverting on an unowned token.
-    /// @param token Address of ERC721 token.
-    /// @param tokenId The identifier for the specific NFT.
-    /// @return Owner of tokenId or null address if unowned.
-    function getERC721TokenOwner(address token, uint256 tokenId)
-        public
-        view
-        returns (address owner)
-    {
-        assembly {
-            // load free memory pointer
-            let cdStart := mload(64)
-
-            // bytes4(keccak256(ownerOf(uint256))) = 0x6352211e
-            mstore(cdStart, 0x6352211e00000000000000000000000000000000000000000000000000000000)
-            mstore(add(cdStart, 4), tokenId)
-
-            // staticcall `ownerOf(tokenId)`
-            // `ownerOf` will revert if tokenId is not owned
-            let success := staticcall(
-                gas,      // forward all gas
-                token,    // call token contract
-                cdStart,  // start of calldata
-                36,       // length of input is 36 bytes
-                cdStart,  // write output over input
-                32        // size of output is 32 bytes
-            )
-
-            // Success implies that tokenId is owned
-            // Copy owner from return data if successful
-            if success {
-                owner := mload(cdStart)
-            }    
-        }
-
-        // Owner initialized to address(0), no need to modify if call is unsuccessful
-        return owner;
-    }
-}
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 14a7a8ed2..c09f69e43 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -33,7 +33,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "generated-artifacts/@(DutchAuction|Forwarder|OrderValidator).json"
+        "abis": "generated-artifacts/@(DutchAuction|Forwarder).json"
     },
     "repository": {
         "type": "git",
diff --git a/contracts/extensions/src/artifacts/index.ts b/contracts/extensions/src/artifacts/index.ts
index 380bf0497..7588178f0 100644
--- a/contracts/extensions/src/artifacts/index.ts
+++ b/contracts/extensions/src/artifacts/index.ts
@@ -2,10 +2,8 @@ import { ContractArtifact } from 'ethereum-types';
 
 import * as DutchAuction from '../../generated-artifacts/DutchAuction.json';
 import * as Forwarder from '../../generated-artifacts/Forwarder.json';
-import * as OrderValidator from '../../generated-artifacts/OrderValidator.json';
 
 export const artifacts = {
     DutchAuction: DutchAuction as ContractArtifact,
     Forwarder: Forwarder as ContractArtifact,
-    OrderValidator: OrderValidator as ContractArtifact,
 };
diff --git a/contracts/extensions/src/wrappers/index.ts b/contracts/extensions/src/wrappers/index.ts
index 30f74b56e..90880e37f 100644
--- a/contracts/extensions/src/wrappers/index.ts
+++ b/contracts/extensions/src/wrappers/index.ts
@@ -1,3 +1,2 @@
 export * from '../../generated-wrappers/dutch_auction';
 export * from '../../generated-wrappers/forwarder';
-export * from '../../generated-wrappers/order_validator';
diff --git a/contracts/extensions/test/extensions/order_validator.ts b/contracts/extensions/test/extensions/order_validator.ts
deleted file mode 100644
index f0f3b43c7..000000000
--- a/contracts/extensions/test/extensions/order_validator.ts
+++ /dev/null
@@ -1,609 +0,0 @@
-import {
-    artifacts as protocolArtifacts,
-    ERC20ProxyContract,
-    ERC20Wrapper,
-    ERC721ProxyContract,
-    ERC721Wrapper,
-    ExchangeContract,
-    ExchangeWrapper,
-} from '@0x/contracts-protocol';
-import {
-    chaiSetup,
-    constants,
-    OrderFactory,
-    OrderStatus,
-    provider,
-    txDefaults,
-    web3Wrapper,
-} from '@0x/contracts-test-utils';
-import { DummyERC20TokenContract, DummyERC721TokenContract } from '@0x/contracts-tokens';
-import { BlockchainLifecycle } from '@0x/dev-utils';
-import { assetDataUtils, orderHashUtils } from '@0x/order-utils';
-import { SignedOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
-import * as chai from 'chai';
-import * as _ from 'lodash';
-
-import { OrderValidatorContract } from '../../generated-wrappers/order_validator';
-import { artifacts } from '../../src/artifacts';
-
-chaiSetup.configure();
-const expect = chai.expect;
-const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-
-describe('OrderValidator', () => {
-    let makerAddress: string;
-    let owner: string;
-    let takerAddress: string;
-    let erc20AssetData: string;
-    let erc721AssetData: string;
-
-    let erc20Token: DummyERC20TokenContract;
-    let zrxToken: DummyERC20TokenContract;
-    let erc721Token: DummyERC721TokenContract;
-    let exchange: ExchangeContract;
-    let orderValidator: OrderValidatorContract;
-    let erc20Proxy: ERC20ProxyContract;
-    let erc721Proxy: ERC721ProxyContract;
-
-    let signedOrder: SignedOrder;
-    let signedOrder2: SignedOrder;
-    let orderFactory: OrderFactory;
-
-    const tokenId = new BigNumber(123456789);
-    const tokenId2 = new BigNumber(987654321);
-    const ERC721_BALANCE = new BigNumber(1);
-    const ERC721_ALLOWANCE = new BigNumber(1);
-
-    before(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    after(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    before(async () => {
-        const accounts = await web3Wrapper.getAvailableAddressesAsync();
-        const usedAddresses = ([owner, makerAddress, takerAddress] = _.slice(accounts, 0, 3));
-
-        const erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
-        const erc721Wrapper = new ERC721Wrapper(provider, usedAddresses, owner);
-
-        const numDummyErc20ToDeploy = 2;
-        [erc20Token, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
-            numDummyErc20ToDeploy,
-            constants.DUMMY_TOKEN_DECIMALS,
-        );
-        erc20Proxy = await erc20Wrapper.deployProxyAsync();
-
-        [erc721Token] = await erc721Wrapper.deployDummyTokensAsync();
-        erc721Proxy = await erc721Wrapper.deployProxyAsync();
-
-        const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
-        exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            protocolArtifacts.Exchange,
-            provider,
-            txDefaults,
-            zrxAssetData,
-        );
-        const exchangeWrapper = new ExchangeWrapper(exchange, provider);
-        await exchangeWrapper.registerAssetProxyAsync(erc20Proxy.address, owner);
-        await exchangeWrapper.registerAssetProxyAsync(erc721Proxy.address, owner);
-
-        orderValidator = await OrderValidatorContract.deployFrom0xArtifactAsync(
-            artifacts.OrderValidator,
-            provider,
-            txDefaults,
-            exchange.address,
-            zrxAssetData,
-        );
-
-        erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20Token.address);
-        erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, tokenId);
-        const defaultOrderParams = {
-            ...constants.STATIC_ORDER_PARAMS,
-            exchangeAddress: exchange.address,
-            makerAddress,
-            feeRecipientAddress: constants.NULL_ADDRESS,
-            makerAssetData: erc20AssetData,
-            takerAssetData: erc721AssetData,
-        };
-        const privateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(makerAddress)];
-        orderFactory = new OrderFactory(privateKey, defaultOrderParams);
-    });
-
-    beforeEach(async () => {
-        await blockchainLifecycle.startAsync();
-    });
-    afterEach(async () => {
-        await blockchainLifecycle.revertAsync();
-    });
-
-    describe('getBalanceAndAllowance', () => {
-        describe('getERC721TokenOwner', async () => {
-            it('should return the null address when tokenId is not owned', async () => {
-                const tokenOwner = await orderValidator.getERC721TokenOwner.callAsync(makerAddress, tokenId);
-                expect(tokenOwner).to.be.equal(constants.NULL_ADDRESS);
-            });
-            it('should return the owner address when tokenId is owned', async () => {
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc721Token.mint.sendTransactionAsync(makerAddress, tokenId),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                const tokenOwner = await orderValidator.getERC721TokenOwner.callAsync(erc721Token.address, tokenId);
-                expect(tokenOwner).to.be.equal(makerAddress);
-            });
-        });
-        describe('ERC20 assetData', () => {
-            it('should return the correct balances and allowances when both values are 0', async () => {
-                const [newBalance, newAllowance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc20AssetData,
-                );
-                expect(constants.ZERO_AMOUNT).to.be.bignumber.equal(newBalance);
-                expect(constants.ZERO_AMOUNT).to.be.bignumber.equal(newAllowance);
-            });
-            it('should return the correct balance and allowance when both values are non-zero', async () => {
-                const balance = new BigNumber(123);
-                const allowance = new BigNumber(456);
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc20Token.setBalance.sendTransactionAsync(makerAddress, balance),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc20Token.approve.sendTransactionAsync(erc20Proxy.address, allowance, {
-                        from: makerAddress,
-                    }),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                const [newBalance, newAllowance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc20AssetData,
-                );
-                expect(balance).to.be.bignumber.equal(newBalance);
-                expect(allowance).to.be.bignumber.equal(newAllowance);
-            });
-        });
-        describe('ERC721 assetData', () => {
-            it('should return a balance of 0 when the tokenId is not owned by target', async () => {
-                const [newBalance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc721AssetData,
-                );
-                expect(newBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            });
-            it('should return an allowance of 0 when no approval is set', async () => {
-                const [, newAllowance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc721AssetData,
-                );
-                expect(newAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            });
-            it('should return a balance of 1 when the tokenId is owned by target', async () => {
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc721Token.mint.sendTransactionAsync(makerAddress, tokenId),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                const [newBalance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc721AssetData,
-                );
-                expect(newBalance).to.be.bignumber.equal(ERC721_BALANCE);
-            });
-            it('should return an allowance of 1 when ERC721Proxy is approved for all', async () => {
-                const isApproved = true;
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, isApproved, {
-                        from: makerAddress,
-                    }),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                const [, newAllowance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc721AssetData,
-                );
-                expect(newAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            });
-            it('should return an allowance of 0 when ERC721Proxy is approved for specific tokenId', async () => {
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc721Token.mint.sendTransactionAsync(makerAddress, tokenId),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await erc721Token.approve.sendTransactionAsync(erc721Proxy.address, tokenId, {
-                        from: makerAddress,
-                    }),
-                    constants.AWAIT_TRANSACTION_MINED_MS,
-                );
-                const [, newAllowance] = await orderValidator.getBalanceAndAllowance.callAsync(
-                    makerAddress,
-                    erc721AssetData,
-                );
-                expect(newAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            });
-        });
-    });
-    describe('getBalancesAndAllowances', () => {
-        it('should return the correct balances and allowances when all values are 0', async () => {
-            const [
-                [erc20Balance, erc721Balance],
-                [erc20Allowance, erc721Allowance],
-            ] = await orderValidator.getBalancesAndAllowances.callAsync(makerAddress, [
-                erc20AssetData,
-                erc721AssetData,
-            ]);
-            expect(erc20Balance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(erc721Balance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(erc20Allowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(erc721Allowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-        });
-        it('should return the correct balances and allowances when balances and allowances are non-zero', async () => {
-            const balance = new BigNumber(123);
-            const allowance = new BigNumber(456);
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.setBalance.sendTransactionAsync(makerAddress, balance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.approve.sendTransactionAsync(erc20Proxy.address, allowance, {
-                    from: makerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.mint.sendTransactionAsync(makerAddress, tokenId),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const isApproved = true;
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, isApproved, {
-                    from: makerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const [
-                [erc20Balance, erc721Balance],
-                [erc20Allowance, erc721Allowance],
-            ] = await orderValidator.getBalancesAndAllowances.callAsync(makerAddress, [
-                erc20AssetData,
-                erc721AssetData,
-            ]);
-            expect(erc20Balance).to.be.bignumber.equal(balance);
-            expect(erc721Balance).to.be.bignumber.equal(ERC721_BALANCE);
-            expect(erc20Allowance).to.be.bignumber.equal(allowance);
-            expect(erc721Allowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-        });
-    });
-    describe('getTraderInfo', () => {
-        beforeEach(async () => {
-            signedOrder = await orderFactory.newSignedOrderAsync();
-        });
-        it('should return the correct info when no balances or allowances are set', async () => {
-            const traderInfo = await orderValidator.getTraderInfo.callAsync(signedOrder, takerAddress);
-            expect(traderInfo.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-        });
-        it('should return the correct info when balances and allowances are set', async () => {
-            const makerBalance = new BigNumber(123);
-            const makerAllowance = new BigNumber(456);
-            const makerZrxBalance = new BigNumber(789);
-            const takerZrxAllowance = new BigNumber(987);
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.setBalance.sendTransactionAsync(makerAddress, makerBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.approve.sendTransactionAsync(erc20Proxy.address, makerAllowance, {
-                    from: makerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.setBalance.sendTransactionAsync(makerAddress, makerZrxBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.approve.sendTransactionAsync(erc20Proxy.address, takerZrxAllowance, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.mint.sendTransactionAsync(takerAddress, tokenId),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const isApproved = true;
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, isApproved, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const traderInfo = await orderValidator.getTraderInfo.callAsync(signedOrder, takerAddress);
-            expect(traderInfo.makerBalance).to.be.bignumber.equal(makerBalance);
-            expect(traderInfo.makerAllowance).to.be.bignumber.equal(makerAllowance);
-            expect(traderInfo.takerBalance).to.be.bignumber.equal(ERC721_BALANCE);
-            expect(traderInfo.takerAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            expect(traderInfo.makerZrxBalance).to.be.bignumber.equal(makerZrxBalance);
-            expect(traderInfo.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxAllowance).to.be.bignumber.equal(takerZrxAllowance);
-        });
-    });
-    describe('getTradersInfo', () => {
-        beforeEach(async () => {
-            signedOrder = await orderFactory.newSignedOrderAsync();
-            signedOrder2 = await orderFactory.newSignedOrderAsync({
-                takerAssetData: assetDataUtils.encodeERC721AssetData(erc721Token.address, tokenId2),
-            });
-        });
-        it('should return the correct info when no balances or allowances have been set', async () => {
-            const orders = [signedOrder, signedOrder2];
-            const takers = [takerAddress, takerAddress];
-            const [traderInfo1, traderInfo2] = await orderValidator.getTradersInfo.callAsync(orders, takers);
-            expect(traderInfo1.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-        });
-        it('should return the correct info when balances and allowances are set', async () => {
-            const makerBalance = new BigNumber(123);
-            const makerAllowance = new BigNumber(456);
-            const makerZrxBalance = new BigNumber(789);
-            const takerZrxAllowance = new BigNumber(987);
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.setBalance.sendTransactionAsync(makerAddress, makerBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.approve.sendTransactionAsync(erc20Proxy.address, makerAllowance, {
-                    from: makerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.setBalance.sendTransactionAsync(makerAddress, makerZrxBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.approve.sendTransactionAsync(erc20Proxy.address, takerZrxAllowance, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const isApproved = true;
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, isApproved, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.mint.sendTransactionAsync(takerAddress, tokenId2),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const orders = [signedOrder, signedOrder2];
-            const takers = [takerAddress, takerAddress];
-            const [traderInfo1, traderInfo2] = await orderValidator.getTradersInfo.callAsync(orders, takers);
-
-            expect(traderInfo1.makerBalance).to.be.bignumber.equal(makerBalance);
-            expect(traderInfo1.makerAllowance).to.be.bignumber.equal(makerAllowance);
-            expect(traderInfo1.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            expect(traderInfo1.makerZrxBalance).to.be.bignumber.equal(makerZrxBalance);
-            expect(traderInfo1.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxAllowance).to.be.bignumber.equal(takerZrxAllowance);
-            expect(traderInfo2.makerBalance).to.be.bignumber.equal(makerBalance);
-            expect(traderInfo2.makerAllowance).to.be.bignumber.equal(makerAllowance);
-            expect(traderInfo2.takerBalance).to.be.bignumber.equal(ERC721_BALANCE);
-            expect(traderInfo2.takerAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            expect(traderInfo2.makerZrxBalance).to.be.bignumber.equal(makerZrxBalance);
-            expect(traderInfo2.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxAllowance).to.be.bignumber.equal(takerZrxAllowance);
-        });
-    });
-    describe('getOrderAndTraderInfo', () => {
-        beforeEach(async () => {
-            signedOrder = await orderFactory.newSignedOrderAsync();
-        });
-        it('should return the correct info when no balances or allowances are set', async () => {
-            const [orderInfo, traderInfo] = await orderValidator.getOrderAndTraderInfo.callAsync(
-                signedOrder,
-                takerAddress,
-            );
-            const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
-            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
-            expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
-            expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-        });
-        it('should return the correct info when balances and allowances are set', async () => {
-            const makerBalance = new BigNumber(123);
-            const makerAllowance = new BigNumber(456);
-            const makerZrxBalance = new BigNumber(789);
-            const takerZrxAllowance = new BigNumber(987);
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.setBalance.sendTransactionAsync(makerAddress, makerBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.approve.sendTransactionAsync(erc20Proxy.address, makerAllowance, {
-                    from: makerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.setBalance.sendTransactionAsync(makerAddress, makerZrxBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.approve.sendTransactionAsync(erc20Proxy.address, takerZrxAllowance, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.mint.sendTransactionAsync(takerAddress, tokenId),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const isApproved = true;
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, isApproved, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const [orderInfo, traderInfo] = await orderValidator.getOrderAndTraderInfo.callAsync(
-                signedOrder,
-                takerAddress,
-            );
-            const expectedOrderHash = orderHashUtils.getOrderHashHex(signedOrder);
-            expect(orderInfo.orderStatus).to.be.equal(OrderStatus.FILLABLE);
-            expect(orderInfo.orderHash).to.be.equal(expectedOrderHash);
-            expect(orderInfo.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.makerBalance).to.be.bignumber.equal(makerBalance);
-            expect(traderInfo.makerAllowance).to.be.bignumber.equal(makerAllowance);
-            expect(traderInfo.takerBalance).to.be.bignumber.equal(ERC721_BALANCE);
-            expect(traderInfo.takerAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            expect(traderInfo.makerZrxBalance).to.be.bignumber.equal(makerZrxBalance);
-            expect(traderInfo.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo.takerZrxAllowance).to.be.bignumber.equal(takerZrxAllowance);
-        });
-    });
-    describe('getOrdersAndTradersInfo', () => {
-        beforeEach(async () => {
-            signedOrder = await orderFactory.newSignedOrderAsync();
-            signedOrder2 = await orderFactory.newSignedOrderAsync({
-                takerAssetData: assetDataUtils.encodeERC721AssetData(erc721Token.address, tokenId2),
-            });
-        });
-        it('should return the correct info when no balances or allowances have been set', async () => {
-            const orders = [signedOrder, signedOrder2];
-            const takers = [takerAddress, takerAddress];
-            const [
-                [orderInfo1, orderInfo2],
-                [traderInfo1, traderInfo2],
-            ] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
-            const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
-            const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
-            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
-            expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
-            expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
-            expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
-            expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-        });
-        it('should return the correct info when balances and allowances are set', async () => {
-            const makerBalance = new BigNumber(123);
-            const makerAllowance = new BigNumber(456);
-            const makerZrxBalance = new BigNumber(789);
-            const takerZrxAllowance = new BigNumber(987);
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.setBalance.sendTransactionAsync(makerAddress, makerBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc20Token.approve.sendTransactionAsync(erc20Proxy.address, makerAllowance, {
-                    from: makerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.setBalance.sendTransactionAsync(makerAddress, makerZrxBalance),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await zrxToken.approve.sendTransactionAsync(erc20Proxy.address, takerZrxAllowance, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const isApproved = true;
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.setApprovalForAll.sendTransactionAsync(erc721Proxy.address, isApproved, {
-                    from: takerAddress,
-                }),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await erc721Token.mint.sendTransactionAsync(takerAddress, tokenId2),
-                constants.AWAIT_TRANSACTION_MINED_MS,
-            );
-            const orders = [signedOrder, signedOrder2];
-            const takers = [takerAddress, takerAddress];
-            const [
-                [orderInfo1, orderInfo2],
-                [traderInfo1, traderInfo2],
-            ] = await orderValidator.getOrdersAndTradersInfo.callAsync(orders, takers);
-            const expectedOrderHash1 = orderHashUtils.getOrderHashHex(signedOrder);
-            const expectedOrderHash2 = orderHashUtils.getOrderHashHex(signedOrder2);
-            expect(orderInfo1.orderStatus).to.be.equal(OrderStatus.FILLABLE);
-            expect(orderInfo1.orderHash).to.be.equal(expectedOrderHash1);
-            expect(orderInfo1.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(orderInfo2.orderStatus).to.be.equal(OrderStatus.FILLABLE);
-            expect(orderInfo2.orderHash).to.be.equal(expectedOrderHash2);
-            expect(orderInfo2.orderTakerAssetFilledAmount).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.makerBalance).to.be.bignumber.equal(makerBalance);
-            expect(traderInfo1.makerAllowance).to.be.bignumber.equal(makerAllowance);
-            expect(traderInfo1.takerBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            expect(traderInfo1.makerZrxBalance).to.be.bignumber.equal(makerZrxBalance);
-            expect(traderInfo1.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo1.takerZrxAllowance).to.be.bignumber.equal(takerZrxAllowance);
-            expect(traderInfo2.makerBalance).to.be.bignumber.equal(makerBalance);
-            expect(traderInfo2.makerAllowance).to.be.bignumber.equal(makerAllowance);
-            expect(traderInfo2.takerBalance).to.be.bignumber.equal(ERC721_BALANCE);
-            expect(traderInfo2.takerAllowance).to.be.bignumber.equal(ERC721_ALLOWANCE);
-            expect(traderInfo2.makerZrxBalance).to.be.bignumber.equal(makerZrxBalance);
-            expect(traderInfo2.makerZrxAllowance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxBalance).to.be.bignumber.equal(constants.ZERO_AMOUNT);
-            expect(traderInfo2.takerZrxAllowance).to.be.bignumber.equal(takerZrxAllowance);
-        });
-    });
-});
-// tslint:disable:max-file-line-count
diff --git a/contracts/extensions/tsconfig.json b/contracts/extensions/tsconfig.json
index c894eb367..a4ce1e002 100644
--- a/contracts/extensions/tsconfig.json
+++ b/contracts/extensions/tsconfig.json
@@ -6,10 +6,6 @@
         "resolveJsonModule": true
     },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
-    "files": [
-        "./generated-artifacts/DutchAuction.json",
-        "./generated-artifacts/Forwarder.json",
-        "./generated-artifacts/OrderValidator.json"
-    ],
+    "files": ["./generated-artifacts/DutchAuction.json", "./generated-artifacts/Forwarder.json"],
     "exclude": ["./deploy/solc/solc_bin"]
 }