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

apendix

Browse Source
This commit is contained in:
Attens1423
2021-05-12 14:56:50 +08:00
parent fa29dbd89f
commit a25a35b5dd
4 changed files with 23 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contracts/SmartRoute/adapter/CurveUnderlyingAdapter.sol
View File

@@ -18,35 +18,28 @@ import {SafeERC20} from "../../lib/SafeERC20.sol";
contract CurveUnderlyingAdapter is IDODOAdapter { contract CurveUnderlyingAdapter is IDODOAdapter {
using SafeMath for uint; using SafeMath for uint;
//fromToken == token[0], underlying function _curveSwap(address to, address pool, bytes memory moreInfo) internal {
function sellBase(address to, address pool, bytes memory moreInfo) external override {
(address fromToken, address toToken, int128 i, int128 j) = abi.decode(moreInfo, (address, address, int128, int128)); (address fromToken, address toToken, int128 i, int128 j) = abi.decode(moreInfo, (address, address, int128, int128));
require(fromToken == ICurve(pool).underlying_coins(i), 'DepthAdapter: WRONG_TOKEN'); require(fromToken == ICurve(pool).underlying_coins(i), 'CurveAdapter: WRONG_TOKEN');
require(toToken == ICurve(pool).underlying_coins(j), 'DepthAdapter: WRONG_TOKEN'); require(toToken == ICurve(pool).underlying_coins(j), 'CurveAdapter: WRONG_TOKEN');
uint256 sellBaseAmount = IERC20(fromToken).balanceOf(address(this)); uint256 sellAmount = IERC20(fromToken).balanceOf(address(this));
// approve // approve
IERC20(fromToken).approve(pool, sellBaseAmount); IERC20(fromToken).approve(pool, sellAmount);
// swap // swap
ICurve(pool).exchange_underlying(i, j, sellBaseAmount, 0); ICurve(pool).exchange_underlying(i, j, sellAmount, 0);
if(to != address(this)) { if(to != address(this)) {
SafeERC20.safeTransfer(IERC20(toToken), to, IERC20(toToken).balanceOf(address(this))); SafeERC20.safeTransfer(IERC20(toToken), to, IERC20(toToken).balanceOf(address(this)));
} }
} }
//fromToken == token[0], underlying
function sellBase(address to, address pool, bytes memory moreInfo) external override {
_curveSwap(to, pool, moreInfo);
}
//fromToken == token[1], underlying //fromToken == token[1], underlying
function sellQuote(address to, address pool, bytes memory moreInfo) external override { function sellQuote(address to, address pool, bytes memory moreInfo) external override {
(address fromToken, address toToken, int128 i, int128 j) = abi.decode(moreInfo, (address, address, int128, int128)); _curveSwap(to, pool, moreInfo);
require(fromToken == ICurve(pool).underlying_coins(i), 'DepthAdapter: WRONG_TOKEN');
require(toToken == ICurve(pool).underlying_coins(j), 'DepthAdapter: WRONG_TOKEN');
uint256 sellQuoteAmount = IERC20(toToken).balanceOf(address(this));
// approve
IERC20(toToken).approve(pool, sellQuoteAmount);
// swap
ICurve(pool).exchange_underlying(i, j, sellQuoteAmount, 0);
if(to != address(this)) {
SafeERC20.safeTransfer(IERC20(fromToken), to, IERC20(fromToken).balanceOf(address(this)));
}
} }
} }

12
contracts/SmartRoute/adapter/UniAdapter.sol
View File

@@ -1,8 +1,6 @@
/* /*
Copyright 2020 DODO ZOO. Copyright 2020 DODO ZOO.
SPDX-License-Identifier: Apache-2.0 SPDX-License-Identifier: Apache-2.0
*/ */
pragma solidity 0.6.9; pragma solidity 0.6.9;
@@ -24,13 +22,10 @@ contract UniAdapter is IDODOAdapter {
uint balance0 = IERC20(baseToken).balanceOf(pool); uint balance0 = IERC20(baseToken).balanceOf(pool);
uint sellBaseAmount = balance0 - reserveIn; uint sellBaseAmount = balance0 - reserveIn;
uint receiveQuoteAmount = 0;
{
uint sellBaseAmountWithFee = sellBaseAmount.mul(997); uint sellBaseAmountWithFee = sellBaseAmount.mul(997);
uint numerator = sellBaseAmountWithFee.mul(reserveOut); uint numerator = sellBaseAmountWithFee.mul(reserveOut);
uint denominator = reserveIn.mul(1000).add(sellBaseAmountWithFee); uint denominator = reserveIn.mul(1000).add(sellBaseAmountWithFee);
receiveQuoteAmount = numerator / denominator; uint receiveQuoteAmount = numerator / denominator;
}
IUni(pool).swap(0, receiveQuoteAmount, to, new bytes(0)); IUni(pool).swap(0, receiveQuoteAmount, to, new bytes(0));
} }
@@ -43,13 +38,10 @@ contract UniAdapter is IDODOAdapter {
uint balance1 = IERC20(quoteToken).balanceOf(pool); uint balance1 = IERC20(quoteToken).balanceOf(pool);
uint sellQuoteAmount = balance1 - reserveIn; uint sellQuoteAmount = balance1 - reserveIn;
uint receiveBaseAmount = 0;
{
uint sellQuoteAmountWithFee = sellQuoteAmount.mul(997); uint sellQuoteAmountWithFee = sellQuoteAmount.mul(997);
uint numerator = sellQuoteAmountWithFee.mul(reserveOut); uint numerator = sellQuoteAmountWithFee.mul(reserveOut);
uint denominator = reserveIn.mul(1000).add(sellQuoteAmountWithFee); uint denominator = reserveIn.mul(1000).add(sellQuoteAmountWithFee);
receiveBaseAmount = numerator / denominator; uint receiveBaseAmount = numerator / denominator;
}
IUni(pool).swap(receiveBaseAmount, 0, to, new bytes(0)); IUni(pool).swap(receiveBaseAmount, 0, to, new bytes(0));
} }
} }

