@hyperlane-xyz/core 1.0.0-beta5 → 1.0.0-beta7

package/contracts/HyperlaneConnectionClient.sol

@@ -89,6 +89,18 @@ abstract contract HyperlaneConnectionClient is
         );
     }
 
+    function __HyperlaneConnectionClient_initialize(
+        address _mailbox,
+        address _interchainGasPaymaster,
+        address _interchainSecurityModule,
+        address _owner
+    ) internal onlyInitializing {
+        _setMailbox(_mailbox);
+        _setInterchainGasPaymaster(_interchainGasPaymaster);
+        _setInterchainSecurityModule(_interchainSecurityModule);
+        _transferOwnership(_owner);
+    }
+
     // ============ External functions ============
 
     /**
@@ -144,10 +156,11 @@ abstract contract HyperlaneConnectionClient is
         emit MailboxSet(_mailbox);
     }
 
-    function _setInterchainSecurityModule(address _module)
-        internal
-        onlyContract(_module)
-    {
+    function _setInterchainSecurityModule(address _module) internal {
+        require(
+            _module == address(0) || Address.isContract(_module),
+            "!contract"
+        );
         interchainSecurityModule = IInterchainSecurityModule(_module);
         emit InterchainSecurityModuleSet(_module);
     }

package/contracts/OwnableMulticall.sol

@@ -6,6 +6,31 @@ pragma solidity ^0.8.13;
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {Call} from "./Call.sol";
 
+function _call(Call[] memory calls, bytes[] memory callbacks)
+    returns (bytes[] memory resolveCalls)
+{
+    resolveCalls = new bytes[](callbacks.length);
+    for (uint256 i = 0; i < calls.length; i++) {
+        (bool success, bytes memory returnData) = calls[i].to.call(
+            calls[i].data
+        );
+        require(success, "Multicall: call failed");
+        resolveCalls[i] = bytes.concat(callbacks[i], returnData);
+    }
+}
+
+// TODO: deduplicate
+function _proxyCallBatch(address to, bytes[] memory calls) {
+    for (uint256 i = 0; i < calls.length; i += 1) {
+        (bool success, bytes memory returnData) = to.call(calls[i]);
+        if (!success) {
+            assembly {
+                revert(add(returnData, 32), returnData)
+            }
+        }
+    }
+}
+
 /*
  * @title OwnableMulticall
  * @dev Allows only only address to execute calls to other contracts
@@ -16,7 +41,7 @@ contract OwnableMulticall is OwnableUpgradeable {
     }
 
     function initialize() external initializer {
-        _transferOwnership(msg.sender);
+        __Ownable_init();
     }
 
     function proxyCalls(Call[] calldata calls) external onlyOwner {
@@ -31,30 +56,4 @@ contract OwnableMulticall is OwnableUpgradeable {
             }
         }
     }
-
-    function _call(Call[] memory calls, bytes[] memory callbacks)
-        internal
-        returns (bytes[] memory resolveCalls)
-    {
-        resolveCalls = new bytes[](callbacks.length);
-        for (uint256 i = 0; i < calls.length; i++) {
-            (bool success, bytes memory returnData) = calls[i].to.call(
-                calls[i].data
-            );
-            require(success, "Multicall: call failed");
-            resolveCalls[i] = bytes.concat(callbacks[i], returnData);
-        }
-    }
-
-    // TODO: deduplicate
-    function proxyCallBatch(address to, bytes[] memory calls) internal {
-        for (uint256 i = 0; i < calls.length; i += 1) {
-            (bool success, bytes memory returnData) = to.call(calls[i]);
-            if (!success) {
-                assembly {
-                    revert(add(returnData, 32), returnData)
-                }
-            }
-        }
-    }
 }

package/contracts/libs/MultisigIsmMetadata.sol

@@ -137,21 +137,6 @@ library MultisigIsmMetadata {
         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,

package/contracts/middleware/InterchainAccountRouter.sol

@@ -13,19 +13,28 @@ import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 /*
- * @title The Hello World App
- * @dev You can use this simple app as a starting point for your own application.
+ * @title Interchain Accounts Router that relays messages via proxy contracts on other chains.
+ * @dev Currently does not support Sovereign Consensus (user specified Interchain Security Modules).
  */
 contract InterchainAccountRouter is Router, IInterchainAccountRouter {
     address immutable implementation;
     bytes32 immutable bytecodeHash;
 
+    /**
+     * @notice Emitted when an interchain account is created (first time message is sent from a given `origin`/`sender` pair)
+     * @param origin The domain of the chain where the message was sent from
+     * @param sender The address of the account that sent the message
+     * @param account The address of the proxy account that was created
+     */
     event InterchainAccountCreated(
         uint32 indexed origin,
         address sender,
         address account
     );
 
+    /**
+     * @notice Constructor deploys a relay (OwnableMulticall.sol) contract that will be cloned for each interchain account.
+     */
     constructor() {
         implementation = address(new OwnableMulticall());
         // cannot be stored immutably because it is dynamically sized
@@ -33,27 +42,32 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         bytecodeHash = keccak256(bytecode);
     }
 
+    /**
+     * @notice Initializes the Router contract with Hyperlane core contracts and the address of the interchain security module.
+     * @param _mailbox The address of the mailbox contract.
+     * @param _interchainGasPaymaster The address of the interchain gas paymaster contract.
+     * @param _interchainSecurityModule The address of the interchain security module contract.
+     * @param _owner The address with owner privileges.
+     */
     function initialize(
         address _mailbox,
         address _interchainGasPaymaster,
-        address _interchainSecurityModule
-    ) public initializer {
-        // Transfer ownership of the contract to `msg.sender`
-        __Router_initialize(
+        address _interchainSecurityModule,
+        address _owner
+    ) external initializer {
+        __HyperlaneConnectionClient_initialize(
             _mailbox,
             _interchainGasPaymaster,
-            _interchainSecurityModule
+            _interchainSecurityModule,
+            _owner
         );
     }
 
-    function initialize(address _mailbox, address _interchainGasPaymaster)
-        public
-        initializer
-    {
-        // Transfer ownership of the contract to `msg.sender`
-        __Router_initialize(_mailbox, _interchainGasPaymaster);
-    }
-
+    /**
+     * @notice Dispatches a sequence of calls to be relayed by the sender's interchain account on the destination domain.
+     * @param _destinationDomain The domain of the chain where the message will be sent to.
+     * @param calls The sequence of calls to be relayed.
+     */
     function dispatch(uint32 _destinationDomain, Call[] calldata calls)
         external
         returns (bytes32)
@@ -61,6 +75,13 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         return _dispatch(_destinationDomain, abi.encode(msg.sender, calls));
     }
 
+    /**
+     * @notice Dispatches a single call to be relayed by the sender's interchain account on the destination domain.
+     * @param _destinationDomain The domain of the chain where the message will be sent to.
+     * @param target The address of the contract to be called.
+     * @param data The ABI-encoded data to be called on target contract.
+     * @return The message ID of the dispatched message.
+     */
     function dispatch(
         uint32 _destinationDomain,
         address target,
@@ -71,6 +92,12 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         return _dispatch(_destinationDomain, abi.encode(msg.sender, calls));
     }
 
+    /**
+     * @notice Returns the address of the interchain account deployed on the current chain for a given `origin`/`sender` pair.
+     * @param _origin The origin domain of the interchain account.
+     * @param _sender The parent account address on the origin domain.
+     * @return The address of the interchain account.
+     */
     function getInterchainAccount(uint32 _origin, address _sender)
         public
         view
@@ -79,6 +106,12 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         return _getInterchainAccount(_salt(_origin, _sender));
     }
 
