@evvm/testnet-contracts 2.3.0 → 3.0.1

package/contracts/nameService/NameService.sol

@@ -2,6 +2,29 @@
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
 
 pragma solidity ^0.8.0;
+
+import {
+    NameServiceError as Error
+} from "@evvm/testnet-contracts/library/errors/NameServiceError.sol";
+import {
+    NameServiceHashUtils as Hash
+} from "@evvm/testnet-contracts/library/utils/signature/NameServiceHashUtils.sol";
+import {
+    NameServiceStructs as Structs
+} from "@evvm/testnet-contracts/library/structs/NameServiceStructs.sol";
+import {
+    IdentityValidation
+} from "@evvm/testnet-contracts/contracts/nameService/lib/IdentityValidation.sol";
+
+import {Core} from "@evvm/testnet-contracts/contracts/core/Core.sol";
+
+import {
+    AdvancedStrings
+} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
+import {
+    ProposalStructs
+} from "@evvm/testnet-contracts/library/utils/governance/ProposalStructs.sol";
+
 /**
  _   _                            
 | \ | |                           
@@ -25,329 +48,260 @@ pragma solidity ^0.8.0;
    ██║   ██╔══╝  ╚════██║   ██║   ██║╚██╗██║██╔══╝     ██║   
    ██║   ███████╗███████║   ██║   ██║ ╚████║███████╗   ██║   
    ╚═╝   ╚══════╝╚══════╝   ╚═╝   ╚═╝  ╚═══╝╚══════╝   ╚═╝   
- *
- * @title EVVM Name Service Contract
+ * @title EVVM Name Service
  * @author Mate labs
- * @notice This contract manages username registration and domain name services for the EVVM ecosystem
- * @dev Provides a comprehensive domain name system with features including:
- *
- * Core Features:
- * - Username registration with pre-registration protection against front-running
- * - Custom metadata management with schema-based data storage
- * - Username trading system with offers and marketplace functionality
- * - Renewal system with dynamic pricing based on market demand
- * - Time-delayed governance for administrative functions
- *
- * Registration Process:
- * 1. Pre-register: Commit to a username hash to prevent front-running
- * 2. Register: Reveal the username and complete registration within 30 minutes
- * 3. Manage: Add custom metadata, handle offers, and renew as needed
- *
- * Security Features:
- * - Signature verification for all operations
- * - Nonce-based replay protection
- * - Time-locked administrative changes
- * - Integration with EVVM core for secure payments
- *
- * Economic Model:
- * - Registration costs 100x EVVM reward amount
- * - Custom metadata operations cost 10x EVVM reward amount
- * - Renewal pricing varies based on market demand and timing
- * - Marketplace takes 0.5% fee on username sales
+ * @notice Identity and username registration system for the EVVM ecosystem.
+ * @dev Manages username registration via a commit-reveal scheme (pre-registration), 
+ *      a secondary marketplace for domain trading, and customizable user metadata. 
+ *      Integrates with Core.sol for payment processing and uses async nonces for high throughput.
  */
 
