@evvm/testnet-contracts 2.0.2 → 2.0.4

package/contracts/nameService/NameService.sol

@@ -299,7 +299,7 @@ contract NameService {
 
         makePay(
             user,
-            getPricePerRegistration(),
+            getPriceOfRegistration(username),
             priorityFee_EVVM,
             nonce_EVVM,
             priorityFlag_EVVM,
@@ -1659,12 +1659,20 @@ contract NameService {
     }
 
     /**
-     * @notice Gets the current price for registering a new username
-     * @dev Price is dynamic and based on current EVVM reward amount (100x reward)
+     * @notice Gets price to register an username
+     * @dev Price is fully dynamic based on existing offers and timing
+     *      - If dosnt have offers, price is 100x current EVVM reward amount
+     *      - If has offers, price is calculated via seePriceToRenew function
+     * @param username The username to get registration price for
      * @return The current registration price in Principal Tokens
      */
-    function getPricePerRegistration() public view returns (uint256) {
-        return Evvm(evvmAddress.current).getRewardAmount() * 100;
+    function getPriceOfRegistration(
+        string memory username
+    ) public view returns (uint256) {
+        return
+            identityDetails[username].offerMaxSlots > 0
+                ? seePriceToRenew(username)
+                : Evvm(evvmAddress.current).getRewardAmount() * 100;
     }
 
     //█ Administrative Getters ███████████████████████████████████████████████████████████████████████

package/interfaces/INameService.sol

@@ -1,9 +1,7 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.4;
 
-pragma solidity ^0.8.0;
-
-interface INameService {
+interface NameService {
     struct OfferMetadata {
         address offerer;
         uint256 expireDate;
@@ -25,7 +23,6 @@ interface INameService {
     error UsernameAlreadyRegistered();
 
     function acceptChangeEvvmAddress() external;
-
     function acceptOffer(
         address user,
         string memory username,
@@ -37,9 +34,7 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function acceptProposeAdmin() external;
-
     function addCustomMetadata(
         address user,
         string memory identity,
@@ -51,20 +46,14 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function cancelChangeEvvmAddress() external;
-
     function cancelProposeAdmin() external;
-
     function cancelWithdrawPrincipalTokens() external;
-
     function checkIfNameServiceNonceIsAvailable(
         address _user,
         uint256 _nonce
     ) external view returns (bool);
-
     function claimWithdrawPrincipalTokens() external;
-
     function flushCustomMetadata(
         address user,
         string memory identity,
@@ -75,7 +64,6 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function flushUsername(
         address user,
         string memory username,
@@ -86,9 +74,7 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function getAdmin() external view returns (address);
-
     function getAdminFullDetails()
         external
         view
@@ -97,17 +83,13 @@ interface INameService {
             address proposalAdmin,
             uint256 timeToAcceptAdmin
         );
-
     function getAmountOfCustomMetadata(
         string memory _username
     ) external view returns (uint256);
-
     function getCustomMetadataMaxSlotsOfIdentity(
         string memory _username
     ) external view returns (uint256);
-
     function getEvvmAddress() external view returns (address);
-
     function getEvvmAddressFullDetails()
         external
         view
@@ -116,51 +98,41 @@ interface INameService {
             address proposalEvvmAddress,
             uint256 timeToAcceptEvvmAddress
         );
-
     function getExpireDateOfIdentity(
         string memory _identity
     ) external view returns (uint256);
-
     function getFullCustomMetadataOfIdentity(
         string memory _username
     ) external view returns (string[] memory);
-
     function getIdentityBasicMetadata(
         string memory _username
     ) external view returns (address, uint256);
-
     function getLengthOfOffersUsername(
         string memory _username
     ) external view returns (uint256 length);
-
     function getOffersOfUsername(
         string memory _username
     ) external view returns (OfferMetadata[] memory offers);
-
     function getOwnerOfIdentity(
         string memory _username
     ) external view returns (address);
-
-    function getPricePerRegistration() external view returns (uint256);
-
+    function getPriceOfRegistration(
+        string memory username
+    ) external view returns (uint256);
     function getPriceToAddCustomMetadata()
         external
         view
         returns (uint256 price);
-
     function getPriceToFlushCustomMetadata(
         string memory _identity
     ) external view returns (uint256 price);
-
     function getPriceToFlushUsername(
         string memory _identity
     ) external view returns (uint256 price);
-
     function getPriceToRemoveCustomMetadata()
         external
         view
         returns (uint256 price);
-
     function getProposedWithdrawAmountFullDetails()
         external
         view
@@ -168,26 +140,21 @@ interface INameService {
             uint256 proposalAmountToWithdrawTokens,
             uint256 timeToAcceptAmountToWithdrawTokens
         );
-
     function getSingleCustomMetadataOfIdentity(
         string memory _username,
         uint256 _key
     ) external view returns (string memory);
-
     function getSingleOfferOfUsername(
         string memory _username,
         uint256 _offerID
     ) external view returns (OfferMetadata memory offer);
-
     function hashUsername(
         string memory _username,
         uint256 _randomNumber
     ) external pure returns (bytes32);
-
     function isUsernameAvailable(
         string memory _username
     ) external view returns (bool);
-
     function makeOffer(
         address user,
         string memory username,
@@ -200,7 +167,6 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external returns (uint256 offerID);
-
     function preRegistrationUsername(
         address user,
         bytes32 hashPreRegisteredUsername,
@@ -211,13 +177,9 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function proposeAdmin(address _adminToPropose) external;
-
     function proposeChangeEvvmAddress(address _newEvvmAddress) external;
-
     function proposeWithdrawPrincipalTokens(uint256 _amount) external;
-
     function registrationUsername(
         address user,
         string memory username,
@@ -229,7 +191,6 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function removeCustomMetadata(
         address user,
         string memory identity,
@@ -241,7 +202,6 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function renewUsername(
         address user,
         string memory username,
@@ -252,23 +212,18 @@ interface INameService {
         bool priorityFlag_EVVM,
         bytes memory signature_EVVM
     ) external;
-
     function seePriceToRenew(
         string memory _identity
     ) external view returns (uint256 price);
-
     function strictVerifyIfIdentityExist(
         string memory _username
     ) external view returns (bool);
-
     function verifyIfIdentityExists(
         string memory _identity
     ) external view returns (bool);
-
     function verifyStrictAndGetOwnerOfIdentity(
         string memory _username
     ) external view returns (address answer);
-
     function withdrawOffer(
         address user,
         string memory username,

package/library/StakingServiceHooks.sol

@@ -59,7 +59,7 @@ abstract contract StakingServiceHooks {
      * @dev CRITICAL: This function ensures atomicity - if any step fails, the entire transaction reverts
      *      preventing the loss of Principal Tokens that could occur with manual step-by-step execution
      */
-    function makeStakeService(uint256 amountToStake) internal {
+    function _makeStakeService(uint256 amountToStake) internal {
         Staking(stakingHookAddress).prepareServiceStaking(amountToStake);
         Evvm(evvmHookAddress).caPay(
             address(stakingHookAddress),
@@ -84,7 +84,7 @@ abstract contract StakingServiceHooks {
      * 
      * @dev Unstaking is subject to the same time locks as regular user unstaking
      */
-    function makeUnstakeService(uint256 amountToUnstake) internal {
+    function _makeUnstakeService(uint256 amountToUnstake) internal {
         Staking(stakingHookAddress).serviceUnstaking(amountToUnstake);
     }
 
@@ -110,7 +110,7 @@ abstract contract StakingServiceHooks {
      *      is upgraded but the staking contract remains the same. In most cases, prefer
      *      using _changeStakingHookAddress which updates both addresses automatically.
      */
-    function changeEvvmHookAddress(address newEvvmAddress) internal {
+    function _changeEvvmHookAddress(address newEvvmAddress) internal {
         evvmHookAddress = newEvvmAddress;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evvm/testnet-contracts",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "EVVM Testnet Contracts - Smart contracts and tools for scalable, modular, and cross-chain EVM virtualization",
   "files": [
     "contracts/**/*.sol",