style: Upgrade dependencies and format code

BendDAO · May 3, 2023 · a0bf541 · a0bf541
1 parent c2cf2f1
commit a0bf541
Show file tree

Hide file tree

Showing 18 changed files with 1,864 additions and 2,954 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,5 +14,6 @@
     "**/.git/subtree-cache/**": true,
     "**/node_modules/**": true,
     "**/dist/**": true
-  }
+  },
+  "solidity.compileUsingRemoteVersion": "v0.8.18+commit.87f61d96"
 }
diff --git a/contracts/BendNftPool.sol b/contracts/BendNftPool.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 
 pragma solidity 0.8.18;
+
 import {IERC20Upgradeable, SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
@@ -117,12 +118,7 @@ contract BendNftPool is INftPool, ReentrancyGuardUpgradeable, OwnableUpgradeable
         emit NftWithdrawn(nft_, tokenIds_, _msgSender());
     }
 
-    function _claim(
-        address owner_,
-        address receiver_,
-        address nft_,
-        uint256[] calldata tokenIds_
-    ) internal {
+    function _claim(address owner_, address receiver_, address nft_, uint256[] calldata tokenIds_) internal {
         PoolState storage pool = poolStates[nft_];
         uint256 tokenId_;
         uint256 claimableRewards;
@@ -148,11 +144,7 @@ contract BendNftPool is INftPool, ReentrancyGuardUpgradeable, OwnableUpgradeable
         }
     }
 
