diff options
-rw-r--r-- | packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol | 1 | ||||
-rw-r--r-- | packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol index 817008ae7..d9e4ce62a 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol @@ -98,6 +98,7 @@ contract MixinExchangeCore is }); // Validate order and maker only if first time seen + // TODO: Read filled and cancelled only once if (filled[order.orderHash] == 0 && cancelled[order.orderHash] == 0) { require(order.makerTokenAmount > 0); require(order.takerTokenAmount > 0); diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol index 9f441b708..03dbd3cbd 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol @@ -64,6 +64,8 @@ contract MixinWrapperFunctions is bytes4 FILL_ORDER_FUNCTION_SIGNATURE = bytes4(keccak256("fillOrder(address[5],uint256[6],uint256,uint8,bytes32,bytes32)")); // Input size is padded to a 4 + n * 32 byte boundary + // TODO: Construct the input array using readable Solidity instead + // of assembly. uint256 mask = 0x1F; uint256 inputSize = 388 + (signature.length + mask) & ~mask; |