@0x/contracts-exchange: Fix linearization issues.

contracts/exchange/contracts/src/Exchange.sol

@@ -26,7 +26,7 @@ import "./MixinTransferSimulator.sol";
 
 
 // solhint-disable no-empty-blocks
-// MixinAssetProxyDispatcher, MixinExchangeCore, MixinExchangeRichErrors, 
+// MixinAssetProxyDispatcher, MixinExchangeCore, MixinExchangeRichErrors,
 // and MixinTransactions are all inherited via the other Mixins that are
 // used.
 contract Exchange is

contracts/exchange/contracts/src/MixinExchangeCore.sol

@@ -18,27 +18,23 @@
 pragma solidity ^0.5.9;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
 import "@0x/contracts-utils/contracts/src/LibBytes.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.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/LibOrder.sol";
 import "./interfaces/IExchangeCore.sol";
 import "./MixinAssetProxyDispatcher.sol";
-import "./MixinExchangeRichErrors.sol";
-import "./MixinCommon.sol";
+import "./MixinSignatureValidator.sol";
 
 
 contract MixinExchangeCore is
     IExchangeCore,
     LibExchangeSelectors,
     LibMath,
     LibFillResults,
-    LibOrder,
-    ReentrancyGuard,
-    MixinCommon,
-    MixinAssetProxyDispatcher
+    MixinAssetProxyDispatcher,
+    MixinSignatureValidator
 {
     using LibBytes for bytes;
 

contracts/exchange/contracts/src/MixinSignatureValidator.sol

@@ -28,17 +28,17 @@ import "./interfaces/IWallet.sol";
 import "./interfaces/IEIP1271Wallet.sol";
 import "./interfaces/ISignatureValidator.sol";
 import "./MixinExchangeRichErrors.sol";
-import "./MixinCommon.sol";
+import "./MixinTransactions.sol";
 
 
 contract MixinSignatureValidator is
-    ISignatureValidator,
+    MixinExchangeRichErrors,
+    ReentrancyGuard,
+    LibEIP1271,
     LibOrder,
     LibZeroExTransaction,
-    LibEIP1271,
-    ReentrancyGuard,
-    MixinCommon,
-    MixinExchangeRichErrors
+    ISignatureValidator,
+    MixinTransactions
 {
     using LibBytes for bytes;
 

contracts/exchange/contracts/src/MixinTransactions.sol

@@ -21,15 +21,15 @@ pragma experimental ABIEncoderV2;
 
 import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
 import "./interfaces/ITransactions.sol";
+import "./interfaces/ISignatureValidator.sol";
 import "./MixinExchangeRichErrors.sol";
-import "./MixinSignatureValidator.sol";
 
 
 contract MixinTransactions is
-    ITransactions,
-    LibZeroExTransaction,
     MixinExchangeRichErrors,
-    MixinSignatureValidator
+    LibZeroExTransaction,
+    ISignatureValidator,
+    ITransactions
 {
     // Mapping of transaction hash => executed
     // This prevents transactions from being executed more than once.

contracts/exchange/contracts/src/interfaces/ISignatureValidator.sol

@@ -112,4 +112,26 @@ contract ISignatureValidator {
         public
         pure
         returns (bool needsRegularValidation);
+
+    // Defined in MixinSignatureValidator
+    function _isValidOrderWithHashSignature(
+        LibOrder.Order memory order,
+        bytes32 orderHash,
+        address signerAddress,
+        bytes memory signature
+    )
+        internal
+        view
+        returns (bool isValid);
+
+    // Defined in MixinSignatureValidator
+    function _isValidTransactionWithHashSignature(
+        LibZeroExTransaction.ZeroExTransaction memory transaction,
+        bytes32 transactionHash,
+        address signerAddress,
+        bytes memory signature
+    )
+        internal
+        view
+        returns (bool isValid);
 }

contracts/exchange/contracts/src/interfaces/ITransactions.sol

@@ -48,4 +48,14 @@ contract ITransactions {
     )
         public
         returns (bytes[] memory);
+
+    /// @dev The current function will be called in the context of this address (either 0x transaction signer or `msg.sender`).
+    ///      If calling a fill function, this address will represent the taker.
+    ///      If calling a cancel function, this address will represent the maker.
+    /// @return Signer of 0x transaction if entry point is `executeTransaction`.
+    ///         `msg.sender` if entry point is any other function.
+    function _getCurrentContextAddress()
+        internal
+        view
+        returns (address);
 }

contracts/exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol

@@ -89,23 +89,6 @@ contract LibExchangeRichErrorDecoder is
         validatorAddress = _readErrorParameterAsAddress(encoded, 1);
     }
 
-    /// @dev Decompose an ABI-encoded SignatureOrderValidatorNotApprovedError.
-    /// @param encoded ABI-encoded revert error.
-    /// @return signerAddress The expected signer of the hash.
-    /// @return validatorAddress The expected validator.
-    function decodeSignatureOrderValidatorNotApprovedError(bytes memory encoded)
-        public
-        pure
-        returns (
-            address signerAddress,
-            address validatorAddress
-        )
-    {
-        _assertSelectorBytes(encoded, SIGNATURE_ORDER_VALIDATOR_NOT_APPROVED_ERROR_SELECTOR);
-        signerAddress = _readErrorParameterAsAddress(encoded, 0);
-        validatorAddress = _readErrorParameterAsAddress(encoded, 1);
-    }
-
     /// @dev Decompose an ABI-encoded SignatureWalletError.
     /// @param encoded ABI-encoded revert error.
     /// @return errorCode The error code.
@@ -129,54 +112,6 @@ contract LibExchangeRichErrorDecoder is
         errorData = _readErrorParameterAsBytes(encoded, 3);
     }
 
