@evvm/testnet-contracts 2.3.0 → 3.0.1

package/contracts/treasuryTwoChains/lib/PayloadUtils.sol

@@ -5,10 +5,8 @@ pragma solidity ^0.8.0;
 /**
  * @title PayloadUtils Library
  * @author Mate labs
- * @notice Utility library for encoding and decoding cross-chain transfer payloads
- * @dev Provides standardized payload format for cross-chain treasury operations
- *      Used by both TreasuryHostChainStation and TreasuryExternalChainStation
- *      to ensure consistent data format across Hyperlane, LayerZero, and Axelar protocols
+ * @notice Utility library for encoding/decoding cross-chain transfer payloads
+ * @dev Standardized payload format (ABI encoding) for TreasuryHostChainStation and TreasuryExternalChainStation. Used across Hyperlane, LayerZero, Axelar.
  */
 library PayloadUtils {
     /// @notice Encodes transfer data into a standardized cross-chain payload

package/interfaces/{IEvvm.sol → ICore.sol}

@@ -2,7 +2,20 @@
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
 pragma solidity ^0.8.0;
 
-library EvvmStructs {
+library CoreStructs {
+    struct BatchData {
+        address from;
+        address to_address;
+        string to_identity;
+        address token;
+        uint256 amount;
+        uint256 priorityFee;
+        address senderExecutor;
+        uint256 nonce;
+        bool isAsyncExec;
+        bytes signature;
+    }
+
     struct DisperseCaPayMetadata {
         uint256 amount;
         address toAddress;
@@ -24,66 +37,75 @@ library EvvmStructs {
         uint256 eraTokens;
         uint256 reward;
     }
+}
 
-    struct PayData {
-        address from;
-        address to_address;
-        string to_identity;
-        address token;
-        uint256 amount;
-        uint256 priorityFee;
-        uint256 nonce;
-        bool priorityFlag;
-        address executor;
-        bytes signature;
+library ProposalStructs {
+    struct AddressTypeProposal {
+        address current;
+        address proposal;
+        uint256 timeToAccept;
     }
 }
 
-interface IEvvm {
+interface ICore {
     error AddressCantBeZero();
+    error AsyncNonceAlreadyReserved();
     error AsyncNonceAlreadyUsed();
+    error AsyncNonceIsReservedByAnotherService();
+    error AsyncNonceNotReserved();
     error BreakerExploded();
     error ImplementationIsNotActive();
     error IncorrectAddressInput();
     error InsufficientBalance();
     error InvalidAmount();
+    error InvalidServiceAddress();
     error InvalidSignature();
+    error MsgSenderIsNotAContract();
     error NotAnCA();
+    error OriginIsNotTheOriginExecutor();
+    error ProposalForUserValidatorNotReady();
     error SenderIsNotAdmin();
-    error SenderIsNotTheExecutor();
     error SenderIsNotTheProposedAdmin();
+    error SenderIsNotTheSenderExecutor();
     error SenderIsNotTreasury();
     error SyncNonceMismatch();
     error TimeLockNotExpired();
+    error UserCannotExecuteTransaction();
     error WindowExpired();
 
     fallback() external;
 
-    function _setupNameServiceAndTreasuryAddress(address _nameServiceAddress, address _treasuryAddress) external;
     function acceptAdmin() external;
     function acceptImplementation() external;
+    function acceptUserValidatorProposal() external;
     function addAmountToUser(address user, address token, uint256 amount) external;
     function addBalance(address user, address token, uint256 quantity) external;
+    function asyncNonceStatus(address user, uint256 nonce) external view returns (bytes1);
+    function batchPay(CoreStructs.BatchData[] memory batchData)
+        external
+        returns (uint256 successfulTransactions, bool[] memory results);
     function caPay(address to, address token, uint256 amount) external;
-    function disperseCaPay(EvvmStructs.DisperseCaPayMetadata[] memory toData, address token, uint256 amount) external;
+    function cancelUserValidatorProposal() external;
+    function disperseCaPay(CoreStructs.DisperseCaPayMetadata[] memory toData, address token, uint256 amount) external;
     function dispersePay(
         address from,
-        EvvmStructs.DispersePayMetadata[] memory toData,
+        CoreStructs.DispersePayMetadata[] memory toData,
         address token,
         uint256 amount,
         uint256 priorityFee,
+        address senderExecutor,
         uint256 nonce,
-        bool priorityFlag,
-        address executor,
+        bool isAsyncExec,
         bytes memory signature
     ) external;
+    function getAsyncNonceReservation(address user, uint256 nonce) external view returns (address);
     function getBalance(address user, address token) external view returns (uint256);
     function getChainHostCoinAddress() external pure returns (address);
     function getCurrentAdmin() external view returns (address);
     function getCurrentImplementation() external view returns (address);
     function getEraPrincipalToken() external view returns (uint256);
     function getEvvmID() external view returns (uint256);
-    function getEvvmMetadata() external view returns (EvvmStructs.EvvmMetadata memory);
+    function getEvvmMetadata() external view returns (CoreStructs.EvvmMetadata memory);
     function getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
     function getNameServiceAddress() external view returns (address);
     function getNextCurrentSyncNonce(address user) external view returns (uint256);
@@ -96,8 +118,11 @@ interface IEvvm {
     function getStakingContractAddress() external view returns (address);
     function getTimeToAcceptAdmin() external view returns (uint256);
     function getTimeToAcceptImplementation() external view returns (uint256);
+    function getUserValidatorAddress() external view returns (address);
+    function getUserValidatorAddressDetails() external view returns (ProposalStructs.AddressTypeProposal memory);
     function getWhitelistTokenToBeAdded() external view returns (address);
     function getWhitelistTokenToBeAddedDateToSet() external view returns (uint256);
+    function initializeSystemContracts(address _nameServiceAddress, address _treasuryAddress) external;
     function isAddressStaker(address user) external view returns (bool);
     function pay(
         address from,
@@ -106,21 +131,29 @@ interface IEvvm {
         address token,
         uint256 amount,
         uint256 priorityFee,
+        address senderExecutor,
         uint256 nonce,
-        bool priorityFlag,
-        address executor,
+        bool isAsyncExec,
         bytes memory signature
     ) external;
-    function payMultiple(EvvmStructs.PayData[] memory payData)
-        external
-        returns (uint256 successfulTransactions, bool[] memory results);
     function pointStaker(address user, bytes1 answer) external;
     function proposeAdmin(address _newOwner) external;
     function proposeImplementation(address _newImpl) external;
+    function proposeUserValidator(address newValidator) external;
     function recalculateReward() external;
     function rejectProposalAdmin() external;
     function rejectUpgrade() external;
     function removeAmountFromUser(address user, address token, uint256 amount) external;
+    function reserveAsyncNonce(uint256 nonce, address serviceAddress) external;
+    function revokeAsyncNonce(uint256 nonce) external;
     function setEvvmID(uint256 newEvvmID) external;
     function setPointStaker(address user, bytes1 answer) external;
+    function validateAndConsumeNonce(
+        address user,
+        bytes32 hashPayload,
+        address originExecutor,
+        uint256 nonce,
+        bool isAsyncExec,
+        bytes memory signature
+    ) external;
 }

package/interfaces/IEstimator.sol

@@ -30,8 +30,8 @@ interface IEstimator {
     function getActualEpochInUint() external view returns (uint256);
     function getAddressStakingMetadata() external view returns (AddressTypeProposal memory);
     function getAdminMetadata() external view returns (AddressTypeProposal memory);
+    function getCoreAddressMetadata() external view returns (AddressTypeProposal memory);
     function getEpochMetadata() external view returns (EpochMetadata memory);
-    function getEvvmAddressMetadata() external view returns (AddressTypeProposal memory);
     function makeEstimation(address _user)
         external
         returns (

package/interfaces/INameService.sol

@@ -5,21 +5,19 @@ pragma solidity ^0.8.0;
 library NameServiceStructs {
     struct OfferMetadata {
         address offerer;
-        uint256 expireDate;
+        uint256 expirationDate;
         uint256 amount;
     }
 }
 
 interface INameService {
     error AmountMustBeGreaterThanZero();
-    error AsyncNonceAlreadyUsed();
     error CannotBeBeforeCurrentTime();
     error EmptyCustomMetadata();
     error IdentityIsNotAUsername();
     error InvalidAdminProposal();
     error InvalidEvvmAddress();
     error InvalidKey();
-    error InvalidSignatureOnNameService();
     error InvalidUsername();
     error InvalidWithdrawAmount();
     error LockTimeNotExpired();
@@ -38,24 +36,24 @@ interface INameService {
         address user,
         string memory username,
         uint256 offerID,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function acceptProposeAdmin() external;
     function addCustomMetadata(
         address user,
         string memory identity,
         string memory value,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function cancelChangeEvvmAddress() external;
     function cancelProposeAdmin() external;
@@ -64,22 +62,22 @@ interface INameService {
     function flushCustomMetadata(
         address user,
         string memory identity,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function flushUsername(
         address user,
         string memory username,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function getAdmin() external view returns (address);
     function getAdminFullDetails()
@@ -87,17 +85,16 @@ interface INameService {
         view
         returns (address currentAdmin, address proposalAdmin, uint256 timeToAcceptAdmin);
     function getAmountOfCustomMetadata(string memory _username) external view returns (uint256);
-    function getCustomMetadataMaxSlotsOfIdentity(string memory _username) external view returns (uint256);
-    function getEvvmAddress() external view returns (address);
-    function getEvvmAddressFullDetails()
+    function getCoreAddress() external view returns (address);
+    function getCoreAddressFullDetails()
         external
         view
         returns (address currentEvvmAddress, address proposalEvvmAddress, uint256 timeToAcceptEvvmAddress);
+    function getCustomMetadataMaxSlotsOfIdentity(string memory _username) external view returns (uint256);
     function getEvvmID() external view returns (uint256);
     function getExpireDateOfIdentity(string memory _identity) external view returns (uint256);
     function getFullCustomMetadataOfIdentity(string memory _username) external view returns (string[] memory);
     function getIdentityBasicMetadata(string memory _username) external view returns (address, uint256);
-    function getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
     function getLengthOfOffersUsername(string memory _username) external view returns (uint256 length);
     function getOffersOfUsername(string memory _username)
         external
@@ -126,24 +123,24 @@ interface INameService {
     function makeOffer(
         address user,
         string memory username,
-        uint256 expireDate,
         uint256 amount,
+        uint256 expirationDate,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external returns (uint256 offerID);
     function preRegistrationUsername(
         address user,
         bytes32 hashPreRegisteredUsername,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function proposeAdmin(address _adminToPropose) external;
     function proposeChangeEvvmAddress(address _newEvvmAddress) external;
@@ -151,34 +148,34 @@ interface INameService {
     function registrationUsername(
         address user,
         string memory username,
-        uint256 clowNumber,
+        uint256 lockNumber,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function removeCustomMetadata(
         address user,
         string memory identity,
         uint256 key,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function renewUsername(
         address user,
         string memory username,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function seePriceToRenew(string memory _identity) external view returns (uint256 price);
     function strictVerifyIfIdentityExist(string memory _username) external view returns (bool);
@@ -188,11 +185,11 @@ interface INameService {
         address user,
         string memory username,
         uint256 offerID,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
 }

package/interfaces/IP2PSwap.sol

@@ -12,6 +12,7 @@ library P2PSwapStructs {
 
     struct MetadataCancelOrder {
         uint256 nonce;
+        address originExecutor;
         address tokenA;
         address tokenB;
         uint256 orderId;
@@ -20,6 +21,7 @@ library P2PSwapStructs {
 
     struct MetadataDispatchOrder {
         uint256 nonce;
+        address originExecutor;
         address tokenA;
         address tokenB;
         uint256 orderId;
@@ -29,6 +31,7 @@ library P2PSwapStructs {
 
     struct MetadataMakeOrder {
         uint256 nonce;
+        address originExecutor;
         address tokenA;
         address tokenB;
         uint256 amountA;
@@ -57,7 +60,6 @@ library P2PSwapStructs {
 }
 
 interface IP2PSwap {
-    error AsyncNonceAlreadyUsed();
     error InvalidServiceSignature();
 
     function acceptFillFixedPercentage() external;
@@ -70,27 +72,24 @@ interface IP2PSwap {
     function cancelOrder(
         address user,
         P2PSwapStructs.MetadataCancelOrder memory metadata,
-        uint256 _priorityFee_Evvm,
-        uint256 _nonce_Evvm,
-        bool _priority_Evvm,
-        bytes memory _signature_Evvm
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function dispatchOrder_fillFixedFee(
         address user,
         P2PSwapStructs.MetadataDispatchOrder memory metadata,
-        uint256 _priorityFee_Evvm,
-        uint256 _nonce_Evvm,
-        bool _priority_Evvm,
-        bytes memory _signature_Evvm,
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay,
         uint256 maxFillFixedFee
     ) external;
     function dispatchOrder_fillPropotionalFee(
         address user,
         P2PSwapStructs.MetadataDispatchOrder memory metadata,
-        uint256 _priorityFee_Evvm,
-        uint256 _nonce_Evvm,
-        bool _priority_Evvm,
-        bytes memory _signature_Evvm
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function findMarket(address tokenA, address tokenB) external view returns (uint256);
     function getAllMarketOrders(uint256 market) external view returns (P2PSwapStructs.OrderForGetter[] memory orders);
@@ -104,6 +103,7 @@ interface IP2PSwap {
         external
         view
         returns (P2PSwapStructs.OrderForGetter[] memory orders);
+    function getNextCurrentSyncNonce(address user) external view returns (uint256);
     function getOrder(uint256 market, uint256 orderId) external view returns (P2PSwapStructs.Order memory order);
     function getOwner() external view returns (address);
     function getOwnerProposal() external view returns (address);
@@ -117,10 +117,9 @@ interface IP2PSwap {
         address user,
         P2PSwapStructs.MetadataMakeOrder memory metadata,
         bytes memory signature,
-        uint256 _priorityFee_Evvm,
-        uint256 _nonce_Evvm,
-        bool _priority_Evvm,
-        bytes memory _signature_Evvm
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external returns (uint256 market, uint256 orderId);
     function proposeFillFixedPercentage(uint256 _seller, uint256 _service, uint256 _mateStaker) external;
     function proposeFillPropotionalPercentage(uint256 _seller, uint256 _service, uint256 _mateStaker) external;

package/interfaces/IStaking.sol

@@ -2,12 +2,14 @@
 // Full license terms available at: https://www.evvm.info/docs/EVVMNoncommercialLicense
 pragma solidity ^0.8.0;
 
-library StakingStructs {
+library ProposalStructs {
     struct BoolTypeProposal {
         bool flag;
         uint256 timeToAccept;
     }
+}
 
+library StakingStructs {
     struct HistoryMetadata {
         bytes32 transactionType;
         uint256 amount;
@@ -21,17 +23,18 @@ interface IStaking {
     error AddressMismatch();
     error AddressMustWaitToFullUnstake();
     error AddressMustWaitToStakeAgain();
-    error AsyncNonceAlreadyUsed();
-    error InvalidSignatureOnStaking();
+    error LimitPresaleStakersExceeded();
     error PresaleStakingDisabled();
+    error PublicStakingDisabled();
     error SenderIsNotAdmin();
     error SenderIsNotGoldenFisher();
+    error SenderIsNotProposedAdmin();
     error ServiceDoesNotFulfillCorrectStakingAmount(uint256 requiredAmount);
     error ServiceDoesNotStakeInSameTx();
+    error TimeToAcceptProposalNotReached();
     error UserIsNotPresaleStaker();
     error UserPresaleStakerLimitExceeded();
 
-    function _setupEstimatorAndEvvm(address _estimator, address _evvm) external;
     function acceptNewAdmin() external;
     function acceptNewEstimator() external;
     function acceptNewGoldenFisher() external;
@@ -50,16 +53,16 @@ interface IStaking {
         external
         view
         returns (StakingStructs.HistoryMetadata memory);
-    function getAllowPresaleStaking() external view returns (StakingStructs.BoolTypeProposal memory);
-    function getAllowPublicStaking() external view returns (StakingStructs.BoolTypeProposal memory);
+    function getAllowPresaleStaking() external view returns (ProposalStructs.BoolTypeProposal memory);
+    function getAllowPublicStaking() external view returns (ProposalStructs.BoolTypeProposal memory);
+    function getCoreAddress() external view returns (address);
     function getEstimatorAddress() external view returns (address);
     function getEstimatorProposal() external view returns (address);
-    function getEvvmAddress() external view returns (address);
     function getEvvmID() external view returns (uint256);
     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 getMateAddress() external view returns (address);
     function getOwner() external view returns (address);
     function getPresaleStaker(address _account) external view returns (bool, uint256);
     function getPresaleStakerCount() external view returns (uint256);
@@ -78,7 +81,8 @@ interface IStaking {
             uint256 idToOverwriteUserHistory,
             uint256 timestampToBeOverwritten
         );
-    function goldenStaking(bool isStaking, uint256 amountOfStaking, bytes memory signature_EVVM) external;
+    function goldenStaking(bool isStaking, uint256 amountOfStaking, bytes memory signaturePay) external;
+    function initializeSystemContracts(address _estimator, address _core) external;
     function prepareChangeAllowPresaleStaking() external;
     function prepareChangeAllowPublicStaking() external;
     function prepareServiceStaking(uint256 amountOfStaking) external;
@@ -86,12 +90,12 @@ interface IStaking {
     function presaleStaking(
         address user,
         bool isStaking,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function priceOfStaking() external pure returns (uint256);
     function proposeAdmin(address _newAdmin) external;
@@ -102,12 +106,12 @@ interface IStaking {
         address user,
         bool isStaking,
         uint256 amountOfStaking,
+        address originExecutor,
         uint256 nonce,
         bytes memory signature,
-        uint256 priorityFee_EVVM,
-        uint256 nonce_EVVM,
-        bool priorityFlag_EVVM,
-        bytes memory signature_EVVM
+        uint256 priorityFeePay,
+        uint256 noncePay,
+        bytes memory signaturePay
     ) external;
     function rejectProposalAdmin() external;
     function rejectProposalEstimator() external;

package/interfaces/ITreasury.sol

@@ -4,11 +4,12 @@ pragma solidity ^0.8.0;
 
 interface ITreasury {
     error DepositAmountMustBeGreaterThanZero();
+    error DepositCoinWithToken();
     error InsufficientBalance();
     error InvalidDepositAmount();
     error PrincipalTokenIsNotWithdrawable();
 
     function deposit(address token, uint256 amount) external payable;
-    function getEvvmAddress() external view returns (address);
+    function getCoreAddress() external view returns (address);
     function withdraw(address token, uint256 amount) external;
 }

package/interfaces/ITreasuryExternalChainStation.sol

@@ -3,12 +3,6 @@
 pragma solidity ^0.8.0;
 
 library ExternalChainStationStructs {
-    struct AddressTypeProposal {
-        address current;
-        address proposal;
-        uint256 timeToAccept;
-    }
-
     struct AxelarConfig {
         string hostChainStationChainName;
         string hostChainStationAddress;
@@ -35,6 +29,14 @@ library ExternalChainStationStructs {
     }
 }
 
+library ProposalStructs {
+    struct AddressTypeProposal {
+        address current;
+        address proposal;
+        uint256 timeToAccept;
+    }
+}
+
 interface ITreasuryExternalChainStation {
     struct EnforcedOptionParam {
         uint32 eid;
@@ -50,6 +52,7 @@ interface ITreasuryExternalChainStation {
 
     error AddressEmptyCode(address target);
     error AddressInsufficientBalance(address account);
+    error AsyncNonceAlreadyUsed();
     error ChainIdNotAuthorized();
     error FailedInnerCall();
     error InsufficientBalance();
@@ -106,6 +109,7 @@ interface ITreasuryExternalChainStation {
         address tokenAddress,
         uint256 priorityFee,
         uint256 amount,
+        uint256 nonce,
         bytes memory signature
     ) external;
     function fisherBridgeSendCoin(
@@ -113,6 +117,7 @@ interface ITreasuryExternalChainStation {
         address addressToReceive,
         uint256 priorityFee,
         uint256 amount,
+        uint256 nonce,
         bytes memory signature
     ) external payable;
     function fisherBridgeSendERC20(
@@ -121,15 +126,16 @@ interface ITreasuryExternalChainStation {
         address tokenAddress,
         uint256 priorityFee,
         uint256 amount,
+        uint256 nonce,
         bytes memory signature
     ) external;
     function gateway() external view returns (address);
-    function getAdmin() external view returns (ExternalChainStationStructs.AddressTypeProposal memory);
+    function getAdmin() external view returns (ProposalStructs.AddressTypeProposal memory);
     function getAxelarConfig() external view returns (ExternalChainStationStructs.AxelarConfig memory);
-    function getFisherExecutor() external view returns (ExternalChainStationStructs.AddressTypeProposal memory);
+    function getFisherExecutor() external view returns (ProposalStructs.AddressTypeProposal memory);
     function getHyperlaneConfig() external view returns (ExternalChainStationStructs.HyperlaneConfig memory);
+    function getIfUsedAsyncNonce(address user, uint256 nonce) external view returns (bool);
     function getLayerZeroConfig() external view returns (ExternalChainStationStructs.LayerZeroConfig memory);
-    function getNextFisherExecutionNonce(address user) external view returns (uint256);
     function getOptions() external view returns (bytes memory);
     function getQuoteHyperlane(address toAddress, address token, uint256 amount) external view returns (uint256);
     function handle(uint32 _origin, bytes32 _sender, bytes memory _data) external payable;