Fix off-by-one in BoostManager and add BorrowerLens.isInUse

aloelabs · Oct 28, 2023 · 29e9641 · 29e9641
1 parent 6fb1d96
commit 29e9641
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/periphery/foundry.toml b/periphery/foundry.toml
@@ -9,7 +9,7 @@ cache_path = 'cache'
 
 via_ir = true
 optimizer = true
-optimizer_runs = 800
+optimizer_runs = 65536
 gas_reports = []
 
 auto_detect_remappings = false

diff --git a/periphery/src/BorrowerLens.sol b/periphery/src/BorrowerLens.sol
@@ -52,6 +52,18 @@ contract BorrowerLens {
         healthB = liabilities > 0 ? (assets * 1e18) / liabilities : 1000e18;
     }
 
+    function isInUse(Borrower borrower) external view returns (bool, IUniswapV3Pool) {
+        IUniswapV3Pool pool = borrower.UNISWAP_POOL();
+
+        if (borrower.getUniswapPositions().length > 0) return (true, pool);
+        if (borrower.TOKEN0().balanceOf(address(borrower)) > 0) return (true, pool);
+        if (borrower.TOKEN1().balanceOf(address(borrower)) > 0) return (true, pool);
+        if (borrower.LENDER0().borrowBalanceStored(address(borrower)) > 0) return (true, pool);
+        if (borrower.LENDER1().borrowBalanceStored(address(borrower)) > 0) return (true, pool);
+
+        return (false, pool);
+    }
+
     function getUniswapFees(Borrower account) external view returns (bytes32[] memory keys, uint256[] memory fees) {
         IUniswapV3Pool pool = account.UNISWAP_POOL();
         Uniswap.FeeComputationCache memory c;

diff --git a/periphery/src/managers/BoostManager.sol b/periphery/src/managers/BoostManager.sol
@@ -92,8 +92,8 @@ contract BoostManager is IManager, IUniswapV3SwapCallback {
                     TickMath.getSqrtRatioAtTick(upper),
                     liquidity
                 );
-                amount0 = needs0 > amount0 ? needs0 - amount0 : 0;
-                amount1 = needs1 > amount1 ? needs1 - amount1 : 0;
+                amount0 = (needs0 + 1) > amount0 ? (needs0 + 1 - amount0) : 0;
+                amount1 = (needs1 + 1) > amount1 ? (needs1 + 1 - amount1) : 0;
             }
 
             borrower.borrow(amount0, amount1, msg.sender);

diff --git a/periphery/test/managers/BoostManager.t.sol b/periphery/test/managers/BoostManager.t.sol
@@ -7,6 +7,7 @@ import {IUniswapV3Pool} from "v3-core/contracts/interfaces/IUniswapV3Pool.sol";
 
 import {Borrower, IManager} from "aloe-ii-core/Borrower.sol";
 import {Factory, BorrowerDeployer} from "aloe-ii-core/Factory.sol";
+import {Lender} from "aloe-ii-core/Lender.sol";
 import {RateModel} from "aloe-ii-core/RateModel.sol";
 import {VolatilityOracle} from "aloe-ii-core/VolatilityOracle.sol";
 
@@ -26,7 +27,7 @@ contract BoostManagerTest is Test {
 
     function setUp() public {
         vm.createSelectFork(vm.rpcUrl("optimism"));
-        vm.rollFork(111258011);
+        vm.rollFork(111336182);
 
         RateModel rateModel = new RateModel();
         VolatilityOracle oracle = new VolatilityOracle();
@@ -36,9 +37,15 @@ contract BoostManagerTest is Test {
 
         borrowerNft = new BorrowerNFT(factory, IBorrowerURISource(address(0)));
         boostManager = new BoostManager(factory, address(borrowerNft), UNISWAP_NFT);
+
+        (Lender lender0, Lender lender1, ) = factory.getMarket(POOL);
+        deal(address(POOL.token0()), address(lender0), 1e18);
+        deal(address(POOL.token1()), address(lender1), 1e18);
+        lender0.deposit(1e18, address(0));
+        lender1.deposit(1e18, address(0));
     }
 
-    function test_mint() public {
+    function test_mint() public { 
         address owner = 0xde8E7d3fFada10dE2A57E7bAc090dB06596F51Cd;
 
         bytes memory mintCall;
@@ -60,7 +67,7 @@ contract BoostManagerTest is Test {
             managers[0] = boostManager;
             datas[0] = abi.encode(
                 uint8(0),
-                abi.encode(uint256(425835), int24(70020), int24(71700), uint128(550621657107328270), 10_000)
+                abi.encode(uint256(425835), int24(70020), int24(71700), uint128(344339104909795631), 10_000)
             );
             antes[0] = 0.01 ether / 1e13;
             modifyCall = abi.encodeCall(borrowerNft.modify, (owner, indices, managers, datas, antes));