d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/V2' of github.com:DODOEX/contractV2 into feature/V2

Browse Source
This commit is contained in:
mingda
2020-11-23 00:47:34 +08:00
parent 3fe7dbb815 f2656d6b2a
commit 9a4480208c
28 changed files with 458 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/DODOVendingMachine/impl/DVM.sol
View File

@@ -7,8 +7,8 @@
pragma solidity 0.6.9;
pragma experimental ABIEncoderV2;
import {IFeeRateModel} from "../../intf/IFeeRateModel.sol";
//TODO:讨论 是否应使用FeeRateModel
import {IConstFeeRateModel} from "../../lib/ConstFeeRateModel.sol";
import {IPermissionManager} from "../../lib/PermissionManager.sol";
import {IExternalValue} from "../../lib/ExternalValue.sol";
import {IERC20} from "../../intf/IERC20.sol";
@@ -32,8 +32,8 @@ contract DVM is DVMTrader, DVMFunding {
initOwner(owner);
_BASE_TOKEN_ = IERC20(baseTokenAddress);
_QUOTE_TOKEN_ = IERC20(quoteTokenAddress);
_LP_FEE_RATE_MODEL_ = IFeeRateModel(lpFeeRateModel);
_MT_FEE_RATE_MODEL_ = IFeeRateModel(mtFeeRateModel);
_LP_FEE_RATE_MODEL_ = IConstFeeRateModel(lpFeeRateModel);
_MT_FEE_RATE_MODEL_ = IConstFeeRateModel(mtFeeRateModel);
_TRADE_PERMISSION_ = IPermissionManager(tradePermissionManager);
_GAS_PRICE_LIMIT_ = IExternalValue(gasPriceSource);
_MAINTAINER_ = maintainer;

1
contracts/DODOVendingMachine/impl/DVMFunding.sol
View File

@@ -31,6 +31,7 @@ contract DVMFunding is DVMVault {
}
// case 3. normal case
if (baseReserve > 0 && quoteReserve > 0) {
//TODO: (Route合约配合实现)
uint256 baseInputRatio = DecimalMath.divFloor(baseInput, baseReserve);
uint256 quoteInputRatio = DecimalMath.divFloor(quoteInput, quoteReserve);
uint256 mintRatio = baseInputRatio > quoteInputRatio ? quoteInputRatio : baseInputRatio;

11
contracts/DODOVendingMachine/impl/DVMStorage.sol
View File

@@ -15,7 +15,7 @@ import {DODOMath} from "../../lib/DODOMath.sol";
import {DecimalMath} from "../../lib/DecimalMath.sol";
import {IPermissionManager} from "../../lib/PermissionManager.sol";
import {IExternalValue} from "../../lib/ExternalValue.sol";
import {IFeeRateModel} from "../../intf/IFeeRateModel.sol";
import {IConstFeeRateModel} from "../../lib/ConstFeeRateModel.sol";
import {IERC20} from "../../intf/IERC20.sol";
contract DVMStorage is InitializableOwnable, ReentrancyGuard {
@@ -54,19 +54,20 @@ contract DVMStorage is InitializableOwnable, ReentrancyGuard {
// ============ Variables for Pricing ============
IFeeRateModel public _LP_FEE_RATE_MODEL_;
IFeeRateModel public _MT_FEE_RATE_MODEL_;
IConstFeeRateModel public _LP_FEE_RATE_MODEL_;
IConstFeeRateModel public _MT_FEE_RATE_MODEL_;
uint256 public _K_;
uint256 public _I_;
// ============ Setting Functions ============
//TODO: owner权限问题论证
function setLpFeeRateModel(address newLpFeeRateModel) external onlyOwner {
_LP_FEE_RATE_MODEL_ = IFeeRateModel(newLpFeeRateModel);
_LP_FEE_RATE_MODEL_ = IConstFeeRateModel(newLpFeeRateModel);
}
function setMtFeeRateModel(address newMtFeeRateModel) external onlyOwner {
_MT_FEE_RATE_MODEL_ = IFeeRateModel(newMtFeeRateModel);
_MT_FEE_RATE_MODEL_ = IConstFeeRateModel(newMtFeeRateModel);
}
function setTradePermissionManager(address newTradePermissionManager) external onlyOwner {

1
contracts/DODOVendingMachine/impl/DVMTrader.sol
View File

@@ -49,6 +49,7 @@ contract DVMTrader is DVMVault {
{
uint256 baseInput = getBaseInput();
uint256 mtFee;
//TODO:tx.origin 的潜在风险,直接写to
(receiveQuoteAmount, mtFee) = querySellBase(tx.origin, baseInput);
_transferQuoteOut(to, receiveQuoteAmount);
_transferQuoteOut(_MAINTAINER_, mtFee);