Migrated to OZ v5

.solhint.json

@@ -9,6 +9,8 @@
     "func-visibility": "off",
     "max-states-count": "off",
     "not-rely-on-time": "off",
-    "compiler-version": "off"
+    "compiler-version": "off",
+    "func-name-mixedcase": "off",
+    "no-inline-assembly": "off"
   }
 }

README.md

@@ -5,13 +5,19 @@
 
 Bring Real World Assets (RWA) on-chain via flexible tokenization framework - TokenF.
 
-!["TokenF Architecture"](https://github.com/dl-tokenf/core-contracts/assets/47551140/9e912d07-bc4d-407d-bf25-859e0da40f32)
+TokenF architecture:
+
+!["TokenF Architecture"](https://github.com/user-attachments/assets/9bc70097-6fa2-4fc6-a7d2-e64298afca6c)
+
+NFTF architecture:
+
+!["NFTF Architecture"](https://github.com/user-attachments/assets/1858dcfd-0851-49c6-88ca-fa6bf317470f)
 
 Built with [Solarity](https://github.com/dl-solarity), [Openzeppelin](https://github.com/OpenZeppelin/openzeppelin-contracts), and aspiration to perfection.
 
 ## Application
 
-TokenF is an on-chain framework that enables development, management, and deployment of permissioned ERC-20-compatible assets on EVM networks. TokenF enables custom rules to be configured for RWA tokens, providing flexible KYC/AML and regulatory compliance checks for the users to abide during interaction with the smart contracts.
+TokenF is an on-chain framework that enables development, management, and deployment of permissioned ERC-20-compatible and ERC-721-compatible assets on EVM networks. TokenF enables custom rules to be configured for RWA tokens, providing flexible KYC/AML and regulatory compliance checks for the users to abide during interaction with the smart contracts.
 
 TokenF is built with certain levels of abstraction in mind: 
 
@@ -41,7 +47,7 @@ npm install @tokenf/contracts
 You will then be able to start using TokenF:
 
 ```solidity
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.21;
 
 import {TokenF} from "@tokenf/contracts/core/TokenF.sol";
 
@@ -50,6 +56,18 @@ contract EquityToken is TokenF {
 }
 ```
 
+or NFTF:
+
+```solidity
+pragma solidity ^0.8.21;
+
+import {NFTF} from "@tokenf/contracts/core/NFTF.sol";
+
+contract EquityNft is NFTF {
+    . . .
+}
+```
+
 > [!TIP]
 > Check out the `examples` directory to learn how to bring your RWA on-chain!
 

contracts/core/AgentAccessControl.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.21;
 
-import {DiamondAccessControl} from "@solarity/solidity-lib/diamond/access/access-control/DiamondAccessControl.sol";
+import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 
 import {IAgentAccessControl} from "../interfaces/IAgentAccessControl.sol";
 
@@ -16,15 +16,14 @@ import {AgentAccessControlStorage} from "./storages/AgentAccessControlStorage.so
 abstract contract AgentAccessControl is
     IAgentAccessControl,
     AgentAccessControlStorage,
-    DiamondAccessControl
+    AccessControlUpgradeable
 {
     /// @inheritdoc IAgentAccessControl
     bytes32 public constant AGENT_ROLE = keccak256("AGENT_ROLE");
 
-    function __AgentAccessControl_init()
-        internal
-        onlyInitializing(AGENT_ACCESS_CONTROL_STORAGE_SLOT)
-    {
+    function __AgentAccessControl_init() internal onlyInitializing {
+        _grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
+
         grantRole(AGENT_ROLE, msg.sender);
     }
 

contracts/core/KYCCompliance.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.21;
 
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
 import {SetHelper} from "@solarity/solidity-lib/libs/arrays/SetHelper.sol";
 
 import {IKYCCompliance} from "../interfaces/IKYCCompliance.sol";
 
+import {IAssetF} from "../interfaces/IAssetF.sol";
+
 import {AgentAccessControl} from "./AgentAccessControl.sol";
-import {TokenF} from "./TokenF.sol";
 import {KYCComplianceStorage} from "./storages/KYCComplianceStorage.sol";
 
 import {AbstractKYCModule} from "../modules/AbstractKYCModule.sol";
@@ -17,13 +18,13 @@ import {AbstractKYCModule} from "../modules/AbstractKYCModule.sol";
  * @notice The KYCCompliance contract
  *
  * The KYCCompliance is a core contract that serves as a repository for KYC modules.
- * It tracks every transfer made within the TokenF contract and disseminates its context to registered KYC modules.
+ * It tracks every transfer made within the TokenF and NFTF contracts and disseminates its context to registered KYC modules.
  */
 abstract contract KYCCompliance is IKYCCompliance, KYCComplianceStorage, AgentAccessControl {
     using EnumerableSet for EnumerableSet.AddressSet;
     using SetHelper for EnumerableSet.AddressSet;
 
-    function __KYCCompliance_init() internal onlyInitializing(KYC_COMPLIANCE_STORAGE_SLOT) {}
+    function __KYCCompliance_init() internal onlyInitializing {}
 
     /// @inheritdoc IKYCCompliance
     function addKYCModules(
@@ -40,7 +41,7 @@ abstract contract KYCCompliance is IKYCCompliance, KYCComplianceStorage, AgentAc
     }
 
     /// @inheritdoc IKYCCompliance
-    function isKYCed(TokenF.Context memory ctx_) public view virtual returns (bool) {
+    function isKYCed(IAssetF.Context memory ctx_) public view virtual returns (bool) {
         address[] memory regulatoryModules_ = getKYCModules();
 
         for (uint256 i = 0; i < regulatoryModules_.length; ++i) {