diff --git a/deploy-detail-v2.0.txt b/deploy-detail-v2.0.txt index 497e249..baff773 100644 --- a/deploy-detail-v2.0.txt +++ b/deploy-detail-v2.0.txt @@ -401,3 +401,87 @@ Deploy time: 2021/1/22 下午1:54:22 ==================================================== network type: bsclive Deploy time: 2021/1/22 下午1:57:54 +==================================================== +network type: kovan +Deploy time: 2021/1/22 下午3:53:35 +Deploy type: V2 +DODOCalleeHelperAddress: 0xf45e57FE0c0Bf759E34152179B2dA0a4e1a6BC9B +DefaultMtFeeRateAddress: 0x2F7e3B1c22C1baE2224Cef9F8BFe6B13789Fd0F7 +DvmTemplateAddress: 0xA6384D1501842e9907D43148E2ca0d50E4ad56E2 +DppTemplateAddress: 0x044b48D64E77Ab8854C46c8456dC05C540c9dd53 +DppAdminTemplateAddress: 0xcFb789F7d5359E376B2aEFC7e14a552457D7d167 +CpTemplateAddress: 0x81c802080c3CE0dE98fcb625670A14Eb8440184a +DODOApprove Address: 0x6FB6313cafaFe38acA19Be0B8151d6354F74A340 +DODOIncentiveAddress: 0x1f69E3CEAbDc464Ab11bceB15726530CD8AC535E +DODOIncentive Init tx: 0xdbfd7e6d14c756665ed33c497ed42f8f40c3ea75eaee01e158874a3a5be7a60f +DvmFactoryAddress: 0xE842d8c9A54B23C4D0cf208daCA3882c0c311353 +Init DvmFactory Tx: 0x736b40137800f9091204317302a927a90f734bece6112fcecb31f1adbb7b3818 +DppFactoryAddress: 0xaFC7F3Ef4f8609411653FbF1Dd6D583A8Ae1f0fA +Init DppFactory Tx: 0x4ae634ccfa937edf510064edd9e2b2ea7e782f2d452d103118e5c4c1f182ff65 +CpFactoryAddress: 0xD25e0A9A464f50191d9C879bE818FbA44680E980 +Init CpFactory Tx: 0xd438ba25d61bb7274440c6d83cfcfb48910299a4bd9cc8f15bc64bad611a3aa0 +DODOV2RouteHelper Address: 0x9641B78445E7818EF76Ed584007311dE752DF831 +DODOProxyV2 Address: 0xfDEDc04A641DE9CEeb4eD2F24d98faa22418Bd94 +Init DODOProxyV2 Tx: 0x8428a34aaacd0c2187294f9f20fdd3a90cdb19633307a7552c8d793e1b1c0ff5 +DODOApprove Init tx: 0x5534e24a69eb855427539eec7e35a398367d044e92cc5249f34e8edd3cedc9d5 +DODOIncentive ChangeProxy tx: 0xa2c6da96963fc693824088bc7d95fa96afe714efed11efb49a85ca27216e4bd9 +DODOIncentive OpenSwitch tx: 0x6bacc0a633934d10895adf1701aa9c059c46a0f6e9bcb321a908cc5ce5ba5b9d +==================================================== +network type: bsclive +Deploy time: 2021/1/22 下午4:18:54 +Deploy type: V2 +DODOCalleeHelperAddress: 0xDfaf9584F5d229A9DBE5978523317820A8897C5A +DODOV1RouterHelper Address: 0x2BBD66fC4898242BDBD2583BBe1d76E8b8f71445 +DefaultMtFeeRateAddress: 0x18DFdE99F578A0735410797e949E8D3e2AFCB9D2 +DefaultPermissionAddress: 0x729f7f44bf64Ce814716b6261e267DbE6cdf021c +Init DefaultPermissionAddress Tx: 0x2fb909748e2afcc040becccae128256d264cd56f713329b49742255b9e478a2c +DvmTemplateAddress: 0xC3BeD579CaB3EC29B22D9AB99F4E586af42496b9 +DppTemplateAddress: 0x550B2e7bD9605b8dcdd20d01bA73f1feB6ce289b +DppAdminTemplateAddress: 0x989DcAA95801C527C5B73AA65d3962dF9aCe1b0C +CpTemplateAddress: 0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be +DODOApprove Address: 0x72d220cE168C4f361dD4deE5D826a01AD8598f6C +DODOIncentiveAddress: 0x80930Cb1849F7D42531506fF45E66724338A821b +DODOIncentive Init tx: 0x2884908366f07ef52408a4903bcc30f58dd9f98988d195cb833807f2d360bdbd +DvmFactoryAddress: 0xf50BDc9E90B7a1c138cb7935071b85c417C4cb8e +Init DvmFactory Tx: 0x3dfc2643f1f20c15270c713fa7b126c6e7acbb284a74869bc502f4a562f7f4a5 +DppFactoryAddress: 0x7737fd30535c69545deeEa54AB8Dd590ccaEBD3c +Init DppFactory Tx: 0x9b319cf1d599831650d25f46a47a7a097422dda6c3580c5cd6e3d280d5eb0e31 +CpFactoryAddress: 0x9aE501385Bc7996A2A4a1FBb00c8d3820611BCB5 +Init CpFactory Tx: 0xf9645fe185e856db852a25eda8cfb41153192c8cc05757cb455bcd90da53e2ba +DODOV2RouteHelper Address: 0xbAb9F4ff4A19a0e8EEBC56b06750253228ffAc6E +DODOProxyV2 Address: 0xb57Dd5c265dBb13CA014F2332069E90CD0e22e65 +Init DODOProxyV2 Tx: 0xb5e8b6503b419f434416fcf905255b704db960959b4c2a52198e97c3945b4ce7 +DODOApprove Init tx: 0x6a74e9a7ef040bf816d945313199bd512719aa0457a0e4e55f8ce17b3eafcc5e +==================================================== +network type: live +Deploy time: 2021/1/22 下午5:40:07 +Deploy type: V2 +DODOCalleeHelperAddress: 0xef49a6DBa1C8DF859E49c17E9A485B439c7689d3 +DODOV1RouterHelper Address: 0x6373ceB657C83C91088d328622573FB766064Ac4 +DefaultMtFeeRateAddress: 0x5e84190a270333aCe5B9202a3F4ceBf11b81bB01 +DefaultPermissionAddress: 0x6B208E08dcF6BD51F50C5Da09d15B2D8E5C46Cf2 +Init DefaultPermissionAddress Tx: 0x235d8c2a5eea61edc73d4e7de1f13f7a4d0479935e4a72c7d400d1844a141071 +DvmTemplateAddress: 0x2BBD66fC4898242BDBD2583BBe1d76E8b8f71445 +DppTemplateAddress: 0x18DFdE99F578A0735410797e949E8D3e2AFCB9D2 +DppAdminTemplateAddress: 0x729f7f44bf64Ce814716b6261e267DbE6cdf021c +CpTemplateAddress: 0x18b0bD918b55f995Fd404B872404378A62cb403b +DODOApprove Address: 0xC3BeD579CaB3EC29B22D9AB99F4E586af42496b9 +DODOIncentiveAddress: 0x989DcAA95801C527C5B73AA65d3962dF9aCe1b0C +DODOIncentive Init tx: 0xccb6c1b53d19754cea094bb0a0957ffc8319b9d75a285dc968e703014b1efae6 +DvmFactoryAddress: 0x72d220cE168C4f361dD4deE5D826a01AD8598f6C +Init DvmFactory Tx: 0xffa5bfc273985acfd01cd391f5e432b4afad50068efc81fde057593e4e5aed1f +DppFactoryAddress: 0xB5Dc5E183c2aCf02aB879A8569aB4EDAf147d537 +Init DppFactory Tx: 0xe73408e20a106f704729fe8bfa46b49c17a4e550c48d39c502eb9312d266dc37 +CpFactoryAddress: 0xE8C9A78725D0451FA19878D5f8A3dC0D55FECF25 +Init CpFactory Tx: 0xde26abd897c382a3cd0c7eeca5ff5a81b07661f831c52c1f7ddeeae1859f9a87 +DODOV2RouteHelper Address: 0xaeB5CF31b97dce6134e416129845e01106fFB177 +DODOProxyV2 Address: 0x9aE501385Bc7996A2A4a1FBb00c8d3820611BCB5 +Init DODOProxyV2 Tx: 0x56342b7096bfba69f24184af2a4ffec2f8c3862b253ab502cfad33b3b47c34f0 +DODOApprove Init tx: 0xc31acb7b6212bc25b6064762cd87bd7f345ac27afb56e4b08bd47b366adf50b1 +==================================================== +network type: live +Deploy time: 2021/1/22 下午6:21:11 +Deploy type: V2 - Adapter +DODOV1Adapter Address: 0xb57Dd5c265dBb13CA014F2332069E90CD0e22e65 +DODOV2Adapter Address: 0xE55154D09265b18aC7CDAC6E646672A5460389a1 +UniAdapter Address: 0x043957f7554275b90c5178872faE851dcfC1089D diff --git a/kovan-mock-v2.0.txt b/kovan-mock-v2.0.txt index 5e5d6f9..56847a1 100644 --- a/kovan-mock-v2.0.txt +++ b/kovan-mock-v2.0.txt @@ -414,3 +414,19 @@ Deploy time: 2021/1/22 下午2:15:43 ==================================================== network type: development Deploy time: 2021/1/22 下午2:17:04 +==================================================== +network type: kovan +Deploy time: 2021/1/22 下午4:12:26 +Mock POOL Tx: V2 +Approve:0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE Tx: 0xb50d7e81ad7a513c0af80ad266adbdc860c3778b8ab195ec9b212254d619575e +Approve:0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA Tx: 0xf34756b71a55168d6969b359cf242005331479284d99eb0f25eaf89d3a55670e +Approve:0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Tx: 0x144da42d3733f34b16ec10bdbf1bd1e062dfabd80e57770f1c0044bb5b8c6a96 +Approve:0x156595bAF85D5C29E91d959889B022d952190A64 Tx: 0x0445a7a66a197d3593e5b4212e1c9ac1b94922764c25d2e2fa4890ec013507b1 +Create DVM: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0x039C04CEFa590e538441A7BAfe6965AcB4A1E34c Tx: 0x79e8f4127c16b19f7a0ff9741b05f086d7f6429f4b8c00cabcc9d3d7eff79ac9 +Create DVM: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0xC4070dc0a10332EfA82d72839281cb55c1037341 Tx: 0x694aa43eb9cb6654913aecfa77885c4fd886847574dbe3d19e9a436a16c9bfcf +Create DVM: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0xC232b6F18Bb48608EfC9bf6790B2ba0A3Be7E365 Tx: 0xa77c971322b33301eb3d2642cbf30bb1fbeb44568ca92fff63ff5632e7d805af +Create DVM: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0x52F1709f83D2cdB355db7Ee42172B69730B208de Tx: 0x748c17c38146b8d9d9c59d3991e56f418fc79148d5c2ffe2b94f019d00d242b1 +Create DPP: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0x47D70124aa9C568b7515f71F023FD0e55A6926b5 Tx: 0x52e028407c0467d52f9cdc64f379081e80f451e564af7a93d5f489adaecb6d65 +Create DPP: 0xd8C30a4E866B188F16aD266dC3333BD47F34ebaE-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0x67841b1553Ed349111659E56897Cd8480DA88f8c Tx: 0x165e682bdc696a6af5821944718508dfd7fc953f1e21e213a741d52ced53ab03 +Create DPP: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x43688f367eb83697c3ca5d03c5055b6bd6f6ac4b Pool:0x3e8DB146423f2Df1Bb3f07C9D7Cf3e76D2C74446 Tx: 0x090746636f90cda0f12435e8cb29d325eb1c730e87e9b8746455b4071fcc2a9f +Create DPP: 0xd7f02D1b4F9495B549787808503Ecfd231C3fbDA-0x156595bAF85D5C29E91d959889B022d952190A64 Pool:0xbD0CCdbC8FECcc68934Bf884fBe85AB7B51A15eb Tx: 0xdbda4038d439060f9ef3fc09df58f80758d38a81e246cbbc0c88a6b7c275b2ed diff --git a/migrations/3_deploy_v2.js b/migrations/3_deploy_v2.js index 6c8013e..4fdddcc 100644 --- a/migrations/3_deploy_v2.js +++ b/migrations/3_deploy_v2.js @@ -93,24 +93,24 @@ module.exports = async (deployer, network, accounts) => { DODOSellHelperAddress = "0x533da777aedce766ceae696bf90f8541a4ba80eb"; WETHAddress = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"; chiAddress = "0x0000000000004946c0e9F43F4Dee607b0eF1fA1c"; - DODOCalleeHelperAddress = ""; + DODOCalleeHelperAddress = "0xef49a6DBa1C8DF859E49c17E9A485B439c7689d3"; DODORouteV2HelperAddress = ""; - DODOV1PmmHelperAddress = ""; + DODOV1PmmHelperAddress = "0x6373ceB657C83C91088d328622573FB766064Ac4"; //Template CloneFactoryAddress = "0x5e5a7b76462e4bdf83aa98795644281bdba80b88"; - DefaultMtFeeRateAddress = ""; - DefaultPermissionAddress = ""; + DefaultMtFeeRateAddress = "0x5e84190a270333aCe5B9202a3F4ceBf11b81bB01"; + DefaultPermissionAddress = "0x6B208E08dcF6BD51F50C5Da09d15B2D8E5C46Cf2"; - DvmTemplateAddress = ""; - DppTemplateAddress = ""; - DppAdminTemplateAddress = ""; - CpTemplateAddress = ""; + DvmTemplateAddress = "0x2BBD66fC4898242BDBD2583BBe1d76E8b8f71445"; + DppTemplateAddress = "0x18DFdE99F578A0735410797e949E8D3e2AFCB9D2"; + DppAdminTemplateAddress = "0x729f7f44bf64Ce814716b6261e267DbE6cdf021c"; + CpTemplateAddress = "0x18b0bD918b55f995Fd404B872404378A62cb403b"; //Factory DvmFactoryAddress = ""; DppFactoryAddress = ""; CpFactoryAddress = ""; //Proxy - DODOApproveAddress = ""; + DODOApproveAddress = "0xC3BeD579CaB3EC29B22D9AB99F4E586af42496b9"; DODOIncentiveAddress = ""; DODOTokenAddress = "0x43Dfc4159D86F3A37A5A4B3D4580b888ad7d4DDd"; //Account @@ -127,7 +127,7 @@ module.exports = async (deployer, network, accounts) => { //Template CloneFactoryAddress = "0x03E2427859119E497EB856a166F616a2Ce5f8c88"; DefaultMtFeeRateAddress = ""; - DefaultPermissionAddress = "0x50C86A07457E99389d7b49761a4237B70f0824E9"; + DefaultPermissionAddress = ""; DvmTemplateAddress = ""; DppTemplateAddress = ""; diff --git a/migrations/4_deploy_v2_mock.js b/migrations/4_deploy_v2_mock.js index 821bad9..49a2d1b 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 = "0x2D7F071415480eE7721eBB48c3147e347b980fEe"; - let DVMFactoryAddress = "0x1C0435b87B3772E994adA2D0194be91EaC85FDb0"; - let DODOApproveAddress = "0x5319f1CF056496e7E13D5653C3C7f338DE127a11"; - let DODOProxyV2Address = "0xe8836EB6EaE9Bc4Db880D4b9C0912E5db817e41D"; + let DPPFactoryAddress = "0xaFC7F3Ef4f8609411653FbF1Dd6D583A8Ae1f0fA"; + let DVMFactoryAddress = "0xE842d8c9A54B23C4D0cf208daCA3882c0c311353"; + let DODOApproveAddress = "0x6FB6313cafaFe38acA19Be0B8151d6354F74A340"; + let DODOProxyV2Address = "0xfDEDc04A641DE9CEeb4eD2F24d98faa22418Bd94"; diff --git a/truffle-config.js b/truffle-config.js index bac73a1..380aa46 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -78,8 +78,8 @@ module.exports = { provider: function () { return new HDWalletProvider(privKey, "https://mainnet.infura.io/v3/" + infuraId); }, - gas: 3000000, - gasPrice: 75000000000, + gas: 6000000, + gasPrice: 80000000000, network_id: 1, skipDryRun: true },