Merge pull request #48 from Gearbox-protocol/fix-aa-pause

fix: abstract adapter no longer inherits acl trait
Gearbox-protocol · Apr 10, 2023 · bbfb9e2 · bbfb9e2
2 parents 473f41c + f8148f2
commit bbfb9e2
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 15 deletions.
diff --git a/contracts/adapters/AbstractAdapter.sol b/contracts/adapters/AbstractAdapter.sol
@@ -3,7 +3,7 @@
 // (c) Gearbox Holdings, 2022
 pragma solidity ^0.8.10;
 
-import { ACLTrait } from "../core/ACLTrait.sol";
+import { IACL } from "../interfaces/IACL.sol";
 import { IAdapter } from "../interfaces/adapters/IAdapter.sol";
 import { IAddressProvider } from "../interfaces/IAddressProvider.sol";
 import { ICreditManagerV2 } from "../interfaces/ICreditManagerV2.sol";
@@ -12,7 +12,7 @@ import { ZeroAddressException } from "../interfaces/IErrors.sol";
 
 /// @title Abstract adapter
 /// @dev Inheriting adapters MUST use provided internal functions to perform all operations with credit accounts
-abstract contract AbstractAdapter is IAdapter, ACLTrait {
+abstract contract AbstractAdapter is IAdapter {
     /// @notice Credit Manager the adapter is connected to
     ICreditManagerV2 public immutable override creditManager;
 
@@ -22,18 +22,14 @@ abstract contract AbstractAdapter is IAdapter, ACLTrait {
     /// @notice Address of the contract the adapter is interacting with
     address public immutable override targetContract;
 
+    /// @notice ACL contract to check rights
+    IACL public immutable override _acl;
+
     /// @notice Constructor
     /// @param _creditManager Credit Manager to connect this adapter to
     /// @param _targetContract Address of the contract this adapter should interact with
-    constructor(address _creditManager, address _targetContract)
-        ACLTrait(
-            address(
-                IPoolService(ICreditManagerV2(_creditManager).pool())
-                    .addressProvider()
-            )
-        )
-    {
-        if (_targetContract == address(0)) {
+    constructor(address _creditManager, address _targetContract) {
+        if (_creditManager == address(0) || _targetContract == address(0)) {
             revert ZeroAddressException(); // F: [AA-2]
         }
 
@@ -42,9 +38,18 @@ abstract contract AbstractAdapter is IAdapter, ACLTrait {
             IPoolService(creditManager.pool()).addressProvider()
         ); // F: [AA-1]
         targetContract = _targetContract; // F: [AA-1]
+
+        _acl = IACL(addressProvider.getACL()); // F: [AA-1]
+    }
+
+    /// @notice Reverts if caller of the function is not configurator
+    modifier configuratorOnly() {
+        if (!_acl.isConfigurator(msg.sender))
+            revert CallerNotConfiguratorException(); // F: [AA-16]
+        _;
     }
 
-    /// @dev Reverts if the caller of the function is not the Credit Facade
+    /// @notice Reverts if caller of the function is not the Credit Facade
     /// @dev Adapter functions are only allowed to be called from within the multicall
     ///      Since at this point Credit Account is owned by the Credit Facade, all functions
     ///      of inheriting adapters that perform actions on account MUST have this modifier

diff --git a/contracts/interfaces/adapters/IAdapter.sol b/contracts/interfaces/adapters/IAdapter.sol
@@ -3,6 +3,7 @@
 // (c) Gearbox Holdings, 2022
 pragma solidity ^0.8.10;
 
+import { IACL } from "../IACL.sol";
 import { IAddressProvider } from "../IAddressProvider.sol";
 import { ICreditManagerV2 } from "../ICreditManagerV2.sol";
 
@@ -38,6 +39,9 @@ interface IAdapterExceptions {
 
     /// @notice Thrown when caller of a `creditFacadeOnly` function is not the Credit Facade
     error CreditFacadeOnlyException();
+
+    /// @notice Thrown when caller of a `configuratorOnly` function is not configurator
+    error CallerNotConfiguratorException();
 }
 
 interface IAdapter is IAdapterExceptions {
@@ -50,6 +54,9 @@ interface IAdapter is IAdapterExceptions {
     /// @notice Address provider
     function addressProvider() external view returns (IAddressProvider);
 
+    /// @notice ACL contract to check rights
+    function _acl() external view returns (IACL);
+
     /// @notice Adapter type
     function _gearboxAdapterType() external pure returns (AdapterType);
 

diff --git a/contracts/test/adapters/AbstractAdapter.t.sol b/contracts/test/adapters/AbstractAdapter.t.sol
@@ -103,6 +103,9 @@ contract AbstractAdapterTest is
 
     /// @dev [AA-1]: AbstractAdapter constructor sets correct values
     function test_AA_01_constructor_sets_correct_values() public {
+        IAddressProvider addressProvider = IPoolService(creditManager.pool())
+            .addressProvider();
+
         assertEq(
             address(adapterMock.creditManager()),
             address(creditManager),
@@ -111,7 +114,7 @@ contract AbstractAdapterTest is
 
         assertEq(
             address(adapterMock.addressProvider()),
-            address(IPoolService(creditManager.pool()).addressProvider()),
+            address(addressProvider),
             "Incorrect address provider"
         );
 
@@ -120,11 +123,17 @@ contract AbstractAdapterTest is
             address(targetMock),
             "Incorrect target contract"
         );
+
+        assertEq(
+            address(adapterMock._acl()),
+            addressProvider.getACL(),
+            "Incorrect ACL"
+        );
     }
 
     /// @dev [AA-2]: AbstractAdapter constructor reverts when passed zero-address as target contract
     function test_AA_02_constructor_reverts_on_zero_address() public {
-        evm.expectRevert();
+        evm.expectRevert(ZeroAddressException.selector);
         new AdapterMock(address(0), address(0));
 
         evm.expectRevert(ZeroAddressException.selector);
@@ -665,7 +674,9 @@ contract AbstractAdapterTest is
                 }
 
                 evm.prank(USER);
-                evm.expectRevert(TokenNotAllowedException.selector);
+                evm.expectRevert(
+                    IAdapterExceptions.TokenNotAllowedException.selector
+                );
                 creditFacade.multicall(
                     multicallBuilder(
                         MultiCall({
@@ -677,4 +688,15 @@ contract AbstractAdapterTest is
             }
         }
     }
+
+    /// @dev [AA-16]: `configuratorOnly` function reverts if called not by configurator
+    function test_AA_16_configuratorOnly_function_reverts_if_called_not_by_configurator()
+        public
+    {
+        evm.expectRevert(
+            IAdapterExceptions.CallerNotConfiguratorException.selector
+        );
+        evm.prank(USER);
+        adapterMock.configure();
+    }
 }
diff --git a/contracts/test/mocks/adapters/AdapterMock.sol b/contracts/test/mocks/adapters/AdapterMock.sol
@@ -19,6 +19,8 @@ contract AdapterMock is AbstractAdapter {
         AbstractAdapter(_creditManager, _targetContract)
     {}
 
+    function configure() external view configuratorOnly {}
+
     function creditFacade() external view returns (address) {
         return _creditFacade();
     }