diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-04-22 08:04:20 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-22 08:31:17 +0800 |
commit | 46653a02683071e9ad35e5c378876a6400fd934c (patch) | |
tree | 8b0a595dc98bfc124bf3cf7156076d0e8f30bdf0 /packages/contracts/src | |
parent | fcef1819b17cea1c9047b3af5644860e0bd06e67 (diff) | |
download | dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.tar dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.tar.gz dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.tar.bz2 dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.tar.lz dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.tar.xz dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.tar.zst dexon-0x-contracts-46653a02683071e9ad35e5c378876a6400fd934c.zip |
Reorder event args
Diffstat (limited to 'packages/contracts/src')
-rw-r--r-- | packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol index 10985d6d3..d4801a8fd 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol @@ -53,21 +53,21 @@ contract MixinExchangeCore is address indexed makerAddress, address takerAddress, address indexed feeRecipientAddress, - bytes makerAssetData, - bytes takerAssetData, uint256 makerAssetFilledAmount, uint256 takerAssetFilledAmount, uint256 makerFeePaid, uint256 takerFeePaid, - bytes32 indexed orderHash + bytes32 indexed orderHash, + bytes makerAssetData, + bytes takerAssetData ); event Cancel( address indexed makerAddress, address indexed feeRecipientAddress, + bytes32 indexed orderHash, bytes makerAssetData, - bytes takerAssetData, - bytes32 indexed orderHash + bytes takerAssetData ); event CancelUpTo( @@ -153,13 +153,13 @@ contract MixinExchangeCore is order.makerAddress, msg.sender, order.feeRecipientAddress, - order.makerAssetData, - order.takerAssetData, fillResults.makerAssetFilledAmount, fillResults.takerAssetFilledAmount, fillResults.makerFeePaid, fillResults.takerFeePaid, - orderHash + orderHash, + order.makerAssetData, + order.takerAssetData ); return fillResults; } @@ -195,9 +195,9 @@ contract MixinExchangeCore is emit Cancel( order.makerAddress, order.feeRecipientAddress, + orderHash, order.makerAssetData, - order.takerAssetData, - orderHash + order.takerAssetData ); return true; } |