Q-AJN-7: zero ERC20 transfer on claim reward (#74)

- if claimed rewards are 0 then do not attempt to transfer - expose unit test
ajna-finance · May 8, 2023 · 86ddbf8 · 86ddbf8
1 parent d10601d
commit 86ddbf8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/src/grants/base/StandardFunding.sol b/src/grants/base/StandardFunding.sol
@@ -261,7 +261,7 @@ abstract contract StandardFunding is Funding, IStandardFunding {
         );
 
         // transfer rewards to delegatee
-        IERC20(ajnaTokenAddress).safeTransfer(msg.sender, rewardClaimed_);
+        if (rewardClaimed_ != 0) IERC20(ajnaTokenAddress).safeTransfer(msg.sender, rewardClaimed_);
     }
 
     /**
@@ -279,17 +279,17 @@ abstract contract StandardFunding is Funding, IStandardFunding {
         uint256 votingPowerAllocatedByDelegatee = voter_.votingPower - voter_.remainingVotingPower;
 
         // if none of the voter's voting power was allocated, they receive no rewards
-        if (votingPowerAllocatedByDelegatee == 0) return 0;
-
-        // calculate reward
-        // delegateeReward = 10 % of GBC distributed as per delegatee Voting power allocated
-        rewards_ = Maths.wdiv(
-            Maths.wmul(
-                currentDistribution_.fundsAvailable,
-                votingPowerAllocatedByDelegatee
-            ),
-            currentDistribution_.fundingVotePowerCast
-        ) / 10;
+        if (votingPowerAllocatedByDelegatee != 0) {
+            // calculate reward
+            // delegateeReward = 10 % of GBC distributed as per delegatee Voting power allocated
+            rewards_ = Maths.wdiv(
+                Maths.wmul(
+                    currentDistribution_.fundsAvailable,
+                    votingPowerAllocatedByDelegatee
+                ),
+                currentDistribution_.fundingVotePowerCast
+            ) / 10;
+        }
     }
 
     /***********************************/

diff --git a/test/unit/StandardFunding.t.sol b/test/unit/StandardFunding.t.sol
@@ -1047,8 +1047,9 @@ contract StandardFundingGrantFundTest is GrantFundTestHelper {
         vm.expectRevert(IStandardFunding.RewardAlreadyClaimed.selector);
         _grantFund.claimDelegateReward(distributionId);
 
-        // transfers 0 ajna Token as _tokenHolder6 has not participated in funding stage
-        _claimDelegateReward(
+        // no ajna tokens transfered as _tokenHolder6 has not participated in funding stage
+        // transfer event should not be emitted
+        _claimZeroDelegateReward(
             {
                 grantFund_:        _grantFund,
                 voter_:            _tokenHolder6,

diff --git a/test/utils/GrantFundTestHelper.sol b/test/utils/GrantFundTestHelper.sol
@@ -122,6 +122,15 @@ abstract contract GrantFundTestHelper is Test {
     /************************************/
 
     function _claimDelegateReward(GrantFund grantFund_, address voter_, uint24 distributionId_, uint256 claimedReward_) internal {
+        changePrank(voter_);
+        vm.expectEmit(true, true, false, true);
+        emit DelegateRewardClaimed(voter_, distributionId_, claimedReward_);
+        vm.expectEmit(true, true, false, true);
+        emit Transfer(address(grantFund_), voter_, claimedReward_);
+        grantFund_.claimDelegateReward(distributionId_);
+    }
+
+    function _claimZeroDelegateReward(GrantFund grantFund_, address voter_, uint24 distributionId_, uint256 claimedReward_) internal {
         changePrank(voter_);
         vm.expectEmit(true, true, false, true);
         emit DelegateRewardClaimed(voter_, distributionId_, claimedReward_);