@evvm/testnet-contracts 2.2.3 → 3.0.0

package/contracts/evvm/lib/ErrorsLib.sol

@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
-pragma solidity ^0.8.0;
-
-library ErrorsLib {
-    error InvalidSignature();
-    error SenderIsNotTheExecutor();
-    error UpdateBalanceFailed();
-    error SyncNonceMismatch();
-    error AsyncNonceAlreadyUsed();
-    error NotAnStaker();
-    error InsufficientBalance();
-    error InvalidAmount(uint256, uint256);
-    error NotAnCA();
-    error SenderIsNotTreasury();
-    error WindowToChangeEvvmIDExpired();
-}

package/contracts/evvm/lib/EvvmStorage.sol

@@ -1,62 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
-pragma solidity ^0.8.0;
-
-import {EvvmStructs} from "./EvvmStructs.sol";
-
-/**
- * @title EvvmStorage
- * @author Mate labs
- * @dev Storage layout contract for EVVM proxy pattern implementation.
- *      This contract inherits all structures from EvvmStructs and
- *      defines the storage layout that will be used by the proxy pattern.
- *
- * @notice This contract should not be deployed directly, it's meant to be
- *         inherited by the implementation contracts to ensure they maintain
- *         the same storage layout.
- */
-
-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;
-
-    address stakingContractAddress;
-
-    address treasuryAddress;
-
-    address whitelistTokenToBeAdded_address;
-    address whitelistTokenToBeAdded_pool;
-    uint256 whitelistTokenToBeAdded_dateToSet;
-
-    /**
-     * @dev The address of the implementation contract is stored
-     *      separately because of the way the proxy pattern works,
-     *      rather than in a struct.
-     */
-    address currentImplementation;
-    address proposalImplementation;
-    uint256 timeToAcceptImplementation;
-
-    uint256 windowTimeToChangeEvvmID;
-
-    EvvmMetadata evvmMetadata;
-
-    AddressTypeProposal admin;
-
-    bytes1 breakerSetupNameServiceAddress;
-
-    mapping(address => bytes1) stakerList;
-
-    mapping(address user => mapping(address token => uint256 quantity)) balances;
-
-    mapping(address user => uint256 nonce) nextSyncUsedNonce;
-
-    mapping(address user => mapping(uint256 nonce => bool isUsed)) asyncUsedNonce;
-
-    mapping(address user => uint256 nonce) nextFisherDepositNonce;
-}

package/contracts/evvm/lib/EvvmStructs.sol

@@ -1,90 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
-pragma solidity ^0.8.0;
-
-/**
- * @title EvvmStructs
- * @dev Library of common structures used across EVVM and its services.
- *      This contract serves as a shared type system for the entire ecosystem,
- *      ensuring consistency in data structures between the core EVVM and
- *      external service contracts.
- *
- * @notice This contract should be inherited by both EVVM and service contracts
- *         that need to interact with these data structures.
- */
-
-abstract contract EvvmStructs {
-    struct PayData {
-        address from;
-        address to_address;
-        string to_identity;
-        address token;
-        uint256 amount;
-        uint256 priorityFee;
-        uint256 nonce;
-        bool priorityFlag;
-        address executor;
-        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;
-        string to_identity;
-    }
-
-    struct DisperseCaPayMetadata {
-        uint256 amount;
-        address toAddress;
-    }
-
-    struct EvvmMetadata {
-        string EvvmName;
-        uint256 EvvmID;
-        string principalTokenName;
-        string principalTokenSymbol;
-        address principalTokenAddress;
-        uint256 totalSupply;
-        uint256 eraTokens;
-        uint256 reward;
-    }
-
-    struct AddressTypeProposal {
-        address current;
-        address proposal;
-        uint256 timeToAccept;
-    }
-
-    struct UintTypeProposal {
-        uint256 current;
-        uint256 proposal;
-        uint256 timeToAccept;
-    }
-}

package/contracts/evvm/lib/SignatureUtils.sol

