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

package/dist/deploy/core/HyperlaneCoreChecker.js

@@ -11,9 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlaneCoreChecker = void 0;
 const utils_1 = require("@hyperlane-xyz/utils");
-const chainMetadata_1 = require("../../consts/chainMetadata");
 const domains_1 = require("../../domains");
-const objects_1 = require("../../utils/objects");
 const HyperlaneAppChecker_1 = require("../HyperlaneAppChecker");
 const types_1 = require("./types");
 class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
@@ -26,11 +24,8 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
             }
             yield this.checkDomainOwnership(chain);
             yield this.checkProxiedContracts(chain);
-            yield this.checkOutbox(chain);
-            yield this.checkInboxes(chain);
-            yield this.checkConnectionManager(chain);
-            yield this.checkValidatorManagers(chain);
-            yield this.checkInterchainGasPaymaster(chain);
+            yield this.checkMailbox(chain);
+            yield this.checkMultisigIsm(chain);
         });
     }
     checkDomainOwnership(chain) {
@@ -39,68 +34,65 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
             if (config.owner) {
                 const contracts = this.app.getContracts(chain);
                 const ownables = [
-                    contracts.connectionManager,
-                    contracts.upgradeBeaconController,
-                    contracts.outbox.contract,
-                    contracts.outboxValidatorManager,
-                    ...Object.values(contracts.inboxes)
-                        .map((inbox) => [
-                        inbox.inbox.contract,
-                        inbox.inboxValidatorManager,
-                    ])
-                        .flat(),
+                    contracts.proxyAdmin,
+                    contracts.mailbox.contract,
+                    contracts.multisigIsm,
                 ];
                 return this.checkOwnership(chain, config.owner, ownables);
             }
         });
     }
-    checkOutbox(chain) {
+    checkMailbox(chain) {
         return __awaiter(this, void 0, void 0, function* () {
             const contracts = this.app.getContracts(chain);
-            const outbox = contracts.outbox.contract;
-            const localDomain = yield outbox.localDomain();
+            const mailbox = contracts.mailbox.contract;
+            const localDomain = yield mailbox.localDomain();
             utils_1.utils.assert(localDomain === domains_1.ChainNameToDomainId[chain]);
-            const actualManager = yield contracts.outbox.contract.validatorManager();
-            const expectedManager = contracts.outboxValidatorManager.address;
-            if (actualManager !== expectedManager) {
+            const actualIsm = yield mailbox.defaultIsm();
+            const expectedIsm = contracts.multisigIsm.address;
+            if (actualIsm !== expectedIsm) {
                 const violation = {
                     type: types_1.CoreViolationType.Mailbox,
-                    mailboxType: types_1.MailboxViolationType.ValidatorManager,
-                    contract: outbox,
+                    mailboxType: types_1.MailboxViolationType.DefaultIsm,
+                    contract: mailbox,
                     chain,
-                    actual: actualManager,
-                    expected: expectedManager,
+                    actual: actualIsm,
+                    expected: expectedIsm,
                 };
                 this.addViolation(violation);
             }
         });
     }
-    // Checks validator sets of the OutboxValidatorManager and all
-    // InboxValidatorManagers on the chain.
-    checkValidatorManagers(chain) {
+    checkProxiedContracts(chain) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const contracts = this.app.getContracts(chain);
+            yield this.checkProxiedContract(chain, 'Mailbox', contracts.mailbox.addresses, contracts.proxyAdmin.address);
+            yield this.checkProxiedContract(chain, 'InterchainGasPaymaster', contracts.mailbox.addresses, contracts.proxyAdmin.address);
+        });
+    }
+    checkMultisigIsm(local) {
         return __awaiter(this, void 0, void 0, function* () {
-            const coreContracts = this.app.getContracts(chain);
-            yield this.checkValidatorManager(chain, chain, coreContracts.outboxValidatorManager);
-            yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(coreContracts.inboxes, (remote, inbox) => this.checkValidatorManager(chain, remote, inbox.inboxValidatorManager)));
+            yield Promise.all(this.app
+                .remoteChains(local)
+                .map((remote) => this.checkMultisigIsmForRemote(local, remote)));
         });
     }
