Remove rewardRatio constant

Fantom-foundation · Oct 31, 2024 · 7301893 · 7301893
1 parent 35012d7
commit 7301893
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 21 deletions.
diff --git a/contracts/sfc/ConstantsManager.sol b/contracts/sfc/ConstantsManager.sol
@@ -15,8 +15,6 @@ contract ConstantsManager is Ownable {
     uint256 public burntFeeShare;
     // The percentage of fees to transfer to treasury address, e.g., 10%
     uint256 public treasuryFeeShare;
-    // The ratio of the reward rate, e.g., 30%
-    uint256 public rewardRatio;
     // the number of epochs that undelegated stake is locked for
     uint256 public withdrawalPeriodEpochs;
     // the number of seconds that undelegated stake is locked for
@@ -83,16 +81,6 @@ contract ConstantsManager is Ownable {
         treasuryFeeShare = v;
     }
 
-    function updateRewardRatio(uint256 v) external virtual onlyOwner {
-        if (v < (5 * Decimal.unit()) / 100) {
-            revert ValueTooSmall();
-        }
-        if (v > Decimal.unit() / 2) {
-            revert ValueTooLarge();
-        }
-        rewardRatio = v;
-    }
-
     function updateWithdrawalPeriodEpochs(uint256 v) external virtual onlyOwner {
         if (v < 2) {
             revert ValueTooSmall();

diff --git a/contracts/sfc/NetworkInitializer.sol b/contracts/sfc/NetworkInitializer.sol
@@ -28,7 +28,6 @@ contract NetworkInitializer {
         consts.updateValidatorCommission((15 * Decimal.unit()) / 100);
         consts.updateBurntFeeShare((20 * Decimal.unit()) / 100);
         consts.updateTreasuryFeeShare((10 * Decimal.unit()) / 100);
-        consts.updateRewardRatio((30 * Decimal.unit()) / 100);
         consts.updateWithdrawalPeriodEpochs(3);
         consts.updateWithdrawalPeriodTime(60 * 60 * 24 * 7);
         consts.updateBaseRewardPerSecond(2668658453701531600);

diff --git a/contracts/sfc/SFC.sol b/contracts/sfc/SFC.sol
@@ -294,7 +294,7 @@ contract SFC is SFCBase, Version {
             uint256 commissionRewardFull = _calcValidatorCommission(rawReward, c.validatorCommission());
             uint256 selfStake = getStake[validatorAddr][validatorID];
             if (selfStake != 0) {
-                _rewardsStash[validatorAddr][validatorID] += _scaleReward(commissionRewardFull);
+                _rewardsStash[validatorAddr][validatorID] += commissionRewardFull;
             }
 
             // accounting reward per token for delegators

diff --git a/contracts/sfc/SFCBase.sol b/contracts/sfc/SFCBase.sol
@@ -122,10 +122,6 @@ contract SFCBase is SFCState {
         totalSupply = totalSupply + amount;
     }
 
-    function _scaleReward(uint256 fullReward) internal view returns (uint256) {
-        return (fullReward * c.rewardRatio()) / Decimal.unit();
-    }
-
     function _recountVotes(address delegator, address validatorAuth, bool strict) internal {
         if (voteBookAddress != address(0)) {
             // Don't allow recountVotes to use up all the gas

diff --git a/contracts/sfc/SFCLib.sol b/contracts/sfc/SFCLib.sol
@@ -318,7 +318,7 @@ contract SFCLib is SFCBase {
         uint256 payableUntil = _highestPayableEpoch(toValidatorID);
         uint256 wholeStake = getStake[delegator][toValidatorID];
         uint256 fullReward = _newRewardsOf(wholeStake, toValidatorID, stashedUntil, payableUntil);
-        return _scaleReward(fullReward);
+        return fullReward;
     }
 
     function _newRewardsOf(

diff --git a/contracts/sfc/Updater.sol b/contracts/sfc/Updater.sol
@@ -88,7 +88,6 @@ contract Updater {
         consts.updateValidatorCommission((15 * Decimal.unit()) / 100);
         consts.updateBurntFeeShare((20 * Decimal.unit()) / 100);
         consts.updateTreasuryFeeShare((10 * Decimal.unit()) / 100);
-        consts.updateRewardRatio((30 * Decimal.unit()) / 100);
         consts.updateWithdrawalPeriodEpochs(3);
         consts.updateWithdrawalPeriodTime(60 * 60 * 24 * 7);
         consts.updateBaseRewardPerSecond(2668658453701531600);

diff --git a/contracts/test/UnitTestSFC.sol b/contracts/test/UnitTestSFC.sol
@@ -85,7 +85,6 @@ contract UnitTestNetworkInitializer {
         consts.updateValidatorCommission((15 * Decimal.unit()) / 100);
         consts.updateBurntFeeShare((20 * Decimal.unit()) / 100);
         consts.updateTreasuryFeeShare((10 * Decimal.unit()) / 100);
-        consts.updateRewardRatio((30 * Decimal.unit()) / 100);
         consts.updateWithdrawalPeriodEpochs(3);
         consts.updateWithdrawalPeriodTime(60 * 60 * 24 * 7);
         consts.updateBaseRewardPerSecond(6183414351851851852);