feat: add rewards controller

VaporFi · Apr 18, 2024 · e1130c3 · e1130c3
1 parent 39c0e3d
commit e1130c3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/interfaces/IRewardsController.sol b/src/interfaces/IRewardsController.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.18;
+
+interface IRewardsController {
+    function tierOf(uint256 tokenId) external view returns (uint256);
+}
diff --git a/src/interfaces/IStratosphere.sol b/src/interfaces/IStratosphere.sol
@@ -3,6 +3,4 @@ pragma solidity 0.8.18;
 
 interface IStratosphere {
     function tokenIdOf(address account) external view returns (uint256);
-
-    function tierOf(uint256 tokenId) external view returns (uint8);
 }
diff --git a/src/libraries/AppStorage.sol b/src/libraries/AppStorage.sol
@@ -91,4 +91,8 @@ struct AppStorage {
     //////////////////
     address gelatoExecutor;
     mapping(uint256 => bool) isSeasonClaimed;
+    //////////////////////////
+    /// REWARDS CONTROLLER ///
+    //////////////////////////
+    address rewardsControllerAddress;
 }
diff --git a/src/libraries/LStratosphere.sol b/src/libraries/LStratosphere.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.18;
 
 import { AppStorage } from "./AppStorage.sol";
 import { IStratosphere } from "../interfaces/IStratosphere.sol";
+import { IRewardsController } from "../interfaces/IRewardsController.sol";
 
 /// @title LStratosphere
 /// @notice Library in charge of Stratosphere related logic
@@ -24,7 +25,8 @@ library LStratosphere {
         uint256 _tokenId = _stratosphere.tokenIdOf(_address);
         if (_tokenId > 0) {
             isStratosphereMember = true;
-            tier = 0;
+            IRewardsController _rewardsController = IRewardsController(s.rewardsControllerAddress);
+            tier = _rewardsController.tierOf(_tokenId);
         }
     }
 }
diff --git a/src/upgradeInitializers/DiamondInit.sol b/src/upgradeInitializers/DiamondInit.sol
@@ -67,11 +67,11 @@ contract DiamondInit {
         s.unlockFee = _args.unlockFee;
 
         s.unlockTimestampDiscountForStratosphereMembers[0] = 500; // 5%
-        s.unlockTimestampDiscountForStratosphereMembers[1] = 550; // 5.5%
-        s.unlockTimestampDiscountForStratosphereMembers[2] = 650; // 6.5%
-        s.unlockTimestampDiscountForStratosphereMembers[3] = 800; // 8%
-        s.unlockTimestampDiscountForStratosphereMembers[4] = 1000; // 10%
-        s.unlockTimestampDiscountForStratosphereMembers[5] = 1500; // 15%
+        s.unlockTimestampDiscountForStratosphereMembers[1] = 650; // 6.5%
+        s.unlockTimestampDiscountForStratosphereMembers[2] = 900; // 9%
+        s.unlockTimestampDiscountForStratosphereMembers[3] = 1300; // 13%
+        s.unlockTimestampDiscountForStratosphereMembers[4] = 2000; // 20%
+        s.unlockTimestampDiscountForStratosphereMembers[5] = 3250; // 32.5%
         s.unlockFeeReceivers.push(_args.replenishmentPool);
         s.unlockFeeReceivers.push(_args.labsMultisig);
         s.unlockFeeReceivers.push(_args.burnWallet);
+6 −48		.github/workflows/ci.yml
+0 −29		.github/workflows/sync.yml
+1 −1		foundry.toml
+1 −1		lib/ds-test
+1 −1		package.json
+3 −5		src/Base.sol
+2 −3		src/Script.sol
+8 −8		src/StdAssertions.sol
+21 −17		src/StdChains.sol
+11 −98		src/StdCheats.sol
+1 −1		src/StdInvariant.sol
+2 −2		src/StdStyle.sol
+3 −12		src/StdUtils.sol
+2 −4		src/Test.sol
+10 −98		src/Vm.sol
+382 −394		src/console2.sol
+0 −13,248		src/safeconsole.sol
+0 −51		test/StdAssertions.t.sol
+36 −91		test/StdChains.t.sol
+3 −151		test/StdCheats.t.sol
+2 −17		test/StdMath.t.sol
+4 −4		test/StdStyle.t.sol
+8 −53		test/StdUtils.t.sol