diff options
| author | Remco Bloemen <remco@wicked.ventures> | 2018-02-24 07:58:50 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:16 +0800 |
| commit | 55da59a5370777328feeeb2aad438ed83eb7a8f4 (patch) | |
| tree | 9ab38e9c54eea9ee01ab807f87071fb368a4014e | |
| parent | 012ee310a4be515ff286a7a6bfefff126af152e7 (diff) | |
| download | dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.tar dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.tar.gz dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.tar.bz2 dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.tar.lz dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.tar.xz dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.tar.zst dexon-0x-contracts-55da59a5370777328feeeb2aad438ed83eb7a8f4.zip | |
Add Todos
| -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; |