@hyperlane-xyz/sdk 0.5.5 → 1.0.0-beta1

package/dist/core/message.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HyperlaneMessage = exports.InboxMessageStatus = exports.MessageStatus = exports.resolveChains = exports.resolveId = exports.resolveDomain = void 0;
+exports.HyperlaneMessage = exports.MessageStatus = exports.resolveChains = exports.resolveId = exports.resolveDomain = void 0;
 const ethers_1 = require("ethers");
 const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
@@ -38,11 +38,6 @@ var MessageStatus;
     MessageStatus[MessageStatus["Relayed"] = 2] = "Relayed";
     MessageStatus[MessageStatus["Processed"] = 3] = "Processed";
 })(MessageStatus = exports.MessageStatus || (exports.MessageStatus = {}));
-var InboxMessageStatus;
-(function (InboxMessageStatus) {
-    InboxMessageStatus[InboxMessageStatus["None"] = 0] = "None";
-    InboxMessageStatus[InboxMessageStatus["Processed"] = 1] = "Processed";
-})(InboxMessageStatus = exports.InboxMessageStatus || (exports.InboxMessageStatus = {}));
 // TODO: move HyperlaneMessage into HyperlaneCore app
 /**
  * A deserialized Hyperlane message.
@@ -54,10 +49,8 @@ class HyperlaneMessage {
         this.message = utils_1.utils.parseMessage(dispatch.event.args.message);
         this.dispatch = dispatch;
         const messageChains = (0, exports.resolveChains)(this.message);
-        const mailboxes = core.getMailboxPair(messageChains.origin, // TODO: Fix never type that results from Exclude<T, T>
-        messageChains.destination);
-        this.outbox = mailboxes.originOutbox;
-        this.inbox = mailboxes.destinationInbox;
+        this.outbox = core.getContracts(messageChains.origin).mailbox.contract;
+        this.inbox = core.getContracts(messageChains.destination).mailbox.contract;
         this.cache = {};
     }
     /**
@@ -76,7 +69,7 @@ class HyperlaneMessage {
      */
     static fromReceipt(multiProvider, core, nameOrDomain, receipt) {
         const messages = [];
-        const outbox = new core_1.Outbox__factory().interface;
+        const outbox = new core_1.Mailbox__factory().interface;
         const chain = (0, exports.resolveDomain)(nameOrDomain);
         const provider = multiProvider.getChainConnection(chain).provider;
         for (const log of receipt.logs) {
@@ -164,7 +157,7 @@ class HyperlaneMessage {
                 return this.cache.process;
             }
             // if not, attempt to query the event
-            const processFilter = this.inbox.filters.Process(this.leaf);
+            const processFilter = this.inbox.filters.Process(this.id);
             const processLogs = yield (0, events_1.findAnnotatedSingleEvent)(this.multiProvider, this.destinationName, this.inbox, processFilter);
             if (processLogs.length === 1) {
                 // if event is returned, store it to the object
@@ -203,17 +196,6 @@ class HyperlaneMessage {
             };
         });
     }
-    /**
-     * Retrieve the inbox status of this message.
-     *
-     * @returns The {@link InboxMessageStatus} corresponding to the solidity
-     * status of the message.
-     */
-    inboxStatus() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.inbox.messages(this.leaf);
-        });
-    }
     /**
      * Checks whether the message has been delivered.
      *
@@ -221,8 +203,7 @@ class HyperlaneMessage {
      */
     delivered() {
         return __awaiter(this, void 0, void 0, function* () {
-            const status = yield this.inboxStatus();
-            return status === InboxMessageStatus.Processed;
+            return this.inbox.delivered(this.id);
         });
     }
     /**
@@ -294,16 +275,10 @@ class HyperlaneMessage {
         return this.dispatch.event.transactionHash;
     }
     /**
-     * The messageHash committed to the tree in the Outbox contract.
-     */
-    get leaf() {
-        return utils_1.utils.messageHash(this.dispatch.event.args.message, this.dispatch.event.args.leafIndex.toNumber());
-    }
-    /**
-     * The index of the leaf in the contract.
+     * The messageId committed to the tree in the Mailbox contract.
      */
-    get leafIndex() {
-        return this.dispatch.event.args.leafIndex;
+    get id() {
+        return utils_1.utils.messageId(this.dispatch.event.args.message);
     }
 }
 exports.HyperlaneMessage = HyperlaneMessage;

package/dist/core/message.js.map

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

package/dist/core/testHyperlaneDeploy.hardhat-test.js

