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

fix && addLiquidityToV1 && test

Browse Source
This commit is contained in:
owen05
2020-12-01 01:47:22 +08:00
parent c3f8e3cc40
commit 21624daa07
17 changed files with 419 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/SmartRoute/intf/IDODOV1Proxy01.sol
View File

@@ -9,14 +9,14 @@ pragma solidity 0.6.9;
pragma experimental ABIEncoderV2;
interface IDODOV1Proxy01 {
function dodoSwap(
function dodoSwapV1(
address fromToken,
address toToken,
uint256 fromTokenAmount,
uint256 minReturnAmount,
address[] memory dodoPairs,
uint8[] memory directions,
uint256 deadline
uint256 deadLine
) external payable returns (uint256 returnAmount);
function externalSwap(
@@ -27,6 +27,6 @@ interface IDODOV1Proxy01 {
uint256 fromTokenAmount,
uint256 minReturnAmount,
bytes memory callDataConcat,
uint256 deadline
uint256 deadLine
) external payable returns (uint256 returnAmount);
}

5
contracts/SmartRoute/intf/IDODOV2.sol
View File

@@ -38,11 +38,6 @@ interface IDODOV2 {
function buyShares(address to) external returns (uint256,uint256,uint256);
// ============= permit =================
function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external;
function sellShares(address to) external returns (uint256,uint256);
// ======================================
//========== DODOPrivatePool ===========

39
contracts/SmartRoute/intf/IDODOV2Proxy01.sol
View File

@@ -11,27 +11,26 @@ pragma experimental ABIEncoderV2;
import {IDODOV1Proxy01} from "./IDODOV1Proxy01.sol";
interface IDODOV2Proxy01 is IDODOV1Proxy01 {
function dodoSwapETHToToken(
function dodoSwapV2ETHToToken(
address payable assetTo,
address toToken,
uint256 fromTokenAmount,
uint256 minReturnAmount,
address[] memory dodoPairs,
uint8[] memory directions,
uint256 deadline
uint256 deadLine
) external payable returns (uint256 returnAmount);
function dodoSwapTokenToETH(
function dodoSwapV2TokenToETH(
address payable assetTo,
address fromToken,
uint256 fromTokenAmount,
uint256 minReturnAmount,
address[] memory dodoPairs,
uint8[] memory directions,
uint256 deadline
uint256 deadLine
) external returns (uint256 returnAmount);
function dodoSwapTokenToToken(
function dodoSwapV2TokenToToken(
address payable assetTo,
address fromToken,
address toToken,
@@ -39,7 +38,7 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
uint256 minReturnAmount,
address[] memory dodoPairs,
uint8[] memory directions,
uint256 deadline
uint256 deadLine
) external returns (uint256 returnAmount);
function createDODOVendingMachine(
@@ -52,18 +51,18 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
uint256 mtFeeRate,
uint256 i,
uint256 k,
uint256 deadline
uint256 deadLine
) external payable returns (address newVendingMachine, uint256 shares);
function addDVMLiquidity(
address DVMAddress,
address dvmAddress,
address to,
uint256 baseInAmount,
uint256 quoteInAmount,
uint256 baseMinAmount,
uint256 quoteMinAmount,
uint8 flag, // 0 - ERC20, 1 - baseInETH, 2 - quoteInETH
uint256 deadline
uint256 deadLine
)
external
payable
@@ -82,11 +81,11 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
uint256 mtFeeRate,
uint256 i,
uint256 k,
uint256 deadline
uint256 deadLine
) external payable returns (address newPrivatePool);
function resetDODOPrivatePool(
address DPPAddress,
address dppAddress,
uint256 newLpFeeRate,
uint256 newMtFeeRate,
uint256 newI,
@@ -96,12 +95,18 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
uint256 baseOutAmount,
uint256 quoteOutAmount,
uint8 flag, // 0 - ERC20, 1 - baseInETH, 2 - quoteInETH, 3 - baseOutETH, 4 - quoteOutETH
uint256 deadline
uint256 deadLine
) external payable;
//TODO: addLiquidityToClassical
function addLiquidityToV1(
address to,
address pair,
uint256 baseAmount,
uint256 quoteAmount,
uint256 baseMinShares,
uint256 quoteMinShares,
uint8 flag, // 0 erc20 Out 1 baseOutETH 2 quoteOut ETH
uint256 deadLine
) external payable returns(uint256, uint256);
//TODO: removeLiquidityToClassical
//TODO: Compatible with classical swap
}