fix: generated

Author: rhlsthrm

.gitmodules

@@ -1,30 +1,24 @@
 [submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/brockelmore/forge-std
+path = lib/forge-std
+url = https://github.com/brockelmore/forge-std
 [submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+path = lib/openzeppelin-contracts-upgradeable
+url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
 [submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/rari-capital/solmate
-[submodule "lib/fuse-flywheel"]
-	path = lib/fuse-flywheel
-	url = https://github.com/fei-protocol/fuse-flywheel
+path = lib/solmate
+url = https://github.com/rari-capital/solmate
 [submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+path = lib/openzeppelin-contracts
+url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "lib/pyth-sdk-solidity"]
-	path = lib/pyth-sdk-solidity
-	url = https://github.com/pyth-network/pyth-sdk-solidity
+path = lib/pyth-sdk-solidity
+url = https://github.com/pyth-network/pyth-sdk-solidity
 [submodule "lib/solidity-bytes-utils"]
-	path = lib/solidity-bytes-utils
-	url = https://github.com/GNSPS/solidity-bytes-utils
+path = lib/solidity-bytes-utils
+url = https://github.com/GNSPS/solidity-bytes-utils
 [submodule "lib/ops"]
-	path = lib/ops
-	url = https://github.com/gelatodigital/ops
+path = lib/ops
+url = https://github.com/gelatodigital/ops
 [submodule "lib/adrastia-periphery"]
-	path = lib/adrastia-periphery
-	url = https://github.com/adrastia-oracle/adrastia-periphery
-[submodule "lib/flywheel-v2"]
-	path = lib/flywheel-v2
-	url = https://github.com/ionicprotocol/flywheel-v2
+path = lib/adrastia-periphery
+url = https://github.com/adrastia-oracle/adrastia-periphery

contracts/ionic/strategies/flywheel/LooplessFlywheelBooster.sol

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.10;
 
-import "./IFlywheelBooster.sol";
+import {IFlywheelBooster} from "./IFlywheelBooster.sol";
 import { ICErc20 } from "../../../compound/CTokenInterfaces.sol";
+import {ERC20} from "solmate/tokens/ERC20.sol";
 
 contract LooplessFlywheelBooster is IFlywheelBooster {
   string public constant BOOSTER_TYPE = "LooplessFlywheelBooster";

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

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

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

@@ -2,7 +2,9 @@
 pragma solidity ^0.8.10;
 
 import {Auth, Authority} from "solmate/auth/Auth.sol";
-import "./BaseFlywheelRewards.sol";
+import {BaseFlywheelRewards} from "./BaseFlywheelRewards.sol";
+import {ERC20} from "solmate/utils/SafeTransferLib.sol";
+import {IonicFlywheelCore} from "../IonicFlywheelCore.sol";
 
 /** 
  @title Flywheel Static Reward Stream

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

@@ -7,7 +7,7 @@ interface ICERC20 {
     function plugin() external returns (address);
 }
 
-interface IPlugin {
+interface IPlugin_FDR {
     function claimRewards() external;
 }
 
@@ -28,7 +28,7 @@ contract IonicFlywheelDynamicRewardsPlugin is FlywheelDynamicRewards {
         override
         returns (uint192)
     {
-        IPlugin plugin = IPlugin(ICERC20(address(strategy)).plugin());
+        IPlugin_FDR plugin = IPlugin_FDR(ICERC20(address(strategy)).plugin());
         try plugin.claimRewards() {} catch {}
 
         uint256 rewardAmount = rewardToken.balanceOf(address(strategy));

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

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.10;
 
 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";

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

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.10;
 
 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";

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

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.10;
 
 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";

contracts/test/DeployMarkets.t.sol

@@ -7,7 +7,6 @@ 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 { IonicFlywheelDynamicRewardsPlugin } from "../ionic/strategies/flywheel/rewards/IonicFlywheelDynamicRewardsPlugin.sol";
-import { FlywheelCore } from "flywheel/FlywheelCore.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";