-    // Checks the validator set for a MultisigValidatorManager on the localDomain that tracks
-    // the validator set for the outboxDomain.
-    // If localDomain == outboxDomain, this checks the OutboxValidatorManager, otherwise
-    // it checks an InboxValidatorManager.
-    checkValidatorManager(local, remote, validatorManager) {
+    checkMultisigIsmForRemote(local, remote) {
         return __awaiter(this, void 0, void 0, function* () {
+            const coreContracts = this.app.getContracts(local);
+            const multisigIsm = coreContracts.multisigIsm;
             const config = this.configMap[remote];
-            const validatorManagerConfig = config.validatorManager;
-            const expectedValidators = validatorManagerConfig.validators;
-            const actualValidators = yield validatorManager.validators();
+            const remoteDomain = domains_1.ChainNameToDomainId[remote];
+            const multisigIsmConfig = config.multisigIsm;
+            const expectedValidators = multisigIsmConfig.validators;
+            const actualValidators = yield multisigIsm.validators(remoteDomain);
             const expectedSet = new Set(expectedValidators.map((_) => _.toLowerCase()));
             const actualSet = new Set(actualValidators.map((_) => _.toLowerCase()));
             if (!utils_1.utils.setEquality(expectedSet, actualSet)) {
                 const violation = {
-                    type: types_1.CoreViolationType.ValidatorManager,
-                    validatorManagerType: types_1.ValidatorManagerViolationType.EnrolledValidators,
-                    contract: validatorManager,
+                    type: types_1.CoreViolationType.MultisigIsm,
+                    subType: types_1.MultisigIsmViolationType.EnrolledValidators,
+                    contract: multisigIsm,
                     chain: local,
                     remote,
                     actual: actualSet,
@@ -108,14 +100,14 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
                 };
                 this.addViolation(violation);
             }
-            const expectedThreshold = validatorManagerConfig.threshold;
+            const expectedThreshold = multisigIsmConfig.threshold;
             utils_1.utils.assert(expectedThreshold !== undefined);
-            const actualThreshold = (yield validatorManager.threshold()).toNumber();
+            const actualThreshold = yield multisigIsm.threshold(remoteDomain);
             if (expectedThreshold !== actualThreshold) {
                 const violation = {
-                    type: types_1.CoreViolationType.ValidatorManager,
-                    validatorManagerType: types_1.ValidatorManagerViolationType.Threshold,
-                    contract: validatorManager,
+                    type: types_1.CoreViolationType.MultisigIsm,
+                    subType: types_1.MultisigIsmViolationType.Threshold,
+                    contract: multisigIsm,
                     chain: local,
                     remote,
                     actual: actualThreshold,
@@ -125,84 +117,6 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
             }
         });
     }
-    checkInboxes(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const coreContracts = this.app.getContracts(chain);
-            // Check that all inboxes on this chain are pointed to the right validator
-            // manager.
-            yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(coreContracts.inboxes, (_, inbox) => __awaiter(this, void 0, void 0, function* () {
-                const expected = inbox.inboxValidatorManager.address;
-                const actual = yield inbox.inbox.contract.validatorManager();
-                if (expected !== actual) {
-                    const violation = {
-                        type: types_1.CoreViolationType.Mailbox,
-                        mailboxType: types_1.MailboxViolationType.ValidatorManager,
-                        contract: inbox.inbox.contract,
-                        chain,
-                        actual,
-                        expected,
-                    };
-                    this.addViolation(violation);
-                }
-            })));
-            yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(coreContracts.inboxes, (remoteChain, inbox) => __awaiter(this, void 0, void 0, function* () {
-                // check that the inbox has the right local domain
-                const actualLocalDomain = yield inbox.inbox.contract.localDomain();
-                utils_1.utils.assert(actualLocalDomain === domains_1.ChainNameToDomainId[chain]);
-                const actualRemoteDomain = yield inbox.inbox.contract.remoteDomain();
-                utils_1.utils.assert(actualRemoteDomain === domains_1.ChainNameToDomainId[remoteChain]);
-            })));
-            // Check that all inboxes on this chain share the same implementation and
-            // UpgradeBeacon.
-            const coreAddresses = this.app.getAddresses(chain);
-            const inboxes = Object.values(coreAddresses.inboxes);
-            const implementations = inboxes.map((r) => r.implementation);
-            const upgradeBeacons = inboxes.map((r) => r.beacon);
-            utils_1.utils.assert(implementations.every((implementation) => implementation === implementations[0]));
-            utils_1.utils.assert(upgradeBeacons.every((beacon) => beacon === upgradeBeacons[0]));
-        });
-    }
-    checkConnectionManager(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const coreContracts = this.app.getContracts(chain);
-            yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(coreContracts.inboxes, (remote, inbox) => __awaiter(this, void 0, void 0, function* () {
-                // expected configured inboxes for remote on chain
-                const remoteConfig = this.configMap[remote];
-                const expectedInboxes = new Set(remoteConfig.remove ? [] : [inbox.inbox.address]);
-                // actual configured inboxes for remote on chain
-                const remoteDomain = chainMetadata_1.chainMetadata[remote].id;
-                const enrolledInboxes = new Set(yield coreContracts.connectionManager.getInboxes(remoteDomain));
-                if (!utils_1.utils.setEquality(enrolledInboxes, expectedInboxes)) {
-                    const violation = {
-                        type: types_1.CoreViolationType.ConnectionManager,
-                        connectionManagerType: types_1.ConnectionManagerViolationType.EnrolledInboxes,
-                        remote,
-                        contract: coreContracts.connectionManager,
-                        chain: chain,
-                        actual: enrolledInboxes,
-                        expected: expectedInboxes,
-                    };
-                    this.violations.push(violation);
-                }
-            })));
-            // Outbox is set on connectionManager
-            const outbox = yield coreContracts.connectionManager.outbox();
-            utils_1.utils.assert(outbox === coreContracts.outbox.address);
-        });
-    }
-    checkProxiedContracts(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const contracts = this.app.getContracts(chain);
-            yield this.checkUpgradeBeacon(chain, 'Outbox', contracts.outbox.addresses);
-            yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(contracts.inboxes, (_remoteChain, inbox) => this.checkUpgradeBeacon(chain, 'Inbox', inbox.inbox.addresses)));
-        });
-    }
-    checkInterchainGasPaymaster(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const contracts = this.app.getContracts(chain);
-            yield this.checkUpgradeBeacon(chain, 'InterchainGasPaymaster', contracts.interchainGasPaymaster.addresses);
-        });
-    }
 }
 exports.HyperlaneCoreChecker = HyperlaneCoreChecker;
 //# sourceMappingURL=HyperlaneCoreChecker.js.map

