Borrow and stake support pcape

Makefile

@@ -624,6 +624,10 @@ upgrade-pool-marketplace:
 upgrade-pool-ape-staking:
 	make TASK_NAME=upgrade:pool-ape-staking run-task
 
+.PHONY: upgrade-borrow_ape_and_stake
+upgrade-borrow_ape_and_stake:
+	make TASK_NAME=upgrade:borrow-ape-and-stake run-task
+
 .PHONY: upgrade-pool-parameters
 upgrade-pool-parameters:
 	make TASK_NAME=upgrade:pool-parameters run-task

contracts/interfaces/IPool.sol

@@ -7,6 +7,7 @@ import {IPoolParameters} from "./IPoolParameters.sol";
 import {IParaProxyInterfaces} from "./IParaProxyInterfaces.sol";
 import {IPoolPositionMover} from "./IPoolPositionMover.sol";
 import "./IPoolApeStaking.sol";
+import "./IPoolBorrowAndStake.sol";
 
 /**
  * @title IPool
@@ -19,7 +20,8 @@ interface IPool is
     IPoolParameters,
     IPoolApeStaking,
     IParaProxyInterfaces,
-    IPoolPositionMover
+    IPoolPositionMover,
+    IPoolBorrowAndStake
 {
 
 }

contracts/interfaces/IPoolApeStaking.sol

@@ -80,8 +80,10 @@ interface IPoolApeStaking {
      * @param tokenId Token id of the ape staking position on
      * @dev Need check User health factor > 1.
      */
-    function unstakeApePositionAndRepay(address nftAsset, uint256 tokenId)
-        external;
+    function unstakeApePositionAndRepay(
+        address nftAsset,
+        uint256 tokenId
+    ) external;
 
     /**
      * @notice repay asset and supply asset for user

contracts/interfaces/IPoolBorrowAndStake.sol

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.8.0;
+
+import "../dependencies/yoga-labs/ApeCoinStaking.sol";
+
+/**
+ * @title IPoolBorrowAndStake
+ *
+ * @notice Defines the basic interface for an ParaSpace Ape Staking Pool.
+ **/
+interface IPoolBorrowAndStake {
+    struct StakingInfoV2 {
+        // Contract address of BAYC/MAYC
+        address nftAsset;
+        // address of borrowing asset, can be Ape or cApe
+        address borrowAsset;
+        // Borrow amount of Ape from lending pool
+        uint256 borrowAmount;
+        address cashAsset;
+        // Cash amount of Ape from user wallet
+        uint256 cashAmount;
+    }
+
+    /**
+     * @notice Deposit ape coin to BAYC/MAYC pool or BAKC pool
+     * @param stakingInfo Detail info of the staking
+     * @param _nfts Array of BAYC/MAYC NFT's with staked amounts
+     * @param _nftPairs Array of Paired BAYC/MAYC NFT's with staked amounts
+     * @dev Need check User health factor > 1.
+     */
+    function borrowApeAndStakeV2(
+        StakingInfoV2 calldata stakingInfo,
+        ApeCoinStaking.SingleNft[] calldata _nfts,
+        ApeCoinStaking.PairNftDepositWithAmount[] calldata _nftPairs
+    ) external;
+}

contracts/protocol/pool/PoolApeStaking.sol

@@ -133,10 +133,10 @@ contract PoolApeStaking is
     }
 
     /// @inheritdoc IPoolApeStaking
-    function claimApeCoin(address nftAsset, uint256[] calldata _nfts)
-        external
-        nonReentrant
-    {
+    function claimApeCoin(
+        address nftAsset,
+        uint256[] calldata _nfts
+    ) external nonReentrant {
         DataTypes.PoolStorage storage ps = poolStorage();
         _checkSApeIsNotPaused(ps);
 
@@ -182,8 +182,8 @@ contract PoolApeStaking is
                 localVar.bakcNToken
             ) {
                 localVar.transferredTokenOwners[
-                        actualTransferAmount
-                    ] = _validateBAKCOwnerAndTransfer(
+                    actualTransferAmount
+                ] = _validateBAKCOwnerAndTransfer(
                     localVar,
                     _nftPairs[index].bakcTokenId,
                     msg.sender
@@ -341,8 +341,8 @@ contract PoolApeStaking is
                 );
 
                 localVar.transferredTokenOwners[
-                        index
-                    ] = _validateBAKCOwnerAndTransfer(
+                    index
+                ] = _validateBAKCOwnerAndTransfer(
                     localVar,
                     _nftPairs[index].bakcTokenId,
                     msg.sender
@@ -405,10 +405,10 @@ contract PoolApeStaking is
     }
 
     /// @inheritdoc IPoolApeStaking
-    function unstakeApePositionAndRepay(address nftAsset, uint256 tokenId)
-        external
-        nonReentrant
-    {
+    function unstakeApePositionAndRepay(
+        address nftAsset,
+        uint256 tokenId
+    ) external nonReentrant {
         DataTypes.PoolStorage storage ps = poolStorage();
         DataTypes.ReserveData storage nftReserve = ps._reserves[nftAsset];
         address xTokenAddress = nftReserve.xTokenAddress;
@@ -522,8 +522,8 @@ contract PoolApeStaking is
                 );
 
                 localVar.transferredTokenOwners[
-                        j
-                    ] = _validateBAKCOwnerAndTransfer(
+                    j
+                ] = _validateBAKCOwnerAndTransfer(
                     localVar,
                     _nftPairs[i][j].bakcTokenId,
                     users[i]
@@ -549,11 +549,10 @@ contract PoolApeStaking is
         _compoundForUsers(ps, localVar, users);
     }
 
-    function _generalCache(DataTypes.PoolStorage storage ps, address nftAsset)
-        internal
-        view
-        returns (ApeStakingLocalVars memory localVar)
-    {
+    function _generalCache(
+        DataTypes.PoolStorage storage ps,
+        address nftAsset
+    ) internal view returns (ApeStakingLocalVars memory localVar) {
         localVar.xTokenAddress = ps._reserves[nftAsset].xTokenAddress;
         localVar.bakcContract = INTokenApeStaking(localVar.xTokenAddress)
             .getBAKC();
@@ -645,10 +644,9 @@ contract PoolApeStaking is
         }
     }
 
-    function _checkSApeIsNotPaused(DataTypes.PoolStorage storage ps)
-        internal
-        view
-    {
+    function _checkSApeIsNotPaused(
+        DataTypes.PoolStorage storage ps
+    ) internal view {
         DataTypes.ReserveData storage reserve = ps._reserves[
             DataTypes.SApeAddress
         ];
@@ -746,11 +744,10 @@ contract PoolApeStaking is
         _supplyForUser(ps, tokenOut, address(this), user, amountOut);
     }
 
-    function _getApeRelativePrice(address tokenOut, uint256 tokenOutUnit)
-        internal
-        view
-        returns (uint256)
-    {
+    function _getApeRelativePrice(
+        address tokenOut,
+        uint256 tokenOutUnit
+    ) internal view returns (uint256) {
         IPriceOracleGetter oracle = IPriceOracleGetter(
             ADDRESSES_PROVIDER.getPriceOracle()
         );