-    /// @dev Decompose an ABI-encoded SignatureOrderValidatorError.
-    /// @param encoded ABI-encoded revert error.
-    /// @return errorCode The error code.
-    /// @return signerAddress The expected signer of the hash.
-    /// @return signature The full signature bytes.
-    /// @return errorData The revert data thrown by the validator contract.
-    function decodeSignatureOrderValidatorError(bytes memory encoded)
-        public
-        pure
-        returns (
-            bytes32 hash,
-            address signerAddress,
-            address validatorAddress,
-            bytes memory signature,
-            bytes memory errorData
-        )
-    {
-        _assertSelectorBytes(encoded, SIGNATURE_ORDER_VALIDATOR_ERROR_SELECTOR);
-        hash = _readErrorParameterAsBytes32(encoded, 0);
-        signerAddress = _readErrorParameterAsAddress(encoded, 1);
-        validatorAddress = _readErrorParameterAsAddress(encoded, 2);
-        signature = _readErrorParameterAsBytes(encoded, 3);
-        errorData = _readErrorParameterAsBytes(encoded, 4);
-    }
-
-    /// @dev Decompose an ABI-encoded SignatureOrderWalletError.
-    /// @param encoded ABI-encoded revert error.
-    /// @return errorCode The error code.
-    /// @return signerAddress The expected signer of the hash.
-    /// @return signature The full signature bytes.
-    /// @return errorData The revert data thrown by the validator contract.
-    function decodeSignatureOrderWalletError(bytes memory encoded)
-        public
-        pure
-        returns (
-            bytes32 hash,
-            address signerAddress,
-            bytes memory signature,
-            bytes memory errorData
-        )
-    {
-        _assertSelectorBytes(encoded, SIGNATURE_ORDER_WALLET_ERROR_SELECTOR);
-        hash = _readErrorParameterAsBytes32(encoded, 0);
-        signerAddress = _readErrorParameterAsAddress(encoded, 1);
-        signature = _readErrorParameterAsBytes(encoded, 2);
-        errorData = _readErrorParameterAsBytes(encoded, 3);
-    }
-
     /// @dev Decompose an ABI-encoded OrderStatusError.
     /// @param encoded ABI-encoded revert error.
     /// @return orderHash The order hash.

contracts/exchange/contracts/test/TestValidatorWallet.sol

@@ -81,7 +81,7 @@ contract TestValidatorWallet is
     /// @dev The data type of a hash.
     mapping (bytes32 => DataType) internal _hashDataTypes;
     /// @dev keccak256 of the expected signature data for a hash.
-    mapping (bytes32 => DataType) internal _hashSignatureHashes;
+    mapping (bytes32 => bytes32) internal _hashSignatureHashes;
 
     constructor(address exchange) public {
         _exchange = ISimplifiedExchange(exchange);