@hyperlane-xyz/sdk 1.5.7-beta1 → 3.0.0-beta0

package/dist/core/TestCoreDeployer.js

@@ -1,31 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TestCoreDeployer = void 0;
-const core_1 = require("@hyperlane-xyz/core");
 const chains_1 = require("../consts/chains");
-const HyperlaneIsmFactory_1 = require("../ism/HyperlaneIsmFactory");
 const testUtils_1 = require("../test/testUtils");
 const HyperlaneCoreDeployer_1 = require("./HyperlaneCoreDeployer");
 const TestCoreApp_1 = require("./TestCoreApp");
-const contracts_1 = require("./contracts");
-const testCoreFactories = {
-    ...contracts_1.coreFactories,
-    mailbox: new core_1.TestMailbox__factory(),
-    interchainGasPaymaster: new core_1.TestInterchainGasPaymaster__factory(),
-    testIsm: new core_1.TestMultisigIsm__factory(),
-};
 class TestCoreDeployer extends HyperlaneCoreDeployer_1.HyperlaneCoreDeployer {
-    constructor(multiProvider) {
-        const ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory({}, multiProvider);
-        super(multiProvider, ismFactory);
-        this.multiProvider = multiProvider;
-    }
-    // deploy a test ISM instead of a real ISM
-    async deployIsm(chain) {
-        const testIsm = await this.deployContractFromFactory(chain, testCoreFactories.testIsm, 'testIsm', []);
-        await testIsm.setAccept(true);
-        return testIsm.address;
-    }
     async deploy() {
         return super.deploy((0, testUtils_1.testCoreConfig)(chains_1.TestChains));
     }

package/dist/core/TestCoreDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestCoreDeployer.js","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAE7B,6CAA8C;AAE9C,oEAAiE;AAEjE,iDAAmD;AAGnD,mEAAgE;AAChE,+CAA4C;AAC5C,2CAA2D;AAE3D,MAAM,iBAAiB,GAAG;IACxB,GAAG,yBAAa;IAChB,OAAO,EAAE,IAAI,2BAAoB,EAAE;IACnC,sBAAsB,EAAE,IAAI,0CAAmC,EAAE;IACjE,OAAO,EAAE,IAAI,+BAAwB,EAAE;CACxC,CAAC;AAEF,MAAa,gBAAiB,SAAQ,6CAAqB;IACzD,YAA4B,aAA4B;QACtD,MAAM,UAAU,GAAG,IAAI,yCAAmB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC9D,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAFP,kBAAa,GAAb,aAAa,CAAe;IAGxD,CAAC;IAED,0CAA0C;IAC1C,KAAK,CAAC,SAAS,CAAC,KAAgB;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAClD,KAAK,EACL,iBAAiB,CAAC,OAAO,EACzB,SAAS,EACT,EAAE,CACH,CAAC;QACF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM;QACV,OAAO,KAAK,CAAC,MAAM,CAAC,IAAA,0BAAc,EAAC,mBAAU,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,yBAAW,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;CACF;AAzBD,4CAyBC"}
+{"version":3,"file":"TestCoreDeployer.js","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAE9C,iDAAmD;AAGnD,mEAAgE;AAChE,+CAA4C;AAG5C,MAAa,gBAAiB,SAAQ,6CAAqB;IACzD,KAAK,CAAC,MAAM;QACV,OAAO,KAAK,CAAC,MAAM,CAAC,IAAA,0BAAc,EAAC,mBAAU,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,yBAAW,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;CACF;AARD,4CAQC"}

package/dist/core/adapters/SealevelCoreAdapter.d.ts

@@ -28,6 +28,6 @@ export declare class SealevelCoreAdapter extends BaseSealevelAdapter implements
     static deriveMailboxDispatchedMessagePda(mailboxProgramId: string | PublicKey, uniqueMessageAccount: string | PublicKey): PublicKey;
     static deriveMailboxDispatchAuthorityPda(programId: string | PublicKey): PublicKey;
     static deriveMailboxProcessAuthorityPda(mailboxProgramId: string | PublicKey, recipient: string | PublicKey): PublicKey;
-    static deriveMailboxMessageProcessedPda(mailboxProgramId: string | PublicKey, messageId: string): PublicKey;
+    static deriveMailboxMessageProcessedPda(mailboxProgramId: string | PublicKey, messageId: HexString): PublicKey;
 }
 //# sourceMappingURL=SealevelCoreAdapter.d.ts.map

