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

fix basemine

Browse Source
This commit is contained in:
owen05
2021-03-31 14:44:00 +08:00
parent 763a3ee24e
commit cd7313d04c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/DODOToken/DODOMineV2/BaseMine.sol
View File

@@ -61,7 +61,7 @@ contract BaseMine is InitializableOwnable {
).add(rt.userRewards[user]); ).add(rt.userRewards[user]);
} }
function getPendingRewardByToken(address user, address rewardToken) public view returns (uint256) { function getPendingRewardByToken(address user, address rewardToken) external view returns (uint256) {
return getPendingReward(user, getIdByRewardToken(rewardToken)); return getPendingReward(user, getIdByRewardToken(rewardToken));
} }
@@ -73,8 +73,8 @@ contract BaseMine is InitializableOwnable {
return _balances[user]; return _balances[user];
} }
function getRewardTokenById(uint256 i) public view returns (address) { function getRewardTokenById(uint256 i) external view returns (address) {
require(i<rewardTokenInfos.length, "DODOMineV2: REWARD_ID_FOUND"); require(i<rewardTokenInfos.length, "DODOMineV2: REWARD_ID_NOT_FOUND");
RewardTokenInfo memory rt = rewardTokenInfos[i]; RewardTokenInfo memory rt = rewardTokenInfos[i];
return rt.rewardToken; return rt.rewardToken;
} }
@@ -86,7 +86,7 @@ contract BaseMine is InitializableOwnable {
return i; return i;
} }
} }
require(true, "DODOMineV2: TOKEN_NOT_FOUND"); require(false, "DODOMineV2: TOKEN_NOT_FOUND");
} }
// ============ Claim ============ // ============ Claim ============
@@ -102,7 +102,7 @@ contract BaseMine is InitializableOwnable {
} }
} }
function claimAllRewards() public { function claimAllRewards() external {
uint256 len = rewardTokenInfos.length; uint256 len = rewardTokenInfos.length;
for (uint256 i = 0; i < len; i++) { for (uint256 i = 0; i < len; i++) {
claimReward(i); claimReward(i);
@@ -143,7 +143,9 @@ contract BaseMine is InitializableOwnable {
uint256 len = rewardTokenInfos.length; uint256 len = rewardTokenInfos.length;
for (uint256 i = 0; i < len; i++) { for (uint256 i = 0; i < len; i++) {
if (rewardToken == rewardTokenInfos[i].rewardToken) { if (rewardToken == rewardTokenInfos[i].rewardToken) {
rewardTokenInfos[i] = rewardTokenInfos[len - 1]; if(i != len - 1) {
rewardTokenInfos[i] = rewardTokenInfos[len - 1];
}
rewardTokenInfos.pop(); rewardTokenInfos.pop();
emit RemoveRewardToken(rewardToken); emit RemoveRewardToken(rewardToken);
break; break;