From a14fecef912e50e10ed6ebc53877db71296f8591 Mon Sep 17 00:00:00 2001 From: owen05 Date: Tue, 19 Jan 2021 21:46:42 +0800 Subject: [PATCH] wait to freeze --- kovan-mock-v2.0.txt | 23 +++++++++++++++++++++++ migrations/4_deploy_v2_mock.js | 12 +++++++----- truffle-config.js | 2 +- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/kovan-mock-v2.0.txt b/kovan-mock-v2.0.txt index c2000ba..b03824f 100644 --- a/kovan-mock-v2.0.txt +++ b/kovan-mock-v2.0.txt @@ -352,3 +352,26 @@ Manual add target Pool: V2 Approve:0xCcf0733cA7B6299D59b1Bddf87f3a8AAaD87461F Tx: 0xebbd30fc18190d0fd7df03ffd24fb784122c0b1e7e73ee5ad2da64c1877ecd0e Approve:0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Tx: 0x1de48a27ef0e08a0bffeb016991b5e9d29ba35920bd9ea5478dc273568616ee7 Create DPP: 0xCcf0733cA7B6299D59b1Bddf87f3a8AAaD87461F-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0x961A1E706907e9AcA5b3d784325C8D571CdACef9 Tx: 0x3a698fbf1e71603dd84ed89ae23c106bc689743b104898e5a5afba9a26f86d35 +==================================================== +network type: kovan +Deploy time: 2021/1/19 下午7:18:43 +Mock POOL Tx: V2 +Approve:0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE Tx: 0xa258254841a87af88a4d8774120c97d2d050342cf209ef9c092a537b1d4416cd +Approve:0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA Tx: 0xe6f248f5fe683b5c8a220d7117cae689b7621d345059c4ed3e22fdcf14f3c2b5 +Approve:0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Tx: 0xc53556e9fc41b5c85b4e7b79fcb2f0a523d3ee2742cff7fc9329e90d3fec8e6d +Approve:0x156595bAF85D5C29E91d959889B022d952190A64 Tx: 0x335cf90b6c828ed74c1f437db3c0f5da414d08e34df99c1a807c1c365697acd7 +Create DVM: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0x2a2cc03eDFe6779fbB50a1Ac24DD6e0969235250 Tx: 0x5cfd06c99886b6e4dbf230dfb198d4485ac19715ee2928218e67f53523b15441 +Create DVM: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0x078BfD1F889A7281eB42a50B57b044f810FEc06C Tx: 0x04b2616dece03d91cf2acfab3e31156acd6eecb89f40d5b507b6f6a5839a7aa0 +Create DVM: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0xfed3E2A4c96091D4a0ad1d5fB1B6Ff26149167C1 Tx: 0xe796c67b0947526700711788bbbd04492cfa662ee0c029aa831d686ecdc0b424 +Create DVM: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0x07c18e84FF588396cb28b51A847EC838865c8347 Tx: 0xaa663a80ed35871b6de6b6a32349d6e7dd63a3fdd1d43c48b1415fae52e09789 +Create DPP: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0x7C20cCFf0fB764A4fdbAD7539188DaC65E01cF73 Tx: 0xcbdbd8f56160f0acd1c04105d45b7cf4bb7b616c602d1149b566f560dfc23b17 +Create DPP: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0xA99917C00371a37Ed41d8AAcc78c38a86b16B0bF Tx: 0xaf67f233c0a7b6db7fc752a1d8f71201c41a7904bf1bdf3a08d4726f54980592 +Create DPP: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0xE4b8D60F358828F0cb51935785Fe5a67892275Fc Tx: 0xc5b4976cc0783e767ac5b0d80e0285f5e263fefc4c2070656a8a7ac9eb0c3a31 +Create DPP: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0x30bD3A1100c247B5e9d62734a6Df6cab6943F808 Tx: 0x845c6a5b3eb170052111caae85f53a2e9983357bbd7deb71c5688e8fbd05187f +==================================================== +network type: kovan +Deploy time: 2021/1/19 下午7:46:00 +Manual add target Pool: V2 +Approve:0xCcf0733cA7B6299D59b1Bddf87f3a8AAaD87461F Tx: 0xed6ada30f414d696eee682871e51dac89206dd077055635570d4c5d305c9e437 +Approve:0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Tx: 0x7b42c175e29053ead5cef8f922296411d2db63ea753640742672b25969abc598 +Create DPP: 0xCcf0733cA7B6299D59b1Bddf87f3a8AAaD87461F-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0xE6943d8494378cF463c9bd7cA1Af3eda9ac12649 Tx: 0xab31c5356f2f608d6f0ef369379af507d23f7cb20bc6f59b82541e90b0eb7c95 diff --git a/migrations/4_deploy_v2_mock.js b/migrations/4_deploy_v2_mock.js index ff2dde1..ec3e5f6 100644 --- a/migrations/4_deploy_v2_mock.js +++ b/migrations/4_deploy_v2_mock.js @@ -64,10 +64,10 @@ module.exports = async (deployer, network, accounts) => { let MintableERC20TemplateAddress = "0xA45a64DAba80757432fA4d654Df12f65f020C13C"; let ERC20FactoryAddress = "0xCb1A2f64EfB02803276BFB5a8D511C4D950282a0"; - let DPPFactoryAddress = "0x29d2feD26D37167d775f3eCAafAEe3e62B5f4fF6"; - let DVMFactoryAddress = "0xFcD6835a9490Dc673944d4AB30F73D7FB8f4fbaA"; - let DODOApproveAddress = "0x25b5C731822E534A1df126985bb8781f1b979eF9"; - let DODOProxyV2Address = "0x3566c45117438485331c0628e10bA7bE09a1fFCB"; + let DPPFactoryAddress = "0x2D7F071415480eE7721eBB48c3147e347b980fEe"; + let DVMFactoryAddress = "0x1C0435b87B3772E994adA2D0194be91EaC85FDb0"; + let DODOApproveAddress = "0x5319f1CF056496e7E13D5653C3C7f338DE127a11"; + let DODOProxyV2Address = "0xe8836EB6EaE9Bc4Db880D4b9C0912E5db817e41D"; const provider = new Web3.providers.HttpProvider("https://kovan.infura.io/v3/22d4a3b2df0e47b78d458f43fe50a199"); @@ -109,6 +109,7 @@ module.exports = async (deployer, network, accounts) => { '0', '1000000', '1000000000000000000', + false, deadline ); var poolAddress = await DPPFactoryInstance._REGISTRY_(token0Addr, quote0Addr, 0); @@ -185,7 +186,6 @@ module.exports = async (deployer, network, accounts) => { const DVMFactoryInstance = await DVMFactory.at(DVMFactoryAddress); const DPPFactoryInstance = await DPPFactory.at(DPPFactoryAddress); - const assetTo = accounts[0]; const baseInAmount = web3.utils.toWei("100000", 'ether'); const quoteInAmount = web3.utils.toWei("10000", 'mwei'); // const quoteInAmount = web3.utils.toWei("0.5", 'ether'); @@ -200,6 +200,7 @@ module.exports = async (deployer, network, accounts) => { POOL_PARAM[i].lpFeeRate, POOL_PARAM[i].i, POOL_PARAM[i].k, + false, deadline ); var poolAddress = await DVMFactoryInstance._REGISTRY_(POOL_PARAM[i].baseAddr, POOL_PARAM[i].quoteAddr, 0); @@ -215,6 +216,7 @@ module.exports = async (deployer, network, accounts) => { POOL_PARAM[i].lpFeeRate, POOL_PARAM[i].i, POOL_PARAM[i].k, + false, deadline ); var poolAddress = await DPPFactoryInstance._REGISTRY_(POOL_PARAM[i].baseAddr, POOL_PARAM[i].quoteAddr, 0); diff --git a/truffle-config.js b/truffle-config.js index 6dad280..89eb1df 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -39,7 +39,7 @@ module.exports = { */ deploySwitch: { DEPLOY_V1: false, - DEPLOY_V2: true, + DEPLOY_V2: false, ADAPTER: false, MOCK_TOKEN: false, MOCK_V2_POOL: false,