Add detectTransferRestriction for Spender and Tokenid

Author: rya-sge

src/modules/AccessControlModule.sol

@@ -0,0 +1,48 @@
+//SPDX-License-Identifier: MPL-2.0
+
+pragma solidity ^0.8.20;
+
+/* ==== OpenZeppelin === */
+import {AccessControl} from "OZ/access/AccessControl.sol";
+
+abstract contract AccessControlModule is AccessControl {
+
+
+    /* ============  Initializer Function ============ */
+    /**
+     * @dev
+     *
+     * - The grant to the admin role is done by AccessControlDefaultAdminRules
+     * - The control of the zero address is done by AccessControlDefaultAdminRules
+     *
+     */
+    function _AccessControlModule_init(address admin)
+    internal {
+        if(admin == address(0)){
+            //revert CMTAT_AccessControlModule_AddressZeroNotAllowed();
+        }
+        // we don't check the return value
+        // _grantRole attempts to grant `role` to `account` and returns a boolean indicating if `role` was granted.
+        // return false only if the admin has already the role
+        _grantRole(DEFAULT_ADMIN_ROLE, admin);
+    }
+
+
+    /*//////////////////////////////////////////////////////////////
+                            PUBLIC/EXTERNAL FUNCTIONS
+    //////////////////////////////////////////////////////////////*/
+    /** 
+     * @dev Returns `true` if `account` has been granted `role`.
+     */
+    function hasRole(
+        bytes32 role,
+        address account
+    ) public view virtual override(AccessControl) returns (bool) {
+        // The Default Admin has all roles
+        if (AccessControl.hasRole(DEFAULT_ADMIN_ROLE, account)) {
+            return true;
+        } else {
+            return AccessControl.hasRole(role, account);
+        }
+    }
+}

src/rules/interfaces/IERC7943NonFungibleCompliance.sol

@@ -21,6 +21,9 @@ interface IERC7943NonFungibleCompliance {
  */
 interface IERC7943NonFungibleComplianceExtend is IERC7943NonFungibleCompliance {
     function detectTransferRestriction(address from, address to, uint256 tokenId, uint256  amount ) external view returns(uint8 code);
-    
+    function detectTransferRestrictionFrom(address spender, address from, address to, uint256 tokenId, uint256 value)
+        external
+        view
+        returns (uint8 code);
 }
 

src/rules/validation/RuleBlacklist.sol

@@ -62,6 +62,15 @@ contract RuleBlacklist is RuleValidateTransfer, RuleAddressSet, RuleBlacklistInv
         }
     }
 
+    function detectTransferRestrictionFrom(address spender, address from, address to, uint256 /* tokenId */, uint256 value )
+        public
+        view
+        override(IERC7943NonFungibleComplianceExtend)
+        returns (uint8)
+    {
+        return detectTransferRestrictionFrom(spender, from, to, value);
+    }
+
     /**
      * @notice To know if the restriction code is valid for this rule or not.
      * @param _restrictionCode The target restriction code

src/rules/validation/RuleSanctionsList.sol

@@ -90,6 +90,15 @@ contract RuleSanctionsList is
         return uint8(REJECTED_CODE_BASE.TRANSFER_OK);
     }
 
+    function detectTransferRestrictionFrom(address spender, address from, address to, uint256 /* tokenId */, uint256 value )
+        public
+        view
+        override(IERC7943NonFungibleComplianceExtend)
+        returns (uint8)
+    {
+        return detectTransferRestrictionFrom(spender, from, to, value);
+    }
+
     /**
      * @notice To know if the restriction code is valid for this rule or not.
      * @param _restrictionCode The target restriction code

src/rules/validation/RuleWhitelist.sol

@@ -105,6 +105,15 @@ contract RuleWhitelist is RuleAddressSet, RuleWhitelistCommon, IIdentityRegistry
         return detectTransferRestriction(from, to, value);
     }
 
+    function detectTransferRestrictionFrom(address spender, address from, address to, uint256 /* tokenId */, uint256 value )
+        public
+        view
+        override(IERC7943NonFungibleComplianceExtend)
+        returns (uint8)
+    {
+        return detectTransferRestrictionFrom(spender, from, to, value);
+    }
+
     /**
      * @notice Checks whether a specific address is currently listed.
      * @param targetAddress The address to check.

src/rules/validation/RuleWhitelistWrapper.sol

@@ -9,6 +9,8 @@ import {RuleWhitelistCommon} from "./abstract/RuleWhitelistCommon.sol";
 import {RulesManagementModule} from "RuleEngine/modules/RulesManagementModule.sol";
 import {RuleEngineInvariantStorage} from "RuleEngine/modules/library/RuleEngineInvariantStorage.sol";
 import {IRule} from "RuleEngine/interfaces/IRule.sol";
+import {IERC7943NonFungibleCompliance, IERC7943NonFungibleComplianceExtend} from "../interfaces/IERC7943NonFungibleCompliance.sol";
+
 /**
  * @title Wrapper to call several different whitelist rules
  */
@@ -96,6 +98,15 @@ contract RuleWhitelistWrapper is RulesManagementModule, MetaTxModuleStandalone,
         }
     }
 
+    function detectTransferRestrictionFrom(address spender, address from, address to, uint256 /* tokenId */, uint256 value )
+        public
+        view
+        override(IERC7943NonFungibleComplianceExtend)
+        returns (uint8)
+    {
+        return detectTransferRestrictionFrom(spender, from, to, value);
+    }
+
     /* ============ ACCESS CONTROL ============ */
     /**
      * @dev Returns `true` if `account` has been granted `role`.