Merge pull request #2116 from 0xProject/feat/3.0/eip1271-selectors

Add 4 byte ids to `EIP1271Wallet.isValidSignature` data

contracts/exchange/contracts/src/MixinSignatureValidator.sol

@@ -30,6 +30,7 @@ import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol";
 import "./interfaces/IWallet.sol";
 import "./interfaces/IEIP1271Wallet.sol";
 import "./interfaces/ISignatureValidator.sol";
+import "./interfaces/IEIP1271Data.sol";
 import "./MixinTransactions.sol";
 
 
@@ -220,15 +221,23 @@ contract MixinSignatureValidator is
         if (signatureType == SignatureType.Validator) {
             // The entire order is verified by a validator contract.
             isValid = _validateBytesWithValidator(
-                abi.encode(order, orderHash),
+                abi.encodeWithSelector(
+                    IEIP1271Data(address(0)).OrderWithHash.selector,
+                    order,
+                    orderHash
+                ),
                 orderHash,
                 signerAddress,
                 signature
             );
         } else if (signatureType == SignatureType.EIP1271Wallet) {
             // The entire order is verified by a wallet contract.
             isValid = _validateBytesWithWallet(
-                abi.encode(order, orderHash),
+                abi.encodeWithSelector(
+                    IEIP1271Data(address(0)).OrderWithHash.selector,
+                    order,
+                    orderHash
+                ),
                 orderHash,
                 signerAddress,
                 signature
@@ -268,15 +277,23 @@ contract MixinSignatureValidator is
         if (signatureType == SignatureType.Validator) {
             // The entire transaction is verified by a validator contract.
             isValid = _validateBytesWithValidator(
-                abi.encode(transaction, transactionHash),
+                abi.encodeWithSelector(
+                    IEIP1271Data(address(0)).ZeroExTransactionWithHash.selector,
+                    transaction,
+                    transactionHash
+                ),
                 transactionHash,
                 signerAddress,
                 signature
             );
         } else if (signatureType == SignatureType.EIP1271Wallet) {
             // The entire transaction is verified by a wallet contract.
             isValid = _validateBytesWithWallet(
-                abi.encode(transaction, transactionHash),
+                abi.encodeWithSelector(
+                    IEIP1271Data(address(0)).ZeroExTransactionWithHash.selector,
+                    transaction,
+                    transactionHash
+                ),
                 transactionHash,
                 signerAddress,
                 signature

contracts/exchange/contracts/src/interfaces/IEIP1271Data.sol

@@ -0,0 +1,48 @@
+/*
+
+  Copyright 2019 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.5.9;
+pragma experimental ABIEncoderV2;
+
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
+
+
+// solhint-disable
+contract IEIP1271Data {
+
+    /// @dev This function's selector is used when ABI encoding the order
+    ///      and hash into a byte array before calling `isValidSignature`.
+    ///      This function serves no other purpose.
+    function OrderWithHash(
+        LibOrder.Order calldata order,
+        bytes32 orderHash
+    )
+        external
+        pure;
+
+    /// @dev This function's selector is used when ABI encoding the transaction
+    ///      and hash into a byte array before calling `isValidSignature`.
+    ///      This function serves no other purpose.
+    function ZeroExTransactionWithHash(
+        LibZeroExTransaction.ZeroExTransaction calldata transaction,
+        bytes32 transactionHash
+    )
+        external
+        pure;
+}