Merge branch 'main' into mike/oz-n-11

# Conflicts: # contracts/sfc/ConstantsManager.sol
Fantom-foundation · Jan 31, 2025 · d6467ca · d6467ca
2 parents cba9a84 + 23beff7
commit d6467ca
Show file tree

Hide file tree

Showing 7 changed files with 350 additions and 49 deletions.
diff --git a/contracts/sfc/ConstantsManager.sol b/contracts/sfc/ConstantsManager.sol
@@ -26,8 +26,6 @@ contract ConstantsManager is Ownable {
     uint256 public baseRewardPerSecond;
     uint256 public offlinePenaltyThresholdBlocksNum;
     uint256 public offlinePenaltyThresholdTime;
-    uint256 public targetGasPowerPerSecond;
-    uint256 public gasPriceBalancingCounterweight;
 
     // The number of epochs to calculate the average uptime ratio from, acceptable bound [10, 87600].
     // Is also the minimum number of epochs necessary for deactivation of offline validators.
@@ -81,14 +79,14 @@ contract ConstantsManager is Ownable {
     }
 
     function updateBurntFeeShare(uint256 v) external onlyOwner {
-        if (v > Decimal.unit() / 2) {
+        if (v + treasuryFeeShare > Decimal.unit()) {
             revert ValueTooLarge();
         }
         burntFeeShare = v;
     }
 
     function updateTreasuryFeeShare(uint256 v) external onlyOwner {
-        if (v > Decimal.unit() / 2) {
+        if (v + burntFeeShare > Decimal.unit()) {
             revert ValueTooLarge();
         }
         treasuryFeeShare = v;
@@ -115,9 +113,6 @@ contract ConstantsManager is Ownable {
     }
 
     function updateBaseRewardPerSecond(uint256 v) external virtual onlyOwner {
-        if (v < Decimal.unit() / 2) {
-            revert ValueTooSmall();
-        }
         if (v > 32 * Decimal.unit()) {
             revert ValueTooLarge();
         }
@@ -144,27 +139,7 @@ contract ConstantsManager is Ownable {
         offlinePenaltyThresholdBlocksNum = v;
     }
 
-    function updateTargetGasPowerPerSecond(uint256 v) external virtual onlyOwner {
-        if (v < 1000000) {
-            revert ValueTooSmall();
-        }
-        if (v > 500000000) {
-            revert ValueTooLarge();
-        }
-        targetGasPowerPerSecond = v;
-    }
-
-    function updateGasPriceBalancingCounterweight(uint256 v) external virtual onlyOwner {
-        if (v < 100) {
-            revert ValueTooSmall();
-        }
-        if (v > 10 * 86400) {
-            revert ValueTooLarge();
-        }
-        gasPriceBalancingCounterweight = v;
-    }
-
-    function updateAverageUptimeEpochWindow(uint32 v) external onlyOwner {
+    function updateAverageUptimeEpochWindow(uint32 v) external virtual onlyOwner {
         if (v < 10) {
             // needs to be long enough to allow permissible downtime for validators maintenance
             revert ValueTooSmall();

diff --git a/contracts/sfc/NetworkInitializer.sol b/contracts/sfc/NetworkInitializer.sol
@@ -25,18 +25,16 @@ contract NetworkInitializer {
         NodeDriverAuth(_auth).initialize(_sfc, _driver, _owner);
 
         ConstantsManager consts = new ConstantsManager(address(this));
-        consts.updateMinSelfStake(500000 * Decimal.unit());
+        consts.updateMinSelfStake(500_000 * Decimal.unit());
         consts.updateMaxDelegatedRatio(16 * Decimal.unit());
         consts.updateValidatorCommission((15 * Decimal.unit()) / 100);
-        consts.updateBurntFeeShare((20 * Decimal.unit()) / 100);
-        consts.updateTreasuryFeeShare((10 * Decimal.unit()) / 100);
+        consts.updateBurntFeeShare(0);
+        consts.updateTreasuryFeeShare((90 * Decimal.unit()) / 100);
         consts.updateWithdrawalPeriodEpochs(3);
         consts.updateWithdrawalPeriodTime(60 * 60 * 24 * 7);
-        consts.updateBaseRewardPerSecond(2668658453701531600);
+        consts.updateBaseRewardPerSecond(1_000);
         consts.updateOfflinePenaltyThresholdTime(5 days);
-        consts.updateOfflinePenaltyThresholdBlocksNum(1000);
-        consts.updateTargetGasPowerPerSecond(2000000);
-        consts.updateGasPriceBalancingCounterweight(3600);
+        consts.updateOfflinePenaltyThresholdBlocksNum(1_000);
         consts.updateAverageUptimeEpochWindow(100);
         consts.updateMinAverageUptime(0); // check disabled by default
         consts.transferOwnership(_owner);

diff --git a/contracts/sfc/NodeDriverAuth.sol b/contracts/sfc/NodeDriverAuth.sol
@@ -87,7 +87,7 @@ contract NodeDriverAuth is OwnableUpgradeable, UUPSUpgradeable {
 
     /// Mint native token. To be used by SFC for minting validators rewards.
     function incBalance(address acc, uint256 diff) external onlySFC {
-        driver.setBalance(acc, address(acc).balance + diff);
+        driver.setBalance(acc, acc.balance + diff);
     }
 
     /// Upgrade code of given contract by copying it from other deployed contract.

diff --git a/contracts/sfc/SFC.sol b/contracts/sfc/SFC.sol
@@ -830,7 +830,10 @@ contract SFC is OwnableUpgradeable, UUPSUpgradeable, Version {
                 revert ValueTooLarge();
             }
             totalSupply -= amount;
-            payable(address(0)).transfer(amount);
+            (bool sent, ) = payable(address(0)).call{value: amount}("");
+            if (!sent) {
+                revert TransferFailed();
+            }
             emit BurntNativeTokens(amount);
         }
     }
@@ -840,9 +843,9 @@ contract SFC is OwnableUpgradeable, UUPSUpgradeable, Version {
     function _receiverOf(address addr) internal view returns (address payable) {
         address to = getRedirection[addr];
         if (to == address(0)) {
-            return payable(address(uint160(addr)));
+            return payable(addr);
         }
-        return payable(address(uint160(to)));
+        return payable(to);
     }
 
     /// Seal epoch - sync validators.

diff --git a/contracts/test/UnitTestConstantsManager.sol b/contracts/test/UnitTestConstantsManager.sol
@@ -14,15 +14,7 @@ contract UnitTestConstantsManager is ConstantsManager {
         baseRewardPerSecond = v;
     }
 
-    function updateGasPriceBalancingCounterweight(uint256 v) external override onlyOwner {
-        gasPriceBalancingCounterweight = v;
-    }
-
     function updateOfflinePenaltyThresholdTime(uint256 v) external override onlyOwner {
         offlinePenaltyThresholdTime = v;
     }
-
-    function updateTargetGasPowerPerSecond(uint256 v) external override onlyOwner {
-        targetGasPowerPerSecond = v;
-    }
 }
diff --git a/contracts/test/UnitTestSFC.sol b/contracts/test/UnitTestSFC.sol
@@ -76,8 +76,6 @@ contract UnitTestNetworkInitializer {
         consts.updateBaseRewardPerSecond(6183414351851851852);
         consts.updateOfflinePenaltyThresholdTime(3 days);
         consts.updateOfflinePenaltyThresholdBlocksNum(1000);
-        consts.updateTargetGasPowerPerSecond(2000000);
-        consts.updateGasPriceBalancingCounterweight(6 * 60 * 60);
         consts.updateAverageUptimeEpochWindow(10);
         consts.updateMinAverageUptime(0); // check disabled by default
         consts.transferOwnership(_owner);