@evvm/testnet-contracts 3.0.0 → 3.0.2

package/interfaces/ICore.sol

@@ -145,7 +145,7 @@ interface ICore {
     function rejectUpgrade() external;
     function removeAmountFromUser(address user, address token, uint256 amount) external;
     function reserveAsyncNonce(uint256 nonce, address serviceAddress) external;
-    function revokeAsyncNonce(address user, uint256 nonce) external;
+    function revokeAsyncNonce(uint256 nonce) external;
     function setEvvmID(uint256 newEvvmID) external;
     function setPointStaker(address user, bytes1 answer) external;
     function validateAndConsumeNonce(

package/interfaces/IP2PSwap.sol

@@ -133,8 +133,6 @@ interface IP2PSwap {
     function rejectProposeOwner() external;
     function rejectProposePercentageFee() external;
     function rejectProposeWithdrawal() external;
-    function reserveAsyncNonceToService(uint256 nonce) external;
-    function revokeAsyncNonceToService(address user, uint256 nonce) external;
     function stake(uint256 amount) external;
     function unstake(uint256 amount) external;
 }

package/library/errors/CoreError.sol

@@ -74,13 +74,12 @@ library CoreError {
     /// @dev Thrown when address validation fails in proposals
     error IncorrectAddressInput();
 
-    //░▒▓█ Time-Lock Errors █████████████████████████████████████████████████████▓▒░
-
-    /// @dev Thrown when attempting time-locked action before delay (30d impl, 1d admin)
-    error TimeLockNotExpired();
-
+    //░▒▓█ Proposal Errors █████████████████████████████████████████████████████▓▒░
 
+    /// @dev Thrown when accepting before timelock
+    error ProposalNotReadyToAccept();
 
+    //░▒▓█ Async/Sync Nonce Errors ██████████████████████████████████████████████▓▒░
     /// @dev Thrown when async nonce already consumed
     error AsyncNonceAlreadyUsed();
 
@@ -102,15 +101,30 @@ library CoreError {
     /// @dev Thrown when using async nonce reserved by different service
     error AsyncNonceIsReservedByAnotherService();
 
-    /// @dev Thrown when accepting UserValidator proposal before timelock
-    error ProposalForUserValidatorNotReady();
-
     /// @dev Thrown when validateAndConsumeNonce caller is EOA (contracts only)
     error MsgSenderIsNotAContract();
 
-    /// @dev Thrown when accepting EVVM address proposal before timelock
-    error ProposalForEvvmAddressNotReady();
-
     /// @dev Thrown when reserving nonce with service == address(0)
     error InvalidServiceAddress();
+
+    //░▒▓█ Token List Errors ████████████████████████████████████████████████████▓▒░
+    /**
+     * @dev Thrown when a token is in
+     *    - the denylist (if the denylist is active)
+     *    - not in the allowlist (if the allowlist is active)
+     */
+    error TokenIsDeniedForExecution();
+
+    /// @dev Thrown when list status is invalid (not 0x00, 0x01, or 0x02)
+    error InvalidListStatus();
+
+    //░▒▓█ Reward Distribution State ██████████████████████████████████████████████████████▓▒░
+
+    error RewardFlowDistributionChangeNotAllowed();
+
+    error BaseRewardIncreaseNotAllowed();
+
+    //░▒▓█ Total Supply State ██████████████████████████████████████████████████████▓▒░
+
+    error MaxSupplyDeletionNotAllowed();
 }

package/library/structs/P2PSwapStructs.sol

@@ -10,7 +10,7 @@ pragma solidity ^0.8.0;
  * @dev All operations validated via Core.sol async nonces. Payments via Core.sol.
  */
 
-abstract contract P2PSwapStructs {
+library P2PSwapStructs {
     /**
      * @notice Market metadata for token pair trading
      * @dev Tracks order slot allocation and active order count.
@@ -68,60 +68,4 @@ abstract contract P2PSwapStructs {
         uint256 service;
         uint256 mateStaker;
     }
-
-    /**
-     * @notice Metadata for makeOrder operation signature
-     * @dev Hashed via P2PSwapHashUtils. Validated via Core.sol with async nonce.
-     * @param nonce Async nonce
-     * @param tokenA Token offered
-     * @param tokenB Token requested
-     * @param amountA Amount offered
-     * @param amountB Amount requested
-     */
-    struct MetadataMakeOrder {
-        uint256 nonce;
-        address originExecutor;
-        address tokenA;
-        address tokenB;
-        uint256 amountA;
-        uint256 amountB;
-    }
-
-    /**
-     * @notice Metadata for cancelOrder operation signature
-     * @dev Hashed via P2PSwapHashUtils. Only order owner can cancel. Async nonce.
-     * @param nonce Async nonce
-     * @param tokenA Token A in pair
-     * @param tokenB Token B in pair
-     * @param orderId Order ID to cancel
-     * @param signature EIP-191 signature from seller
-     */
-    struct MetadataCancelOrder {
-        uint256 nonce;
-        address originExecutor;
-        address tokenA;
-        address tokenB;
-        uint256 orderId;
-        bytes signature;
-    }
-
-    /**
-     * @notice Metadata for dispatchOrder operation signature
-     * @dev Hashed via P2PSwapHashUtils. Used by both proportional and fixed fee variants. Async nonce.
-     * @param nonce Async nonce
-     * @param tokenA Token A in pair
-     * @param tokenB Token B in pair
-     * @param orderId Order ID to fill
-     * @param amountOfTokenBToFill Total tokenB including fees
-     * @param signature EIP-191 signature from buyer
-     */
-    struct MetadataDispatchOrder {
-        uint256 nonce;
-        address originExecutor;
-        address tokenA;
-        address tokenB;
-        uint256 orderId;
-        uint256 amountOfTokenBToFill;
-        bytes signature;
-    }
 }

package/library/utils/governance/ProposalStructs.sol

@@ -46,4 +46,10 @@ library ProposalStructs {
         bool flag;
         uint256 timeToAccept;
     }
+
+    struct Bytes1TypeProposal {
+        bytes1 current;
+        bytes1 proposal;
+        uint256 timeToAccept;
+    }
 }

package/library/utils/service/CoreExecution.sol

@@ -121,25 +121,6 @@ abstract contract CoreExecution {
         core.disperseCaPay(toData, token, amount);
     }
 
-    /**
-     * @notice Reserves async nonce for user and this service exclusively
-     * @dev Calls core.reserveAsyncNonce(user, nonce, address(this)). Nonce can be revoked before use.
-     * @param nonce Async nonce number to reserve
-     */
-    function reserveAsyncNonceToService(uint256 nonce) external {
-        core.reserveAsyncNonce(nonce, address(this));
-    }
-
-    /**
-     * @notice Revokes reserved async nonce before use
-     * @dev Calls core.revokeAsyncNonce(user, nonce). Cannot revoke consumed nonces.
-     * @param user User address that reserved nonce
-     * @param nonce Async nonce number to revoke
-     */
-    function revokeAsyncNonceToService(address user, uint256 nonce) external {
-        core.revokeAsyncNonce(user, nonce);
-    }
-
     /**
      * @notice Gets next sequential sync nonce for user
      * @dev View function returning core.getNextCurrentSyncNonce(user). Auto-increments after each use.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evvm/testnet-contracts",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "type": "module",
   "description": "EVVM Testnet Contracts - Smart contracts and tools for scalable, modular, and cross-chain EVM virtualization",
   "files": [