change impact tolerance, implement isReadyForHardWork, remove getRewa…

…rds, change forking block, fixes

src/core/libs/ConstantsLib.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.23;
 
 library ConstantsLib {
-    uint internal constant SWAP_REVENUE_PRICE_IMPACT_TOLERANCE = 3_000;
     uint internal constant DENOMINATOR = 100_000;
     address internal constant DEAD_ADDRESS = 0xdEad000000000000000000000000000000000000;
 }

src/interfaces/IStrategy.sol

@@ -135,6 +135,9 @@ interface IStrategy is IERC165 {
     /// @return Description in free form
     function description() external view returns (string memory);
 
+    /// @notice Is HardWork on vault deposits can be enabled
+    function isHardWorkOnDepositAllowed() external view returns (bool);
+
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      WRITE FUNCTIONS                       */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/

src/strategies/CompoundFarmStrategy.sol

@@ -16,7 +16,7 @@ contract CompoundFarmStrategy is FarmingStrategyBase {
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @inheritdoc IControllable
-    string public constant VERSION = "1.0.0";
+    string public constant VERSION = "1.1.0";
 
     // keccak256(abi.encode(uint256(keccak256("erc7201:stability.CompoundFarmStrategy")) - 1)) & ~bytes32(uint256(0xff));
     bytes32 private constant COMPOUNDFARMSTRATEGY_STORAGE_LOCATION =
@@ -97,8 +97,6 @@ contract CompoundFarmStrategy is FarmingStrategyBase {
         __assets[0] = _$_._assets[0];
         amounts = new uint[](1);
         amounts[0] = $.comet.balanceOf(address(this)) - _$_.total;
-        // just for coverage
-        _getRewards();
     }
 
     /// @inheritdoc IStrategy
@@ -152,13 +150,15 @@ contract CompoundFarmStrategy is FarmingStrategyBase {
         }
     }
 
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return true;
+    }
+
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                   FARMING STRATEGY BASE                    */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    /// @inheritdoc FarmingStrategyBase
-    function _getRewards() internal view override returns (uint[] memory amounts) {}
-
     /// @inheritdoc IFarmingStrategy
     function canFarm() external pure override returns (bool) {
         return true;

src/strategies/DefiEdgeQuickSwapMerklFarmStrategy.sol

@@ -24,7 +24,7 @@ contract DefiEdgeQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBa
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @inheritdoc IControllable
-    string public constant VERSION = "1.0.1";
+    string public constant VERSION = "1.1.0";
 
     address internal constant ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
 
@@ -97,8 +97,6 @@ contract DefiEdgeQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBa
         for (uint i; i < len; ++i) {
             amounts[i] = StrategyLib.balance(__assets[i]);
         }
-        // just for covergage
-        _getRewards();
     }
 
     /// @inheritdoc IStrategy
@@ -174,13 +172,9 @@ contract DefiEdgeQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBa
         return DQMFLib.generateDescription(farm, $lp.ammAdapter);
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                   FARMING STRATEGY BASE                    */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /// @inheritdoc FarmingStrategyBase
-    function _getRewards() internal view override returns (uint[] memory amounts) {
-        // calculated in getRevenue()
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return false;
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/

src/strategies/GammaQuickSwapMerklFarmStrategy.sol

@@ -23,7 +23,7 @@ contract GammaQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @inheritdoc IControllable
-    string public constant VERSION = "1.0.1";
+    string public constant VERSION = "1.1.0";
 
     uint internal constant _PRECISION = 1e36;
 
@@ -107,8 +107,6 @@ contract GammaQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase
         for (uint i; i < len; ++i) {
             amounts[i] = StrategyLib.balance(__assets[i]);
         }
-        // just for covergage
-        _getRewards();
     }
 
     /// @inheritdoc IStrategy
