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

simplify cpfacotry && fix proxy-dvm test

Browse Source
This commit is contained in:
owen05
2020-12-31 11:53:54 +08:00
parent f81e5481f8
commit c42f7e590e
5 changed files with 170 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/Factory/CrowdPoolingFactory.sol
View File

@@ -21,13 +21,11 @@ contract CrowdPoolingFactory is InitializableOwnable {
address public immutable _CLONE_FACTORY_;
address public immutable _CP_TEMPLATE_;
address public immutable _UNOWNED_DVM_FACTORY_;
address public immutable _FEE_RATE_MODEL_TEMPLATE_;
address public immutable _DVM_FACTORY_;
address public immutable _DEFAULT_MAINTAINER_;
address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
address public immutable _DEFAULT_PERMISSION_MANAGER_;
address public immutable _DEFAULT_GAS_PRICE_SOURCE_;
uint256 public _X_ = 50; //default
uint256 public _Y_ = 0; //default
@@ -70,21 +68,17 @@ contract CrowdPoolingFactory is InitializableOwnable {
constructor(
address cloneFactory,
address cpTemplate,
address unOwnedDvmFactory,
address feeRateModelTemplate,
address dvmFactory,
address defaultMaintainer,
address defaultMtFeeRateModel,
address defaultPermissionManager,
address defaultGasPriceSource
address defaultPermissionManager
) public {
_CLONE_FACTORY_ = cloneFactory;
_CP_TEMPLATE_ = cpTemplate;
_UNOWNED_DVM_FACTORY_ = unOwnedDvmFactory;
_FEE_RATE_MODEL_TEMPLATE_ = feeRateModelTemplate;
_DVM_FACTORY_ = dvmFactory;
_DEFAULT_MAINTAINER_ = defaultMaintainer;
_DEFAULT_MT_FEE_RATE_MODEL_ = defaultMtFeeRateModel;
_DEFAULT_PERMISSION_MANAGER_ = defaultPermissionManager;
_DEFAULT_GAS_PRICE_SOURCE_ = defaultGasPriceSource;
_X_ = 50;
_Y_ = 30 days;
}
@@ -109,7 +103,7 @@ contract CrowdPoolingFactory is InitializableOwnable {
addressList[3] = quoteToken;
addressList[4] = _DEFAULT_PERMISSION_MANAGER_;
addressList[5] = _DEFAULT_MT_FEE_RATE_MODEL_;
addressList[6] = _UNOWNED_DVM_FACTORY_;
addressList[6] = _DVM_FACTORY_;
ICP(cpAddress).init(
addressList,

8
contracts/lib/DODOMath.sol
View File

@@ -74,8 +74,8 @@ library DODOMath {
// V0 = V1*(1+(sqrt-1)/2k)
// sqrt = √(1+4kidelta/V1)
// premium = 1+(sqrt-1)/2k
uint256 sqrt = DecimalMath.multiMulWithDiv((4 * k).mul(i),delta,V1).add(DecimalMath.ONE2).sqrt();
// uint256 sqrt = (4 * k).mul(i).mul(delta).div(V1).add(DecimalMath.ONE2).sqrt();
// uint256 sqrt = DecimalMath.multiMulWithDiv((4 * k).mul(i),delta,V1).add(DecimalMath.ONE2).sqrt();
uint256 sqrt = (4 * k).mul(i).mul(delta).div(V1).add(DecimalMath.ONE2).sqrt();
uint256 premium = DecimalMath.divFloor(sqrt.sub(DecimalMath.ONE), k * 2).add(
DecimalMath.ONE
);
@@ -129,8 +129,8 @@ library DODOMath {
// Q2=Q1/(1+ideltaBQ1/Q0/Q0)
// temp = ideltaBQ1/Q0/Q0
// Q1-Q2 = Q1*(temp/(1+temp))
uint256 temp = DecimalMath.multiMulWithDiv(i.mul(delta),V1,V0).div(V0);
// uint256 temp = i.mul(delta).mul(V1).div(V0.mul(V0));
// uint256 temp = DecimalMath.multiMulWithDiv(i.mul(delta),V1,V0).div(V0);
uint256 temp = i.mul(delta).mul(V1).div(V0.mul(V0));
return V1.mul(temp).div(temp.add(DecimalMath.ONE));
}

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

@@ -5,8 +5,6 @@
*/
const ethUtil = require('ethereumjs-util');
import { SignHelper } from "../utils/SignHelper";
import BigNumber from "bignumber.js";
import { decimalStr, MAX_UINT256, mweiStr } from '../utils/Converter';
import { logGas } from '../utils/Log';
@@ -20,43 +18,9 @@ let project: string;
let trader: string;
let config = {
lpFeeRate: decimalStr("0.002"),
mtFeeRate: decimalStr("0.001"),
lpFeeRate: decimalStr("0.003"),
k: decimalStr("0.1"),
i: decimalStr("100"),
};
//For Permit Init
let typedData = {
types: {
EIP712Domain: [
{ name: 'name', type: 'string' },
{ name: 'version', type: 'string' },
{ name: 'chainId', type: 'uint256' },
{ name: 'verifyingContract', type: 'address' },
],
Permit: [
{ name: 'owner', type: 'address' },
{ name: 'spender', type: 'address' },
{ name: 'value', type: 'uint256' },
{ name: 'nonce', type: 'uint256' },
{ name: 'deadline', type: 'uint256' },
]
},
primaryType: 'Permit',
domain: {
name: '',
version: '1',
chainId: 1,
verifyingContract: '',
},
message: {
owner: "",
spender: "",
value: MAX_UINT256,
nonce: 0,
deadline: 0
}
i: decimalStr("1"),
};
async function init(ctx: ProxyContext): Promise<void> {
@@ -70,12 +34,15 @@ async function init(ctx: ProxyContext): Promise<void> {
await ctx.mintTestToken(lp, ctx.USDT, mweiStr("1000000"));
await ctx.mintTestToken(project, ctx.USDT, mweiStr("1000000"));
await ctx.mintTestToken(lp, ctx.USDC, mweiStr("1000000"));
await ctx.mintTestToken(project, ctx.USDC, mweiStr("1000000"));
await ctx.approveProxy(lp);
await ctx.approveProxy(project);
await ctx.approveProxy(trader);
}
async function initCreateDVM(ctx: ProxyContext, token0: string, token1:string, token0Amount: string, token1Amount: string, ethValue:string,i:string): Promise<string> {
async function initCreateDVM(ctx: ProxyContext, token0: string, token1: string, token0Amount: string, token1Amount: string, ethValue: string, i: string): Promise<string> {
let PROXY = ctx.DODOProxyV2;
await PROXY.methods.createDODOVendingMachine(
project,
@@ -84,14 +51,13 @@ async function initCreateDVM(ctx: ProxyContext, token0: string, token1:string, t
token0Amount,
token1Amount,
config.lpFeeRate,
config.mtFeeRate,
i,
config.k,
Math.floor(new Date().getTime()/1000 + 60 * 10)
).send(ctx.sendParam(project,ethValue));
if(token0 == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') token0 = ctx.WETH.options.address;
if(token1 == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') token1 = ctx.WETH.options.address;
var addr = await ctx.DVMFactory.methods._REGISTRY_(token0,token1,0).call();
Math.floor(new Date().getTime() / 1000 + 60 * 10)
).send(ctx.sendParam(project, ethValue));
if (token0 == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') token0 = ctx.WETH.options.address;
if (token1 == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') token1 = ctx.WETH.options.address;
var addr = await ctx.DVMFactory.methods._REGISTRY_(token0, token1, 0).call();
return addr;
}
@@ -100,9 +66,13 @@ describe("DODOProxyV2.0", () => {
let snapshotId: string;
let ctx: ProxyContext;
let dvm_DODO_USDT: string;
let dvm_USDT_USDC: string;
let dvm_WETH_USDT: string;
let dvm_WETH_USDC: string;
let DVM_DODO_USDT: Contract;
let DVM_USDT_USDC: Contract;
let DVM_WETH_USDT: Contract;
let DVM_WETH_USDC: Contract;
before(async () => {
let ETH = await contracts.newContract(
@@ -110,12 +80,18 @@ describe("DODOProxyV2.0", () => {
);
ctx = await getProxyContext(ETH.options.address);
await init(ctx);
dvm_DODO_USDT = await initCreateDVM(ctx,ctx.DODO.options.address,ctx.USDT.options.address,decimalStr("100000"),mweiStr("30000"), "0",mweiStr("0.3"));
DVM_DODO_USDT = contracts.getContractWithAddress(contracts.DVM_NAME,dvm_DODO_USDT);
dvm_WETH_USDT = await initCreateDVM(ctx,'0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',ctx.USDT.options.address,decimalStr("5"),mweiStr("30000"),"5",mweiStr("600"));
DVM_WETH_USDT = contracts.getContractWithAddress(contracts.DVM_NAME,dvm_WETH_USDT);
console.log("dvm_DODO_USDT:",dvm_DODO_USDT);
console.log("dvm_WETH_USDT:",dvm_WETH_USDT);
dvm_DODO_USDT = await initCreateDVM(ctx, ctx.DODO.options.address, ctx.USDT.options.address, decimalStr("100000"), mweiStr("20000"), "0", mweiStr("0.2"));
DVM_DODO_USDT = contracts.getContractWithAddress(contracts.DVM_NAME, dvm_DODO_USDT);
dvm_USDT_USDC = await initCreateDVM(ctx, ctx.USDT.options.address, ctx.USDC.options.address, mweiStr("100000"), mweiStr("100000"), "0", mweiStr("1"));
DVM_USDT_USDC = contracts.getContractWithAddress(contracts.DVM_NAME, dvm_USDT_USDC);
dvm_WETH_USDT = await initCreateDVM(ctx, '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', ctx.USDT.options.address, decimalStr("5"), mweiStr("3000"), "5", mweiStr("600"));
DVM_WETH_USDT = contracts.getContractWithAddress(contracts.DVM_NAME, dvm_WETH_USDT);
dvm_WETH_USDC = await initCreateDVM(ctx, '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', ctx.USDC.options.address, decimalStr("5"), mweiStr("3000"), "5", mweiStr("600"));
DVM_WETH_USDC = contracts.getContractWithAddress(contracts.DVM_NAME, dvm_WETH_USDC);
console.log("dvm_DODO_USDT:", dvm_DODO_USDT);
console.log("dvm_USDT_USDC:", dvm_USDT_USDC);
console.log("dvm_WETH_USDT:", dvm_WETH_USDT);
console.log("dvm_WETH_USDC:", dvm_WETH_USDC);
});
beforeEach(async () => {
@@ -139,12 +115,11 @@ describe("DODOProxyV2.0", () => {
baseAmount,
quoteAmount,
config.lpFeeRate,
config.mtFeeRate,
config.i,
config.k,
Math.floor(new Date().getTime()/1000 + 60 * 10)
),ctx.sendParam(project),"createDVM");
var addrs = await ctx.DVMFactory.methods.getVendingMachine(baseToken,quoteToken).call();
Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(project), "createDVM");
var addrs = await ctx.DVMFactory.methods.getVendingMachine(baseToken, quoteToken).call();
assert.equal(
await ctx.DODO.methods.balanceOf(addrs[1]).call(),
baseAmount
@@ -156,42 +131,41 @@ describe("DODOProxyV2.0", () => {
});
it("createDVM - ETH", async () => {
var baseToken = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
var quoteToken = ctx.USDT.options.address;
var baseAmount = decimalStr("5");
var quoteAmount = mweiStr("10000");
await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine(
project,
baseToken,
quoteToken,
baseAmount,
quoteAmount,
config.lpFeeRate,
config.mtFeeRate,
config.i,
config.k,
Math.floor(new Date().getTime()/1000 + 60 * 10)
),ctx.sendParam(project, '5'),"createDVM - Wrap ETH");
var addrs = await ctx.DVMFactory.methods.getVendingMachine(ctx.WETH.options.address,quoteToken).call();
assert.equal(
await ctx.WETH.methods.balanceOf(addrs[1]).call(),
baseAmount
);
assert.equal(
await ctx.USDT.methods.balanceOf(addrs[1]).call(),
quoteAmount
);
});
// it("createDVM - ETH", async () => {
// var baseToken = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
// var quoteToken = ctx.USDT.options.address;
// var baseAmount = decimalStr("5");
// var quoteAmount = mweiStr("10000");
// await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine(
// project,
// baseToken,
// quoteToken,
// baseAmount,
// quoteAmount,
// config.lpFeeRate,
// config.i,
// config.k,
// Math.floor(new Date().getTime() / 1000 + 60 * 10)
// ), ctx.sendParam(project, '5'), "createDVM - Wrap ETH");
// var addrs = await ctx.DVMFactory.methods.getVendingMachine(ctx.WETH.options.address, quoteToken).call();
// assert.equal(
// await ctx.WETH.methods.balanceOf(addrs[1]).call(),
// baseAmount
// );
// assert.equal(
// await ctx.USDT.methods.balanceOf(addrs[1]).call(),
// quoteAmount
// );
// });
it("addLiquidity", 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(lp).call();
assert.equal(b_baseReserve,decimalStr("100000"));
assert.equal(b_quoteReserve,mweiStr("30000"));
assert.equal(b_dlp,decimalStr("0"));
assert.equal(b_baseReserve, decimalStr("100000"));
assert.equal(b_quoteReserve, mweiStr("20000"));
assert.equal(b_dlp, decimalStr("0"));
await logGas(await ctx.DODOProxyV2.methods.addDVMLiquidity(
dvm_DODO_USDT,
lp,
@@ -200,14 +174,14 @@ describe("DODOProxyV2.0", () => {
decimalStr("0"),
mweiStr("0"),
0,
Math.floor(new Date().getTime()/1000 + 60 * 10)
),ctx.sendParam(lp),"addLiquidity");
Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(lp), "addLiquidity");
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(lp).call();
assert.equal(a_baseReserve,decimalStr("101000"));
assert.equal(a_quoteReserve,mweiStr("30300"));
assert.equal(a_dlp,"1000000000000000000000");
assert.equal(a_baseReserve, decimalStr("101000"));
assert.equal(a_quoteReserve, mweiStr("20200"));
assert.equal(a_dlp, "1000000000000000000000");
});
@@ -215,9 +189,9 @@ describe("DODOProxyV2.0", () => {
var b_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
var b_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
var b_dlp = await DVM_WETH_USDT.methods.balanceOf(lp).call();
assert.equal(b_baseReserve,decimalStr("5"));
assert.equal(b_quoteReserve,mweiStr("30000"));
assert.equal(b_dlp,decimalStr("0"));
assert.equal(b_baseReserve, decimalStr("5"));
assert.equal(b_quoteReserve, mweiStr("30000"));
assert.equal(b_dlp, decimalStr("0"));
await logGas(await ctx.DODOProxyV2.methods.addDVMLiquidity(
dvm_WETH_USDT,
lp,
@@ -226,14 +200,14 @@ describe("DODOProxyV2.0", () => {
decimalStr("0"),
mweiStr("0"),
1,
Math.floor(new Date().getTime()/1000 + 60 * 10)
),ctx.sendParam(lp,'1'),"addLiquidity - ETH");
Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(lp, '1'), "addLiquidity - ETH");
var a_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
var a_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
var a_dlp = await DVM_WETH_USDT.methods.balanceOf(lp).call();
assert.equal(a_baseReserve,decimalStr("6"));
assert.equal(a_quoteReserve,mweiStr("36000"));
assert.equal(a_dlp,"1000000000000000000");
assert.equal(a_baseReserve, decimalStr("6"));
assert.equal(a_quoteReserve, mweiStr("36000"));
assert.equal(a_dlp, "1000000000000000000");
});
@@ -245,11 +219,6 @@ describe("DODOProxyV2.0", () => {
var b_USDT = await ctx.USDT.methods.balanceOf(project).call();
var b_ETH = await ctx.Web3.eth.getBalance(project);
// console.log("b_baseReserve:" + b_baseReserve + " b_quoteReserve:" + b_quoteReserve + " b_dlp:" + b_dlp + " b_WETH:" + b_WETH + " b_USDT:" + b_USDT + " b_ETH:" + b_ETH);
assert.equal(b_baseReserve,decimalStr("5"));
assert.equal(b_quoteReserve, mweiStr("30000"));
assert.equal(b_dlp,decimalStr("5"));
assert.equal(b_WETH,decimalStr("0"));
assert.equal(b_USDT, mweiStr("940000"));
await logGas(await DVM_WETH_USDT.methods.sellShares(
decimalStr("1"),
ctx.DODOCalleeHelper.options.address,
@@ -257,7 +226,7 @@ describe("DODOProxyV2.0", () => {
mweiStr("0"),
'0x00',
Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(project),"sellShares - ETH helper");
), ctx.sendParam(project), "sellShares - ETH helper");
var a_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
var a_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
@@ -265,15 +234,46 @@ describe("DODOProxyV2.0", () => {
var a_WETH = await ctx.WETH.methods.balanceOf(project).call();
var a_USDT = await ctx.USDT.methods.balanceOf(project).call();
var a_ETH = await ctx.Web3.eth.getBalance(project);
console.log("b_ETH:" + b_ETH + " a_ETH:" + a_ETH);
// console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve + " a_dlp:" + a_dlp + " a_WETH:" + a_WETH + " a_USDT:" + a_USDT + " a_ETH:" + a_ETH);
assert.equal(a_baseReserve, decimalStr("4"));
assert.equal(a_quoteReserve, mweiStr("24000"));
assert.equal(a_dlp, decimalStr("4"));
assert.equal(a_WETH, decimalStr("0"));
assert.equal(a_USDT, mweiStr("946000"));
assert.equal(a_USDT, mweiStr("856000"));
assert.equal(new BigNumber(b_ETH).isGreaterThan(new BigNumber(a_ETH).minus(decimalStr("1"))), true);
})
it("sellShares - Without ETH helper", async () => {
var b_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
var b_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
var b_dlp = await DVM_WETH_USDT.methods.balanceOf(project).call();
var b_WETH = await ctx.WETH.methods.balanceOf(project).call();
var b_USDT = await ctx.USDT.methods.balanceOf(project).call();
var b_ETH = await ctx.Web3.eth.getBalance(project);
// console.log("b_baseReserve:" + b_baseReserve + " b_quoteReserve:" + b_quoteReserve + " b_dlp:" + b_dlp + " b_WETH:" + b_WETH + " b_USDT:" + b_USDT + " b_ETH:" + b_ETH);
await logGas(await DVM_WETH_USDT.methods.sellShares(
decimalStr("1"),
project,
decimalStr("0"),
mweiStr("0"),
'0x',
Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(project), "sellShares - Without ETH helper");
var a_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
var a_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
var a_dlp = await DVM_WETH_USDT.methods.balanceOf(project).call();
var a_WETH = await ctx.WETH.methods.balanceOf(project).call();
var a_USDT = await ctx.USDT.methods.balanceOf(project).call();
var a_ETH = await ctx.Web3.eth.getBalance(project);
// console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve + " a_dlp:" + a_dlp + " a_WETH:" + a_WETH + " a_USDT:" + a_USDT + " a_ETH:" + a_ETH);
assert.equal(a_baseReserve, decimalStr("4"));
assert.equal(a_quoteReserve, mweiStr("24000"));
assert.equal(a_dlp, decimalStr("4"));
assert.equal(a_WETH, decimalStr("1"));
assert.equal(a_USDT, mweiStr("856000"));
})
it("swap - one jump", async () => {
await ctx.mintTestToken(trader, ctx.DODO, decimalStr("1000"));
var b_DOOD = await ctx.DODO.methods.balanceOf(trader).call();
@@ -281,9 +281,8 @@ describe("DODOProxyV2.0", () => {
var dodoPairs = [
dvm_DODO_USDT
]
var directions = [
0
]
var directions = 0
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
@@ -299,7 +298,7 @@ describe("DODOProxyV2.0", () => {
console.log("b_DOOD:" + b_DOOD + " a_DODO:" + a_DOOD);
console.log("b_USDT:" + b_USDT + " a_USDT:" + a_USDT);
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_USDT, "189227055");
assert.equal(a_USDT, "124886061");
});
@@ -311,10 +310,7 @@ describe("DODOProxyV2.0", () => {
dvm_DODO_USDT,
dvm_WETH_USDT
]
var directions = [
0,
1
]
var directions = 2
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
@@ -330,7 +326,7 @@ describe("DODOProxyV2.0", () => {
console.log("b_DOOD:" + b_DOOD + " a_DODO:" + a_DOOD);
console.log("b_WETH:" + b_WETH + " a_WETH:" + a_WETH);
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_WETH, "51466023624936494");
assert.equal(a_WETH, "160562971834401560");
});
it("swap - two jump - inETH", async () => {
@@ -341,10 +337,7 @@ describe("DODOProxyV2.0", () => {
dvm_WETH_USDT,
dvm_DODO_USDT
]
var directions = [
0,
1
]
var directions = 2
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
@@ -359,12 +352,12 @@ describe("DODOProxyV2.0", () => {
console.log("b_DOOD:" + b_DOOD + " a_DODO:" + a_DOOD);
console.log("b_WETH:" + b_WETH + " a_WETH:" + a_WETH);
console.log("b_ETH:" + b_ETH + " a_ETH:" + a_ETH);
assert.equal(a_DOOD, "7952984575630657240990");
assert.equal(a_DOOD, "2758402621041673925359");
});
it("swap - two jump - outETH", async () => {
await ctx.mintTestToken(trader, ctx.DODO, decimalStr("100000"));
await ctx.mintTestToken(trader, ctx.DODO, decimalStr("1000"));
var b_DOOD = await ctx.DODO.methods.balanceOf(trader).call();
var b_WETH = await ctx.WETH.methods.balanceOf(trader).call();
var b_ETH = await ctx.Web3.eth.getBalance(trader);
@@ -372,14 +365,11 @@ describe("DODOProxyV2.0", () => {
dvm_DODO_USDT,
dvm_WETH_USDT
]
var directions = [
0,
1
]
var directions = 2
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("10000"),
decimalStr("1000"),
1,
dodoPairs,
directions,
@@ -391,153 +381,41 @@ describe("DODOProxyV2.0", () => {
console.log("b_DOOD:" + b_DOOD + " a_DODO:" + a_DOOD);
console.log("b_WETH:" + b_WETH + " a_WETH:" + a_WETH);
console.log("b_ETH:" + b_ETH + " a_ETH:" + a_ETH);
assert.equal(a_DOOD, decimalStr("90000"));
assert.equal(a_DOOD, decimalStr("0"));
assert.equal(
tx.events['OrderHistory'].returnValues['returnAmount'],
"859941980524143252"
"317467466094549770"
)
});
// 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();
// var b_DODO = await ctx.DODO.methods.balanceOf(project).call();
// var b_USDT = await ctx.USDT.methods.balanceOf(project).call();
// assert.equal(b_baseReserve,decimalStr("100000"));
// assert.equal(b_quoteReserve,mweiStr("30000"));
// assert.equal(b_dlp,decimalStr("100000"));
// assert.equal(b_DODO,decimalStr("900000"));
// assert.equal(b_USDT,mweiStr("940000"));
// await DVM_DODO_USDT.methods.approve(ctx.SmartApprove.options.address, MAX_UINT256).send(ctx.sendParam(project));
// await logGas(await ctx.DODOProxy.methods.removeDVMLiquidity(
// dvm_DODO_USDT,
// project,
// decimalStr("100"),
// decimalStr("0"),
// mweiStr("0"),
// 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();
// var a_DODO = await ctx.DODO.methods.balanceOf(project).call();
// var a_USDT = await ctx.USDT.methods.balanceOf(project).call();
// assert.equal(a_baseReserve, decimalStr("99900"));
// assert.equal(a_quoteReserve, mweiStr("29970"));
// assert.equal(a_dlp, decimalStr("99900"));
// assert.equal(a_DODO, decimalStr("900100"));
// assert.equal(a_USDT, mweiStr("940030"));
// });
// it("removeLiquidity - ETH", async () => {
// var b_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
// var b_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
// var b_dlp = await DVM_WETH_USDT.methods.balanceOf(project).call();
// var b_WETH = await ctx.WETH.methods.balanceOf(project).call();
// var b_USDT = await ctx.USDT.methods.balanceOf(project).call();
// var b_ETH = await ctx.Web3.eth.getBalance(project);
// assert.equal(b_baseReserve, decimalStr("5"));
// assert.equal(b_quoteReserve, mweiStr("30000"));
// assert.equal(b_dlp, decimalStr("5"));
// assert.equal(b_WETH, decimalStr("0"));
// assert.equal(b_USDT, mweiStr("940000"));
// await DVM_WETH_USDT.methods.approve(ctx.SmartApprove.options.address, MAX_UINT256).send(ctx.sendParam(project));
// var tx = await logGas(await ctx.DODOProxy.methods.removeDVMLiquidity(
// dvm_WETH_USDT,
// project,
// decimalStr("1"),
// decimalStr("0"),
// mweiStr("0"),
// 1,
// Math.floor(new Date().getTime() / 1000 + 60 * 10)
// ), ctx.sendParam(project), "removeLiquidity - ETH");
// var a_baseReserve = await DVM_WETH_USDT.methods._BASE_RESERVE_().call();
// var a_quoteReserve = await DVM_WETH_USDT.methods._QUOTE_RESERVE_().call();
// var a_dlp = await DVM_WETH_USDT.methods.balanceOf(project).call();
// var a_WETH = await ctx.WETH.methods.balanceOf(project).call();
// var a_USDT = await ctx.USDT.methods.balanceOf(project).call();
// var a_ETH = await ctx.Web3.eth.getBalance(project);
// // console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve + " a_dlp:" + a_dlp + " a_WETH:" + a_WETH + " a_USDT:" + a_USDT);
// assert.equal(a_baseReserve, decimalStr("4"));
// assert.equal(a_quoteReserve, mweiStr("24000"));
// assert.equal(a_dlp, decimalStr("4"));
// assert.equal(a_WETH, decimalStr("0"));
// assert.equal(a_USDT, mweiStr("946000"));
// console.log("b_ETH:", b_ETH);
// console.log("a_ETH:", a_ETH);
// assert.equal(new BigNumber(b_ETH).isGreaterThan(new BigNumber(a_ETH).minus(decimalStr("1"))), true);
// });
// it("removeLiquidity - permit", 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();
// var b_DODO = await ctx.DODO.methods.balanceOf(project).call();
// var b_USDT = await ctx.USDT.methods.balanceOf(project).call();
// assert.equal(b_baseReserve, decimalStr("100000"));
// assert.equal(b_quoteReserve, mweiStr("30000"));
// assert.equal(b_dlp, decimalStr("100000"));
// assert.equal(b_DODO, decimalStr("900000"));
// assert.equal(b_USDT, mweiStr("940000"));
// var DOMAIN_SEPARATOR = await DVM_DODO_USDT.methods.DOMAIN_SEPARATOR().call();
// // var name = await DVM_DODO_USDT.methods.name().call();
// // typedData.domain.name = ctx.Web3.utils.sha3(name);
// // typedData.domain.version = ctx.Web3.utils.sha3('1');
// // typedData.domain.chainId = await ctx.Web3.eth.getChainId();
// // typedData.domain.verifyingContract = dvm_DODO_USDT;
// typedData.message.owner = project;
// typedData.message.spender = ctx.SmartApprove.options.address;
// var nonceStr = await DVM_DODO_USDT.methods.nonces(project).call();
// typedData.message.nonce = parseInt(nonceStr);
// typedData.message.deadline = Math.floor(new Date().getTime() / 1000 + 60 * 10);
// var resHash = new SignHelper().signHash(DOMAIN_SEPARATOR,typedData.message);
// var sig = await ctx.Web3.eth.sign('0x' + resHash.toString('hex'), project);
// // let r = sig.slice(0, 66)
// // let s = '0x' + sig.slice(66, 130)
// // let v = '0x1c'
// const signRes = ethUtil.fromRpcSig(sig);
// const prefix = Buffer.from("\x19Ethereum Signed Message:\n");
// const prefixedMsg = ethUtil.keccak256(
// Buffer.concat([prefix, Buffer.from(String(resHash.length)), resHash])
// );
// console.log("add-prefix-degist:", "0x" + prefixedMsg.toString('hex'));
// var pubKey = ethUtil.ecrecover(prefixedMsg, signRes.v,signRes.r,signRes.s)
// // var pubKey = ethUtil.ecrecover(resHash, Buffer.from(v), Buffer.from(r), Buffer.from(s))
// var addrBuf = ethUtil.pubToAddress(pubKey);
// console.log("project:" + project);
// console.log("addr-web3-recover:" + ethUtil.bufferToHex(addrBuf));
// // var tx = await logGas(await DVM_DODO_USDT.methods.permit(project, typedData.message.spender, typedData.message.value, typedData.message.deadline, signRes.v, signRes.r, signRes.s), ctx.sendParam(project), "perimit test");
// // console.log("addr-sol-recover:" + tx.events['TestAddr'].returnValues['addr']);
// // console.log("sol-domain:" + tx.events['TestAddr'].returnValues['domain']);
// // console.log("sol-msg:" + tx.events['TestAddr'].returnValues['message']);
// // console.log("sol-digest:" + tx.events['TestAddr'].returnValues['digest']);
// // await logGas(await ctx.DODOProxy.methods.removeDVMLiquidityWithPermit(
// // dvm_DODO_USDT,
// // project,
// // decimalStr("100"),
// // decimalStr("0"),
// // mweiStr("0"),
// // 0,
// // typedData.message.deadline,
// // true,
// // signRes.v, signRes.r, signRes.s
// // ), ctx.sendParam(project), "removeLiquidity perimit");
// // 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();
// // var a_DODO = await ctx.DODO.methods.balanceOf(project).call();
// // var a_USDT = await ctx.USDT.methods.balanceOf(project).call();
// // console.log("a_baseReserve:" + a_baseReserve + " a_quoteReserve:" + a_quoteReserve + " a_dlp:" + a_dlp + " a_DODO:" + a_DODO + " a_USDT:" + a_USDT);
// // assert.equal(a_baseReserve, decimalStr("99900"));
// // assert.equal(a_quoteReserve, mweiStr("29970"));
// // assert.equal(a_dlp, decimalStr("99900"));
// // assert.equal(a_DODO, decimalStr("900100"));
// // assert.equal(a_USDT, mweiStr("940030"));
// });
it("swap - three jump", async () => {
await ctx.mintTestToken(trader, ctx.DODO, decimalStr("1000"));
var b_DOOD = await ctx.DODO.methods.balanceOf(trader).call();
var b_WETH = await ctx.WETH.methods.balanceOf(trader).call();
var dodoPairs = [
dvm_DODO_USDT,
dvm_USDT_USDC,
dvm_WETH_USDC
]
var directions = 4
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
1,
dodoPairs,
directions,
Math.floor(new Date().getTime() / 1000 + 60 * 10)
), ctx.sendParam(trader), "swap - two jump");
var a_DOOD = await ctx.DODO.methods.balanceOf(trader).call();
var a_WETH = await ctx.WETH.methods.balanceOf(trader).call();
console.log("b_DOOD:" + b_DOOD + " a_DODO:" + a_DOOD);
console.log("b_WETH:" + b_WETH + " a_WETH:" + a_WETH);
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_WETH, "158299831331715351");
});
});
});

1
test/utils/Contracts.ts
View File

@@ -41,7 +41,6 @@ export const DPP_NAME = "DPP"
export const DPP_FACTORY_NAME = "DPPFactory"
export const SMART_APPROVE = "DODOApprove"
export const DODO_SELL_HELPER = "DODOSellHelper"
export const DVM_ADMIN_NAME = "DVMAdmin"
export const DPP_ADMIN_NAME = "DPPAdmin"
export const DODO_CALLEE_HELPER_NAME = "DODOCalleeHelper"
export const CROWD_POOLING_NAME = "CP"

34
test/utils/ProxyContextV2.ts
View File

@@ -33,6 +33,7 @@ export class ProxyContext {
//token
DODO: Contract;
USDC: Contract;
USDT: Contract;
WETH: Contract;
@@ -58,25 +59,17 @@ export class ProxyContext {
var dvmTemplate = await contracts.newContract(contracts.DVM_NAME)
var dppTemplate = await contracts.newContract(contracts.DPP_NAME)
var cpTemplate = await contracts.newContract(contracts.CROWD_POOLING_NAME)
var dvmAdminTemplate = await contracts.newContract(contracts.DVM_ADMIN_NAME)
var dppAdminTemplate = await contracts.newContract(contracts.DPP_ADMIN_NAME)
var feeRateModelTemplate = await contracts.newContract(contracts.FEE_RATE_MODEL_NAME)
var permissionManagerTemplate = await contracts.newContract(contracts.PERMISSION_MANAGER_NAME)
var vauleSource = await contracts.newContract(contracts.EXTERNAL_VALUE_NAME)
var defaultGasSource = await contracts.newContract(contracts.EXTERNAL_VALUE_NAME)
await defaultGasSource.methods.init(this.Deployer,MAX_UINT256).send(this.sendParam(this.Deployer));
var mtFeeRateModelTemplate = await contracts.newContract(contracts.FEE_RATE_MODEL_NAME)
await mtFeeRateModelTemplate.methods.init(this.Deployer,decimalStr("0.01")).send(this.sendParam(this.Deployer));
this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
[
cloneFactory.options.address,
dvmTemplate.options.address,
dvmAdminTemplate.options.address,
feeRateModelTemplate.options.address,
permissionManagerTemplate.options.address,
defaultGasSource.options.address,
this.Deployer,
feeRateModelTemplate.options.address,
permissionManagerTemplate.options.address
mtFeeRateModelTemplate.options.address
]
)
@@ -90,10 +83,8 @@ export class ProxyContext {
cloneFactory.options.address,
dppTemplate.options.address,
dppAdminTemplate.options.address,
feeRateModelTemplate.options.address,
permissionManagerTemplate.options.address,
vauleSource.options.address,
defaultGasSource.options.address,
this.Deployer,
mtFeeRateModelTemplate.options.address,
this.DODOApprove.options.address
]
)
@@ -103,11 +94,9 @@ export class ProxyContext {
cloneFactory.options.address,
cpTemplate.options.address,
this.DVMFactory.options.address,
feeRateModelTemplate.options.address,
this.Deployer,
feeRateModelTemplate.options.address,
permissionManagerTemplate.options.address,
defaultGasSource.options.address
mtFeeRateModelTemplate.options.address,
permissionManagerTemplate.options.address
]
)
@@ -137,6 +126,10 @@ export class ProxyContext {
contracts.MINTABLE_ERC20_CONTRACT_NAME,
["USDT Token", "USDT", 6]
);
this.USDC = await contracts.newContract(
contracts.MINTABLE_ERC20_CONTRACT_NAME,
["USDC Token", "USDC", 6]
);
this.DODOCalleeHelper = await contracts.newContract(
contracts.DODO_CALLEE_HELPER_NAME,
@@ -166,6 +159,9 @@ export class ProxyContext {
await this.USDT.methods
.approve(this.DODOApprove.options.address, MAX_UINT256)
.send(this.sendParam(account));
await this.USDC.methods
.approve(this.DODOApprove.options.address, MAX_UINT256)
.send(this.sendParam(account));
await this.WETH.methods
.approve(this.DODOApprove.options.address, MAX_UINT256)
.send(this.sendParam(account));