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

fix

Browse Source
This commit is contained in:
owen05
2021-01-07 21:58:24 +08:00
parent b2c8668a12
commit 267ad24edc
9 changed files with 18 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/Proxy/proxy.classical.test.ts
View File

@@ -175,7 +175,6 @@ describe("AddLiquidity", () => {
await ctxV1.DODO.methods.approve(ctxV2.DODOApprove.options.address, MAX_UINT256).send(ctxV2.sendParam(trader));
await ctxV1.USDT.methods.approve(ctxV2.DODOApprove.options.address, MAX_UINT256).send(ctxV2.sendParam(trader));
await logGas(await ctxV2.DODOProxyV2.methods.addLiquidityToV1(
trader,
ctxV1.DODO_USDT.options.address,
decimalStr("100"),
mweiStr("100"),
@@ -205,7 +204,6 @@ describe("AddLiquidity", () => {
console.log("weth_lp:" + weth_lp + " usdc_lp:" + usdc_lp);
await ctxV1.USDC.methods.approve(ctxV2.DODOApprove.options.address, MAX_UINT256).send(ctxV2.sendParam(trader));
await logGas(await ctxV2.DODOProxyV2.methods.addLiquidityToV1(
trader,
ctxV1.WETH_USDC.options.address,
decimalStr("1"),
mweiStr("100"),

6
test/Proxy/proxy.cp.test.ts
View File

@@ -140,7 +140,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(b_lp_2, decimalStr("0"));
await logGas(await ctx.DODOProxyV2.methods.bid(
buyer1,
cp_DODO_USDT,
mweiStr("50"),
0,
@@ -148,7 +147,6 @@ describe("DODOProxyV2.0", () => {
), ctx.sendParam(buyer1), "bid");
await logGas(await ctx.DODOProxyV2.methods.bid(
buyer2,
cp_DODO_USDT,
mweiStr("80"),
0,
@@ -156,7 +154,6 @@ describe("DODOProxyV2.0", () => {
), ctx.sendParam(buyer2), "bid");
await logGas(await ctx.DODOProxyV2.methods.bid(
buyer2,
cp_DODO_USDT,
mweiStr("80"),
0,
@@ -164,7 +161,6 @@ describe("DODOProxyV2.0", () => {
), ctx.sendParam(buyer2), "bid");
await logGas(await ctx.DODOProxyV2.methods.bid(
buyer2,
cp_DODO_USDT,
mweiStr("80"),
0,
@@ -193,7 +189,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(b_lp_2, decimalStr("0"));
await logGas(await ctx.DODOProxyV2.methods.bid(
buyer1,
cp_DODO_WETH,
decimalStr("2"),
1,
@@ -201,7 +196,6 @@ describe("DODOProxyV2.0", () => {
), ctx.sendParam(buyer1, "2"), "bid");
await logGas(await ctx.DODOProxyV2.methods.bid(
buyer2,
cp_DODO_WETH,
decimalStr("1"),
1,

10
test/Proxy/proxy.dpp.test.ts
View File

@@ -236,7 +236,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 0
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.USDT.options.address,
decimalStr("500"),
@@ -252,7 +251,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_USDT, "99749900");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.USDT.options.address,
decimalStr("500"),
@@ -273,7 +271,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -289,7 +286,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_WETH, "165350643050738035");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -310,7 +306,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
1,
dodoPairs,
@@ -325,7 +320,6 @@ describe("DODOProxyV2.0", () => {
// console.log("b_ETH:" + b_ETH + " a_ETH:" + a_ETH);
assert.equal(a_DOOD, "2908497423869401229986");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
1,
dodoPairs,
@@ -346,7 +340,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("500"),
1,
@@ -366,7 +359,6 @@ describe("DODOProxyV2.0", () => {
"165350643050738035"
)
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("500"),
1,
@@ -388,7 +380,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 4
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -404,7 +395,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_WETH, "165004688801375425");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),

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

@@ -45,7 +45,6 @@ async function init(ctx: ProxyContext): Promise<void> {
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,
token0,
token1,
token0Amount,
@@ -109,7 +108,6 @@ describe("DODOProxyV2.0", () => {
var baseAmount = decimalStr("10000");
var quoteAmount = mweiStr("10000");
await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine(
project,
baseToken,
quoteToken,
baseAmount,
@@ -137,7 +135,6 @@ describe("DODOProxyV2.0", () => {
// var baseAmount = decimalStr("5");
// var quoteAmount = mweiStr("10000");
// await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine(
// project,
// baseToken,
// quoteToken,
// baseAmount,
@@ -168,7 +165,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(b_dlp, decimalStr("0"));
await logGas(await ctx.DODOProxyV2.methods.addDVMLiquidity(
dvm_DODO_USDT,
lp,
decimalStr("1000"),
mweiStr("300"),
decimalStr("0"),
@@ -194,7 +190,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(b_dlp, decimalStr("0"));
await logGas(await ctx.DODOProxyV2.methods.addDVMLiquidity(
dvm_WETH_USDT,
lp,
decimalStr("1"),
mweiStr("6000"),
decimalStr("0"),
@@ -284,7 +279,6 @@ describe("DODOProxyV2.0", () => {
var directions = 0
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.USDT.options.address,
decimalStr("500"),
@@ -300,7 +294,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_USDT, "126151370");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.USDT.options.address,
decimalStr("500"),
@@ -322,7 +315,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -338,7 +330,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_WETH, "163816613646287588");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -359,7 +350,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
1,
dodoPairs,
@@ -374,7 +364,6 @@ describe("DODOProxyV2.0", () => {
// console.log("b_ETH:" + b_ETH + " a_ETH:" + a_ETH);
assert.equal(a_DOOD, "2814340111190341070680");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
1,
dodoPairs,
@@ -392,7 +381,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("1000"),
1,
@@ -407,7 +395,6 @@ describe("DODOProxyV2.0", () => {
"323865907568573497"
)
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("1000"),
1,
@@ -426,7 +413,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 4
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -440,7 +426,6 @@ describe("DODOProxyV2.0", () => {
assert.equal(a_DOOD, decimalStr("500"));
assert.equal(a_WETH, "163633965833613187");
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),

4
test/Proxy/proxy.mix.test.ts
View File

@@ -60,7 +60,6 @@ async function initCreateDPP(ctx: ProxyContext, token0: string, token1: 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,
token0,
token1,
token0Amount,
@@ -114,7 +113,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
decimalStr("500"),
@@ -141,7 +139,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
1,
dodoPairs,
@@ -169,7 +166,6 @@ describe("DODOProxyV2.0", () => {
]
var directions = 2
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("10000"),
1,