Merge pull request #225 from gildlab/2025-03-07-nix

access control ierc165 authorier

Author: thedavidmeister

src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol

@@ -6,6 +6,8 @@ import {IAuthorizeV1, Unauthorized} from "../../interface/IAuthorizeV1.sol";
 
 import {AccessControlUpgradeable as AccessControl} from
     "openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol";
+import {IAccessControlUpgradeable as IAccessControl} from
+    "openzeppelin-contracts-upgradeable/contracts/access/IAccessControlUpgradeable.sol";
 import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain.factory/interface/ICloneableV2.sol";
 import {
     CONFISCATE_RECEIPT,
@@ -119,7 +121,7 @@ contract OffchainAssetReceiptVaultAuthorizerV1 is IAuthorizeV1, ICloneableV2, Ac
     /// @inheritdoc IERC165
     function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
         return interfaceId == type(IAuthorizeV1).interfaceId || interfaceId == type(ICloneableV2).interfaceId
-            || super.supportsInterface(interfaceId);
+            || interfaceId == type(IAccessControl).interfaceId || super.supportsInterface(interfaceId);
     }
 
     /// Permissions are treated as roles in this implementation. This makes the

test/src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.ierc165.t.sol

@@ -8,17 +8,21 @@ import {IERC165} from "openzeppelin-contracts/contracts/utils/introspection/IERC
 import {OffchainAssetReceiptVaultAuthorizerV1} from "src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
 import {IAuthorizeV1} from "src/interface/IAuthorizeV1.sol";
 import {ICloneableV2} from "rain.factory/interface/ICloneableV2.sol";
+import {IAccessControlUpgradeable as IAccessControl} from
+    "openzeppelin-contracts-upgradeable/contracts/access/IAccessControlUpgradeable.sol";
 
 contract OffchainAssetReceiptVaultAuthorizerV1Test is Test {
     function testOffchainAssetReceiptVaultAuthorizerV1IERC165(bytes4 badInterfaceId) external {
         vm.assume(badInterfaceId != type(IERC165).interfaceId);
         vm.assume(badInterfaceId != type(ICloneableV2).interfaceId);
         vm.assume(badInterfaceId != type(IAuthorizeV1).interfaceId);
+        vm.assume(badInterfaceId != type(IAccessControl).interfaceId);
 
         OffchainAssetReceiptVaultAuthorizerV1 authorizer = new OffchainAssetReceiptVaultAuthorizerV1();
         assertTrue(authorizer.supportsInterface(type(IERC165).interfaceId));
         assertTrue(authorizer.supportsInterface(type(ICloneableV2).interfaceId));
         assertTrue(authorizer.supportsInterface(type(IAuthorizeV1).interfaceId));
+        assertTrue(authorizer.supportsInterface(type(IAccessControl).interfaceId));
 
         assertFalse(authorizer.supportsInterface(badInterfaceId));
     }