diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-08-25 08:29:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 08:29:09 +0800 |
| commit | 74ce893f520db6ae4617432975b5c9321ff5b89b (patch) | |
| tree | 45853fe1c16066290834ee5827b3c269a9fb7734 /packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol | |
| parent | 94e01be9ed5bfe2d0ace4cd0562fced889b34108 (diff) | |
| parent | cc1fac9bbee2656bdb327490de42922abfc5125a (diff) | |
| download | dexon-0x-contracts-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.gz dexon-0x-contracts-74ce893f520db6ae4617432975b5c9321ff5b89b.tar.zst dexon-0x-contracts-74ce893f520db6ae4617432975b5c9321ff5b89b.zip | |
Merge pull request #1003 from 0xProject/feature/contracts/roundup
[contracts] Add getPartialAmountCeil and isRoundingErrorCeil
Diffstat (limited to 'packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol index 218713d3c..a7ff400b9 100644 --- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol +++ b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol @@ -163,7 +163,7 @@ contract MixinExchangeWrapper is // Convert the remaining amount of makerAsset to buy into remaining amount // of takerAsset to sell, assuming entire amount can be sold in the current order - uint256 remainingTakerAssetFillAmount = getPartialAmount( + uint256 remainingTakerAssetFillAmount = getPartialAmountFloor( orders[i].takerAssetAmount, orders[i].makerAssetAmount, remainingMakerAssetFillAmount @@ -231,7 +231,7 @@ contract MixinExchangeWrapper is // Convert the remaining amount of ZRX to buy into remaining amount // of WETH to sell, assuming entire amount can be sold in the current order. - uint256 remainingWethSellAmount = getPartialAmount( + uint256 remainingWethSellAmount = getPartialAmountFloor( orders[i].takerAssetAmount, safeSub(orders[i].makerAssetAmount, orders[i].takerFee), // our exchange rate after fees remainingZrxBuyAmount |