@evvm/testnet-contracts 2.1.3 → 2.2.1

package/contracts/treasuryTwoChains/lib/SignatureUtils.sol

@@ -1,26 +1,24 @@
 // 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";
+
 /**
  * @title SignatureUtils
  * @author Mate labs
  * @notice Signature verification utilities for Treasury Cross-Chain Fisher Bridge operations
  * @dev Specialized signature verification for Fisher Bridge transactions in the EVVM cross-chain treasury system
  *      Provides EIP-191 compliant signature verification with structured message format for enhanced security
- * 
+ *
  * Key Features:
  * - EIP-191 standard message signing format for wallet compatibility
  * - Fisher Bridge specific message structure for transaction authenticity
  * - Nonce-based replay attack prevention
  * - EVVM ID integration for cross-instance security
  * - Support for both ETH and ERC20 token bridge operations
- * 
+ *
  * Security Model:
  * - Structured message format: "{evvmID},fisherBridge,{parameters}"
  * - Nonce validation prevents replay attacks across chains
@@ -32,7 +30,7 @@ library SignatureUtils {
     /// @dev Constructs and verifies structured message for Fisher Bridge cross-chain operations
     ///      Message format: "{evvmID},fisherBridge,{addressToReceive},{nonce},{tokenAddress},{priorityFee},{amount}"
     ///      This ensures each signature is unique and prevents cross-chain replay attacks
-    /// 
+    ///
     /// @param evvmID Unique identifier of the EVVM instance (prevents cross-instance replay)
     /// @param signer Address that should have signed the message (transaction originator)
     /// @param addressToReceive Destination address on the target chain for the bridged tokens
@@ -42,7 +40,7 @@ library SignatureUtils {
     /// @param amount Total amount of tokens being bridged across chains
     /// @param signature ECDSA signature (65 bytes) created by the signer using their private key
     /// @return bool True if the signature is valid and matches the expected signer, false otherwise
-    /// 
+    ///
     /// @dev Security Features:
     ///      - EIP-191 compliance ensures wallet compatibility (MetaMask, WalletConnect, etc.)
     ///      - Structured message prevents parameter manipulation
@@ -60,19 +58,19 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "fisherBridge",
                 string.concat(
                     AdvancedStrings.addressToString(addressToReceive),
                     ",",
-                    Strings.toString(nonce),
+                    AdvancedStrings.uintToString(nonce),
                     ",",
                     AdvancedStrings.addressToString(tokenAddress),
                     ",",
-                    Strings.toString(priorityFee),
+                    AdvancedStrings.uintToString(priorityFee),
                     ",",
-                    Strings.toString(amount)
+                    AdvancedStrings.uintToString(amount)
                 ),
                 signature,
                 signer

package/interfaces/IEstimator.sol

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
 pragma solidity ^0.8.0;
 
 interface IEstimator {
@@ -19,50 +18,21 @@ interface IEstimator {
     }
 
     function acceptActivatorProposal() external;
-
     function acceptAddressStakingProposal() external;
-
     function acceptAdminProposal() external;
-
     function acceptEvvmAddressProposal() external;
-
     function cancelActivatorProposal() external;
-
     function cancelAddressStakingProposal() external;
-
     function cancelAdminProposal() external;
-
     function cancelEvvmAddressProposal() external;
-
-    function getActivatorMetadata()
-        external
-        view
-        returns (AddressTypeProposal memory);
-
+    function getActivatorMetadata() external view returns (AddressTypeProposal memory);
     function getActualEpochInFormat() external view returns (bytes32);
-
     function getActualEpochInUint() external view returns (uint256);
-
-    function getAddressStakingMetadata()
-        external
-        view
-        returns (AddressTypeProposal memory);
-
-    function getAdminMetadata()
-        external
-        view
-        returns (AddressTypeProposal memory);
-
+    function getAddressStakingMetadata() external view returns (AddressTypeProposal memory);
+    function getAdminMetadata() external view returns (AddressTypeProposal memory);
     function getEpochMetadata() external view returns (EpochMetadata memory);
-
-    function getEvvmAddressMetadata()
-        external
-        view
-        returns (AddressTypeProposal memory);
-
-    function makeEstimation(
-        address _user
-    )
+    function getEvvmAddressMetadata() external view returns (AddressTypeProposal memory);
+    function makeEstimation(address _user)
         external
         returns (
             bytes32 epochAnswer,
@@ -71,25 +41,12 @@ interface IEstimator {
             uint256 idToOverwrite,
             uint256 timestampToOverwrite
         );
-
-    function notifyNewEpoch(
-        address tokenPool,
-        uint256 totalPool,
-        uint256 totalStaked,
-        uint256 tStart
-    ) external;
-
+    function notifyNewEpoch(address tokenPool, uint256 totalPool, uint256 totalStaked, uint256 tStart) external;
     function setActivatorProposal(address _proposal) external;
-
     function setAddressStakingProposal(address _proposal) external;
-
     function setAdminProposal(address _proposal) external;
-
     function setEvvmAddressProposal(address _proposal) external;
-
-    function simulteEstimation(
-        address _user
-    )
+    function simulteEstimation(address _user)
         external
         view
         returns (

package/interfaces/IEvvm.sol

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
 pragma solidity ^0.8.0;
 
 library EvvmStructs {
@@ -41,43 +40,29 @@ library EvvmStructs {
 }
 
 interface IEvvm {
+    error AsyncNonceAlreadyUsed();
     error InsufficientBalance();
     error InvalidAmount(uint256, uint256);
-    error InvalidAsyncNonce();
     error InvalidSignature();
     error NotAnCA();
     error SenderIsNotTheExecutor();
     error SenderIsNotTreasury();
+    error SyncNonceMismatch();
     error UpdateBalanceFailed();
     error WindowToChangeEvvmIDExpired();
 
     fallback() external;
 
-    function _setupNameServiceAndTreasuryAddress(
-        address _nameServiceAddress,
-        address _treasuryAddress
-    ) external;
-
+    function _setupNameServiceAndTreasuryAddress(address _nameServiceAddress, address _treasuryAddress) external;
     function acceptAdmin() external;
-
     function acceptImplementation() external;
-
-    function addAmountToUser(
-        address user,
-        address token,
-        uint256 amount
-    ) external;
-
+    function addAmountToUser(address user, address token, uint256 amount) external;
     function addBalance(address user, address token, uint256 quantity) external;
-
+    function payMultiple(EvvmStructs.PayData[] memory payData)
+        external
+        returns (uint256 successfulTransactions, bool[] memory results);
     function caPay(address to, address token, uint256 amount) external;
-
-    function disperseCaPay(
-        EvvmStructs.DisperseCaPayMetadata[] memory toData,
-        address token,
-        uint256 amount
-    ) external;
-
+    function disperseCaPay(EvvmStructs.DisperseCaPayMetadata[] memory toData, address token, uint256 amount) external;
     function dispersePay(
         address from,
         EvvmStructs.DispersePayMetadata[] memory toData,
@@ -89,63 +74,28 @@ interface IEvvm {
         address executor,
         bytes memory signature
     ) external;
-
-    function getBalance(
-        address user,
-        address token
-    ) external view returns (uint256);
-
+    function getBalance(address user, address token) external view returns (uint256);
+    function getChainHostCoinAddress() external pure returns (address);
     function getCurrentAdmin() external view returns (address);
-
     function getCurrentImplementation() external view returns (address);
-
     function getEraPrincipalToken() external view returns (uint256);
-
     function getEvvmID() external view returns (uint256);
-
-    function getEvvmMetadata()
-        external
-        view
-        returns (EvvmStructs.EvvmMetadata memory);
-
-    function getIfUsedAsyncNonce(
-        address user,
-        uint256 nonce
-    ) external view returns (bool);
-
+    function getEvvmMetadata() external view returns (EvvmStructs.EvvmMetadata memory);
+    function getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
     function getNameServiceAddress() external view returns (address);
-
-    function getNextCurrentSyncNonce(
-        address user
-    ) external view returns (uint256);
-
-    function getNextFisherDepositNonce(
-        address user
-    ) external view returns (uint256);
-
+    function getNextCurrentSyncNonce(address user) external view returns (uint256);
+    function getNextFisherDepositNonce(address user) external view returns (uint256);
+    function getPrincipalTokenAddress() external view returns (address);
     function getPrincipalTokenTotalSupply() external view returns (uint256);
-
     function getProposalAdmin() external view returns (address);
-
     function getProposalImplementation() external view returns (address);
-
     function getRewardAmount() external view returns (uint256);
-
     function getStakingContractAddress() external view returns (address);
-
     function getTimeToAcceptAdmin() external view returns (uint256);
-
     function getTimeToAcceptImplementation() external view returns (uint256);
-
     function getWhitelistTokenToBeAdded() external view returns (address);
-
-    function getWhitelistTokenToBeAddedDateToSet()
-        external
-        view
-        returns (uint256);
-
+    function getWhitelistTokenToBeAddedDateToSet() external view returns (uint256);
     function isAddressStaker(address user) external view returns (bool);
-
     function pay(
         address from,
         address to_address,
@@ -158,38 +108,14 @@ interface IEvvm {
         address executor,
         bytes memory signature
     ) external;
-
-    function payMultiple(
-        EvvmStructs.PayData[] memory payData
-    )
-        external
-        returns (
-            uint256 successfulTransactions,
-            uint256 failedTransactions,
-            bool[] memory results
-        );
-
     function pointStaker(address user, bytes1 answer) external;
-
     function proposeAdmin(address _newOwner) external;
-
     function proposeImplementation(address _newImpl) external;
-
     function recalculateReward() external;
-
     function rejectProposalAdmin() external;
-
     function rejectUpgrade() external;
-
-    function removeAmountFromUser(
-        address user,
-        address token,
-        uint256 amount
-    ) external;
-
+    function removeAmountFromUser(address user, address token, uint256 amount) external;
     function setEvvmID(uint256 newEvvmID) external;
-
     function setNameServiceAddress(address _nameServiceAddress) external;
-
     function setPointStaker(address user, bytes1 answer) external;
 }

package/interfaces/INameService.sol

@@ -1,22 +1,23 @@
 // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+pragma solidity ^0.8.0;
 
-pragma solidity ^0.8.4;
-
-interface NameService {
+library NameServiceStructs {
     struct OfferMetadata {
         address offerer;
         uint256 expireDate;
         uint256 amount;
     }
+}
 
+interface INameService {
     error AcceptOfferVerificationFailed();
+    error AsyncNonceAlreadyUsed();
     error EmptyCustomMetadata();
     error FlushUsernameVerificationFailed();
     error InvalidKey();
     error InvalidSignatureOnNameService();
-    error InvalidUsername(bytes1);
-    error NonceAlreadyUsed();
+    error InvalidUsername();
     error PreRegistrationNotValid();
     error RenewUsernameVerificationFailed();
     error SenderIsNotAdmin();
@@ -51,10 +52,6 @@ interface NameService {
     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,
@@ -80,83 +77,43 @@ interface NameService {
     function getAdminFullDetails()
         external
         view
-        returns (
-            address currentAdmin,
-            address proposalAdmin,
-            uint256 timeToAcceptAdmin
-        );
-    function getAmountOfCustomMetadata(
-        string memory _username
-    ) external view returns (uint256);
-    function getCustomMetadataMaxSlotsOfIdentity(
-        string memory _username
-    ) external view returns (uint256);
+        returns (address currentAdmin, 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
-        returns (
-            address currentEvvmAddress,
-            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 getPriceOfRegistration(
-        string memory username
-    ) external view returns (uint256);
-    function getPriceToAddCustomMetadata()
+        returns (address currentEvvmAddress, 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 getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
+    function getLengthOfOffersUsername(string memory _username) external view returns (uint256 length);
+    function getOffersOfUsername(string memory _username)
+        external
+        view
+        returns (NameServiceStructs.OfferMetadata[] memory offers);
+    function getOwnerOfIdentity(string memory _username) external view returns (address);
+    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
-        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()
+        returns (uint256 proposalAmountToWithdrawTokens, uint256 timeToAcceptAmountToWithdrawTokens);
+    function getSingleCustomMetadataOfIdentity(string memory _username, uint256 _key)
         external
         view
-        returns (uint256 price);
-    function getProposedWithdrawAmountFullDetails()
+        returns (string memory);
+    function getSingleOfferOfUsername(string memory _username, uint256 _offerID)
         external
         view
-        returns (
-            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);
+        returns (NameServiceStructs.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,
@@ -214,18 +171,10 @@ interface NameService {
         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 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/interfaces/IP2PSwap.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+pragma solidity ^0.8.0;
 
-pragma solidity ^0.8.4;
-
-interface P2PSwap {
+library P2PSwapStructs {
     struct MarketInformation {
         address tokenA;
         address tokenB;
@@ -55,6 +54,11 @@ interface P2PSwap {
         uint256 service;
         uint256 mateStaker;
     }
+}
+
+interface IP2PSwap {
+    error AsyncNonceAlreadyUsed();
+    error InvalidServiceSignature();
 
     function acceptFillFixedPercentage() external;
     function acceptFillPropotionalPercentage() external;
@@ -65,16 +69,15 @@ interface P2PSwap {
     function addBalance(address _token, uint256 _amount) external;
     function cancelOrder(
         address user,
-        MetadataCancelOrder memory metadata,
+        P2PSwapStructs.MetadataCancelOrder memory metadata,
         uint256 _priorityFee_Evvm,
         uint256 _nonce_Evvm,
         bool _priority_Evvm,
         bytes memory _signature_Evvm
     ) external;
-    function checkIfANonceP2PSwapIsUsed(address user, uint256 nonce) external view returns (bool);
     function dispatchOrder_fillFixedFee(
         address user,
-        MetadataDispatchOrder memory metadata,
+        P2PSwapStructs.MetadataDispatchOrder memory metadata,
         uint256 _priorityFee_Evvm,
         uint256 _nonce_Evvm,
         bool _priority_Evvm,
@@ -83,35 +86,36 @@ interface P2PSwap {
     ) external;
     function dispatchOrder_fillPropotionalFee(
         address user,
-        MetadataDispatchOrder memory metadata,
+        P2PSwapStructs.MetadataDispatchOrder memory metadata,
         uint256 _priorityFee_Evvm,
         uint256 _nonce_Evvm,
         bool _priority_Evvm,
         bytes memory _signature_Evvm
     ) external;
     function findMarket(address tokenA, address tokenB) external view returns (uint256);
-    function getAllMarketOrders(uint256 market) external view returns (OrderForGetter[] memory orders);
-    function getAllMarketsMetadata() external view returns (MarketInformation[] memory);
+    function getAllMarketOrders(uint256 market) external view returns (P2PSwapStructs.OrderForGetter[] memory orders);
+    function getAllMarketsMetadata() external view returns (P2PSwapStructs.MarketInformation[] memory);
     function getBalanceOfContract(address token) external view returns (uint256);
-    function getMarketMetadata(uint256 market) external view returns (MarketInformation memory);
+    function getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
+    function getMarketMetadata(uint256 market) external view returns (P2PSwapStructs.MarketInformation memory);
     function getMaxLimitFillFixedFee() external view returns (uint256);
     function getMaxLimitFillFixedFeeProposal() external view returns (uint256);
     function getMyOrdersInSpecificMarket(address user, uint256 market)
         external
         view
-        returns (OrderForGetter[] memory orders);
-    function getOrder(uint256 market, uint256 orderId) external view returns (Order memory order);
+        returns (P2PSwapStructs.OrderForGetter[] memory orders);
+    function getOrder(uint256 market, uint256 orderId) external view returns (P2PSwapStructs.Order memory order);
     function getOwner() external view returns (address);
     function getOwnerProposal() external view returns (address);
     function getOwnerTimeToAccept() external view returns (uint256);
     function getPercentageFee() external view returns (uint256);
     function getProposalPercentageFee() external view returns (uint256);
     function getProposedWithdrawal() external view returns (address, uint256, address, uint256);
-    function getRewardPercentage() external view returns (Percentage memory);
-    function getRewardPercentageProposal() external view returns (Percentage memory);
+    function getRewardPercentage() external view returns (P2PSwapStructs.Percentage memory);
+    function getRewardPercentageProposal() external view returns (P2PSwapStructs.Percentage memory);
     function makeOrder(
         address user,
-        MetadataMakeOrder memory metadata,
+        P2PSwapStructs.MetadataMakeOrder memory metadata,
         bytes memory signature,
         uint256 _priorityFee_Evvm,
         uint256 _nonce_Evvm,