@hyperlane-xyz/core 3.8.0-beta0 → 3.8.1

package/contracts/hooks/layer-zero/LayerZeroV1Hook.sol

@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+/*@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+     @@@@@  HYPERLANE  @@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+@@@@@@@@@       @@@@@@@@*/
+import {ILayerZeroEndpoint} from "@layerzerolabs/lz-evm-v1-0.7/contracts/interfaces/ILayerZeroEndpoint.sol";
+import {Message} from "../../libs/Message.sol";
+import {TypeCasts} from "../../libs/TypeCasts.sol";
+import {MailboxClient} from "../../client/MailboxClient.sol";
+import {Indexed} from "../../libs/Indexed.sol";
+import {IPostDispatchHook} from "../../interfaces/hooks/IPostDispatchHook.sol";
+import {AbstractPostDispatchHook} from "../libs/AbstractPostDispatchHook.sol";
+import {StandardHookMetadata} from "../libs/StandardHookMetadata.sol";
+
+struct LayerZeroMetadata {
+    /// @dev the destination chain identifier
+    uint16 dstChainId;
+    /// @dev the user app address on this EVM chain. Contract address that calls Endpoint.send(). Used for LZ user app config lookup
+    address userApplication;
+    /// @dev if the source transaction is cheaper than the amount of value passed, refund the additional amount to this address
+    address refundAddress;
+    /// @dev the custom message to send over LayerZero
+    bytes payload;
+    /// @dev the address on destination chain (in bytes). A 40 length byte with remote and local addresses concatenated.
+    bytes destination;
+    /// @dev  parameters for the adapter service, e.g. send some dust native token to dstChain
+    bytes adapterParam;
+}
+
+contract LayerZeroV1Hook is AbstractPostDispatchHook, MailboxClient {
+    using StandardHookMetadata for bytes;
+    using Message for bytes;
+    using TypeCasts for bytes32;
+
+    ILayerZeroEndpoint public immutable lZEndpoint;
+
+    constructor(address _mailbox, address _lZEndpoint) MailboxClient(_mailbox) {
+        lZEndpoint = ILayerZeroEndpoint(_lZEndpoint);
+    }
+
+    // ============ External Functions ============
+
+    /// @inheritdoc IPostDispatchHook
+    function hookType() external pure override returns (uint8) {
+        return uint8(IPostDispatchHook.Types.LAYER_ZERO_V1);
+    }
+
+    /// @inheritdoc AbstractPostDispatchHook
+    function _postDispatch(
+        bytes calldata metadata,
+        bytes calldata message
+    ) internal virtual override {
+        // ensure hook only dispatches messages that are dispatched by the mailbox
+        bytes32 id = message.id();
+        require(_isLatestDispatched(id), "message not dispatched by mailbox");
+
+        bytes calldata lZMetadata = metadata.getCustomMetadata();
+        LayerZeroMetadata memory layerZeroMetadata = parseLzMetadata(
+            lZMetadata
+        );
+        lZEndpoint.send{value: msg.value}(
+            layerZeroMetadata.dstChainId,
+            layerZeroMetadata.destination,
+            layerZeroMetadata.payload,
+            payable(layerZeroMetadata.refundAddress),
+            address(0), // _zroPaymentAddress is hardcoded to addr(0) because zro tokens should not be directly accepted
+            layerZeroMetadata.adapterParam
+        );
+    }
+
+    /// @inheritdoc AbstractPostDispatchHook
+    function _quoteDispatch(
+        bytes calldata metadata,
+        bytes calldata
+    ) internal view virtual override returns (uint256 nativeFee) {
+        bytes calldata lZMetadata = metadata.getCustomMetadata();
+        LayerZeroMetadata memory layerZeroMetadata = parseLzMetadata(
+            lZMetadata
+        );
+        (nativeFee, ) = lZEndpoint.estimateFees(
+            layerZeroMetadata.dstChainId,
+            layerZeroMetadata.userApplication,
+            layerZeroMetadata.payload,
+            false, // _payInZRO is hardcoded to false because zro tokens should not be directly accepted
+            layerZeroMetadata.adapterParam
+        );
+    }
+
+    /**
+     * @notice Formats LayerZero metadata using default abi encoding
+     * @param layerZeroMetadata LayerZero specific metadata
+     * @return ABI encoded metadata
+     */
+    function formatLzMetadata(
+        LayerZeroMetadata calldata layerZeroMetadata
+    ) public pure returns (bytes memory) {
+        return abi.encode(layerZeroMetadata);
+    }
+
+    /**
+     * @notice Decodes LayerZero metadata. Should be used after formatLzMetadata()
+     * @param lZMetadata ABI encoded metadata
+     */
+    function parseLzMetadata(
+        bytes calldata lZMetadata
+    ) public pure returns (LayerZeroMetadata memory parsedLayerZeroMetadata) {
+        (parsedLayerZeroMetadata) = abi.decode(lZMetadata, (LayerZeroMetadata));
+    }
+}

