diff --git a/contracts/DODOToken/DODORecharge.sol b/contracts/DODOToken/DODORecharge.sol index b781dde..92d025a 100644 --- a/contracts/DODOToken/DODORecharge.sol +++ b/contracts/DODOToken/DODORecharge.sol @@ -16,8 +16,8 @@ import {IDODOApproveProxy} from "../SmartRoute/DODOApproveProxy.sol"; contract DODORecharge is InitializableOwnable { using SafeERC20 for IERC20; - address immutable _DODO_TOKEN_; - address immutable _DODO_APPROVE_PROXY_; + address public immutable _DODO_TOKEN_; + address public immutable _DODO_APPROVE_PROXY_; event DeductDODO(address user,uint256 _amount); diff --git a/contracts/DODOToken/vDODOToken.sol b/contracts/DODOToken/vDODOToken.sol index d104ebe..3432e66 100644 --- a/contracts/DODOToken/vDODOToken.sol +++ b/contracts/DODOToken/vDODOToken.sol @@ -30,7 +30,7 @@ contract vDODOToken is InitializableOwnable { // ============ Storage(ERC20) ============ - string public name = "vDODO Token"; + string public name = "vDODO Membership Token"; string public symbol = "vDODO"; uint8 public decimals = 18; mapping(address => mapping(address => uint256)) internal _ALLOWED_; diff --git a/deploy-detail-periphery.txt b/deploy-detail-periphery.txt index 0dd0f64..8f14c84 100644 --- a/deploy-detail-periphery.txt +++ b/deploy-detail-periphery.txt @@ -67,3 +67,23 @@ DODOApproveProxy add tx: 0x0a9174ac009af95a3273ad3a3a961e997aef48d5c3d2537e0389 vDODOToken first mint tx: 0x600c5714df725a86725b36a01c3bf5cfc60853f02b7f7214ca9d80c98eb9e72d vDODOToken injected dodo tx: 0xf2415de9bafeef0d80afe990b5e36a0ebcd339d6cd604d6388fd72e4f01e0de7 vDODOToken changeReward tx: 0x80c01b5e630acdccc2a96f97d884e207488ee64a18cdfcb4566820473ffe3a1f +==================================================== +network type: live +Deploy time: 2021/2/13 下午9:54:02 +Deploy type: vDODOToken +vDODOTokenAddress: 0xc4436fBAE6eBa5d95bf7d53Ae515F8A707Bd402A +Init vDODOTokenAddress Tx: 0x89392c1bd215fff0d5da44e27c0d0d2099a97788a28d371fa55d19af74895d9a +DODOCirculationHelperAddress: 0x53233ABD9108761258a4B6B7822abFD6716B129B +Init DODOCirculationHelperAddress Tx: 0xc26313165161badec354d39c999a85223965df186246b8ea37182eae894e7442 +==================================================== +network type: bsclive +Deploy time: 2021/2/13 下午10:20:21 +Deploy type: DODORecharge +DODORechargeAddress: 0x61b21603A527b487C4a3A80a69224b87751D0F6a +Init DODORechargeAddress Tx: 0x47bc2d2f46aac266ecf7c7743cc935fa06cf862e26463a9a8c1ebe91cee47611 +==================================================== +network type: bsclive +Deploy time: 2021/2/13 下午10:24:52 +Deploy type: DODORecharge +DODORechargeAddress: 0xF7c5311B618E6dFBBc34210c92D2C9675D7EdDCA +Init DODORechargeAddress Tx: 0xc22cdde8436f28ae2343ebcd628091104545a60c6550a2cedf47344c5b337b09 diff --git a/deploy-detail-v2.0.txt b/deploy-detail-v2.0.txt index c4e64ca..a0dbb9f 100644 --- a/deploy-detail-v2.0.txt +++ b/deploy-detail-v2.0.txt @@ -643,3 +643,12 @@ DODOIncentive ChangeProxy tx: 0xd0427f9a814efb822a36ebf17bbf637d066887adacf636c ==================================================== network type: kovan Deploy time: 2021/2/13 下午12:25:44 +==================================================== +network type: live +Deploy time: 2021/2/13 下午9:53:52 +==================================================== +network type: bsclive +Deploy time: 2021/2/13 下午10:20:14 +==================================================== +network type: bsclive +Deploy time: 2021/2/13 下午10:24:45 diff --git a/migrations/5_deploy_periphery.js b/migrations/5_deploy_periphery.js index 7319edc..7e1a90f 100644 --- a/migrations/5_deploy_periphery.js +++ b/migrations/5_deploy_periphery.js @@ -4,6 +4,7 @@ const file = fs.createWriteStream("../deploy-detail-periphery.txt", { 'flags': ' let logger = new console.Console(file, file); const DODOBscToken = artifacts.require("DODOBscToken"); +const DODORecharge = artifacts.require("DODORecharge"); const DODOMigrationBSC = artifacts.require("DODOMigrationBSC"); const vDODOToken = artifacts.require("vDODOToken"); const DODOCirculationHelper = artifacts.require("DODOCirculationHelper"); @@ -36,8 +37,10 @@ module.exports = async (deployer, network, accounts) => { GovernanceAddress = "0x0000000000000000000000000000000000000000"; //Account multiSigAddress = "0x95C4F5b83aA70810D4f142d58e5F7242Bd891CB0"; - dodoTeam = ""; + dodoTeam = "0x95C4F5b83aA70810D4f142d58e5F7242Bd891CB0"; } else if (network == "bsclive") { + DODOTokenAddress = "0x67ee3Cb086F8a16f34beE3ca72FAD36F7Db929e2"; + DODOApproveProxyAddress = "0xB76de21f04F677f07D9881174a1D8E624276314C"; //Account multiSigAddress = "0x4073f2b9bB95774531b9e23d206a308c614A943a"; } else return; @@ -46,6 +49,15 @@ module.exports = async (deployer, network, accounts) => { logger.log("network type: " + network); logger.log("Deploy time: " + new Date().toLocaleString()); + if (deploySwitch.DODORecharge) { + logger.log("Deploy type: DODORecharge"); + await deployer.deploy(DODORecharge, DODOTokenAddress, DODOApproveProxyAddress); + DODORechargeAddress = DODORecharge.address; + logger.log("DODORechargeAddress: ", DODORechargeAddress); + const dodoRechargeInstance = await DODORecharge.at(DODORechargeAddress); + var tx = await dodoRechargeInstance.initOwner(multiSigAddress); + logger.log("Init DODORechargeAddress Tx:", tx.tx); + } if (deploySwitch.DODOBscToken && (network == "bsclive")) { logger.log("Deploy type: DODOBscToken"); diff --git a/truffle-config.js b/truffle-config.js index b6c7699..8e996bf 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -48,8 +48,9 @@ module.exports = { MOCK_TARGET_POOL: false, BSCMigration: false, DODOBscToken: false, - vDODOToken: true, + vDODOToken: false, CALLEE: false, + DODORecharge: true }, networks: {