@evvm/testnet-contracts 2.1.3 → 2.2.1

package/contracts/treasury/Treasury.sol

@@ -27,21 +27,23 @@ pragma solidity ^0.8.0;
  * @dev Secure vault for ETH and ERC20 tokens with EVVM integration and input validation
  */
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "@evvm/testnet-contracts/library/primitives/IERC20.sol";
 import {SafeTransferLib} from "@solady/utils/SafeTransferLib.sol";
-import {Evvm} from "@evvm/testnet-contracts/contracts/evvm/Evvm.sol";
-import {ErrorsLib} from "@evvm/testnet-contracts/contracts/treasury/lib/ErrorsLib.sol";
+import {IEvvm} from "@evvm/testnet-contracts/interfaces/IEvvm.sol";
+import {
+    ErrorsLib
+} from "@evvm/testnet-contracts/contracts/treasury/lib/ErrorsLib.sol";
 
 contract Treasury {
-    /// @notice Address of the EVVM core contract
-    address public evvmAddress;
+
+    IEvvm evvm;
 
     /**
      * @notice Initialize Treasury with EVVM contract address
      * @param _evvmAddress Address of the EVVM core contract
      */
     constructor(address _evvmAddress) {
-        evvmAddress = _evvmAddress;
+        evvm = IEvvm(_evvmAddress);
     }
 
     /**
@@ -56,11 +58,7 @@ contract Treasury {
                 revert ErrorsLib.DepositAmountMustBeGreaterThanZero();
             if (amount != msg.value) revert ErrorsLib.InvalidDepositAmount();
 
-            Evvm(evvmAddress).addAmountToUser(
-                msg.sender,
-                address(0),
-                msg.value
-            );
+            evvm.addAmountToUser(msg.sender, address(0), msg.value);
         } else {
             /// user is sending ERC20 tokens
 
@@ -69,7 +67,7 @@ contract Treasury {
                 revert ErrorsLib.DepositAmountMustBeGreaterThanZero();
 
             IERC20(token).transferFrom(msg.sender, address(this), amount);
-            Evvm(evvmAddress).addAmountToUser(msg.sender, token, amount);
+            evvm.addAmountToUser(msg.sender, token, amount);
         }
     }
 
@@ -79,26 +77,26 @@ contract Treasury {
      * @param amount Amount to withdraw
      */
     function withdraw(address token, uint256 amount) external {
-        if (token == Evvm(evvmAddress).getEvvmMetadata().principalTokenAddress)
+        if (token == evvm.getEvvmMetadata().principalTokenAddress)
             revert ErrorsLib.PrincipalTokenIsNotWithdrawable();
 
-        if (Evvm(evvmAddress).getBalance(msg.sender, token) < amount)
+        if (evvm.getBalance(msg.sender, token) < amount)
             revert ErrorsLib.InsufficientBalance();
 
         if (token == address(0)) {
             /// user is trying to withdraw native coin
 
-            Evvm(evvmAddress).removeAmountFromUser(
-                msg.sender,
-                address(0),
-                amount
-            );
+            evvm.removeAmountFromUser(msg.sender, address(0), amount);
             SafeTransferLib.safeTransferETH(msg.sender, amount);
         } else {
             /// user is trying to withdraw ERC20 tokens
 
-            Evvm(evvmAddress).removeAmountFromUser(msg.sender, token, amount);
+            evvm.removeAmountFromUser(msg.sender, token, amount);
             IERC20(token).transfer(msg.sender, amount);
         }
     }
+
+    function getEvvmAddress() external view returns (address) {
+        return address(evvm);
+    }
 }

package/contracts/treasuryTwoChains/TreasuryExternalChainStation.sol