@@ -24,21 +24,21 @@ const remoteChain = 'test2';
 const remoteDomain = chainMetadata_1.chainMetadata[remoteChain].id;
 const message = '0xdeadbeef';
 describe('TestCoreDeployer', () => __awaiter(void 0, void 0, void 0, function* () {
-    let testCoreApp, localOutbox, remoteOutbox, dispatchReceipt;
+    let testCoreApp, localMailbox, remoteMailbox, dispatchReceipt;
     beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
         const [signer] = yield hardhat_1.ethers.getSigners();
         const multiProvider = (0, utils_2.getTestMultiProvider)(signer);
         const deployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
         testCoreApp = yield deployer.deployApp();
         const recipient = yield new core_1.TestRecipient__factory(signer).deploy();
-        localOutbox = testCoreApp.getContracts(localChain).outbox.contract;
-        const dispatchResponse = localOutbox.dispatch(remoteDomain, utils_1.utils.addressToBytes32(recipient.address), message);
-        yield (0, chai_1.expect)(dispatchResponse).to.emit(localOutbox, 'Dispatch');
+        localMailbox = testCoreApp.getContracts(localChain).mailbox.contract;
+        const dispatchResponse = localMailbox.dispatch(remoteDomain, utils_1.utils.addressToBytes32(recipient.address), message);
+        yield (0, chai_1.expect)(dispatchResponse).to.emit(localMailbox, 'Dispatch');
         dispatchReceipt = yield testCoreApp.multiProvider
             .getChainConnection(localChain)
             .handleTx(dispatchResponse);
-        remoteOutbox = testCoreApp.getContracts(remoteChain).outbox.contract;
-        yield (0, chai_1.expect)(remoteOutbox.dispatch(localDomain, utils_1.utils.addressToBytes32(recipient.address), message)).to.emit(remoteOutbox, 'Dispatch');
+        remoteMailbox = testCoreApp.getContracts(remoteChain).mailbox.contract;
+        yield (0, chai_1.expect)(remoteMailbox.dispatch(localDomain, utils_1.utils.addressToBytes32(recipient.address), message)).to.emit(remoteMailbox, 'Dispatch');
     }));
     it('processes outbound messages for a single domain', () => __awaiter(void 0, void 0, void 0, function* () {
         const responses = yield testCoreApp.processOutboundMessages(localChain);

package/dist/core/testHyperlaneDeploy.hardhat-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"testHyperlaneDeploy.hardhat-test.js","sourceRoot":"","sources":["../../src/core/testHyperlaneDeploy.hardhat-test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testHyperlaneDeploy.hardhat-test.js","sourceRoot":"","sources":["../../src/core/testHyperlaneDeploy.hardhat-test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAmC;AACnC,qCAAmC;AACnC,+BAA8B;AAE9B,qCAAiC;AAEjC,8CAA0E;AAC1E,gDAA6C;AAE7C,2DAAwD;AACxD,2CAAuD;AAGvD,yDAAsD;AAEtD,MAAM,UAAU,GAAG,OAAO,CAAC;AAC3B,MAAM,WAAW,GAAG,6BAAa,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;AACjD,MAAM,WAAW,GAAG,OAAO,CAAC;AAC5B,MAAM,YAAY,GAAG,6BAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;AACnD,MAAM,OAAO,GAAG,YAAY,CAAC;AAE7B,QAAQ,CAAC,kBAAkB,EAAE,GAAS,EAAE;IACtC,IAAI,WAAwB,EAC1B,YAAyB,EACzB,aAA0B,EAC1B,eAAgC,CAAC;IAEnC,UAAU,CAAC,GAAS,EAAE;QACpB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAE3C,MAAM,aAAa,GAAG,IAAA,4BAAoB,EAAC,MAAM,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,IAAI,mCAAgB,CAAC,aAAa,CAAC,CAAC;QACrD,WAAW,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;QAEzC,MAAM,SAAS,GAAG,MAAM,IAAI,6BAAsB,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;QACpE,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QAErE,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAC5C,YAAY,EACZ,aAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EACzC,OAAO,CACR,CAAC;QACF,MAAM,IAAA,aAAM,EAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACjE,eAAe,GAAG,MAAM,WAAW,CAAC,aAAa;aAC9C,kBAAkB,CAAC,UAAU,CAAC;aAC9B,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAC9B,aAAa,GAAG,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QACvE,MAAM,IAAA,aAAM,EACV,aAAa,CAAC,QAAQ,CACpB,WAAW,EACX,aAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EACzC,OAAO,CACR,CACF,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACvC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAS,EAAE;QAC/D,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;QACxE,IAAA,aAAM,EAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAS,EAAE;QAC3D,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,uBAAuB,CAC9D,UAAU,CACX,CAAC;QACF,IAAA,aAAM,EAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,uBAAuB,CAC/D,WAAW,CACZ,CAAC;QACF,IAAA,aAAM,EAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAS,EAAE;QACtC,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;QACtD,IAAA,aAAM,EAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxE,IAAA,aAAM,EAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAS,EAAE;QACpD,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnC,WAAW,CAAC,wBAAwB,CAAC,eAAe,CAAC;YACrD,WAAW,CAAC,uBAAuB,CAAC,UAAU,CAAC;SAChD,CAAC,CAAC;QACH,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,CAAC"}

package/dist/deploy/HyperlaneAppChecker.d.ts

@@ -2,7 +2,7 @@ import { Ownable } from '@hyperlane-xyz/core';
 import type { types } from '@hyperlane-xyz/utils';
 import { HyperlaneApp } from '../HyperlaneApp';
 import { MultiProvider } from '../providers/MultiProvider';
-import { BeaconProxyAddresses } from '../proxy';
+import { TransparentProxyAddresses } from '../proxy';
 import { ChainMap, ChainName } from '../types';
 import { CheckerViolation } from './types';
 export declare abstract class HyperlaneAppChecker<Chain extends ChainName, App extends HyperlaneApp<any, Chain>, Config> {
@@ -14,7 +14,7 @@ export declare abstract class HyperlaneAppChecker<Chain extends ChainName, App e
     abstract checkChain(chain: Chain): Promise<void>;
     check(): Promise<void[]>;
     addViolation(violation: CheckerViolation): void;
-    checkUpgradeBeacon(chain: Chain, name: string, proxiedAddress: BeaconProxyAddresses): Promise<void>;
+    checkProxiedContract(chain: Chain, name: string, proxiedAddress: TransparentProxyAddresses, proxyAdminAddress?: types.Address): Promise<void>;
     checkOwnership(chain: Chain, owner: types.Address, ownables: Ownable[]): Promise<void>;
     expectViolations(types: string[], expectedMatches: number[]): void;
     expectEmpty(): void;

package/dist/deploy/HyperlaneAppChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneAppChecker.d.ts","sourceRoot":"","sources":["../../src/deploy/HyperlaneAppChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAiC,MAAM,SAAS,CAAC;AAE1E,8BAAsB,mBAAmB,CACvC,KAAK,SAAS,SAAS,EACvB,GAAG,SAAS,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,EACpC,MAAM;IAEN,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAC7C,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBAGtC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAQpC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAE1C,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAiB9B,YAAY,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAIzC,kBAAkB,CACtB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,oBAAoB,GACnC,OAAO,CAAC,IAAI,CAAC;IAaV,cAAc,CAClB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC;IAkBhB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI;IAwBlE,WAAW,IAAI,IAAI;CAIpB"}
+{"version":3,"file":"HyperlaneAppChecker.d.ts","sourceRoot":"","sources":["../../src/deploy/HyperlaneAppChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAiC,MAAM,SAAS,CAAC;AAE1E,8BAAsB,mBAAmB,CACvC,KAAK,SAAS,SAAS,EACvB,GAAG,SAAS,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,EACpC,MAAM;IAEN,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAC7C,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBAGtC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAQpC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAE1C,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAiB9B,YAAY,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAIzC,oBAAoB,CACxB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,yBAAyB,EACzC,iBAAiB,CAAC,EAAE,KAAK,CAAC,OAAO,GAChC,OAAO,CAAC,IAAI,CAAC;IAiBV,cAAc,CAClB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC;IAkBhB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI;IAwBlE,WAAW,IAAI,IAAI;CAIpB"}

package/dist/deploy/HyperlaneAppChecker.js

@@ -36,12 +36,16 @@ class HyperlaneAppChecker {
     addViolation(violation) {
         this.violations.push(violation);
     }
-    checkUpgradeBeacon(chain, name, proxiedAddress) {
+    checkProxiedContract(chain, name, proxiedAddress, proxyAdminAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const dc = this.multiProvider.getChainConnection(chain);
-            const implementation = yield (0, proxy_1.upgradeBeaconImplementation)(dc.provider, proxiedAddress.beacon);
+            const implementation = yield (0, proxy_1.proxyImplementation)(dc.provider, proxiedAddress.proxy);
             if (implementation !== proxiedAddress.implementation) {
-                this.addViolation((0, proxy_1.upgradeBeaconViolation)(chain, name, proxiedAddress, implementation));
+                this.addViolation((0, proxy_1.proxyViolation)(chain, name, proxiedAddress, implementation));
+            }
+            if (proxyAdminAddress) {
+                const admin = yield (0, proxy_1.proxyAdmin)(dc.provider, proxiedAddress.proxy);
+                utils_1.utils.assert(admin === proxyAdminAddress, 'Proxy admin mismatch');
             }
         });
     }

package/dist/deploy/HyperlaneAppChecker.js.map

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

package/dist/deploy/HyperlaneDeployer.d.ts

@@ -1,10 +1,9 @@
 import { Debugger } from 'debug';
 import { ethers } from 'ethers';
-import { Ownable } from '@hyperlane-xyz/core';
-import type { types } from '@hyperlane-xyz/utils';
+import { Ownable, ProxyAdmin } from '@hyperlane-xyz/core';
 import { HyperlaneContracts, HyperlaneFactories } from '../contracts';
 import { MultiProvider } from '../providers/MultiProvider';
-import { BeaconProxyAddresses, ProxiedContract } from '../proxy';
+import { ProxiedContract, TransparentProxyAddresses } from '../proxy';
 import { ChainMap, ChainName } from '../types';
 import { ContractVerificationInput } from './verify/types';
 export interface DeployerOptions {
@@ -27,19 +26,15 @@ export declare abstract class HyperlaneDeployer<Chain extends ChainName, Config,
     abstract deployContracts(chain: Chain, config: Config): Promise<Contracts>;
     deploy(partialDeployment?: Partial<Record<Chain, Partial<Contracts>>>): Promise<Record<Chain, Contracts>>;
     protected runIfOwner(chain: Chain, ownable: Ownable, fn: () => Promise<any>): Promise<void>;
-    protected deployContractFromFactory<F extends ethers.ContractFactory>(chain: Chain, factory: F, contractName: string, args: Parameters<F['deploy']>, deployOpts?: DeployOptions): Promise<ReturnType<F['deploy']>>;
+    protected deployContractFromFactory<F extends ethers.ContractFactory>(chain: Chain, factory: F, contractName: string, constructorArgs: Parameters<F['deploy']>, deployOpts?: DeployOptions): Promise<ReturnType<F['deploy']>>;
     deployContract<K extends keyof Factories>(chain: Chain, contractName: K, args: Parameters<Factories[K]['deploy']>, deployOpts?: DeployOptions): Promise<ReturnType<Factories[K]['deploy']>>;
-    protected deployProxy<C extends ethers.Contract>(chain: Chain, implementation: C, beaconAddress: string, initArgs: Parameters<C['initialize']>): Promise<ProxiedContract<C, BeaconProxyAddresses>>;
+    protected deployProxy<C extends ethers.Contract>(chain: Chain, implementation: C, proxyAdmin: ProxyAdmin, initArgs: Parameters<C['initialize']>, deployOpts?: DeployOptions): Promise<ProxiedContract<C, TransparentProxyAddresses>>;
+    private cacheContract;
     /**
-     * Deploys the UpgradeBeacon, Implementation and Proxy for a given contract
+     * Deploys the Implementation and Proxy for a given contract
      *
      */
-    deployProxiedContract<K extends keyof Factories, C extends Awaited<ReturnType<Factories[K]['deploy']>>>(chain: Chain, contractName: K, deployArgs: Parameters<Factories[K]['deploy']>, ubcAddress: types.Address, initArgs: Parameters<C['initialize']>): Promise<ProxiedContract<C, BeaconProxyAddresses>>;
-    /**
-     * Sets up a new proxy with the same beacon and implementation
-     *
-     */
-    duplicateProxiedContract<C extends ethers.Contract>(chain: Chain, proxy: ProxiedContract<C, BeaconProxyAddresses>, initArgs: Parameters<C['initialize']>): Promise<ProxiedContract<C, BeaconProxyAddresses>>;
+    deployProxiedContract<K extends keyof Factories, C extends Awaited<ReturnType<Factories[K]['deploy']>>>(chain: Chain, contractName: K, constructorArgs: Parameters<Factories[K]['deploy']>, proxyAdmin: ProxyAdmin, initArgs: Parameters<C['initialize']>, deployOpts?: DeployOptions): Promise<ProxiedContract<C, TransparentProxyAddresses>>;
     mergeWithExistingVerificationInputs(existingInputsMap: ChainMap<Chain, ContractVerificationInput[]>): ChainMap<Chain, ContractVerificationInput[]>;
 }
 //# sourceMappingURL=HyperlaneDeployer.d.ts.map

package/dist/deploy/HyperlaneDeployer.d.ts.map

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

package/dist/deploy/HyperlaneDeployer.js

@@ -56,12 +56,17 @@ class HyperlaneDeployer {
             const dc = this.multiProvider.getChainConnection(chain);
             const address = yield dc.signer.getAddress();
             const owner = yield ownable.owner();
+            const logObj = { owner, signer: address };
             if (address === owner) {
+                this.logger('Owner and signer are equal, proceeding', logObj);
                 return fn();
             }
+            else {
+                this.logger('Owner and signer NOT equal, skipping', logObj);
+            }
         });
     }
-    deployContractFromFactory(chain, factory, contractName, args, deployOpts) {
+    deployContractFromFactory(chain, factory, contractName, constructorArgs, deployOpts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const cachedContract = (_a = this.deployedContracts[chain]) === null || _a === void 0 ? void 0 : _a[contractName];
@@ -78,29 +83,29 @@ class HyperlaneDeployer {
             if (deployOpts &&
                 deployOpts.create2Salt &&
                 (yield chainConnection.provider.getCode(exports.CREATE2FACTORY_ADDRESS)) != '0x') {
-                if (args.length > 0) {
-                    throw new Error("Can't use CREATE2 with deployment args");
-                }
                 this.logger(`Deploying with CREATE2 factory`);
                 const create2Factory = core_1.Create2Factory__factory.connect(exports.CREATE2FACTORY_ADDRESS, signer);
                 const salt = ethers_1.ethers.utils.keccak256(ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(deployOpts.create2Salt)));
-                const contractAddr = yield create2Factory.deployedAddress(factory.bytecode, yield signer.getAddress(), salt);
+                const encodedConstructorArgs = factory.interface.encodeDeploy(constructorArgs);
+                const bytecode = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.concat([factory.bytecode, encodedConstructorArgs]));
+                // TODO: Maybe recover deployed contracts?
+                const contractAddr = yield create2Factory.deployedAddress(bytecode, yield signer.getAddress(), salt);
                 const deployTx = deployOpts.initCalldata
-                    ? yield create2Factory.deployAndInit(factory.bytecode, salt, deployOpts.initCalldata, chainConnection.overrides)
-                    : yield create2Factory.deploy(factory.bytecode, salt, chainConnection.overrides);
+                    ? yield create2Factory.deployAndInit(bytecode, salt, deployOpts.initCalldata, chainConnection.overrides)
+                    : yield create2Factory.deploy(bytecode, salt, chainConnection.overrides);
                 yield chainConnection.handleTx(deployTx);
                 this.verificationInputs[chain].push({
                     name: contractName,
                     address: contractAddr,
                     isProxy: false,
-                    constructorArguments: '',
+                    constructorArguments: encodedConstructorArgs,
                 });
                 return factory.attach(contractAddr).connect(signer);
             }
             else {
                 const contract = yield factory
                     .connect(signer)
-                    .deploy(...args, chainConnection.overrides);
+                    .deploy(...constructorArgs, chainConnection.overrides);
                 yield chainConnection.handleTx(contract.deployTransaction);
                 if (deployOpts === null || deployOpts === void 0 ? void 0 : deployOpts.initCalldata) {
                     this.logger(`Initialize ${contractName} on ${chain}`);
@@ -118,30 +123,64 @@ class HyperlaneDeployer {
     }
     deployContract(chain, contractName, args, deployOpts) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.deployContractFromFactory(chain, this.factories[contractName], contractName.toString(), args, deployOpts);
+            const contract = yield this.deployContractFromFactory(chain, this.factories[contractName], contractName.toString(), args, deployOpts);
+            this.cacheContract(chain, contractName, contract);
+            return contract;
         });
     }
-    deployProxy(chain, implementation, beaconAddress, initArgs) {
+    deployProxy(chain, implementation, proxyAdmin, initArgs, deployOpts) {
         return __awaiter(this, void 0, void 0, function* () {
             const initData = implementation.interface.encodeFunctionData('initialize', initArgs);
-            const deployArgs = [
-                beaconAddress,
-                initData,
-            ];
-            const beaconProxy = yield this.deployContractFromFactory(chain, new core_1.UpgradeBeaconProxy__factory(), 'UpgradeBeaconProxy', deployArgs);
-            return new proxy_1.ProxiedContract(implementation.attach(beaconProxy.address), {
-                kind: proxy_1.ProxyKind.UpgradeBeacon,
-                proxy: beaconProxy.address,
+            let proxy;
+            const chainConnection = this.multiProvider.getChainConnection(chain);
+            this.logger(`Deploying transparent upgradable proxy`);
+            if (deployOpts &&
+                deployOpts.create2Salt &&
+                (yield chainConnection.provider.getCode(exports.CREATE2FACTORY_ADDRESS)) != '0x') {
+                // To get consistent addresses with Create2, we need to use
+                // consistent constructor arguments.
+                // The three constructor arguments we need to configure are:
+                // 1. Proxy implementation: This will start as the Create2Factory
+                //    address, as it needs to be a contract address.
+                //    After we've taken over as the proxy admin, we will set it
+                //    to the proper address.
+                // 2. Proxy admin: This will start as the Create2Factory contract
+                //    address. We will change this to the proper address atomically.
+                // 3. Initialization data: This will start as null, and we will
+                //    initialize our proxied contract manually.
+                const constructorArgs = [exports.CREATE2FACTORY_ADDRESS, exports.CREATE2FACTORY_ADDRESS, '0x'];
+                // We set the initCallData to atomically change admin to the proxyAdmin
+                // contract.
+                const initCalldata = new core_1.TransparentUpgradeableProxy__factory().interface.encodeFunctionData('changeAdmin', [proxyAdmin.address]);
+                proxy = yield this.deployContractFromFactory(chain, new core_1.TransparentUpgradeableProxy__factory(), 'TransparentUpgradableProxy', constructorArgs, Object.assign(Object.assign({}, deployOpts), { initCalldata }));
+                this.logger(`Upgrading and initializing transparent upgradable proxy`);
+                // We now have a deployed proxy admin'd by ProxyAdmin.
+                // Upgrade its implementation and initialize it
+                yield proxyAdmin.upgradeAndCall(proxy.address, implementation.address, initData);
+            }
+            else {
+                const constructorArgs = [implementation.address, proxyAdmin.address, initData];
+                proxy = yield this.deployContractFromFactory(chain, new core_1.TransparentUpgradeableProxy__factory(), 'TransparentUpgradableProxy', constructorArgs);
+            }
+            return new proxy_1.ProxiedContract(implementation.attach(proxy.address), {
+                kind: proxy_1.ProxyKind.Transparent,
+                proxy: proxy.address,
                 implementation: implementation.address,
-                beacon: beaconAddress,
             });
         });
     }
+    cacheContract(chain, contractName, contract) {
+        if (!this.deployedContracts[chain]) {
+            this.deployedContracts[chain] = {};
+        }
+        // @ts-ignore
+        this.deployedContracts[chain][contractName] = contract;
+    }
     /**
-     * Deploys the UpgradeBeacon, Implementation and Proxy for a given contract
+     * Deploys the Implementation and Proxy for a given contract
      *
      */
-    deployProxiedContract(chain, contractName, deployArgs, ubcAddress, initArgs) {
+    deployProxiedContract(chain, contractName, constructorArgs, proxyAdmin, initArgs, deployOpts) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const cachedProxy = (_a = this.deployedContracts[chain]) === null || _a === void 0 ? void 0 : _a[contractName];
@@ -149,24 +188,10 @@ class HyperlaneDeployer {
                 this.logger(`Recovered proxy ${contractName.toString()} on ${chain}`);
                 return cachedProxy;
             }
-            const implementation = yield this.deployContract(chain, contractName, deployArgs);
-            this.logger(`Proxy ${contractName.toString()} on ${chain}`);
-            const beaconDeployArgs = [
-                implementation.address,
-                ubcAddress,
-            ];
-            const beacon = yield this.deployContractFromFactory(chain, new core_1.UpgradeBeacon__factory(), 'UpgradeBeacon', beaconDeployArgs);
-            return this.deployProxy(chain, implementation, beacon.address, initArgs);
-        });
-    }
-    /**
-     * Sets up a new proxy with the same beacon and implementation
-     *
-     */
-    duplicateProxiedContract(chain, proxy, initArgs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger(`Duplicate Proxy on ${chain}`);
-            return this.deployProxy(chain, proxy.contract.attach(proxy.addresses.implementation), proxy.addresses.beacon, initArgs);
+            const implementation = yield this.deployContract(chain, contractName, constructorArgs, deployOpts);
+            const contract = yield this.deployProxy(chain, implementation, proxyAdmin, initArgs, deployOpts);
+            this.cacheContract(chain, contractName, contract);
+            return contract;
         });
     }
     mergeWithExistingVerificationInputs(existingInputsMap) {

package/dist/deploy/HyperlaneDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneDeployer.js","sourceRoot":"","sources":["../../src/deploy/HyperlaneDeployer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HyperlaneDeployer.js","sourceRoot":"","sources":["../../src/deploy/HyperlaneDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAwC;AACxC,mCAAgC;AAEhC,8CAM6B;AAE7B,4CAMsB;AAEtB,oCAIkB;AAElB,8CAA0C;AAG1C,0CAA8D;AAWjD,QAAA,sBAAsB,GACjC,4CAA4C,CAAC;AAC/C,MAAsB,iBAAiB;IAWrC,YACqB,aAAmC,EACnC,SAAkC,EAClC,SAAoB,EACpB,OAAyB;QAHzB,kBAAa,GAAb,aAAa,CAAsB;QACnC,cAAS,GAAT,SAAS,CAAyB;QAClC,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAkB;QATvC,sBAAiB,GAA+C,EAAE,CAAC;QAWxE,IAAI,CAAC,kBAAkB,GAAG,IAAA,gBAAM,EAAC,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,KAAI,IAAA,aAAK,EAAC,uBAAuB,CAAC,CAAC;IAClE,CAAC;IAIK,MAAM,CACV,oBAAgE,IAAI;SACjE,iBAAiB;;;YAEpB,IAAA,gBAAM,EACJ,iBAA+C,EAC/C,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBACnB,IAAI,CAAC,MAAM,CACT,4BAA4B,KAAK,0BAA0B,CAC5D,CAAC;gBACF,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBACrE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAA,4BAAgB,EAC9C,SAAS,EACT,eAAe,CAAC,MAAO,CACxB,CAAC;YACJ,CAAC,CACF,CAAC;YACF,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAY,CAAC;YAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAC/C,YAAY,EACZ,KAAK,CACN,CAAC,YAAY,CAAC;YAEf,IAAI,CAAC,MAAM,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAC;YAC/C,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;gBAChC,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBACrE,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,CAAC;gBACxD,IAAI,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,SAAS,MAAM,CAAC,CAAC;gBAC3D,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,eAAe,CACxD,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACtB,CAAC;gBACF,uDAAuD;gBACvD,IAAI,CAAC,MAAM,CACT,IAAI,CAAC,SAAS,CACZ,IAAA,8BAAkB,EAChB,MAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAe,mCAAI,EAAE,CACnD,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;aACH;YACD,OAAO,IAAI,CAAC,iBAA+C,CAAC;;KAC7D;IAEe,UAAU,CACxB,KAAY,EACZ,OAAgB,EAChB,EAAsB;;YAEtB,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,MAAO,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;YAC1C,IAAI,OAAO,KAAK,KAAK,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,wCAAwC,EAAE,MAAM,CAAC,CAAC;gBAC9D,OAAO,EAAE,EAAE,CAAC;aACb;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,sCAAsC,EAAE,MAAM,CAAC,CAAC;aAC7D;QACH,CAAC;KAAA;IAEe,yBAAyB,CACvC,KAAY,EACZ,OAAU,EACV,YAAoB,EACpB,eAAwC,EACxC,UAA0B;;;YAE1B,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,0CAAG,YAAY,CAAC,CAAC;YACrE,IAAI,cAAc,EAAE;gBAClB,IAAI,CAAC,MAAM,CAAC,sBAAsB,YAAY,OAAO,KAAK,EAAE,CAAC,CAAC;gBAC9D,OAAO,cAAyC,CAAC;aAClD;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACrE,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;YACtC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAC;aAC3C;YAED,IAAI,CAAC,MAAM,CAAC,UAAU,YAAY,OAAO,KAAK,EAAE,CAAC,CAAC;YAElD,IACE,UAAU;gBACV,UAAU,CAAC,WAAW;gBACtB,CAAC,MAAM,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,8BAAsB,CAAC,CAAC,IAAI,IAAI,EACxE;gBACA,IAAI,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC;gBAE9C,MAAM,cAAc,GAAG,8BAAuB,CAAC,OAAO,CACpD,8BAAsB,EACtB,MAAM,CACP,CAAC;gBACF,MAAM,IAAI,GAAG,eAAM,CAAC,KAAK,CAAC,SAAS,CACjC,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CACvE,CAAC;gBACF,MAAM,sBAAsB,GAC1B,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;gBAClD,MAAM,QAAQ,GAAG,eAAM,CAAC,KAAK,CAAC,OAAO,CACnC,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAChE,CAAC;gBAEF,0CAA0C;gBAC1C,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,eAAe,CACvD,QAAQ,EACR,MAAM,MAAM,CAAC,UAAU,EAAE,EACzB,IAAI,CACL,CAAC;gBAEF,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY;oBACtC,CAAC,CAAC,MAAM,cAAc,CAAC,aAAa,CAChC,QAAQ,EACR,IAAI,EACJ,UAAU,CAAC,YAAY,EACvB,eAAe,CAAC,SAAS,CAC1B;oBACH,CAAC,CAAC,MAAM,cAAc,CAAC,MAAM,CACzB,QAAQ,EACR,IAAI,EACJ,eAAe,CAAC,SAAS,CAC1B,CAAC;gBACN,MAAM,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAEzC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;oBAClC,IAAI,EAAE,YAAY;oBAClB,OAAO,EAAE,YAAY;oBACrB,OAAO,EAAE,KAAK;oBACd,oBAAoB,EAAE,sBAAsB;iBAC7C,CAAC,CAAC;gBAEH,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,MAAM,CAEjD,CAAC;aACH;iBAAM;gBACL,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC3B,OAAO,CAAC,MAAM,CAAC;qBACf,MAAM,CAAC,GAAG,eAAe,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;gBAEzD,MAAM,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;gBAE3D,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,EAAE;oBAC5B,IAAI,CAAC,MAAM,CAAC,cAAc,YAAY,OAAO,KAAK,EAAE,CAAC,CAAC;oBACtD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;wBAC1C,EAAE,EAAE,QAAQ,CAAC,OAAO;wBACpB,IAAI,EAAE,UAAU,CAAC,YAAY;qBAC9B,CAAC,CAAC;oBACH,MAAM,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBACxC;gBAED,MAAM,iBAAiB,GAAG,IAAA,oCAA4B,EACpD,YAAY,EACZ,QAAQ,EACR,OAAO,CAAC,QAAQ,CACjB,CAAC;gBACF,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAEvD,OAAO,QAAmC,CAAC;aAC5C;;KACF;IAEK,cAAc,CAClB,KAAY,EACZ,YAAe,EACf,IAAwC,EACxC,UAA0B;;YAE1B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACnD,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAC5B,YAAY,CAAC,QAAQ,EAAE,EACvB,IAAI,EACJ,UAAU,CACX,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;YAClD,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA;IAEe,WAAW,CACzB,KAAY,EACZ,cAAiB,EACjB,UAAsB,EACtB,QAAqC,EACrC,UAA0B;;YAE1B,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,kBAAkB,CAC1D,YAAY,EACZ,QAAQ,CACT,CAAC;YACF,IAAI,KAAkC,CAAC;YACvC,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACrE,IAAI,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;YACtD,IACE,UAAU;gBACV,UAAU,CAAC,WAAW;gBACtB,CAAC,MAAM,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,8BAAsB,CAAC,CAAC,IAAI,IAAI,EACxE;gBACA,2DAA2D;gBAC3D,oCAAoC;gBACpC,4DAA4D;gBAC5D,iEAAiE;gBACjE,oDAAoD;gBACpD,+DAA+D;gBAC/D,4BAA4B;gBAC5B,iEAAiE;gBACjE,oEAAoE;gBACpE,+DAA+D;gBAC/D,+CAA+C;gBAC/C,MAAM,eAAe,GAEjB,CAAC,8BAAsB,EAAE,8BAAsB,EAAE,IAAI,CAAC,CAAC;gBAC3D,uEAAuE;gBACvE,YAAY;gBACZ,MAAM,YAAY,GAChB,IAAI,2CAAoC,EAAE,CAAC,SAAS,CAAC,kBAAkB,CACrE,aAAa,EACb,CAAC,UAAU,CAAC,OAAO,CAAC,CACrB,CAAC;gBACJ,KAAK,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAC1C,KAAK,EACL,IAAI,2CAAoC,EAAE,EAC1C,4BAA4B,EAC5B,eAAe,kCACV,UAAU,KAAE,YAAY,IAC9B,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,yDAAyD,CAAC,CAAC;gBACvE,sDAAsD;gBACtD,+CAA+C;gBAC/C,MAAM,UAAU,CAAC,cAAc,CAC7B,KAAK,CAAC,OAAO,EACb,cAAc,CAAC,OAAO,EACtB,QAAQ,CACT,CAAC;aACH;iBAAM;gBACL,MAAM,eAAe,GAEjB,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC3D,KAAK,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAC1C,KAAK,EACL,IAAI,2CAAoC,EAAE,EAC1C,4BAA4B,EAC5B,eAAe,CAChB,CAAC;aACH;YAED,OAAO,IAAI,uBAAe,CACxB,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAM,EACzC;gBACE,IAAI,EAAE,iBAAS,CAAC,WAAW;gBAC3B,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,cAAc,EAAE,cAAc,CAAC,OAAO;aACvC,CACF,CAAC;QACJ,CAAC;KAAA;IAEO,aAAa,CACnB,KAAY,EACZ,YAAe,EACf,QAA2B;QAE3B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YAClC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SACpC;QACD,aAAa;QACb,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;IACzD,CAAC;IAED;;;OAGG;IACG,qBAAqB,CAIzB,KAAY,EACZ,YAAe,EACf,eAAmD,EACnD,UAAsB,EACtB,QAAqC,EACrC,UAA0B;;;YAE1B,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,0CAAG,YAAmB,CAAC,CAAC;YACzE,IAAI,WAAW,EAAE;gBACf,IAAI,CAAC,MAAM,CAAC,mBAAmB,YAAY,CAAC,QAAQ,EAAE,OAAO,KAAK,EAAE,CAAC,CAAC;gBACtE,OAAO,WAA4D,CAAC;aACrE;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAC9C,KAAK,EACL,YAAY,EACZ,eAAe,EACf,UAAU,CACX,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CACrC,KAAK,EACL,cAAmB,EACnB,UAAU,EACV,QAAQ,EACR,UAAU,CACX,CAAC;YACF,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;YAClD,OAAO,QAAQ,CAAC;;KACjB;IAED,mCAAmC,CACjC,iBAA+D;QAE/D,MAAM,SAAS,GAAG,IAAI,GAAG,EAAS,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAU,CAAC,CAAC,CAAC;QACzE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACjD,SAAS,CAAC,GAAG,CAAC,CAAU,CAAC,CAC1B,CAAC;QAEF,aAAa;QACb,MAAM,GAAG,GAAiD,EAAE,CAAC;QAC7D,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;YAC7B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACtD,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACvD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,SAAS,CAAC,CAAC;SAChD;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AA5VD,8CA4VC"}

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

@@ -1,4 +1,3 @@
-import { MultisigValidatorManager } from '@hyperlane-xyz/core';
 import { HyperlaneCore } from '../../core/HyperlaneCore';
 import { ChainName } from '../../types';
 import { HyperlaneAppChecker } from '../HyperlaneAppChecker';
@@ -6,12 +5,9 @@ import { CoreConfig } from './types';
 export declare class HyperlaneCoreChecker<Chain extends ChainName> extends HyperlaneAppChecker<Chain, HyperlaneCore<Chain>, CoreConfig> {
     checkChain(chain: Chain): Promise<void>;
     checkDomainOwnership(chain: Chain): Promise<void>;
-    checkOutbox(chain: Chain): Promise<void>;
-    checkValidatorManagers(chain: Chain): Promise<void>;
-    checkValidatorManager(local: Chain, remote: Chain, validatorManager: MultisigValidatorManager): Promise<void>;
-    checkInboxes(chain: Chain): Promise<void>;
-    checkConnectionManager(chain: Chain): Promise<void>;
+    checkMailbox(chain: Chain): Promise<void>;
     checkProxiedContracts(chain: Chain): Promise<void>;
-    checkInterchainGasPaymaster(chain: Chain): Promise<void>;
+    checkMultisigIsm(local: Chain): Promise<void>;
+    checkMultisigIsmForRemote(local: Chain, remote: Chain): Promise<void>;
 }
 //# sourceMappingURL=HyperlaneCoreChecker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreChecker.d.ts","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAI/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAEL,UAAU,EASX,MAAM,SAAS,CAAC;AAEjB,qBAAa,oBAAoB,CAC/B,KAAK,SAAS,SAAS,CACvB,SAAQ,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC9D,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBvC,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBjD,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBxC,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBnD,qBAAqB,CACzB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,KAAK,EACb,gBAAgB,EAAE,wBAAwB,GACzC,OAAO,CAAC,IAAI,CAAC;IA8CV,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzC,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAqCnD,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlD,2BAA2B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ/D"}
+{"version":3,"file":"HyperlaneCoreChecker.d.ts","sourceRoot":"","sources":["../../../src/deploy/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EACL,UAAU,EAOX,MAAM,SAAS,CAAC;AAEjB,qBAAa,oBAAoB,CAC/B,KAAK,SAAS,SAAS,CACvB,SAAQ,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAC9D,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAavC,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBzC,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,yBAAyB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAgD5E"}