aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorRemco Bloemen <remco@wicked.ventures>2018-02-22 08:51:11 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:16 +0800
commit92e112dc63f5d30c96718906f370da537f096a0b (patch)
tree14683b03116aa38649277b219eabfd282ace43a4 /packages/contracts/src
parent6f5a84703eee7d7f0598d9cfa46f7c8b5ae4a3d5 (diff)
downloaddexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.tar
dexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.tar.gz
dexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.tar.bz2
dexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.tar.lz
dexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.tar.xz
dexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.tar.zst
dexon-sol-tools-92e112dc63f5d30c96718906f370da537f096a0b.zip
Revert cancel order signature abstraction
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol9
1 files changed, 2 insertions, 7 deletions
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);