@@ -1,120 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-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
-     *       verify messages, the next functions are used to verify the messages signed
-     *       by the users
-     */
-
-    /**
-     *  @notice This function is used to verify the message signed for the payment
-     *  @param signer user who signed the message
-     *  @param _receiverAddress address of the receiver
-     *  @param _receiverIdentity identity of the receiver
-     *
-     *  @notice if the _receiverAddress is 0x0 the function will use the _receiverIdentity
-     *
-     *  @param _token address of the token to send
-     *  @param _amount amount to send
-     *  @param _priorityFee priorityFee to send to the staking holder
-     *  @param _nonce nonce of the transaction
-     *  @param _priorityFlag if the transaction is priority or not
-     *  @param _executor the executor of the transaction
-     *  @param signature signature of the user who wants to send the message
-     *  @return true if the signature is valid
-     */
-    function verifyMessageSignedForPay(
-        uint256 evvmID,
-        address signer,
-        address _receiverAddress,
-        string memory _receiverIdentity,
-        address _token,
-        uint256 _amount,
-        uint256 _priorityFee,
-        uint256 _nonce,
-        bool _priorityFlag,
-        address _executor,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "pay",
-                string.concat(
-                    _receiverAddress == address(0)
-                        ? _receiverIdentity
-                        : AdvancedStrings.addressToString(_receiverAddress),
-                    ",",
-                    AdvancedStrings.addressToString(_token),
-                    ",",
-                    AdvancedStrings.uintToString(_amount),
-                    ",",
-                    AdvancedStrings.uintToString(_priorityFee),
-                    ",",
-                    AdvancedStrings.uintToString(_nonce),
-                    ",",
-                    _priorityFlag ? "true" : "false",
-                    ",",
-                    AdvancedStrings.addressToString(_executor)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    /**
-     *  @notice This function is used to verify the message signed for the dispersePay
-     *  @param signer user who signed the message
-     *  @param hashList hash of the list of the transactions, the hash is calculated
-     *                  using sha256(abi.encode(toData))
-     *  @param _token token address to send
-     *  @param _amount amount to send
-     *  @param _priorityFee priorityFee to send to the fisher who wants to send the message
-     *  @param _nonce nonce of the transaction
-     *  @param _priorityFlag if the transaction is priority or not
-     *  @param _executor the executor of the transaction
-     *  @param signature signature of the user who wants to send the message
-     *  @return true if the signature is valid
-     */
-    function verifyMessageSignedForDispersePay(
-        uint256 evvmID,
-        address signer,
-        bytes32 hashList,
-        address _token,
-        uint256 _amount,
-        uint256 _priorityFee,
-        uint256 _nonce,
-        bool _priorityFlag,
-        address _executor,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "dispersePay",
-                string.concat(
-                    AdvancedStrings.bytes32ToString(hashList),
-                    ",",
-                    AdvancedStrings.addressToString(_token),
-                    ",",
-                    AdvancedStrings.uintToString(_amount),
-                    ",",
-                    AdvancedStrings.uintToString(_priorityFee),
-                    ",",
-                    AdvancedStrings.uintToString(_nonce),
-                    ",",
-                    _priorityFlag ? "true" : "false",
-                    ",",
-                    AdvancedStrings.addressToString(_executor)
-                ),
-                signature,
-                signer
-            );
-    }
-}

package/contracts/nameService/lib/ErrorsLib.sol

@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
-pragma solidity ^0.8.0;
-
-library ErrorsLib {
-    error SenderIsNotAdmin();
-    error UserIsNotOwnerOfIdentity();
-    error NonceAlreadyUsed();
-    error InvalidSignatureOnNameService();
-    error InvalidUsername();
-    error UsernameAlreadyRegistered();
-    error PreRegistrationNotValid();
-    error MakeOfferVerificationFailed();
-    error UserIsNotOwnerOfOffer();
-    error AcceptOfferVerificationFailed();
-    error RenewUsernameVerificationFailed();
-    error EmptyCustomMetadata();
-    error InvalidKey();
-    error FlushUsernameVerificationFailed();
-}

package/contracts/nameService/lib/NameServiceStructs.sol

@@ -1,69 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
-pragma solidity ^0.8.0;
-
-abstract contract NameServiceStructs {
-    /**
-     * @dev Struct for managing address change proposals with time delay
-     * @param current Currently active address
-     * @param proposal Proposed new address waiting for approval
-     * @param timeToAccept Timestamp when the proposal can be accepted
-     */
-    struct AddressTypeProposal {
-        address current;
-        address proposal;
-        uint256 timeToAccept;
-    }
-
-    /**
-     * @dev Struct for managing uint256 value proposals with time delay
-     * @param current Currently active value
-     * @param proposal Proposed new value waiting for approval
-     * @param timeToAccept Timestamp when the proposal can be accepted
-     */
-    struct UintTypeProposal {
-        uint256 current;
-        uint256 proposal;
-        uint256 timeToAccept;
-    }
-
-    /**
-     * @dev Struct for managing boolean flag changes with time delay
-     * @param flag Current boolean state
-     * @param timeToAcceptChange Timestamp when the flag change can be executed
-     */
-    struct BoolTypeProposal {
-        bool flag;
-        uint256 timeToAcceptChange;
-    }
-
-    /**
-     * @dev Core metadata for each registered identity/username
-     * @param owner Address that owns this identity
-     * @param expireDate Timestamp when the registration expires
-     * @param customMetadataMaxSlots Number of custom metadata entries stored
-     * @param offerMaxSlots Maximum number of offers that have been made
-     * @param flagNotAUsername Flag indicating if this is a pre-registration (0x01) or actual username (0x00)
-     */
-    struct IdentityBaseMetadata {
-        address owner;
-        uint256 expireDate;
-        uint256 customMetadataMaxSlots;
-        uint256 offerMaxSlots;
-        bytes1 flagNotAUsername;
-    }
-
-
-    /**
-     * @dev Metadata for marketplace offers on usernames
-     * @param offerer Address making the offer
-     * @param expireDate Timestamp when the offer expires
-     * @param amount Amount offered in Principal Tokens (after 0.5% marketplace fee deduction)
-     */
-    struct OfferMetadata {
-        address offerer;
-        uint256 expireDate;
-        uint256 amount;
-    }
-}

