diff --git a/config/heco-config.js b/config/heco-config.js index 9c802b5..54d1768 100644 --- a/config/heco-config.js +++ b/config/heco-config.js @@ -9,31 +9,32 @@ module.exports = { DODOSellHelper: "0xA0Bb1FbC23a547a8D448C7c8a2336F69A9dBa1AF", DODOCalleeHelper: "0xbd5cc9cf41a7dedaa7dfa6da189d3a522fe262d1", DODOV1PmmHelper: "0xFB973C79C665C0AC69E74C67be90D4C7A6f23c59", - DODOV2RouteHelper: "0x01330a505D1A5EA2d91EA50f3f2742150fba93da", + DODOV2RouteHelper: "0xd8E049732079a06a2483a3e1789755aD64dC03a9", //Template CloneFactory: "0x5dCEAe50CF8C3B885430E0E79226C513Db0318f2", FeeRateModel: "0x07911226E710dd0b9B1c4a2Dd3c85DeFd821D492", PermissionManager: "0xC142FBA5948c372f49aDa159748EA224de6cC9AA", - DVM: "0x13742E431830980c59Ca8d8eC4D001F64C0D0f09", + DVM: "0x05061d7f9353a7B5EB550840974B71A7465c2E86", DPP: "0x824083c29f99cd1E31D4A6bD859b1B5C2F0EA3EE", DPPAdmin: "0x3232fd648997F89E614A021fdAc756d61F9030A1", - CP: "0x02869989ecc2D310C360861Ec2779f7027F65190", + CP: "0x5B67cF070ce4303Ff4d450f21Cc371F9f0549335", ERC20: "0x62e1622a47c9fe74b2cf0bade5ecb8669ff9bfbf", MintableERC20: "0xdd9de5ed7a11b1ed3314cd7f754f27a15dedc63f", //Factory - DVMFactory: "0x496F9267054106Ea74F44BEFc2E3ea88126EB08f", - DPPFactory: "0xc18dd66CD9C9D1D8540ADbDe46C9a238C2713ff1", - CrowdPoolingFactory: "0x5949a2840865f5d9DdB37c2419060663473f3392", - ERC20Factory: "0x8476DE046e1923adD9002A73133230B9e5BE4127", + DVMFactory: "0xd8c77CF0F01222b07B8343A681C46eFA3faEa985", + DPPFactory: "0xF5420a3b91c457d336589217d45CcB8F7250eAed", + UpCpFactory: "0xF7c3467786efAA9BD4022941ecd5a00C61b17FA9", + CrowdPoolingFactory: "0x56133d0b63abf7A15D5697dD2dB9e04730f1A9C2", + ERC20Factory: "0x2cCDF6F742afBe813B68Ec6bb421C1BEa74fBd46", //Approve - DODOApprove: "0x67E849C7BC9735BFC8f6399171A94EA3BD80A19F", - DODOApproveProxy: "0x053b27B5b93f6F213084d8e2e1c9317D4B4Ffb28", + DODOApprove: "0x68b6c06Ac8Aa359868393724d25D871921E97293", + DODOApproveProxy: "0x91737709De4b2eDEE3a2B78A84e21a60C0b4D70b", //Periphery - DODOIncentive: "0x94290Bf438697Fa684d8CE0aC07c09f0e82D4f74", + DODOIncentive: "0x0000000000000000000000000000000000000000", //Adpater DODOV1Adapter: "0x9B63602c1FEd8292b76fb611B5de66a8fB7F8a77", @@ -41,7 +42,7 @@ module.exports = { UniAdapter: "0xDfa10eC79CE97689a7FeD409aEc3174681EF9602", //Proxy - DODOV2Proxy: "0x9c7300731971d083FA640b12ef0BCbFD6D8DB232", + DODOV2Proxy: "0xAc7cC7d2374492De2D1ce21e2FEcA26EB0d113e7", //vDODO DODOCirculationHelper: "", diff --git a/deploy-detail-periphery.txt b/deploy-detail-periphery.txt index db36264..a9fd245 100644 --- a/deploy-detail-periphery.txt +++ b/deploy-detail-periphery.txt @@ -312,3 +312,9 @@ network type: arbtest Deploy time: 2021/4/5 下午9:24:48 Deploy type: DODOToken DODOTokenAddress: 0x67ee3Cb086F8a16f34beE3ca72FAD36F7Db929e2 +==================================================== +network type: heco +Deploy time: 2021/4/6 下午9:02:51 +Deploy type: UpCrowdPoolingFactory +UpCrowdPoolingFactory address: 0xF7c3467786efAA9BD4022941ecd5a00C61b17FA9 +Init UpCpFactory Tx: 0x27d493acbed5e6425c86a48fe8ebfd65a49b884570e44cb87a6164c902aa52c9 diff --git a/deploy-detail-v2.0.txt b/deploy-detail-v2.0.txt index 515b4f9..d6bbe0e 100644 --- a/deploy-detail-v2.0.txt +++ b/deploy-detail-v2.0.txt @@ -882,3 +882,24 @@ Deploy type: V2 - Adapter DODOV1Adapter Address: 0x3a343F2e4e142412c5dD130359edb765a6054965 DODOV2Adapter Address: 0x2cD18557E14aF72DAA8090BcAA95b231ffC9ea26 UniAdapter Address: 0xeCEaDe494FD5F913Fd937C5CAc4577236395Dc32 +==================================================== +network type: heco +Deploy time: 2021/4/6 下午8:24:26 +Deploy type: V2 +multiSigAddress: 0xD93c8D2429a6b0269527f148F3A0e5D187B0b1Ca +DvmTemplateAddress: 0x05061d7f9353a7B5EB550840974B71A7465c2E86 +CpTemplateAddress: 0x5B67cF070ce4303Ff4d450f21Cc371F9f0549335 +ERC20FactoryAddress: 0x2cCDF6F742afBe813B68Ec6bb421C1BEa74fBd46 +DODOApprove Address: 0x68b6c06Ac8Aa359868393724d25D871921E97293 +DODOApproveProxy Address: 0x91737709De4b2eDEE3a2B78A84e21a60C0b4D70b +DvmFactoryAddress: 0xd8c77CF0F01222b07B8343A681C46eFA3faEa985 +Init DvmFactory Tx: 0xfc3b46811c447b5a72f507591f25c954cd4b857fb3cfca6706e40a1fdbea0aec +DppFactoryAddress: 0xF5420a3b91c457d336589217d45CcB8F7250eAed +Init DppFactory Tx: 0xc1bc6fe39d58d44f308a7c3af6e39ab8ab6896afff99fb035d6cc6e42675cce6 +CpFactoryAddress: 0x56133d0b63abf7A15D5697dD2dB9e04730f1A9C2 +Init CpFactory Tx: 0xa3bb6a347ac6eb3955e6773d776bedc480e54da15d744773be24b55273f87e0a +DODOV2RouteHelper Address: 0xd8E049732079a06a2483a3e1789755aD64dC03a9 +DODOV2Proxy02 Address: 0xAc7cC7d2374492De2D1ce21e2FEcA26EB0d113e7 +Init DODOProxyV2 Tx: 0xaf68709cabcfa8efdd8d16eadf9ce2d51dd8cfdc074fea704c762cfc9cad6f94 +DODOApproveProxy Init tx: 0xad3f8af693cc90f8f7843ef7458c54fe7bf7bdd18951dbfbfcbcdec2e709813d +DODOApprove Init tx: 0x64c084228573cc313470155da609ffc126dde54a942c0b221e7512e95d71fcb3 diff --git a/migrations/2_deploy_v2.js b/migrations/2_deploy_v2.js index c7f8ca2..c29c0e4 100644 --- a/migrations/2_deploy_v2.js +++ b/migrations/2_deploy_v2.js @@ -296,9 +296,9 @@ module.exports = async (deployer, network, accounts) => { //2. ChangeDODO Incentive proxy - const DODOIncentiveInstance = await DODOIncentive.at(DODOIncentiveAddress); - var tx = await DODOIncentiveInstance.changeDODOProxy(DODOProxyV2.address); - logger.log("DODOIncentive ChangeProxy tx: ", tx.tx); + // const DODOIncentiveInstance = await DODOIncentive.at(DODOIncentiveAddress); + // var tx = await DODOIncentiveInstance.changeDODOProxy(DODOProxyV2.address); + // logger.log("DODOIncentive ChangeProxy tx: ", tx.tx); //3. Open trade incentive // var tx = await DODOIncentiveInstance.changePerReward("10000000000000000000");