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

ing

Browse Source
This commit is contained in:
owen05
2021-01-22 14:54:34 +08:00
parent a5b29dd35c
commit 53c1e3ebee
6 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kovan-mock-v2.0.txt
View File

@@ -401,3 +401,16 @@ network type: bsclive
Deploy time: 2021/1/22 下午1:57:57 Deploy time: 2021/1/22 下午1:57:57
Mock TOKEN Tx: V2 Mock TOKEN Tx: V2
ERC20 address: 0x497A44c951fCCF92ADfdeD0a5b0162256F147647; Symbol:DODO ERC20 address: 0x497A44c951fCCF92ADfdeD0a5b0162256F147647; Symbol:DODO
====================================================
network type: development
Deploy time: 2021/1/22 下午2:02:32
Mock TOKEN Tx: V2
====================================================
network type: development
Deploy time: 2021/1/22 下午2:03:08
====================================================
network type: development
Deploy time: 2021/1/22 下午2:15:43
====================================================
network type: development
Deploy time: 2021/1/22 下午2:17:04

4
migrations/3_deploy_v2.js
View File

@@ -64,7 +64,7 @@ module.exports = async (deployer, network, accounts) => {
DODOSellHelperAddress = "0xbdEae617F2616b45DCB69B287D52940a76035Fe3"; DODOSellHelperAddress = "0xbdEae617F2616b45DCB69B287D52940a76035Fe3";
WETHAddress = "0x5eca15b12d959dfcf9c71c59f8b467eb8c6efd0b"; WETHAddress = "0x5eca15b12d959dfcf9c71c59f8b467eb8c6efd0b";
chiAddress = "0x0000000000004946c0e9f43f4dee607b0ef1fa1c"; chiAddress = "0x0000000000004946c0e9f43f4dee607b0ef1fa1c";
DODOCalleeHelperAddress = "0x507EBbb195CF54E0aF147A2b269C08a38EA36989"; DODOCalleeHelperAddress = "";
DODOV1PmmHelperAddress = "0xC972069473a686b1c11Bd9347D719c87e6745d39"; DODOV1PmmHelperAddress = "0xC972069473a686b1c11Bd9347D719c87e6745d39";
DODORouteV2HelperAddress = ""; DODORouteV2HelperAddress = "";
@@ -97,7 +97,7 @@ module.exports = async (deployer, network, accounts) => {
DODORouteV2HelperAddress = ""; DODORouteV2HelperAddress = "";
DODOV1PmmHelperAddress = ""; DODOV1PmmHelperAddress = "";
//Template //Template
CloneFactoryAddress = ""; CloneFactoryAddress = "0x5e5a7b76462e4bdf83aa98795644281bdba80b88";
DefaultMtFeeRateAddress = ""; DefaultMtFeeRateAddress = "";
DefaultPermissionAddress = ""; DefaultPermissionAddress = "";

22
migrations/4_deploy_v2_mock.js
View File

@@ -58,21 +58,17 @@ const POOL_PARAM = [
]; ];
module.exports = async (deployer, network, accounts) => { module.exports = async (deployer, network, accounts) => {
// if (network != "kovan") return; if (network != "kovan") return;
// let CloneFactoryAddress = "0xf7959fe661124C49F96CF30Da33729201aEE1b27"; let CloneFactoryAddress = "0xf7959fe661124C49F96CF30Da33729201aEE1b27";
// let ERC20TemplateAddress = "0x77d2e257241e6971688b08bdA9F658F065d7bb41"; let ERC20TemplateAddress = "0x77d2e257241e6971688b08bdA9F658F065d7bb41";
// let MintableERC20TemplateAddress = "0xA45a64DAba80757432fA4d654Df12f65f020C13C"; let MintableERC20TemplateAddress = "0xA45a64DAba80757432fA4d654Df12f65f020C13C";
// let ERC20FactoryAddress = "0xCb1A2f64EfB02803276BFB5a8D511C4D950282a0"; let ERC20FactoryAddress = "0xCb1A2f64EfB02803276BFB5a8D511C4D950282a0";
// let DPPFactoryAddress = "0x2D7F071415480eE7721eBB48c3147e347b980fEe"; let DPPFactoryAddress = "0x2D7F071415480eE7721eBB48c3147e347b980fEe";
// let DVMFactoryAddress = "0x1C0435b87B3772E994adA2D0194be91EaC85FDb0"; let DVMFactoryAddress = "0x1C0435b87B3772E994adA2D0194be91EaC85FDb0";
// let DODOApproveAddress = "0x5319f1CF056496e7E13D5653C3C7f338DE127a11"; let DODOApproveAddress = "0x5319f1CF056496e7E13D5653C3C7f338DE127a11";
// let DODOProxyV2Address = "0xe8836EB6EaE9Bc4Db880D4b9C0912E5db817e41D"; let DODOProxyV2Address = "0xe8836EB6EaE9Bc4Db880D4b9C0912E5db817e41D";
let CloneFactoryAddress = "0x03E2427859119E497EB856a166F616a2Ce5f8c88";
let ERC20TemplateAddress = "0xef49a6DBa1C8DF859E49c17E9A485B439c7689d3";
let MintableERC20TemplateAddress = "0x6373ceB657C83C91088d328622573FB766064Ac4";
let ERC20FactoryAddress = "0x5e84190a270333aCe5B9202a3F4ceBf11b81bB01";
const provider = new Web3.providers.HttpProvider("https://kovan.infura.io/v3/22d4a3b2df0e47b78d458f43fe50a199"); const provider = new Web3.providers.HttpProvider("https://kovan.infura.io/v3/22d4a3b2df0e47b78d458f43fe50a199");

4
test/DVM/ConstPriceCase.test.ts
View File

@@ -83,7 +83,7 @@ describe("ConstPriceCase", () => {
// maintainer balances // maintainer balances
assert.equal( assert.equal(
await ctx.BASE.methods.balanceOf(ctx.Maintainer).call(), await ctx.BASE.methods.balanceOf(ctx.Maintainer).call(),
decimalStr("0.002") decimalStr("0")
); );
assert.equal( assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(), await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(),
@@ -124,7 +124,7 @@ describe("ConstPriceCase", () => {
); );
assert.equal( assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(), await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(),
decimalStr("0.1") decimalStr("0")
); );
}); });
}); });

2
test/V2Proxy/proxy.dvm.test.ts
View File

@@ -52,7 +52,7 @@ async function initCreateDVM(ctx: ProxyContext, token0: string, token1: string,
config.lpFeeRate, config.lpFeeRate,
i, i,
config.k, config.k,
true, false,
Math.floor(new Date().getTime() / 1000 + 60 * 10) Math.floor(new Date().getTime() / 1000 + 60 * 10)
).send(ctx.sendParam(project, ethValue)); ).send(ctx.sendParam(project, ethValue));
if (token0 == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') token0 = ctx.WETH.options.address; if (token0 == '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE') token0 = ctx.WETH.options.address;

2
truffle-config.js
View File

@@ -41,7 +41,7 @@ module.exports = {
DEPLOY_V1: false, DEPLOY_V1: false,
DEPLOY_V2: false, DEPLOY_V2: false,
ADAPTER: false, ADAPTER: false,
MOCK_TOKEN: true, MOCK_TOKEN: false,
MOCK_V2_POOL: false, MOCK_V2_POOL: false,
MOCK_V2_SWAP: false, MOCK_V2_SWAP: false,
MANUAL_ADD_POOL: false, MANUAL_ADD_POOL: false,