package/contracts/nameService/lib/SignatureUtils.sol

@@ -1,245 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-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
-     *       verify messages, the next functions are used to verify the messages signed
-     *       by the users
-     */
-
-    function verifyMessageSignedForPreRegistrationUsername(
-        uint256 evvmID,
-        address signer,
-        bytes32 _hashUsername,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "preRegistrationUsername",
-                string.concat(
-                    AdvancedStrings.bytes32ToString(_hashUsername),
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForRegistrationUsername(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _clowNumber,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "registrationUsername",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_clowNumber),
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForMakeOffer(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _dateExpire,
-        uint256 _amount,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "makeOffer",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_dateExpire),
-                    ",",
-                    AdvancedStrings.uintToString(_amount),
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForWithdrawOffer(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _offerId,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "withdrawOffer",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_offerId),
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForAcceptOffer(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _offerId,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "acceptOffer",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_offerId),
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForRenewUsername(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "renewUsername",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForAddCustomMetadata(
-        uint256 evvmID,
-        address signer,
-        string memory _identity,
-        string memory _value,
-        uint256 _nameServiceNonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "addCustomMetadata",
-                string.concat(
-                    _identity,
-                    ",",
-                    _value,
-                    ",",
-                    AdvancedStrings.uintToString(_nameServiceNonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForRemoveCustomMetadata(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _key,
-        uint256 _nonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "removeCustomMetadata",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_key),
-                    ",",
-                    AdvancedStrings.uintToString(_nonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForFlushCustomMetadata(
-        uint256 evvmID,
-        address signer,
-        string memory _identity,
-        uint256 _nonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "flushCustomMetadata",
-                string.concat(
-                    _identity,
-                    ",",
-                    AdvancedStrings.uintToString(_nonce)
-                ),
-                signature,
-                signer
-            );
-    }
-
-    function verifyMessageSignedForFlushUsername(
-        uint256 evvmID,
-        address signer,
-        string memory _username,
-        uint256 _nonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureUtil.verifySignature(
-                evvmID,
-                "flushUsername",
-                string.concat(
-                    _username,
-                    ",",
-                    AdvancedStrings.uintToString(_nonce)
-                ),
-                signature,
-                signer
-            );
-    }
-}

package/contracts/p2pSwap/lib/P2PSwapStructs.sol

@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
-// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
-
-pragma solidity ^0.8.0;
-
-
-abstract contract P2PSwapStructs {
-    struct MarketInformation {
-        address tokenA;
-        address tokenB;
-        uint256 maxSlot;
-        uint256 ordersAvailable;
-    }
-
-    struct Order {
-        address seller;
-        uint256 amountA;
-        uint256 amountB;
-    }
-
-    struct OrderForGetter {
-        uint256 marketId;
-        uint256 orderId;
-        address seller;
-        uint256 amountA;
-        uint256 amountB;
-    }
-
-    struct Percentage {
-        uint256 seller;
-        uint256 service;
-        uint256 mateStaker;
-    }
-
-    struct MetadataMakeOrder {
-        uint256 nonce;
-        address tokenA;
-        address tokenB;
-        uint256 amountA;
-        uint256 amountB;
-    }
-
-    struct MetadataCancelOrder {
-        uint256 nonce;
-        address tokenA;
-        address tokenB;
-        uint256 orderId;
-        bytes signature;
-    }
-
-    struct MetadataDispatchOrder {
-        uint256 nonce;
-        address tokenA;
-        address tokenB;
-        uint256 orderId;
-        uint256 amountOfTokenBToFill;
-        bytes signature;
-    }
-}