d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix vdodo

Browse Source
This commit is contained in:
owen05
2021-02-13 13:31:48 +08:00
parent 1360f60d60
commit 7df484fccc
6 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/DODOToken/vDODOToken.sol
View File

@@ -273,7 +273,11 @@ contract vDODOToken is InitializableOwnable {
// ============ Helper Functions ============ // ============ Helper Functions ============
function getLatestAlpha() public view returns (uint256 newAlpha, uint256 curDistribution) { function getLatestAlpha() public view returns (uint256 newAlpha, uint256 curDistribution) {
curDistribution = _DODO_PER_BLOCK_ * (block.number - _LAST_REWARD_BLOCK_); if (_LAST_REWARD_BLOCK_ == 0) {
curDistribution = 0;
} else {
curDistribution = _DODO_PER_BLOCK_ * (block.number - _LAST_REWARD_BLOCK_);
}
if (_TOTAL_STAKING_POWER_ > 0) { if (_TOTAL_STAKING_POWER_ > 0) {
newAlpha = uint256(alpha).add(DecimalMath.divFloor(curDistribution, _TOTAL_STAKING_POWER_)); newAlpha = uint256(alpha).add(DecimalMath.divFloor(curDistribution, _TOTAL_STAKING_POWER_));
} else { } else {

14
deploy-detail-periphery.txt
View File

@@ -53,3 +53,17 @@ network type: live
Deploy time: 2021/2/9 下午11:22:45 Deploy time: 2021/2/9 下午11:22:45
Deploy type: DODOMigrationBSC Deploy type: DODOMigrationBSC
DODOMigrationBSCAddress: 0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7 DODOMigrationBSCAddress: 0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7
====================================================
network type: kovan
Deploy time: 2021/2/13 下午12:25:51
Deploy type: vDODOToken
vDODOTokenAddress: 0x188A86C23c596C8b907b227C1DB34EfE769e5c0b
Init vDODOTokenAddress Tx: 0x203c468d95005fe957e0ee22717b1a098a893be916dc18926de98f8d752832e3
DODOCirculationHelperAddress: 0xbF5B98D74B249B86a2f1099D34CF568e2b5EB5b6
Init DODOCirculationHelperAddress Tx: 0xfc46968cf93ff5324b70ca838e66ab5a4b95a2477a352f30e5e92f02d2cbce4a
vDODOToken setDODOCirculationHelper tx: 0x47216bde498446ee2ed3e4e534c8814ad1e919e4c86f95d5ac619cbf1c1529aa
DODOApproveProxy Unlock tx: 0xac285c252c052144c80722ca67b9e765280f2c45b8e4ff73282fabe26158aba6
DODOApproveProxy add tx: 0x0a9174ac009af95a3273ad3a3a961e997aef48d5c3d2537e0389dd48619f1d06
vDODOToken first mint tx: 0x600c5714df725a86725b36a01c3bf5cfc60853f02b7f7214ca9d80c98eb9e72d
vDODOToken injected dodo tx: 0xf2415de9bafeef0d80afe990b5e36a0ebcd339d6cd604d6388fd72e4f01e0de7
vDODOToken changeReward tx: 0x80c01b5e630acdccc2a96f97d884e207488ee64a18cdfcb4566820473ffe3a1f

3
deploy-detail-v2.0.txt
View File

@@ -640,3 +640,6 @@ Init DODOProxyV2 Tx: 0x72afdcd3795ee00b67b87c88af14227584b1ca7588dd10cdcda11c423
DODOApproveProxy Init tx: 0x34e33c12750fff4abd34dd368157ad1b2101597f44a3f9783725d8a245860b73 DODOApproveProxy Init tx: 0x34e33c12750fff4abd34dd368157ad1b2101597f44a3f9783725d8a245860b73
DODOApprove Init tx: 0x1f8ac1bbf54e3b42dc3657485fd837efba382a73342e2ced29b6e9fbdb4edeb4 DODOApprove Init tx: 0x1f8ac1bbf54e3b42dc3657485fd837efba382a73342e2ced29b6e9fbdb4edeb4
DODOIncentive ChangeProxy tx: 0xd0427f9a814efb822a36ebf17bbf637d066887adacf636c32455a165d30b768 DODOIncentive ChangeProxy tx: 0xd0427f9a814efb822a36ebf17bbf637d066887adacf636c32455a165d30b768
====================================================
network type: kovan
Deploy time: 2021/2/13 下午12:25:44

3
kovan-mock-v2.0.txt
View File

@@ -526,3 +526,6 @@ Deploy time: 2021/2/9 下午10:48:41
==================================================== ====================================================
network type: kovan network type: kovan
Deploy time: 2021/2/9 下午10:51:19 Deploy time: 2021/2/9 下午10:51:19
====================================================
network type: kovan
Deploy time: 2021/2/13 下午12:25:48

8
migrations/5_deploy_periphery.js
View File

@@ -22,8 +22,8 @@ module.exports = async (deployer, network, accounts) => {
if (network == "kovan") { if (network == "kovan") {
DODOTokenAddress = "0x854b0f89BAa9101e49Bfb357A38071C9db5d0DFa"; DODOTokenAddress = "0x854b0f89BAa9101e49Bfb357A38071C9db5d0DFa";
DODOApproveProxyAddress = "0xE2bf3e72E126f0AD4Aec07AdfA6cc345EEF43bDe"; DODOApproveProxyAddress = "0xE2bf3e72E126f0AD4Aec07AdfA6cc345EEF43bDe";
DODOCirculationHelperAddress = "0xC4d70FdD0310BcAcA8a6eC85e66e95576CB096E4"; DODOCirculationHelperAddress = "";
vDODOTokenAddress = "0x8e565B96C3B6BB36363183f5D43D667927164e91"; vDODOTokenAddress = "";
GovernanceAddress = "0x0000000000000000000000000000000000000000"; GovernanceAddress = "0x0000000000000000000000000000000000000000";
//Account //Account
multiSigAddress = accounts[0]; multiSigAddress = accounts[0];
@@ -97,8 +97,8 @@ module.exports = async (deployer, network, accounts) => {
if(network == 'kovan') { if(network == 'kovan') {
const vDODOTokenInstance = await vDODOToken.at(vDODOTokenAddress); const vDODOTokenInstance = await vDODOToken.at(vDODOTokenAddress);
//updateDODOCirculationHelper //updateDODOCirculationHelper
// var tx = await vDODOTokenInstance.updateDODOCirculationHelper(DODOCirculationHelperAddress); var tx = await vDODOTokenInstance.updateDODOCirculationHelper(DODOCirculationHelperAddress);
// logger.log("vDODOToken setDODOCirculationHelper tx: ", tx.tx); logger.log("vDODOToken setDODOCirculationHelper tx: ", tx.tx);
//ApproveProxy add //ApproveProxy add
const DODOApproveProxyInstance = await DODOApproveProxy.at(DODOApproveProxyAddress); const DODOApproveProxyInstance = await DODOApproveProxy.at(DODOApproveProxyAddress);

4
truffle-config.js
View File

@@ -46,9 +46,9 @@ module.exports = {
MOCK_V2_SWAP: false, MOCK_V2_SWAP: false,
MANUAL_ADD_POOL: false, MANUAL_ADD_POOL: false,
MOCK_TARGET_POOL: false, MOCK_TARGET_POOL: false,
BSCMigration: true, BSCMigration: false,
DODOBscToken: false, DODOBscToken: false,
vDODOToken: false, vDODOToken: true,
CALLEE: false, CALLEE: false,
}, },