Refactor library usage

.circleci/config.yml

@@ -90,13 +90,15 @@ jobs:
             - restore_cache:
                   keys:
                       - repo-{{ .Environment.CIRCLE_SHA1 }}
-            - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-coordinator @0x/contracts-dev-utils @0x/contracts-staking
+            - run: yarn wsrun test:circleci @0x/contracts-multisig @0x/contracts-utils @0x/contracts-exchange-libs @0x/contracts-erc20 @0x/contracts-erc721 @0x/contracts-erc1155 @0x/contracts-asset-proxy @0x/contracts-exchange @0x/contracts-dev-utils @0x/contracts-staking
             # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
             # - run: yarn wsrun test:circleci @0x/contracts-extensions
             # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
             # - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder
             # TODO(dorothy-zbornak): Re-enable after this package is complete.
             # - run: yarn wsrun test:circleci @0x/contracts-staking
+            # TODO(abandeali): Re-enable after this package is complete.
+            # - run: yarn wsrun test:circleci @0x/contracts-coordinator
     test-contracts-geth:
         docker:
             - image: circleci/node:9-browsers

contracts/asset-proxy/compiler.json

@@ -22,17 +22,5 @@
                 ]
             }
         }
-    },
-    "contracts": [
-        "archive/MixinAuthorizable.sol",
-        "src/ERC1155Proxy.sol",
-        "src/ERC20Proxy.sol",
-        "src/ERC721Proxy.sol",
-        "src/MultiAssetProxy.sol",
-        "src/StaticCallProxy.sol",
-        "src/interfaces/IAssetData.sol",
-        "src/interfaces/IAssetProxy.sol",
-        "src/interfaces/IAuthorizable.sol",
-        "test/TestStaticCallTarget.sol"
-    ]
+    }
 }

contracts/asset-proxy/package.json

@@ -12,7 +12,7 @@
     "scripts": {
         "build": "yarn pre_build && tsc -b",
         "build:ci": "yarn build",
-        "pre_build": "run-s compile generate_contract_wrappers",
+        "pre_build": "run-s compile contracts:gen generate_contract_wrappers",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
@@ -34,7 +34,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAuthorizable|MixinAuthorizable|MultiAssetProxy|StaticCallProxy|TestStaticCallTarget).json",
+        "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestStaticCallTarget).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

contracts/asset-proxy/src/artifacts.ts

@@ -10,20 +10,26 @@ import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json';
 import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json';
 import * as IAssetData from '../generated-artifacts/IAssetData.json';
 import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json';
+import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispatcher.json';
 import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json';
+import * as MixinAssetProxyDispatcher from '../generated-artifacts/MixinAssetProxyDispatcher.json';
 import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json';
 import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json';
+import * as Ownable from '../generated-artifacts/Ownable.json';
 import * as StaticCallProxy from '../generated-artifacts/StaticCallProxy.json';
 import * as TestStaticCallTarget from '../generated-artifacts/TestStaticCallTarget.json';
 export const artifacts = {
+    MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact,
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    Ownable: Ownable as ContractArtifact,
     ERC1155Proxy: ERC1155Proxy as ContractArtifact,
     ERC20Proxy: ERC20Proxy as ContractArtifact,
     ERC721Proxy: ERC721Proxy as ContractArtifact,
-    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
     MultiAssetProxy: MultiAssetProxy as ContractArtifact,
     StaticCallProxy: StaticCallProxy as ContractArtifact,
     IAssetData: IAssetData as ContractArtifact,
     IAssetProxy: IAssetProxy as ContractArtifact,
+    IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,
     IAuthorizable: IAuthorizable as ContractArtifact,
     TestStaticCallTarget: TestStaticCallTarget as ContractArtifact,
 };

contracts/asset-proxy/src/wrappers.ts

@@ -8,8 +8,11 @@ export * from '../generated-wrappers/erc20_proxy';
 export * from '../generated-wrappers/erc721_proxy';
 export * from '../generated-wrappers/i_asset_data';
 export * from '../generated-wrappers/i_asset_proxy';
+export * from '../generated-wrappers/i_asset_proxy_dispatcher';
 export * from '../generated-wrappers/i_authorizable';
+export * from '../generated-wrappers/mixin_asset_proxy_dispatcher';
 export * from '../generated-wrappers/mixin_authorizable';
 export * from '../generated-wrappers/multi_asset_proxy';
+export * from '../generated-wrappers/ownable';
 export * from '../generated-wrappers/static_call_proxy';
 export * from '../generated-wrappers/test_static_call_target';

contracts/asset-proxy/tsconfig.json

@@ -8,9 +8,12 @@
         "generated-artifacts/ERC721Proxy.json",
         "generated-artifacts/IAssetData.json",
         "generated-artifacts/IAssetProxy.json",
+        "generated-artifacts/IAssetProxyDispatcher.json",
         "generated-artifacts/IAuthorizable.json",