12
contracts/SmartRoute/proxies/DODORouteProxy.sol
View File

@@ -80,13 +80,13 @@ contract DODORouteProxy {
address[] memory mixPairs, address[] memory mixPairs,
address[] memory assetTo, address[] memory assetTo,
uint256 directions, uint256 directions,
bool isIncentive, bool,
uint256 deadLine uint256 deadLine
) external payable judgeExpired(deadLine) returns (uint256 returnAmount) { ) external payable judgeExpired(deadLine) returns (uint256 returnAmount) {
require(mixPairs.length > 0, "DODOV2Proxy02: PAIRS_EMPTY"); require(mixPairs.length > 0, "DODORouteProxy: PAIRS_EMPTY");
require(mixPairs.length == mixAdapters.length, "DODOV2Proxy02: PAIR_ADAPTER_NOT_MATCH"); require(mixPairs.length == mixAdapters.length, "DODORouteProxy: PAIR_ADAPTER_NOT_MATCH");
require(mixPairs.length == assetTo.length - 1, "DODOV2Proxy02: PAIR_ASSETTO_NOT_MATCH"); require(mixPairs.length == assetTo.length - 1, "DODORouteProxy: PAIR_ASSETTO_NOT_MATCH");
require(minReturnAmount > 0, "DODOV2Proxy02: RETURN_AMOUNT_ZERO"); require(minReturnAmount > 0, "DODORouteProxy: RETURN_AMOUNT_ZERO");
address _fromToken = fromToken; address _fromToken = fromToken;
address _toToken = toToken; address _toToken = toToken;
@@ -113,7 +113,7 @@ contract DODORouteProxy {
returnAmount = IERC20(_toToken).tokenBalanceOf(msg.sender).sub(toTokenOriginBalance); returnAmount = IERC20(_toToken).tokenBalanceOf(msg.sender).sub(toTokenOriginBalance);
} }
require(returnAmount >= minReturnAmount, "DODOV2Proxy02: Return amount is not enough"); require(returnAmount >= minReturnAmount, "DODORouteProxy: Return amount is not enough");
emit OrderHistory( emit OrderHistory(
_fromToken, _fromToken,

20
migrations/4_deploy_periphery.js
View File

@@ -28,7 +28,7 @@ const DODOV2RouteHelper = artifacts.require("DODOV2RouteHelper");
const ERC20Mine = artifacts.require("ERC20Mine"); const ERC20Mine = artifacts.require("ERC20Mine");
const vDODOMine = artifacts.require("vDODOMine"); const vDODOMine = artifacts.require("vDODOMine");
const DepthAdapter = artifacts.require("DepthUnderlyingAdapter"); const CurveAdapter = artifacts.require("CurveUnderlyingAdapter");
module.exports = async (deployer, network, accounts) => { module.exports = async (deployer, network, accounts) => {
let CONFIG = GetConfig(network, accounts) let CONFIG = GetConfig(network, accounts)
@@ -371,20 +371,6 @@ module.exports = async (deployer, network, accounts) => {
} }
} }
if(deploySwitch.MULTIHOP) {
logger.log("====================================================");
logger.log("network type: " + network);
logger.log("Deploy time: " + new Date().toLocaleString());
logger.log("Deploy type: MaxHops - Adapter");
await deployer.deploy(
RABSwap,
WETHAddress,
DODOApproveProxyAddress
);
logger.log("DODOMaxHops Address: ", RABSwap.address);
}
if(deploySwitch.test_ADAPTER) { if(deploySwitch.test_ADAPTER) {
logger.log("===================================================="); logger.log("====================================================");
@@ -392,8 +378,8 @@ module.exports = async (deployer, network, accounts) => {
logger.log("Deploy time: " + new Date().toLocaleString()); logger.log("Deploy time: " + new Date().toLocaleString());
logger.log("Deploy type: test - Adapter"); logger.log("Deploy type: test - Adapter");
await deployer.deploy(DepthAdapter); await deployer.deploy(CurveAdapter);
logger.log("test_Adapter Address: ", DepthAdapter.address); logger.log("test_Adapter Address: ", CurveAdapter.address);
} }
}; };