add proxy test framework
This commit is contained in:
@@ -40,8 +40,6 @@ contract SmartSwap is Ownable {
|
||||
uint256 timeStamp
|
||||
);
|
||||
|
||||
event ExternalRecord(address indexed to, address indexed sender);
|
||||
|
||||
constructor(
|
||||
address _smartApprove,
|
||||
address _dodoSellHelper,
|
||||
@@ -76,9 +74,8 @@ contract SmartSwap is Ownable {
|
||||
}
|
||||
|
||||
for (uint256 i = 0; i < dodoPairs.length; i++) {
|
||||
uint256 curDirection = directions[i];
|
||||
address curDodoPair = dodoPairs[i];
|
||||
if (curDirection == 0) {
|
||||
if (directions[i] == 0) {
|
||||
address curDodoBase = IDODO(curDodoPair)._BASE_TOKEN_();
|
||||
uint256 curAmountIn = IERC20(curDodoBase).balanceOf(address(this));
|
||||
IERC20(curDodoBase).universalApprove(curDodoPair, curAmountIn);
|
||||
@@ -139,6 +136,5 @@ contract SmartSwap is Ownable {
|
||||
require(returnAmount >= minReturnAmount, "DODO SmartSwap: Return amount is not enough");
|
||||
IERC20(toToken).universalTransfer(msg.sender, returnAmount);
|
||||
emit OrderHistory(fromToken, toToken, msg.sender, fromTokenAmount, returnAmount, block.timestamp);
|
||||
emit ExternalRecord(to, msg.sender);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,21 +11,8 @@ pragma experimental ABIEncoderV2;
|
||||
import {IERC20} from "./IERC20.sol";
|
||||
|
||||
interface IDODOV2 {
|
||||
function createDODOPrivatePool(
|
||||
address baseToken,
|
||||
address quoteToken,
|
||||
address[] memory valueTemplates, //feeRateAddr,mtRateAddr,kAddr,iAddr
|
||||
uint256[] memory values //feeRate,mtRate,k,i
|
||||
) external returns (address newPrivatePool);
|
||||
|
||||
function createDODOVendingMachine(
|
||||
address baseToken,
|
||||
address quoteToken,
|
||||
uint256 lpFeeRate,
|
||||
uint256 mtFeeRate,
|
||||
uint256 i,
|
||||
uint256 k
|
||||
) external returns (address newVendingMachine);
|
||||
//========== Common ==================
|
||||
|
||||
function sellBase(address to) external returns (uint256 receiveQuoteAmount);
|
||||
|
||||
@@ -35,16 +22,34 @@ interface IDODOV2 {
|
||||
|
||||
function sellShares(address to) external returns (uint256,uint256);
|
||||
|
||||
|
||||
function getVaultReserve() external view returns (uint256 baseReserve, uint256 quoteReserve);
|
||||
|
||||
function _BASE_TOKEN_() external returns (address);
|
||||
|
||||
function _QUOTE_TOKEN_() external returns (address);
|
||||
|
||||
//========== DODOVendingMachine ========
|
||||
|
||||
function createDODOVendingMachine(
|
||||
address baseToken,
|
||||
address quoteToken,
|
||||
uint256 lpFeeRate,
|
||||
uint256 mtFeeRate,
|
||||
uint256 i,
|
||||
uint256 k
|
||||
) external returns (address newVendingMachine);
|
||||
|
||||
//========== DODOPrivatePool ===========
|
||||
|
||||
function initTargetAndReserve() external;
|
||||
|
||||
function createDODOPrivatePool(
|
||||
address baseToken,
|
||||
address quoteToken,
|
||||
address[] memory valueTemplates, //feeRateAddr,mtRateAddr,kAddr,iAddr
|
||||
uint256[] memory values //feeRate,mtRate,k,i
|
||||
) external returns (address newPrivatePool);
|
||||
|
||||
function reset(
|
||||
uint256 newLpFeeRate,
|
||||
uint256 newMtFeeRate,
|
||||
|
||||
Reference in New Issue
Block a user