@@ -31,27 +31,54 @@ pragma solidity ^0.8.0;
  * @author Mate labs
  */
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {ErrorsLib} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/ErrorsLib.sol";
-import {ExternalChainStationStructs} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/ExternalChainStationStructs.sol";
+import {IERC20} from "@evvm/testnet-contracts/library/primitives/IERC20.sol";
+import {
+    ErrorsLib
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/ErrorsLib.sol";
+import {
+    ExternalChainStationStructs
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/ExternalChainStationStructs.sol";
 
 import {SafeTransferLib} from "@solady/utils/SafeTransferLib.sol";
 
-import {SignatureUtils} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/SignatureUtils.sol";
-import {PayloadUtils} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/PayloadUtils.sol";
+import {
+    SignatureUtils
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/SignatureUtils.sol";
+import {
+    PayloadUtils
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/PayloadUtils.sol";
 
 import {IMailbox} from "@hyperlane-xyz/core/contracts/interfaces/IMailbox.sol";
 
-import {MessagingParams, MessagingReceipt} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
-import {OApp, Origin, MessagingFee} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
-import {OAppOptionsType3} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OAppOptionsType3.sol";
-import {OptionsBuilder} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol";
+import {
+    MessagingParams,
+    MessagingReceipt
+} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+import {
+    OApp,
+    Origin,
+    MessagingFee
+} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
+import {
+    OAppOptionsType3
+} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OAppOptionsType3.sol";
+import {
+    OptionsBuilder
+} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
-import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
-import {IAxelarGasService} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol";
-import {IInterchainGasEstimation} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IInterchainGasEstimation.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {
+    AxelarExecutable
+} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
+import {
+    IAxelarGasService
+} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol";
+import {
+    IInterchainGasEstimation
+} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IInterchainGasEstimation.sol";
+import {
+    AdvancedStrings
+} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 
 contract TreasuryExternalChainStation is
     ExternalChainStationStructs,
@@ -85,7 +112,9 @@ contract TreasuryExternalChainStation is
 
     /// @notice Unique identifier for the EVVM instance this station belongs to
     /// @dev Immutable value set at deployment for signature verification
-    uint256 immutable EVVM_ID;
+    uint256 evvmID;
+
+    uint256 windowTimeToChangeEvvmID;
 
     /// @notice Tracks the next nonce for Fisher bridge operations per user address
     /// @dev Prevents replay attacks in Fisher bridge transactions
@@ -142,15 +171,13 @@ contract TreasuryExternalChainStation is
     /// @dev Sets up Hyperlane, LayerZero, and Axelar configurations for multi-protocol support
     /// @param _admin Initial admin address with full administrative privileges
     /// @param _crosschainConfig Configuration struct containing all cross-chain protocol settings
-    /// @param _evvmId Unique identifier for the EVVM instance this station serves
     constructor(
         address _admin,
-        CrosschainConfig memory _crosschainConfig,
-        uint256 _evvmId
+        CrosschainConfig memory _crosschainConfig
     )
-        OApp(_crosschainConfig.endpointAddress, _admin)
+        OApp(_crosschainConfig.layerZero.endpointAddress, _admin)
         Ownable(_admin)
-        AxelarExecutable(_crosschainConfig.gatewayAddress)
+        AxelarExecutable(_crosschainConfig.axelar.gatewayAddress)
     {
         admin = AddressTypeProposal({
             current: _admin,
@@ -159,23 +186,26 @@ contract TreasuryExternalChainStation is
         });
         hyperlane = HyperlaneConfig({
             hostChainStationDomainId: _crosschainConfig
+                .hyperlane
                 .hostChainStationDomainId,
             hostChainStationAddress: "",
-            mailboxAddress: _crosschainConfig.mailboxAddress
+            mailboxAddress: _crosschainConfig.hyperlane.mailboxAddress
         });
         layerZero = LayerZeroConfig({
-            hostChainStationEid: _crosschainConfig.hostChainStationEid,
+            hostChainStationEid: _crosschainConfig
+                .layerZero
+                .hostChainStationEid,
             hostChainStationAddress: "",
-            endpointAddress: _crosschainConfig.endpointAddress
+            endpointAddress: _crosschainConfig.layerZero.endpointAddress
         });
         axelar = AxelarConfig({
             hostChainStationChainName: _crosschainConfig
+                .axelar
                 .hostChainStationChainName,
             hostChainStationAddress: "",
-            gasServiceAddress: _crosschainConfig.gasServiceAddress,
-            gatewayAddress: _crosschainConfig.gatewayAddress
+            gasServiceAddress: _crosschainConfig.axelar.gasServiceAddress,
+            gatewayAddress: _crosschainConfig.axelar.gatewayAddress
         });
-        EVVM_ID = _evvmId;
     }
 
     /// @notice One-time setup of host chain station address across all protocols
@@ -203,6 +233,21 @@ contract TreasuryExternalChainStation is
         fuseSetHostChainAddress = 0x00;
     }
 
+    /**
+     * @notice Updates the EVVM ID with a new value, restricted to admin and time-limited
+     * @dev Allows the admin to change the EVVM ID within a 1-day window after deployment
+     */
+    function setEvvmID(uint256 newEvvmID) external onlyAdmin {
+        if (evvmID != 0) {
+            if (block.timestamp > windowTimeToChangeEvvmID)
+                revert ErrorsLib.WindowToChangeEvvmIDExpired();
+        }
+
+        evvmID = newEvvmID;
+
+        windowTimeToChangeEvvmID = block.timestamp + 24 hours;
+    }
+
     /// @notice Deposits ERC20 tokens and sends them to host chain via selected protocol
     /// @dev Supports Hyperlane (0x01), LayerZero (0x02), and Axelar (0x03) protocols
     /// @param toAddress Recipient address on the host chain
@@ -341,7 +386,7 @@ contract TreasuryExternalChainStation is
     ) external onlyFisherExecutor {
         if (
             !SignatureUtils.verifyMessageSignedForFisherBridge(
-                EVVM_ID,
+                evvmID,
                 from,
                 addressToReceive,
                 nextFisherExecutionNonce[from],
@@ -373,7 +418,7 @@ contract TreasuryExternalChainStation is
     ) external onlyFisherExecutor {
         if (
             !SignatureUtils.verifyMessageSignedForFisherBridge(
-                EVVM_ID,
+                evvmID,
                 from,
                 addressToReceive,
                 nextFisherExecutionNonce[from],
@@ -414,7 +459,7 @@ contract TreasuryExternalChainStation is
     ) external payable onlyFisherExecutor {
         if (
             !SignatureUtils.verifyMessageSignedForFisherBridge(
-                EVVM_ID,
+                evvmID,
                 from,
                 addressToReceive,
                 nextFisherExecutionNonce[from],
@@ -441,7 +486,7 @@ contract TreasuryExternalChainStation is
     }
 
     // Hyperlane Specific Functions //
-    
+
     /// @notice Calculates the fee required for Hyperlane cross-chain message dispatch
     /// @dev Queries the Hyperlane mailbox for accurate fee estimation
     /// @param toAddress Recipient address on the destination chain
@@ -572,11 +617,19 @@ contract TreasuryExternalChainStation is
         string calldata _sourceAddress,
         bytes calldata _payload
     ) internal override {
-        if (!Strings.equal(_sourceChain, axelar.hostChainStationChainName))
-            revert ErrorsLib.ChainIdNotAuthorized();
+        if (
+            !AdvancedStrings.equal(
+                _sourceChain,
+                axelar.hostChainStationChainName
+            )
+        ) revert ErrorsLib.ChainIdNotAuthorized();
 
-        if (!Strings.equal(_sourceAddress, axelar.hostChainStationAddress))
-            revert ErrorsLib.SenderNotAuthorized();
+        if (
+            !AdvancedStrings.equal(
+                _sourceAddress,
+                axelar.hostChainStationAddress
+            )
+        ) revert ErrorsLib.SenderNotAuthorized();
 
         decodeAndGive(_payload);
     }
@@ -705,7 +758,7 @@ contract TreasuryExternalChainStation is
     }
 
     // Getter functions //
-    
+
     /// @notice Returns the complete admin configuration including proposals and timelock
     /// @return Current admin address, proposed admin, and acceptance timestamp
     function getAdmin() external view returns (AddressTypeProposal memory) {
@@ -798,4 +851,4 @@ contract TreasuryExternalChainStation is
     /// @notice Disabled ownership renouncement function for security
     /// @dev Prevents accidental loss of administrative control over the contract
     function renounceOwnership() public virtual override onlyOwner {}
-}
+}

package/contracts/treasuryTwoChains/TreasuryHostChainStation.sol

@@ -31,26 +31,53 @@ pragma solidity ^0.8.0;
  * @author Mate labs
  */
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {Evvm} from "@evvm/testnet-contracts/contracts/evvm/Evvm.sol";
-import {ErrorsLib} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/ErrorsLib.sol";
-import {HostChainStationStructs} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/HostChainStationStructs.sol";
-
-import {SignatureUtils} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/SignatureUtils.sol";
-import {PayloadUtils} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/PayloadUtils.sol";
+import {IERC20} from "@evvm/testnet-contracts/library/primitives/IERC20.sol";
+import {IEvvm} from "@evvm/testnet-contracts/interfaces/IEvvm.sol";
+import {
+    ErrorsLib
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/ErrorsLib.sol";
+import {
+    HostChainStationStructs
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/HostChainStationStructs.sol";
+
+import {
+    SignatureUtils
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/SignatureUtils.sol";
+import {
+    PayloadUtils
+} from "@evvm/testnet-contracts/contracts/treasuryTwoChains/lib/PayloadUtils.sol";
 
 import {IMailbox} from "@hyperlane-xyz/core/contracts/interfaces/IMailbox.sol";
 
-import {MessagingParams, MessagingReceipt} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
-import {OApp, Origin, MessagingFee} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
-import {OAppOptionsType3} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OAppOptionsType3.sol";
-import {OptionsBuilder} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol";
+import {
+    MessagingParams,
+    MessagingReceipt
+} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+import {
+    OApp,
+    Origin,
+    MessagingFee
+} from "@layerzerolabs/oapp-evm/contracts/oapp/OApp.sol";
+import {
+    OAppOptionsType3
+} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OAppOptionsType3.sol";
+import {
+    OptionsBuilder
+} from "@layerzerolabs/oapp-evm/contracts/oapp/libs/OptionsBuilder.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
-import {AxelarExecutable} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
-import {IAxelarGasService} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol";
-import {IInterchainGasEstimation} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IInterchainGasEstimation.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {
+    AxelarExecutable
+} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/executable/AxelarExecutable.sol";
+import {
+    IAxelarGasService
+} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IAxelarGasService.sol";
+import {
+    IInterchainGasEstimation
+} from "@axelar-network/axelar-gmp-sdk-solidity/contracts/interfaces/IInterchainGasEstimation.sol";
+import {
+    AdvancedStrings
+} from "@evvm/testnet-contracts/library/utils/AdvancedStrings.sol";
 
 contract TreasuryHostChainStation is
     HostChainStationStructs,
@@ -58,9 +85,9 @@ contract TreasuryHostChainStation is
     OAppOptionsType3,
     AxelarExecutable
 {
-    /// @notice Address of the EVVM core contract for balance operations
+    /// @notice EVVM core contract for balance operations
     /// @dev Used to integrate with EVVM's balance management and token operations
-    address evvmAddress;
+    IEvvm evvm;
 
     /// @notice Admin address management with time-delayed proposals
     /// @dev Stores current admin, proposed admin, and acceptance timestamp
@@ -147,11 +174,12 @@ contract TreasuryHostChainStation is
         address _admin,
         CrosschainConfig memory _crosschainConfig
     )
-        OApp(_crosschainConfig.endpointAddress, _admin)
+        OApp(_crosschainConfig.layerZero.endpointAddress, _admin)
         Ownable(_admin)
-        AxelarExecutable(_crosschainConfig.gatewayAddress)
+        AxelarExecutable(_crosschainConfig.axelar.gatewayAddress)
     {
-        evvmAddress = _evvmAddress;
+        evvm = IEvvm(_evvmAddress);
+
         admin = AddressTypeProposal({
             current: _admin,
             proposal: address(0),
@@ -159,21 +187,25 @@ contract TreasuryHostChainStation is
         });
         hyperlane = HyperlaneConfig({
             externalChainStationDomainId: _crosschainConfig
+                .hyperlane
                 .externalChainStationDomainId,
             externalChainStationAddress: "",
-            mailboxAddress: _crosschainConfig.mailboxAddress
+            mailboxAddress: _crosschainConfig.hyperlane.mailboxAddress
         });
         layerZero = LayerZeroConfig({
-            externalChainStationEid: _crosschainConfig.externalChainStationEid,
+            externalChainStationEid: _crosschainConfig
+                .layerZero
+                .externalChainStationEid,
             externalChainStationAddress: "",
-            endpointAddress: _crosschainConfig.endpointAddress
+            endpointAddress: _crosschainConfig.layerZero.endpointAddress
         });
         axelar = AxelarConfig({
             externalChainStationChainName: _crosschainConfig
+                .axelar
                 .externalChainStationChainName,
             externalChainStationAddress: "",
-            gasServiceAddress: _crosschainConfig.gasServiceAddress,
-            gatewayAddress: _crosschainConfig.gatewayAddress
+            gasServiceAddress: _crosschainConfig.axelar.gasServiceAddress,
+            gatewayAddress: _crosschainConfig.axelar.gatewayAddress
         });
     }
 
@@ -214,10 +246,10 @@ contract TreasuryHostChainStation is
         uint256 amount,
         bytes1 protocolToExecute
     ) external payable {
-        if (token == Evvm(evvmAddress).getEvvmMetadata().principalTokenAddress)
+        if (token == evvm.getEvvmMetadata().principalTokenAddress)
             revert ErrorsLib.PrincipalTokenIsNotWithdrawable();
 
-        if (Evvm(evvmAddress).getBalance(msg.sender, token) < amount)
+        if (evvm.getBalance(msg.sender, token) < amount)
             revert ErrorsLib.InsufficientBalance();
 
         executerEVVM(false, msg.sender, token, amount);
@@ -285,7 +317,7 @@ contract TreasuryHostChainStation is
     ) external onlyFisherExecutor {
         if (
             !SignatureUtils.verifyMessageSignedForFisherBridge(
-                Evvm(evvmAddress).getEvvmID(),
+                evvm.getEvvmID(),
                 from,
                 addressToReceive,
                 nextFisherExecutionNonce[from],
@@ -320,17 +352,15 @@ contract TreasuryHostChainStation is
         uint256 amount,
         bytes memory signature
     ) external onlyFisherExecutor {
-        if (
-            tokenAddress ==
-            Evvm(evvmAddress).getEvvmMetadata().principalTokenAddress
-        ) revert ErrorsLib.PrincipalTokenIsNotWithdrawable();
+        if (tokenAddress == evvm.getEvvmMetadata().principalTokenAddress)
+            revert ErrorsLib.PrincipalTokenIsNotWithdrawable();
 
-        if (Evvm(evvmAddress).getBalance(from, tokenAddress) < amount)
+        if (evvm.getBalance(from, tokenAddress) < amount)
             revert ErrorsLib.InsufficientBalance();
 
         if (
             !SignatureUtils.verifyMessageSignedForFisherBridge(
-                Evvm(evvmAddress).getEvvmID(),
+                evvm.getEvvmID(),
                 from,
                 addressToReceive,
                 nextFisherExecutionNonce[from],
@@ -359,7 +389,7 @@ contract TreasuryHostChainStation is
     }
 
     // Hyperlane Specific Functions //
-    
+
     /// @notice Calculates the fee required for Hyperlane cross-chain message dispatch
     /// @dev Queries the Hyperlane mailbox for accurate fee estimation
     /// @param toAddress Recipient address on the destination chain
@@ -490,11 +520,19 @@ contract TreasuryHostChainStation is
         string calldata _sourceAddress,
         bytes calldata _payload
     ) internal override {
-        if (!Strings.equal(_sourceChain, axelar.externalChainStationChainName))
-            revert ErrorsLib.ChainIdNotAuthorized();
+        if (
+            !AdvancedStrings.equal(
+                _sourceChain,
+                axelar.externalChainStationChainName
+            )
+        ) revert ErrorsLib.ChainIdNotAuthorized();
 
-        if (!Strings.equal(_sourceAddress, axelar.externalChainStationAddress))
-            revert ErrorsLib.SenderNotAuthorized();
+        if (
+            !AdvancedStrings.equal(
+                _sourceAddress,
+                axelar.externalChainStationAddress
+            )
+        ) revert ErrorsLib.SenderNotAuthorized();
 
         decodeAndDeposit(_payload);
     }
@@ -624,7 +662,7 @@ contract TreasuryHostChainStation is
     }
 
     // Getter functions //
-    
+
     /// @notice Returns the complete admin configuration including proposals and timelock
     /// @return Current admin address, proposed admin, and acceptance timestamp
     function getAdmin() external view returns (AddressTypeProposal memory) {
@@ -654,7 +692,7 @@ contract TreasuryHostChainStation is
     /// @notice Returns the EVVM core contract address
     /// @return Address of the EVVM contract used for balance operations
     function getEvvmAddress() external view returns (address) {
-        return evvmAddress;
+        return address(evvm);
     }
 
     /// @notice Returns the complete Hyperlane protocol configuration
@@ -714,14 +752,10 @@ contract TreasuryHostChainStation is
     ) internal {
         if (typeOfExecution) {
             // true = add
-            Evvm(evvmAddress).addAmountToUser(userToExecute, token, amount);
+            evvm.addAmountToUser(userToExecute, token, amount);
         } else {
             // false = remove
-            Evvm(evvmAddress).removeAmountFromUser(
-                userToExecute,
-                token,
-                amount
-            );
+            evvm.removeAmountFromUser(userToExecute, token, amount);
         }
     }
 

package/contracts/treasuryTwoChains/lib/ErrorsLib.sol

@@ -43,4 +43,6 @@ library ErrorsLib {
     /// @notice Thrown when Fisher bridge signature verification fails
     /// @dev Security check for Fisher bridge operations to ensure transaction authenticity and prevent replay attacks
     error InvalidSignature();
+
+    error WindowToChangeEvvmIDExpired();
 }

package/contracts/treasuryTwoChains/lib/ExternalChainStationStructs.sol

@@ -60,21 +60,10 @@ abstract contract ExternalChainStationStructs {
 
     /// @notice Unified cross-chain configuration for all supported protocols
     /// @dev Single structure containing all protocol configurations for deployment
-    /// @param hostChainStationDomainId Hyperlane domain ID for host chain
-    /// @param mailboxAddress Hyperlane mailbox contract address
-    /// @param hostChainStationEid LayerZero endpoint ID for host chain
-    /// @param endpointAddress LayerZero V2 endpoint contract address
-    /// @param hostChainStationChainName Axelar chain name for host chain
-    /// @param gasServiceAddress Axelar gas service contract address
-    /// @param gatewayAddress Axelar gateway contract address
     struct CrosschainConfig {
-        uint32 hostChainStationDomainId;
-        address mailboxAddress;
-        uint32 hostChainStationEid;
-        address endpointAddress;
-        string hostChainStationChainName;
-        address gasServiceAddress;
-        address gatewayAddress;
+        HyperlaneConfig hyperlane;
+        LayerZeroConfig layerZero;
+        AxelarConfig axelar;
     }
 
     /// @notice Parameters for coordinated host chain address changes across all protocols

package/contracts/treasuryTwoChains/lib/HostChainStationStructs.sol

@@ -69,13 +69,9 @@ abstract contract HostChainStationStructs {
     /// @param gasServiceAddress Axelar gas service contract address
     /// @param gatewayAddress Axelar gateway contract address
     struct CrosschainConfig {
-        uint32 externalChainStationDomainId;
-        address mailboxAddress;
-        uint32 externalChainStationEid;
-        address endpointAddress;
-        string externalChainStationChainName;
-        address gasServiceAddress;
-        address gatewayAddress;
+        HyperlaneConfig hyperlane;
+        LayerZeroConfig layerZero;
+        AxelarConfig axelar;
     }
 
     /// @notice Parameters for coordinated external chain address changes across all protocols