@evvm/testnet-contracts 2.1.3 → 2.2.0

package/contracts/evvm/Evvm.sol

@@ -77,7 +77,7 @@ import {NameService} from "@evvm/testnet-contracts/contracts/nameService/NameSer
 import {EvvmStorage} from "@evvm/testnet-contracts/contracts/evvm/lib/EvvmStorage.sol";
 import {ErrorsLib} from "@evvm/testnet-contracts/contracts/evvm/lib/ErrorsLib.sol";
 import {SignatureUtils} from "@evvm/testnet-contracts/contracts/evvm/lib/SignatureUtils.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 
 contract Evvm is EvvmStorage {
     /**
@@ -145,6 +145,8 @@ contract Evvm is EvvmStorage {
         address _stakingContractAddress,
         EvvmMetadata memory _evvmMetadata
     ) {
+        evvmMetadata = _evvmMetadata;
+        
         stakingContractAddress = _stakingContractAddress;
 
         admin.current = _initialOwner;
@@ -157,7 +159,7 @@ contract Evvm is EvvmStorage {
 
         breakerSetupNameServiceAddress = FLAG_IS_STAKER;
 
-        evvmMetadata = _evvmMetadata;
+        
     }
 
     /**
@@ -209,14 +211,14 @@ contract Evvm is EvvmStorage {
      * @dev Allows the admin to change the EVVM ID within a 1-day window after deployment
      */
     function setEvvmID(uint256 newEvvmID) external onlyAdmin {
-        if (newEvvmID == 0) {
+        if (evvmMetadata.EvvmID != 0) {
             if (block.timestamp > windowTimeToChangeEvvmID)
                 revert ErrorsLib.WindowToChangeEvvmIDExpired();
         }
 
         evvmMetadata.EvvmID = newEvvmID;
 
-        windowTimeToChangeEvvmID = block.timestamp + 1 minutes;
+        windowTimeToChangeEvvmID = block.timestamp + 24 hours;
     }
 
     /**
@@ -380,7 +382,7 @@ contract Evvm is EvvmStorage {
         if (priorityFlag && asyncUsedNonce[from][nonce])
             revert ErrorsLib.InvalidAsyncNonce();
 
-        address to = !Strings.equal(to_identity, "")
+        address to = !AdvancedStrings.equal(to_identity, "")
             ? NameService(nameServiceAddress).verifyStrictAndGetOwnerOfIdentity(
                 to_identity
             )
@@ -501,7 +503,7 @@ contract Evvm is EvvmStorage {
                 }
             }
 
-            to_aux = !Strings.equal(payData[iteration].to_identity, "")
+            to_aux = !AdvancedStrings.equal(payData[iteration].to_identity, "")
                 ? NameService(nameServiceAddress)
                     .verifyStrictAndGetOwnerOfIdentity(
                         payData[iteration].to_identity
@@ -633,7 +635,7 @@ contract Evvm is EvvmStorage {
         for (uint256 i = 0; i < toData.length; i++) {
             acomulatedAmount += toData[i].amount;
 
-            if (!Strings.equal(toData[i].to_identity, "")) {
+            if (!AdvancedStrings.equal(toData[i].to_identity, "")) {
                 if (
                     NameService(nameServiceAddress).strictVerifyIfIdentityExist(
                         toData[i].to_identity
@@ -950,7 +952,9 @@ contract Evvm is EvvmStorage {
      */
     function proposeImplementation(address _newImpl) external onlyAdmin {
         proposalImplementation = _newImpl;
-        timeToAcceptImplementation = block.timestamp + 30 days;
+        timeToAcceptImplementation =
+            block.timestamp +
+            TIME_TO_ACCEPT_IMPLEMENTATION;
     }
 
     /**
@@ -999,7 +1003,7 @@ contract Evvm is EvvmStorage {
         }
 
         admin.proposal = _newOwner;
-        admin.timeToAccept = block.timestamp + 1 minutes;
+        admin.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**

package/contracts/evvm/lib/EvvmStorage.sol

@@ -20,6 +20,8 @@ import {EvvmStructs} from "./EvvmStructs.sol";
 abstract contract EvvmStorage is EvvmStructs {
     address constant ETH_ADDRESS = address(0);
     bytes1 constant FLAG_IS_STAKER = 0x01;
+    uint256 constant TIME_TO_ACCEPT_PROPOSAL = 1 days;
+    uint256 constant TIME_TO_ACCEPT_IMPLEMENTATION = 30 days;
 
     address nameServiceAddress;
 

package/contracts/evvm/lib/SignatureUtils.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
 
-import {SignatureRecover} from "@evvm/testnet-contracts/library/SignatureRecover.sol";
-import {AdvancedStrings} from "@evvm/testnet-contracts/library/AdvancedStrings.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 
 pragma solidity ^0.8.0;
 
@@ -14,6 +13,7 @@ library SignatureUtils {
      *       by the users
      */
 
+
     /**
      *  @notice This function is used to verify the message signed for the payment
      *  @param signer user who signed the message
@@ -45,8 +45,8 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "pay",
                 string.concat(
                     _receiverAddress == address(0)
@@ -55,11 +55,11 @@ library SignatureUtils {
                     ",",
                     AdvancedStrings.addressToString(_token),
                     ",",
-                    Strings.toString(_amount),
+                    AdvancedStrings.uintToString(_amount),
                     ",",
-                    Strings.toString(_priorityFee),
+                    AdvancedStrings.uintToString(_priorityFee),
                     ",",
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     _priorityFlag ? "true" : "false",
                     ",",
@@ -97,19 +97,19 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "dispersePay",
                 string.concat(
                     AdvancedStrings.bytes32ToString(hashList),
                     ",",
                     AdvancedStrings.addressToString(_token),
                     ",",
-                    Strings.toString(_amount),
+                    AdvancedStrings.uintToString(_amount),
                     ",",
-                    Strings.toString(_priorityFee),
+                    AdvancedStrings.uintToString(_priorityFee),
                     ",",
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     _priorityFlag ? "true" : "false",
                     ",",

package/contracts/nameService/NameService.sol

@@ -57,8 +57,7 @@ pragma solidity ^0.8.0;
  */
 
 import {Evvm} from "@evvm/testnet-contracts/contracts/evvm/Evvm.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {AdvancedStrings} from "@evvm/testnet-contracts/library/AdvancedStrings.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";
 
@@ -129,6 +128,11 @@ contract NameService {
         uint256 amount;
     }
 
+    uint256 constant TIME_TO_ACCEPT_PROPOSAL = 1 days;
+
+    /// @dev Amount of Principal Tokens locked in pending marketplace offers
+    uint256 private principalTokenTokenLockedForWithdrawOffers;
+
     /// @dev Nested mapping: username => offer ID => offer details
     mapping(string username => mapping(uint256 id => OfferMetadata))
         private usernameOffers;
@@ -153,9 +157,6 @@ contract NameService {
     address private constant PRINCIPAL_TOKEN_ADDRESS =
         0x0000000000000000000000000000000000000001;
 
-    /// @dev Amount of Principal Tokens locked in pending marketplace offers
-    uint256 private principalTokenTokenLockedForWithdrawOffers;
-
     /// @dev Restricts function access to the current admin address only
     modifier onlyAdmin() {
         if (msg.sender != admin.current) revert ErrorsLib.SenderIsNotAdmin();
@@ -955,7 +956,7 @@ contract NameService {
         }
 
         admin.proposal = _adminToPropose;
-        admin.timeToAccept = block.timestamp + 1 minutes;
+        admin.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -1007,7 +1008,9 @@ contract NameService {
         }
 
         amountToWithdrawTokens.proposal = _amount;
-        amountToWithdrawTokens.timeToAccept = block.timestamp + 1 minutes;
+        amountToWithdrawTokens.timeToAccept =
+            block.timestamp +
+            TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -1046,7 +1049,7 @@ contract NameService {
             revert();
         }
         evvmAddress.proposal = _newEvvmAddress;
-        evvmAddress.timeToAccept = block.timestamp + 1 minutes;
+        evvmAddress.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**

package/contracts/nameService/lib/ErrorsLib.sol

@@ -24,4 +24,4 @@ library ErrorsLib {
     error EmptyCustomMetadata();
     error InvalidKey();
     error FlushUsernameVerificationFailed();
-}
+}

package/contracts/nameService/lib/SignatureUtils.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
 
-import {SignatureRecover} from "@evvm/testnet-contracts/library/SignatureRecover.sol";
-import {AdvancedStrings} from "@evvm/testnet-contracts/library/AdvancedStrings.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 
 pragma solidity ^0.8.0;
 
@@ -22,13 +21,13 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "preRegistrationUsername",
                 string.concat(
                     AdvancedStrings.bytes32ToString(_hashUsername),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -44,15 +43,15 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "registrationUsername",
                 string.concat(
                     _username,
                     ",",
-                    Strings.toString(_clowNumber),
+                    AdvancedStrings.uintToString(_clowNumber),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -69,17 +68,17 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "makeOffer",
                 string.concat(
                     _username,
                     ",",
-                    Strings.toString(_dateExpire),
+                    AdvancedStrings.uintToString(_dateExpire),
                     ",",
-                    Strings.toString(_amount),
+                    AdvancedStrings.uintToString(_amount),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -95,15 +94,15 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "withdrawOffer",
                 string.concat(
                     _username,
                     ",",
-                    Strings.toString(_offerId),
+                    AdvancedStrings.uintToString(_offerId),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -119,15 +118,15 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "acceptOffer",
                 string.concat(
                     _username,
                     ",",
-                    Strings.toString(_offerId),
+                    AdvancedStrings.uintToString(_offerId),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -142,13 +141,13 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "renewUsername",
                 string.concat(
                     _username,
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -164,15 +163,15 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "addCustomMetadata",
                 string.concat(
                     _identity,
                     ",",
                     _value,
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 ),
                 signature,
                 signer
@@ -188,15 +187,15 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "removeCustomMetadata",
                 string.concat(
                     _username,
                     ",",
-                    Strings.toString(_key),
+                    AdvancedStrings.uintToString(_key),
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 ),
                 signature,
                 signer
@@ -211,10 +210,10 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "flushCustomMetadata",
-                string.concat(_identity, ",", Strings.toString(_nonce)),
+                string.concat(_identity, ",", AdvancedStrings.uintToString(_nonce)),
                 signature,
                 signer
             );
@@ -228,10 +227,10 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "flushUsername",
-                string.concat(_username, ",", Strings.toString(_nonce)),
+                string.concat(_username, ",", AdvancedStrings.uintToString(_nonce)),
                 signature,
                 signer
             );