-import {Evvm} from "@evvm/testnet-contracts/contracts/evvm/Evvm.sol";
-import {
-    AsyncNonce
-} from "@evvm/testnet-contracts/library/utils/nonces/AsyncNonce.sol";
-import {
-    NameServiceStructs
-} from "@evvm/testnet-contracts/contracts/nameService/lib/NameServiceStructs.sol";
-import {
-    AdvancedStrings
-} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
-import {
-    ErrorsLib
-} from "@evvm/testnet-contracts/contracts/nameService/lib/ErrorsLib.sol";
-import {
-    SignatureUtils
-} from "@evvm/testnet-contracts/contracts/nameService/lib/SignatureUtils.sol";
-import {
-    IdentityValidation
-} from "@evvm/testnet-contracts/contracts/nameService/lib/IdentityValidation.sol";
-
-contract NameService is AsyncNonce, NameServiceStructs {
-    /// @dev Time delay constant for accepting proposals
+contract NameService {
+    /// @dev Time delay for accepting proposals (1 day)
     uint256 constant TIME_TO_ACCEPT_PROPOSAL = 1 days;
 
-    /// @dev Amount of Principal Tokens locked in pending marketplace offers
+    /// @dev Principal Tokens locked in pending marketplace
     uint256 private principalTokenTokenLockedForWithdrawOffers;
 
-    /// @dev Nested mapping: username => offer ID => offer details
-    mapping(string username => mapping(uint256 id => OfferMetadata))
+    /// @dev Nested mapping: username => offer ID => offer
+    mapping(string username => mapping(uint256 id => Structs.OfferMetadata))
         private usernameOffers;
 
-    /// @dev Nested mapping: username => metadata key => custom value string
+    /// @dev Nested mapping: username => key => custom value
     mapping(string username => mapping(uint256 numberKey => string customValue))
         private identityCustomMetadata;
 
-    /// @dev Proposal system for token withdrawal amounts with time delay
-    UintTypeProposal amountToWithdrawTokens;
+    /// @dev Proposal system for token withdrawal with delay
+    ProposalStructs.UintTypeProposal amountToWithdrawTokens;
 
-    /// @dev Proposal system for EVVM contract address changes with time delay
-    AddressTypeProposal evvmAddress;
+    /// @dev Proposal system for Core address changes
+    ProposalStructs.AddressTypeProposal coreAddress;
 
-    /// @dev Proposal system for admin address changes with time delay
-    AddressTypeProposal admin;
+    /// @dev Proposal system for admin address changes
+    ProposalStructs.AddressTypeProposal admin;
 
-    /// @dev Mapping from username to its core metadata and registration details
-    mapping(string username => IdentityBaseMetadata basicMetadata)
+    /// @dev Mapping from username to core metadata
+    mapping(string username => Structs.IdentityBaseMetadata basicMetadata)
         private identityDetails;
 
-    /// @dev Instance of the EVVM core contract for payment processing and token operations
-    Evvm private evvm;
+    /// @dev EVVM contract for payment processing
+    Core private core;
 
-    /// @dev Restricts function access to the current admin address only
+    /// @dev Restricts function access to current admin only
     modifier onlyAdmin() {
-        if (msg.sender != admin.current) revert ErrorsLib.SenderIsNotAdmin();
+        if (msg.sender != admin.current) revert Error.SenderIsNotAdmin();
 
         _;
     }
 
+    //█ Initialization ████████████████████████████████████████████████████████████████████████
+
     /**
-     * @notice Initializes the NameService contract
-     * @dev Sets up the EVVM integration and initial admin
-     * @param _evvmAddress Address of the EVVM core contract for payment processing
-     * @param _initialOwner Address that will have admin privileges
+     * @notice Initializes the NameService with the Core contract and initial administrator.
+     * @param _coreAddress The address of the EVVM Core contract.
+     * @param _initialOwner The address granted administrative privileges.
      */
-    constructor(address _evvmAddress, address _initialOwner) {
-        evvmAddress.current = _evvmAddress;
+    constructor(address _coreAddress, address _initialOwner) {
+        coreAddress.current = _coreAddress;
         admin.current = _initialOwner;
-        evvm = Evvm(_evvmAddress);
+        core = Core(_coreAddress);
     }
 
+    //█ Registration Functions ████████████████████████████████████████████████████████████████████████
+
     /**
-     * @notice Pre-registers a username hash to prevent front-running attacks
-     * @dev Creates a temporary reservation that can be registered 30 minutes later
-     * @param user Address of the user making the pre-registration
-     * @param hashPreRegisteredUsername Keccak256 hash of username + random number
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @notice Commits a username hash to prevent front-running before registration.
+     * @dev Part of the commit-reveal scheme. Valid for 30 minutes.
+     * @param user The address of the registrant.
+     * @param hashPreRegisteredUsername The keccak256 hash of (username + secret).
+     * @param originExecutor Optional tx.origin restriction.
+     * @param nonce Async nonce for signature verification.
+     * @param signature Registrant's authorization signature.
+     * @param priorityFeePay Optional priority fee for the executor.
+     * @param noncePay Nonce for the Core payment (if fee is paid).
+     * @param signaturePay Signature for the Core payment (if fee is paid).
      */
     function preRegistrationUsername(
         address user,
         bytes32 hashPreRegisteredUsername,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForPreRegistrationUsername(
-                evvm.getEvvmID(),
-                user,
-                hashPreRegisteredUsername,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
-
-        verifyAsyncNonce(user, nonce);
-
-        if (priorityFee_EVVM > 0)
-            requestPay(
-                user,
-                0,
-                priorityFee_EVVM,
-                nonce_EVVM,
-                priorityFlag_EVVM,
-                signature_EVVM
-            );
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForPreRegistrationUsername(hashPreRegisteredUsername),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
+
+        if (priorityFeePay > 0)
+            requestPay(user, 0, priorityFeePay, noncePay, signaturePay);
 
         identityDetails[
             string.concat(
                 "@",
                 AdvancedStrings.bytes32ToString(hashPreRegisteredUsername)
             )
-        ] = IdentityBaseMetadata({
+        ] = Structs.IdentityBaseMetadata({
             owner: user,
-            expireDate: block.timestamp + 30 minutes,
+            expirationDate: block.timestamp + 30 minutes,
             customMetadataMaxSlots: 0,
             offerMaxSlots: 0,
             flagNotAUsername: 0x01
         });
 
-        markAsyncNonceAsUsed(user, nonce);
-
-        if (evvm.isAddressStaker(msg.sender))
-            makeCaPay(msg.sender, evvm.getRewardAmount() + priorityFee_EVVM);
+        if (core.isAddressStaker(msg.sender))
+            makeCaPay(msg.sender, core.getRewardAmount() + priorityFeePay);
     }
 
     /**
-     * @notice Completes username registration using a pre-registration commitment
-     * @dev Must be called after the pre-registration period (30 minutes) has reached
-     * @param user Address of the user completing the registration
-     * @param username The actual username being registered (revealed from hash)
-     * @param clowNumber Random number used in the pre-registration hash
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @notice Finalizes username registration by revealing the secret associated with a pre-registration.
+     * @dev Validates format, availability, and payment. Grants 1 year of ownership.
+     * @param user The address of the registrant.
+     * @param username The plain-text username being registered.
+     * @param lockNumber The secret used in the pre-registration hash.
+     * @param originExecutor Optional tx.origin restriction.
+     * @param nonce Async nonce for signature verification.
+     * @param signature Registrant's authorization signature.
+     * @param priorityFeePay Optional priority fee for the executor.
+     * @param noncePay Nonce for the Core payment (registration fee + priority fee).
+     * @param signaturePay Signature for the Core payment.
      */
     function registrationUsername(
         address user,
         string memory username,
-        uint256 clowNumber,
+        uint256 lockNumber,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForRegistrationUsername(
-                evvm.getEvvmID(),
-                user,
-                username,
-                clowNumber,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForRegistrationUsername(username, lockNumber),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (
             admin.current != user &&
             !IdentityValidation.isValidUsername(username)
-        ) revert ErrorsLib.InvalidUsername();
+        ) revert Error.InvalidUsername();
 
         if (!isUsernameAvailable(username))
-            revert ErrorsLib.UsernameAlreadyRegistered();
-
-        verifyAsyncNonce(user, nonce);
+            revert Error.UsernameAlreadyRegistered();
 
         requestPay(
             user,
             getPriceOfRegistration(username),
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
+            priorityFeePay,
+            noncePay,
+            signaturePay
         );
 
         string memory _key = string.concat(
             "@",
-            AdvancedStrings.bytes32ToString(hashUsername(username, clowNumber))
+            AdvancedStrings.bytes32ToString(hashUsername(username, lockNumber))
         );
 
         if (
             identityDetails[_key].owner != user ||
-            identityDetails[_key].expireDate > block.timestamp
-        ) revert ErrorsLib.PreRegistrationNotValid();
+            identityDetails[_key].expirationDate > block.timestamp
+        ) revert Error.PreRegistrationNotValid();
 
-        identityDetails[username] = IdentityBaseMetadata({
+        identityDetails[username] = Structs.IdentityBaseMetadata({
             owner: user,
-            expireDate: block.timestamp + 366 days,
+            expirationDate: block.timestamp + 366 days,
             customMetadataMaxSlots: 0,
             offerMaxSlots: 0,
             flagNotAUsername: 0x00
         });
 
-        markAsyncNonceAsUsed(user, nonce);
-
-        if (evvm.isAddressStaker(msg.sender))
+        if (core.isAddressStaker(msg.sender))
             makeCaPay(
                 msg.sender,
-                (50 * evvm.getRewardAmount()) + priorityFee_EVVM
+                (50 * core.getRewardAmount()) + priorityFeePay
             );
 
         delete identityDetails[_key];
     }
 
+    //█ Marketplace Functions ████████████████████████████████████████████████████████████████████████
+
     /**
-     * @notice Creates a marketplace offer to purchase a username
-     * @dev Locks the offer amount in the contract until withdrawn or accepted
-     * @param user Address making the offer
-     * @param username Target username for the offer
-     * @param expireDate Timestamp when the offer expires
-     * @param amount Amount being offered in Principal Tokens
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
-     * @return offerID Unique identifier for the created offer
+     * @notice Places a purchase offer on an existing username.
+     * @dev Tokens are locked in the contract. A 0.5% marketplace fee is applied upon successful sale.
+     * @param user The address of the offerer.
+     * @param username The target username.
+     * @param amount Total amount offered (including fee).
+     * @param expirationDate When the offer expires.
+     * @param originExecutor Optional tx.origin restriction.
+     * @param nonce Async nonce for signature verification.
+     * @param signature Offerer's authorization signature.
+     * @param priorityFeePay Optional priority fee for the executor.
+     * @param noncePay Nonce for the Core payment (locks tokens).
+     * @param signaturePay Signature for the Core payment.
+     * @return offerID The unique ID of the created offer.
      */
     function makeOffer(
         address user,
         string memory username,
-        uint256 expireDate,
         uint256 amount,
+        uint256 expirationDate,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external returns (uint256 offerID) {
-        if (
-            !SignatureUtils.verifyMessageSignedForMakeOffer(
-                evvm.getEvvmID(),
-                user,
-                username,
-                expireDate,
-                amount,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForMakeOffer(username, amount, expirationDate),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (
             identityDetails[username].flagNotAUsername == 0x01 ||
             !verifyIfIdentityExists(username)
-        ) revert ErrorsLib.InvalidUsername();
+        ) revert Error.InvalidUsername();
 
-        if (expireDate <= block.timestamp)
-            revert ErrorsLib.CannotBeBeforeCurrentTime();
+        if (expirationDate <= block.timestamp)
+            revert Error.CannotBeBeforeCurrentTime();
 
-        if (amount == 0) revert ErrorsLib.AmountMustBeGreaterThanZero();
+        if (amount == 0) revert Error.AmountMustBeGreaterThanZero();
 
-        verifyAsyncNonce(user, nonce);
-
-        requestPay(
-            user,
-            amount,
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
-        );
+        requestPay(user, amount, priorityFeePay, noncePay, signaturePay);
 
         while (usernameOffers[username][offerID].offerer != address(0))
             offerID++;
 
         uint256 amountToOffer = ((amount * 995) / 1000);
 
-        usernameOffers[username][offerID] = OfferMetadata({
+        usernameOffers[username][offerID] = Structs.OfferMetadata({
             offerer: user,
-            expireDate: expireDate,
+            expirationDate: expirationDate,
             amount: amountToOffer
         });
 
         makeCaPay(
             msg.sender,
-            evvm.getRewardAmount() +
+            core.getRewardAmount() +
                 ((amount * 125) / 100_000) +
-                priorityFee_EVVM
+                priorityFeePay
         );
 
         principalTokenTokenLockedForWithdrawOffers +=
@@ -359,59 +313,70 @@ contract NameService is AsyncNonce, NameServiceStructs {
         } else if (identityDetails[username].offerMaxSlots == 0) {
             identityDetails[username].offerMaxSlots++;
         }
-
-        markAsyncNonceAsUsed(user, nonce);
     }
 
     /**
-     * @notice Withdraws a marketplace offer and refunds the locked tokens
-     * @dev Can only be called by the offer creator before expiration
-     * @param user Address that made the original offer
-     * @param username Username the offer was made for
-     * @param offerID Unique identifier of the offer to withdraw
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @notice Withdraws marketplace offer and refunds tokens
+     * @dev Can only be called by offer creator or after expire
+     *
+     * Withdrawal Flow:
+     * 1. Validates offer exists and belongs to user
+     * 2. Optionally validates expiration date passed
+     * 3. Refunds locked tokens to offerer
+     * 4. Processes optional priority fee
+     * 5. Deletes offer and updates slot count
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes username + offer ID
+     * - Prevents replay attacks and double withdrawals
+     *
+     * Core.sol Integration:
+     * - Refund: offer amount via makeTransfer to offerer
+     * - Priority fee: via requestPay (if > 0)
+     * - Staker reward: 1x reward + priority fee
+     * - makeCaPay distributes to caller if staker
+     *
+     * Token Unlocking:
+     * - Decreases principalTokenTokenLockedForWithdrawOffers
+     * - Releases both offer amount and marketplace fee
+     * - Returns funds to original offerer
+     *
+     * @param user Address that made original offer
+     * @param username Username offer was made for
+     * @param offerID Unique identifier of offer to withdraw
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function withdrawOffer(
         address user,
         string memory username,
         uint256 offerID,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForWithdrawOffer(
-                evvm.getEvvmID(),
-                user,
-                username,
-                offerID,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForWithdrawOffer(username, offerID),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (usernameOffers[username][offerID].offerer != user)
-            revert ErrorsLib.UserIsNotOwnerOfOffer();
-
-        verifyAsyncNonce(user, nonce);
-
-        if (priorityFee_EVVM > 0)
-            requestPay(
-                user,
-                0,
-                priorityFee_EVVM,
-                nonce_EVVM,
-                priorityFlag_EVVM,
-                signature_EVVM
-            );
+            revert Error.UserIsNotOwnerOfOffer();
+
+        if (priorityFeePay > 0)
+            requestPay(user, 0, priorityFeePay, noncePay, signaturePay);
 
         makeCaPay(user, usernameOffers[username][offerID].amount);
 
@@ -419,72 +384,91 @@ contract NameService is AsyncNonce, NameServiceStructs {
 
         makeCaPay(
             msg.sender,
-            evvm.getRewardAmount() +
+            core.getRewardAmount() +
                 ((usernameOffers[username][offerID].amount * 1) / 796) +
-                priorityFee_EVVM
+                priorityFeePay
         );
 
         principalTokenTokenLockedForWithdrawOffers -=
             (usernameOffers[username][offerID].amount) +
             (((usernameOffers[username][offerID].amount * 1) / 199) / 4);
-
-        markAsyncNonceAsUsed(user, nonce);
     }
 
     /**
-     * @notice Accepts a marketplace offer and transfers username ownership
-     * @dev Can only be called by the current username owner before offer expiration
-     * @param user Address of the current username owner
+     * @notice Accepts marketplace offer and transfers ownership
+     * @dev Can only be called by current owner before expiration
+     *
+     * Acceptance Flow:
+     * 1. Validates user is current username owner
+     * 2. Validates offer exists and not expired
+     * 3. Transfers offer amount to seller
+     * 4. Transfers ownership to offerer
+     * 5. Processes optional priority fee
+     * 6. Deletes offer and unlocks tokens
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes username + offer ID
+     * - Prevents replay attacks and double acceptance
+     *
+     * Core.sol Integration:
+     * - Payment: offer amount via makeCaPay to seller
+     * - Priority fee: via requestPay (if > 0)
+     * - Fee Distribution:
+     *   * 99.5% to seller (locked amount)
+     *   * 0.5% + reward to staker (if applicable)
+     * - makeCaPay transfers from locked funds
+     *
+     * Ownership Transfer:
+     * - Changes identityDetails[username].owner
+     * - Preserves all metadata and expiration
+     * - Transfers all custom metadata slots
+     *
+     * Token Unlocking:
+     * - Decreases principalTokenTokenLockedForWithdrawOffers
+     * - Releases offer amount + marketplace fee
+     * - Distributes to seller and staker
+     *
+     * @param user Address of current username owner
      * @param username Username being sold
-     * @param offerID Unique identifier of the offer to accept
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @param offerID Unique identifier of offer to accept
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function acceptOffer(
         address user,
         string memory username,
         uint256 offerID,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForAcceptOffer(
-                evvm.getEvvmID(),
-                user,
-                username,
-                offerID,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForAcceptOffer(username, offerID),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (identityDetails[username].owner != user)
-            revert ErrorsLib.UserIsNotOwnerOfIdentity();
+            revert Error.UserIsNotOwnerOfIdentity();
 
         if (
             usernameOffers[username][offerID].offerer == address(0) ||
-            usernameOffers[username][offerID].expireDate < block.timestamp
-        ) revert ErrorsLib.OfferInactive();
-
-        verifyAsyncNonce(user, nonce);
-
-        if (priorityFee_EVVM > 0) {
-            requestPay(
-                user,
-                0,
-                priorityFee_EVVM,
-                nonce_EVVM,
-                priorityFlag_EVVM,
-                signature_EVVM
-            );
+            usernameOffers[username][offerID].expirationDate < block.timestamp
+        ) revert Error.OfferInactive();
+
+        if (priorityFeePay > 0) {
+            requestPay(user, 0, priorityFeePay, noncePay, signaturePay);
         }
 
         makeCaPay(user, usernameOffers[username][offerID].amount);
@@ -494,168 +478,192 @@ contract NameService is AsyncNonce, NameServiceStructs {
 
         usernameOffers[username][offerID].offerer = address(0);
 
-        if (evvm.isAddressStaker(msg.sender)) {
+        if (core.isAddressStaker(msg.sender)) {
             makeCaPay(
                 msg.sender,
-                (evvm.getRewardAmount()) +
+                (core.getRewardAmount()) +
                     (((usernameOffers[username][offerID].amount * 1) / 199) /
                         4) +
-                    priorityFee_EVVM
+                    priorityFeePay
             );
         }
 
         principalTokenTokenLockedForWithdrawOffers -=
             (usernameOffers[username][offerID].amount) +
             (((usernameOffers[username][offerID].amount * 1) / 199) / 4);
-
-        markAsyncNonceAsUsed(user, nonce);
     }
 
     /**
-     * @notice Renews a username registration for another year
-     * @dev Pricing varies based on timing and market demand for the username
+     * @notice Renews username registration for another year
+     * @dev Dynamic pricing based on timing and market demand
      *
      * Pricing Rules:
-     * - Free renewal if done within 1 year of expiration (limited time offer)
-     * - Variable cost based on highest active offer (minimum 500 Principal Token)
-     * - Fixed 500,000 Principal Token if renewed more than 1 year before expiration
-     * - Can be renewed up to 100 years in advance
+     * - Free: Renewed within grace period after expiration
+     * - Variable: Based on highest active offer (min 500 PT)
+     * - Fixed: 500,000 PT if renewed >1 year early
+     * - Can renew up to 100 years in advance
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes username only
+     * - Prevents replay attacks
+     *
+     * Core.sol Integration:
+     * - Payment: seePriceToRenew calculates cost
+     * - Paid through requestPay (locks tokens)
+     * - Staker reward: 1x reward + 50% of price + fee
+     * - makeCaPay distributes rewards
      *
-     * @param user Address of the username owner
+     * Renewal Logic:
+     * - Extends expirationDate by 366 days
+     * - Preserves ownership and all metadata
+     * - Cannot exceed 100 years (36500 days)
+     *
+     * @param user Address of username owner
      * @param username Username to renew
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function renewUsername(
         address user,
         string memory username,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForRenewUsername(
-                evvm.getEvvmID(),
-                user,
-                username,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForRenewUsername(username),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (identityDetails[username].owner != user)
-            revert ErrorsLib.UserIsNotOwnerOfIdentity();
+            revert Error.UserIsNotOwnerOfIdentity();
 
         if (identityDetails[username].flagNotAUsername == 0x01)
-            revert ErrorsLib.IdentityIsNotAUsername();
-
-        if (identityDetails[username].expireDate > block.timestamp + 36500 days)
-            revert ErrorsLib.RenewalTimeLimitExceeded();
+            revert Error.IdentityIsNotAUsername();
 
-        verifyAsyncNonce(user, nonce);
+        if (
+            identityDetails[username].expirationDate >
+            block.timestamp + 36500 days
+        ) revert Error.RenewalTimeLimitExceeded();
 
         uint256 priceOfRenew = seePriceToRenew(username);
 
         requestPay(
             user,
             priceOfRenew,
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
+            priorityFeePay,
+            noncePay,
+            signaturePay
         );
 
-        if (evvm.isAddressStaker(msg.sender)) {
+        if (core.isAddressStaker(msg.sender)) {
             makeCaPay(
                 msg.sender,
-                evvm.getRewardAmount() +
+                core.getRewardAmount() +
                     ((priceOfRenew * 50) / 100) +
-                    priorityFee_EVVM
+                    priorityFeePay
             );
         }
 
-        identityDetails[username].expireDate += 366 days;
-        markAsyncNonceAsUsed(user, nonce);
+        identityDetails[username].expirationDate += 366 days;
     }
 
+    //█ Metadata Functions ████████████████████████████████████████████████████████████████████████
+
     /**
-     * @notice Adds custom metadata to a username following a standardized schema format
-     * @dev Metadata follows format: [schema]:[subschema]>[value]
+     * @notice Adds custom metadata to username using schema format
+     * @dev Metadata format: [schema]:[subschema]>[value]
      *
      * Standard Format Examples:
      * - memberOf:>EVVM
      * - socialMedia:x>jistro (Twitter/X handle)
-     * - email:dev>jistro[at]evvm.org (development email)
-     * - email:callme>contact[at]jistro.xyz (contact email)
+     * - email:dev>jistro[at]evvm.org (dev email)
+     * - email:callme>contact[at]jistro.xyz (contact)
      *
      * Schema Guidelines:
      * - Based on https://schema.org/docs/schemas.html
      * - ':' separates schema from subschema
      * - '>' separates metadata from value
-     * - Pad with spaces if schema/subschema < 5 characters
-     * - Use "socialMedia" for social networks with network name as subschema
+     * - Pad spaces if schema/subschema < 5 chars
+     * - Use "socialMedia" for social networks
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes identity + value
+     * - Prevents replay attacks
      *
-     * @param user Address of the username owner
+     * Core.sol Integration:
+     * - Payment: 10x EVVM reward amount
+     * - Paid through requestPay (locks tokens)
+     * - Staker reward: 5x reward + priority fee
+     * - makeCaPay distributes rewards
+     *
+     * Slot Management:
+     * - Increments customMetadataMaxSlots
+     * - Each slot holds one metadata entry
+     * - No limit on number of slots
+     *
+     * @param user Address of username owner
      * @param identity Username to add metadata to
-     * @param value Metadata string following the standardized format
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @param value Metadata string following format
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function addCustomMetadata(
         address user,
         string memory identity,
         string memory value,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForAddCustomMetadata(
-                evvm.getEvvmID(),
-                user,
-                identity,
-                value,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForAddCustomMetadata(identity, value),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (identityDetails[identity].owner != user)
-            revert ErrorsLib.UserIsNotOwnerOfIdentity();
+            revert Error.UserIsNotOwnerOfIdentity();
 
-        if (bytes(value).length == 0) revert ErrorsLib.EmptyCustomMetadata();
-
-        verifyAsyncNonce(user, nonce);
+        if (bytes(value).length == 0) revert Error.EmptyCustomMetadata();
 
         requestPay(
             user,
             getPriceToAddCustomMetadata(),
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
+            priorityFeePay,
+            noncePay,
+            signaturePay
         );
 
-        if (evvm.isAddressStaker(msg.sender)) {
+        if (core.isAddressStaker(msg.sender)) {
             makeCaPay(
                 msg.sender,
-                (5 * evvm.getRewardAmount()) +
+                (5 * core.getRewardAmount()) +
                     ((getPriceToAddCustomMetadata() * 50) / 100) +
-                    priorityFee_EVVM
+                    priorityFeePay
             );
         }
 
@@ -664,59 +672,77 @@ contract NameService is AsyncNonce, NameServiceStructs {
         ] = value;
 
         identityDetails[identity].customMetadataMaxSlots++;
-        markAsyncNonceAsUsed(user, nonce);
     }
 
     /**
-     * @notice Removes a specific custom metadata entry by key and reorders the array
-     * @dev Shifts all subsequent metadata entries to fill the gap after removal
-     * @param user Address of the username owner
+     * @notice Removes specific custom metadata entry by key
+     * @dev Shifts all subsequent entries to fill gap
+     *
+     * Removal Process:
+     * 1. Validates user owns username
+     * 2. Validates key exists in metadata slots
+     * 3. Deletes entry at key position
+     * 4. Shifts all entries after key down by 1
+     * 5. Decrements customMetadataMaxSlots
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes identity + key
+     * - Prevents replay attacks
+     *
+     * Core.sol Integration:
+     * - Payment: 10x EVVM reward amount
+     * - Paid through requestPay (locks tokens)
+     * - Staker reward: 5x reward + priority fee
+     * - makeCaPay distributes rewards
+     *
+     * Array Reordering:
+     * - Shifts entries from key+1 to maxSlots
+     * - Maintains continuous slot indexing
+     * - No gaps in metadata array
+     *
+     * @param user Address of username owner
      * @param identity Username to remove metadata from
-     * @param key Index of the metadata entry to remove
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @param key Index of metadata entry to remove
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function removeCustomMetadata(
         address user,
         string memory identity,
         uint256 key,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForRemoveCustomMetadata(
-                evvm.getEvvmID(),
-                user,
-                identity,
-                key,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForRemoveCustomMetadata(identity, key),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (identityDetails[identity].owner != user)
-            revert ErrorsLib.UserIsNotOwnerOfIdentity();
+            revert Error.UserIsNotOwnerOfIdentity();
 
         if (identityDetails[identity].customMetadataMaxSlots <= key)
-            revert ErrorsLib.InvalidKey();
-
-        verifyAsyncNonce(user, nonce);
+            revert Error.InvalidKey();
 
         requestPay(
             user,
             getPriceToRemoveCustomMetadata(),
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
+            priorityFeePay,
+            noncePay,
+            signaturePay
         );
 
         if (identityDetails[identity].customMetadataMaxSlots == key) {
@@ -738,62 +764,81 @@ contract NameService is AsyncNonce, NameServiceStructs {
 
         identityDetails[identity].customMetadataMaxSlots--;
 
-        markAsyncNonceAsUsed(user, nonce);
-
-        if (evvm.isAddressStaker(msg.sender))
+        if (core.isAddressStaker(msg.sender))
             makeCaPay(
                 msg.sender,
-                (5 * evvm.getRewardAmount()) + priorityFee_EVVM
+                (5 * core.getRewardAmount()) + priorityFeePay
             );
     }
 
     /**
-     * @notice Removes all custom metadata entries for a username
-     * @dev More gas-efficient than removing entries individually
-     * @param user Address of the username owner
+     * @notice Removes all custom metadata entries for username
+     * @dev More gas-efficient than removing individually
+     *
+     * Flush Process:
+     * 1. Validates user owns username
+     * 2. Validates metadata slots exist (not empty)
+     * 3. Calculates cost based on slot count
+     * 4. Deletes all metadata entries in loop
+     * 5. Resets customMetadataMaxSlots to 0
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes identity only
+     * - Prevents replay attacks
+     *
+     * Core.sol Integration:
+     * - Payment: getPriceToFlushCustomMetadata (per slot)
+     * - Cost: 10x EVVM reward per metadata entry
+     * - Paid through requestPay (locks tokens)
+     * - Staker reward: 5x reward per slot + priority
+     * - makeCaPay distributes batch rewards
+     *
+     * Efficiency:
+     * - Single transaction for all metadata
+     * - Batch pricing for multiple entries
+     * - Cheaper than calling removeCustomMetadata N times
+     *
+     * @param user Address of username owner
      * @param identity Username to flush all metadata from
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function flushCustomMetadata(
         address user,
         string memory identity,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForFlushCustomMetadata(
-                evvm.getEvvmID(),
-                user,
-                identity,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForFlushCustomMetadata(identity),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (identityDetails[identity].owner != user)
-            revert ErrorsLib.UserIsNotOwnerOfIdentity();
+            revert Error.UserIsNotOwnerOfIdentity();
 
         if (identityDetails[identity].customMetadataMaxSlots == 0)
-            revert ErrorsLib.EmptyCustomMetadata();
-
-        verifyAsyncNonce(user, nonce);
+            revert Error.EmptyCustomMetadata();
 
         requestPay(
             user,
             getPriceToFlushCustomMetadata(identity),
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
+            priorityFeePay,
+            noncePay,
+            signaturePay
         );
 
         for (
@@ -804,69 +849,96 @@ contract NameService is AsyncNonce, NameServiceStructs {
             delete identityCustomMetadata[identity][i];
         }
 
-        if (evvm.isAddressStaker(msg.sender)) {
+        if (core.isAddressStaker(msg.sender)) {
             makeCaPay(
                 msg.sender,
-                ((5 * evvm.getRewardAmount()) *
+                ((5 * core.getRewardAmount()) *
                     identityDetails[identity].customMetadataMaxSlots) +
-                    priorityFee_EVVM
+                    priorityFeePay
             );
         }
 
         identityDetails[identity].customMetadataMaxSlots = 0;
-        markAsyncNonceAsUsed(user, nonce);
     }
 
     /**
-     * @notice Completely removes a username registration and all associated data
-     * @dev Deletes the username, all custom metadata, and makes it available for re-registration
-     * @param user Address of the username owner
-     * @param username Username to completely remove from the system
-     * @param nonce Unique nonce to prevent replay attacks
-     * @param signature Signature proving authorization for this operation
-     * @param priorityFee_EVVM Priority fee for faster transaction processing
-     * @param nonce_EVVM Nonce for the EVVM payment transaction
-     * @param priorityFlag_EVVM True for async payment, false for sync payment
-     * @param signature_EVVM Signature for the EVVM payment transaction
+     * @notice Completely removes username and all data
+     * @dev Deletes username, metadata, makes available for
+     * re-registration
+     *
+     * Flush Process:
+     * 1. Validates user owns username
+     * 2. Validates not expired (must be active)
+     * 3. Validates is actual username (not temp hash)
+     * 4. Calculates cost based on metadata + username
+     * 5. Deletes all metadata entries
+     * 6. Resets username to default state
+     * 7. Preserves offerMaxSlots history
+     *
+     * Core.sol Integration:
+     * - Validates signature with State.validateAndConsumeNonce
+     * - Uses async nonce (isAsyncExec = true)
+     * - Hash includes username only
+     * - Prevents replay attacks
+     *
+     * Core.sol Integration:
+     * - Payment: getPriceToFlushUsername
+     * - Cost: Base + (10x reward per metadata slot)
+     * - Paid through requestPay (locks tokens)
+     * - Staker reward: 5x reward per slot + priority
+     * - makeCaPay distributes to caller
+     *
+     * Cleanup:
+     * - Deletes all custom metadata slots
+     * - Sets owner to address(0)
+     * - Sets expirationDate to 0
+     * - Resets customMetadataMaxSlots to 0
+     * - Keeps offerMaxSlots for history
+     * - Sets flagNotAUsername to 0x00
+     * - Username becomes available for re-registration
+     *
+     * @param user Address of username owner
+     * @param username Username to completely remove
+     * @param nonce Async nonce for replay protection
+     * @param signature Signature for Core.sol validation
+     * @param priorityFeePay Priority fee for faster processing
+     * @param noncePay Nonce for EVVM payment transaction
+     * @param signaturePay Signature for EVVM payment
      */
     function flushUsername(
         address user,
         string memory username,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external {
-        if (
-            !SignatureUtils.verifyMessageSignedForFlushUsername(
-                evvm.getEvvmID(),
-                user,
-                username,
-                nonce,
-                signature
-            )
-        ) revert ErrorsLib.InvalidSignatureOnNameService();
+        core.validateAndConsumeNonce(
+            user,
+            Hash.hashDataForFlushUsername(username),
+            originExecutor,
+            nonce,
+            true,
+            signature
+        );
 
         if (identityDetails[username].owner != user)
-            revert ErrorsLib.UserIsNotOwnerOfIdentity();
+            revert Error.UserIsNotOwnerOfIdentity();
 
-        if (block.timestamp >= identityDetails[username].expireDate)
-            revert ErrorsLib.OwnershipExpired();
+        if (block.timestamp >= identityDetails[username].expirationDate)
+            revert Error.OwnershipExpired();
 
         if (identityDetails[username].flagNotAUsername == 0x01)
-            revert ErrorsLib.IdentityIsNotAUsername();
-
-        verifyAsyncNonce(user, nonce);
+            revert Error.IdentityIsNotAUsername();
 
         requestPay(
             user,
             getPriceToFlushUsername(username),
-            priorityFee_EVVM,
-            nonce_EVVM,
-            priorityFlag_EVVM,
-            signature_EVVM
+            priorityFeePay,
+            noncePay,
+            signaturePay
         );
 
         for (
@@ -879,31 +951,30 @@ contract NameService is AsyncNonce, NameServiceStructs {
 
         makeCaPay(
             msg.sender,
-            ((5 * evvm.getRewardAmount()) *
+            ((5 * core.getRewardAmount()) *
                 identityDetails[username].customMetadataMaxSlots) +
-                priorityFee_EVVM
+                priorityFeePay
         );
 
-        identityDetails[username] = IdentityBaseMetadata({
+        identityDetails[username] = Structs.IdentityBaseMetadata({
             owner: address(0),
-            expireDate: 0,
+            expirationDate: 0,
             customMetadataMaxSlots: 0,
             offerMaxSlots: identityDetails[username].offerMaxSlots,
             flagNotAUsername: 0x00
         });
-        markAsyncNonceAsUsed(user, nonce);
     }
 
-    //█ Administrative Functions with Time-Delayed Governance ████████████████████████████████████
+    //█ Administrative Functions ████████████████████████████████████████████████████████████████████████
 
     /**
-     * @notice Proposes a new admin address with 1-day time delay
-     * @dev Part of the time-delayed governance system for admin changes
+     * @notice Proposes new admin address with 1-day delay
+     * @dev Time-delayed governance system for admin changes
      * @param _adminToPropose Address of the proposed new admin
      */
     function proposeAdmin(address _adminToPropose) public onlyAdmin {
         if (_adminToPropose == address(0) || _adminToPropose == admin.current)
-            revert ErrorsLib.InvalidAdminProposal();
+            revert Error.InvalidAdminProposal();
 
         admin.proposal = _adminToPropose;
         admin.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
@@ -924,12 +995,12 @@ contract NameService is AsyncNonce, NameServiceStructs {
      */
     function acceptProposeAdmin() public {
         if (admin.proposal != msg.sender)
-            revert ErrorsLib.SenderIsNotProposedAdmin();
+            revert Error.SenderIsNotProposedAdmin();
 
         if (block.timestamp < admin.timeToAccept)
-            revert ErrorsLib.LockTimeNotExpired();
+            revert Error.LockTimeNotExpired();
 
-        admin = AddressTypeProposal({
+        admin = ProposalStructs.AddressTypeProposal({
             current: admin.proposal,
             proposal: address(0),
             timeToAccept: 0
@@ -943,14 +1014,14 @@ contract NameService is AsyncNonce, NameServiceStructs {
      */
     function proposeWithdrawPrincipalTokens(uint256 _amount) public onlyAdmin {
         if (
-            evvm.getBalance(address(this), evvm.getPrincipalTokenAddress()) -
+            core.getBalance(address(this), core.getPrincipalTokenAddress()) -
                 (5083 +
-                    evvm.getRewardAmount() +
+                    core.getRewardAmount() +
                     principalTokenTokenLockedForWithdrawOffers) <
             _amount ||
             _amount == 0
         ) {
-            revert ErrorsLib.InvalidWithdrawAmount();
+            revert Error.InvalidWithdrawAmount();
         }
 
         amountToWithdrawTokens.proposal = _amount;
@@ -974,7 +1045,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
      */
     function claimWithdrawPrincipalTokens() public onlyAdmin {
         if (block.timestamp < amountToWithdrawTokens.timeToAccept)
-            revert ErrorsLib.LockTimeNotExpired();
+            revert Error.LockTimeNotExpired();
 
         makeCaPay(admin.current, amountToWithdrawTokens.proposal);
 
@@ -990,11 +1061,10 @@ contract NameService is AsyncNonce, NameServiceStructs {
     function proposeChangeEvvmAddress(
         address _newEvvmAddress
     ) public onlyAdmin {
-        if (_newEvvmAddress == address(0))
-            revert ErrorsLib.InvalidEvvmAddress();
+        if (_newEvvmAddress == address(0)) revert Error.InvalidEvvmAddress();
 
-        evvmAddress.proposal = _newEvvmAddress;
-        evvmAddress.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
+        coreAddress.proposal = _newEvvmAddress;
+        coreAddress.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -1002,8 +1072,8 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @dev Only the current admin can cancel pending proposals
      */
     function cancelChangeEvvmAddress() public onlyAdmin {
-        evvmAddress.proposal = address(0);
-        evvmAddress.timeToAccept = 0;
+        coreAddress.proposal = address(0);
+        coreAddress.timeToAccept = 0;
     }
 
     /**
@@ -1011,16 +1081,16 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @dev Can only be called after the time delay has passed
      */
     function acceptChangeEvvmAddress() public onlyAdmin {
-        if (block.timestamp < evvmAddress.timeToAccept)
-            revert ErrorsLib.LockTimeNotExpired();
+        if (block.timestamp < coreAddress.timeToAccept)
+            revert Error.LockTimeNotExpired();
 
-        evvmAddress = AddressTypeProposal({
-            current: evvmAddress.proposal,
+        coreAddress = ProposalStructs.AddressTypeProposal({
+            current: coreAddress.proposal,
             proposal: address(0),
             timeToAccept: 0
         });
 
-        evvm = Evvm(evvmAddress.current);
+        core = Core(coreAddress.current);
     }
 
     //█ Utility Functions ████████████████████████████████████████████████████████████████████████
@@ -1034,27 +1104,26 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @param amount Amount to pay in Principal Tokens
      * @param priorityFee Additional priority fee for faster processing
      * @param nonce Nonce for the EVVM transaction
-     * @param priorityFlag True for async payment, false for sync payment
      * @param signature Signature authorizing the payment
+     * @dev all evvm nonce execution are async (true)
      */
     function requestPay(
         address user,
         uint256 amount,
         uint256 priorityFee,
         uint256 nonce,
-        bool priorityFlag,
         bytes memory signature
     ) internal {
-        evvm.pay(
+        core.pay(
             user,
             address(this),
             "",
-            evvm.getPrincipalTokenAddress(),
+            core.getPrincipalTokenAddress(),
             amount,
             priorityFee,
-            nonce,
-            priorityFlag,
             address(this),
+            nonce,
+            true,
             signature
         );
     }
@@ -1066,7 +1135,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @param amount Amount of Principal Tokens to distribute
      */
     function makeCaPay(address user, uint256 amount) internal {
-        evvm.caPay(user, evvm.getPrincipalTokenAddress(), amount);
+        core.caPay(user, core.getPrincipalTokenAddress(), amount);
     }
 
     //█ Username Hashing Functions ███████████████████████████████████████████████████████████████████
@@ -1101,14 +1170,14 @@ contract NameService is AsyncNonce, NameServiceStructs {
         if (identityDetails[_identity].flagNotAUsername == 0x01) {
             if (
                 identityDetails[_identity].owner == address(0) ||
-                identityDetails[_identity].expireDate != 0
+                identityDetails[_identity].expirationDate != 0
             ) {
                 return false;
             } else {
                 return true;
             }
         } else {
-            if (identityDetails[_identity].expireDate == 0) {
+            if (identityDetails[_identity].expirationDate == 0) {
                 return false;
             } else {
                 return true;
@@ -1128,14 +1197,14 @@ contract NameService is AsyncNonce, NameServiceStructs {
         if (identityDetails[_username].flagNotAUsername == 0x01) {
             if (
                 identityDetails[_username].owner == address(0) ||
-                identityDetails[_username].expireDate != 0
+                identityDetails[_username].expirationDate != 0
             ) {
                 revert();
             } else {
                 return true;
             }
         } else {
-            if (identityDetails[_username].expireDate == 0) {
+            if (identityDetails[_username].expirationDate == 0) {
                 revert();
             } else {
                 return true;
@@ -1164,9 +1233,8 @@ contract NameService is AsyncNonce, NameServiceStructs {
     function verifyStrictAndGetOwnerOfIdentity(
         string memory _username
     ) public view returns (address answer) {
-        if (strictVerifyIfIdentityExist(_username)) {
+        if (strictVerifyIfIdentityExist(_username))
             answer = identityDetails[_username].owner;
-        }
     }
 
     /**
@@ -1181,15 +1249,15 @@ contract NameService is AsyncNonce, NameServiceStructs {
     function seePriceToRenew(
         string memory _identity
     ) public view returns (uint256 price) {
-        if (identityDetails[_identity].expireDate >= block.timestamp) {
-            if (usernameOffers[_identity][0].expireDate != 0) {
+        if (identityDetails[_identity].expirationDate >= block.timestamp) {
+            if (usernameOffers[_identity][0].expirationDate != 0) {
                 for (
                     uint256 i = 0;
                     i < identityDetails[_identity].offerMaxSlots;
                     i++
                 ) {
                     if (
-                        usernameOffers[_identity][i].expireDate >
+                        usernameOffers[_identity][i].expirationDate >
                         block.timestamp &&
                         usernameOffers[_identity][i].offerer != address(0)
                     ) {
@@ -1202,14 +1270,14 @@ contract NameService is AsyncNonce, NameServiceStructs {
             if (price == 0) {
                 price = 500 * 10 ** 18;
             } else {
-                uint256 principalTokenReward = evvm.getRewardAmount();
-                
+                uint256 principalTokenReward = core.getRewardAmount();
+
                 price = ((price * 5) / 1000) > (500000 * principalTokenReward)
                     ? (500000 * principalTokenReward)
                     : ((price * 5) / 1000);
             }
         } else {
-            price = 500_000 * evvm.getRewardAmount();
+            price = 500_000 * core.getRewardAmount();
         }
     }
 
@@ -1219,7 +1287,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @return price Cost in Principal Tokens (10x current reward amount)
      */
     function getPriceToAddCustomMetadata() public view returns (uint256 price) {
-        price = 10 * evvm.getRewardAmount();
+        price = 10 * core.getRewardAmount();
     }
 
     /**
@@ -1232,7 +1300,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
         view
         returns (uint256 price)
     {
-        price = 10 * evvm.getRewardAmount();
+        price = 10 * core.getRewardAmount();
     }
 
     /**
@@ -1245,7 +1313,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
         string memory _identity
     ) public view returns (uint256 price) {
         price =
-            (10 * evvm.getRewardAmount()) *
+            (10 * core.getRewardAmount()) *
             identityDetails[_identity].customMetadataMaxSlots;
     }
 
@@ -1259,9 +1327,9 @@ contract NameService is AsyncNonce, NameServiceStructs {
         string memory _identity
     ) public view returns (uint256 price) {
         price =
-            ((10 * evvm.getRewardAmount()) *
+            ((10 * core.getRewardAmount()) *
                 identityDetails[_identity].customMetadataMaxSlots) +
-            evvm.getRewardAmount();
+            core.getRewardAmount();
     }
 
     //█ Identity Availability Functions ██████████████████████████████████████████████████████████████
@@ -1275,11 +1343,11 @@ contract NameService is AsyncNonce, NameServiceStructs {
     function isUsernameAvailable(
         string memory _username
     ) public view returns (bool) {
-        if (identityDetails[_username].expireDate == 0) {
+        if (identityDetails[_username].expirationDate == 0) {
             return true;
         } else {
             return
-                identityDetails[_username].expireDate + 60 days <
+                identityDetails[_username].expirationDate + 60 days <
                 block.timestamp;
         }
     }
@@ -1295,7 +1363,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
     ) public view returns (address, uint256) {
         return (
             identityDetails[_username].owner,
-            identityDetails[_username].expireDate
+            identityDetails[_username].expirationDate
         );
     }
 
@@ -1369,8 +1437,10 @@ contract NameService is AsyncNonce, NameServiceStructs {
      */
     function getOffersOfUsername(
         string memory _username
-    ) public view returns (OfferMetadata[] memory offers) {
-        offers = new OfferMetadata[](identityDetails[_username].offerMaxSlots);
+    ) public view returns (Structs.OfferMetadata[] memory offers) {
+        offers = new Structs.OfferMetadata[](
+            identityDetails[_username].offerMaxSlots
+        );
 
         for (uint256 i = 0; i < identityDetails[_username].offerMaxSlots; i++) {
             offers[i] = usernameOffers[_username][i];
@@ -1387,7 +1457,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
     function getSingleOfferOfUsername(
         string memory _username,
         uint256 _offerID
-    ) public view returns (OfferMetadata memory offer) {
+    ) public view returns (Structs.OfferMetadata memory offer) {
         return usernameOffers[_username][_offerID];
     }
 
@@ -1402,7 +1472,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
     ) public view returns (uint256 length) {
         do {
             length++;
-        } while (usernameOffers[_username][length].expireDate != 0);
+        } while (usernameOffers[_username][length].expirationDate != 0);
     }
 
     /**
@@ -1414,7 +1484,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
     function getExpireDateOfIdentity(
         string memory _identity
     ) public view returns (uint256) {
-        return identityDetails[_identity].expireDate;
+        return identityDetails[_identity].expirationDate;
     }
 
     /**
@@ -1431,7 +1501,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
         return
             identityDetails[username].offerMaxSlots > 0
                 ? seePriceToRenew(username)
-                : evvm.getRewardAmount() * 100;
+                : core.getRewardAmount() * 100;
     }
 
     //█ Administrative Getters ███████████████████████████████████████████████████████████████████████
@@ -1490,7 +1560,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @return Unique EvvmID string
      */
     function getEvvmID() external view returns (uint256) {
-        return evvm.getEvvmID();
+        return core.getEvvmID();
     }
 
     /**
@@ -1498,8 +1568,8 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @dev Returns the address of the EVVM contract used for payment processing
      * @return The current EVVM contract address
      */
-    function getEvvmAddress() public view returns (address) {
-        return evvmAddress.current;
+    function getCoreAddress() public view returns (address) {
+        return coreAddress.current;
     }
 
     /**
@@ -1509,7 +1579,7 @@ contract NameService is AsyncNonce, NameServiceStructs {
      * @return proposalEvvmAddress Proposed new EVVM address (if any)
      * @return timeToAcceptEvvmAddress Timestamp when proposal can be accepted
      */
-    function getEvvmAddressFullDetails()
+    function getCoreAddressFullDetails()
         public
         view
         returns (
@@ -1519,9 +1589,9 @@ contract NameService is AsyncNonce, NameServiceStructs {
         )
     {
         return (
-            evvmAddress.current,
-            evvmAddress.proposal,
-            evvmAddress.timeToAccept
+            coreAddress.current,
+            coreAddress.proposal,
+            coreAddress.timeToAccept
         );
     }
 }