package/dist/core/adapters/SealevelCoreAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SealevelCoreAdapter.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/SealevelCoreAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAa,MAAM,sBAAsB,CAAC;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAEL,uBAAuB,EACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAKvC,qBAAa,mBACX,SAAQ,mBACR,YAAW,YAAY;aAGL,SAAS,EAAE,SAAS;aACpB,aAAa,EAAE,qBAAqB;aACpC,SAAS,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;gBAF/B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;IAKjD,iBAAiB,CACf,QAAQ,EAAE,uBAAuB,GAChC,KAAK,CAAC;QAAE,SAAS,EAAE,SAAS,CAAC;QAAC,WAAW,EAAE,SAAS,CAAA;KAAE,CAAC;IAkBpD,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,SAAS,EACtB,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAoBhB,MAAM,CAAC,wBAAwB,CAC7B,IAAI,EAAE,MAAM,EAAE,GACb,KAAK,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAepD,MAAM,CAAC,qBAAqB,CAC1B,gBAAgB,EAAE,MAAM,GAAG,SAAS,GACnC,SAAS;IAIZ,MAAM,CAAC,sBAAsB,CAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,GACnC,SAAS;IAIZ,MAAM,CAAC,iCAAiC,CACtC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,oBAAoB,EAAE,MAAM,GAAG,SAAS,GACvC,SAAS;IAaZ,MAAM,CAAC,iCAAiC,CACtC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,SAAS;IAOZ,MAAM,CAAC,gCAAgC,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,SAAS;IAaZ,MAAM,CAAC,gCAAgC,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,SAAS,EAAE,MAAM,GAChB,SAAS;CAMb"}
+{"version":3,"file":"SealevelCoreAdapter.d.ts","sourceRoot":"","sources":["../../../src/core/adapters/SealevelCoreAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACL,OAAO,EACP,SAAS,EAIV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAEL,uBAAuB,EACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAKvC,qBAAa,mBACX,SAAQ,mBACR,YAAW,YAAY;aAGL,SAAS,EAAE,SAAS;aACpB,aAAa,EAAE,qBAAqB;aACpC,SAAS,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;gBAF/B,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE;IAKjD,iBAAiB,CACf,QAAQ,EAAE,uBAAuB,GAChC,KAAK,CAAC;QAAE,SAAS,EAAE,SAAS,CAAC;QAAC,WAAW,EAAE,SAAS,CAAA;KAAE,CAAC;IAiBpD,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,SAAS,EACtB,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAoBhB,MAAM,CAAC,wBAAwB,CAC7B,IAAI,EAAE,MAAM,EAAE,GACb,KAAK,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAepD,MAAM,CAAC,qBAAqB,CAC1B,gBAAgB,EAAE,MAAM,GAAG,SAAS,GACnC,SAAS;IAIZ,MAAM,CAAC,sBAAsB,CAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,GACnC,SAAS;IAIZ,MAAM,CAAC,iCAAiC,CACtC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,oBAAoB,EAAE,MAAM,GAAG,SAAS,GACvC,SAAS;IAaZ,MAAM,CAAC,iCAAiC,CACtC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,SAAS;IAOZ,MAAM,CAAC,gCAAgC,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,SAAS;IAaZ,MAAM,CAAC,gCAAgC,CACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,SAAS,EAAE,SAAS,GACnB,SAAS;CAYb"}

package/dist/core/adapters/SealevelCoreAdapter.js

@@ -18,15 +18,14 @@ class SealevelCoreAdapter extends MultiProtocolApp_1.BaseSealevelAdapter {
         if (sourceTx.type !== ProviderType_1.ProviderType.SolanaWeb3) {
             throw new Error(`Unsupported provider type for SealevelCoreAdapter ${sourceTx.type}`);
         }
-        const receipt = sourceTx.receipt;
-        const logs = receipt.meta?.logMessages;
+        const logs = sourceTx.receipt.meta?.logMessages;
         if (!logs)
             throw new Error('Transaction logs required to check message delivery');
         const parsedLogs = SealevelCoreAdapter.parseMessageDispatchLogs(logs);
         if (!parsedLogs.length)
             throw new Error('Message dispatch log not found');
         return parsedLogs.map(({ destination, messageId }) => ({
-            messageId: Buffer.from(messageId, 'hex').toString('hex'),
+            messageId: (0, utils_1.ensure0x)(messageId),
             destination: this.multiProvider.getChainName(destination),
         }));
     }
@@ -86,7 +85,13 @@ class SealevelCoreAdapter extends MultiProtocolApp_1.BaseSealevelAdapter {
         ], mailboxProgramId);
     }
     static deriveMailboxMessageProcessedPda(mailboxProgramId, messageId) {
-        return super.derivePda(['hyperlane', '-', 'processed_message', Buffer.from(messageId, 'hex')], mailboxProgramId);
+        return super.derivePda([
+            'hyperlane',
+            '-',
+            'processed_message',
+            '-',
+            Buffer.from((0, utils_1.strip0x)(messageId), 'hex'),
+        ], mailboxProgramId);
     }
 }
 exports.SealevelCoreAdapter = SealevelCoreAdapter;

