@evvm/testnet-contracts 2.1.3 → 2.2.1

package/contracts/p2pSwap/lib/P2PSwapStructs.sol

@@ -0,0 +1,59 @@
+// 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;
+    }
+}

package/contracts/p2pSwap/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
@@ -25,19 +23,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 +52,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 +79,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

@@ -16,6 +16,7 @@ MMMMMMMMMMMM
  */
 
 import {Staking} from "@evvm/testnet-contracts/contracts/staking/Staking.sol";
+import {StakingStructs} from "@evvm/testnet-contracts/contracts/staking/lib/StakingStructs.sol";
 import {Evvm} from "@evvm/testnet-contracts/contracts/evvm/Evvm.sol";
 
 contract Estimator {
@@ -111,7 +112,7 @@ contract Estimator {
         uint256 sumSmT;
 
         uint256 tLast = epoch.tStart;
-        Staking.HistoryMetadata memory h;
+        StakingStructs.HistoryMetadata memory h;
         uint256 size = Staking(addressStaking.actual).getSizeOfAddressHistory(
             _user
         );
@@ -180,7 +181,7 @@ contract Estimator {
         address _proposal
     ) external onlyActivator {
         activator.proposal = _proposal;
-        activator.timeToAccept = block.timestamp + 1 minutes;
+        activator.timeToAccept = block.timestamp + 1 days;
     }
 
     function cancelActivatorProposal() external onlyActivator {
@@ -200,7 +201,7 @@ contract Estimator {
         address _proposal
     ) external onlyAdmin {
         evvmAddress.proposal = _proposal;
-        evvmAddress.timeToAccept = block.timestamp + 1 minutes;
+        evvmAddress.timeToAccept = block.timestamp + 1 days;
     }
 
     function cancelEvvmAddressProposal() external onlyAdmin {
@@ -220,7 +221,7 @@ contract Estimator {
         address _proposal
     ) external onlyAdmin {
         addressStaking.proposal = _proposal;
-        addressStaking.timeToAccept = block.timestamp + 1 minutes;
+        addressStaking.timeToAccept = block.timestamp + 1 days;
     }
 
     function cancelAddressStakingProposal() external onlyAdmin {
@@ -240,7 +241,7 @@ contract Estimator {
         address _proposal
     ) external onlyAdmin {
         admin.proposal = _proposal;
-        admin.timeToAccept = block.timestamp + 1 minutes;
+        admin.timeToAccept = block.timestamp + 1 days;
     }
 
     function cancelAdminProposal() external onlyAdmin {
@@ -315,7 +316,7 @@ contract Estimator {
         uint256 sumSmT;
 
         uint256 tLast = epoch.tStart;
-        Staking.HistoryMetadata memory h;
+        StakingStructs.HistoryMetadata memory h;
         uint256 size = Staking(addressStaking.actual).getSizeOfAddressHistory(
             _user
         );