Merge pull request #67 from Gearbox-protocol/pqk-cleanup

feat: pqk + quotas cleanup
Gearbox-protocol · Jun 4, 2023 · 07d583d · 07d583d
2 parents a1df2d7 + e832d40
commit 07d583d
Show file tree

Hide file tree

Showing 58 changed files with 1,680 additions and 904 deletions.
diff --git a/contracts/adapters/LICENSE b/contracts/adapters/LICENSE
diff --git a/contracts/adapters/AbstractAdapter.sol → contracts/core/AbstractAdapter.sol b/contracts/adapters/AbstractAdapter.sol → contracts/core/AbstractAdapter.sol
diff --git a/contracts/support/BotListV3.sol → contracts/core/BotListV3.sol b/contracts/support/BotListV3.sol → contracts/core/BotListV3.sol
@@ -86,7 +86,6 @@ contract BotListV3 is ACLNonReentrantTrait, IBotListV3 {
     /// @param permissions A bit mask of permissions
     /// @param fundingAmount Total amount of ETH available to the bot for payments
     /// @param weeklyFundingAllowance Amount of ETH available to the bot weekly
-
     function setBotPermissions(
         address creditAccount,
         address bot,
@@ -149,6 +148,7 @@ contract BotListV3 is ACLNonReentrantTrait, IBotListV3 {
         }
     }
 
+    /// @dev Removes all permissions and funding for a (credit account, bot) pair
     function _eraseBot(address creditAccount, address bot) internal {
         delete botPermissions[creditAccount][bot]; // F: [BL-06]
         delete botFunding[creditAccount][bot]; // F: [BL-06]
@@ -164,7 +164,7 @@ contract BotListV3 is ACLNonReentrantTrait, IBotListV3 {
     /// @param paymentAmount Amount to pay
     function payBot(address payer, address creditAccount, address bot, uint72 paymentAmount)
         external
-        onlyValidCreditFacade
+        onlyValidCreditFacade // F: [BL-05]
     {
         if (paymentAmount == 0) return;
 

diff --git a/contracts/support/WithdrawalManagerV3.sol → contracts/core/WithdrawalManagerV3.sol b/contracts/support/WithdrawalManagerV3.sol → contracts/core/WithdrawalManagerV3.sol
diff --git a/contracts/credit/CreditAccountV3.sol b/contracts/credit/CreditAccountV3.sol
@@ -59,7 +59,7 @@ contract CreditAccountV3 is ICreditAccountV3 {
     }
 
     /// @inheritdoc ICreditAccountV3
-    function execute(address target, bytes memory data)
+    function execute(address target, bytes calldata data)
         external
         override
         creditManagerOnly // U:[CA-2]
@@ -69,7 +69,7 @@ contract CreditAccountV3 is ICreditAccountV3 {
     }
 
     /// @inheritdoc ICreditAccountV3
-    function rescue(address target, bytes memory data)
+    function rescue(address target, bytes calldata data)
         external
         override
         factoryOnly // U:[CA-2]

diff --git a/contracts/credit/CreditConfiguratorV3.sol b/contracts/credit/CreditConfiguratorV3.sol
@@ -955,7 +955,7 @@ contract CreditConfiguratorV3 is ICreditConfiguratorV3, ACLNonReentrantTrait {
     function setTotalDebtLimit(uint128 newLimit)
         external
         override
-        configuratorOnly // I: [CC-2]
+        controllerOnly // I: [CC-2]
     {
         CreditFacadeV3 cf = CreditFacadeV3(creditFacade());
         if (!cf.trackTotalDebt()) revert TotalDebtNotTrackedException(); // I:[CC-34]

diff --git a/contracts/credit/CreditFacadeV3.sol b/contracts/credit/CreditFacadeV3.sol
@@ -879,7 +879,7 @@ contract CreditFacadeV3 is ICreditFacadeV3, ACLNonReentrantTrait {
         (address token, bytes memory data) = abi.decode(callData, (address, bytes)); // U:[FA-25]
 
         address priceFeed = IPriceOracleV2(ICreditManagerV3(creditManager).priceOracle()).priceFeeds(token); // U:[FA-25]
-        if (priceFeed == address(0)) revert PriceFeedNotExistsException(); // U:[FA-25]
+        if (priceFeed == address(0)) revert PriceFeedDoesNotExistException(); // U:[FA-25]
 
         IPriceFeedOnDemand(priceFeed).updatePrice(data); // U:[FA-25]
     }
@@ -950,17 +950,14 @@ contract CreditFacadeV3 is ICreditFacadeV3, ACLNonReentrantTrait {
         internal
         returns (uint256 tokensToEnable, uint256 tokensToDisable)
     {
-        int96 realQuotaChange;
         (address token, int96 quotaChange, uint96 minQuota) = abi.decode(callData, (address, int96, uint96)); // U:[FA-34]
-        (realQuotaChange, tokensToEnable, tokensToDisable) = ICreditManagerV3(creditManager).updateQuota({
+        (tokensToEnable, tokensToDisable) = ICreditManagerV3(creditManager).updateQuota({
             creditAccount: creditAccount,
             token: token,
             quotaChange: quotaChange,
             minQuota: minQuota,
             maxQuota: uint96(Math.min(type(uint96).max, maxQuotaMultiplier * debtLimits.maxDebt))
         }); // U:[FA-34]
-
-        emit UpdateQuota({creditAccount: creditAccount, token: token, quotaChange: realQuotaChange}); // U:[FA-34]
     }
 
     /// @notice Requests the Credit Manager to schedule a withdrawal