From 5ff6acdb5164fbcb9a161574a2021ab675d3e447 Mon Sep 17 00:00:00 2001 From: owen05 Date: Sat, 13 Feb 2021 11:01:20 +0800 Subject: [PATCH] deploy --- deploy-detail-periphery.txt | 23 +++++++++++++++++ deploy-detail-v2.0.txt | 37 +++++++++------------------ kovan-mock-v2.0.txt | 12 +++++++++ migrations/3_deploy_v2.js | 8 +++--- migrations/5_deploy_periphery.js | 44 ++++++++++++++++++++++++-------- truffle-config.js | 6 ++--- 6 files changed, 87 insertions(+), 43 deletions(-) diff --git a/deploy-detail-periphery.txt b/deploy-detail-periphery.txt index 54c8aff..307bedb 100644 --- a/deploy-detail-periphery.txt +++ b/deploy-detail-periphery.txt @@ -30,3 +30,26 @@ Deploy time: 2021/2/8 下午3:27:50 Deploy type: DODOMigrationBSC DODOMigrationBSCAddress: 0x958f79e2998DFe417208b9A07D799265B0298e58 Init DODOMigrationBSCAddress Tx: 0x9b9ed65c536b5b53d83b811a754383d48cae00e4e5c80bee74f755c30a9c0748 +==================================================== +network type: kovan +Deploy time: 2021/2/9 下午10:43:23 +Deploy type: vDODOToken +vDODOTokenAddress: 0x8e565B96C3B6BB36363183f5D43D667927164e91 +Init vDODOTokenAddress Tx: 0x14ed266c46601e4ac34918dd09219551825cf53b87746f39b2b5967a86f35291 +DODOCirculationHelperAddress: 0xC4d70FdD0310BcAcA8a6eC85e66e95576CB096E4 +Init DODOCirculationHelperAddress Tx: 0xfe3a2e2373f5c3e4a1edf9c508fe6e7065718a93c3d2dc088605ef005eeffa10 +vDODOToken setDODOCirculationHelper tx: 0xb8081353a0ce44b7158419992ab8f1c0e2ce9ed74f37299682ca98a29c8d38d1 +==================================================== +network type: kovan +Deploy time: 2021/2/9 下午10:51:22 +Deploy type: vDODOToken +DODOApproveProxy Unlock tx: 0x898ee9683fd23561eacc2c7997a1fbc8784ce71e98d726a99653498f3b8ca978 +DODOApproveProxy add tx: 0xc9b63fc733fef275c5d4ded72d63c6b5c16d529f3be9d8d053446b8f850bbc9a +vDODOToken first mint tx: 0x8bf4e65fb02588e8f806f33c813424b10d16c2c5756f05faba92de3d94a4b5fc +vDODOToken injected dodo tx: 0x146f5a4446ff3427e87f3e64b7953f139b5effcf92036bdb880be280bf03fa2d +vDODOToken changeReward tx: 0x913602870c7d25fedc7f21eb9314b7329db032c5141dc3ed432f1d9661a19804 +==================================================== +network type: live +Deploy time: 2021/2/9 下午11:22:45 +Deploy type: DODOMigrationBSC +DODOMigrationBSCAddress: 0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7 diff --git a/deploy-detail-v2.0.txt b/deploy-detail-v2.0.txt index 3342e0e..7077851 100644 --- a/deploy-detail-v2.0.txt +++ b/deploy-detail-v2.0.txt @@ -628,28 +628,15 @@ DODOApprove Init tx: 0x49813a01135d05674e2086511c57f27fb55b8b5ec5ca5373812d6634 DODOIncentive ChangeProxy tx: 0xde4919c4a69b5eb58dfa2132c2d41ff163fe95a49fe972f76fb296cd491f7df6 ==================================================== network type: kovan -Deploy time: 2021/2/9 上午9:22:06 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午9:37:18 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午9:45:32 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午9:49:16 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午9:55:50 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午10:00:29 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午10:07:02 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午10:38:43 -==================================================== -network type: kovan -Deploy time: 2021/2/9 上午10:39:52 +Deploy time: 2021/2/9 下午10:15:02 +Deploy type: V2 +DODOApprove Address: 0xa375b128e139ae54EF7F189BC8fEb4624f1c2Afa +DODOApproveProxy Address: 0xE2bf3e72E126f0AD4Aec07AdfA6cc345EEF43bDe +DppFactoryAddress: 0xC65F8087288aa0a118aa6F3228Ef9ecc8187F4b6 +Init DppFactory Tx: 0x7c031a17e29c7585704b1669b4fe1ea66e1180aa1990b973fc133f8fd950114a +DODOV2RouteHelper Address: 0xcB3b6cdBe2e57D3e37feba0C55584992Cc1B973F +DODOV2Proxy02 Address: 0x85CAA68ae47f047aa01C48BCaA711CA70a950fFb +Init DODOProxyV2 Tx: 0x72afdcd3795ee00b67b87c88af14227584b1ca7588dd10cdcda11c42331117e6 +DODOApproveProxy Init tx: 0x34e33c12750fff4abd34dd368157ad1b2101597f44a3f9783725d8a245860b73 +DODOApprove Init tx: 0x1f8ac1bbf54e3b42dc3657485fd837efba382a73342e2ced29b6e9fbdb4edeb4 +DODOIncentive ChangeProxy tx: 0xd0427f9a814efb822a36ebf17bbf637d066887adacf636c32455a165d30b768 diff --git a/kovan-mock-v2.0.txt b/kovan-mock-v2.0.txt index 9e9d305..8b5741b 100644 --- a/kovan-mock-v2.0.txt +++ b/kovan-mock-v2.0.txt @@ -514,3 +514,15 @@ Mock POOL Tx: V2 Approve:0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA Tx: 0x29017dc8173e6e65768ef17baeffdb006e88d36088be0cc97a53c365ac929e60 Create DPP: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x5eca15b12d959dfcf9c71c59f8b467eb8c6efd0b Pool:0x210912095691C9b0e318c22e49d94170ACAaCd0a Tx: 0x5bf334d720433b4fbfb71a4f75f5755ccd39f0977e59b74e78df083b03d9d9f5 Create DPP: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x5eca15b12d959dfcf9c71c59f8b467eb8c6efd0b Pool:0x25F03Cc8d661D04513D17497dDE752BDF96A8459 Tx: 0xb15244e5e51f2e593adee05c337c00b265636869c59af6589ca49b82f56a86a7 +==================================================== +network type: kovan +Deploy time: 2021/2/9 下午10:19:34 +==================================================== +network type: kovan +Deploy time: 2021/2/9 下午10:43:19 +==================================================== +network type: kovan +Deploy time: 2021/2/9 下午10:48:41 +==================================================== +network type: kovan +Deploy time: 2021/2/9 下午10:51:19 diff --git a/migrations/3_deploy_v2.js b/migrations/3_deploy_v2.js index bbbbc75..d259bbc 100644 --- a/migrations/3_deploy_v2.js +++ b/migrations/3_deploy_v2.js @@ -77,7 +77,7 @@ module.exports = async (deployer, network, accounts) => { chiAddress = "0x0000000000004946c0e9f43f4dee607b0ef1fa1c"; DODOCalleeHelperAddress = "0x36ce1831941d35c3588759B2D084E240a094ad4A"; DODOV1PmmHelperAddress = "0xC972069473a686b1c11Bd9347D719c87e6745d39"; - DODORouteV2HelperAddress = "0x4605149BB2Efab69D4fA37Bc9669f3b6f7bD3F92"; + DODORouteV2HelperAddress = "0xcB3b6cdBe2e57D3e37feba0C55584992Cc1B973F"; //Template CloneFactoryAddress = "0xf7959fe661124C49F96CF30Da33729201aEE1b27"; @@ -90,11 +90,11 @@ module.exports = async (deployer, network, accounts) => { CpTemplateAddress = "0x973bEbaE41E79c2B4d9EaEE14c2aB85f43673dc3"; //Factory DvmFactoryAddress = "0x322F8014C125Da09314d3a68d4d9F427823F17FD"; - DppFactoryAddress = "0x9fA487762d4329eBDD83a00a82C8a02719Fdf512"; + DppFactoryAddress = "0xC65F8087288aa0a118aa6F3228Ef9ecc8187F4b6"; CpFactoryAddress = "0x9e6E8985D52E91eDf1671f28Ca73bc4F3E219b72"; //Approve - DODOApproveAddress = "0x4A354b8d0DDb7083f066bDaC1f50d23DE221B01C"; - DODOApproveProxyAddress = "0xe778affD2a337b57a9cDAF6f2ba0bebe3e16316E"; + DODOApproveAddress = "0xa375b128e139ae54EF7F189BC8fEb4624f1c2Afa"; + DODOApproveProxyAddress = "0xE2bf3e72E126f0AD4Aec07AdfA6cc345EEF43bDe"; DODOIncentiveAddress = "0x5cFCc14f7C8be8B138D9fDF7438391b0BFe0589F"; DODOTokenAddress = "0x854b0f89BAa9101e49Bfb357A38071C9db5d0DFa"; //Account diff --git a/migrations/5_deploy_periphery.js b/migrations/5_deploy_periphery.js index c9785c5..d2fb7a5 100644 --- a/migrations/5_deploy_periphery.js +++ b/migrations/5_deploy_periphery.js @@ -7,6 +7,7 @@ const DODOBscToken = artifacts.require("DODOBscToken"); const DODOMigrationBSC = artifacts.require("DODOMigrationBSC"); const vDODOToken = artifacts.require("vDODOToken"); const DODOCirculationHelper = artifacts.require("DODOCirculationHelper"); +const DODOApproveProxy = artifacts.require("DODOApproveProxy"); module.exports = async (deployer, network, accounts) => { @@ -16,15 +17,17 @@ module.exports = async (deployer, network, accounts) => { let DODOCirculationHelperAddress = ""; let GovernanceAddress = ""; let vDODOTokenAddress = ""; + let dodoTeam = ""; if (network == "kovan") { - DODOTokenAddress = "0xfF2985D13953Cb92ecc585aA2B6A4AF8cB46068f"; - DODOApproveProxyAddress = "0x5ee5B85ddf0b842e0d65f0d295F6954eceFBEeD4"; - DODOCirculationHelperAddress = ""; - vDODOTokenAddress = ""; + DODOTokenAddress = "0x854b0f89BAa9101e49Bfb357A38071C9db5d0DFa"; + DODOApproveProxyAddress = "0xE2bf3e72E126f0AD4Aec07AdfA6cc345EEF43bDe"; + DODOCirculationHelperAddress = "0xC4d70FdD0310BcAcA8a6eC85e66e95576CB096E4"; + vDODOTokenAddress = "0x8e565B96C3B6BB36363183f5D43D667927164e91"; GovernanceAddress = "0x0000000000000000000000000000000000000000"; //Account multiSigAddress = accounts[0]; + dodoTeam = "0xaac153c1344cA14497A5dd22b1F70C28793625aa"; } else if (network == "live") { DODOTokenAddress = "0x43dfc4159d86f3a37a5a4b3d4580b888ad7d4ddd"; DODOApproveProxyAddress = "0x335aC99bb3E51BDbF22025f092Ebc1Cf2c5cC619"; @@ -33,6 +36,7 @@ module.exports = async (deployer, network, accounts) => { GovernanceAddress = "0x0000000000000000000000000000000000000000"; //Account multiSigAddress = "0x95C4F5b83aA70810D4f142d58e5F7242Bd891CB0"; + dodoTeam = ""; } else if (network == "bsclive") { //Account multiSigAddress = "0x4073f2b9bB95774531b9e23d206a308c614A943a"; @@ -71,7 +75,8 @@ module.exports = async (deployer, network, accounts) => { vDODOToken, GovernanceAddress, DODOTokenAddress, - DODOApproveProxyAddress + DODOApproveProxyAddress, + dodoTeam ); vDODOTokenAddress = vDODOToken.address; logger.log("vDODOTokenAddress: ", vDODOTokenAddress); @@ -81,7 +86,7 @@ module.exports = async (deployer, network, accounts) => { } if (DODOCirculationHelperAddress == "") { - await deployer.deploy(DODOCirculationHelper, vDODOTokenAddress, DODOTokenAddress ); + await deployer.deploy(DODOCirculationHelper, vDODOTokenAddress, DODOTokenAddress); DODOCirculationHelperAddress = DODOCirculationHelper.address; logger.log("DODOCirculationHelperAddress: ", DODOCirculationHelperAddress); const DODOCirculationHelperInstance = await DODOCirculationHelper.at(DODOCirculationHelperAddress); @@ -91,12 +96,29 @@ module.exports = async (deployer, network, accounts) => { if(network == 'kovan') { const vDODOTokenInstance = await vDODOToken.at(vDODOTokenAddress); - //changePerReward - var tx = await vDODOTokenInstance.changePerReward("10000000000000000000"); - logger.log("vDODOToken changeReward tx: ", tx.tx); //updateDODOCirculationHelper - tx = await vDODOTokenInstance.updateDODOCirculationHelper(DODOCirculationHelperAddress); - logger.log("vDODOToken setDODOCirculationHelper tx: ", tx.tx); + // var tx = await vDODOTokenInstance.updateDODOCirculationHelper(DODOCirculationHelperAddress); + // logger.log("vDODOToken setDODOCirculationHelper tx: ", tx.tx); + + //ApproveProxy add + const DODOApproveProxyInstance = await DODOApproveProxy.at(DODOApproveProxyAddress); + tx = await DODOApproveProxyInstance.unlockAddProxy(vDODOTokenAddress); + logger.log("DODOApproveProxy Unlock tx: ", tx.tx); + tx = await DODOApproveProxyInstance.addDODOProxy(); + logger.log("DODOApproveProxy add tx: ", tx.tx); + + //Mint DODO first + tx = await vDODOTokenInstance.mint("100000000000000000000000",dodoTeam); + logger.log("vDODOToken first mint tx: ", tx.tx); + + //preDepositedBlockReward + tx = await vDODOTokenInstance.preDepositedBlockReward("1000000000000000000000"); + logger.log("vDODOToken injected dodo tx: ", tx.tx); + + //changePerReward + tx = await vDODOTokenInstance.changePerReward("100000000000000000"); + logger.log("vDODOToken changeReward tx: ", tx.tx); + } } diff --git a/truffle-config.js b/truffle-config.js index b3d1750..2615681 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -42,11 +42,11 @@ module.exports = { DEPLOY_V2: false, ADAPTER: false, MOCK_TOKEN: false, - MOCK_V2_POOL: true, + MOCK_V2_POOL: false, MOCK_V2_SWAP: false, MANUAL_ADD_POOL: false, MOCK_TARGET_POOL: false, - BSCMigration: false, + BSCMigration: true, DODOBscToken: false, vDODOToken: false, CALLEE: false, @@ -82,7 +82,7 @@ module.exports = { return new HDWalletProvider(privKey, "https://mainnet.infura.io/v3/" + infuraId); }, gas: 6000000, - gasPrice: 100000000000, + gasPrice: 120000000000, network_id: 1, skipDryRun: true },