Merge branch 'feature/V2' of github.com:DODOEX/contractV2 into feature/V2

2020-11-25 17:16:59 +08:00
parent 1c92f2e6b4 8da583d5a8
commit 31d3b0fd9b
24 changed files with 382 additions and 176 deletions
--- a/test/Proxy/proxy.dpp.test.ts
+++ b/test/Proxy/proxy.dpp.test.ts
@@ -0,0 +1,161 @@
+/*
+
+    Copyright 2020 DODO ZOO.
+    SPDX-License-Identifier: Apache-2.0
+
+*/
+
+// import * as assert from 'assert';
+
+import { decimalStr, mweiStr} from '../utils/Converter';
+import { logGas } from '../utils/Log';
+import { ProxyContext, getProxyContext } from '../utils/ProxyContext';
+import { assert } from 'chai';
+
+let lp: string;
+let project: string;
+let trader: string;
+
+let config = {
+  lpFeeRate: decimalStr("0.002"),
+  mtFeeRate: decimalStr("0.001"),
+  k: decimalStr("0.1"),
+  i: decimalStr("100"),
+};
+
+async function init(ctx: ProxyContext): Promise<void> {
+  lp = ctx.SpareAccounts[0];
+  project = ctx.SpareAccounts[1];
+  trader = ctx.SpareAccounts[2];
+  await ctx.approveProxy(lp);
+  await ctx.approveProxy(project);
+  await ctx.approveProxy(trader);
+
+  await ctx.mintTestToken(lp, ctx.DODO, decimalStr("100000"));
+  await ctx.mintTestToken(project, ctx.DODO, decimalStr("100000"));
+  await ctx.mintTestToken(trader, ctx.DODO, decimalStr("100000"));
+
+  await ctx.mintTestToken(lp, ctx.USDT, mweiStr("100000"));
+  await ctx.mintTestToken(project, ctx.USDT, mweiStr("100000"));
+
+  // await ctx.WETH.methods.deposit().send(ctx.sendParam(lp, '80'));
+  // await ctx.WETH.methods.deposit().send(ctx.sendParam(project, '80'));
+}
+
+
+async function initCreateDPP(ctx: ProxyContext, token0: any, token1:any, token0Amount: string, token1Amount: string): Promise<void> {
+  let PROXY = ctx.DODOProxy;
+  await PROXY.methods.createDODOPrivatePool(
+    token0.options.address,
+    token1.options.address,
+    token0Amount,
+    token1Amount,
+    config.lpFeeRate,
+    config.mtFeeRate,
+    config.i,
+    config.k,
+    Math.floor(new Date().getTime()/1000 + 60 * 10)
+  ).send(ctx.sendParam(project));
+}
+
+describe("DODOProxyV2.0", () => {
+  let snapshotId: string;
+  let ctx: ProxyContext;
+
+  before(async () => {
+    ctx = await getProxyContext();
+    await init(ctx);
+    // await initCreateDPP(ctx,ctx.DODO,ctx.USDT,decimalStr("10000"),decimalStr("10000"));
+    // await initCreateDPP(ctx,ctx.WETH,ctx.USDT,decimalStr("50"),decimalStr("10000"));
+  });
+
+  beforeEach(async () => {
+    snapshotId = await ctx.EVM.snapshot();
+  });
+
+  afterEach(async () => {
+    await ctx.EVM.reset(snapshotId);
+  });
+
+  describe("DODOProxy", () => {
+    /**
+     * 1. 创建空池子
+     * 2. 创建ERC20 DPP
+     * 3. 创建ETH && ERC20 Token 
+     */
+    it("createDPP - empty", async () => {
+      var baseToken = ctx.DODO.options.address;
+      var quoteToken = ctx.USDT.options.address;
+      await ctx.DODOProxy.methods.createDODOPrivatePool(
+        baseToken,
+        quoteToken,
+        decimalStr("0"),
+        decimalStr("0"),
+        config.lpFeeRate,
+        config.mtFeeRate,
+        config.i,
+        config.k,
+        Math.floor(new Date().getTime()/1000 + 60 * 10)
+      ).send(ctx.sendParam(project));
+      var addrs = await ctx.DPPFactory.methods.getPrivatePool(baseToken,quoteToken).call();
+      var dppInfo = await ctx.DPPFactory.methods._DPP_INFO_(addrs[0]).call();
+      console.log("dppInfo:",dppInfo);
+      assert.equal(
+        dppInfo[0],
+        project
+      );
+    });
+
+
+    it("resetDPP", async () => {
+        //需要存钱
+        //需要退钱
+    });
+
+
+    /**
+     * trade
+     */
+    it("trade-sellQuote-R=1", async () => {
+        //R变号与不变号
+    });
+
+    
+    it("trade-sellQuote-R>1", async () => {
+        //R变号与不变号
+    });
+
+
+    it("trade-sellQuote-R<1", async () => {
+        //R变号与不变号
+    });
+
+
+    it("trade-sellBase-R=1", async () => {
+        //R变号与不变号
+    });
+
+
+    it("trade-sellBase-R>1", async () => {
+        //R变号与不变号
+    });
+
+
+    it("trade-sellBase-R<1", async () => {
+        //R变号与不变号
+    });
+
+
+
+    it("retrieve", async () => {
+        //eth允许
+        //控制无法提取base && quote
+    });
+
+
+    /**
+     * 直接底层dpp操作测试
+     */
+
+  });
+});
--- a/test/Proxy/proxy.dvm.test.ts
+++ b/test/Proxy/proxy.dvm.test.ts
@@ -38,15 +38,13 @@ async function init(ctx: ProxyContext): Promise<void> {
  await ctx.mintTestToken(lp, ctx.USDT, mweiStr("100000"));
  await ctx.mintTestToken(project, ctx.USDT, mweiStr("100000"));

-  await ctx.mintTestToken(lp, ctx.WETH, decimalStr("70"));
-  await ctx.mintTestToken(project, ctx.WETH, decimalStr("70"));
+  // await ctx.WETH.methods.deposit().send(ctx.sendParam(lp, '80'));
+  // await ctx.WETH.methods.deposit().send(ctx.sendParam(project, '80'));
 }

 async function initCreateDVM(ctx: ProxyContext, token0: any, token1:any, token0Amount: string, token1Amount: string): Promise<void> {
  let PROXY = ctx.DODOProxy;
-  let dvmAddress;
-  let shares;
-  (dvmAddress, shares) = await PROXY.methods.createDODOVendingMachine(
+  await PROXY.methods.createDODOVendingMachine(
    token0.options.address,
    token1.options.address,
    token0Amount,
@@ -57,26 +55,8 @@ async function initCreateDVM(ctx: ProxyContext, token0: any, token1:any, token0A
    config.k,
    Math.floor(new Date().getTime()/1000 + 60 * 10);
  ).send(ctx.sendParam(project));
-  console.log("create dvmAddress: ", dvmAddress);
-  console.log("create shares: ", shares);
 }

-async function initCreateDPP(ctx: ProxyContext, token0: any, token1:any, token0Amount: string, token1Amount: string): Promise<void> {
-  let PROXY = ctx.DODOProxy;
-  let dppAddress = await PROXY.methods.createDODOPrivatePool(
-    token0.options.address,
-    token1.options.address,
-    token0Amount,
-    token1Amount,
-    config.lpFeeRate,
-    config.mtFeeRate,
-    config.i,
-    config.k,
-    Math.floor(new Date().getTime()/1000 + 60 * 10);
-  ).send(ctx.sendParam(project));
-  console.log("create dppAddress: ", dppAddress);
-  console.log("create shares: ", shares);
-}

 describe("DODOProxyV2.0", () => {
  let snapshotId: string;
@@ -85,10 +65,8 @@ describe("DODOProxyV2.0", () => {
  before(async () => {
    ctx = await getProxyContext();
    await init(ctx);
-    await initCreateDVM(ctx,ctx.DODO,ctx.USDT,decimalStr("10000"),decimalStr("10000"));
-    await initCreateDVM(ctx,ctx.WETH,ctx.USDT,decimalStr("50"),decimalStr("10000"));
-    await initCreateDPP(ctx,ctx.DODO,ctx.USDT,decimalStr("10000"),decimalStr("10000"));
-    await initCreateDPP(ctx,ctx.WETH,ctx.USDT,decimalStr("50"),decimalStr("10000"));
+    // await initCreateDVM(ctx,ctx.DODO,ctx.USDT,decimalStr("10000"),decimalStr("10000"));
+    // await initCreateDVM(ctx,ctx.WETH,ctx.USDT,decimalStr("50"),decimalStr("10000"));
  });

  beforeEach(async () => {
@@ -126,24 +104,6 @@ describe("DODOProxyV2.0", () => {

    });

-    /**
-     * 1. 创建空池子
-     * 2. 创建ERC20 DPP
-     * 3. 创建ETH && ERC20 Token 
-     */
-    it("createDPP", async () => {
-
-    });
-
-
-    /**
-     *
-     */
-    it("resetDPP", async () => {
-
-    });
-
-
    /**
     *
     */
@@ -151,5 +111,11 @@ describe("DODOProxyV2.0", () => {

    });

+
+
+    /**
+     * 直接底层dvm操作测试
+     */
+
  });
 });
--- a/test/Route/Route.test.ts
+++ b/test/Route/Route.test.ts
@@ -90,7 +90,7 @@ async function calcRoute(ctx: DODOContext, fromTokenAmount: string, slippage: nu
    let curPair = pairs[i]
    dodoPairs.push(curPair.pair)
    let curContact = pairs[i].pairContract
-    if (routes[i].address == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') {
+    if (routes[i].address == '0x000000000000000000000000000000000000000E') {
      directions[i] = 0;
      swapAmount = await curContact.methods.querySellBaseToken(swapAmount).call();
      console.log(i + "-swapAmount:", swapAmount);
@@ -273,7 +273,7 @@ describe("Trader", () => {
      console.log("weth contract Before:" + fromWei(b_w_eth, 'ether'))
      //set route path
      var routes = [{
-        address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        address: "0x000000000000000000000000000000000000000E",
        decimals: 18
      }, {
        address: ctx.USDC.options.address,
@@ -311,7 +311,7 @@ describe("Trader", () => {
      console.log("weth contract Before:" + fromWei(b_w_eth, 'ether'))
      //set route path
      var routes = [{
-        address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        address: "0x000000000000000000000000000000000000000E",
        decimals: 18
      }, {
        address: ctx.USDC.options.address,
@@ -368,7 +368,7 @@ describe("Trader", () => {
        address: ctx.USDC.options.address,
        decimals: 6
      }, {
-        address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+        address: "0x000000000000000000000000000000000000000E",
        decimals: 18
      }];

--- a/test/utils/Contracts.ts
+++ b/test/utils/Contracts.ts
@@ -21,7 +21,7 @@ export const DODO_LP_TOKEN_CONTRACT_NAME = "DODOLpToken"
 export const DODO_ZOO_CONTRACT_NAME = "DOOZoo"
 export const DODO_WILD_CONTRACT_NAME = "DOOWild"
 export const DODO_ETH_PROXY_CONTRACT_NAME = "DODOEthProxy"
-export const WETH_CONTRACT_NAME = "WETH"
+export const WETH_CONTRACT_NAME = "WETH9"
 export const UNISWAP_CONTRACT_NAME = "Uniswap"
 export const UNISWAP_ARBITRAGEUR_CONTRACT_NAME = "UniswapArbitrageur"
 export const DODO_TOKEN_CONTRACT_NAME = "DODOToken"
--- a/test/utils/ProxyContext.ts
+++ b/test/utils/ProxyContext.ts
@@ -43,6 +43,11 @@ export class ProxyContext {
    this.EVM = new EVM();
    this.Web3 = getDefaultWeb3();

+    const allAccounts = await this.Web3.eth.getAccounts();
+    this.Deployer = allAccounts[0];
+    this.Maintainer = allAccounts[1];
+    this.SpareAccounts = allAccounts.slice(2, 10);
+
    var WETH = await contracts.newContract(
      contracts.WETH_CONTRACT_NAME
    );
@@ -57,6 +62,8 @@ export class ProxyContext {
    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,decimalStr("1000000"));

    this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
      [
@@ -65,10 +72,14 @@ export class ProxyContext {
        dvmAdminTemplate.options.address,
        feeRateModelTemplate.options.address,
        permissionManagerTemplate.options.address,
-        vauleSource.options.address
+        defaultGasSource.options.address
       ]
    )

+    this.SmartApprove = await contracts.newContract(
+      contracts.SMART_APPROVE
+    );
+
    this.DPPFactory = await contracts.newContract(contracts.DPP_FACTORY_NAME,
      [
        cloneFactory.options.address,
@@ -76,28 +87,28 @@ export class ProxyContext {
        dppAdminTemplate.options.address,
        feeRateModelTemplate.options.address,
        permissionManagerTemplate.options.address,
-        vauleSource.options.address
+        vauleSource.options.address,
+        defaultGasSource.options.address,
+        this.SmartApprove.options.address
      ]
    )

-    this.SmartApprove = await contracts.newContract(
-      contracts.SMART_APPROVE
-    );
-
    var dodoSellHelper = await contracts.newContract(
      contracts.DODO_SELL_HELPER
    );

    this.DODOProxy = await contracts.newContract(contracts.DODO_PROXY_NAME,
      [
-        dvmFactory.options.address,
-        dppFactory.options.address,
+        this.DVMFactory.options.address,
+        this.DPPFactory.options.address,
        WETH.options.address,
-        smartApprove.options.address,
+        this.SmartApprove.options.address,
        dodoSellHelper.options.address
      ]
    );

+    await this.SmartApprove.methods.setSmartSwap(this.DODOProxy.options.address).send(this.sendParam(this.Deployer));
+
    this.DODO = await contracts.newContract(
      contracts.MINTABLE_ERC20_CONTRACT_NAME,
      ["DODO Token", "DODO", 18]
@@ -110,11 +121,6 @@ export class ProxyContext {
      contracts.WETH_CONTRACT_NAME
    );

-    const allAccounts = await this.Web3.eth.getAccounts();
-    this.Deployer = allAccounts[0];
-    this.Maintainer = allAccounts[1];
-    this.SpareAccounts = allAccounts.slice(2, 10);
-
    console.log(log.blueText("[Init DVM context]"));
  }