+    /**
+     * @notice Returns and deploys (if not already) the interchain account for a given `origin`/`sender` pair.
+     * @param _origin The origin domain of the interchain account.
+     * @param _sender The parent account address on the origin domain.
+     * @return The address of the interchain account.
+     */
     function getDeployedInterchainAccount(uint32 _origin, address _sender)
         public
         returns (OwnableMulticall)
@@ -94,6 +127,12 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         return OwnableMulticall(interchainAccount);
     }
 
+    /**
+     * @notice Returns the salt used to deploy the interchain account for a given `origin`/`sender` pair.
+     * @param _origin The origin domain of the interchain account.
+     * @param _sender The parent account address on the origin domain.
+     * @return The CREATE2 salt used for deploying the interchain account.
+     */
     function _salt(uint32 _origin, address _sender)
         internal
         pure
@@ -102,6 +141,11 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         return bytes32(abi.encodePacked(_origin, _sender));
     }
 
+    /**
+     * @notice Returns the address of the interchain account deployed on the current chain for a given salt.
+     * @param salt The salt used to deploy the interchain account.
+     * @return The address of the interchain account.
+     */
     function _getInterchainAccount(bytes32 salt)
         internal
         view
@@ -110,6 +154,11 @@ contract InterchainAccountRouter is Router, IInterchainAccountRouter {
         return Create2.computeAddress(salt, bytecodeHash);
     }
 