package/dist/deploy/core/HyperlaneCoreChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreChecker.js","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HyperlaneCoreChecker.js","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"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"}

package/dist/deploy/core/HyperlaneCoreDeployer.d.ts

@@ -1,33 +1,27 @@
 import { ethers } from 'ethers';
-import { Inbox } from '@hyperlane-xyz/core';
+import { InterchainGasPaymaster, Mailbox, MultisigIsm, Ownable, ProxyAdmin } from '@hyperlane-xyz/core';
 import type { types } from '@hyperlane-xyz/utils';
-import { CoreContractsMap, HyperlaneCore } from '../../core/HyperlaneCore';
-import { CoreContracts, InboxContracts, OutboxContracts, coreFactories } from '../../core/contracts';
-import { ChainConnection } from '../../providers/ChainConnection';
+import { CoreContracts, coreFactories } from '../../core/contracts';
 import { MultiProvider } from '../../providers/MultiProvider';
-import { BeaconProxyAddresses, ProxiedContract } from '../../proxy';
-import { ChainMap, ChainName, Remotes } from '../../types';
-import { HyperlaneDeployer } from '../HyperlaneDeployer';
-import { CoreConfig, ValidatorManagerConfig } from './types';
-export declare class HyperlaneCoreDeployer<Chain extends ChainName> extends HyperlaneDeployer<Chain, CoreConfig, CoreContracts<Chain, Chain>, typeof coreFactories> {
+import { ProxiedContract, TransparentProxyAddresses } from '../../proxy';
+import { ChainMap, ChainName } from '../../types';
+import { DeployOptions, HyperlaneDeployer } from '../HyperlaneDeployer';
+import { CoreConfig } from './types';
+export declare class HyperlaneCoreDeployer<Chain extends ChainName> extends HyperlaneDeployer<Chain, CoreConfig, CoreContracts, typeof coreFactories> {
     startingBlockNumbers: ChainMap<Chain, number | undefined>;
     constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, CoreConfig>, factoriesOverride?: {
-        outbox: import("@hyperlane-xyz/core").Outbox__factory;
-        outboxValidatorManager: import("@hyperlane-xyz/core").OutboxValidatorManager__factory;
-        inbox: import("@hyperlane-xyz/core").Inbox__factory;
-        inboxValidatorManager: import("@hyperlane-xyz/core").InboxValidatorManager__factory;
         interchainAccountRouter: import("@hyperlane-xyz/core").InterchainAccountRouter__factory;
         interchainQueryRouter: import("@hyperlane-xyz/core").InterchainQueryRouter__factory;
         create2Factory: import("@hyperlane-xyz/core").Create2Factory__factory;
-        connectionManager: import("@hyperlane-xyz/core").AbacusConnectionManager__factory;
-        upgradeBeaconController: import("@hyperlane-xyz/core").UpgradeBeaconController__factory;
+        proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
         interchainGasPaymaster: import("@hyperlane-xyz/core").InterchainGasPaymaster__factory;
+        multisigIsm: import("@hyperlane-xyz/core").MultisigIsm__factory;
+        mailbox: import("@hyperlane-xyz/core").Mailbox__factory;
     });
-    deploy(partialDeployment?: Partial<CoreContractsMap<Chain>>): Promise<CoreContractsMap<Chain>>;
-    deployOutbox<LocalChain extends Chain>(chain: LocalChain, config: ValidatorManagerConfig, ubcAddress: types.Address): Promise<OutboxContracts>;
-    deployInbox<Local extends Chain>(localChain: Local, remoteChain: Remotes<Chain, Local>, config: ValidatorManagerConfig, ubcAddress: types.Address, duplicate?: ProxiedContract<Inbox, BeaconProxyAddresses>): Promise<InboxContracts>;
-    deployContracts<LocalChain extends Chain>(chain: LocalChain, config: CoreConfig): Promise<CoreContracts<Chain, LocalChain>>;
-    static transferOwnership<CoreChains extends ChainName>(core: HyperlaneCore<CoreChains>, owners: ChainMap<CoreChains, types.Address>, multiProvider: MultiProvider<CoreChains>): Promise<ChainMap<CoreChains, ethers.ContractReceipt[]>>;
-    static transferOwnershipOfChain<Chain extends ChainName, Local extends Chain>(coreContracts: CoreContracts<Chain, Local>, owner: types.Address, chainConnection: ChainConnection): Promise<ethers.ContractReceipt[]>;
+    deployInterchainGasPaymaster<LocalChain extends Chain>(chain: LocalChain, proxyAdmin: ProxyAdmin, deployOpts?: DeployOptions): Promise<ProxiedContract<InterchainGasPaymaster, TransparentProxyAddresses>>;
+    deployMailbox<LocalChain extends Chain>(chain: LocalChain, defaultIsmAddress: types.Address, proxyAdmin: ProxyAdmin, deployOpts?: DeployOptions): Promise<ProxiedContract<Mailbox, TransparentProxyAddresses>>;
+    deployMultisigIsm<LocalChain extends Chain>(chain: LocalChain): Promise<MultisigIsm>;
+    deployContracts<LocalChain extends Chain>(chain: LocalChain, config: CoreConfig): Promise<CoreContracts>;
+    transferOwnershipOfContracts(chain: Chain, ownables: Ownable[]): Promise<ethers.ContractReceipt[]>;
 }
 //# sourceMappingURL=HyperlaneCoreDeployer.d.ts.map

