@evvm/testnet-contracts 2.1.3 → 2.2.1

package/interfaces/IStaking.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 Staking {
+library StakingStructs {
     struct BoolTypeProposal {
         bool flag;
         uint256 timeToAccept;
@@ -15,18 +14,20 @@ interface Staking {
         uint256 timestamp;
         uint256 totalStaked;
     }
+}
 
+interface IStaking {
     error AddressIsNotAService();
     error AddressMismatch();
     error AddressMustWaitToFullUnstake();
     error AddressMustWaitToStakeAgain();
+    error AsyncNonceAlreadyUsed();
     error InvalidSignatureOnStaking();
     error PresaleStakingDisabled();
     error SenderIsNotAdmin();
     error SenderIsNotGoldenFisher();
     error ServiceDoesNotFulfillCorrectStakingAmount(uint256 requiredAmount);
     error ServiceDoesNotStakeInSameTx();
-    error StakingNonceAlreadyUsed();
     error UserIsNotPresaleStaker();
     error UserPresaleStakerLimitExceeded();
 
@@ -40,57 +41,34 @@ interface Staking {
     function cancelChangeAllowPresaleStaking() external;
     function cancelChangeAllowPublicStaking() external;
     function cancelSetSecondsToUnllockFullUnstaking() external;
-    function checkIfStakeNonceUsed(
-        address _account,
-        uint256 _nonce
-    ) external view returns (bool);
     function confirmChangeAllowPresaleStaking() external;
     function confirmChangeAllowPublicStaking() external;
     function confirmServiceStaking() external;
     function confirmSetSecondsToUnllockFullUnstaking() external;
-    function getAddressHistory(
-        address _account
-    ) external view returns (HistoryMetadata[] memory);
-    function getAddressHistoryByIndex(
-        address _account,
-        uint256 _index
-    ) external view returns (HistoryMetadata memory);
-    function getAllDataOfAllowPublicStaking()
+    function getAddressHistory(address _account) external view returns (StakingStructs.HistoryMetadata[] memory);
+    function getAddressHistoryByIndex(address _account, uint256 _index)
         external
         view
-        returns (BoolTypeProposal memory);
-    function getAllowPresaleStaking()
-        external
-        view
-        returns (BoolTypeProposal memory);
+        returns (StakingStructs.HistoryMetadata memory);
+    function getAllDataOfAllowPublicStaking() external view returns (StakingStructs.BoolTypeProposal memory);
+    function getAllowPresaleStaking() external view returns (StakingStructs.BoolTypeProposal memory);
     function getEstimatorAddress() external view returns (address);
     function getEstimatorProposal() external view returns (address);
     function getEvvmAddress() external view returns (address);
     function getGoldenFisher() external view returns (address);
     function getGoldenFisherProposal() external view returns (address);
+    function getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
     function getMateAddress() external pure returns (address);
     function getOwner() external view returns (address);
-    function getPresaleStaker(
-        address _account
-    ) external view returns (bool, uint256);
+    function getPresaleStaker(address _account) external view returns (bool, uint256);
     function getPresaleStakerCount() external view returns (uint256);
     function getSecondsToUnlockFullUnstaking() external view returns (uint256);
     function getSecondsToUnlockStaking() external view returns (uint256);
-    function getSizeOfAddressHistory(
-        address _account
-    ) external view returns (uint256);
-    function getTimeToUserUnlockFullUnstakingTime(
-        address _account
-    ) external view returns (uint256);
-    function getTimeToUserUnlockStakingTime(
-        address _account
-    ) external view returns (uint256);
-    function getUserAmountStaked(
-        address _account
-    ) external view returns (uint256);
-    function gimmeYiel(
-        address user
-    )
+    function getSizeOfAddressHistory(address _account) external view returns (uint256);
+    function getTimeToUserUnlockFullUnstakingTime(address _account) external view returns (uint256);
+    function getTimeToUserUnlockStakingTime(address _account) external view returns (uint256);
+    function getUserAmountStaked(address _account) external view returns (uint256);
+    function gimmeYiel(address user)
         external
         returns (
             bytes32 epochAnswer,
@@ -99,17 +77,11 @@ interface Staking {
             uint256 idToOverwriteUserHistory,
             uint256 timestampToBeOverwritten
         );
-    function goldenStaking(
-        bool isStaking,
-        uint256 amountOfStaking,
-        bytes memory signature_EVVM
-    ) external;
+    function goldenStaking(bool isStaking, uint256 amountOfStaking, bytes memory signature_EVVM) external;
     function prepareChangeAllowPresaleStaking() external;
     function prepareChangeAllowPublicStaking() external;
     function prepareServiceStaking(uint256 amountOfStaking) external;
-    function prepareSetSecondsToUnllockFullUnstaking(
-        uint256 _secondsToUnllockFullUnstaking
-    ) external;
+    function prepareSetSecondsToUnllockFullUnstaking(uint256 _secondsToUnllockFullUnstaking) external;
     function presaleStaking(
         address user,
         bool isStaking,
@@ -124,9 +96,7 @@ interface Staking {
     function proposeAdmin(address _newAdmin) external;
     function proposeEstimator(address _estimator) external;
     function proposeGoldenFisher(address _goldenFisher) external;
-    function proposeSetSecondsToUnlockStaking(
-        uint256 _secondsToUnlockStaking
-    ) external;
+    function proposeSetSecondsToUnlockStaking(uint256 _secondsToUnlockStaking) external;
     function publicStaking(
         address user,
         bool isStaking,

package/interfaces/ITreasury.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 ITreasury {
@@ -10,8 +9,6 @@ interface ITreasury {
     error PrincipalTokenIsNotWithdrawable();
 
     function deposit(address token, uint256 amount) external payable;
-
-    function evvmAddress() external view returns (address);
-
+    function getEvvmAddress() external view returns (address);
     function withdraw(address token, uint256 amount) external;
 }

package/interfaces/ITreasuryExternalChainStation.sol

@@ -1,5 +1,6 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.4;
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+pragma solidity ^0.8.0;
 
 library ExternalChainStationStructs {
     struct AddressTypeProposal {
@@ -16,13 +17,9 @@ library ExternalChainStationStructs {
     }
 
     struct CrosschainConfig {
-        uint32 hostChainStationDomainId;
-        address mailboxAddress;
-        uint32 hostChainStationEid;
-        address endpointAddress;
-        string hostChainStationChainName;
-        address gasServiceAddress;
-        address gatewayAddress;
+        HyperlaneConfig hyperlane;
+        LayerZeroConfig layerZero;
+        AxelarConfig axelar;
     }
 
     struct HyperlaneConfig {
@@ -38,7 +35,7 @@ library ExternalChainStationStructs {
     }
 }
 
-interface TreasuryExternalChainStation {
+interface ITreasuryExternalChainStation {
     struct EnforcedOptionParam {
         uint32 eid;
         uint16 msgType;
@@ -74,6 +71,7 @@ interface TreasuryExternalChainStation {
     error SafeCastOverflowedUintDowncast(uint8 bits, uint256 value);
     error SafeERC20FailedOperation(address token);
     error SenderNotAuthorized();
+    error WindowToChangeEvvmIDExpired();
 
     event EnforcedOptionSet(EnforcedOptionParam[] _enforcedOptions);
     event FisherBridgeSend(
@@ -87,8 +85,7 @@ interface TreasuryExternalChainStation {
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
     event PeerSet(uint32 eid, bytes32 peer);
 
-    function _setHostChainAddress(address hostChainStationAddress, string memory hostChainStationAddressString)
-        external;
+    function _setHostChainAddress(address hostChainStationAddress, string memory hostChainStationAddressString) external;
     function acceptAdmin() external;
     function acceptFisherExecutor() external;
     function acceptHostChainAddress() external;
@@ -98,9 +95,7 @@ interface TreasuryExternalChainStation {
         view
         returns (bytes memory);
     function depositCoin(address toAddress, uint256 amount, bytes1 protocolToExecute) external payable;
-    function depositERC20(address toAddress, address token, uint256 amount, bytes1 protocolToExecute)
-        external
-        payable;
+    function depositERC20(address toAddress, address token, uint256 amount, bytes1 protocolToExecute) external payable;
     function endpoint() external view returns (address);
     function enforcedOptions(uint32 eid, uint16 msgType) external view returns (bytes memory enforcedOption);
     function execute(bytes32 commandId, string memory sourceChain, string memory sourceAddress, bytes memory payload)
@@ -161,6 +156,7 @@ interface TreasuryExternalChainStation {
     function renounceOwnership() external;
     function setDelegate(address _delegate) external;
     function setEnforcedOptions(EnforcedOptionParam[] memory _enforcedOptions) external;
+    function setEvvmID(uint256 newEvvmID) external;
     function setPeer(uint32 _eid, bytes32 _peer) external;
     function transferOwnership(address newOwner) external;
 }

package/interfaces/ITreasuryHostChainStation.sol

@@ -1,5 +1,6 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.4;
+// SPDX-License-Identifier: EVVM-NONCOMMERCIAL-1.0
+// Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
+pragma solidity ^0.8.0;
 
 library HostChainStationStructs {
     struct AddressTypeProposal {
@@ -16,13 +17,9 @@ library HostChainStationStructs {
     }
 
     struct CrosschainConfig {
-        uint32 externalChainStationDomainId;
-        address mailboxAddress;
-        uint32 externalChainStationEid;
-        address endpointAddress;
-        string externalChainStationChainName;
-        address gasServiceAddress;
-        address gatewayAddress;
+        HyperlaneConfig hyperlane;
+        LayerZeroConfig layerZero;
+        AxelarConfig axelar;
     }
 
     struct HyperlaneConfig {
@@ -38,7 +35,7 @@ library HostChainStationStructs {
     }
 }
 
-interface TreasuryHostChainStation {
+interface ITreasuryHostChainStation {
     struct EnforcedOptionParam {
         uint32 eid;
         uint16 msgType;

package/library/Erc191TestBuilder.sol

@@ -4,15 +4,14 @@
 pragma solidity ^0.8.0;
 /**
  * @title Erc191TestBuilder
- * @author Mate labs
+ * @author jistro.eth
  * @notice this library is used to build ERC191 messages for foundry test scripts
  *         more info in
  *         https://book.getfoundry.sh/cheatcodes/create-wallet
  *         https://book.getfoundry.sh/cheatcodes/sign
  */
 
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {AdvancedStrings} from "./AdvancedStrings.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 
 library Erc191TestBuilder {
     //-----------------------------------------------------------------------------------
@@ -30,7 +29,7 @@ library Erc191TestBuilder {
         address _executor
     ) internal pure returns (bytes32 messageHash) {
         string memory messageToSign = string.concat(
-            Strings.toString(evvmID),
+            AdvancedStrings.uintToString(evvmID),
             ",",
             "pay",
             ",",
@@ -40,11 +39,11 @@ library Erc191TestBuilder {
             ",",
             AdvancedStrings.addressToString(_token),
             ",",
-            Strings.toString(_amount),
+            AdvancedStrings.uintToString(_amount),
             ",",
-            Strings.toString(_priorityFee),
+            AdvancedStrings.uintToString(_priorityFee),
             ",",
-            Strings.toString(_nonce),
+            AdvancedStrings.uintToString(_nonce),
             ",",
             _priority_boolean ? "true" : "false",
             ",",
@@ -66,7 +65,7 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "dispersePay",
                     ",",
@@ -74,11 +73,11 @@ library Erc191TestBuilder {
                     ",",
                     AdvancedStrings.addressToString(_token),
                     ",",
-                    Strings.toString(_amount),
+                    AdvancedStrings.uintToString(_amount),
                     ",",
-                    Strings.toString(_priorityFee),
+                    AdvancedStrings.uintToString(_priorityFee),
                     ",",
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     _priority_boolean ? "true" : "false",
                     ",",
@@ -99,13 +98,13 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "preRegistrationUsername",
                     ",",
                     AdvancedStrings.bytes32ToString(_hashUsername),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -119,15 +118,15 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "registrationUsername",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_clowNumber),
+                    AdvancedStrings.uintToString(_clowNumber),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -142,17 +141,17 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "makeOffer",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_dateExpire),
+                    AdvancedStrings.uintToString(_dateExpire),
                     ",",
-                    Strings.toString(_amount),
+                    AdvancedStrings.uintToString(_amount),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -166,15 +165,15 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "withdrawOffer",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_offerId),
+                    AdvancedStrings.uintToString(_offerId),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -188,15 +187,15 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "acceptOffer",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_offerId),
+                    AdvancedStrings.uintToString(_offerId),
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -209,13 +208,13 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "renewUsername",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -229,7 +228,7 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "addCustomMetadata",
                     ",",
@@ -237,7 +236,7 @@ library Erc191TestBuilder {
                     ",",
                     _value,
                     ",",
-                    Strings.toString(_nameServiceNonce)
+                    AdvancedStrings.uintToString(_nameServiceNonce)
                 )
             );
     }
@@ -251,15 +250,15 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "removeCustomMetadata",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_key),
+                    AdvancedStrings.uintToString(_key),
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 )
             );
     }
@@ -272,13 +271,13 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "flushCustomMetadata",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 )
             );
     }
@@ -291,13 +290,13 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "flushUsername",
                     ",",
                     _username,
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 )
             );
     }
@@ -316,7 +315,7 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "publicServiceStaking",
                     ",",
@@ -324,9 +323,9 @@ library Erc191TestBuilder {
                     ",",
                     _isStaking ? "true" : "false",
                     ",",
-                    Strings.toString(_amountOfStaking),
+                    AdvancedStrings.uintToString(_amountOfStaking),
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 )
             );
     }
@@ -340,15 +339,15 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "publicStaking",
                     ",",
                     _isStaking ? "true" : "false",
                     ",",
-                    Strings.toString(_amountOfStaking),
+                    AdvancedStrings.uintToString(_amountOfStaking),
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 )
             );
     }
@@ -362,15 +361,15 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "presaleStaking",
                     ",",
                     _isStaking ? "true" : "false",
                     ",",
-                    Strings.toString(_amountOfStaking),
+                    AdvancedStrings.uintToString(_amountOfStaking),
                     ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 )
             );
     }
@@ -390,19 +389,19 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "makeOrder",
                     ",",
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     AdvancedStrings.addressToString(_tokenA),
                     ",",
                     AdvancedStrings.addressToString(_tokenB),
                     ",",
-                    Strings.toString(_amountA),
+                    AdvancedStrings.uintToString(_amountA),
                     ",",
-                    Strings.toString(_amountB)
+                    AdvancedStrings.uintToString(_amountB)
                 )
             );
     }
@@ -417,17 +416,17 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "cancelOrder",
                     ",",
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     AdvancedStrings.addressToString(_tokenA),
                     ",",
                     AdvancedStrings.addressToString(_tokenB),
                     ",",
-                    Strings.toString(_orderId)
+                    AdvancedStrings.uintToString(_orderId)
                 )
             );
     }