+    /**
+     * @notice Handles dispatched messages by relaying calls to the interchain account.
+     * @param _origin The origin domain of the interchain account.
+     * @param _message The ABI-encoded message containing the sender and the sequence of calls to be relayed.
+     */
     function _handle(
         uint32 _origin,
         bytes32, // router sender

package/contracts/middleware/InterchainQueryRouter.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.13;
 
 // ============ Internal Imports ============
-import {OwnableMulticall, Call} from "../OwnableMulticall.sol";
+import {_call, _proxyCallBatch, Call} from "../OwnableMulticall.sol";
 import {Router} from "../Router.sol";
 import {IInterchainQueryRouter} from "../../interfaces/IInterchainQueryRouter.sol";
 
@@ -11,52 +11,68 @@ 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,
-    IInterchainQueryRouter
-{
+/**
+ * @title Interchain Query Router that performs remote view calls on other chains and returns the result.
+ * @dev Currently does not support Sovereign Consensus (user specified Interchain Security Modules).
+ */
+contract InterchainQueryRouter is Router, IInterchainQueryRouter {
     enum Action {
         DISPATCH,
         RESOLVE
     }
 
+    /**
+     * @notice Emitted when a query is dispatched to another chain.
+     * @param destinationDomain The domain of the chain to query.
+     * @param sender The address that dispatched the query.
+     */
     event QueryDispatched(
         uint32 indexed destinationDomain,
         address indexed sender
     );
+    /**
+     * @notice Emitted when a query is returned to the origin chain.
+     * @param originDomain The domain of the chain to return the result to.
+     * @param sender The address to receive the result.
+     */
     event QueryReturned(uint32 indexed originDomain, address indexed sender);
+    /**
+     * @notice Emitted when a query is resolved on the origin chain.
+     * @param destinationDomain The domain of the chain that was queried.
+     * @param sender The address that resolved the query.
+     */
     event QueryResolved(
         uint32 indexed destinationDomain,
         address indexed sender
     );
 
+    /**
+     * @notice Initializes the Router contract with Hyperlane core contracts and the address of the interchain security module.
+     * @param _mailbox The address of the mailbox contract.
+     * @param _interchainGasPaymaster The address of the interchain gas paymaster contract.
+     * @param _interchainSecurityModule The address of the interchain security module contract.
+     * @param _owner The address with owner privileges.
+     */
     function initialize(
         address _mailbox,
         address _interchainGasPaymaster,
-        address _interchainSecurityModule
-    ) public initializer {
-        // Transfer ownership of the contract to `msg.sender`
-        __Router_initialize(
+        address _interchainSecurityModule,
+        address _owner
+    ) external initializer {
+        __HyperlaneConnectionClient_initialize(
             _mailbox,
             _interchainGasPaymaster,
-            _interchainSecurityModule
+            _interchainSecurityModule,
+            _owner
         );
     }
 
-    function initialize(address _mailbox, address _interchainGasPaymaster)
-        public
-        initializer
-    {
-        // Transfer ownership of the contract to `msg.sender`
-        __Router_initialize(_mailbox, _interchainGasPaymaster);
-    }
-
     /**
      * @param _destinationDomain Domain of destination chain
      * @param target The address of the contract to query on destination chain.
      * @param queryData The calldata of the view call to make on the destination chain.
      * @param callback Callback function selector on `msg.sender` and optionally abi-encoded prefix arguments.
+     * @return messageId The ID of the message encoding the query.
      */
     function query(
         uint32 _destinationDomain,
@@ -111,14 +127,17 @@ contract InterchainQueryRouter is
         emit QueryDispatched(_destinationDomain, msg.sender);
     }
 
-    // TODO: add REJECT behavior ala NodeJS Promise API
+    /**
+     * @notice Handles a message from remote enrolled Interchain Query Router.
+     * @param _origin The domain of the chain that sent the message.
+     * @param _message The ABI-encoded interchain query.
+     */
     function _handle(
         uint32 _origin,
         bytes32, // router sender
         bytes calldata _message
     ) internal override {
-        // TODO: fix double ABI decoding with calldata slices
-        Action action = abi.decode(_message, (Action));
+        Action action = Action(uint8(bytes1(_message[31])));
         if (action == Action.DISPATCH) {
             (
                 ,
@@ -137,7 +156,7 @@ contract InterchainQueryRouter is
                 _message,
                 (Action, address, bytes[])
             );
-            proxyCallBatch(sender, resolveCallbacks);
+            _proxyCallBatch(sender, resolveCallbacks);
             emit QueryResolved(_origin, sender);
         }
     }

package/contracts/middleware/README.md

@@ -2,12 +2,14 @@
 
 ## Interchain Accounts
 
-An interchain account is a smart contract that is deployed on a remote chain and is controlled exclusively by the deploying local account.
-Interchain accounts provide developers with a [transparent multicall API](./contracts/OwnableMulticall.sol) to remote smart contracts.
+An interchain account is a smart contract that is deployed on a remote chain controlled exclusively by the origin chain's deployer account.
+Interchain accounts provide developers with a [transparent multicall API](../OwnableMulticall.sol) to remote smart contracts.
 This avoids the need to deploy application specific smart contracts on remote chains while simultaneously enabling cross-chain composability.
 
 See [IBC Interchain Accounts](https://github.com/cosmos/ibc/blob/main/spec/app/ics-027-interchain-accounts/README.md) for the Cosmos ecosystem equivalent.
 
 ## Interchain Query System
 
-TBD
+The interchain query system generalizes view calls to contracts on remote chains. It is a [transparent multicall API](../OwnableMulticall.sol) that can be used to query remote smart contracts. This avoids the need to deploy application specific smart contracts on remote chains while simultaneously enabling cross-chain composability.
+
+See [IBC Interchain Query System](https://github.com/cosmos/ibc/tree/main/spec/app/ics-031-crosschain-queries) for the Cosmos ecosystem equivalent.

package/contracts/middleware/liquidity-layer/LiquidityLayerRouter.sol

@@ -19,27 +19,27 @@ contract LiquidityLayerRouter is Router, ILiquidityLayerRouter {
 
     event LiquidityLayerAdapterSet(string indexed bridge, address adapter);
 
+    /**
+     * @notice Initializes the Router contract with Hyperlane core contracts and the address of the interchain security module.
+     * @param _mailbox The address of the mailbox contract.
+     * @param _interchainGasPaymaster The address of the interchain gas paymaster contract.
+     * @param _interchainSecurityModule The address of the interchain security module contract.
+     * @param _owner The address with owner privileges.
+     */
     function initialize(
         address _mailbox,
         address _interchainGasPaymaster,
-        address _interchainSecurityModule
-    ) public initializer {
-        // Transfer ownership of the contract to `msg.sender`
-        __Router_initialize(
+        address _interchainSecurityModule,
+        address _owner
+    ) external initializer {
+        __HyperlaneConnectionClient_initialize(
             _mailbox,
             _interchainGasPaymaster,
-            _interchainSecurityModule
+            _interchainSecurityModule,
+            _owner
         );
     }
 
-    function initialize(address _mailbox, address _interchainGasPaymaster)
-        public
-        initializer
-    {
-        // Transfer ownership of the contract to `msg.sender`
-        __Router_initialize(_mailbox, _interchainGasPaymaster);
-    }
-
     function dispatchWithTokens(
         uint32 _destinationDomain,
         bytes32 _recipientAddress,

package/contracts/mock/MockHyperlaneEnvironment.sol

@@ -39,15 +39,18 @@ contract MockHyperlaneEnvironment {
         InterchainQueryRouter originQueryRouter = new InterchainQueryRouter();
         InterchainQueryRouter destinationQueryRouter = new InterchainQueryRouter();
 
+        address owner = address(this);
         originQueryRouter.initialize(
             address(originMailbox),
             address(igps[originDomain]),
-            address(isms[originDomain])
+            address(isms[originDomain]),
+            owner
         );
         destinationQueryRouter.initialize(
             address(destinationMailbox),
             address(igps[destinationDomain]),
-            address(isms[destinationDomain])
+            address(isms[destinationDomain]),
+            owner
         );
 
         originQueryRouter.enrollRemoteRouter(

package/contracts/test/TestRouter.sol

@@ -7,7 +7,7 @@ contract TestRouter is Router {
     event InitializeOverload();
 
     function initialize(address _mailbox) external initializer {
-        __Router_initialize(_mailbox);
+        __HyperlaneConnectionClient_initialize(_mailbox);
         emit InitializeOverload();
     }
 

package/dist/contracts/middleware/InterchainAccountRouter.d.ts

@@ -20,8 +20,7 @@ export interface InterchainAccountRouterInterface extends utils.Interface {
         "getDeployedInterchainAccount(uint32,address)": FunctionFragment;
         "getInterchainAccount(uint32,address)": FunctionFragment;
         "handle(uint32,bytes32,bytes)": FunctionFragment;
-        "initialize(address,address)": FunctionFragment;
-        "initialize(address,address,address)": FunctionFragment;
+        "initialize(address,address,address,address)": FunctionFragment;
         "interchainGasPaymaster()": FunctionFragment;
         "interchainSecurityModule()": FunctionFragment;
         "mailbox()": FunctionFragment;
@@ -33,7 +32,7 @@ export interface InterchainAccountRouterInterface extends utils.Interface {
         "setMailbox(address)": FunctionFragment;
         "transferOwnership(address)": FunctionFragment;
     };
-    getFunction(nameOrSignatureOrTopic: "dispatch(uint32,(address,bytes)[])" | "dispatch(uint32,address,bytes)" | "domains" | "enrollRemoteRouter" | "enrollRemoteRouters" | "getDeployedInterchainAccount" | "getInterchainAccount" | "handle" | "initialize(address,address)" | "initialize(address,address,address)" | "interchainGasPaymaster" | "interchainSecurityModule" | "mailbox" | "owner" | "renounceOwnership" | "routers" | "setInterchainGasPaymaster" | "setInterchainSecurityModule" | "setMailbox" | "transferOwnership"): FunctionFragment;
+    getFunction(nameOrSignatureOrTopic: "dispatch(uint32,(address,bytes)[])" | "dispatch(uint32,address,bytes)" | "domains" | "enrollRemoteRouter" | "enrollRemoteRouters" | "getDeployedInterchainAccount" | "getInterchainAccount" | "handle" | "initialize" | "interchainGasPaymaster" | "interchainSecurityModule" | "mailbox" | "owner" | "renounceOwnership" | "routers" | "setInterchainGasPaymaster" | "setInterchainSecurityModule" | "setMailbox" | "transferOwnership"): FunctionFragment;
     encodeFunctionData(functionFragment: "dispatch(uint32,(address,bytes)[])", values: [BigNumberish, CallStruct[]]): string;
     encodeFunctionData(functionFragment: "dispatch(uint32,address,bytes)", values: [BigNumberish, string, BytesLike]): string;
     encodeFunctionData(functionFragment: "domains", values?: undefined): string;
@@ -42,8 +41,7 @@ export interface InterchainAccountRouterInterface extends utils.Interface {
     encodeFunctionData(functionFragment: "getDeployedInterchainAccount", values: [BigNumberish, string]): string;
     encodeFunctionData(functionFragment: "getInterchainAccount", values: [BigNumberish, string]): string;
     encodeFunctionData(functionFragment: "handle", values: [BigNumberish, BytesLike, BytesLike]): string;
-    encodeFunctionData(functionFragment: "initialize(address,address)", values: [string, string]): string;
-    encodeFunctionData(functionFragment: "initialize(address,address,address)", values: [string, string, string]): string;
+    encodeFunctionData(functionFragment: "initialize", values: [string, string, string, string]): string;
     encodeFunctionData(functionFragment: "interchainGasPaymaster", values?: undefined): string;
     encodeFunctionData(functionFragment: "interchainSecurityModule", values?: undefined): string;
     encodeFunctionData(functionFragment: "mailbox", values?: undefined): string;
@@ -62,8 +60,7 @@ export interface InterchainAccountRouterInterface extends utils.Interface {
     decodeFunctionResult(functionFragment: "getDeployedInterchainAccount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "getInterchainAccount", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "handle", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initialize(address,address)", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "initialize(address,address,address)", data: BytesLike): Result;
+    decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "interchainGasPaymaster", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "interchainSecurityModule", data: BytesLike): Result;
     decodeFunctionResult(functionFragment: "mailbox", data: BytesLike): Result;
@@ -179,10 +176,7 @@ export interface InterchainAccountRouter extends BaseContract {
         handle(_origin: BigNumberish, _sender: BytesLike, _message: BytesLike, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
-        "initialize(address,address)"(_mailbox: string, _interchainGasPaymaster: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<ContractTransaction>;
-        "initialize(address,address,address)"(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, overrides?: Overrides & {
+        initialize(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, _owner: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<ContractTransaction>;
         interchainGasPaymaster(overrides?: CallOverrides): Promise<[string]>;
@@ -226,10 +220,7 @@ export interface InterchainAccountRouter extends BaseContract {
     handle(_origin: BigNumberish, _sender: BytesLike, _message: BytesLike, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
-    "initialize(address,address)"(_mailbox: string, _interchainGasPaymaster: string, overrides?: Overrides & {
-        from?: string | Promise<string>;
-    }): Promise<ContractTransaction>;
-    "initialize(address,address,address)"(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, overrides?: Overrides & {
+    initialize(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, _owner: string, overrides?: Overrides & {
         from?: string | Promise<string>;
     }): Promise<ContractTransaction>;
     interchainGasPaymaster(overrides?: CallOverrides): Promise<string>;
@@ -261,8 +252,7 @@ export interface InterchainAccountRouter extends BaseContract {
         getDeployedInterchainAccount(_origin: BigNumberish, _sender: string, overrides?: CallOverrides): Promise<string>;
         getInterchainAccount(_origin: BigNumberish, _sender: string, overrides?: CallOverrides): Promise<string>;
         handle(_origin: BigNumberish, _sender: BytesLike, _message: BytesLike, overrides?: CallOverrides): Promise<void>;
-        "initialize(address,address)"(_mailbox: string, _interchainGasPaymaster: string, overrides?: CallOverrides): Promise<void>;
-        "initialize(address,address,address)"(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, overrides?: CallOverrides): Promise<void>;
+        initialize(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, _owner: string, overrides?: CallOverrides): Promise<void>;
         interchainGasPaymaster(overrides?: CallOverrides): Promise<string>;
         interchainSecurityModule(overrides?: CallOverrides): Promise<string>;
         mailbox(overrides?: CallOverrides): Promise<string>;
@@ -311,10 +301,7 @@ export interface InterchainAccountRouter extends BaseContract {
         handle(_origin: BigNumberish, _sender: BytesLike, _message: BytesLike, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
-        "initialize(address,address)"(_mailbox: string, _interchainGasPaymaster: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<BigNumber>;
-        "initialize(address,address,address)"(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, overrides?: Overrides & {
+        initialize(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, _owner: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<BigNumber>;
         interchainGasPaymaster(overrides?: CallOverrides): Promise<BigNumber>;
@@ -359,10 +346,7 @@ export interface InterchainAccountRouter extends BaseContract {
         handle(_origin: BigNumberish, _sender: BytesLike, _message: BytesLike, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
-        "initialize(address,address)"(_mailbox: string, _interchainGasPaymaster: string, overrides?: Overrides & {
-            from?: string | Promise<string>;
-        }): Promise<PopulatedTransaction>;
-        "initialize(address,address,address)"(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, overrides?: Overrides & {
+        initialize(_mailbox: string, _interchainGasPaymaster: string, _interchainSecurityModule: string, _owner: string, overrides?: Overrides & {
             from?: string | Promise<string>;
         }): Promise<PopulatedTransaction>;
         interchainGasPaymaster(overrides?: CallOverrides): Promise<PopulatedTransaction>;