diff --git a/config/mblocal-config.js b/config/mblocal-config.js deleted file mode 100644 index b1c0e7c..0000000 --- a/config/mblocal-config.js +++ /dev/null @@ -1,56 +0,0 @@ -module.exports = { - MBLOCAL_CONFIG: { - //TOKEN - WETH: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741", - CHI: "0x0000000000000000000000000000000000000000", - DODO: "0x5c4242beB94dE30b922f57241f1D02f36e906915", - - //Helper - DODOSellHelper: "0xF8cef78E923919054037a1D03662bBD884fF4edf", - DODOCalleeHelper: "0xe573BCA813c741229ffB2488F7856C6cAa841041", - DODOV1PmmHelper: "0xBb0CC0fb3e0c06725c67167501f850B4900D6DB5", - DODOV2RouteHelper: "0x8e66867Ff57250AF985Da3a81eE480fb6889EA9B", - - //Template - CloneFactory: "0xfE5D3c52F7ee9aa32a69b96Bfbb088Ba0bCd8EfC", - FeeRateModel: "0x92496871560a01551E1B4fD04540D7A519D5C19e", - PermissionManager: "0xDc552396caEc809752fED0c5E23fd3983766e758", - DVM: "0xD81C7319c85fcd6e1F0893b3988BeBab6247Adbc", - DPP: "0x596fB37d99bd679d1af76fBCB658f7a1a31A1205", - DPPAdmin: "0x4d6942683D051FF95804B08EF11F98A7F41C1b44", - CP: "0x79885EBC79783C9174faC36Ed99cD9467CB8cDbE", - ERC20: "0xe9CC152481642D7a3Ea207E3930067B19663770F", - MintableERC20: "0x0484C33Bad127FA77CC64d6475aDD6483c70BbB9", - - //Factory - DVMFactory: "0x8d9c0eAc2AF186035b18c479E2261fF893283f83", - DPPFactory: "0xBF1fdCb2A1CAf1CA5662222417f0351043EEc19A", - CrowdPoolingFactory: "0x7f78c83A10b9AcDaB1572bC76FD44FF51feDdafE", - ERC20Factory: "0x4FBb399fB0E360e11DFF274090650C7e588F1af1", - - //Approve - DODOApprove: "0xC7430D8919b54F85a723810FBceF2114482EC5D1", - DODOApproveProxy: "0xC683516e791c5E2b8e913dE0670d499927f54CEc", - - //Periphery - DODOIncentive: "0x1bc238EAd60bdF5e94BB8f7205b6e75ACabACbC0", - - //Adpater - DODOV1Adapter: "", - DODOV2Adapter: "", - UniAdapter: "", - - //Proxy - DODOV2Proxy: "0x750C200d7c7C426da169742f705CA5268e1736b4", - - //vDODO - DODOCirculationHelper: "", - Governance: "", - dodoTeam: "", - vDODOToken: "", - - //Account - multiSigAddress: "", - defaultMaintainer: "", - } -} \ No newline at end of file diff --git a/config/oktest-config.js b/config/oktest-config.js index ad98d1c..a502e06 100644 --- a/config/oktest-config.js +++ b/config/oktest-config.js @@ -1,47 +1,47 @@ module.exports = { OKTEST_CONFIG: { //TOKEN - WETH: "", + WETH: "0x2219845942d28716c0f7c605765fabdca1a7d9e0", CHI: "0x0000000000000000000000000000000000000000", - DODO: "", + DODO: "0x19DA73be23Cea6bFA804Ec020041b8F3971BC522", //Helper - DODOSellHelper: "", - DODOCalleeHelper: "", - DODOV1PmmHelper: "", - DODOV2RouteHelper: "", + DODOSellHelper: "0x0F859706AeE7FcF61D5A8939E8CB9dBB6c1EDA33", + DODOCalleeHelper: "0xe380Ad3181A69BF92133D2feb609867c4adC61eA", + DODOV1PmmHelper: "0xED3Ac3335a24331F1704df8CB456C88dCA282782", + DODOV2RouteHelper: "0x6A08844EdeB49A8578671F1452Fd7dbcc048424F", //Template CloneFactory: "", - FeeRateModel: "", - PermissionManager: "", - DVM: "", - DPP: "", - DPPAdmin: "", - CP: "", - ERC20: "", - MintableERC20: "", + FeeRateModel: "0x4073f2b9bB95774531b9e23d206a308c614A943a", + PermissionManager: "0x0cA2d4BC266B1ad7a0787409AD7a0331D78Eea90", + DVM: "0xbd826D0d98480F1D63Bc4125F1368889517559d0", + DPP: "0x890ED2A571486799F1b6413fbA4669106441f702", + DPPAdmin: "0x00E7e2bE2e5EcD4343DeE10712Aa53e94c7B5958", + CP: "0x93e0fd315d95F164147a6C427dA3D6173750C256", + ERC20: "0x044B56B8CB54c358415Bf9507d56b1A09b5E4c29", + MintableERC20: "0x527a5791761fCeBa189B5bEaE175E922D87c636e", //Factory - DVMFactory: "", - DPPFactory: "", - CrowdPoolingFactory: "", - ERC20Factory: "", + DVMFactory: "0x16810820A4ff4348Fc39C07bDf1641B724E7F5E7", + DPPFactory: "0x4f678ECC9d5507eDf39E7656A714A9B51Bb6EA58", + CrowdPoolingFactory: "0xf4D3ab686a1E133Ec0806644FE5d1FD94869F88F", + ERC20Factory: "0xc54c1D6Bf83c9d8ef260b93dEfc0eC00132Fa33B", //Approve - DODOApprove: "", - DODOApproveProxy: "", + DODOApprove: "0x51cB75FEd3beb23Ae3Ed5FC74a761E3913ae47f9", + DODOApproveProxy: "0xf40be68442e8bcf900FED714246f99BE556345e7", //Periphery - DODOIncentive: "", + DODOIncentive: "0x3318FB94AF0c7B4A45001b5901d36BBA85afef2D", //Adpater - DODOV1Adapter: "", - DODOV2Adapter: "", - UniAdapter: "", + DODOV1Adapter: "0xa432E1ace51eB849d7a1664e5c60ce965B1fE6E4", + DODOV2Adapter: "0xC2aA2C0175e376E63cFb0bd1CAB1196DDc9a7076", + UniAdapter: "0x03E2427859119E497EB856a166F616a2Ce5f8c88", //Proxy - DODOV2Proxy: "", + DODOV2Proxy: "0xf83BeeA1025359C4d2cf554C330bF8Fd1a9eEbAb", //vDODO DODOCirculationHelper: "", diff --git a/configAdapter.js b/configAdapter.js index f36f095..283cf93 100644 --- a/configAdapter.js +++ b/configAdapter.js @@ -3,7 +3,7 @@ const { BSC_CONFIG } = require("./config/bsc-config"); const { HECO_CONFIG } = require("./config/heco-config"); const { KOVAN_CONFIG } = require("./config/kovan-config"); const { MBTEST_CONFIG } = require("./config/mbtest-config"); -const { MBLOCAL_CONFIG } = require("./config/mblocal-config"); +const { OKTEST_CONFIG } = require("./config/oktest-config"); exports.GetConfig = function (network, accounts) { var CONFIG = {} @@ -27,8 +27,8 @@ exports.GetConfig = function (network, accounts) { CONFIG.multiSigAddress = accounts[0] CONFIG.defaultMaintainer = accounts[0] break; - case "mbdev": - CONFIG = MBLOCAL_CONFIG + case "oktest": + CONFIG = OKTEST_CONFIG CONFIG.multiSigAddress = accounts[0] CONFIG.defaultMaintainer = accounts[0] break; diff --git a/deploy-detail-periphery.txt b/deploy-detail-periphery.txt index 597a092..2305c1f 100644 --- a/deploy-detail-periphery.txt +++ b/deploy-detail-periphery.txt @@ -292,3 +292,9 @@ Deploy time: 2021/3/15 下午9:02:47 Deploy type: WETH9 WETH9Address: 0xF8cef78E923919054037a1D03662bBD884fF4edf MultiCallAddress: 0xb61c30c1612504d334b39E5172D8215cb5Ad576C +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午5:50:20 +Deploy type: DODOToken +DODOTokenAddress: 0x19DA73be23Cea6bFA804Ec020041b8F3971BC522 +MultiCallAddress: 0x1Cc229Ac0ef9ba932e4dEbB898C77901C9AFB694 diff --git a/deploy-detail-v2.0.txt b/deploy-detail-v2.0.txt index 11ad83d..6628202 100644 --- a/deploy-detail-v2.0.txt +++ b/deploy-detail-v2.0.txt @@ -655,3 +655,69 @@ Deploy type: V2 - Adapter DODOV1Adapter Address: 0x1a3fa978909d86dF1244216b02733136b438D83E DODOV2Adapter Address: 0x0e1630bd2bc047fF6338F78Dc45410e1c0Fc32a0 UniAdapter Address: 0x1E7727eDad5a2ef47C5AB95a20FEd515735591B2 +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午5:51:41 +Deploy type: V2 +multiSigAddress: undefined +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午5:55:38 +Deploy type: V2 +multiSigAddress: undefined +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午6:29:10 +Deploy type: V2 +multiSigAddress: 0xaac153c1344cA14497A5dd22b1F70C28793625aa +DODOSellHelper Address: 0x0F859706AeE7FcF61D5A8939E8CB9dBB6c1EDA33 +DODOCalleeHelperAddress: 0xe380Ad3181A69BF92133D2feb609867c4adC61eA +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午6:32:58 +Deploy type: V2 +multiSigAddress: 0xaac153c1344cA14497A5dd22b1F70C28793625aa +DODOV1RouterHelper Address: 0xED3Ac3335a24331F1704df8CB456C88dCA282782 +CloneFactoryAddress: 0xb0199C2c8ADF1E6c1e41De60A62E993406Cb8C02 +DefaultMtFeeRateAddress: 0x4073f2b9bB95774531b9e23d206a308c614A943a +Init DefaultMtFeeRateAddress Tx: 0xee585bca5c418f8d901532b07946af27ce4fbba2efbfbeae134196ab4f830886 +DefaultPermissionAddress: 0x0cA2d4BC266B1ad7a0787409AD7a0331D78Eea90 +Init DefaultPermissionAddress Tx: 0x7d4bf524098795aaf9ea08b55854905e58b44501ef7b9a81759955778c437fd2 +DvmTemplateAddress: 0xbd826D0d98480F1D63Bc4125F1368889517559d0 +DppTemplateAddress: 0x890ED2A571486799F1b6413fbA4669106441f702 +DppAdminTemplateAddress: 0x00E7e2bE2e5EcD4343DeE10712Aa53e94c7B5958 +CpTemplateAddress: 0x93e0fd315d95F164147a6C427dA3D6173750C256 +ERC20TemplateAddress: 0x044B56B8CB54c358415Bf9507d56b1A09b5E4c29 +MintableERC20TemplateAddress: 0x527a5791761fCeBa189B5bEaE175E922D87c636e +ERC20FactoryAddress: 0xc54c1D6Bf83c9d8ef260b93dEfc0eC00132Fa33B +DODOApprove Address: 0x51cB75FEd3beb23Ae3Ed5FC74a761E3913ae47f9 +DODOApproveProxy Address: 0xf40be68442e8bcf900FED714246f99BE556345e7 +DODOIncentiveAddress: 0x3318FB94AF0c7B4A45001b5901d36BBA85afef2D +DODOIncentive Init tx: 0xd611e33a9a5f7f20ee96ecf5c4dbef7b07b017727032707f0c46187ca6e7262c +DvmFactoryAddress: 0x16810820A4ff4348Fc39C07bDf1641B724E7F5E7 +Init DvmFactory Tx: 0x30c2cca689561742fe5ef5ce47edf63c3854b83ce1b92e7c842be1871c94a3b2 +DppFactoryAddress: 0x4f678ECC9d5507eDf39E7656A714A9B51Bb6EA58 +Init DppFactory Tx: 0x4ff036040a161b764206e91fd1af16b10da9ef5dbfa9edaf550bf64966d024d3 +CpFactoryAddress: 0xf4D3ab686a1E133Ec0806644FE5d1FD94869F88F +Init CpFactory Tx: 0xb300f6ae79927223daecaef686795d18443b1223fe290a76b3d008c80f4efd50 +DODOV2RouteHelper Address: 0x6A08844EdeB49A8578671F1452Fd7dbcc048424F +DODOV2Proxy02 Address: 0x76532E95E26336c2096f969a6AF396f4796A0b67 +Init DODOProxyV2 Tx: 0xd93bc1ccb24267dce549964f3b70ed0eb9c16b2f35cc9e14d36515c0d0fa4239 +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午8:18:09 +Deploy type: V2 +multiSigAddress: 0xaac153c1344cA14497A5dd22b1F70C28793625aa +CloneFactoryAddress: 0xae7153d043C55789F88032C168a0A74B18E73CEE +DODOV2Proxy02 Address: 0xf83BeeA1025359C4d2cf554C330bF8Fd1a9eEbAb +Init DODOProxyV2 Tx: 0x503e53d6663cf23f726af62da5a9f6b1e6e03d5ff8f46193d15885578915b313 +DODOApproveProxy Init tx: 0x6826b75559744a67e29c7688b55ecaf5cd2ce3bc6b697ff938a3af9da93a3c89 +DODOApprove Init tx: 0xaff1b167b4e23f76547a0de488ad06a734b9738bd963a3eba26572ca0fc0def2 +DODOIncentive ChangeProxy tx: 0xac36da3fb39009346e41db0ef0b165b1785ef479b6550200d5bf225a6033f7de +==================================================== +network type: oktest +Deploy time: 2021/3/18 下午8:21:27 +Deploy type: V2 - Adapter +DODOV1Adapter Address: 0xa432E1ace51eB849d7a1664e5c60ce965B1fE6E4 +DODOV2Adapter Address: 0xC2aA2C0175e376E63cFb0bd1CAB1196DDc9a7076 +UniAdapter Address: 0x03E2427859119E497EB856a166F616a2Ce5f8c88 diff --git a/migrations/2_deploy_v2.js b/migrations/2_deploy_v2.js index 50ef93b..c7f8ca2 100644 --- a/migrations/2_deploy_v2.js +++ b/migrations/2_deploy_v2.js @@ -283,7 +283,7 @@ module.exports = async (deployer, network, accounts) => { logger.log("Init DODOProxyV2 Tx:", tx.tx); - if (network == 'kovan' || network == 'mbtestnet') { + if (network == 'kovan' || network == 'mbtestnet' || network == 'oktest') { const DODOApproveProxyInstance = await DODOApproveProxy.at(DODOApproveProxyAddress); var tx = await DODOApproveProxyInstance.init(multiSigAddress, [DODOProxyV2.address]); diff --git a/truffle-config.js b/truffle-config.js index febd37b..5c5b029 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -38,22 +38,22 @@ module.exports = { * $ truffle test --network */ deploySwitch: { - DEPLOY_V1: false, - DEPLOY_V2: false, - ADAPTER: false, - MOCK_TOKEN: false, - MOCK_V2_POOL: false, - vDODOToken: false, - DODORecharge: false, - MINE: false, - FEERATEIMPL: false, - WETH: false, - DODO: false, - UpCP: false, - DVM: false, - CP: false, - CPFactory: false, - MultiCall: true + DEPLOY_V1: false, + DEPLOY_V2: false, + ADAPTER: false, + MOCK_TOKEN: false, + MOCK_V2_POOL: false, + vDODOToken: false, + DODORecharge: false, + MINE: false, + FEERATEIMPL: false, + WETH: false, + DODO: false, + UpCP: false, + DVM: false, + CP: false, + CPFactory: false, + MultiCall: false }, networks: { @@ -70,7 +70,7 @@ module.exports = { gas: 1000000000, gasPrice: 1, }, - + kovan: { networkCheckTimeout: 100000, provider: function () { @@ -92,7 +92,7 @@ module.exports = { network_id: 1, skipDryRun: true }, - + bsclive: { provider: function () { return new HDWalletProvider(privKey, "https://bsc-dataseed1.binance.org"); @@ -102,7 +102,7 @@ module.exports = { timeoutBlocks: 200, skipDryRun: true }, - + heco: { provider: function () { return new HDWalletProvider(privKey, "https://http-mainnet.hecochain.com"); @@ -110,19 +110,22 @@ module.exports = { gasPrice: 1500000000, network_id: 128 }, - + mbtestnet: { provider: () => { return new HDWalletProvider(privKey, 'https://moonbeam-rpc.dodoex.io'); }, network_id: 1281, }, - - mbdev: { + + oktest: { provider: () => { - return new HDWalletProvider(privKey, 'http://localhost:9933/') + return new HDWalletProvider(privKey, 'https://exchaintest.okexcn.com') }, - network_id: 1281, + network_id: 65, + confirmations: 10, + timeoutBlocks: 200, + skipDryRun: true }, coverage: {