package/dist/core/adapters/SealevelCoreAdapter.js.map

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

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

@@ -7,6 +7,8 @@ const hardhat_1 = require("hardhat");
 const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const chains_1 = require("../consts/chains");
+const HyperlaneProxyFactoryDeployer_1 = require("../deploy/HyperlaneProxyFactoryDeployer");
+const HyperlaneIsmFactory_1 = require("../ism/HyperlaneIsmFactory");
 const MultiProvider_1 = require("../providers/MultiProvider");
 const TestCoreDeployer_1 = require("./TestCoreDeployer");
 const localChain = chains_1.Chains.test1;
@@ -17,7 +19,9 @@ describe('TestCoreDeployer', async () => {
     beforeEach(async () => {
         const [signer] = await hardhat_1.ethers.getSigners();
         const multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
-        const deployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
+        const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer_1.HyperlaneProxyFactoryDeployer(multiProvider);
+        const ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory(await ismFactoryDeployer.deploy(multiProvider.mapKnownChains(() => ({}))), multiProvider);
+        const deployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider, ismFactory);
         testCoreApp = await deployer.deployApp();
         const recipient = await new core_1.TestRecipient__factory(signer).deploy();
         localMailbox = testCoreApp.getContracts(localChain).mailbox;

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":"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"}

package/dist/core/types.d.ts

@@ -23,8 +23,8 @@ export declare enum MailboxViolationType {
 }
 export interface MailboxViolation extends CheckerViolation {
     type: CoreViolationType.Mailbox;
+    subType: MailboxViolationType;
     contract: Mailbox;
-    mailboxType: MailboxViolationType;
 }
 export interface MailboxMultisigIsmViolation extends MailboxViolation {
     actual: Address;

package/dist/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,UAAU,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,iBAAiB,sBAAsB;IACvC,iBAAiB,sBAAsB;CACxC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,IAAI,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAC1C,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,UAAU,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,iBAAiB,sBAAsB;IACvC,iBAAiB,sBAAsB;CACxC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAChC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,IAAI,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAC1C,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC"}

package/dist/deploy/HyperlaneAppChecker.d.ts

@@ -24,5 +24,6 @@ export declare abstract class HyperlaneAppChecker<App extends HyperlaneApp<any>,
     protected checkOwnership(chain: ChainName, owner: Address, ownableOverrides?: Record<string, Address>): Promise<void>;
     expectViolations(violationCounts: Record<string, number>): void;
     expectEmpty(): void;
+    logViolationsTable(): void;
 }
 //# sourceMappingURL=HyperlaneAppChecker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneAppChecker.d.ts","sourceRoot":"","sources":["../../src/deploy/HyperlaneAppChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EACL,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAuB,MAAM,SAAS,CAAC;AAC7D,OAAO,EAGL,gBAAgB,EAKjB,MAAM,SAAS,CAAC;AAEjB,8BAAsB,mBAAmB,CACvC,GAAG,SAAS,YAAY,CAAC,GAAG,CAAC,EAC7B,MAAM;IAEN,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBAGtC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;IAQ7B,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9C,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAiB9B,YAAY,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAIzC,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BtD,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC;IAkDhB,OAAO,CAAC,sBAAsB;IAOxB,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAAE,EAChC,yBAAyB,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAiB,GACjE,OAAO,CAAC,IAAI,CAAC;IAiBV,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;cAKrD,cAAc,CAC5B,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,OAAO,EACd,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,IAAI,CAAC;IAmBhB,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAgB/D,WAAW,IAAI,IAAI;CAIpB"}
+{"version":3,"file":"HyperlaneAppChecker.d.ts","sourceRoot":"","sources":["../../src/deploy/HyperlaneAppChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAA+B,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAuB,MAAM,SAAS,CAAC;AAC7D,OAAO,EAGL,gBAAgB,EAKjB,MAAM,SAAS,CAAC;AAEjB,8BAAsB,mBAAmB,CACvC,GAAG,SAAS,YAAY,CAAC,GAAG,CAAC,EAC7B,MAAM;IAEN,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBAGtC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;IAQ7B,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9C,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAsB9B,YAAY,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAIzC,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BtD,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC;IAkDhB,OAAO,CAAC,sBAAsB;IAOxB,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAAE,EAChC,yBAAyB,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAiB,GACjE,OAAO,CAAC,IAAI,CAAC;IAiBV,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;cAKrD,cAAc,CAC5B,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,OAAO,EACd,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACzC,OAAO,CAAC,IAAI,CAAC;IAmBhB,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAgB/D,WAAW,IAAI,IAAI;IAKnB,kBAAkB,IAAI,IAAI;CAmB3B"}

package/dist/deploy/HyperlaneAppChecker.js

@@ -16,14 +16,17 @@ class HyperlaneAppChecker {
     }
     async check() {
         Object.keys(this.configMap)
-            .filter((_) => !this.app.chains().includes(_))
+            .filter((chain) => this.multiProvider.getChainMetadata(chain).protocol ===
+            utils_2.ProtocolType.Ethereum && !this.app.chains().includes(chain))
             .forEach((chain) => this.addViolation({
             type: types_1.ViolationType.NotDeployed,
             chain,
             expected: '',
             actual: '',
         }));
-        return Promise.all(this.app.chains().map((chain) => this.checkChain(chain)));
+        return Promise.all(
+        // this.app.chains() will only return Ethereum chains that can be interacted with.
+        this.app.chains().map((chain) => this.checkChain(chain)));
     }
     addViolation(violation) {
         this.violations.push(violation);
@@ -148,6 +151,26 @@ class HyperlaneAppChecker {
         const count = this.violations.length;
         (0, utils_2.assert)(count === 0, `Found ${count} violations`);
     }
+    logViolationsTable() {
+        const violations = this.violations;
+        if (violations.length > 0) {
+            // eslint-disable-next-line no-console
+            console.table(violations, [
+                'chain',
+                'remote',
+                'name',
+                'type',
+                'subType',
+                'actual',
+                'expected',
+                'description',
+            ]);
+        }
+        else {
+            // eslint-disable-next-line no-console
+            console.info(`${module} Checker found no violations`);
+        }
+    }
 }
 exports.HyperlaneAppChecker = HyperlaneAppChecker;
 //# sourceMappingURL=HyperlaneAppChecker.js.map

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,9 +1,10 @@
 import { Debugger } from 'debug';
-import { Contract, ethers } from 'ethers';
+import { Contract, PopulatedTransaction, ethers } from 'ethers';
 import { MailboxClient, Ownable, ProxyAdmin, TimelockController, TransparentUpgradeableProxy } from '@hyperlane-xyz/core';
 import { Address } from '@hyperlane-xyz/utils';
 import { HyperlaneAddressesMap, HyperlaneContracts, HyperlaneContractsMap, HyperlaneFactories } from '../contracts/types';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory';
+import { IsmConfig } from '../ism/types';
 import { MultiProvider } from '../providers/MultiProvider';
 import { MailboxClientConfig } from '../router/types';
 import { ChainMap, ChainName } from '../types';
@@ -18,24 +19,27 @@ export declare abstract class HyperlaneDeployer<Config, Factories extends Hyperl
     protected readonly multiProvider: MultiProvider;
     protected readonly factories: Factories;
     protected readonly options?: DeployerOptions | undefined;
+    protected readonly recoverVerificationInputs: boolean;
     verificationInputs: ChainMap<ContractVerificationInput[]>;
     cachedAddresses: HyperlaneAddressesMap<any>;
     deployedContracts: HyperlaneContractsMap<Factories>;
     startingBlockNumbers: ChainMap<number | undefined>;
     protected logger: Debugger;
     protected chainTimeoutMs: number;
-    constructor(multiProvider: MultiProvider, factories: Factories, options?: DeployerOptions | undefined);
+    constructor(multiProvider: MultiProvider, factories: Factories, options?: DeployerOptions | undefined, recoverVerificationInputs?: boolean);
     cacheAddressesMap(addressesMap: HyperlaneAddressesMap<any>): void;
     checkConfig(_: ChainMap<Config>): Promise<void>;
     abstract deployContracts(chain: ChainName, config: Config): Promise<HyperlaneContracts<Factories>>;
     deploy(configMap: ChainMap<Config>): Promise<HyperlaneContractsMap<Factories>>;
-    protected addDeployedContracts(chain: ChainName, contracts: HyperlaneContracts<any>): void;
+    protected addDeployedContracts(chain: ChainName, contracts: HyperlaneContracts<any>, verificationInputs?: ContractVerificationInput[]): void;
+    protected addVerificationArtifacts(chain: ChainName, artifacts: ContractVerificationInput[]): void;
     protected runIf<T>(chain: ChainName, address: string, fn: () => Promise<T>, label?: string): Promise<T | undefined>;
     protected runIfOwner<T>(chain: ChainName, ownable: Ownable, fn: () => Promise<T>): Promise<T | undefined>;
     protected runIfAdmin<T>(chain: ChainName, proxy: Contract, signerAdminFn: () => Promise<T>, proxyAdminOwnerFn: (proxyAdmin: ProxyAdmin) => Promise<T>): Promise<T | undefined>;
+    protected configureIsm<C extends Ownable>(chain: ChainName, contract: C, config: IsmConfig, getIsm: (contract: C) => Promise<Address>, setIsm: (contract: C, ism: Address) => Promise<PopulatedTransaction>): Promise<void>;
+    protected configureHook<C extends Ownable>(chain: ChainName, contract: C, targetHook: Address, getHook: (contract: C) => Promise<Address>, setHook: (contract: C, hook: Address) => Promise<PopulatedTransaction>): Promise<void>;
     protected initMailboxClient(local: ChainName, client: MailboxClient, config: MailboxClientConfig): Promise<void>;
     protected deployContractFromFactory<F extends ethers.ContractFactory>(chain: ChainName, factory: F, contractName: string, constructorArgs: Parameters<F['deploy']>, initializeArgs?: Parameters<Awaited<ReturnType<F['deploy']>>['initialize']>): Promise<ReturnType<F['deploy']>>;
-    protected addVerificationArtifact(chain: ChainName, artifact: ContractVerificationInput): void;
     deployContract<K extends keyof Factories>(chain: ChainName, contractName: K, constructorArgs: Parameters<Factories[K]['deploy']>, initializeArgs?: Parameters<Awaited<ReturnType<Factories[K]['deploy']>>['initialize']>): Promise<HyperlaneContracts<Factories>[K]>;
     protected changeAdmin(chain: ChainName, proxy: TransparentUpgradeableProxy, admin: string): Promise<void>;
     protected upgradeAndInitialize<C extends ethers.Contract>(chain: ChainName, proxy: TransparentUpgradeableProxy, implementation: C, initializeArgs: Parameters<C['initialize']>): Promise<void>;
@@ -43,6 +47,7 @@ export declare abstract class HyperlaneDeployer<Config, Factories extends Hyperl
     deployTimelock(chain: ChainName, timelockConfig: UpgradeConfig['timelock']): Promise<TimelockController>;
     writeCache<K extends keyof Factories>(chain: ChainName, contractName: K, address: Address): void;
     readCache<F extends ethers.ContractFactory>(chain: ChainName, factory: F, contractName: string): Awaited<ReturnType<F['deploy']>> | undefined;
+    recoverVerificationArtifacts<C extends ethers.Contract>(chain: ChainName, contractName: string, cachedContract: C, constructorArgs: Parameters<C['deploy']>, initializeArgs?: Parameters<C['initialize']>): Promise<ContractVerificationInput[]>;
     /**
      * Deploys the Implementation and Proxy for a given contract
      *

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

@@ -9,10 +9,11 @@ const HyperlaneIsmFactory_1 = require("../ism/HyperlaneIsmFactory");
 const proxy_1 = require("./proxy");
 const utils_2 = require("./verify/utils");
 class HyperlaneDeployer {
-    constructor(multiProvider, factories, options) {
+    constructor(multiProvider, factories, options, recoverVerificationInputs = false) {
         this.multiProvider = multiProvider;
         this.factories = factories;
         this.options = options;
+        this.recoverVerificationInputs = recoverVerificationInputs;
         this.verificationInputs = {};
         this.cachedAddresses = {};
         this.deployedContracts = {};
@@ -28,7 +29,9 @@ class HyperlaneDeployer {
     }
     async deploy(configMap) {
         const configChains = Object.keys(configMap);
-        const targetChains = this.multiProvider.intersect(configChains, true).intersection;
+        const ethereumConfigChains = configChains.filter((chain) => this.multiProvider.getChainMetadata(chain).protocol ===
+            utils_1.ProtocolType.Ethereum);
+        const targetChains = this.multiProvider.intersect(ethereumConfigChains, true).intersection;
         this.logger(`Start deploy to ${targetChains}`);
         for (const chain of targetChains) {
             const signerUrl = await this.multiProvider.tryGetExplorerAddressUrl(chain);
@@ -45,11 +48,20 @@ class HyperlaneDeployer {
         }
         return this.deployedContracts;
     }
-    addDeployedContracts(chain, contracts) {
+    addDeployedContracts(chain, contracts, verificationInputs) {
         this.deployedContracts[chain] = {
             ...this.deployedContracts[chain],
             ...contracts,
         };
+        if (verificationInputs)
+            this.addVerificationArtifacts(chain, verificationInputs);
+    }
+    addVerificationArtifacts(chain, artifacts) {
+        this.verificationInputs[chain] = this.verificationInputs[chain] || [];
+        artifacts.forEach((artifact) => {
+            this.verificationInputs[chain].push(artifact);
+        });
+        // TODO: deduplicate
     }
     async runIf(chain, address, fn, label = 'address') {
         const signer = await this.multiProvider.getSignerAddress(chain);
@@ -79,75 +91,70 @@ class HyperlaneDeployer {
             return this.runIf(chain, admin, () => signerAdminFn(), 'admin');
         }
     }
-    async initMailboxClient(local, client, config) {
-        this.logger(`Initializing mailbox client (if not already) on ${local}...`);
-        await this.runIfOwner(local, client, async () => {
-            const txOverrides = this.multiProvider.getTransactionOverrides(local);
-            // set hook if not already set (and configured)
-            if (config.hook && config.hook !== (await client.hook())) {
-                this.logger(`Set hook on ${local}`);
-                await this.multiProvider.handleTx(local, client.setHook(config.hook, txOverrides));
-            }
-            let currentIsm = await client.interchainSecurityModule();
-            // in case the above returns zero address, fetch the defaultISM from the mailbox
-            if (currentIsm === ethers_1.ethers.constants.AddressZero) {
-                const mailbox = core_1.Mailbox__factory.connect(config.mailbox, client.signer);
-                currentIsm = await mailbox.defaultIsm();
-            }
-            // set interchain security module if not already set (and configured)
-            if (config.interchainSecurityModule) {
-                let configuredIsm;
-                if (typeof config.interchainSecurityModule === 'string') {
-                    configuredIsm = config.interchainSecurityModule;
-                }
-                else if (this.options?.ismFactory) {
-                    const matches = await (0, HyperlaneIsmFactory_1.moduleMatchesConfig)(local, currentIsm, config.interchainSecurityModule, this.multiProvider, this.options.ismFactory.chainMap[local]);
-                    if (matches) {
-                        // when the ISM recursively matches the IsmConfig, we don't need to deploy a new ISM
-                        this.logger(`ISM matches config for chain ${local}, skipping deploy`);
-                        return;
-                    }
-                    const ism = await this.options.ismFactory.deploy(local, config.interchainSecurityModule);
-                    configuredIsm = ism.address;
-                }
-                else {
-                    throw new Error('No ISM factory provided');
+    async configureIsm(chain, contract, config, getIsm, setIsm) {
+        if (this.options?.ismFactory === undefined) {
+            throw new Error('No ISM factory provided');
+        }
+        const ismFactory = this.options.ismFactory;
+        const configuredIsm = await getIsm(contract);
+        const matches = await (0, HyperlaneIsmFactory_1.moduleMatchesConfig)(chain, configuredIsm, config, this.multiProvider, ismFactory.getContracts(chain));
+        if (!matches) {
+            await this.runIfOwner(chain, contract, async () => {
+                const targetIsm = await ismFactory.deploy(chain, config);
+                this.logger(`Set ISM on ${chain}`);
+                await this.multiProvider.sendTransaction(chain, setIsm(contract, targetIsm.address));
+                if (targetIsm.address !== (await getIsm(contract))) {
+                    throw new Error(`Set ISM failed on ${chain}`);
                 }
-                if (!(0, utils_1.eqAddress)(currentIsm, configuredIsm)) {
-                    this.logger(`Set interchain security module on ${local} at ${configuredIsm}`);
-                    await this.multiProvider.handleTx(local, client.setInterchainSecurityModule(configuredIsm, txOverrides));
+            });
+        }
+    }
+    async configureHook(chain, contract, targetHook, getHook, setHook) {
+        const configuredHook = await getHook(contract);
+        if (!(0, utils_1.eqAddress)(targetHook, configuredHook)) {
+            await this.runIfOwner(chain, contract, async () => {
+                this.logger(`Set hook on ${chain} to ${targetHook}, currently is ${configuredHook}`);
+                await this.multiProvider.sendTransaction(chain, setHook(contract, targetHook));
+                const actualHook = await getHook(contract);
+                if (!(0, utils_1.eqAddress)(targetHook, actualHook)) {
+                    throw new Error(`Set hook failed on ${chain}, wanted ${targetHook}, got ${actualHook}`);
                 }
-            }
-        });
+            });
+        }
+    }
+    async initMailboxClient(local, client, config) {
+        this.logger(`Initializing mailbox client (if not already) on ${local}...`);
+        if (config.hook) {
+            await this.configureHook(local, client, config.hook, (_client) => _client.hook(), (_client, _hook) => _client.populateTransaction.setHook(_hook));
+        }
+        if (config.interchainSecurityModule) {
+            await this.configureIsm(local, client, config.interchainSecurityModule, (_client) => _client.interchainSecurityModule(), (_client, _module) => _client.populateTransaction.setInterchainSecurityModule(_module));
+        }
         this.logger(`Connection client on ${local} initialized...`);
     }
     async deployContractFromFactory(chain, factory, contractName, constructorArgs, initializeArgs) {
         const cachedContract = this.readCache(chain, factory, contractName);
         if (cachedContract) {
+            if (this.recoverVerificationInputs) {
+                const recoveredInputs = await this.recoverVerificationArtifacts(chain, contractName, cachedContract, constructorArgs, initializeArgs);
+                this.addVerificationArtifacts(chain, recoveredInputs);
+            }
             return cachedContract;
         }
-        const signer = this.multiProvider.getSigner(chain);
-        const overrides = this.multiProvider.getTransactionOverrides(chain);
         this.logger(`Deploy ${contractName} on ${chain}`);
-        const contract = await factory
-            .connect(signer)
-            .deploy(...constructorArgs, overrides);
-        await this.multiProvider.handleTx(chain, contract.deployTransaction);
+        const contract = await this.multiProvider.handleDeploy(chain, factory, constructorArgs);
         if (initializeArgs) {
             this.logger(`Initialize ${contractName} on ${chain}`);
+            const overrides = this.multiProvider.getTransactionOverrides(chain);
             const initTx = await contract.initialize(...initializeArgs, overrides);
             await this.multiProvider.handleTx(chain, initTx);
         }
         const verificationInput = (0, utils_2.getContractVerificationInput)(contractName, contract, factory.bytecode);
-        this.addVerificationArtifact(chain, verificationInput);
+        this.addVerificationArtifacts(chain, [verificationInput]);
         return contract;
     }
-    addVerificationArtifact(chain, artifact) {
-        this.verificationInputs[chain] = this.verificationInputs[chain] || [];
-        this.verificationInputs[chain].push(artifact);
-    }
     async deployContract(chain, contractName, constructorArgs, initializeArgs) {
-        const contract = (await this.deployContractFromFactory(chain, this.factories[contractName], contractName.toString(), constructorArgs, initializeArgs));
+        const contract = await this.deployContractFromFactory(chain, this.factories[contractName], contractName.toString(), constructorArgs, initializeArgs);
         this.writeCache(chain, contractName, contract.address);
         return contract;
     }
@@ -173,15 +180,12 @@ class HyperlaneDeployer {
         await this.runIfAdmin(chain, proxy, () => this.multiProvider.handleTx(chain, proxy.upgradeToAndCall(implementation.address, initData, overrides)), (proxyAdmin) => this.multiProvider.handleTx(chain, proxyAdmin.upgradeAndCall(proxy.address, implementation.address, initData, overrides)));
     }
     async deployProxy(chain, implementation, proxyAdmin, initializeArgs) {
-        const initData = initializeArgs
-            ? implementation.interface.encodeFunctionData('initialize', initializeArgs)
-            : '0x';
-        this.logger(`Deploying transparent upgradable proxy`);
-        const constructorArgs = [
-            implementation.address,
-            proxyAdmin,
-            initData,
-        ];
+        const isProxied = await (0, proxy_1.isProxy)(this.multiProvider.getProvider(chain), implementation.address);
+        if (isProxied) {
+            // if the implementation is already a proxy, do not deploy a new proxy
+            return implementation;
+        }
+        const constructorArgs = (0, proxy_1.proxyConstructorArgs)(implementation, proxyAdmin, initializeArgs);
         const proxy = await this.deployContractFromFactory(chain, new core_1.TransparentUpgradeableProxy__factory(), 'TransparentUpgradeableProxy', constructorArgs);
         return implementation.attach(proxy.address);
     }
@@ -214,15 +218,30 @@ class HyperlaneDeployer {
         }
         return undefined;
     }
+    async recoverVerificationArtifacts(chain, contractName, cachedContract, constructorArgs, initializeArgs) {
+        const provider = this.multiProvider.getProvider(chain);
+        const isProxied = await (0, proxy_1.isProxy)(provider, cachedContract.address);
+        let implementation;
+        if (isProxied) {
+            implementation = await (0, proxy_1.proxyImplementation)(provider, cachedContract.address);
+        }
+        else {
+            implementation = cachedContract.address;
+        }
+        const implementationInput = (0, utils_2.buildVerificationInput)(contractName, implementation, cachedContract.interface.encodeDeploy(constructorArgs));
+        if (!isProxied) {
+            return [implementationInput];
+        }
+        const admin = await (0, proxy_1.proxyAdmin)(provider, cachedContract.address);
+        const proxyArgs = (0, proxy_1.proxyConstructorArgs)(cachedContract.attach(implementation), admin, initializeArgs);
+        const proxyInput = (0, utils_2.buildVerificationInput)('TransparentUpgradeableProxy', cachedContract.address, core_1.TransparentUpgradeableProxy__factory.createInterface().encodeDeploy(proxyArgs));
+        return [implementationInput, proxyInput];
+    }
     /**
      * Deploys the Implementation and Proxy for a given contract
      *
      */
     async deployProxiedContract(chain, contractName, proxyAdmin, constructorArgs, initializeArgs) {
-        const cachedContract = this.readCache(chain, this.factories[contractName], contractName.toString());
-        if (cachedContract) {
-            return cachedContract;
-        }
         // Try to initialize the implementation even though it may not be necessary
         const implementation = await this.deployContract(chain, contractName, constructorArgs, initializeArgs);
         // Initialize the proxy the same way