@hyperlane-xyz/core 0.5.3 → 0.5.4-1

package/contracts/libs/MultisigIsmMetadata.sol

@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity >=0.8.0;
+
+/**
+ * Format of metadata:
+ * [   0:  32] Merkle root
+ * [  32:  64] Root index
+ * [  64:  96] Origin mailbox address
+ * [  96:1120] Merkle proof
+ * [1120:1152] Threshold
+ * [1152:????] Validator signatures, 65 bytes each, length == Threshold
+ * [????:????] Addresses of the entire validator set, left padded to bytes32
+ */
+library MultisigIsmMetadata {
+    uint256 private constant MERKLE_ROOT_OFFSET = 0;
+    uint256 private constant MERKLE_INDEX_OFFSET = 32;
+    uint256 private constant ORIGIN_MAILBOX_OFFSET = 64;
+    uint256 private constant MERKLE_PROOF_OFFSET = 96;
+    uint256 private constant THRESHOLD_OFFSET = 1120;
+    uint256 private constant SIGNATURES_OFFSET = 1152;
+    uint256 private constant SIGNATURE_LENGTH = 65;
+
+    /**
+     * @notice Returns the merkle root of the signed checkpoint.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return Merkle root of the signed checkpoint
+     */
+    function root(bytes calldata _metadata) internal pure returns (bytes32) {
+        return bytes32(_metadata[MERKLE_ROOT_OFFSET:MERKLE_INDEX_OFFSET]);
+    }
+
+    /**
+     * @notice Returns the index of the signed checkpoint.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return Index of the signed checkpoint
+     */
+    function index(bytes calldata _metadata) internal pure returns (uint256) {
+        return
+            uint256(
+                bytes32(_metadata[MERKLE_INDEX_OFFSET:ORIGIN_MAILBOX_OFFSET])
+            );
+    }
+
+    /**
+     * @notice Returns the origin mailbox of the signed checkpoint as bytes32.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return Origin mailbox of the signed checkpoint as bytes32
+     */
+    function originMailbox(bytes calldata _metadata)
+        internal
+        pure
+        returns (bytes32)
+    {
+        return bytes32(_metadata[ORIGIN_MAILBOX_OFFSET:MERKLE_PROOF_OFFSET]);
+    }
+
+    /**
+     * @notice Returns the merkle proof branch of the message.
+     * @dev This appears to be more gas efficient than returning a calldata
+     * slice and using that.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return Merkle proof branch of the message.
+     */
+    function proof(bytes calldata _metadata)
+        internal
+        pure
+        returns (bytes32[32] memory)
+    {
+        return
+            abi.decode(
+                _metadata[MERKLE_PROOF_OFFSET:THRESHOLD_OFFSET],
+                (bytes32[32])
+            );
+    }
+
+    /**
+     * @notice Returns the number of required signatures. Verified against
+     * the commitment stored in the module.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return The number of required signatures.
+     */
+    function threshold(bytes calldata _metadata)
+        internal
+        pure
+        returns (uint256)
+    {
+        return uint256(bytes32(_metadata[THRESHOLD_OFFSET:SIGNATURES_OFFSET]));
+    }
+
+    /**
+     * @notice Returns the validator ECDSA signature at `_index`.
+     * @dev Assumes signatures are sorted by validator
+     * @dev Assumes `_metadata` encodes `threshold` signatures.
+     * @dev Assumes `_index` is less than `threshold`
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @param _index The index of the signature to return.
+     * @return The validator ECDSA signature at `_index`.
+     */
+    function signatureAt(bytes calldata _metadata, uint256 _index)
+        internal
+        pure
+        returns (bytes calldata)
+    {
+        uint256 _start = SIGNATURES_OFFSET + (_index * SIGNATURE_LENGTH);
+        uint256 _end = _start + SIGNATURE_LENGTH;
+        return _metadata[_start:_end];
+    }
+
+    /**
+     * @notice Returns the validator address at `_index`.
+     * @dev Assumes `_index` is less than the number of validators
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @param _index The index of the validator to return.
+     * @return The validator address at `_index`.
+     */
+    function validatorAt(bytes calldata _metadata, uint256 _index)
+        internal
+        pure
+        returns (address)
+    {
+        // Validator addresses are left padded to bytes32 in order to match
+        // abi.encodePacked(address[]).
+        uint256 _start = _validatorsOffset(_metadata) + (_index * 32) + 12;
+        uint256 _end = _start + 20;
+        return address(bytes20(_metadata[_start:_end]));
+    }
+
+    /**
+     * @notice Returns the validator set encoded as bytes. Verified against the
+     * commitment stored in the module.
+     * @dev Validator addresses are encoded as tightly packed array of bytes32,
+     * sorted to match the enumerable set stored by the module.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return The validator set encoded as bytes.
+     */
+    function validators(bytes calldata _metadata)
+        internal
+        pure
+        returns (bytes calldata)
+    {
+        return _metadata[_validatorsOffset(_metadata):];
+    }
+
+    /**
+     * @notice Returns the size of the validator set encoded in the metadata
+     * @dev Validator addresses are encoded as tightly packed array of bytes32,
+     * sorted to match the enumerable set stored by the module.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return The size of the validator set encoded in the metadata
+     */
+    function commitment(bytes calldata _metadata)
+        internal
+        pure
+        returns (uint256)
+    {
+        return (_metadata.length - _validatorsOffset(_metadata)) / 32;
+    }
+
+    /**
+     * @notice Returns the size of the validator set encoded in the metadata
+     * @dev Validator addresses are encoded as tightly packed array of bytes32,
+     * sorted to match the enumerable set stored by the module.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return The size of the validator set encoded in the metadata
+     */
+    function validatorCount(bytes calldata _metadata)
+        internal
+        pure
+        returns (uint256)
+    {
+        return (_metadata.length - _validatorsOffset(_metadata)) / 32;
+    }
+
+    /**
+     * @notice Returns the offset in bytes of the list of validators within
+     * `_metadata`.
+     * @param _metadata ABI encoded Multisig ISM metadata.
+     * @return The index at which the list of validators starts
+     */
+    function _validatorsOffset(bytes calldata _metadata)
+        private
+        pure
+        returns (uint256)
+    {
+        return SIGNATURES_OFFSET + (threshold(_metadata) * SIGNATURE_LENGTH);
+    }
+}

