Merge branch 'feat-liq-pool' of github.com:sprintertech/sprinter-liquidity-contracts into feat-liq-pool

Author: lastperson

contracts/LiquidityPool.sol

@@ -175,7 +175,7 @@ contract LiquidityPool is AccessControlUpgradeable, EIP712Upgradeable {
         // get USDC from AAVE
         IPool pool = IPool(AAVE_POOL_PROVIDER.getPool());
         uint256 withdrawn = pool.withdraw(address(COLLATERAL), amount, to);
-        assert(withdrawn == amount);
+        // assert(withdrawn == amount);
         // health factor after withdraw
         UserAccountData memory userAccountData;
         (
@@ -187,29 +187,10 @@ contract LiquidityPool is AccessControlUpgradeable, EIP712Upgradeable {
             userAccountData.healthFactor
         ) = pool.getUserAccountData(address(this));
         if (userAccountData.healthFactor <  _getStorage().minHealthFactor) revert HealthFactorTooLow();
-        emit WithdrawnFromAave(amount);
-    }
-
-    function withdrawAll(address to) public onlyRole(DEFAULT_ADMIN_ROLE) {
-        // get USDC from AAVE
-        IPool pool = IPool(AAVE_POOL_PROVIDER.getPool());
-        // Check that there is no debt
-        UserAccountData memory userAccountData;
-        (
-            userAccountData.totalCollateralBase,
-            userAccountData.totalDebtBase,
-            userAccountData.availableBorrowsBase,
-            userAccountData.currentLiquidationThreshold,
-            userAccountData.ltv,
-            userAccountData.healthFactor
-        ) = pool.getUserAccountData(address(this));
-        if (userAccountData.totalDebtBase != 0) revert TokenHasDebt();
-
-        uint256 withdrawn = pool.withdraw(address(COLLATERAL), type(uint256).max, to);
         emit WithdrawnFromAave(withdrawn);
     }
 
-   function withdrawProfit(address token, address to, uint256 amount) public onlyRole(WITHDRAW_PROFIT_ROLE) {
+    function withdrawProfit(address token, address to, uint256 amount) public onlyRole(WITHDRAW_PROFIT_ROLE) {
         // check that not collateral
         if (token == address(COLLATERAL)) revert CannotWithdrawProfitCollateral();
         // check that no debt

test/LiquidityPool.ts

@@ -6,7 +6,7 @@ import hre from "hardhat";
 import {
   getCreateAddress, getContractAt, deploy, signBorrow
 } from "./helpers";
-import {encodeBytes32String} from "ethers";
+import {encodeBytes32String, MaxUint256} from "ethers";
 import {
   MockTarget, LiquidityPool, TransparentUpgradeableProxy, ProxyAdmin
 } from "../typechain-types";
@@ -431,7 +431,10 @@ describe("LiquidityPool", function () {
       expect(await usdc.balanceOf(user.address)).to.be.eq(amount);
       expect(await aToken.balanceOf(liquidityPool.target)).to.be.greaterThan(0);
 
-      expect(await liquidityPool.connect(admin).withdrawAll(user.address))
+      // Using type(uint256).max as amount to withdraw all available amount
+      expect(await liquidityPool.connect(admin).withdraw(
+        user.address, MaxUint256
+      ))
         .to.emit(liquidityPool, "WidthrawnFromAave");
       expect(await usdc.balanceOf(user.address)).to.be.greaterThan(amount);
       expect(await aToken.balanceOf(liquidityPool.target)).to.eq(0);
@@ -785,41 +788,6 @@ describe("LiquidityPool", function () {
         .to.be.revertedWithCustomError(liquidityPool, "AccessControlUnauthorizedAccount");
     });
 
-    it("Should NOT withdraw all collateral if there is some debt", async function () {
-      const {
-        liquidityPool, usdc, usdcOwner, USDC_DEC, user, admin, uni, mpc_signer, UNI_DEC, user2
-      } = await loadFixture(deployAll);
-      const amount = 1000n * USDC_DEC; // $1000
-      await usdc.connect(usdcOwner).transfer(liquidityPool.target, amount);
-      expect(await liquidityPool.deposit())
-        .to.emit(liquidityPool, "SuppliedToAave").withArgs(amount);
-
-      const amountToBorrow = 3n * UNI_DEC;
-
-      const signature = await signBorrow(
-        mpc_signer,
-        liquidityPool.target as string,
-        uni.target as string,
-        amountToBorrow.toString(),
-        user2.address,
-        "0x",
-        31337
-      );
-
-      expect(await liquidityPool.connect(user).borrow(
-        uni.target,
-        amountToBorrow,
-        user2,
-        "0x",
-        0n,
-        2000000000n,
-        signature))
-      .to.emit(liquidityPool, "Borrowed");
-
-      await expect(liquidityPool.connect(admin).withdrawAll(user.address))
-        .to.be.revertedWithCustomError(liquidityPool, "TokenHasDebt");
-    });
-
     it("Should NOT withdraw profit for collateral", async function () {
       const {liquidityPool, usdc, admin, user} = await loadFixture(deployAll);
       const amount = 1000n;