diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-08-21 08:00:08 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-08-25 09:17:27 +0800 |
| commit | a32b201afe6c90a6bd06b88a5d512408cd3cb032 (patch) | |
| tree | e8e8690ed524c14fcedea9f82cb9f4a2ca69f6c4 /packages/contracts/src/2.0.0 | |
| parent | 0ecdf1e2132141b199fa929ec1c6ca9979f06302 (diff) | |
| download | dexon-0x-contracts-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.gz dexon-0x-contracts-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.zst dexon-0x-contracts-a32b201afe6c90a6bd06b88a5d512408cd3cb032.zip | |
Rounding for fees in match orders addressed, plus example
Diffstat (limited to 'packages/contracts/src/2.0.0')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol index 58f131819..b3f376eb8 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol @@ -214,8 +214,8 @@ contract MixinMatchOrders is // Compute fees for left order matchedFillResults.left.makerFeePaid = getPartialAmount( - matchedFillResults.left.takerAssetFilledAmount, - leftOrder.takerAssetAmount, + matchedFillResults.left.makerAssetFilledAmount, + leftOrder.makerAssetAmount, leftOrder.makerFee ); matchedFillResults.left.takerFeePaid = getPartialAmount( @@ -226,8 +226,8 @@ contract MixinMatchOrders is // Compute fees for right order matchedFillResults.right.makerFeePaid = getPartialAmount( - matchedFillResults.right.takerAssetFilledAmount, - rightOrder.takerAssetAmount, + matchedFillResults.right.makerAssetFilledAmount, + rightOrder.makerAssetAmount, rightOrder.makerFee ); matchedFillResults.right.takerFeePaid = getPartialAmount( |