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

add dppProxy

Browse Source
This commit is contained in:
owen05
2021-10-11 23:42:56 +08:00
parent 18f6debb19
commit 3020279d17
14 changed files with 42 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
contracts/SmartRoute/DODOV2Proxy02.sol
View File

@@ -40,7 +40,6 @@ contract DODOV2Proxy02 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
address public immutable _DODO_APPROVE_PROXY_;
address public immutable _DODO_SELL_HELPER_;
address public immutable _DVM_FACTORY_;
address public immutable _DPP_FACTORY_;
mapping (address => bool) public isWhiteListed;
// ============ Events ============
@@ -66,13 +65,11 @@ contract DODOV2Proxy02 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
constructor(
address dvmFactory,
address dppFactory,
address payable weth,
address dodoApproveProxy,
address dodoSellHelper
) public {
_DVM_FACTORY_ = dvmFactory;
_DPP_FACTORY_ = dppFactory;
_WETH_ = weth;
_DODO_APPROVE_PROXY_ = dodoApproveProxy;
_DODO_SELL_HELPER_ = dodoSellHelper;
@@ -208,93 +205,6 @@ contract DODOV2Proxy02 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
}
}
// ============ DPP Functions (create & reset) ============
// function createDODOPrivatePool(
// address baseToken,
// address quoteToken,
// uint256 baseInAmount,
// uint256 quoteInAmount,
// uint256 lpFeeRate,
// uint256 i,
// uint256 k,
// bool isOpenTwap,
// uint256 deadLine
// )
// external
// override
// payable
// preventReentrant
// judgeExpired(deadLine)
// returns (address newPrivatePool)
// {
// newPrivatePool = IDODOV2(_DPP_FACTORY_).createDODOPrivatePool();
// address _baseToken = baseToken;
// address _quoteToken = quoteToken;
// _deposit(msg.sender, newPrivatePool, _baseToken, baseInAmount, _baseToken == _ETH_ADDRESS_);
// _deposit(
// msg.sender,
// newPrivatePool,
// _quoteToken,
// quoteInAmount,
// _quoteToken == _ETH_ADDRESS_
// );
// if (_baseToken == _ETH_ADDRESS_) _baseToken = _WETH_;
// if (_quoteToken == _ETH_ADDRESS_) _quoteToken = _WETH_;
// IDODOV2(_DPP_FACTORY_).initDODOPrivatePool(
// newPrivatePool,
// msg.sender,
// _baseToken,
// _quoteToken,
// lpFeeRate,
// k,
// i,
// isOpenTwap
// );
// }
// function resetDODOPrivatePool(
// address dppAddress,
// uint256[] memory paramList, //0 - newLpFeeRate, 1 - newI, 2 - newK
// uint256[] memory amountList, //0 - baseInAmount, 1 - quoteInAmount, 2 - baseOutAmount, 3- quoteOutAmount
// uint8 flag, // 0 - ERC20, 1 - baseInETH, 2 - quoteInETH, 3 - baseOutETH, 4 - quoteOutETH
// uint256 minBaseReserve,
// uint256 minQuoteReserve,
// uint256 deadLine
// ) external override payable preventReentrant judgeExpired(deadLine) {
// _deposit(
// msg.sender,
// dppAddress,
// IDODOV2(dppAddress)._BASE_TOKEN_(),
// amountList[0],
// flag == 1
// );
// _deposit(
// msg.sender,
// dppAddress,
// IDODOV2(dppAddress)._QUOTE_TOKEN_(),
// amountList[1],
// flag == 2
// );
// require(IDODOV2(IDODOV2(dppAddress)._OWNER_()).reset(
// msg.sender,
// paramList[0],
// paramList[1],
// paramList[2],
// amountList[2],
// amountList[3],
// minBaseReserve,
// minQuoteReserve
// ), "Reset Failed");
// _withdraw(msg.sender, IDODOV2(dppAddress)._BASE_TOKEN_(), amountList[2], flag == 3);
// _withdraw(msg.sender, IDODOV2(dppAddress)._QUOTE_TOKEN_(), amountList[3], flag == 4);
// }
// ============ Swap ============
function dodoSwapV2ETHToToken(

2
contracts/SmartRoute/proxies/DODODppProxy.sol
View File

@@ -47,7 +47,7 @@ contract DODODppProxy is ReentrancyGuard {
// ============ Modifiers ============
modifier judgeExpired(uint256 deadLine) {
require(deadLine >= block.timestamp, "DODOCpProxy: EXPIRED");
require(deadLine >= block.timestamp, "DPPProxy: EXPIRED");
_;
}