From 6b866d60533c7e46446bfb69639b07affd1aeb17 Mon Sep 17 00:00:00 2001 From: Remco Bloemen Date: Fri, 24 Aug 2018 17:29:52 -0700 Subject: Revert maker not equal taker check --- .../contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index dc62db448..515606cb9 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -303,12 +303,6 @@ contract MixinExchangeCore is ); } - // Orders can not be self-filled (use cancel instead) - require( - order.makerAddress != takerAddress, - "INVALID_TAKER" - ); - // Validate Maker signature (check only if first time seen) if (orderInfo.orderTakerAssetFilledAmount == 0) { require( @@ -339,6 +333,7 @@ contract MixinExchangeCore is view { // Revert if fill amount is invalid + // TODO: reconsider necessity for v2.1 require( takerAssetFillAmount != 0, "INVALID_TAKER_AMOUNT" -- cgit v1.2.3