package/contracts/middleware/InterchainAccountRouter.sol

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
+// ============ Internal Imports ============
 import {OwnableMulticall, Call} from "../OwnableMulticall.sol";
+import {Router} from "../Router.sol";
+import {IInterchainAccountRouter} from "../../interfaces/IInterchainAccountRouter.sol";
 
 // ============ External Imports ============
-import {Router} from "../Router.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
@@ -13,7 +15,7 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
  * @title The Hello World App
  * @dev You can use this simple app as a starting point for your own application.
  */
-contract InterchainAccountRouter is Router {
+contract InterchainAccountRouter is Router, IInterchainAccountRouter {
     bytes constant bytecode = type(OwnableMulticall).creationCode;
     bytes32 constant bytecodeHash = bytes32(keccak256(bytecode));
 
@@ -25,21 +27,22 @@ contract InterchainAccountRouter is Router {
 
     function initialize(
         address _owner,
-        address _abacusConnectionManager,
+        address _mailbox,
         address _interchainGasPaymaster
     ) public initializer {
         // Transfer ownership of the contract to deployer
         _transferOwnership(_owner);
-        // Set the addresses for the ACM and IGP
+        // Set the addresses for the Mailbox and IGP
         // Alternatively, this could be done later in an initialize method
-        _setAbacusConnectionManager(_abacusConnectionManager);
+        _setMailbox(_mailbox);
         _setInterchainGasPaymaster(_interchainGasPaymaster);
     }
 
     function dispatch(uint32 _destinationDomain, Call[] calldata calls)
         external
+        returns (bytes32)
     {
-        _dispatch(_destinationDomain, abi.encode(msg.sender, calls));
+        return _dispatch(_destinationDomain, abi.encode(msg.sender, calls));
     }
 
     function getInterchainAccount(uint32 _origin, address _sender)

package/contracts/middleware/InterchainQueryRouter.sol

@@ -1,15 +1,21 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
+// ============ Internal Imports ============
 import {OwnableMulticall, Call} from "../OwnableMulticall.sol";
+import {Router} from "../Router.sol";
+import {IInterchainQueryRouter} from "../../interfaces/IInterchainQueryRouter.sol";
 
 // ============ External Imports ============
-import {Router} from "../Router.sol";
 import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
-contract InterchainQueryRouter is Router, OwnableMulticall {
+contract InterchainQueryRouter is
+    Router,
+    OwnableMulticall,
+    IInterchainQueryRouter
+{
     enum Action {
         DISPATCH,
         RESOLVE
@@ -27,14 +33,14 @@ contract InterchainQueryRouter is Router, OwnableMulticall {
 
     function initialize(
         address _owner,
-        address _abacusConnectionManager,
+        address _mailbox,
         address _interchainGasPaymaster
     ) public initializer {
         // Transfer ownership of the contract to deployer
         _transferOwnership(_owner);
-        // Set the addresses for the ACM and IGP
+        // Set the addresses for the Mailbox and IGP
         // Alternatively, this could be done later in an initialize method
-        _setAbacusConnectionManager(_abacusConnectionManager);
+        _setMailbox(_mailbox);
         _setInterchainGasPaymaster(_interchainGasPaymaster);
     }
 
@@ -47,13 +53,13 @@ contract InterchainQueryRouter is Router, OwnableMulticall {
         uint32 _destinationDomain,
         Call calldata call,
         bytes calldata callback
-    ) external {
+    ) external returns (bytes32 messageId) {
         // TODO: fix this ugly arrayification
         Call[] memory calls = new Call[](1);
         calls[0] = call;
         bytes[] memory callbacks = new bytes[](1);
         callbacks[0] = callback;
-        query(_destinationDomain, calls, callbacks);
+        messageId = query(_destinationDomain, calls, callbacks);
     }
 
     /**
@@ -65,12 +71,12 @@ contract InterchainQueryRouter is Router, OwnableMulticall {
         uint32 _destinationDomain,
         Call[] memory calls,
         bytes[] memory callbacks
-    ) public {
+    ) public returns (bytes32 messageId) {
         require(
             calls.length == callbacks.length,
             "InterchainQueryRouter: calls and callbacks must be same length"
         );
-        _dispatch(
+        messageId = _dispatch(
             _destinationDomain,
             abi.encode(Action.DISPATCH, msg.sender, calls, callbacks)
         );

package/contracts/middleware/{token-bridge/TokenBridgeRouter.sol → liquidity-layer/LiquidityLayerRouter.sol}

@@ -6,29 +6,28 @@ import {Router} from "../../Router.sol";
 import {IMessageRecipient} from "../../../interfaces/IMessageRecipient.sol";
 import {ICircleBridge} from "./interfaces/circle/ICircleBridge.sol";
 import {ICircleMessageTransmitter} from "./interfaces/circle/ICircleMessageTransmitter.sol";
-import {ITokenBridgeAdapter} from "./interfaces/ITokenBridgeAdapter.sol";
-import {ITokenBridgeMessageRecipient} from "./interfaces/ITokenBridgeMessageRecipient.sol";
+import {ILiquidityLayerAdapter} from "./interfaces/ILiquidityLayerAdapter.sol";
+import {ILiquidityLayerMessageRecipient} from "./interfaces/ILiquidityLayerMessageRecipient.sol";
 
 import {TypeCasts} from "../../libs/TypeCasts.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-contract TokenBridgeRouter is Router {
+contract LiquidityLayerRouter is Router {
     // Token bridge => adapter address
-    mapping(string => address) public tokenBridgeAdapters;
+    mapping(string => address) public liquidityLayerAdapters;
 
-    event TokenBridgeAdapterSet(string indexed bridge, address adapter);
+    event LiquidityLayerAdapterSet(string indexed bridge, address adapter);
 
     function initialize(
         address _owner,
-        address _abacusConnectionManager,
+        address _mailbox,
         address _interchainGasPaymaster
     ) public initializer {
         // Transfer ownership of the contract to deployer
         _transferOwnership(_owner);
-        // Set the addresses for the ACM and IGP
         // Alternatively, this could be done later in an initialize method
-        _setAbacusConnectionManager(_abacusConnectionManager);
+        _setMailbox(_mailbox);
         _setInterchainGasPaymaster(_interchainGasPaymaster);
     }
 
@@ -40,7 +39,7 @@ contract TokenBridgeRouter is Router {
         uint256 _amount,
         string calldata _bridge
     ) external payable {
-        ITokenBridgeAdapter _adapter = _getAdapter(_bridge);
+        ILiquidityLayerAdapter _adapter = _getAdapter(_bridge);
 
         // Transfer the tokens to the adapter
         // TODO: use safeTransferFrom
@@ -70,11 +69,11 @@ contract TokenBridgeRouter is Router {
             _messageBody // The "user" message
         );
 
-        // Dispatch the _messageWithMetadata to the destination's TokenBridgeRouter.
+        // Dispatch the _messageWithMetadata to the destination's LiquidityLayerRouter.
         _dispatchWithGas(_destinationDomain, _messageWithMetadata, msg.value);
     }
 
-    // Handles a message from an enrolled remote TokenBridgeRouter
+    // Handles a message from an enrolled remote LiquidityLayerRouter
     function _handle(
         uint32 _origin,
         bytes32, // _sender, unused
@@ -93,7 +92,7 @@ contract TokenBridgeRouter is Router {
                 (bytes32, bytes32, uint256, string, bytes, bytes)
             );
 
-        ITokenBridgeMessageRecipient _userRecipient = ITokenBridgeMessageRecipient(
+        ILiquidityLayerMessageRecipient _userRecipient = ILiquidityLayerMessageRecipient(
                 TypeCasts.bytes32ToAddress(_userRecipientAddress)
             );
 
@@ -115,20 +114,20 @@ contract TokenBridgeRouter is Router {
         );
     }
 
-    function setTokenBridgeAdapter(string calldata _bridge, address _adapter)
+    function setLiquidityLayerAdapter(string calldata _bridge, address _adapter)
         external
         onlyOwner
     {
-        tokenBridgeAdapters[_bridge] = _adapter;
-        emit TokenBridgeAdapterSet(_bridge, _adapter);
+        liquidityLayerAdapters[_bridge] = _adapter;
+        emit LiquidityLayerAdapterSet(_bridge, _adapter);
     }
 
     function _getAdapter(string memory _bridge)
         internal
         view
-        returns (ITokenBridgeAdapter _adapter)
+        returns (ILiquidityLayerAdapter _adapter)
     {
-        _adapter = ITokenBridgeAdapter(tokenBridgeAdapters[_bridge]);
+        _adapter = ILiquidityLayerAdapter(liquidityLayerAdapters[_bridge]);
         // Require the adapter to have been set
         require(address(_adapter) != address(0), "No adapter found for bridge");
     }

package/contracts/middleware/{token-bridge → liquidity-layer}/adapters/CircleBridgeAdapter.sol

@@ -5,19 +5,19 @@ import {Router} from "../../../Router.sol";
 
 import {ICircleBridge} from "../interfaces/circle/ICircleBridge.sol";
 import {ICircleMessageTransmitter} from "../interfaces/circle/ICircleMessageTransmitter.sol";
-import {ITokenBridgeAdapter} from "../interfaces/ITokenBridgeAdapter.sol";
+import {ILiquidityLayerAdapter} from "../interfaces/ILiquidityLayerAdapter.sol";
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
+contract CircleBridgeAdapter is ILiquidityLayerAdapter, Router {
     /// @notice The CircleBridge contract.
     ICircleBridge public circleBridge;
 
     /// @notice The Circle MessageTransmitter contract.
     ICircleMessageTransmitter public circleMessageTransmitter;
 
-    /// @notice The TokenBridgeRouter contract.
-    address public tokenBridgeRouter;
+    /// @notice The LiquidityLayerRouter contract.
+    address public liquidityLayerRouter;
 
     /// @notice Hyperlane domain => Circle domain.
     /// ATM, known Circle domains are Ethereum = 0 and Avalanche = 1.
@@ -54,8 +54,8 @@ contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
      */
     event TokenRemoved(address indexed token, string indexed symbol);
 
-    modifier onlyTokenBridgeRouter() {
-        require(msg.sender == tokenBridgeRouter, "!tokenBridgeRouter");
+    modifier onlyLiquidityLayerRouter() {
+        require(msg.sender == liquidityLayerRouter, "!liquidityLayerRouter");
         _;
     }
 
@@ -63,26 +63,25 @@ contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
      * @param _owner The new owner.
      * @param _circleBridge The CircleBridge contract.
      * @param _circleMessageTransmitter The Circle MessageTransmitter contract.
-     * @param _tokenBridgeRouter The TokenBridgeRouter contract.
+     * @param _liquidityLayerRouter The LiquidityLayerRouter contract.
      */
     function initialize(
         address _owner,
         address _circleBridge,
         address _circleMessageTransmitter,
-        address _tokenBridgeRouter
+        address _liquidityLayerRouter
     ) public initializer {
         // Transfer ownership of the contract to deployer
         _transferOwnership(_owner);
 
-        // Set the addresses for the ACM and IGP to address(0) - they aren't used.
-        _setAbacusConnectionManager(address(0));
+        // Set the addresses for the IGP to address(0) - it's not used.
         _setInterchainGasPaymaster(address(0));
 
         circleBridge = ICircleBridge(_circleBridge);
         circleMessageTransmitter = ICircleMessageTransmitter(
             _circleMessageTransmitter
         );
-        tokenBridgeRouter = _tokenBridgeRouter;
+        liquidityLayerRouter = _liquidityLayerRouter;
     }
 
     function sendTokens(
@@ -90,7 +89,7 @@ contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
         bytes32, // _recipientAddress, unused
         address _token,
         uint256 _amount
-    ) external onlyTokenBridgeRouter returns (bytes memory) {
+    ) external onlyLiquidityLayerRouter returns (bytes memory) {
         string memory _tokenSymbol = tokenAddressToSymbol[_token];
         require(
             bytes(_tokenSymbol).length > 0,
@@ -106,7 +105,7 @@ contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
             "CircleBridgeAdapter: No router for domain"
         );
 
-        // Approve the token to Circle. We assume that the TokenBridgeRouter
+        // Approve the token to Circle. We assume that the LiquidityLayerRouter
         // has already transferred the token to this contract.
         require(
             IERC20(_token).approve(address(circleBridge), _amount),
@@ -121,8 +120,7 @@ contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
         );
 
         emit BridgedToken(_nonce);
-
-        return abi.encodePacked(_nonce, _tokenSymbol);
+        return abi.encode(_nonce, _tokenSymbol);
     }
 
     // Returns the token and amount sent
@@ -131,7 +129,7 @@ contract CircleBridgeAdapter is ITokenBridgeAdapter, Router {
         address _recipient,
         uint256 _amount,
         bytes calldata _adapterData // The adapter data from the message
-    ) external onlyTokenBridgeRouter returns (address, uint256) {
+    ) external onlyLiquidityLayerRouter returns (address, uint256) {
         // The origin Circle domain
         uint32 _originCircleDomain = hyperlaneDomainToCircleDomain[
             _originDomain

package/contracts/middleware/{token-bridge/interfaces/ITokenBridgeAdapter.sol → liquidity-layer/interfaces/ILiquidityLayerAdapter.sol}

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
-interface ITokenBridgeAdapter {
+interface ILiquidityLayerAdapter {
     function sendTokens(
         uint32 _destinationDomain,
         bytes32 _recipientAddress,

package/contracts/middleware/{token-bridge/interfaces/ITokenBridgeMessageRecipient.sol → liquidity-layer/interfaces/ILiquidityLayerMessageRecipient.sol}

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
-interface ITokenBridgeMessageRecipient {
+interface ILiquidityLayerMessageRecipient {
     function handleWithTokens(
         uint32 _origin,
         bytes32 _sender,

package/contracts/mock/MockCircleBridge.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.13;
+
+import {ICircleBridge} from "../middleware/liquidity-layer/interfaces/circle/ICircleBridge.sol";
+import {MockToken} from "./MockToken.sol";
+
+contract MockCircleBridge is ICircleBridge {
+    uint64 public nextNonce = 0;
+    MockToken token;
+
+    constructor(MockToken _token) {
+        token = _token;
+    }
+
+    function depositForBurn(
+        uint256 _amount,
+        uint32,
+        bytes32,
+        address _burnToken
+    ) external returns (uint64 _nonce) {
+        nextNonce = nextNonce + 1;
+        _nonce = nextNonce;
+        require(address(token) == _burnToken);
+        token.transferFrom(msg.sender, address(this), _amount);
+        token.burn(_amount);
+    }
+
+    function depositForBurnWithCaller(
+        uint256,
+        uint32,
+        bytes32,
+        address,
+        bytes32
+    ) external returns (uint64 _nonce) {
+        nextNonce = nextNonce + 1;
+        _nonce = nextNonce;
+    }
+}

package/contracts/mock/MockCircleMessageTransmitter.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.13;
+
+import {ICircleMessageTransmitter} from "../middleware/liquidity-layer/interfaces/circle/ICircleMessageTransmitter.sol";
+import {MockToken} from "./MockToken.sol";
+
+contract MockCircleMessageTransmitter is ICircleMessageTransmitter {
+    mapping(bytes32 => bool) processedNonces;
+    MockToken token;
+
+    constructor(MockToken _token) {
+        token = _token;
+    }
+
+    function receiveMessage(bytes memory, bytes calldata)
+        external
+        pure
+        returns (bool success)
+    {
+        success = true;
+    }
+
+    function hashSourceAndNonce(uint32 _source, uint256 _nonce)
+        public
+        pure
+        returns (bytes32)
+    {
+        return keccak256(abi.encodePacked(_source, _nonce));
+    }
+
+    function process(
+        bytes32 _nonceId,
+        address _recipient,
+        uint256 _amount
+    ) public {
+        processedNonces[_nonceId] = true;
+        token.mint(_recipient, _amount);
+    }
+
+    function usedNonces(bytes32 _nonceId) external view returns (bool) {
+        return processedNonces[_nonceId];
+    }
+}

package/contracts/mock/MockHyperlaneEnvironment.sol

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.13;
+
+import "./MockMailbox.sol";
+import "../middleware/InterchainQueryRouter.sol";
+
+import {TypeCasts} from "../libs/TypeCasts.sol";
+
+contract MockHyperlaneEnvironment {
+    uint32 originDomain;
+    uint32 destinationDomain;
+
+    mapping(uint32 => MockMailbox) public mailboxes;
+    mapping(uint32 => InterchainQueryRouter) public queryRouters;
+
+    constructor(uint32 _originDomain, uint32 _destinationDomain) {
+        originDomain = _originDomain;
+        destinationDomain = _destinationDomain;
+
+        MockMailbox originMailbox = new MockMailbox(_originDomain);
+        MockMailbox destinationMailbox = new MockMailbox(_destinationDomain);
+
+        mailboxes[_originDomain] = originMailbox;
+        mailboxes[_destinationDomain] = destinationMailbox;
+
+        InterchainQueryRouter originQueryRouter = new InterchainQueryRouter();
+        InterchainQueryRouter destinationQueryRouter = new InterchainQueryRouter();
+
+        originQueryRouter.initialize(
+            address(this),
+            address(originMailbox),
+            address(0)
+        );
+        destinationQueryRouter.initialize(
+            address(this),
+            address(destinationMailbox),
+            address(0)
+        );
+
+        originQueryRouter.enrollRemoteRouter(
+            _destinationDomain,
+            TypeCasts.addressToBytes32(address(destinationQueryRouter))
+        );
+        destinationQueryRouter.enrollRemoteRouter(
+            _originDomain,
+            TypeCasts.addressToBytes32(address(originQueryRouter))
+        );
+
+        queryRouters[_originDomain] = originQueryRouter;
+        queryRouters[_destinationDomain] = destinationQueryRouter;
+    }
+
+    function processNextPendingMessage() public {
+        mailboxes[destinationDomain].processNextInboundMessage();
+    }
+
+    function processNextPendingMessageFromDestination() public {
+        mailboxes[originDomain].processNextInboundMessage();
+    }
+}