diff options
| author | Greg Hysen <hysz@users.noreply.github.com> | 2018-08-29 04:51:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 04:51:38 +0800 |
| commit | 1402a0aa22a071eca75a2b263f516d209f74bafc (patch) | |
| tree | ed994e001182e7109723af7c94ec99b6ff20bca8 /packages/contracts/src | |
| parent | 14fdb71a716cb95bc1f6933db9057d23f3c41909 (diff) | |
| parent | f225f9e7c8f59a0ea04f6c9b07493a0458c4f502 (diff) | |
| download | dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.tar dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.tar.gz dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.tar.bz2 dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.tar.lz dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.tar.xz dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.tar.zst dexon-sol-tools-1402a0aa22a071eca75a2b263f516d209f74bafc.zip | |
Merge pull request #1036 from 0xProject/fix/contracts/calculateFillResults
Making rounding consistent in calculateFillResults
Diffstat (limited to 'packages/contracts/src')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index 64b1f7665..ff908917d 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -459,8 +459,8 @@ contract MixinExchangeCore is order.makerAssetAmount ); fillResults.makerFeePaid = safeGetPartialAmountFloor( - takerAssetFilledAmount, - order.takerAssetAmount, + fillResults.makerAssetFilledAmount, + order.makerAssetAmount, order.makerFee ); fillResults.takerFeePaid = safeGetPartialAmountFloor( |