@evvm/testnet-contracts 2.1.3 → 2.2.1

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;
@@ -156,8 +158,6 @@ contract Evvm is EvvmStorage {
         stakerList[_stakingContractAddress] = FLAG_IS_STAKER;
 
         breakerSetupNameServiceAddress = FLAG_IS_STAKER;
-
-        evvmMetadata = _evvmMetadata;
     }
 
     /**
@@ -209,14 +209,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;
     }
 
     /**
@@ -365,22 +365,25 @@ contract Evvm is EvvmStorage {
                 token,
                 amount,
                 priorityFee,
-                priorityFlag ? nonce : nextSyncUsedNonce[from],
+                nonce,
                 priorityFlag,
                 executor,
                 signature
             )
         ) revert ErrorsLib.InvalidSignature();
 
-        if (executor != address(0)) {
-            if (msg.sender != executor)
-                revert ErrorsLib.SenderIsNotTheExecutor();
-        }
+        if ((executor != address(0)) && (msg.sender != executor))
+            revert ErrorsLib.SenderIsNotTheExecutor();
 
-        if (priorityFlag && asyncUsedNonce[from][nonce])
-            revert ErrorsLib.InvalidAsyncNonce();
+        if (priorityFlag) {
+            if (asyncUsedNonce[from][nonce])
+                revert ErrorsLib.AsyncNonceAlreadyUsed();
+        } else {
+            if (nextSyncUsedNonce[from] != nonce)
+                revert ErrorsLib.SyncNonceMismatch();
+        }
 
-        address to = !Strings.equal(to_identity, "")
+        address to = !AdvancedStrings.equal(to_identity, "")
             ? NameService(nameServiceAddress).verifyStrictAndGetOwnerOfIdentity(
                 to_identity
             )
@@ -423,24 +426,15 @@ contract Evvm is EvvmStorage {
      *
      * Return Values:
      * - successfulTransactions: Count of completed payments
-     * - failedTransactions: Count of failed payments
      * - results: Boolean array indicating success/failure for each payment
      *
      * @param payData Array of PayData structures containing payment details
      * @return successfulTransactions Number of payments that completed successfully
-     * @return failedTransactions Number of payments that failed
      * @return results Boolean array with success status for each payment
      */
     function payMultiple(
         PayData[] memory payData
-    )
-        external
-        returns (
-            uint256 successfulTransactions,
-            uint256 failedTransactions,
-            bool[] memory results
-        )
-    {
+    ) external returns (uint256 successfulTransactions, bool[] memory results) {
         address to_aux;
         results = new bool[](payData.length);
         for (uint256 iteration = 0; iteration < payData.length; iteration++) {
@@ -453,9 +447,7 @@ contract Evvm is EvvmStorage {
                     payData[iteration].token,
                     payData[iteration].amount,
                     payData[iteration].priorityFee,
-                    payData[iteration].priorityFlag
-                        ? payData[iteration].nonce
-                        : nextSyncUsedNonce[payData[iteration].from],
+                    payData[iteration].nonce,
                     payData[iteration].priorityFlag,
                     payData[iteration].executor,
                     payData[iteration].signature
@@ -464,7 +456,6 @@ contract Evvm is EvvmStorage {
 
             if (payData[iteration].executor != address(0)) {
                 if (msg.sender != payData[iteration].executor) {
-                    failedTransactions++;
                     results[iteration] = false;
                     continue;
                 }
@@ -482,7 +473,6 @@ contract Evvm is EvvmStorage {
                         payData[iteration].nonce
                     ] = true;
                 } else {
-                    failedTransactions++;
                     results[iteration] = false;
                     continue;
                 }
@@ -495,13 +485,12 @@ contract Evvm is EvvmStorage {
                 ) {
                     nextSyncUsedNonce[payData[iteration].from]++;
                 } else {
-                    failedTransactions++;
                     results[iteration] = false;
                     continue;
                 }
             }
 
-            to_aux = !Strings.equal(payData[iteration].to_identity, "")
+            to_aux = !AdvancedStrings.equal(payData[iteration].to_identity, "")
                 ? NameService(nameServiceAddress)
                     .verifyStrictAndGetOwnerOfIdentity(
                         payData[iteration].to_identity
@@ -512,7 +501,6 @@ contract Evvm is EvvmStorage {
                 payData[iteration].priorityFee + payData[iteration].amount >
                 balances[payData[iteration].from][payData[iteration].token]
             ) {
-                failedTransactions++;
                 results[iteration] = false;
                 continue;
             }
@@ -525,7 +513,6 @@ contract Evvm is EvvmStorage {
                     payData[iteration].amount
                 )
             ) {
-                failedTransactions++;
                 results[iteration] = false;
                 continue;
             } else {
@@ -541,7 +528,6 @@ contract Evvm is EvvmStorage {
                             payData[iteration].priorityFee
                         )
                     ) {
-                        failedTransactions++;
                         results[iteration] = false;
                         continue;
                     }
@@ -607,7 +593,7 @@ contract Evvm is EvvmStorage {
                 token,
                 amount,
                 priorityFee,
-                priorityFlag ? nonce : nextSyncUsedNonce[from],
+                nonce,
                 priorityFlag,
                 executor,
                 signature
@@ -621,7 +607,10 @@ contract Evvm is EvvmStorage {
 
         if (priorityFlag) {
             if (asyncUsedNonce[from][nonce])
-                revert ErrorsLib.InvalidAsyncNonce();
+                revert ErrorsLib.AsyncNonceAlreadyUsed();
+        } else {
+            if (nextSyncUsedNonce[from] != nonce)
+                revert ErrorsLib.SyncNonceMismatch();
         }
 
         if (balances[from][token] < amount + priorityFee)
@@ -633,7 +622,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
@@ -665,6 +654,7 @@ contract Evvm is EvvmStorage {
         } else {
             nextSyncUsedNonce[from]++;
         }
+
     }
 
     /**
@@ -771,6 +761,7 @@ contract Evvm is EvvmStorage {
         if (isAddressStaker(msg.sender)) {
             _giveReward(msg.sender, 1);
         }
+
     }
 
     //░▒▓█Treasury exclusive functions██████████████████████████████████████████▓▒░
@@ -950,7 +941,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 +992,7 @@ contract Evvm is EvvmStorage {
         }
 
         admin.proposal = _newOwner;
-        admin.timeToAccept = block.timestamp + 1 minutes;
+        admin.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -1132,6 +1125,14 @@ contract Evvm is EvvmStorage {
         return evvmMetadata;
     }
 
+    function getPrincipalTokenAddress() external view returns (address) {
+        return evvmMetadata.principalTokenAddress;
+    }
+
+    function getChainHostCoinAddress() external pure returns (address) {
+        return address(0);
+    }
+
     /**
      * @notice Gets the unique identifier string for this EVVM instance
      * @dev Returns the EvvmID used for distinguishing different EVVM deployments

package/contracts/evvm/lib/ErrorsLib.sol

@@ -7,7 +7,8 @@ library ErrorsLib {
     error InvalidSignature();
     error SenderIsNotTheExecutor();
     error UpdateBalanceFailed();
-    error InvalidAsyncNonce();
+    error SyncNonceMismatch();
+    error AsyncNonceAlreadyUsed();
     error NotAnStaker();
     error InsufficientBalance();
     error InvalidAmount(uint256, uint256);

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/EvvmStructs.sol

@@ -28,6 +28,32 @@ abstract contract EvvmStructs {
         bytes signature;
     }
 
+    struct DispersePayData {
+        address from;
+        DispersePayMetadata[] toData;
+        address token;
+        uint256 totalAmount;
+        uint256 priorityFee;
+        uint256 nonce;
+        bool priorityFlag;
+        address executor;
+        bytes signature;
+    }
+
+    struct CaPayData {
+        address from;
+        address to;
+        address token;
+        uint256 amount;
+    }
+
+    struct DisperseCaPayData{
+        address from;
+        DisperseCaPayMetadata[] toData;
+        address token;
+        uint256 amount;
+    }
+
     struct DispersePayMetadata {
         uint256 amount;
         address to_address;
@@ -38,7 +64,7 @@ abstract contract EvvmStructs {
         uint256 amount;
         address toAddress;
     }
-    
+
     struct EvvmMetadata {
         string EvvmName;
         uint256 EvvmID;

package/contracts/evvm/lib/SignatureUtils.sol

@@ -1,12 +1,10 @@
 // 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";
-
 pragma solidity ^0.8.0;
 
+import {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
+
 library SignatureUtils {
     /**
      *  @dev using EIP-191 (https://eips.ethereum.org/EIPS/eip-191) can be used to sign and
@@ -45,8 +43,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 +53,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 +95,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",
                     ",",
@@ -119,5 +117,4 @@ library SignatureUtils {
                 signer
             );
     }
-
-}
+}