package/dist/deploy/core/HyperlaneCoreDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAW,MAAM,qBAAqB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAkB,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAE7D,qBAAa,qBAAqB,CAChC,KAAK,SAAS,SAAS,CACvB,SAAQ,iBAAiB,CACzB,KAAK,EACL,UAAU,EACV,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EAC3B,OAAO,aAAa,CACrB;IACC,oBAAoB,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;gBAGxD,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,EACtC,iBAAiB;;;;;;;;;;;KAAgB;IAS7B,MAAM,CACV,iBAAiB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GACnD,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAI7B,YAAY,CAAC,UAAU,SAAS,KAAK,EACzC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,sBAAsB,EAC9B,UAAU,EAAE,KAAK,CAAC,OAAO,GACxB,OAAO,CAAC,eAAe,CAAC;IAkBrB,WAAW,CAAC,KAAK,SAAS,KAAK,EACnC,UAAU,EAAE,KAAK,EACjB,WAAW,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,EAClC,MAAM,EAAE,sBAAsB,EAC9B,UAAU,EAAE,KAAK,CAAC,OAAO,EACzB,SAAS,CAAC,EAAE,eAAe,CAAC,KAAK,EAAE,oBAAoB,CAAC,GACvD,OAAO,CAAC,cAAc,CAAC;IAgCpB,eAAe,CAAC,UAAU,SAAS,KAAK,EAC5C,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;WA8F/B,iBAAiB,CAAC,UAAU,SAAS,SAAS,EACzD,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,EAC/B,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,EAC3C,aAAa,EAAE,aAAa,CAAC,UAAU,CAAC,GACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;WAY7C,wBAAwB,CACnC,KAAK,SAAS,SAAS,EACvB,KAAK,SAAS,KAAK,EAEnB,aAAa,EAAE,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EAC1C,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;CAkBrC"}
+{"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EACL,sBAAsB,EACtB,OAAO,EACP,WAAW,EACX,OAAO,EACP,UAAU,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAExE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,qBAAqB,CAChC,KAAK,SAAS,SAAS,CACvB,SAAQ,iBAAiB,CACzB,KAAK,EACL,UAAU,EACV,aAAa,EACb,OAAO,aAAa,CACrB;IACC,oBAAoB,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;gBAGxD,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,EACtC,iBAAiB;;;;;;;;KAAgB;IAQnC,4BAA4B,CAAC,UAAU,SAAS,KAAK,EACnD,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,UAAU,EACtB,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CACR,eAAe,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CACnE;IAWK,aAAa,CAAC,UAAU,SAAS,KAAK,EAC1C,KAAK,EAAE,UAAU,EACjB,iBAAiB,EAAE,KAAK,CAAC,OAAO,EAChC,UAAU,EAAE,UAAU,EACtB,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IAezD,iBAAiB,CAAC,UAAU,SAAS,KAAK,EAC9C,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,WAAW,CAAC;IAmEjB,eAAe,CAAC,UAAU,SAAS,KAAK,EAC5C,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,aAAa,CAAC;IAkCnB,4BAA4B,CAChC,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;CAgBrC"}