-    function claim(
-        address nft_,
-        uint256[] calldata tokenIds_,
-        address delegateVault_
-    ) external override onlyApe(nft_) {
+    function claim(address nft_, uint256[] calldata tokenIds_, address delegateVault_) external override onlyApe(nft_) {
         address owner = _msgSender();
         address receiver = _msgSender();
         if (delegateVault_ != address(0)) {
@@ -191,13 +183,10 @@ contract BendNftPool is INftPool, ReentrancyGuardUpgradeable, OwnableUpgradeable
         );
     }
 
-    function claimable(address nft_, uint256[] calldata tokenIds_)
-        external
-        view
-        override
-        onlyApe(nft_)
-        returns (uint256 amount)
-    {
+    function claimable(
+        address nft_,
+        uint256[] calldata tokenIds_
+    ) external view override onlyApe(nft_) returns (uint256 amount) {
         PoolState storage pool = poolStates[nft_];
         uint256 tokenId_ = 0;
         for (uint256 i = 0; i < tokenIds_.length; i++) {
@@ -208,11 +197,9 @@ contract BendNftPool is INftPool, ReentrancyGuardUpgradeable, OwnableUpgradeable
         }
     }
 
-    function getPoolStateUI(address nft_)
-        external
-        view
-        returns (uint256 totalNftAmount, uint256 accumulatedRewardsPerNft)
-    {
+    function getPoolStateUI(
+        address nft_
+    ) external view returns (uint256 totalNftAmount, uint256 accumulatedRewardsPerNft) {
         PoolState storage pool = poolStates[nft_];
         totalNftAmount = pool.stakedNft.totalSupply();
         accumulatedRewardsPerNft = pool.accumulatedRewardsPerNft;
@@ -224,10 +211,10 @@ contract BendNftPool is INftPool, ReentrancyGuardUpgradeable, OwnableUpgradeable
     }
 
     function onERC721Received(
-        address, /*operator*/
-        address, /*from*/
-        uint256, /*tokenId*/
-        bytes calldata /*data*/
+        address,
+        /*operator*/ address,
+        /*from*/ uint256,
+        /*tokenId*/ bytes calldata /*data*/
     ) external view returns (bytes4) {
         bool isValidNFT = (bayc == msg.sender || mayc == msg.sender || bakc == msg.sender);
         if (!isValidNFT) {
@@ -243,11 +230,10 @@ contract BendNftPool is INftPool, ReentrancyGuardUpgradeable, OwnableUpgradeable
      * @dev Rounds down the claimable rewards to the nearest integer.
      * Because ERC4626 will round down the rewards when withdraw.
      */
-    function _round_claimble_rewards(uint256 accumulatedRewardsPerNft, uint256 rewardsDebt)
-        private
-        pure
-        returns (uint256 rewards)
-    {
+    function _round_claimble_rewards(
+        uint256 accumulatedRewardsPerNft,
+        uint256 rewardsDebt
+    ) private pure returns (uint256 rewards) {
         rewards = (accumulatedRewardsPerNft - rewardsDebt) / APE_COIN_PRECISION;
         if (rewards > 0) {
             rewards -= 1;

diff --git a/contracts/interfaces/IApeCoinStaking.sol b/contracts/interfaces/IApeCoinStaking.sol
@@ -81,27 +81,15 @@ interface IApeCoinStaking {
 
     function nftContracts(uint256 poolId_) external view returns (address);
 
-    function rewardsBy(
-        uint256 poolId_,
-        uint256 from_,
-        uint256 to_
-    ) external view returns (uint256, uint256);
+    function rewardsBy(uint256 poolId_, uint256 from_, uint256 to_) external view returns (uint256, uint256);
 
     function apeCoin() external view returns (address);
 
     function getCurrentTimeRangeIndex(Pool memory pool_) external view returns (uint256);
 
     function getTimeRangeBy(uint256 poolId_, uint256 index_) external view returns (TimeRange memory);
 
-    function getPoolsUI()
-        external
-        view
-        returns (
-            PoolUI memory,
-            PoolUI memory,
-            PoolUI memory,
-            PoolUI memory
-        );
+    function getPoolsUI() external view returns (PoolUI memory, PoolUI memory, PoolUI memory, PoolUI memory);
 
     function getSplitStakes(address address_) external view returns (DashboardStake[] memory);
 
@@ -113,18 +101,16 @@ interface IApeCoinStaking {
 
     function addressPosition(address addr_) external view returns (Position memory);
 
-    function pendingRewards(
-        uint256 poolId_,
-        address address_,
-        uint256 tokenId_
-    ) external view returns (uint256);
+    function pendingRewards(uint256 poolId_, address address_, uint256 tokenId_) external view returns (uint256);
 
     function depositBAYC(SingleNft[] calldata nfts_) external;
 
     function depositMAYC(SingleNft[] calldata nfts_) external;
 
-    function depositBAKC(PairNftDepositWithAmount[] calldata baycPairs_, PairNftDepositWithAmount[] calldata maycPairs_)
-        external;
+    function depositBAKC(
+        PairNftDepositWithAmount[] calldata baycPairs_,
+        PairNftDepositWithAmount[] calldata maycPairs_
+    ) external;
 
     function depositSelfApeCoin(uint256 amount_) external;
 
@@ -134,11 +120,7 @@ interface IApeCoinStaking {
 
     function claimMAYC(uint256[] calldata nfts_, address recipient_) external;
 
-    function claimBAKC(
-        PairNft[] calldata baycPairs_,
-        PairNft[] calldata maycPairs_,
-        address recipient_
-    ) external;
+    function claimBAKC(PairNft[] calldata baycPairs_, PairNft[] calldata maycPairs_, address recipient_) external;
 
     function withdrawBAYC(SingleNft[] calldata nfts_, address recipient_) external;
 

diff --git a/contracts/interfaces/IDelegationRegistry.sol b/contracts/interfaces/IDelegationRegistry.sol
@@ -69,11 +69,7 @@ interface IDelegationRegistry {
      * @param contract_ The address for the contract you're delegating
      * @param value Whether to enable or disable delegation for this address, true for setting and false for revoking
      */
-    function delegateForContract(
-        address delegate,
-        address contract_,
-        bool value
-    ) external;
+    function delegateForContract(address delegate, address contract_, bool value) external;
 
     /**
      * @notice Allow the delegate to act on your behalf for a specific token
@@ -82,12 +78,7 @@ interface IDelegationRegistry {
      * @param tokenId The token id for the token you're delegating
      * @param value Whether to enable or disable delegation for this address, true for setting and false for revoking
      */
-    function delegateForToken(
-        address delegate,
-        address contract_,
-        uint256 tokenId,
-        bool value
-    ) external;
+    function delegateForToken(address delegate, address contract_, uint256 tokenId, bool value) external;
 
     /**
      * @notice Revoke all delegates
@@ -172,11 +163,7 @@ interface IDelegationRegistry {
      * @param contract_ The address for the contract you're delegating
      * @param vault The cold wallet who issued the delegation
      */
-    function checkDelegateForContract(
-        address delegate,
-        address vault,
-        address contract_
-    ) external view returns (bool);
+    function checkDelegateForContract(address delegate, address vault, address contract_) external view returns (bool);
 
     /**
      * @notice Returns true if the address is delegated to act on your behalf for a specific token, the token's contract or an entire vault

diff --git a/contracts/interfaces/INftPool.sol b/contracts/interfaces/INftPool.sol
@@ -39,11 +39,7 @@ interface INftPool {
     function withdraw(address nft_, uint256[] calldata tokenIds_) external;
 
     // bacAPE
-    function claim(
-        address nft_,
-        uint256[] calldata tokenIds_,
-        address delegateVault_
-    ) external;
+    function claim(address nft_, uint256[] calldata tokenIds_, address delegateVault_) external;
 
     // rewards
     function receiveApeCoin(address nft_, uint256 rewardsAmount_) external;

diff --git a/contracts/interfaces/INftVault.sol b/contracts/interfaces/INftVault.sol
@@ -25,19 +25,10 @@ interface INftVault is IERC721Receiver {
 
     // delegate.cash
 
-    function setDelegateCash(
-        address delegate_,
-        address nft_,
-        uint256[] calldata tokenIds,
-        bool value
-    ) external;
+    function setDelegateCash(address delegate_, address nft_, uint256[] calldata tokenIds, bool value) external;
 
     // deposit nft
-    function depositNft(
-        address nft_,
-        uint256[] calldata tokenIds_,
-        address staker_
-    ) external;
+    function depositNft(address nft_, uint256[] calldata tokenIds_, address staker_) external;
 
     // withdraw nft
     function withdrawNft(address nft_, uint256[] calldata tokenIds_) external;
@@ -56,13 +47,15 @@ interface INftVault is IERC721Receiver {
     ) external;
 
     // unstake
-    function unstakeBaycPool(IApeCoinStaking.SingleNft[] calldata nfts_, address recipient_)
-        external
-        returns (uint256 principal, uint256 rewards);
+    function unstakeBaycPool(
+        IApeCoinStaking.SingleNft[] calldata nfts_,
+        address recipient_
+    ) external returns (uint256 principal, uint256 rewards);
 
-    function unstakeMaycPool(IApeCoinStaking.SingleNft[] calldata nfts_, address recipient_)
-        external
-        returns (uint256 principal, uint256 rewards);
+    function unstakeMaycPool(
+        IApeCoinStaking.SingleNft[] calldata nfts_,
+        address recipient_
+    ) external returns (uint256 principal, uint256 rewards);
 
     function unstakeBakcPool(
         IApeCoinStaking.PairNftWithdrawWithAmount[] calldata baycPairs_,

diff --git a/contracts/interfaces/IStakedNft.sol b/contracts/interfaces/IStakedNft.sol
@@ -6,11 +6,7 @@ import {IERC721Receiver} from "@openzeppelin/contracts/interfaces/IERC721Receive
 import {IERC721Enumerable} from "@openzeppelin/contracts/interfaces/IERC721Enumerable.sol";
 
 interface IStakedNft is IERC721Metadata, IERC721Receiver, IERC721Enumerable {
-    function mint(
-        address staker,
-        address to,
-        uint256[] calldata tokenIds
-    ) external;
+    function mint(address staker, address to, uint256[] calldata tokenIds) external;
 
     function burn(uint256[] calldata tokenIds) external;
 
@@ -38,9 +34,5 @@ interface IStakedNft is IERC721Metadata, IERC721Receiver, IERC721Enumerable {
 
     function underlyingAsset() external view returns (address);
 
-    function setDelegateCash(
-        address delegate,
-        uint256[] calldata tokenIds,
-        bool value
-    ) external;
+    function setDelegateCash(address delegate, uint256[] calldata tokenIds, bool value) external;
 }
diff --git a/contracts/libraries/ApeStakingLib.sol b/contracts/libraries/ApeStakingLib.sol
@@ -14,11 +14,10 @@ library ApeStakingLib {
     uint256 internal constant MAYC_POOL_ID = 2;
     uint256 internal constant BAKC_POOL_ID = 3;
 
-    function getCurrentTimeRange(IApeCoinStaking apeCoinStaking_, uint256 poolId)
-        internal
-        view
-        returns (IApeCoinStaking.TimeRange memory)
-    {
+    function getCurrentTimeRange(
+        IApeCoinStaking apeCoinStaking_,
+        uint256 poolId
+    ) internal view returns (IApeCoinStaking.TimeRange memory) {
         (
             IApeCoinStaking.PoolUI memory apeCoinPoolUI,
             IApeCoinStaking.PoolUI memory baycPoolUI,
@@ -66,11 +65,10 @@ library ApeStakingLib {
         return apeCoinStaking_.nftPosition(getNftPoolId(apeCoinStaking_, nft_), tokenId_);
     }
 
-    function getNftPool(IApeCoinStaking apeCoinStaking_, address nft_)
-        internal
-        view
-        returns (IApeCoinStaking.PoolWithoutTimeRange memory)
-    {
+    function getNftPool(
+        IApeCoinStaking apeCoinStaking_,
+        address nft_
+    ) internal view returns (IApeCoinStaking.PoolWithoutTimeRange memory) {
         return apeCoinStaking_.pools(getNftPoolId(apeCoinStaking_, nft_));
     }