@@ -442,17 +441,17 @@ library Erc191TestBuilder {
         return
             buildHashForSign(
                 string.concat(
-                    Strings.toString(evvmID),
+                    AdvancedStrings.uintToString(evvmID),
                     ",",
                     "dispatchOrder",
                     ",",
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     AdvancedStrings.addressToString(_tokenA),
                     ",",
                     AdvancedStrings.addressToString(_tokenB),
                     ",",
-                    Strings.toString(_orderId)
+                    AdvancedStrings.uintToString(_orderId)
                 )
             );
     }
@@ -468,7 +467,7 @@ library Erc191TestBuilder {
             keccak256(
                 abi.encodePacked(
                     "\x19Ethereum Signed Message:\n",
-                    Strings.toString(bytes(messageToSign).length),
+                    AdvancedStrings.uintToString(bytes(messageToSign).length),
                     messageToSign
                 )
             );

package/library/EvvmService.sol

@@ -0,0 +1,40 @@
+// 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 "@evvm/testnet-contracts/interfaces/IEvvm.sol";
+import {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
+import {AsyncNonce} from "@evvm/testnet-contracts/library/utils/nonces/AsyncNonce.sol";
+import {StakingServiceUtils} from "@evvm/testnet-contracts/library/utils/service/StakingServiceUtils.sol";
+import {EvvmPayments} from "@evvm/testnet-contracts/library/utils/service/EvvmPayments.sol";
+
+abstract contract EvvmService is
+    AsyncNonce,
+    StakingServiceUtils,
+    EvvmPayments
+{
+    error InvalidServiceSignature();
+
+    constructor(
+        address evvmAddress,
+        address stakingAddress
+    ) StakingServiceUtils(stakingAddress) EvvmPayments(evvmAddress) {}
+
+    function validateServiceSignature(
+        string memory functionName,
+        string memory inputs,
+        bytes memory signature,
+        address expectedSigner
+    ) internal view virtual {
+        if (
+            !SignatureUtil.verifySignature(
+                evvm.getEvvmID(),
+                functionName,
+                inputs,
+                signature,
+                expectedSigner
+            )
+        ) revert InvalidServiceSignature();
+    }
+}