Add repayer contract (#48)

* Add repayer contract

* Remove Repaid event from USDC pool

* Apply suggestions from code review

Co-authored-by: Oleksii Matiiasevych <[email protected]>

* Fix import

* Add repayer to deploy scripts

* Fix lint

* Fix tryResolve

* Add task for setting repayer routes

* Fix task

* Fix set routes tasks

---------

Co-authored-by: Oleksii Matiiasevych <[email protected]>

Author: viatrix

contracts/LiquidityHub.sol

@@ -196,10 +196,10 @@ contract LiquidityHub is ILiquidityHub, ERC4626Upgradeable, AccessControlUpgrade
     function depositProfit(uint256 assets) external onlyRole(DEPOSIT_PROFIT_ROLE) {
         LiquidityHubStorage storage $ = _getStorage();
         SafeERC20.safeTransferFrom(IERC20(asset()), _msgSender(), address(LIQUIDITY_POOL), assets);
-        uint256 totalAssets = $.totalAssets;
-        require(totalAssets > 0, EmptyHub());
-        require(assets <= _assetsIncreaseHardLimit(totalAssets), AssetsExceedHardLimit());
-        uint256 newAssets = totalAssets + assets;
+        uint256 currentAssets = $.totalAssets;
+        require(currentAssets > 0, EmptyHub());
+        require(assets <= _assetsIncreaseHardLimit(currentAssets), AssetsExceedHardLimit());
+        uint256 newAssets = currentAssets + assets;
         $.totalAssets = newAssets;
         LIQUIDITY_POOL.deposit(assets);
         emit DepositProfit(_msgSender(), assets);

contracts/LiquidityPoolAave.sol

@@ -48,8 +48,8 @@ contract LiquidityPoolAave is LiquidityPool {
     event BorrowTokenLTVSet(address token, uint256 oldLTV, uint256 newLTV);
     event HealthFactorSet(uint256 oldHealthFactor, uint256 newHealthFactor);
     event DefaultLTVSet(uint256 oldDefaultLTV, uint256 newDefaultLTV);
-    event Repaid(address borrowToken, uint256 repaidAmount);
     event WithdrawnFromAave(address to, uint256 amount);
+    event Repaid(address borrowToken, uint256 repaidAmount);
 
     constructor(
         address liquidityToken,

contracts/Rebalancer.sol

@@ -9,14 +9,15 @@ import {ERC7201Helper} from "./utils/ERC7201Helper.sol";
 import {ILiquidityPool} from "./interfaces/ILiquidityPool.sol";
 import {IRebalancer} from "./interfaces/IRebalancer.sol";
 import {ICCTPTokenMessenger, ICCTPMessageTransmitter} from "./interfaces/ICCTP.sol";
+import {CCTPAdapter} from "./utils/CCTPAdapter.sol";
 
 /// @title Facilitates liquidity movement between Liquidity Pools on same/different chains.
 /// Routes, which is a destination pool/domain and a bridging provider, have to be approved by admin.
 /// Rebalancing only takes arbitrary input on the amount, then contract enforces correct processing.
 /// REBALANCER_ROLE is needed to finalize/init rebalancing process.
 /// @notice Upgradeable.
 /// @author Oleksii Matiiasevych <[email protected]>
-contract Rebalancer is IRebalancer, AccessControlUpgradeable {
+contract Rebalancer is IRebalancer, AccessControlUpgradeable, CCTPAdapter {
     using SafeERC20 for IERC20;
     using BitMaps for BitMaps.BitMap;
     using EnumerableSet for EnumerableSet.AddressSet;
@@ -41,8 +42,6 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable {
     error ZeroAmount();
     error RouteDenied();
     error InvalidRoute();
-    error ProcessFailed();
-    error UnsupportedDomain();
     error UnsupportedProvider();
     error InvalidLength();
     error InvalidPoolAssets();
@@ -189,7 +188,7 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable {
             _processRebalanceLOCAL(amount, destinationPool);
         } else
         if (provider == Provider.CCTP) {
-            _initiateRebalanceCCTP(amount, destinationPool, destinationDomain);
+            initiateTransferCCTP(CCTP_TOKEN_MESSENGER, ASSETS, amount, destinationPool, destinationDomain);
         } else {
             // Unreachable atm, but could become so when more providers are added to enum.
             revert UnsupportedProvider();
@@ -204,7 +203,8 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable {
         require(isRouteAllowed(destinationPool, DOMAIN, Provider.LOCAL), RouteDenied());
         uint256 depositAmount = 0;
         if (provider == Provider.CCTP) {
-            depositAmount = _processRebalanceCCTP(destinationPool, extraData);
+            depositAmount = processTransferCCTP(CCTP_MESSAGE_TRANSMITTER, ASSETS, destinationPool, extraData);
+            ILiquidityPool(destinationPool).deposit(depositAmount);
         } else {
             // Unreachable atm, but could become so when more providers are added to enum.
             revert UnsupportedProvider();
@@ -213,21 +213,6 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable {
         emit ProcessRebalance(depositAmount, destinationPool, provider);
     }
 
-    function _initiateRebalanceCCTP(
-        uint256 amount,
-        address destinationPool,
-        Domain destinationDomain
-    ) internal {
-        ASSETS.forceApprove(address(CCTP_TOKEN_MESSENGER), amount);
-        CCTP_TOKEN_MESSENGER.depositForBurnWithCaller(
-            amount,
-            domainCCTP(destinationDomain),
-            _addressToBytes32(address(destinationPool)),
-            address(ASSETS),
-            _addressToBytes32(address(this))
-        );
-    }
-
     function _processRebalanceLOCAL(
         uint256 amount,
         address destinationPool
@@ -238,50 +223,6 @@ contract Rebalancer is IRebalancer, AccessControlUpgradeable {
         emit ProcessRebalance(amount, destinationPool, Provider.LOCAL);
     }
 
-    function _processRebalanceCCTP(
-        address destinationPool,
-        bytes calldata extraData
-    ) internal returns (uint256) {
-        uint256 balanceBefore = ASSETS.balanceOf(address(destinationPool));
-
-        (bytes memory message, bytes memory attestation) = abi.decode(extraData, (bytes, bytes));
-        bool success = CCTP_MESSAGE_TRANSMITTER.receiveMessage(message, attestation);
-        require(success, ProcessFailed());
-
-        uint256 balanceAfter = ASSETS.balanceOf(address(destinationPool));
-        require(balanceAfter > balanceBefore, ProcessFailed());
-        uint256 depositAmount = balanceAfter - balanceBefore;
-        ILiquidityPool(destinationPool).deposit(depositAmount);
-        return depositAmount;
-    }
-
-    function domainCCTP(Domain destinationDomain) public pure virtual returns (uint32) {
-        if (destinationDomain == Domain.ETHEREUM) {
-            return 0;
-        } else
-        if (destinationDomain == Domain.AVALANCHE) {
-            return 1;
-        } else
-        if (destinationDomain == Domain.OP_MAINNET) {
-            return 2;
-        } else
-        if (destinationDomain == Domain.ARBITRUM_ONE) {
-            return 3;
-        } else
-        if (destinationDomain == Domain.BASE) {
-            return 6;
-        } else
-        if (destinationDomain == Domain.POLYGON_MAINNET) {
-            return 7;
-        } else {
-            revert UnsupportedDomain();
-        }
-    }
-
-    function _addressToBytes32(address addr) internal pure returns (bytes32) {
-        return bytes32(uint256(uint160(addr)));
-    }
-
     function _getStorage() private pure returns (RebalancerStorage storage $) {
         assembly {
             $.slot := STORAGE_LOCATION