for system reward package, just need to claim reward once

bnb-chain · Jan 8, 2021 · 3ad28d9 · 3ad28d9
1 parent 035c3eb
commit 3ad28d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/contracts/RelayerIncentivize.sol b/contracts/RelayerIncentivize.sol
@@ -61,13 +61,12 @@ contract RelayerIncentivize is IRelayerIncentivize, System, IParamSubscriber {
 
     uint256 actualAmount;
     if (fromSystemReward) {
-      actualAmount = ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), amount);
+      actualAmount = ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), amount.add(compensateRelayerAmount));
     } else {
       actualAmount = ISystemReward(TOKEN_HUB_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), amount);
-    }
-
-    if (compensateRelayerAmount > 0) {
-        actualAmount = actualAmount.add(ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), compensateRelayerAmount));
+      if (compensateRelayerAmount > 0) {
+          actualAmount = actualAmount.add(ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), compensateRelayerAmount));
+      }
     }
 
     countInRound++;

diff --git a/contracts/RelayerIncentivize.template b/contracts/RelayerIncentivize.template
@@ -63,13 +63,12 @@ contract RelayerIncentivize is IRelayerIncentivize, System, IParamSubscriber {
   {% endif %}
     uint256 actualAmount;
     if (fromSystemReward) {
-      actualAmount = ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), amount);
+      actualAmount = ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), amount.add(compensateRelayerAmount));
     } else {
       actualAmount = ISystemReward(TOKEN_HUB_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), amount);
-    }
-
-    if (compensateRelayerAmount > 0) {
-        actualAmount = actualAmount.add(ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), compensateRelayerAmount));
+      if (compensateRelayerAmount > 0) {
+          actualAmount = actualAmount.add(ISystemReward(SYSTEM_REWARD_ADDR).claimRewards(address(uint160(INCENTIVIZE_ADDR)), compensateRelayerAmount));
+      }
     }
 
     countInRound++;