package/contracts/hooks/layer-zero/LayerZeroV2Hook.sol

@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+/*@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+     @@@@@  HYPERLANE  @@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+@@@@@@@@@       @@@@@@@@*/
+import {MessagingParams, MessagingFee, ILayerZeroEndpointV2} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+import {Message} from "../../libs/Message.sol";
+import {TypeCasts} from "../../libs/TypeCasts.sol";
+import {Indexed} from "../../libs/Indexed.sol";
+import {IPostDispatchHook} from "../../interfaces/hooks/IPostDispatchHook.sol";
+import {AbstractMessageIdAuthHook} from "../libs/AbstractMessageIdAuthHook.sol";
+import {StandardHookMetadata} from "../libs/StandardHookMetadata.sol";
+
+struct LayerZeroV2Metadata {
+    /// @dev the endpoint Id. prev dstChainId
+    uint32 eid;
+    /// @dev if the source transaction is cheaper than the amount of value passed, refund the additional amount to this address
+    address refundAddress;
+    /// @dev  parameters for the adapter service, e.g. send some dust native token to dstChain. prev adapterParam
+    bytes options;
+}
+
+contract LayerZeroV2Hook is AbstractMessageIdAuthHook {
+    using StandardHookMetadata for bytes;
+    using Message for bytes;
+    using TypeCasts for bytes32;
+
+    ILayerZeroEndpointV2 public immutable lZEndpoint;
+
+    /// @dev offset for Layer Zero metadata parsing
+    uint8 constant EID_OFFSET = 0;
+    uint8 constant REFUND_ADDRESS_OFFSET = 4;
+    uint8 constant OPTIONS_OFFSET = 24;
+
+    constructor(
+        address _mailbox,
+        uint32 _destinationDomain,
+        bytes32 _ism,
+        address _lZEndpoint
+    ) AbstractMessageIdAuthHook(_mailbox, _destinationDomain, _ism) {
+        lZEndpoint = ILayerZeroEndpointV2(_lZEndpoint);
+    }
+
+    // ============ External Functions ============
+
+    /// @inheritdoc AbstractMessageIdAuthHook
+    function _sendMessageId(
+        bytes calldata metadata,
+        bytes memory payload
+    ) internal override {
+        bytes calldata lZMetadata = metadata.getCustomMetadata();
+        (
+            uint32 eid,
+            address refundAddress,
+            bytes memory options
+        ) = parseLzMetadata(lZMetadata);
+
+        // Build and send message
+        MessagingParams memory msgParams = MessagingParams(
+            eid,
+            ism,
+            payload,
+            options,
+            false // payInLzToken
+        );
+        lZEndpoint.send{value: msg.value}(msgParams, refundAddress);
+    }
+
+    /// @dev payInZRO is hardcoded to false because zro tokens should not be directly accepted
+    function _quoteDispatch(
+        bytes calldata metadata,
+        bytes calldata message
+    ) internal view virtual override returns (uint256) {
+        bytes calldata lZMetadata = metadata.getCustomMetadata();
+        (uint32 eid, , bytes memory options) = parseLzMetadata(lZMetadata);
+
+        // Build and quote message
+        MessagingParams memory msgParams = MessagingParams(
+            eid,
+            message.recipient(),
+            message.body(),
+            options,
+            false // payInLzToken
+        );
+        MessagingFee memory msgFee = lZEndpoint.quote(
+            msgParams,
+            message.senderAddress()
+        );
+
+        return msgFee.nativeFee;
+    }
+
+    /**
+     * @notice Formats LayerZero metadata using default abi encoding
+     * @param layerZeroMetadata LayerZero specific metadata
+     * @return ABI encoded metadata
+     */
+    function formatLzMetadata(
+        LayerZeroV2Metadata calldata layerZeroMetadata
+    ) public pure returns (bytes memory) {
+        return
+            abi.encodePacked(
+                layerZeroMetadata.eid,
+                layerZeroMetadata.refundAddress,
+                layerZeroMetadata.options
+            );
+    }
+
+    /**
+     * @notice Decodes LayerZero metadata. Should be used after formatLzMetadata()
+     * @param lZMetadata ABI encoded metadata
+     */
+    function parseLzMetadata(
+        bytes calldata lZMetadata
+    )
+        public
+        pure
+        returns (uint32 eid, address refundAddress, bytes memory options)
+    {
+        eid = uint32(bytes4(lZMetadata[EID_OFFSET:REFUND_ADDRESS_OFFSET]));
+        refundAddress = address(
+            bytes20(lZMetadata[REFUND_ADDRESS_OFFSET:OPTIONS_OFFSET])
+        );
+        options = lZMetadata[OPTIONS_OFFSET:];
+    }
+}