package/dist/deploy/core/HyperlaneCoreDeployer.js

@@ -14,8 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlaneCoreDeployer = void 0;
 const debug_1 = __importDefault(require("debug"));
+const ethers_1 = require("ethers");
 const chainMetadata_1 = require("../../consts/chainMetadata");
 const contracts_1 = require("../../core/contracts");
+const domains_1 = require("../../domains");
 const objects_1 = require("../../utils/objects");
 const HyperlaneDeployer_1 = require("../HyperlaneDeployer");
 class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
@@ -25,47 +27,51 @@ class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         });
         this.startingBlockNumbers = (0, objects_1.objMap)(configMap, () => undefined);
     }
-    // override return type for inboxes shape derived from chain
-    deploy(partialDeployment) {
-        const _super = Object.create(null, {
-            deploy: { get: () => super.deploy }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            return _super.deploy.call(this, partialDeployment);
-        });
+    deployInterchainGasPaymaster(chain, proxyAdmin, deployOpts) {
+        return this.deployProxiedContract(chain, 'interchainGasPaymaster', [], proxyAdmin, [], deployOpts);
     }
-    deployOutbox(chain, config, ubcAddress) {
+    deployMailbox(chain, defaultIsmAddress, proxyAdmin, deployOpts) {
         return __awaiter(this, void 0, void 0, function* () {
             const domain = chainMetadata_1.chainMetadata[chain].id;
-            const outboxValidatorManager = yield this.deployContract(chain, 'outboxValidatorManager', [domain, config.validators, config.threshold]);
-            const outbox = yield this.deployProxiedContract(chain, 'outbox', [domain], ubcAddress, [outboxValidatorManager.address]);
-            return { outbox, outboxValidatorManager };
+            const owner = this.configMap[chain].owner;
+            const mailbox = yield this.deployProxiedContract(chain, 'mailbox', [domain], proxyAdmin, [owner, defaultIsmAddress], deployOpts);
+            return mailbox;
         });
     }
-    deployInbox(localChain, remoteChain, config, ubcAddress, duplicate) {
+    deployMultisigIsm(chain) {
+        const _super = Object.create(null, {
+            runIfOwner: { get: () => super.runIfOwner }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            const localDomain = chainMetadata_1.chainMetadata[localChain].id;
-            const remoteDomain = chainMetadata_1.chainMetadata[remoteChain].id;
-            const inboxValidatorManager = yield this.deployContract(localChain, 'inboxValidatorManager', [remoteDomain, config.validators, config.threshold]);
-            const initArgs = [
-                remoteDomain,
-                inboxValidatorManager.address,
-            ];
-            let inbox;
-            if (duplicate) {
-                inbox = yield this.duplicateProxiedContract(localChain, duplicate, initArgs);
-            }
-            else {
-                inbox = yield this.deployProxiedContract(localChain, 'inbox', [localDomain], ubcAddress, initArgs);
-            }
-            return { inbox, inboxValidatorManager };
+            const multisigIsm = yield this.deployContract(chain, 'multisigIsm', []);
+            const configChains = Object.keys(this.configMap);
+            const chainConnection = this.multiProvider.getChainConnection(chain);
+            const remotes = this.multiProvider
+                .intersect(configChains, false)
+                .multiProvider.remoteChains(chain);
+            yield _super.runIfOwner.call(this, chain, multisigIsm, () => __awaiter(this, void 0, void 0, function* () {
+                // TODO: Remove extraneous validators
+                const remoteDomains = remotes.map((chain) => domains_1.ChainNameToDomainId[chain]);
+                const actualValidators = yield Promise.all(remoteDomains.map((id) => multisigIsm.validators(id)));
+                const expectedValidators = remotes.map((chain) => this.configMap[chain].multisigIsm.validators);
+                const validatorsToEnroll = expectedValidators.map((validators, i) => validators.filter((validator) => !actualValidators[i].includes(ethers_1.ethers.utils.getAddress(validator))));
+                const chainsToEnrollValidators = remotes.filter((_, i) => validatorsToEnroll[i].length > 0);
+                if (chainsToEnrollValidators.length > 0) {
+                    this.logger(`Enroll ${chainsToEnrollValidators} validators on ${chain}`);
+                    yield chainConnection.handleTx(multisigIsm.enrollValidators(chainsToEnrollValidators.map((c) => domains_1.ChainNameToDomainId[c]), validatorsToEnroll.filter((validators) => validators.length > 0), chainConnection.overrides));
+                }
+                const actualThresholds = yield Promise.all(remoteDomains.map((id) => multisigIsm.threshold(id)));
+                const expectedThresholds = remotes.map((chain) => this.configMap[chain].multisigIsm.threshold);
+                const chainsToSetThreshold = remotes.filter((_, i) => actualThresholds[i] !== expectedThresholds[i]);
+                if (chainsToSetThreshold.length > 0) {
+                    this.logger(`Set remote (${chainsToSetThreshold}) thresholds on ${chain}`);
+                    yield chainConnection.handleTx(multisigIsm.setThresholds(chainsToSetThreshold.map((c) => domains_1.ChainNameToDomainId[c]), chainsToSetThreshold.map((c) => this.configMap[c].multisigIsm.threshold), chainConnection.overrides));
+                }
+            }));
+            return multisigIsm;
         });
     }
     deployContracts(chain, config) {
-        const _super = Object.create(null, {
-            runIfOwner: { get: () => super.runIfOwner }
-        });
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (config.remove) {
                 // skip deploying to chains configured to be removed
@@ -75,59 +81,33 @@ class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
             const provider = dc.provider;
             const startingBlockNumber = yield provider.getBlockNumber();
             this.startingBlockNumbers[chain] = startingBlockNumber;
-            const upgradeBeaconController = yield this.deployContract(chain, 'upgradeBeaconController', []);
-            const interchainGasPaymaster = yield this.deployProxiedContract(chain, 'interchainGasPaymaster', [], upgradeBeaconController.address, []);
-            const connectionManager = yield this.deployContract(chain, 'connectionManager', []);
-            const outbox = yield this.deployOutbox(chain, config.validatorManager, upgradeBeaconController.address);
-            yield _super.runIfOwner.call(this, chain, connectionManager, () => __awaiter(this, void 0, void 0, function* () {
-                const current = yield connectionManager.outbox();
-                if (current !== outbox.outbox.address) {
-                    const outboxTx = yield connectionManager.setOutbox(outbox.outbox.address, dc.overrides);
-                    yield dc.handleTx(outboxTx);
-                }
-            }));
-            const configChains = Object.keys(this.configMap);
-            const remotes = this.multiProvider
-                .intersect(configChains, false)
-                .multiProvider.remoteChains(chain);
-            const inboxes = (_b = (_a = this.deployedContracts[chain]) === null || _a === void 0 ? void 0 : _a.inboxes) !== null && _b !== void 0 ? _b : {};
-            let prev;
-            for (const remote of remotes) {
-                if (!inboxes[remote]) {
-                    inboxes[remote] = yield this.deployInbox(chain, remote, this.configMap[remote].validatorManager, upgradeBeaconController.address, (_c = inboxes[prev]) === null || _c === void 0 ? void 0 : _c.inbox);
-                }
-                yield _super.runIfOwner.call(this, chain, connectionManager, () => __awaiter(this, void 0, void 0, function* () {
-                    const isEnrolled = yield connectionManager.isInbox(inboxes[remote].inbox.address);
-                    if (!isEnrolled) {
-                        this.logger(`Enrolling inbox for remote '${remote}'`);
-                        const enrollTx = yield connectionManager.enrollInbox(chainMetadata_1.chainMetadata[remote].id, inboxes[remote].inbox.address, dc.overrides);
-                        yield dc.handleTx(enrollTx);
-                    }
-                }));
-                prev = remote;
-            }
-            return Object.assign({ upgradeBeaconController,
-                connectionManager,
-                interchainGasPaymaster, inboxes: inboxes }, outbox);
+            const multisigIsm = yield this.deployMultisigIsm(chain);
+            const proxyAdmin = yield this.deployContract(chain, 'proxyAdmin', []);
+            const interchainGasPaymaster = yield this.deployInterchainGasPaymaster(chain, proxyAdmin);
+            const mailbox = yield this.deployMailbox(chain, multisigIsm.address, proxyAdmin);
+            // Mailbox ownership is transferred upon initialization.
+            const ownables = [multisigIsm, proxyAdmin];
+            yield this.transferOwnershipOfContracts(chain, ownables);
+            return {
+                proxyAdmin,
+                interchainGasPaymaster,
+                mailbox,
+                multisigIsm,
+            };
         });
     }
-    static transferOwnership(core, owners, multiProvider) {
+    transferOwnershipOfContracts(chain, ownables) {
         return __awaiter(this, void 0, void 0, function* () {
-            return (0, objects_1.promiseObjAll)((0, objects_1.objMap)(core.contractsMap, (chain, coreContracts) => __awaiter(this, void 0, void 0, function* () {
-                return HyperlaneCoreDeployer.transferOwnershipOfChain(coreContracts, owners[chain], multiProvider.getChainConnection(chain));
+            const owner = this.configMap[chain].owner;
+            const chainConnection = this.multiProvider.getChainConnection(chain);
+            const receipts = yield Promise.all(ownables.map((ownable) => __awaiter(this, void 0, void 0, function* () {
+                const currentOwner = yield ownable.owner();
+                if (currentOwner.toLowerCase() !== owner.toLowerCase()) {
+                    return chainConnection.handleTx(ownable.transferOwnership(owner, chainConnection.overrides));
+                }
+                return undefined;
             })));
-        });
-    }
-    static transferOwnershipOfChain(coreContracts, owner, chainConnection) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ownables = [
-                coreContracts.outbox.contract,
-                coreContracts.outboxValidatorManager,
-                coreContracts.connectionManager,
-                coreContracts.upgradeBeaconController,
-                ...Object.values(coreContracts.inboxes).flatMap((inbox) => [inbox.inbox.contract, inbox.inboxValidatorManager]),
-            ];
-            return Promise.all(ownables.map((ownable) => chainConnection.handleTx(ownable.transferOwnership(owner, chainConnection.overrides))));
+            return receipts.filter((x) => x !== undefined);
         });
     }
 }

package/dist/deploy/core/HyperlaneCoreDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreDeployer.js","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HyperlaneCoreDeployer.js","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"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"}