@0x/contracts-exchange: Revert changes to IWallet.

2019-10-03 10:21:24 -07:00
parent 035dc607db
commit f993b6d1ed
8 changed files with 46 additions and 9 deletions
--- a/contracts/exchange/CHANGELOG.json
+++ b/contracts/exchange/CHANGELOG.json
@@ -189,10 +189,6 @@
            {
                "note": "Overridden functions in `ReentrancyTester` now return sane values.",
                "pr": 2075
-            },
-            {
-                "note": "Move `IWallet.sol` to `exchange-libs`.",
-                "pr": 2233
            }
        ],
        "timestamp": 1570135330
--- a/contracts/exchange/contracts/src/MixinSignatureValidator.sol
+++ b/contracts/exchange/contracts/src/MixinSignatureValidator.sol
@@ -27,7 +27,7 @@ import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol";
 import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol";
-import "@0x/contracts-exchange-libs/contracts/src/IWallet.sol";
+import "./interfaces/IWallet.sol";
 import "./interfaces/IEIP1271Wallet.sol";
 import "./interfaces/ISignatureValidator.sol";
 import "./interfaces/IEIP1271Data.sol";
@@ -465,7 +465,7 @@ contract MixinSignatureValidator is
        return signatureType;
    }

-    /// @dev ABI encodes an order and hash with a selector to be passed into
+    /// @dev ABI encodes an order and hash with a selector to be passed into 
    ///      an EIP1271 compliant `isValidSignature` function.
    function _encodeEIP1271OrderWithHash(
        LibOrder.Order memory order,
@@ -482,7 +482,7 @@ contract MixinSignatureValidator is
        );
    }

-    /// @dev ABI encodes a transaction and hash with a selector to be passed into
+    /// @dev ABI encodes a transaction and hash with a selector to be passed into 
    ///      an EIP1271 compliant `isValidSignature` function.
    function _encodeEIP1271TransactionWithHash(
        LibZeroExTransaction.ZeroExTransaction memory transaction,
--- a/contracts/exchange/contracts/src/interfaces/IProtocolFees.sol
+++ b/contracts/exchange/contracts/src/interfaces/IProtocolFees.sol
@@ -19,7 +19,6 @@
 pragma solidity ^0.5.9;


-// solhint-disable no-simple-event-func-name
 contract IProtocolFees {

    // Logs updates to the protocol fee multiplier.
--- a/contracts/exchange/contracts/src/interfaces/IWallet.sol
+++ b/contracts/exchange/contracts/src/interfaces/IWallet.sol
@@ -0,0 +1,38 @@
+/*
+
+  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";
+
+
+contract IWallet {
+
+    /// @dev Validates a hash with the `Wallet` signature type.
+    /// @param hash Message hash that is signed.
+    /// @param signature Proof of signing.
+    /// @return magicValue `bytes4(0xb0671381)` if the signature check succeeds.
+    function isValidSignature(
+        bytes32 hash,
+        bytes calldata signature
+    )
+        external
+        view
+        returns (bytes4 magicValue);
+}
--- a/contracts/exchange/package.json
+++ b/contracts/exchange/package.json
@@ -35,7 +35,7 @@
        "compile:truffle": "truffle compile"
    },
    "config": {
-        "abis": "./generated-artifacts/@(Exchange|IAssetProxy|IAssetProxyDispatcher|IEIP1271Data|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|IProtocolFees|ISignatureValidator|ITransactions|ITransferSimulator|IWrapperFunctions|IsolatedExchange|LibExchangeRichErrorDecoder|MixinAssetProxyDispatcher|MixinExchangeCore|MixinMatchOrders|MixinProtocolFees|MixinSignatureValidator|MixinTransactions|MixinTransferSimulator|MixinWrapperFunctions|ReentrancyTester|TestAssetProxyDispatcher|TestExchangeInternals|TestLibExchangeRichErrorDecoder|TestProtocolFees|TestProtocolFeesReceiver|TestSignatureValidator|TestTransactions|TestValidatorWallet|TestWrapperFunctions).json",
+        "abis": "./generated-artifacts/@(Exchange|IAssetProxy|IAssetProxyDispatcher|IEIP1271Data|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|IProtocolFees|ISignatureValidator|ITransactions|ITransferSimulator|IWallet|IWrapperFunctions|IsolatedExchange|LibExchangeRichErrorDecoder|MixinAssetProxyDispatcher|MixinExchangeCore|MixinMatchOrders|MixinProtocolFees|MixinSignatureValidator|MixinTransactions|MixinTransferSimulator|MixinWrapperFunctions|ReentrancyTester|TestAssetProxyDispatcher|TestExchangeInternals|TestLibExchangeRichErrorDecoder|TestProtocolFees|TestProtocolFeesReceiver|TestSignatureValidator|TestTransactions|TestValidatorWallet|TestWrapperFunctions).json",
        "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
    },
    "repository": {
--- a/contracts/exchange/src/artifacts.ts
+++ b/contracts/exchange/src/artifacts.ts
@@ -18,6 +18,7 @@ import * as ISignatureValidator from '../generated-artifacts/ISignatureValidator
 import * as IsolatedExchange from '../generated-artifacts/IsolatedExchange.json';
 import * as ITransactions from '../generated-artifacts/ITransactions.json';
 import * as ITransferSimulator from '../generated-artifacts/ITransferSimulator.json';
+import * as IWallet from '../generated-artifacts/IWallet.json';
 import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json';
 import * as LibExchangeRichErrorDecoder from '../generated-artifacts/LibExchangeRichErrorDecoder.json';
 import * as MixinAssetProxyDispatcher from '../generated-artifacts/MixinAssetProxyDispatcher.json';
@@ -59,6 +60,7 @@ export const artifacts = {
    ISignatureValidator: ISignatureValidator as ContractArtifact,
    ITransactions: ITransactions as ContractArtifact,
    ITransferSimulator: ITransferSimulator as ContractArtifact,
+    IWallet: IWallet as ContractArtifact,
    IWrapperFunctions: IWrapperFunctions as ContractArtifact,
    LibExchangeRichErrorDecoder: LibExchangeRichErrorDecoder as ContractArtifact,
    IsolatedExchange: IsolatedExchange as ContractArtifact,
--- a/contracts/exchange/src/wrappers.ts
+++ b/contracts/exchange/src/wrappers.ts
@@ -15,6 +15,7 @@ export * from '../generated-wrappers/i_protocol_fees';
 export * from '../generated-wrappers/i_signature_validator';
 export * from '../generated-wrappers/i_transactions';
 export * from '../generated-wrappers/i_transfer_simulator';
+export * from '../generated-wrappers/i_wallet';
 export * from '../generated-wrappers/i_wrapper_functions';
 export * from '../generated-wrappers/isolated_exchange';
 export * from '../generated-wrappers/lib_exchange_rich_error_decoder';
--- a/contracts/exchange/tsconfig.json
+++ b/contracts/exchange/tsconfig.json
@@ -15,6 +15,7 @@
        "generated-artifacts/ISignatureValidator.json",
        "generated-artifacts/ITransactions.json",
        "generated-artifacts/ITransferSimulator.json",
+        "generated-artifacts/IWallet.json",
        "generated-artifacts/IWrapperFunctions.json",
        "generated-artifacts/IsolatedExchange.json",
        "generated-artifacts/LibExchangeRichErrorDecoder.json",