aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-08-21 08:00:08 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-08-25 09:17:27 +0800
commita32b201afe6c90a6bd06b88a5d512408cd3cb032 (patch)
treee8e8690ed524c14fcedea9f82cb9f4a2ca69f6c4 /packages/contracts/src
parent0ecdf1e2132141b199fa929ec1c6ca9979f06302 (diff)
downloaddexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar
dexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.gz
dexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.bz2
dexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.lz
dexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.xz
dexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.tar.zst
dexon-sol-tools-a32b201afe6c90a6bd06b88a5d512408cd3cb032.zip
Rounding for fees in match orders addressed, plus example
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol8
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(