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

remove proxy removeliqudity

Browse Source
This commit is contained in:
owen05
2020-11-26 21:16:40 +08:00
parent e3637fe022
commit 978b7eb1db
3 changed files with 1 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/SmartRoute/DODOV2Proxy01.sol
View File

@@ -181,19 +181,6 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
require(baseActualInAmount >= baseMinAmount && quoteActualInAmount >= quoteMinAmount, 'DODOV2Proxy01: deposit amount is not enough');
}
function removeDVMLiquidity(
address DVMAddress,
address to,
uint256 shares,
uint256 baseOutMinAmount,
uint256 quoteOutMinAmount,
uint256 deadline
) external virtual override judgeExpired(deadline) returns (uint256 baseOutAmount,uint256 quoteOutAmount) {
require(shares > 0, 'DODOV2Proxy01: Insufficient_Liquidity');
(baseOutAmount,quoteOutAmount) = IDODOV2(DVMAddress).sellShares(to);
require(baseOutAmount >= baseOutMinAmount && quoteOutAmount >= quoteOutMinAmount,'DODOV2Proxy01: withdraw amount is not enough');
}
function createDODOPrivatePool(
address baseToken,
address quoteToken,

14
contracts/intf/IDODOV2Proxy01.sol
View File

@@ -89,17 +89,6 @@ interface IDODOV2Proxy01 {
uint256 deadline
) external payable returns (uint256 shares,uint256 baseActualInAmount,uint256 quoteActualInAmount);
function removeDVMLiquidity(
address DVMAddress,
address to,
uint256 shares,
uint256 baseOutMinAmount,
uint256 quoteOutMinAmount,
uint256 deadline
) external returns (uint256 baseOutAmount,uint256 quoteOutAmount);
function createDODOPrivatePool(
address baseToken,
address quoteToken,
@@ -109,10 +98,9 @@ interface IDODOV2Proxy01 {
uint256 mtFeeRate,
uint256 i,
uint256 k,
uint256 deadline
uint256 deadline
) external payable returns (address newPrivatePool);
function resetDODOPrivatePool(
address DPPAddress,
uint256 newLpFeeRate,

35
test/Proxy/proxy.dvm.test.ts
View File

@@ -211,40 +211,5 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_dlp,"1000000000000000000");
});
//TODO:ing
it("removeLiquidity", async () => {
var b_baseReserve = await DVM_DODO_USDT.methods._BASE_RESERVE_().call();
var b_quoteReserve = await DVM_DODO_USDT.methods._QUOTE_RESERVE_().call();
var b_dlp = await DVM_DODO_USDT.methods.balanceOf(project).call();
assert.equal(b_baseReserve,decimalStr("100000"));
assert.equal(b_quoteReserve,mweiStr("30000"));
console.log("b_dlp:" + b_dlp);
// assert.equal(b_dlp,decimalStr("0"));
await logGas(await ctx.DODOProxy.methods.removeDVMLiquidity(
dvm_DODO_USDT,
project,
decimalStr("100"),
decimalStr("0"),
mweiStr("0"),
Math.floor(new Date().getTime()/1000 + 60 * 10)
),ctx.sendParam(project),"removeLiquidity");
var a_baseReserve = await DVM_DODO_USDT.methods._BASE_RESERVE_().call();
var a_quoteReserve = await DVM_DODO_USDT.methods._QUOTE_RESERVE_().call();
var a_dlp = await DVM_DODO_USDT.methods.balanceOf(project).call();
// assert.equal(a_baseReserve,decimalStr("6"));
// assert.equal(a_quoteReserve,mweiStr("36000"));
// assert.equal(a_dlp,"1000000000000000000");
console.log("b_dlp:" + b_dlp + " a_dlp:" + a_dlp);
console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve);
});
/**
*
*/
it("dodoSwap", async () => {
});
});
});