From 92e112dc63f5d30c96718906f370da537f096a0b Mon Sep 17 00:00:00 2001
From: Remco Bloemen <remco@wicked.ventures>
Date: Wed, 21 Feb 2018 16:51:11 -0800
Subject: Revert cancel order signature abstraction

---
 .../contracts/current/protocol/Exchange/MixinExchangeCore.sol    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
index 7000f6389..817008ae7 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
@@ -165,8 +165,7 @@ contract MixinExchangeCore is
     function cancelOrder(
         address[5] orderAddresses,
         uint256[6] orderValues,
-        uint256 takerTokenCancelAmount,
-        bytes signature)
+        uint256 takerTokenCancelAmount)
         public
         returns (uint256 takerTokenCancelledAmount)
     {
@@ -187,11 +186,7 @@ contract MixinExchangeCore is
         require(order.makerTokenAmount > 0);
         require(order.takerTokenAmount > 0);
         require(takerTokenCancelAmount > 0);
-        require(isValidSignature(
-            keccak256(orderSchemaHash, order.orderHash),
-            order.maker,
-            signature
-        ));
+        require(order.maker == msg.sender);
 
         if (block.timestamp >= order.expirationTimestampInSec) {
             LogError(uint8(Errors.ORDER_EXPIRED), order.orderHash);
-- 
cgit