@evvm/testnet-contracts 2.1.2 → 2.2.0

package/contracts/p2pSwap/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;
 
@@ -25,19 +24,19 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "makeOrder",
                 string.concat(
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     AdvancedStrings.addressToString(_tokenA),
                     ",",
                     AdvancedStrings.addressToString(_tokenB),
                     ",",
-                    Strings.toString(_amountA),
+                    AdvancedStrings.uintToString(_amountA),
                     ",",
-                    Strings.toString(_amountB)
+                    AdvancedStrings.uintToString(_amountB)
                 ),
                 signature,
                 signer
@@ -54,17 +53,17 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "cancelOrder",
                 string.concat(
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     AdvancedStrings.addressToString(_tokenA),
                     ",",
                     AdvancedStrings.addressToString(_tokenB),
                     ",",
-                    Strings.toString(_orderId)
+                    AdvancedStrings.uintToString(_orderId)
                 ),
                 signature,
                 signer
@@ -81,17 +80,17 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 "dispatchOrder",
                 string.concat(
-                    Strings.toString(_nonce),
+                    AdvancedStrings.uintToString(_nonce),
                     ",",
                     AdvancedStrings.addressToString(_tokenA),
                     ",",
                     AdvancedStrings.addressToString(_tokenB),
                     ",",
-                    Strings.toString(_orderId)
+                    AdvancedStrings.uintToString(_orderId)
                 ),
                 signature,
                 signer

package/contracts/staking/Estimator.sol

