fix lpRate+mtRate

DODOEX · Oct 19, 2023 · 3e05bca · 3e05bca
1 parent 7167bd9
commit 3e05bca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/contracts/DODOV3MM/D3Pool/D3Trading.sol b/contracts/DODOV3MM/D3Pool/D3Trading.sol
@@ -111,7 +111,9 @@ contract D3Trading is D3Funding {
         // external call & swap callback
         IDODOSwapCallback(msg.sender).d3MMSwapCallBack(fromToken, fromAmount, data);
         // transfer mtFee to maintainer
-        _transferOut(state._MAINTAINER_, toToken, mtFee);
+        if(mtFee > 0) {
+            _transferOut(state._MAINTAINER_, toToken, mtFee);
+        }
 
         require(
             IERC20(fromToken).balanceOf(address(this)) - state.balances[fromToken] >= fromAmount,
@@ -151,7 +153,9 @@ contract D3Trading is D3Funding {
         // external call & swap callback
         IDODOSwapCallback(msg.sender).d3MMSwapCallBack(fromToken, payFromAmount, data);
         // transfer mtFee to maintainer
-        _transferOut(state._MAINTAINER_, toToken, mtFee);
+        if(mtFee > 0 ) {
+            _transferOut(state._MAINTAINER_, toToken, mtFee);
+        }
 
         require(
             IERC20(fromToken).balanceOf(address(this)) - state.balances[fromToken] >= payFromAmount,
@@ -199,7 +203,7 @@ contract D3Trading is D3Funding {
         uint256 mtFeeRate = D3State.fromTokenMMInfo.mtFeeRate +  D3State.toTokenMMInfo.mtFeeRate;
         mtFee = DecimalMath.mulFloor(receiveToAmount, mtFeeRate);
 
-        return (payFromAmount, receiveToAmount - swapFee, vusdAmount, swapFee, mtFee);
+        return (payFromAmount, receiveToAmount - mtFee, vusdAmount, swapFee, mtFee);
     }
 
     /// @notice user could query sellToken result deducted swapFee, assign toAmount
@@ -222,7 +226,7 @@ contract D3Trading is D3Funding {
         swapFee = DecimalMath.mulFloor(toAmount, swapFeeRate);
         uint256 mtFeeRate = D3State.fromTokenMMInfo.mtFeeRate +  D3State.toTokenMMInfo.mtFeeRate;
         mtFee = DecimalMath.mulFloor(toAmount, mtFeeRate);
-        toAmountWithFee = toAmount + swapFee;
+        toAmountWithFee = toAmount + mtFee;
         }
 
         require(toAmountWithFee <= state.balances[toToken], Errors.BALANCE_NOT_ENOUGH);

diff --git a/contracts/DODOV3MM/lib/MakerTypes.sol b/contracts/DODOV3MM/lib/MakerTypes.sol
@@ -78,7 +78,7 @@ library MakerTypes {
         uint256 bidDownRate = priceInfo & 0xffff;
 
         // swap fee rate standarlize
-        swapFee = swapFeeRate * (10 ** 14) + mtFeeRate;
+        swapFee = swapFeeRate * (10 ** 14);
         uint256 swapFeeSpread = DecimalMath.mul(midPriceWithDecimal, swapFee);
 
         // ask price standarlize