update solidity, move rest of files and update tests

Author: antisaa

contracts/ionic/strategies/MockERC4626Dynamic.sol

@@ -5,7 +5,7 @@ import { ERC20 } from "solmate/tokens/ERC20.sol";
 
 import { ERC4626 } from "solmate/mixins/ERC4626.sol";
 import { FixedPointMathLib } from "solmate/utils/FixedPointMathLib.sol";
-import { FlywheelCore } from "flywheel-v2/FlywheelCore.sol";
+import { IonicFlywheelCore } from "./flywheel/IonicFlywheelCore.sol";
 
 /**
  * @title Mock ERC4626 Contract
@@ -17,7 +17,7 @@ contract MockERC4626Dynamic is ERC4626 {
   using FixedPointMathLib for uint256;
 
   /* ========== STATE VARIABLES ========== */
-  FlywheelCore public immutable flywheel;
+  IonicFlywheelCore public immutable flywheel;
 
   /* ========== INITIALIZER ========== */
 
@@ -26,7 +26,7 @@ contract MockERC4626Dynamic is ERC4626 {
      @param _asset The ERC20 compliant token the Vault should accept.
      @param _flywheel Flywheel to pull in rewardsToken
     */
-  constructor(ERC20 _asset, FlywheelCore _flywheel)
+  constructor(ERC20 _asset, IonicFlywheelCore _flywheel)
     ERC4626(
       _asset,
       string(abi.encodePacked("Midas ", _asset.name(), " Vault")),

contracts/ionic/strategies/flywheel/FlywheelCore.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity ^0.8.10;
 
 import {ERC20} from "solmate/tokens/ERC20.sol";
 import {Auth, Authority} from "solmate/auth/Auth.sol";

contracts/ionic/strategies/flywheel/IFlywheelBooster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity ^0.8.10;
 
 import {ERC20} from "solmate/tokens/ERC20.sol";
 

contracts/ionic/strategies/flywheel/IonicReplacingFlywheel.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.10;
 
 import "./IonicFlywheel.sol";
 
-import { IFlywheelRewards } from "flywheel-v2/interfaces/IFlywheelRewards.sol";
-import { IFlywheelBooster } from "flywheel-v2/interfaces/IFlywheelBooster.sol";
+import { IFlywheelRewards } from "./rewards/IFlywheelRewards.sol";
+import { IFlywheelBooster } from "./IFlywheelBooster.sol";
 
 contract IonicReplacingFlywheel is IonicFlywheel {
   IonicFlywheelCore public flywheelToReplace;

contracts/ionic/strategies/flywheel/LooplessFlywheelBooster.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.10;
 
-import "flywheel-v2/interfaces/IFlywheelBooster.sol";
+import "./IFlywheelBooster.sol";
 import { ICErc20 } from "../../../compound/CTokenInterfaces.sol";
 
 contract LooplessFlywheelBooster is IFlywheelBooster {

contracts/ionic/strategies/flywheel/rewards/BaseFlywheelRewards.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity ^0.8.10;
 
 import {SafeTransferLib, ERC20} from "solmate/utils/SafeTransferLib.sol";
 import {IFlywheelRewards} from "./IFlywheelRewards.sol";

contracts/ionic/strategies/flywheel/rewards/FlywheelDynamicRewards.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity ^0.8.10;
 
 import "./BaseFlywheelRewards.sol";
 import {SafeCastLib} from "solmate/utils/SafeCastLib.sol";

contracts/ionic/strategies/flywheel/rewards/FlywheelStaticRewards.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity ^0.8.10;
 
 import {Auth, Authority} from "solmate/auth/Auth.sol";
 import "./BaseFlywheelRewards.sol";

contracts/ionic/strategies/flywheel/rewards/IFlywheelRewards.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity ^0.8.10;
 
 import {ERC20} from "solmate/tokens/ERC20.sol";
 import {IonicFlywheelCore} from "../IonicFlywheelCore.sol";

contracts/ionic/strategies/flywheel/rewards/IonicFlywheelDynamicRewardsPlugin.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity ^0.8.10;
+
+import "./FlywheelDynamicRewards.sol";
+
+interface ICERC20 {
+    function plugin() external returns (address);
+}
+
+interface IPlugin {
+    function claimRewards() external;
+}
+
+/** 
+ @title Ionic Flywheel Dynamic Reward Stream
+ @notice Determines rewards based on reward cycle
+ Each cycle, claims rewards on the plugin before getting the reward amount
+*/
+contract IonicFlywheelDynamicRewardsPlugin is FlywheelDynamicRewards {
+    using SafeTransferLib for ERC20;
+
+    constructor(IonicFlywheelCore _flywheel, uint32 _cycleLength)
+        FlywheelDynamicRewards(_flywheel, _cycleLength)
+    {}
+
+    function getNextCycleRewards(ERC20 strategy)
+        internal
+        override
+        returns (uint192)
+    {
+        IPlugin plugin = IPlugin(ICERC20(address(strategy)).plugin());
+        try plugin.claimRewards() {} catch {}
+
+        uint256 rewardAmount = rewardToken.balanceOf(address(strategy));
+        if (rewardAmount != 0) {
+            rewardToken.safeTransferFrom(
+                address(strategy),
+                address(this),
+                rewardAmount
+            );
+        }
+        return uint192(rewardAmount);
+    }
+}

contracts/ionic/strategies/flywheel/rewards/ReplacingFlywheelDynamicRewards.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.10;
 
-import { FlywheelDynamicRewards } from "flywheel-v2/rewards/FlywheelDynamicRewards.sol";
-import { BaseFlywheelRewards } from "flywheel-v2/rewards/BaseFlywheelRewards.sol";
-import { FlywheelCore } from "flywheel-v2/FlywheelCore.sol";
+import { FlywheelDynamicRewards } from "./FlywheelDynamicRewards.sol";
+import { BaseFlywheelRewards } from "./BaseFlywheelRewards.sol";
+import { IonicFlywheelCore } from "../IonicFlywheelCore.sol";
 import { Auth, Authority } from "solmate/auth/Auth.sol";
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";
 
@@ -18,11 +18,11 @@ interface IPlugin {
 contract ReplacingFlywheelDynamicRewards is FlywheelDynamicRewards {
   using SafeTransferLib for ERC20;
 
-  FlywheelCore public replacedFlywheel;
+  IonicFlywheelCore public replacedFlywheel;
 
   constructor(
-    FlywheelCore _replacedFlywheel,
-    FlywheelCore _flywheel,
+    IonicFlywheelCore _replacedFlywheel,
+    IonicFlywheelCore _flywheel,
     uint32 _cycleLength
   ) FlywheelDynamicRewards(_flywheel, _cycleLength) {
     replacedFlywheel = _replacedFlywheel;

contracts/ionic/strategies/flywheel/rewards/ReplacingFlywheelStaticRewards.sol

@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.10;
 
-import { FlywheelStaticRewards } from "flywheel-v2/rewards/FlywheelStaticRewards.sol";
-import { BaseFlywheelRewards } from "flywheel-v2/rewards/BaseFlywheelRewards.sol";
-import { FlywheelCore } from "flywheel-v2/FlywheelCore.sol";
+import { FlywheelStaticRewards } from "./FlywheelStaticRewards.sol";
+import { BaseFlywheelRewards } from "./BaseFlywheelRewards.sol";
+import { IonicFlywheelCore } from "../IonicFlywheelCore.sol";
 import { Auth, Authority } from "solmate/auth/Auth.sol";
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";
 
 contract ReplacingFlywheelStaticRewards is FlywheelStaticRewards {
   using SafeTransferLib for ERC20;
 
-  FlywheelCore public replacedFlywheel;
+  IonicFlywheelCore public replacedFlywheel;
 
   constructor(
-    FlywheelCore _replacedFlywheel,
-    FlywheelCore _flywheel,
+    IonicFlywheelCore _replacedFlywheel,
+    IonicFlywheelCore _flywheel,
     address _owner,
     Authority _authority
   ) FlywheelStaticRewards(_flywheel, _owner, _authority) {

contracts/ionic/strategies/flywheel/rewards/WithdrawableFlywheelStaticRewards.sol

@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.10;
 
-import { FlywheelStaticRewards } from "flywheel-v2/rewards/FlywheelStaticRewards.sol";
-import { BaseFlywheelRewards } from "flywheel-v2/rewards/BaseFlywheelRewards.sol";
-import { FlywheelCore } from "flywheel-v2/FlywheelCore.sol";
+import { FlywheelStaticRewards } from "./FlywheelStaticRewards.sol";
+import { BaseFlywheelRewards } from "./BaseFlywheelRewards.sol";
+import { IonicFlywheelCore } from "../IonicFlywheelCore.sol";
 import { Auth, Authority } from "solmate/auth/Auth.sol";
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";
 
 contract WithdrawableFlywheelStaticRewards is FlywheelStaticRewards {
   using SafeTransferLib for ERC20;
 
   constructor(
-    FlywheelCore _flywheel,
+    IonicFlywheelCore _flywheel,
     address _owner,
     Authority _authority
   ) FlywheelStaticRewards(_flywheel, _owner, _authority) {}

contracts/test/DeployMarkets.t.sol

@@ -6,10 +6,10 @@ import "forge-std/Test.sol";
 import { ERC20 } from "solmate/tokens/ERC20.sol";
 import { Auth, Authority } from "solmate/auth/Auth.sol";
 import { MockERC20 } from "solmate/test/utils/mocks/MockERC20.sol";
-import { FuseFlywheelDynamicRewardsPlugin } from "fuse-flywheel/rewards/FuseFlywheelDynamicRewardsPlugin.sol";
+import { IonicFlywheelDynamicRewardsPlugin } from "../ionic/strategies/flywheel/rewards/IonicFlywheelDynamicRewardsPlugin.sol";
 import { FlywheelCore } from "flywheel/FlywheelCore.sol";
-import { IFlywheelBooster } from "flywheel/interfaces/IFlywheelBooster.sol";
-import { IFlywheelRewards } from "flywheel/interfaces/IFlywheelRewards.sol";
+import { IFlywheelBooster } from "../ionic/strategies/flywheel/IFlywheelBooster.sol";
+import { IFlywheelRewards } from "../ionic/strategies/flywheel/rewards/IFlywheelRewards.sol";
 import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 import { ICErc20, ICErc20Plugin, ICErc20PluginRewards } from "../compound/CTokenInterfaces.sol";
@@ -51,7 +51,7 @@ contract DeployMarketsTest is Test {
   FeeDistributor ionicAdmin;
   PoolDirectory poolDirectory;
 
-  FuseFlywheelDynamicRewardsPlugin rewards;
+  IonicFlywheelDynamicRewardsPlugin rewards;
 
   address[] markets;
   bool[] t;
@@ -213,8 +213,8 @@ contract DeployMarketsTest is Test {
     TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(1), "");
     IonicFlywheelCore flywheel = IonicFlywheelCore(address(proxy));
     flywheel.initialize(underlyingToken, IFlywheelRewards(address(0)), IFlywheelBooster(address(0)), address(this));
-    FlywheelCore asFlywheelCore = FlywheelCore(address(flywheel));
-    rewards = new FuseFlywheelDynamicRewardsPlugin(asFlywheelCore, 1);
+    IonicFlywheelCore asFlywheelCore = IonicFlywheelCore(address(flywheel));
+    rewards = new IonicFlywheelDynamicRewardsPlugin(asFlywheelCore, 1);
     flywheel.setFlywheelRewards(rewards);
 
     mockERC4626Dynamic = new MockERC4626Dynamic(ERC20(address(underlyingToken)), asFlywheelCore);

contracts/test/FlywheelUpgradesTest.t.sol

@@ -16,9 +16,9 @@ import { Comptroller } from "../compound/Comptroller.sol";
 
 import { TransparentUpgradeableProxy } from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import { ERC20 } from "solmate/tokens/ERC20.sol";
-import { IFlywheelRewards } from "flywheel-v2/interfaces/IFlywheelRewards.sol";
-import { FlywheelCore } from "flywheel-v2/FlywheelCore.sol";
-import { FlywheelDynamicRewards } from "flywheel-v2/rewards/FlywheelDynamicRewards.sol";
+import { IFlywheelRewards } from "flywheel/interfaces/IFlywheelRewards.sol";
+import { FlywheelCore } from "flywheel/FlywheelCore.sol";
+import { FlywheelDynamicRewards } from "flywheel/rewards/FlywheelDynamicRewards.sol";
 
 contract FlywheelUpgradesTest is BaseTest {
   PoolDirectory internal fpd;