From 01826fa59fde64b3972826c1ce886293118ee92d Mon Sep 17 00:00:00 2001 From: sirpy Date: Wed, 8 Jan 2025 18:29:53 +0200 Subject: [PATCH] fix: allow stakers to withdraw from staking contracts if G$ rewards pending --- contracts/staking/GoodFundManager.sol | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/contracts/staking/GoodFundManager.sol b/contracts/staking/GoodFundManager.sol index df735c37..c0afd343 100644 --- a/contracts/staking/GoodFundManager.sol +++ b/contracts/staking/GoodFundManager.sol @@ -390,23 +390,23 @@ contract GoodFundManager is DAOUpgradeableContract, DSMath { * @param _user user to get rewards */ function mintReward(address _token, address _user) public { - Reward memory staking = rewardsForStakingContract[address(msg.sender)]; - require(staking.blockStart > 0, "Staking contract not registered"); - uint256 amount = IGoodStaking(address(msg.sender)).rewardsMinted( - _user, - staking.blockReward, - staking.blockStart, - staking.blockEnd - ); - if (amount > 0 && staking.isBlackListed == false) { - GoodReserveCDai(nameService.getAddress("RESERVE")).mintRewardFromRR( - _token, - _user, - amount - ); - - emit StakingRewardMinted(msg.sender, _user, amount); - } + // do nothing post reserve hack + // Reward memory staking = rewardsForStakingContract[address(msg.sender)]; + // require(staking.blockStart > 0, "Staking contract not registered"); + // uint256 amount = IGoodStaking(address(msg.sender)).rewardsMinted( + // _user, + // staking.blockReward, + // staking.blockStart, + // staking.blockEnd + // ); + // if (amount > 0 && staking.isBlackListed == false) { + // GoodReserveCDai(nameService.getAddress("RESERVE")).mintRewardFromRR( + // _token, + // _user, + // amount + // ); + // emit StakingRewardMinted(msg.sender, _user, amount); + // } } /// quick sort