package/contracts/hooks/libs/AbstractMessageIdAuthHook.sol

@@ -78,6 +78,10 @@ abstract contract AbstractMessageIdAuthHook is
             message.destination() == destinationDomain,
             "AbstractMessageIdAuthHook: invalid destination domain"
         );
+        require(
+            metadata.msgValue(0) < 2 ** 255,
+            "AbstractMessageIdAuthHook: msgValue must be less than 2 ** 255"
+        );
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
             id

package/contracts/interfaces/hooks/IPostDispatchHook.sol

@@ -23,7 +23,8 @@ interface IPostDispatchHook {
         FALLBACK_ROUTING,
         ID_AUTH_ISM,
         PAUSABLE,
-        PROTOCOL_FEE
+        PROTOCOL_FEE,
+        LAYER_ZERO_V1
     }
 
     /**

package/contracts/isms/hook/AbstractMessageIdAuthorizedIsm.sol

@@ -99,7 +99,7 @@ abstract contract AbstractMessageIdAuthorizedIsm is
      * @dev Only callable by the authorized hook.
      * @param messageId Hyperlane Id of the message.
      */
-    function verifyMessageId(bytes32 messageId) external payable virtual {
+    function verifyMessageId(bytes32 messageId) public payable virtual {
         require(
             _isAuthorized(),
             "AbstractMessageIdAuthorizedIsm: sender is not the hook"

package/contracts/isms/hook/layer-zero/LayerZeroV2Ism.sol

@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity >=0.8.0;
+
+/*@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+     @@@@@  HYPERLANE  @@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+@@@@@@@@@       @@@@@@@@*/
+
+// ============ Internal Imports ============
+
+import {IInterchainSecurityModule} from "../../../interfaces/IInterchainSecurityModule.sol";
+import {Message} from "../../../libs/Message.sol";
+import {TypeCasts} from "../../../libs/TypeCasts.sol";
+import {AbstractMessageIdAuthorizedIsm} from "../AbstractMessageIdAuthorizedIsm.sol";
+
+// ============ External Imports ============
+import {Origin} from "@layerzerolabs/lz-evm-protocol-v2/contracts/interfaces/ILayerZeroEndpointV2.sol";
+
+/**
+ * @title LayerZeroV2Ism
+ * @notice Uses LayerZero V2 deliver and verify a messages Id
+ */
+contract LayerZeroV2Ism is AbstractMessageIdAuthorizedIsm {
+    using Message for bytes;
+    using TypeCasts for bytes32;
+
+    // Layerzero endpoint address
+    address public immutable endpoint;
+
+    // ============ Constants ============
+
+    uint8 public constant moduleType =
+        uint8(IInterchainSecurityModule.Types.NULL);
+
+    // @dev the offset of msg.data where the function parameters (as bytes) begins. 4 bytes is always used when encoding the function selector
+    uint8 constant FUNC_SELECTOR_OFFSET = 4;
+
+    // @dev the offset of msg.data where Origin.sender begins. 32 is always used since calldata comes in 32 bytes.
+    uint8 constant ORIGIN_SENDER_OFFSET = FUNC_SELECTOR_OFFSET + 32;
+
+    // ============ Constructor ============
+    constructor(address _endpoint) {
+        require(
+            _endpoint != address(0),
+            "LayerZeroV2Ism: invalid authorized endpoint"
+        );
+        endpoint = _endpoint;
+    }
+
+    /**
+     * @notice Entry point for receiving msg/packet from the LayerZero endpoint.
+     * @param _lzMessage The payload of the received message.
+     * @dev Authorization verifcation is done within verifyMessageId() -> _isAuthorized()
+     */
+    function lzReceive(
+        Origin calldata,
+        bytes32,
+        bytes calldata _lzMessage,
+        address,
+        bytes calldata
+    ) external payable {
+        verifyMessageId(_messageId(_lzMessage));
+    }
+
+    // ============ Internal function ============
+
+    /**
+     * @notice Slices the messageId from the message delivered from LayerZeroV2Hook
+     * @dev message is created as abi.encodeCall(AbstractMessageIdAuthorizedIsm.verifyMessageId, id)
+     * @dev _message will be 36 bytes (4 bytes for function selector, and 32 bytes for messageId)
+     */
+    function _messageId(
+        bytes calldata _message
+    ) internal pure returns (bytes32) {
+        return bytes32(_message[FUNC_SELECTOR_OFFSET:]);
+    }
+
+    /**
+     * @notice Validates criterias to verify a message
+     * @dev this is called by AbstractMessageIdAuthorizedIsm.verifyMessageId
+     * @dev parses msg.value to get parameters from lzReceive()
+     */
+    function _isAuthorized() internal view override returns (bool) {
+        require(_isAuthorizedHook(), "LayerZeroV2Ism: hook is not authorized");
+
+        require(
+            _isAuthorizedEndPoint(),
+            "LayerZeroV2Ism: endpoint is not authorized"
+        );
+
+        return true;
+    }
+
+    /**
+     * @notice check if origin.sender is the authorized hook
+     */
+    function _isAuthorizedHook() internal view returns (bool) {
+        return bytes32(msg.data[ORIGIN_SENDER_OFFSET:]) == authorizedHook;
+    }
+
+    /**
+     * @notice check if LayerZero endpoint is authorized
+     */
+    function _isAuthorizedEndPoint() internal view returns (bool) {
+        return msg.sender == endpoint;
+    }
+}

package/contracts/middleware/InterchainAccountRouter.sol

@@ -1,12 +1,25 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.13;
 
+/*@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+     @@@@@  HYPERLANE  @@@@@@@
+    @@@@@@@@@@@@@@@@@@@@@@@@@
+   @@@@@@@@@       @@@@@@@@@
+  @@@@@@@@@       @@@@@@@@@
+ @@@@@@@@@       @@@@@@@@@
+@@@@@@@@@       @@@@@@@@*/
+
 // ============ Internal Imports ============
 import {OwnableMulticall} from "./libs/OwnableMulticall.sol";
 import {InterchainAccountMessage} from "./libs/InterchainAccountMessage.sol";
 import {CallLib} from "./libs/Call.sol";
 import {MinimalProxy} from "../libs/MinimalProxy.sol";
 import {TypeCasts} from "../libs/TypeCasts.sol";
+import {StandardHookMetadata} from "../hooks/libs/StandardHookMetadata.sol";
 import {EnumerableMapExtended} from "../libs/EnumerableMapExtended.sol";
 import {Router} from "../client/Router.sol";
 
@@ -82,17 +95,17 @@ contract InterchainAccountRouter is Router {
 
     /**
      * @notice Initializes the contract with HyperlaneConnectionClient contracts
-     * @param _interchainGasPaymaster Unused but required by HyperlaneConnectionClient
+     * @param _customHook used by the Router to set the hook to override with
      * @param _interchainSecurityModule The address of the local ISM contract
      * @param _owner The address with owner privileges
      */
     function initialize(
-        address _interchainGasPaymaster,
+        address _customHook,
         address _interchainSecurityModule,
         address _owner
     ) external initializer {
         _MailboxClient_initialize(
-            _interchainGasPaymaster,
+            _customHook,
             _interchainSecurityModule,
             _owner
         );
@@ -157,7 +170,7 @@ contract InterchainAccountRouter is Router {
         address _to,
         uint256 _value,
         bytes memory _data
-    ) external returns (bytes32) {
+    ) external payable returns (bytes32) {
         bytes32 _router = routers(_destination);
         bytes32 _ism = isms[_destination];
         bytes memory _body = InterchainAccountMessage.encode(
@@ -170,6 +183,44 @@ contract InterchainAccountRouter is Router {
         return _dispatchMessage(_destination, _router, _ism, _body);
     }
 
+    /**
+     * @notice Dispatches a single remote call to be made by an owner's
+     * interchain account on the destination domain
+     * @dev Uses the default router and ISM addresses for the destination
+     * domain, reverting if none have been configured
+     * @param _destination The remote domain of the chain to make calls on
+     * @param _to The address of the contract to call
+     * @param _value The value to include in the call
+     * @param _data The calldata
+     * @param _hookMetadata The hook metadata to override with for the hook set by the owner
+     * @return The Hyperlane message ID
+     */
+    function callRemote(
+        uint32 _destination,
+        address _to,
+        uint256 _value,
+        bytes memory _data,
+        bytes memory _hookMetadata
+    ) external payable returns (bytes32) {
+        bytes32 _router = routers(_destination);
+        bytes32 _ism = isms[_destination];
+        bytes memory _body = InterchainAccountMessage.encode(
+            msg.sender,
+            _ism,
+            _to,
+            _value,
+            _data
+        );
+        return
+            _dispatchMessageWithMetadata(
+                _destination,
+                _router,
+                _ism,
+                _body,
+                _hookMetadata
+            );
+    }
+
     /**
      * @notice Dispatches a sequence of remote calls to be made by an owner's
      * interchain account on the destination domain
@@ -183,10 +234,44 @@ contract InterchainAccountRouter is Router {
     function callRemote(
         uint32 _destination,
         CallLib.Call[] calldata _calls
-    ) external returns (bytes32) {
+    ) external payable returns (bytes32) {
         bytes32 _router = routers(_destination);
         bytes32 _ism = isms[_destination];
-        return callRemoteWithOverrides(_destination, _router, _ism, _calls);
+        bytes memory _body = InterchainAccountMessage.encode(
+            msg.sender,
+            _ism,
+            _calls
+        );
+
+        return _dispatchMessage(_destination, _router, _ism, _body);
+    }
+
+    /**
+     * @notice Dispatches a sequence of remote calls to be made by an owner's
+     * interchain account on the destination domain
+     * @dev Uses the default router and ISM addresses for the destination
+     * domain, reverting if none have been configured
+     * @dev Recommend using CallLib.build to format the interchain calls.
+     * @param _destination The remote domain of the chain to make calls on
+     * @param _calls The sequence of calls to make
+     * @param _hookMetadata The hook metadata to override with for the hook set by the owner
+     * @return The Hyperlane message ID
+     */
+    function callRemote(
+        uint32 _destination,
+        CallLib.Call[] calldata _calls,
+        bytes calldata _hookMetadata
+    ) external payable returns (bytes32) {
+        bytes32 _router = routers(_destination);
+        bytes32 _ism = isms[_destination];
+        return
+            callRemoteWithOverrides(
+                _destination,
+                _router,
+                _ism,
+                _calls,
+                _hookMetadata
+            );
     }
 
     /**
@@ -395,7 +480,7 @@ contract InterchainAccountRouter is Router {
         bytes32 _router,
         bytes32 _ism,
         CallLib.Call[] calldata _calls
-    ) public returns (bytes32) {
+    ) public payable returns (bytes32) {
         bytes memory _body = InterchainAccountMessage.encode(
             msg.sender,
             _ism,
@@ -404,6 +489,39 @@ contract InterchainAccountRouter is Router {
         return _dispatchMessage(_destination, _router, _ism, _body);
     }
 
+    /**
+     * @notice Dispatches a sequence of remote calls to be made by an owner's
+     * interchain account on the destination domain
+     * @dev Recommend using CallLib.build to format the interchain calls
+     * @param _destination The remote domain of the chain to make calls on
+     * @param _router The remote router address
+     * @param _ism The remote ISM address
+     * @param _calls The sequence of calls to make
+     * @param _hookMetadata The hook metadata to override with for the hook set by the owner
+     * @return The Hyperlane message ID
+     */
+    function callRemoteWithOverrides(
+        uint32 _destination,
+        bytes32 _router,
+        bytes32 _ism,
+        CallLib.Call[] calldata _calls,
+        bytes memory _hookMetadata
+    ) public payable returns (bytes32) {
+        bytes memory _body = InterchainAccountMessage.encode(
+            msg.sender,
+            _ism,
+            _calls
+        );
+        return
+            _dispatchMessageWithMetadata(
+                _destination,
+                _router,
+                _ism,
+                _body,
+                _hookMetadata
+            );
+    }
+
     // ============ Internal Functions ============
 
     /**
@@ -474,7 +592,33 @@ contract InterchainAccountRouter is Router {
     ) private returns (bytes32) {
         require(_router != bytes32(0), "no router specified for destination");
         emit RemoteCallDispatched(_destination, msg.sender, _router, _ism);
-        return mailbox.dispatch(_destination, _router, _body);
+        return mailbox.dispatch{value: msg.value}(_destination, _router, _body);
+    }
+
+    /**
+     * @notice Dispatches an InterchainAccountMessage to the remote router with hook metadata
+     * @param _destination The remote domain
+     * @param _router The address of the remote InterchainAccountRouter
+     * @param _ism The address of the remote ISM
+     * @param _body The InterchainAccountMessage body
+     * @param _hookMetadata The hook metadata to override with for the hook set by the owner
+     */
+    function _dispatchMessageWithMetadata(
+        uint32 _destination,
+        bytes32 _router,
+        bytes32 _ism,
+        bytes memory _body,
+        bytes memory _hookMetadata
+    ) private returns (bytes32) {
+        require(_router != bytes32(0), "no router specified for destination");
+        emit RemoteCallDispatched(_destination, msg.sender, _router, _ism);
+        return
+            mailbox.dispatch{value: msg.value}(
+                _destination,
+                _router,
+                _body,
+                _hookMetadata
+            );
     }
 
     /**

package/contracts/mock/MockHyperlaneEnvironment.sol

@@ -31,9 +31,6 @@ contract MockHyperlaneEnvironment {
         originMailbox.setDefaultIsm(address(isms[originDomain]));
         destinationMailbox.setDefaultIsm(address(isms[destinationDomain]));
 
-        igps[originDomain] = new TestInterchainGasPaymaster();
-        igps[destinationDomain] = new TestInterchainGasPaymaster();
-
         originMailbox.transferOwnership(msg.sender);
         destinationMailbox.transferOwnership(msg.sender);
 

package/contracts/test/ERC20Test.sol

@@ -19,4 +19,12 @@ contract ERC20Test is ERC20 {
     function decimals() public view override returns (uint8) {
         return _decimals;
     }
+
+    function mint(uint256 amount) public {
+        _mint(msg.sender, amount);
+    }
+
+    function mintTo(address account, uint256 amount) public {
+        _mint(account, amount);
+    }
 }

package/contracts/test/ERC4626/ERC4626Test.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.0;
+import "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts/interfaces/IERC20.sol";
+
+contract ERC4626Test is ERC4626 {
+    constructor(
+        address _asset,
+        string memory _name,
+        string memory _symbol
+    ) ERC4626(IERC20(_asset)) ERC20(_name, _symbol) {}
+}

package/contracts/test/TestInterchainGasPaymaster.sol

@@ -17,4 +17,8 @@ contract TestInterchainGasPaymaster is InterchainGasPaymaster {
     ) public pure override returns (uint256) {
         return gasPrice * gasAmount;
     }
+
+    function getDefaultGasUsage() public pure returns (uint256) {
+        return DEFAULT_GAS_USAGE;
+    }
 }