+        "generated-artifacts/MixinAssetProxyDispatcher.json",
         "generated-artifacts/MixinAuthorizable.json",
         "generated-artifacts/MultiAssetProxy.json",
+        "generated-artifacts/Ownable.json",
         "generated-artifacts/StaticCallProxy.json",
         "generated-artifacts/TestStaticCallTarget.json"
     ],

contracts/coordinator/compiler.json

@@ -21,6 +21,5 @@
                 ]
             }
         }
-    },
-    "contracts": ["src/Coordinator.sol", "src/registry/CoordinatorRegistry.sol"]
+    }
 }

contracts/coordinator/contracts/src/MixinCoordinatorApprovalVerifier.sol

@@ -19,19 +19,18 @@
 pragma solidity ^0.5.9;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 import "@0x/contracts-utils/contracts/src/LibAddressArray.sol";
+import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
 import "./libs/LibCoordinatorApproval.sol";
 import "./interfaces/ISignatureValidator.sol";
 import "./interfaces/ICoordinatorApprovalVerifier.sol";
 
 
 // solhint-disable avoid-tx-origin
 contract MixinCoordinatorApprovalVerifier is
-    LibExchangeSelectors,
     LibCoordinatorApproval,
     LibZeroExTransaction,
     ISignatureValidator,
@@ -84,9 +83,9 @@ contract MixinCoordinatorApprovalVerifier is
     {
         bytes4 selector = data.readBytes4(0);
         if (
-            selector == FILL_ORDER_SELECTOR ||
-            selector == FILL_ORDER_NO_THROW_SELECTOR ||
-            selector == FILL_OR_KILL_ORDER_SELECTOR
+            selector == IExchange(address(0)).fillOrder.selector ||
+            selector == IExchange(address(0)).fillOrderNoThrow.selector ||
+            selector == IExchange(address(0)).fillOrKillOrder.selector
         ) {
             // Decode single order
             (LibOrder.Order memory order) = abi.decode(
@@ -96,19 +95,19 @@ contract MixinCoordinatorApprovalVerifier is
             orders = new LibOrder.Order[](1);
             orders[0] = order;
         } else if (
-            selector == BATCH_FILL_ORDERS_SELECTOR ||
-            selector == BATCH_FILL_ORDERS_NO_THROW_SELECTOR ||
-            selector == BATCH_FILL_OR_KILL_ORDERS_SELECTOR ||
-            selector == MARKET_BUY_ORDERS_SELECTOR ||
-            selector == MARKET_SELL_ORDERS_SELECTOR
+            selector == IExchange(address(0)).batchFillOrders.selector ||
+            selector == IExchange(address(0)).batchFillOrdersNoThrow.selector ||
+            selector == IExchange(address(0)).batchFillOrKillOrders.selector ||
+            selector == IExchange(address(0)).marketBuyOrders.selector ||
+            selector == IExchange(address(0)).marketSellOrders.selector
         ) {
             // Decode all orders
             // solhint-disable indent
             (orders) = abi.decode(
                 data.slice(4, data.length),
                 (LibOrder.Order[])
             );
-        } else if (selector == MATCH_ORDERS_SELECTOR) {
+        } else if (selector == IExchange(address(0)).matchOrders.selector) {
             // Decode left and right orders
             (LibOrder.Order memory leftOrder, LibOrder.Order memory rightOrder) = abi.decode(
                 data.slice(4, data.length),

contracts/coordinator/contracts/src/libs/LibCoordinatorApproval.sol

@@ -34,7 +34,7 @@ contract LibCoordinatorApproval is
     //     "uint256 approvalExpirationTimeSeconds",
     //     ")"
     // ));
-    bytes32 constant internal EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH = 0x2fbcdbaa76bc7589916958ae919dfbef04d23f6bbf26de6ff317b32c6cc01e05;
+    bytes32 constant public EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH = 0x2fbcdbaa76bc7589916958ae919dfbef04d23f6bbf26de6ff317b32c6cc01e05;
 
     struct CoordinatorApproval {
         address txOrigin;                       // Required signer of Ethereum transaction that is submitting approval.

contracts/coordinator/package.json

@@ -12,7 +12,7 @@
     "scripts": {
         "build": "yarn pre_build && tsc -b",
         "build:ci": "yarn build",
-        "pre_build": "run-s compile generate_contract_wrappers",
+        "pre_build": "run-s compile contracts:gen generate_contract_wrappers",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",

contracts/dev-utils/compiler.json

@@ -22,12 +22,5 @@
                 ]
             }
         }
-    },
-    "contracts": [
-        "src/DevUtils.sol",
-        "src/EthBalanceChecker.sol",
-        "src/LibAssetData.sol",
-        "src/LibTransactionDecoder.sol",
-        "src/OrderTransferSimulationUtils.sol"
-    ]
+    }
 }