crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert cancel order signature abstraction

Browse Source
This commit is contained in:
Remco Bloemen
2018-02-21 16:51:11 -08:00
committed by Amir Bandeali
parent 6f5a84703e
commit 92e112dc63
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
View File

@@ -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);