Upgrade tests (WIP)

Fantom-foundation · Sep 16, 2024 · f7431a1 · f7431a1
1 parent 241f434
commit f7431a1
Show file tree

Hide file tree

Showing 2 changed files with 420 additions and 559 deletions.
diff --git a/contracts/sfc/SFCBase.sol b/contracts/sfc/SFCBase.sol
@@ -41,7 +41,7 @@ contract SFCBase is SFCState {
             return 0;
         }
         uint256 totalReward = epochDuration * _baseRewardPerSecond;
-        return totalReward * baseRewardWeight /totalBaseRewardWeight;
+        return totalReward * baseRewardWeight / totalBaseRewardWeight;
     }
 
     function _mintNativeToken(uint256 amount) internal {
@@ -68,7 +68,7 @@ contract SFCBase is SFCState {
         if (lockupDuration != 0) {
             uint256 maxLockupExtraRatio = Decimal.unit() - unlockedRewardRatio;
             uint256 lockupExtraRatio = maxLockupExtraRatio * lockupDuration / c.maxLockupDuration();
-            uint256 totalScaledReward = fullReward * unlockedRewardRatio + lockupExtraRatio / Decimal.unit();
+            uint256 totalScaledReward = fullReward * (unlockedRewardRatio + lockupExtraRatio) / Decimal.unit();
             reward.lockupBaseReward = fullReward * unlockedRewardRatio / Decimal.unit();
             reward.lockupExtraReward = totalScaledReward - reward.lockupBaseReward;
         } else {