@@ -183,13 +181,9 @@ contract GammaQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase
         return _generateDescription(farm, $lp.ammAdapter);
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                   FARMING STRATEGY BASE                    */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /// @inheritdoc FarmingStrategyBase
-    function _getRewards() internal view override returns (uint[] memory amounts) {
-        // empty
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return false;
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/

src/strategies/IchiQuickSwapMerklFarmStrategy.sol

@@ -19,7 +19,7 @@ contract IchiQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase {
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @inheritdoc IControllable
-    string public constant VERSION = "1.0.1";
+    string public constant VERSION = "1.1.0";
 
     uint internal constant PRECISION = 10 ** 18;
 
@@ -110,8 +110,6 @@ contract IchiQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase {
         for (uint i; i < len; ++i) {
             amounts[i] = StrategyLib.balance(__assets[i]);
         }
-        // just for covergage
-        _getRewards();
     }
 
     /// @inheritdoc IStrategy
@@ -167,13 +165,9 @@ contract IchiQuickSwapMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase {
         return (shortAddr, true);
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                   FARMING STRATEGY BASE                    */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /// @inheritdoc FarmingStrategyBase
-    function _getRewards() internal view override returns (uint[] memory amounts) {
-        // calculated in getRevenue()
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return false;
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/

src/strategies/IchiRetroMerklFarmStrategy.sol

@@ -19,7 +19,7 @@ contract IchiRetroMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase {
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @inheritdoc IControllable
-    string public constant VERSION = "1.0.1";
+    string public constant VERSION = "1.1.0";
 
     uint internal constant PRECISION = 10 ** 18;
 
@@ -110,8 +110,6 @@ contract IchiRetroMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase {
         for (uint i; i < len; ++i) {
             amounts[i] = StrategyLib.balance(__assets[i]);
         }
-        // just for covergage
-        _getRewards();
     }
 
     /// @inheritdoc IStrategy
@@ -167,13 +165,14 @@ contract IchiRetroMerklFarmStrategy is LPStrategyBase, FarmingStrategyBase {
         return (shortAddr, true);
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                   FARMING STRATEGY BASE                    */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return false;
+    }
 
-    /// @inheritdoc FarmingStrategyBase
-    function _getRewards() internal view override returns (uint[] memory amounts) {
-        // calculated in getRevenue()
+    /// @dev this special method used to fix forge coverage issue
+    function t() external pure returns (bool) {
+        return true;
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/

src/strategies/QuickswapV3StaticFarmStrategy.sol

@@ -15,6 +15,7 @@ import "../adapters/libs/AmmAdapterIdLib.sol";
 import "../interfaces/ICAmmAdapter.sol";
 
 /// @title Earning QuickSwapV3 farm rewards and swap fees by static liquidity position
+/// @dev DEPRECATED - strategy outdated in jan 2024
 /// @author Alien Deployer (https://github.com/a17)
 /// @author JodsMigel (https://github.com/JodsMigel)
 contract QuickSwapV3StaticFarmStrategy is LPStrategyBase, FarmingStrategyBase {
@@ -25,7 +26,7 @@ contract QuickSwapV3StaticFarmStrategy is LPStrategyBase, FarmingStrategyBase {
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @inheritdoc IControllable
-    string public constant VERSION = "1.0.2";
+    string public constant VERSION = "1.1.0";
 
     // keccak256(abi.encode(uint256(keccak256("erc7201:stability.QuickswapV3StaticFarmStrategy")) - 1)) & ~bytes32(uint256(0xff));
     bytes32 private constant QUICKSWAPV3STATICFARMSTRATEGY_STORAGE_LOCATION =
@@ -214,14 +215,9 @@ contract QuickSwapV3StaticFarmStrategy is LPStrategyBase, FarmingStrategyBase {
         return QuickswapLib.generateDescription(farm, $lp.ammAdapter);
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                   FARMING STRATEGY BASE                    */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /// @inheritdoc FarmingStrategyBase
-    function _getRewards() internal view override returns (uint[] memory amounts) {
-        QuickswapLib.QuickSwapV3StaticFarmStrategyStorage storage $ = _getQuickStaticFarmStorage();
-        return QuickswapLib.getRewards($._tokenId, $._farmingCenter, _getIncentiveKey());
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return false;
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
@@ -456,4 +452,10 @@ contract QuickSwapV3StaticFarmStrategy is LPStrategyBase, FarmingStrategyBase {
         FarmingStrategyBaseStorage storage _$ = _getFarmingStrategyBaseStorage();
         QuickswapLib.collectRewardsToState($, _$, tokenId, key);
     }
+
+    function _getRewards() internal view returns (uint[] memory amounts) {
+        QuickswapLib.QuickSwapV3StaticFarmStrategyStorage storage $ = _getQuickStaticFarmStorage();
+        return QuickswapLib.getRewards($._tokenId, $._farmingCenter, _getIncentiveKey());
+    }
+
 }

src/strategies/base/FarmingStrategyBase.sol

@@ -17,7 +17,7 @@ abstract contract FarmingStrategyBase is StrategyBase, IFarmingStrategy {
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     /// @dev Version of FarmingStrategyBase implementation
-    string public constant VERSION_FARMING_STRATEGY_BASE = "1.0.1";
+    string public constant VERSION_FARMING_STRATEGY_BASE = "1.1.0";
 
     // keccak256(abi.encode(uint256(keccak256("erc7201:stability.FarmingStrategyBase")) - 1)) & ~bytes32(uint256(0xff));
     bytes32 private constant FARMINGSTRATEGYBASE_STORAGE_LOCATION =
@@ -48,13 +48,6 @@ abstract contract FarmingStrategyBase is StrategyBase, IFarmingStrategy {
         return _getFarmingStrategyBaseStorage().farmId;
     }
 
-    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*         Must be implemented by derived contracts           */
-    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
-
-    /// @dev Calculation of rewards available for claim
-    function _getRewards() internal view virtual returns (uint[] memory amounts);
-
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*         Providing farm data to derived contracts           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/

src/strategies/libs/LPStrategyLib.sol

@@ -15,6 +15,8 @@ import "../../interfaces/IRVault.sol";
 library LPStrategyLib {
     using SafeERC20 for IERC20;
 
+    uint internal constant SWAP_ASSETS_PRICE_IMPACT_TOLERANCE = 4_000;
+
     struct ProcessRevenueVars {
         string vaultYpe;
         uint compoundRatio;
@@ -134,7 +136,7 @@ library LPStrategyLib {
                                 assets_[exchangeAssetIndex],
                                 vars.bbToken,
                                 exchangeAssetBBAmount,
-                                ConstantsLib.SWAP_REVENUE_PRICE_IMPACT_TOLERANCE
+                                SWAP_ASSETS_PRICE_IMPACT_TOLERANCE
                             );
                         }
                     } else {
@@ -148,7 +150,7 @@ library LPStrategyLib {
                                 assets_[otherAssetIndex],
                                 vars.bbToken,
                                 otherAssetBBAmount,
-                                ConstantsLib.SWAP_REVENUE_PRICE_IMPACT_TOLERANCE
+                                SWAP_ASSETS_PRICE_IMPACT_TOLERANCE
                             );
                         }
                     } else {
@@ -209,7 +211,7 @@ library LPStrategyLib {
                     // swap assets[0] to assets[1]
                     if (toSwapAsset0 > vars.threshold0) {
                         vars.swapper.swap(
-                            assets[0], assets[1], toSwapAsset0, ConstantsLib.SWAP_REVENUE_PRICE_IMPACT_TOLERANCE
+                            assets[0], assets[1], toSwapAsset0, SWAP_ASSETS_PRICE_IMPACT_TOLERANCE
                         );
                     }
                 } else if (prop0Pool > 0) {
@@ -221,7 +223,7 @@ library LPStrategyLib {
                     // swap assets[1] to assets[0]
                     if (toSwapAsset1 > vars.threshold1) {
                         vars.swapper.swap(
-                            assets[1], assets[0], toSwapAsset1, ConstantsLib.SWAP_REVENUE_PRICE_IMPACT_TOLERANCE
+                            assets[1], assets[0], toSwapAsset1, SWAP_ASSETS_PRICE_IMPACT_TOLERANCE
                         );
                     }
                 }

src/strategies/libs/StrategyLib.sol

@@ -21,6 +21,9 @@ import "../../interfaces/IFarmingStrategy.sol";
 library StrategyLib {
     using SafeERC20 for IERC20;
 
+    /// @dev Reward pools may have low liquidity and 1% fees
+    uint internal constant SWAP_REWARDS_PRICE_IMPACT_TOLERANCE = 7_000;
+
     struct ExtractFeesVars {
         IPlatform platform;
         uint feePlatform;
@@ -157,7 +160,7 @@ library StrategyLib {
         for (uint i; i < len; ++i) {
             if (rewardAmounts_[i] > swapper.threshold(rewardAssets_[i])) {
                 swapper.swap(
-                    rewardAssets_[i], exchangeAsset, rewardAmounts_[i], ConstantsLib.SWAP_REVENUE_PRICE_IMPACT_TOLERANCE
+                    rewardAssets_[i], exchangeAsset, rewardAmounts_[i], SWAP_REWARDS_PRICE_IMPACT_TOLERANCE
                 );
             }
         }

src/test/MockStrategy.sol

@@ -50,6 +50,11 @@ contract MockStrategy is LPStrategyBase {
         _depositReturnZero = !_depositReturnZero;
     }
 
+    /// @inheritdoc IStrategy
+    function isHardWorkOnDepositAllowed() external pure returns (bool) {
+        return true;
+    }
+
     function initVariants(address)
         public
         pure

src/test/MockVaultUpgrade.sol

@@ -12,7 +12,6 @@ contract MockVaultUpgrade is Controllable, ERC20Upgradeable, IVault {
     using SafeERC20 for IERC20;
 
     string public constant VERSION = "10.99.99";
-    address internal constant DEAD_ADDRESS = 0xdEad000000000000000000000000000000000000;
 
     IStrategy public strategy;
     uint public maxSupply;

test/base/UniversalTest.sol

@@ -597,6 +597,11 @@ abstract contract UniversalTest is Test, ChainSetup, Utils {
                     vars.withdrawnUsdValue += balNow * price / 10 ** IERC20Metadata(assets[j]).decimals();
                 }
                 assertGe(vars.withdrawnUsdValue, vars.depositUsdValue - vars.depositUsdValue / 1000);
+
+                /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+                /*                         COVERAGE                           */
+                /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+                strategy.isHardWorkOnDepositAllowed();
             }
         }
     }

test/base/chains/PolygonSetup.sol

@@ -10,7 +10,8 @@ abstract contract PolygonSetup is ChainSetup {
     constructor() {
         vm.selectFork(vm.createFork(vm.envString("POLYGON_RPC_URL")));
         // vm.rollFork(48098000); // Sep-01-2023 03:23:25 PM +UTC
-        vm.rollFork(51800000); // Jan-01-2024 02:33:32 AM +UTC
+        // vm.rollFork(51800000); // Jan-01-2024 02:33:32 AM +UTC
+        vm.rollFork(54000000); // Feb-27-2024 12:56:05 AM +UTC
     }
 
     function testPolygonSetupStub() external {}

test/core/Vault.t.sol

@@ -66,6 +66,7 @@ contract VaultTest is Test, FullMockSetup {
         strategy.getRevenue();
         strategy.description();
         strategy.initVariants(address(0));
+        strategy.isHardWorkOnDepositAllowed();
     }
 
     function testDepositWithdrawHardWork() public {

test/strategies/DQMF.Polygon.t.sol

@@ -10,7 +10,7 @@ contract DefiEdgeQuickSwapMerklFarmStrategyTest is PolygonSetup, UniversalTest {
     address internal constant USD = address(840);
 
     constructor() {
-        vm.rollFork(52400000); // Jan-16-2024 05:22:08 PM +UTC
+        // vm.rollFork(52400000); // Jan-16-2024 05:22:08 PM +UTC
     }
 
     function testDQMF() public universalTest {