@hyperlane-xyz/sdk 1.0.0-beta4 → 1.0.0-beta5

package/dist/core/HyperlaneCore.d.ts

@@ -1,816 +1,203 @@
 import { ethers } from 'ethers';
-import { Inbox, Outbox } from '@hyperlane-xyz/core';
+import { Mailbox } from '@hyperlane-xyz/core';
 import { types } from '@hyperlane-xyz/utils';
 import { HyperlaneApp } from '../HyperlaneApp';
 import { environments } from '../consts/environments';
 import { ChainConnection } from '../providers/ChainConnection';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ConnectionClientConfig } from '../router';
-import { ChainMap, ChainName, Remotes } from '../types';
+import { ChainMap, ChainName } from '../types';
 import { CoreContracts } from './contracts';
 export declare type CoreEnvironment = keyof typeof environments;
 export declare type CoreEnvironmentChain<E extends CoreEnvironment> = Extract<keyof typeof environments[E], ChainName>;
 export declare type CoreContractsMap<Chain extends ChainName> = {
-    [local in Chain]: CoreContracts<Chain, local>;
+    [local in Chain]: CoreContracts;
 };
 export declare type DispatchedMessage = {
-    leafIndex: number;
+    id: string;
     message: string;
     parsed: types.ParsedMessage;
 };
-export declare class HyperlaneCore<Chain extends ChainName = ChainName> extends HyperlaneApp<CoreContracts<Chain, Chain>, Chain> {
+export declare class HyperlaneCore<Chain extends ChainName = ChainName> extends HyperlaneApp<CoreContracts, Chain> {
     constructor(contractsMap: CoreContractsMap<Chain>, multiProvider: MultiProvider<Chain>);
     static fromEnvironment<Env extends CoreEnvironment, Chain extends ChainName = ChainName>(env: Env, multiProvider: MultiProvider<Chain>): HyperlaneCore<keyof {
         test: {
             test1: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
                 };
-                inboxes: {
-                    test2: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    test3: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
+                mailbox: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
                 };
-                outboxValidatorManager: string;
+                multisigIsm: string;
             };
             test2: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    test1: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    test3: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
                 };
-                outbox: {
+                mailbox: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
                 };
-                outboxValidatorManager: string;
+                multisigIsm: string;
             };
             test3: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    test1: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    test2: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
                 };
-                outbox: {
+                mailbox: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
                 };
-                outboxValidatorManager: string;
+                multisigIsm: string;
             };
         };
         testnet2: {
             alfajores: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             fuji: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             mumbai: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             bsctestnet: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
-            goerli: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+            arbitrumgoerli: {
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
-            moonbasealpha: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+            optimismgoerli: {
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
-            optimismgoerli: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+            goerli: {
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrumgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
-            arbitrumgoerli: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+            moonbasealpha: {
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    alfajores: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    fuji: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    mumbai: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsctestnet: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    goerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbasealpha: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimismgoerli: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
@@ -818,700 +205,373 @@ export declare class HyperlaneCore<Chain extends ChainName = ChainName> extends
         };
         mainnet: {
             avalanche: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             bsc: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             polygon: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             celo: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             arbitrum: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             optimism: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             ethereum: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    moonbeam: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
             moonbeam: {
-                upgradeBeaconController: string;
-                connectionManager: string;
+                proxyAdmin: string;
+                multisigIsm: string;
                 interchainGasPaymaster: {
                     kind: string;
                     proxy: string;
                     implementation: string;
-                    beacon: string;
-                };
-                inboxes: {
-                    celo: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    ethereum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    avalanche: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    polygon: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    bsc: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    arbitrum: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                    optimism: {
-                        inbox: {
-                            kind: string;
-                            proxy: string;
-                            implementation: string;
-                            beacon: string;
-                        };
-                        inboxValidatorManager: string;
-                    };
-                };
-                outbox: {
-                    kind: string;
-                    proxy: string;
-                    implementation: string;
-                    beacon: string;
-                };
-                outboxValidatorManager: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
                 interchainAccountRouter: string;
                 interchainQueryRouter: string;
                 create2Factory: string;
             };
         };
+        testnet3: {
+            alfajores: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            fuji: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            mumbai: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            bsctestnet: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            goerli: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            moonbasealpha: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            optimismgoerli: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            arbitrumgoerli: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+        };
+        mainnet2: {
+            celo: {
+                proxyAdmin: string;
+                interchainGasPaymaster: string;
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            ethereum: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            avalanche: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            polygon: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            bsc: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            arbitrum: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            optimism: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+            moonbeam: {
+                proxyAdmin: string;
+                interchainGasPaymaster: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                mailbox: {
+                    kind: string;
+                    proxy: string;
+                    implementation: string;
+                };
+                multisigIsm: string;
+            };
+        };
     }[Env] & Chain>;
-    getContracts<Local extends Chain>(chain: Local): CoreContracts<Chain, Local>;
+    getContracts<Local extends Chain>(chain: Local): CoreContracts;
     getConnectionClientConfig(chain: Chain): ConnectionClientConfig;
     getConnectionClientConfigMap(): ChainMap<Chain, ConnectionClientConfig>;
     extendWithConnectionClientConfig<T>(configMap: ChainMap<Chain, T>): ChainMap<Chain, T & ConnectionClientConfig>;
-    extendWithConnectionManagers<T>(config: ChainMap<Chain, T>): ChainMap<Chain, T & {
-        connectionManager: string;
-    }>;
-    getMailboxPair<Local extends Chain>(origin: Remotes<Chain, Local>, destination: Local): {
-        originOutbox: Outbox;
-        destinationInbox: Inbox;
-    };
     protected getDestination(message: DispatchedMessage): {
-        inbox: Inbox;
+        mailbox: Mailbox;
         chainConnection: ChainConnection;
     };
     protected waitForProcessReceipt(message: DispatchedMessage): Promise<ethers.ContractReceipt>;