@@ -180,7 +180,7 @@ contract Estimator {
         address _proposal
     ) external onlyActivator {
         activator.proposal = _proposal;
-        activator.timeToAccept = block.timestamp + 1 days;
+        activator.timeToAccept = block.timestamp + 1 minutes;
     }
 
     function cancelActivatorProposal() external onlyActivator {
@@ -200,7 +200,7 @@ contract Estimator {
         address _proposal
     ) external onlyAdmin {
         evvmAddress.proposal = _proposal;
-        evvmAddress.timeToAccept = block.timestamp + 1 days;
+        evvmAddress.timeToAccept = block.timestamp + 1 minutes;
     }
 
     function cancelEvvmAddressProposal() external onlyAdmin {
@@ -220,7 +220,7 @@ contract Estimator {
         address _proposal
     ) external onlyAdmin {
         addressStaking.proposal = _proposal;
-        addressStaking.timeToAccept = block.timestamp + 1 days;
+        addressStaking.timeToAccept = block.timestamp + 1 minutes;
     }
 
     function cancelAddressStakingProposal() external onlyAdmin {
@@ -240,7 +240,7 @@ contract Estimator {
         address _proposal
     ) external onlyAdmin {
         admin.proposal = _proposal;
-        admin.timeToAccept = block.timestamp + 1 days;
+        admin.timeToAccept = block.timestamp + 1 minutes;
     }
 
     function cancelAdminProposal() external onlyAdmin {

package/contracts/staking/Staking.sol

@@ -42,6 +42,7 @@ pragma solidity ^0.8.0;
  */
 
 import {Evvm} from "@evvm/testnet-contracts/contracts/evvm/Evvm.sol";
+import {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
 import {NameService} from "@evvm/testnet-contracts/contracts/nameService/NameService.sol";
 import {Estimator} from "@evvm/testnet-contracts/contracts/staking/Estimator.sol";
 import {ErrorsLib} from "@evvm/testnet-contracts/contracts/staking/lib/ErrorsLib.sol";
@@ -135,6 +136,8 @@ contract Staking {
         bool IsAService;
     }
 
+    uint256 constant TIME_TO_ACCEPT_PROPOSAL = 1 days;
+
     /// @dev Address of the EVVM core contract
     address private EVVM_ADDRESS;
 
@@ -211,12 +214,12 @@ contract Staking {
 
         goldenFisher.actual = initialGoldenFisher;
 
-        allowPublicStaking.flag = true;
-        allowPresaleStaking.flag = false;
+        allowPublicStaking.flag = false;
+        allowPresaleStaking.flag = true;
 
         secondsToUnlockStaking.actual = 0;
 
-        secondsToUnllockFullUnstaking.actual = 21 days;
+        secondsToUnllockFullUnstaking.actual = 5 days;
 
         breakerSetupEstimatorAndEvvm = 0x01;
     }
@@ -411,12 +414,12 @@ contract Staking {
      * @notice Prepares a service/contract account for staking by recording pre-staking state
      * @dev First step in the service staking process. Must be followed by payment via caPay and confirmServiceStaking in the same transaction
      * @param amountOfStaking Amount of staking tokens the service intends to stake
-     * 
+     *
      * Service Staking Process:
      * 1. Call prepareServiceStaking(amount) - Records balances and metadata
-     * 2. Use EVVM.caPay() to transfer the required Principal Tokens to this contract  
+     * 2. Use EVVM.caPay() to transfer the required Principal Tokens to this contract
      * 3. Call confirmServiceStaking() - Validates payment and completes staking
-     * 
+     *
      * @dev All three steps MUST occur in the same transaction or the staking will fail
      * @dev CRITICAL WARNING: If the process is not completed properly (especially if caPay is called
      *      but confirmServiceStaking is not), the Principal Tokens will remain locked in the staking
@@ -442,13 +445,13 @@ contract Staking {
     /**
      * @notice Confirms and completes the service staking operation after payment verification
      * @dev Final step in service staking. Validates that payment was made correctly and completes the staking process
-     * 
+     *
      * Validation checks:
      * - Service balance decreased by the exact staking cost
-     * - Staking contract balance increased by the exact staking cost  
+     * - Staking contract balance increased by the exact staking cost
      * - Operation occurs in the same transaction as prepareServiceStaking
      * - Caller matches the service that initiated the preparation
-     * 
+     *
      * @dev Only callable by the same contract that called prepareServiceStaking
      * @dev Must be called in the same transaction as prepareServiceStaking
      */
@@ -499,7 +502,7 @@ contract Staking {
      * @notice Allows a service/contract account to unstake their staking tokens
      * @dev Simplified unstaking process for services - no signature or payment required, just direct unstaking
      * @param amountOfStaking Amount of staking tokens to unstake
-     * 
+     *
      * @dev The service will receive Principal Tokens equal to: amountOfStaking * PRICE_OF_STAKING
      * @dev Subject to the same time locks as regular unstaking (21 days for full unstake)
      * @dev Only callable by contract accounts (services), not EOAs
@@ -761,7 +764,7 @@ contract Staking {
      */
     function proposeAdmin(address _newAdmin) external onlyOwner {
         admin.proposal = _newAdmin;
-        admin.timeToAccept = block.timestamp + 1 days;
+        admin.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -795,7 +798,7 @@ contract Staking {
      */
     function proposeGoldenFisher(address _goldenFisher) external onlyOwner {
         goldenFisher.proposal = _goldenFisher;
-        goldenFisher.timeToAccept = block.timestamp + 1 days;
+        goldenFisher.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -829,7 +832,9 @@ contract Staking {
         uint256 _secondsToUnlockStaking
     ) external onlyOwner {
         secondsToUnlockStaking.proposal = _secondsToUnlockStaking;
-        secondsToUnlockStaking.timeToAccept = block.timestamp + 1 days;
+        secondsToUnlockStaking.timeToAccept =
+            block.timestamp +
+            TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -863,7 +868,9 @@ contract Staking {
         uint256 _secondsToUnllockFullUnstaking
     ) external onlyOwner {
         secondsToUnllockFullUnstaking.proposal = _secondsToUnllockFullUnstaking;
-        secondsToUnllockFullUnstaking.timeToAccept = block.timestamp + 1 days;
+        secondsToUnllockFullUnstaking.timeToAccept =
+            block.timestamp +
+            TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -894,7 +901,9 @@ contract Staking {
      * @dev Initiates the time-delayed process to enable/disable public staking
      */
     function prepareChangeAllowPublicStaking() external onlyOwner {
-        allowPublicStaking.timeToAccept = block.timestamp + 1 days;
+        allowPublicStaking.timeToAccept =
+            block.timestamp +
+            TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -924,7 +933,9 @@ contract Staking {
      * @dev Initiates the time-delayed process to enable/disable presale staking
      */
     function prepareChangeAllowPresaleStaking() external onlyOwner {
-        allowPresaleStaking.timeToAccept = block.timestamp + 1 days;
+        allowPresaleStaking.timeToAccept =
+            block.timestamp +
+            TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**
@@ -956,7 +967,7 @@ contract Staking {
      */
     function proposeEstimator(address _estimator) external onlyOwner {
         estimator.proposal = _estimator;
-        estimator.timeToAccept = block.timestamp + 1 days;
+        estimator.timeToAccept = block.timestamp + TIME_TO_ACCEPT_PROPOSAL;
     }
 
     /**

package/contracts/staking/lib/ErrorsLib.sol

@@ -20,4 +20,3 @@ library ErrorsLib {
     error ServiceDoesNotStakeInSameTx();
     error AddressMismatch();
 }
-

package/contracts/staking/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;
 
@@ -24,42 +23,15 @@ library SignatureUtils {
         bytes memory signature
     ) internal pure returns (bool) {
         return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
+            SignatureUtil.verifySignature(
+                evvmID,
                 isExternalStaking ? "publicStaking" : "presaleStaking",
                 string.concat(
                     _isStaking ? "true" : "false",
                     ",",
-                    Strings.toString(_amountOfStaking),
+                    AdvancedStrings.uintToString(_amountOfStaking),
                     ",",
-                    Strings.toString(_nonce)
-                ),
-                signature,
-                user
-            );
-    }
-
-    function verifyMessageSignedForPublicServiceStake(
-        uint256 evvmID,
-        address user,
-        address serviceAddress,
-        bool _isStaking,
-        uint256 _amountOfStaking,
-        uint256 _nonce,
-        bytes memory signature
-    ) internal pure returns (bool) {
-        return
-            SignatureRecover.signatureVerification(
-                Strings.toString(evvmID),
-                "publicServiceStaking",
-                string.concat(
-                    AdvancedStrings.addressToString(serviceAddress),
-                    ",",
-                    _isStaking ? "true" : "false",
-                    ",",
-                    Strings.toString(_amountOfStaking),
-                    ",",
-                    Strings.toString(_nonce)
+                    AdvancedStrings.uintToString(_nonce)
                 ),
                 signature,
                 user

package/contracts/treasuryTwoChains/TreasuryExternalChainStation.sol

@@ -588,7 +588,7 @@ contract TreasuryExternalChainStation is
         if (_newOwner == address(0) || _newOwner == admin.current) revert();
 
         admin.proposal = _newOwner;
-        admin.timeToAccept = block.timestamp + 1 days;
+        admin.timeToAccept = block.timestamp + 1 minutes;
     }
 
     /// @notice Cancels a pending admin change proposal
@@ -625,7 +625,7 @@ contract TreasuryExternalChainStation is
         ) revert();
 
         fisherExecutor.proposal = _newFisherExecutor;
-        fisherExecutor.timeToAccept = block.timestamp + 1 days;
+        fisherExecutor.timeToAccept = block.timestamp + 1 minutes;
     }
 
     /// @notice Cancels a pending Fisher executor change proposal
@@ -661,7 +661,7 @@ contract TreasuryExternalChainStation is
         hostChainAddressChangeProposal = ChangeHostChainAddressParams({
             porposeAddress_AddressType: hostChainStationAddress,
             porposeAddress_StringType: hostChainStationAddressString,
-            timeToAccept: block.timestamp + 1 days
+            timeToAccept: block.timestamp + 1 minutes
         });
     }
 

package/contracts/treasuryTwoChains/TreasuryHostChainStation.sol

@@ -506,7 +506,7 @@ contract TreasuryHostChainStation is
         if (_newOwner == address(0) || _newOwner == admin.current) revert();
 
         admin.proposal = _newOwner;
-        admin.timeToAccept = block.timestamp + 1 days;
+        admin.timeToAccept = block.timestamp + 1 minutes;
     }
 
     /// @notice Cancels a pending admin change proposal
@@ -543,7 +543,7 @@ contract TreasuryHostChainStation is
         ) revert();
 
         fisherExecutor.proposal = _newFisherExecutor;
-        fisherExecutor.timeToAccept = block.timestamp + 1 days;
+        fisherExecutor.timeToAccept = block.timestamp + 1 minutes;
     }
 
     /// @notice Cancels a pending Fisher executor change proposal
@@ -579,7 +579,7 @@ contract TreasuryHostChainStation is
         externalChainAddressChangeProposal = ChangeExternalChainAddressParams({
             porposeAddress_AddressType: externalChainStationAddress,
             porposeAddress_StringType: externalChainStationAddressString,
-            timeToAccept: block.timestamp + 1 days
+            timeToAccept: block.timestamp + 1 minutes
         });
     }
 

package/contracts/treasuryTwoChains/lib/SignatureUtils.sol

@@ -1,8 +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 {SignatureUtil} from "@evvm/testnet-contracts/library/utils/SignatureUtil.sol";
+import {AdvancedStrings} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 
 pragma solidity ^0.8.0;
@@ -60,19 +60,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/IStaking.sol

@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.4;
 
-interface Staking {
+interface IStaking {
     struct BoolTypeProposal {
         bool flag;
         uint256 timeToAccept;