Merge pull request #1827 from 0xProject/feat/3.0/cancelOrdersNothrow

Implement `cancelOrderNoThrow` and `batchCancelOrdersNoThrow`
0xProject · May 21, 2019 · 10d3539 · 10d3539
2 parents 2a28fcc + 1e7e566
commit 10d3539
Show file tree

Hide file tree

Showing 13 changed files with 169 additions and 262 deletions.
diff --git a/contracts/erc20/contracts/test/UntransferrableDummyERC20Token.sol b/contracts/erc20/contracts/test/UntransferrableDummyERC20Token.sol
@@ -22,6 +22,7 @@ import "./DummyERC20Token.sol";
 
 
 // solhint-disable no-empty-blocks
+// solhint-disable no-unused-vars
 contract UntransferrableDummyERC20Token is
     DummyERC20Token
 {

diff --git a/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol b/contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
@@ -21,17 +21,17 @@ pragma experimental ABIEncoderV2;
 
 import "./libs/LibConstants.sol";
 import "./mixins/MExchangeWrapper.sol";
-import "@0x/contracts-exchange-libs/contracts/src/LibAbiEncoder.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
 
 
 contract MixinExchangeWrapper is
-    LibAbiEncoder,
     LibFillResults,
     LibMath,
     LibConstants,
+    LibExchangeSelectors,
     MExchangeWrapper
 {
     /// @dev Fills the input order.
@@ -49,7 +49,8 @@ contract MixinExchangeWrapper is
         returns (FillResults memory fillResults)
     {
         // ABI encode calldata for `fillOrder`
-        bytes memory fillOrderCalldata = _abiEncodeFillOrder(
+        bytes memory fillOrderCalldata = abi.encodeWithSelector(
+            FILL_ORDER_SELECTOR,
             order,
             takerAssetFillAmount,
             signature

diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json
@@ -23,7 +23,6 @@
         }
     },
     "contracts": [
-        "src/LibAbiEncoder.sol",
         "src/LibConstants.sol",
         "src/LibEIP712ExchangeDomain.sol",
         "src/LibFillResults.sol",

diff --git a/contracts/exchange-libs/contracts/src/LibAbiEncoder.sol b/contracts/exchange-libs/contracts/src/LibAbiEncoder.sol
diff --git a/contracts/exchange-libs/contracts/test/TestLibs.sol b/contracts/exchange-libs/contracts/test/TestLibs.sol
@@ -23,39 +23,20 @@ import "../src/LibEIP712ExchangeDomain.sol";
 import "../src/LibMath.sol";
 import "../src/LibOrder.sol";
 import "../src/LibFillResults.sol";
-import "../src/LibAbiEncoder.sol";
 
 
 // solhint-disable no-empty-blocks
 contract TestLibs is
     LibEIP712ExchangeDomain,
     LibMath,
     LibOrder,
-    LibFillResults,
-    LibAbiEncoder
+    LibFillResults
 {
     constructor (uint256 chainId)
         public
         LibEIP712ExchangeDomain(chainId, address(0))
     {}
 
-    function abiEncodeFillOrder(
-        Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        pure
-        returns (bytes memory fillOrderCalldata)
-    {
-        fillOrderCalldata = _abiEncodeFillOrder(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-        return fillOrderCalldata;
-    }
-
     function getPartialAmountFloor(
         uint256 numerator,
         uint256 denominator,

diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json
@@ -34,7 +34,7 @@
         "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol"
     },
     "config": {
-        "abis": "./generated-artifacts/@(LibAbiEncoder|LibAssetProxyErrors|LibConstants|LibEIP712ExchangeDomain|LibFillResults|LibMath|LibOrder|LibZeroExTransaction|TestLibs).json",
+        "abis": "./generated-artifacts/@(LibAssetProxyErrors|LibConstants|LibEIP712ExchangeDomain|LibFillResults|LibMath|LibOrder|LibZeroExTransaction|TestLibs).json",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
     },
     "repository": {

diff --git a/contracts/exchange-libs/src/artifacts.ts b/contracts/exchange-libs/src/artifacts.ts
@@ -5,7 +5,6 @@
  */
 import { ContractArtifact } from 'ethereum-types';
 
-import * as LibAbiEncoder from '../generated-artifacts/LibAbiEncoder.json';
 import * as LibConstants from '../generated-artifacts/LibConstants.json';
 import * as LibEIP712ExchangeDomain from '../generated-artifacts/LibEIP712ExchangeDomain.json';
 import * as LibFillResults from '../generated-artifacts/LibFillResults.json';
@@ -14,7 +13,6 @@ import * as LibOrder from '../generated-artifacts/LibOrder.json';
 import * as LibZeroExTransaction from '../generated-artifacts/LibZeroExTransaction.json';
 import * as TestLibs from '../generated-artifacts/TestLibs.json';
 export const artifacts = {
-    LibAbiEncoder: LibAbiEncoder as ContractArtifact,
     LibConstants: LibConstants as ContractArtifact,
     LibFillResults: LibFillResults as ContractArtifact,
     LibMath: LibMath as ContractArtifact,

diff --git a/contracts/exchange-libs/src/wrappers.ts b/contracts/exchange-libs/src/wrappers.ts
@@ -3,7 +3,6 @@
  * Warning: This file is auto-generated by contracts-gen. Don't edit manually.
  * -----------------------------------------------------------------------------
  */
-export * from '../generated-wrappers/lib_abi_encoder';
 export * from '../generated-wrappers/lib_constants';
 export * from '../generated-wrappers/lib_e_i_p712_exchange_domain';
 export * from '../generated-wrappers/lib_fill_results';

diff --git a/contracts/exchange-libs/tsconfig.json b/contracts/exchange-libs/tsconfig.json
@@ -3,7 +3,6 @@
     "compilerOptions": { "outDir": "lib", "rootDir": ".", "resolveJsonModule": true },
     "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"],
     "files": [
-        "generated-artifacts/LibAbiEncoder.json",
         "generated-artifacts/LibConstants.json",
         "generated-artifacts/LibEIP712ExchangeDomain.json",
         "generated-artifacts/LibFillResults.json",