feat: add apr oracle and fix availableDepositLimit

src/strategies/crvUSD/SiloLlamaAprOracle.sol

@@ -3,8 +3,23 @@ pragma solidity 0.8.18;
 
 import {AprOracleBase} from "@periphery/AprOracle/AprOracleBase.sol";
 
+import {IInterestRateModel} from "@silo/interfaces/IInterestRateModel.sol";
+import {ISiloRepository} from "@silo/interfaces/ISiloRepository.sol";
+import {Solvency} from "@silo/lib/Solvency.sol";
+
 contract SiloLlamaAprOracle is AprOracleBase {
-    constructor() AprOracleBase("Strategy Apr Oracle Example", msg.sender) {}
+
+    address private immutable silo;
+    address private immutable asset;
+
+    ISiloRepository private immutable siloRepository;
+
+    constructor(address _siloRepository, address _silo, address _asset, string memory _name) AprOracleBase(_name, msg.sender) {
+        siloRepository = ISiloRepository(_siloRepository);
+
+        silo = _silo;
+        asset = _asset;
+    }
 
     /**
      * @notice Will return the expected Apr of a strategy post a debt change.
@@ -29,8 +44,13 @@ contract SiloLlamaAprOracle is AprOracleBase {
         address _strategy,
         int256 _delta
     ) external view override returns (uint256) {
-        // TODO: Implement any necessary logic to return the most accurate
-        //      APR estimation for the strategy.
+        // TODO -- + CRV/SILO rewards
+        // uint256 rateBeforeFee = IInterestRateModel(siloRepository.getInterestRateModel(silo, asset)).getCurrentInterestRate(
+        //     silo,
+        //     asset, 
+        //     block.timestamp
+        // );
+        // uint256 rateAfterFee = rateBeforeFee - (rateBeforeFee * siloRepository.protocolShareFee() / Solvency._PRECISION_DECIMALS);
         return 1e17;
     }
 }

src/strategies/crvUSD/SiloLlamaStrategy.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.18;
 
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 import {BaseStrategy, ERC20} from "@tokenized-strategy/BaseStrategy.sol";
@@ -168,10 +167,7 @@ contract SiloLlamaStrategy is AuctionSwapper, BaseStrategy {
             _claimAndSellRewards();
 
             // Check how much we can re-deploy into the yield source.
-            uint256 toDeploy = Math.min(
-                asset.balanceOf(address(this)), 
-                availableDepositLimit(address(this))
-            );
+            uint256 toDeploy = asset.balanceOf(address(this));
 
             // If greater than 0.
             if (toDeploy > 0) {
@@ -219,7 +215,7 @@ contract SiloLlamaStrategy is AuctionSwapper, BaseStrategy {
         uint256, // _amountTaken
         uint256 // _amountPayed
     ) internal override {
-        uint256 toDeploy = Math.min(asset.balanceOf(address(this)), availableDepositLimit(address(this)));
+        uint256 toDeploy = asset.balanceOf(address(this));
         if (toDeploy > 0) _deployFunds(toDeploy);
     }
 

src/test/Oracle.t.sol

@@ -3,14 +3,14 @@ pragma solidity ^0.8.18;
 import "forge-std/console.sol";
 import {Setup} from "./utils/Setup.sol";
 
-import {StrategyAprOracle} from "../periphery/StrategyAprOracle.sol";
+import {AprOracleBase} from "@periphery/AprOracle/AprOracleBase.sol";
 
 contract OracleTest is Setup {
-    StrategyAprOracle public oracle;
+    AprOracleBase public oracle;
 
     function setUp() public override {
         super.setUp();
-        oracle = new StrategyAprOracle();
+        oracle = _deployAprOracle();
     }
 
     function checkOracle(address _strategy, uint256 _delta) public {

src/test/utils/Strategies.sol

@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: AGPL-3.0
 pragma solidity 0.8.18;
 
+import {AprOracleBase} from "@periphery/AprOracle/AprOracleBase.sol";
+
 import {ISilo} from "@silo/interfaces/ISilo.sol";
 
 import {SiloLlamaStrategy} from "../../strategies/crvUSD/SiloLlamaStrategy.sol";
+import {SiloLlamaAprOracle} from "../../strategies/crvUSD/SiloLlamaAprOracle.sol";
 
 contract Strategies {
 
@@ -18,6 +21,15 @@ contract Strategies {
         _earnSiloLlamaInterest();
     }
 
+    function _deployAprOracle() internal returns (AprOracleBase) {
+        return AprOracleBase(address(new SiloLlamaAprOracle(
+            address(0xBCd67f35c7A2F212db0AD7f68fC773b5aC15377c), // _siloRepository
+            _crvUSDCRVSilo, // _silo
+            _crvUSD, // _asset
+            "crvUSD/CRV SiloLlamaAprOracle"
+        )));
+    }
+
     function _setUpSiloLlamaStrategy() private returns (address _strategy) {
         // address[] memory _rewardTokens,
         address[] memory _rewardTokens = new address[](2);