@hyperlane-xyz/sdk 1.1.4 → 1.2.1

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/deploy/core/types.ts"],"names":[],"mappings":";;;AAiBA,IAAY,iBAKX;AALD,WAAY,iBAAiB;IAC3B,gDAA2B,CAAA;IAC3B,wCAAmB,CAAA;IACnB,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;AACzC,CAAC,EALW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAK5B;AAED,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,qEAAyC,CAAA;IACzC,mDAAuB,CAAA;AACzB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC;AAED,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;AAC3B,CAAC,EAFW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAE/B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/deploy/core/types.ts"],"names":[],"mappings":";;;AAUA,IAAY,qBAEX;AAFD,WAAY,qBAAqB;IAC/B,8DAAqC,CAAA;AACvC,CAAC,EAFW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAEhC;AAmBD,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,gDAA2B,CAAA;IAC3B,wCAAmB,CAAA;IACnB,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;IACvC,sEAAiD,CAAA;AACnD,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B;AAED,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,qEAAyC,CAAA;IACzC,mDAAuB,CAAA;AACzB,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC;AAED,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;AAC3B,CAAC,EAFW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAE/B;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+CAA2B,CAAA;IAC3B,6CAAyB,CAAA;AAC3B,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B"}

package/dist/deploy/middleware/LiquidityLayerApp.d.ts

@@ -3,32 +3,32 @@ import { LiquidityLayerContracts } from '../../middleware';
 import { MultiProvider } from '../../providers/MultiProvider';
 import { ChainMap, ChainName } from '../../types';
 import { BridgeAdapterConfig } from './LiquidityLayerRouterDeployer';
-interface CircleBridgeMessage<Chain> {
-    chain: Chain;
-    remoteChain: Chain;
+interface CircleBridgeMessage {
+    chain: ChainName;
+    remoteChain: ChainName;
     txHash: string;
     message: string;
     nonce: number;
     domain: number;
     nonceHash: string;
 }
-interface PortalBridgeMessage<Chain> {
-    origin: Chain;
+interface PortalBridgeMessage {
+    origin: ChainName;
     nonce: number;
     portalSequence: number;
-    destination: Chain;
+    destination: ChainName;
 }
-export declare class LiquidityLayerApp<Chain extends ChainName = ChainName> extends HyperlaneApp<LiquidityLayerContracts, Chain> {
-    readonly contractsMap: ChainMap<Chain, LiquidityLayerContracts>;
-    readonly multiProvider: MultiProvider<Chain>;
-    readonly config: ChainMap<Chain, BridgeAdapterConfig>;
-    constructor(contractsMap: ChainMap<Chain, LiquidityLayerContracts>, multiProvider: MultiProvider<Chain>, config: ChainMap<Chain, BridgeAdapterConfig>);
-    fetchCircleMessageTransactions(chain: Chain): Promise<string[]>;
-    fetchPortalBridgeTransactions(chain: Chain): Promise<string[]>;
-    parsePortalMessages(chain: Chain, txHash: string): Promise<PortalBridgeMessage<Chain>[]>;
-    parseCircleMessages(chain: Chain, txHash: string): Promise<CircleBridgeMessage<Chain>[]>;
-    attemptPortalTransferCompletion(message: PortalBridgeMessage<Chain>): Promise<void>;
-    attemptCircleAttestationSubmission(message: CircleBridgeMessage<Chain>): Promise<void>;
+export declare class LiquidityLayerApp extends HyperlaneApp<LiquidityLayerContracts> {
+    readonly contractsMap: ChainMap<LiquidityLayerContracts>;
+    readonly multiProvider: MultiProvider;
+    readonly config: ChainMap<BridgeAdapterConfig>;
+    constructor(contractsMap: ChainMap<LiquidityLayerContracts>, multiProvider: MultiProvider, config: ChainMap<BridgeAdapterConfig>);
+    fetchCircleMessageTransactions(chain: ChainName): Promise<string[]>;
+    fetchPortalBridgeTransactions(chain: ChainName): Promise<string[]>;
+    parsePortalMessages(chain: ChainName, txHash: string): Promise<PortalBridgeMessage[]>;
+    parseCircleMessages(chain: ChainName, txHash: string): Promise<CircleBridgeMessage[]>;
+    attemptPortalTransferCompletion(message: PortalBridgeMessage): Promise<void>;
+    attemptCircleAttestationSubmission(message: CircleBridgeMessage): Promise<void>;
 }
 export {};
 //# sourceMappingURL=LiquidityLayerApp.d.ts.map

package/dist/deploy/middleware/LiquidityLayerApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiquidityLayerApp.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/LiquidityLayerApp.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAsBrE,UAAU,mBAAmB,CAAC,KAAK;IACjC,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,KAAK,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,mBAAmB,CAAC,KAAK;IACjC,MAAM,EAAE,KAAK,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,KAAK,CAAC;CACpB;AAED,qBAAa,iBAAiB,CAC5B,KAAK,SAAS,SAAS,GAAG,SAAS,CACnC,SAAQ,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC;aAElC,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;aACtD,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC;aACnC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;gBAF5C,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC,EACtD,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IAKxD,8BAA8B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAc/D,6BAA6B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAc9D,mBAAmB,CACvB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;IAuBlC,mBAAmB,CACvB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;IA2ClC,+BAA+B,CACnC,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC;IAmDV,kCAAkC,CACtC,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC;CAsCjB"}
+{"version":3,"file":"LiquidityLayerApp.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/LiquidityLayerApp.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAsBrE,UAAU,mBAAmB;IAC3B,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,SAAS,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,SAAS,CAAC;CACxB;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,uBAAuB,CAAC;aAExD,YAAY,EAAE,QAAQ,CAAC,uBAAuB,CAAC;aAC/C,aAAa,EAAE,aAAa;aAC5B,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;gBAFrC,YAAY,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAC/C,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;IAKjD,8BAA8B,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAenE,6BAA6B,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAelE,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAsB3B,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA0C3B,+BAA+B,CACnC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAmDV,kCAAkC,CACtC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC;CAyCjB"}

package/dist/deploy/middleware/LiquidityLayerApp.js

@@ -19,7 +19,6 @@ const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const HyperlaneApp_1 = require("../../HyperlaneApp");
 const chains_1 = require("../../consts/chains");
-const domains_1 = require("../../domains");
 const PORTAL_VAA_SERVICE_TESTNET_BASE_URL = 'https://wormhole-v2-testnet-api.certus.one/v1/signed_vaa/';
 const CIRCLE_ATTESTATIONS_BASE_URL = 'https://iris-api-sandbox.circle.com/attestations/';
 const PORTAL_VAA_SERVICE_SUCCESS_CODE = 5;
@@ -37,36 +36,32 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
     }
     fetchCircleMessageTransactions(chain) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cc = this.multiProvider.getChainConnection(chain);
-            const params = new URLSearchParams({
-                module: 'logs',
-                action: 'getLogs',
-                address: this.getContracts(chain).circleBridgeAdapter.address,
-                topic0: BridgedTokenTopic,
-            });
-            const req = yield (0, cross_fetch_1.default)(`${cc.getApiUrl()}?${params}`);
+            const url = new URL(this.multiProvider.getExplorerApiUrl(chain));
+            url.searchParams.set('module', 'logs');
+            url.searchParams.set('action', 'getLogs');
+            url.searchParams.set('address', this.getContracts(chain).circleBridgeAdapter.address);
+            url.searchParams.set('topic0', BridgedTokenTopic);
+            const req = yield (0, cross_fetch_1.default)(url);
             const response = yield req.json();
             return response.result.map((_) => _.transactionHash).flat();
         });
     }
     fetchPortalBridgeTransactions(chain) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cc = this.multiProvider.getChainConnection(chain);
-            const params = new URLSearchParams({
-                module: 'logs',
-                action: 'getLogs',
-                address: this.getContracts(chain).portalAdapter.address,
-                topic0: PortalBridgedTokenTopic,
-            });
-            const req = yield (0, cross_fetch_1.default)(`${cc.getApiUrl()}?${params}`);
+            const url = new URL(this.multiProvider.getExplorerApiUrl(chain));
+            url.searchParams.set('module', 'logs');
+            url.searchParams.set('action', 'getLogs');
+            url.searchParams.set('address', this.getContracts(chain).portalAdapter.address);
+            url.searchParams.set('topic0', PortalBridgedTokenTopic);
+            const req = yield (0, cross_fetch_1.default)(url);
             const response = yield req.json();
             return response.result.map((_) => _.transactionHash).flat();
         });
     }
     parsePortalMessages(chain, txHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const connection = this.multiProvider.getChainConnection(chain);
-            const receipt = yield connection.provider.getTransactionReceipt(txHash);
+            const provider = this.multiProvider.getProvider(chain);
+            const receipt = yield provider.getTransactionReceipt(txHash);
             const matchingLogs = receipt.logs
                 .map((_) => {
                 try {
@@ -82,16 +77,14 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
             const event = matchingLogs.find((_) => _.name === 'BridgedToken');
             const portalSequence = event.args.portalSequence.toNumber();
             const nonce = event.args.nonce.toNumber();
-            const destination = domains_1.DomainIdToChainName[event.args.destination];
-            return [
-                { origin: chain, nonce, portalSequence, destination },
-            ];
+            const destination = this.multiProvider.getChainName(event.args.destination);
+            return [{ origin: chain, nonce, portalSequence, destination }];
         });
     }
     parseCircleMessages(chain, txHash) {
         return __awaiter(this, void 0, void 0, function* () {
-            const connection = this.multiProvider.getChainConnection(chain);
-            const receipt = yield connection.provider.getTransactionReceipt(txHash);
+            const provider = this.multiProvider.getProvider(chain);
+            const receipt = yield provider.getTransactionReceipt(txHash);
             const matchingLogs = receipt.logs
                 .map((_) => {
                 try {
@@ -114,11 +107,10 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
             const nonce = matchingLogs.find((_) => _.name === 'BridgedToken').args
                 .nonce;
             const remoteChain = chain === chains_1.Chains.fuji ? chains_1.Chains.goerli : chains_1.Chains.fuji;
-            const domain = this.config[chain].circle.circleDomainMapping.find((_) => _.hyperlaneDomain === domains_1.ChainNameToDomainId[chain]).circleDomain;
+            const domain = this.config[chain].circle.circleDomainMapping.find((_) => _.hyperlaneDomain === this.multiProvider.getDomainId(chain)).circleDomain;
             return [
                 {
                     chain,
-                    // @ts-ignore
                     remoteChain,
                     txHash,
                     message,
@@ -134,28 +126,27 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
         return __awaiter(this, void 0, void 0, function* () {
             const destinationPortalAdapter = this.getContracts(message.destination)
                 .portalAdapter;
-            const transferId = yield destinationPortalAdapter.transferId(domains_1.ChainNameToDomainId[message.origin], message.nonce);
+            const transferId = yield destinationPortalAdapter.transferId(this.multiProvider.getDomainId(message.origin), message.nonce);
             const transferTokenAddress = yield destinationPortalAdapter.portalTransfersProcessed(transferId);
             if (!utils_1.utils.eqAddress(transferTokenAddress, ethers_1.ethers.constants.AddressZero)) {
                 console.log(`Transfer with nonce ${message.nonce} from ${message.origin} to ${message.destination} already processed`);
                 return;
             }
-            const wormholeOriginDomain = (_a = this.config[message.destination].portal.wormholeDomainMapping.find((_) => _.hyperlaneDomain === domains_1.ChainNameToDomainId[message.origin])) === null || _a === void 0 ? void 0 : _a.wormholeDomain;
+            const wormholeOriginDomain = (_a = this.config[message.destination].portal.wormholeDomainMapping.find((_) => _.hyperlaneDomain === this.multiProvider.getDomainId(message.origin))) === null || _a === void 0 ? void 0 : _a.wormholeDomain;
             const emitter = utils_1.utils.strip0x(utils_1.utils.addressToBytes32(this.config[message.origin].portal.portalBridgeAddress));
             const vaa = yield (0, cross_fetch_1.default)(`${PORTAL_VAA_SERVICE_TESTNET_BASE_URL}${wormholeOriginDomain}/${emitter}/${message.portalSequence}`).then((_) => _.json());
             if (vaa.code && vaa.code === PORTAL_VAA_SERVICE_SUCCESS_CODE) {
                 console.log(`VAA not yet found for nonce ${message.nonce}`);
                 return;
             }
-            const connection = this.multiProvider.getChainConnection(message.destination);
             console.debug(`Complete portal transfer for nonce ${message.nonce} on ${message.destination}`);
-            yield connection.handleTx(destinationPortalAdapter.completeTransfer(utils_1.utils.ensure0x(Buffer.from(vaa.vaaBytes, 'base64').toString('hex'))));
+            yield this.multiProvider.handleTx(message.destination, destinationPortalAdapter.completeTransfer(utils_1.utils.ensure0x(Buffer.from(vaa.vaaBytes, 'base64').toString('hex'))));
         });
     }
     attemptCircleAttestationSubmission(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            const connection = this.multiProvider.getChainConnection(message.remoteChain);
-            const transmitter = core_1.ICircleMessageTransmitter__factory.connect(this.config[message.remoteChain].circle.messageTransmitterAddress, connection.signer);
+            const signer = this.multiProvider.getSigner(message.remoteChain);
+            const transmitter = core_1.ICircleMessageTransmitter__factory.connect(this.config[message.remoteChain].circle.messageTransmitterAddress, signer);
             const alreadyProcessed = yield transmitter.usedNonces(message.nonceHash);
             if (alreadyProcessed) {
                 console.log(`Message sent on ${message.txHash} was already processed`);
@@ -170,8 +161,8 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
             }
             console.log(`Ready to submit attestations for message ${message.nonce}`);
             const tx = yield transmitter.receiveMessage(message.message, attestations.attestation);
-            console.log(`Submitted attestations in ${yield connection.getTxUrl(tx)}`);
-            yield connection.handleTx(tx);
+            console.log(`Submitted attestations in ${this.multiProvider.tryGetExplorerTxUrl(message.remoteChain, tx)}`);
+            yield this.multiProvider.handleTx(message.remoteChain, tx);
         });
     }
 }

package/dist/deploy/middleware/LiquidityLayerApp.js.map

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

package/dist/deploy/middleware/LiquidityLayerRouterDeployer.d.ts

@@ -1,5 +1,4 @@
 import { CircleBridgeAdapter, LiquidityLayerRouter, PortalAdapter } from '@hyperlane-xyz/core';
-import { HyperlaneCore } from '../../core/HyperlaneCore';
 import { LiquidityLayerContracts, LiquidityLayerFactories } from '../../middleware';
 import { MultiProvider } from '../../providers/MultiProvider';
 import { ChainMap, ChainName } from '../../types';
@@ -32,13 +31,11 @@ export declare type BridgeAdapterConfig = {
     portal?: PortalAdapterConfig;
 };
 export declare type LiquidityLayerConfig = RouterConfig & BridgeAdapterConfig;
-export declare class LiquidityLayerDeployer<Chain extends ChainName> extends MiddlewareRouterDeployer<Chain, LiquidityLayerConfig, LiquidityLayerContracts, LiquidityLayerFactories> {
-    protected core: HyperlaneCore<Chain>;
-    protected create2salt: string;
-    constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, LiquidityLayerConfig>, core: HyperlaneCore<Chain>, create2salt?: string);
-    enrollRemoteRouters(contractsMap: ChainMap<Chain, LiquidityLayerContracts>): Promise<void>;
-    deployContracts(chain: Chain, config: LiquidityLayerConfig): Promise<LiquidityLayerContracts>;
-    deployPortalAdapter(chain: Chain, adapterConfig: PortalAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<PortalAdapter>;
-    deployCircleBridgeAdapter(chain: Chain, adapterConfig: CircleBridgeAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<CircleBridgeAdapter>;
+export declare class LiquidityLayerDeployer extends MiddlewareRouterDeployer<LiquidityLayerConfig, LiquidityLayerContracts, LiquidityLayerFactories> {
+    constructor(multiProvider: MultiProvider, configMap: ChainMap<LiquidityLayerConfig>, create2salt?: string);
+    enrollRemoteRouters(contractsMap: ChainMap<LiquidityLayerContracts>): Promise<void>;
+    deployContracts(chain: ChainName, config: LiquidityLayerConfig): Promise<LiquidityLayerContracts>;
+    deployPortalAdapter(chain: ChainName, adapterConfig: PortalAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<PortalAdapter>;
+    deployCircleBridgeAdapter(chain: ChainName, adapterConfig: CircleBridgeAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<CircleBridgeAdapter>;
 }
 //# sourceMappingURL=LiquidityLayerRouterDeployer.d.ts.map

package/dist/deploy/middleware/LiquidityLayerRouterDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiquidityLayerRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EAEnB,oBAAoB,EAEpB,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EAExB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yBAAyB,EAAE,MAAM,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;KACtB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,oBAAY,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,yBAAyB,CAAC;IACnC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,oBAAY,oBAAoB,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAEtE,qBAAa,sBAAsB,CACjC,KAAK,SAAS,SAAS,CACvB,SAAQ,wBAAwB,CAChC,KAAK,EACL,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,CACxB;IAIG,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC;IACpC,SAAS,CAAC,WAAW;gBAHrB,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC,EACtC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,EAC1B,WAAW,SAA+B;IAKhD,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC,GACrD,OAAO,CAAC,IAAI,CAAC;IA2BV,eAAe,CACnB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,uBAAuB,CAAC;IAmC7B,mBAAmB,CACvB,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,mBAAmB,EAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,aAAa,CAAC;IAyDnB,yBAAyB,CAC7B,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,yBAAyB,EACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,mBAAmB,CAAC;CAqEhC"}
+{"version":3,"file":"LiquidityLayerRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EAEnB,oBAAoB,EACpB,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EAExB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yBAAyB,EAAE,MAAM,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;KACtB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,oBAAY,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,yBAAyB,CAAC;IACnC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,oBAAY,oBAAoB,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,wBAAwB,CAClE,oBAAoB,EACpB,uBAAuB,EACvB,uBAAuB,CACxB;gBAEG,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EACzC,WAAW,SAA+B;IAKtC,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,uBAAuB,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC;IA2BV,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,uBAAuB,CAAC;IA4B7B,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,mBAAmB,EAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,aAAa,CAAC;IAyDnB,yBAAyB,CAC7B,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,yBAAyB,EACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,mBAAmB,CAAC;CAuEhC"}

package/dist/deploy/middleware/LiquidityLayerRouterDeployer.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiquidityLayerDeployer = exports.BridgeAdapterType = void 0;
 const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
-const domains_1 = require("../../domains");
 const middleware_1 = require("../../middleware");
 const objects_1 = require("../../utils/objects");
 const deploy_1 = require("./deploy");
@@ -22,10 +21,8 @@ var BridgeAdapterType;
     BridgeAdapterType["Portal"] = "Portal";
 })(BridgeAdapterType = exports.BridgeAdapterType || (exports.BridgeAdapterType = {}));
 class LiquidityLayerDeployer extends deploy_1.MiddlewareRouterDeployer {
-    constructor(multiProvider, configMap, core, create2salt = 'LiquidityLayerDeployerSalt') {
-        super(multiProvider, configMap, middleware_1.liquidityLayerFactories, {});
-        this.core = core;
-        this.create2salt = create2salt;
+    constructor(multiProvider, configMap, create2salt = 'LiquidityLayerDeployerSalt') {
+        super(multiProvider, configMap, middleware_1.liquidityLayerFactories, create2salt);
     }
     enrollRemoteRouters(contractsMap) {
         const _super = Object.create(null, {
@@ -47,27 +44,25 @@ class LiquidityLayerDeployer extends deploy_1.MiddlewareRouterDeployer {
     // Custom contract deployment logic can go here
     // If no custom logic is needed, call deployContract for the router
     deployContracts(chain, config) {
+        const _super = Object.create(null, {
+            deployContracts: { get: () => super.deployContracts }
+        });
         return __awaiter(this, void 0, void 0, function* () {
-            const initCalldata = this.getInitArgs(config, core_1.LiquidityLayerRouter__factory.createInterface());
-            const router = yield this.deployContract(chain, 'router', [], {
-                create2Salt: this.create2salt,
-                initCalldata,
-            });
+            const routerContracts = yield _super.deployContracts.call(this, chain, config);
             const bridgeAdapters = {};
             if (config.circle) {
-                bridgeAdapters.circleBridgeAdapter = yield this.deployCircleBridgeAdapter(chain, config.circle, config.owner, router);
+                bridgeAdapters.circleBridgeAdapter = yield this.deployCircleBridgeAdapter(chain, config.circle, config.owner, routerContracts.router);
             }
             if (config.portal) {
-                bridgeAdapters.portalAdapter = yield this.deployPortalAdapter(chain, config.portal, config.owner, router);
+                bridgeAdapters.portalAdapter = yield this.deployPortalAdapter(chain, config.portal, config.owner, routerContracts.router);
             }
-            return Object.assign(Object.assign({}, bridgeAdapters), { router });
+            return Object.assign(Object.assign({}, routerContracts), bridgeAdapters);
         });
     }
     deployPortalAdapter(chain, adapterConfig, owner, router) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cc = this.multiProvider.getChainConnection(chain);
             const initCalldata = core_1.PortalAdapter__factory.createInterface().encodeFunctionData('initialize', [
-                domains_1.ChainNameToDomainId[chain],
+                this.multiProvider.getDomainId(chain),
                 owner,
                 adapterConfig.portalBridgeAddress,
                 router.address,
@@ -81,18 +76,17 @@ class LiquidityLayerDeployer extends deploy_1.MiddlewareRouterDeployer {
                 if (expectedCircleDomain === wormholeDomain)
                     continue;
                 this.logger(`Set wormhole domain ${wormholeDomain} for hyperlane domain ${hyperlaneDomain}`);
-                yield cc.handleTx(portalAdapter.addDomain(hyperlaneDomain, wormholeDomain));
+                yield this.multiProvider.handleTx(chain, portalAdapter.addDomain(hyperlaneDomain, wormholeDomain));
             }
             if (!utils_1.utils.eqAddress(yield router.liquidityLayerAdapters('Portal'), portalAdapter.address)) {
                 this.logger('Set Portal as LiquidityLayerAdapter on Router');
-                yield cc.handleTx(router.setLiquidityLayerAdapter(adapterConfig.type, portalAdapter.address));
+                yield this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, portalAdapter.address));
             }
             return portalAdapter;
         });
     }
     deployCircleBridgeAdapter(chain, adapterConfig, owner, router) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cc = this.multiProvider.getChainConnection(chain);
             const initCalldata = core_1.CircleBridgeAdapter__factory.createInterface().encodeFunctionData('initialize', [
                 owner,
                 adapterConfig.tokenMessengerAddress,
@@ -105,7 +99,7 @@ class LiquidityLayerDeployer extends deploy_1.MiddlewareRouterDeployer {
             });
             if (!utils_1.utils.eqAddress(yield circleBridgeAdapter.tokenSymbolToAddress('USDC'), adapterConfig.usdcAddress)) {
                 this.logger(`Set USDC token contract`);
-                yield cc.handleTx(circleBridgeAdapter.addToken(adapterConfig.usdcAddress, 'USDC'));
+                yield this.multiProvider.handleTx(chain, circleBridgeAdapter.addToken(adapterConfig.usdcAddress, 'USDC'));
             }
             // Set domain mappings
             for (const { circleDomain, hyperlaneDomain, } of adapterConfig.circleDomainMapping) {
@@ -113,11 +107,11 @@ class LiquidityLayerDeployer extends deploy_1.MiddlewareRouterDeployer {
                 if (expectedCircleDomain === circleDomain)
                     continue;
                 this.logger(`Set circle domain ${circleDomain} for hyperlane domain ${hyperlaneDomain}`);
-                yield cc.handleTx(circleBridgeAdapter.addDomain(hyperlaneDomain, circleDomain));
+                yield this.multiProvider.handleTx(chain, circleBridgeAdapter.addDomain(hyperlaneDomain, circleDomain));
             }
             if (!utils_1.utils.eqAddress(yield router.liquidityLayerAdapters('Circle'), circleBridgeAdapter.address)) {
                 this.logger('Set Circle as LiquidityLayerAdapter on Router');
-                yield cc.handleTx(router.setLiquidityLayerAdapter(adapterConfig.type, circleBridgeAdapter.address));
+                yield this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, circleBridgeAdapter.address));
             }
             return circleBridgeAdapter;
         });

package/dist/deploy/middleware/LiquidityLayerRouterDeployer.js.map

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

package/dist/deploy/middleware/deploy.d.ts

@@ -1,26 +1,23 @@
-import { ethers } from 'ethers';
-import { HyperlaneCore } from '../../core/HyperlaneCore';
 import { InterchainAccountContracts, InterchainAccountFactories, InterchainQueryContracts, InterchainQueryFactories } from '../../middleware';
 import { MultiProvider } from '../../providers/MultiProvider';
-import { RouterContracts, RouterFactories } from '../../router';
+import { ProxiedRouterContracts, RouterFactories } from '../../router';
 import { ChainMap, ChainName } from '../../types';
 import { HyperlaneRouterDeployer } from '../router/HyperlaneRouterDeployer';
 import { RouterConfig } from '../router/types';
-export declare type InterchainAccountConfig = RouterConfig;
-export declare abstract class MiddlewareRouterDeployer<Chain extends ChainName, MiddlewareRouterConfig extends RouterConfig, MiddlewareRouterContracts extends RouterContracts, MiddlewareFactories extends RouterFactories> extends HyperlaneRouterDeployer<Chain, MiddlewareRouterConfig, MiddlewareRouterContracts, MiddlewareFactories> {
-    getInitArgs(config: MiddlewareRouterConfig, routerInterface: ethers.utils.Interface): string;
-}
-export declare class InterchainAccountDeployer<Chain extends ChainName> extends MiddlewareRouterDeployer<Chain, InterchainAccountConfig, InterchainAccountContracts, InterchainAccountFactories> {
-    protected core: HyperlaneCore<Chain>;
+export declare abstract class MiddlewareRouterDeployer<MiddlewareRouterConfig extends RouterConfig, MiddlewareRouterContracts extends ProxiedRouterContracts, MiddlewareFactories extends RouterFactories> extends HyperlaneRouterDeployer<MiddlewareRouterConfig, MiddlewareRouterContracts, MiddlewareFactories> {
     protected create2salt: string;
-    constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, InterchainAccountConfig>, core: HyperlaneCore<Chain>, create2salt?: string);
-    deployContracts(chain: Chain, config: InterchainAccountConfig): Promise<InterchainAccountContracts>;
+    constructor(multiProvider: MultiProvider, configMap: ChainMap<MiddlewareRouterConfig>, factories: MiddlewareFactories, create2salt?: string);
+    constructorArgs(_: MiddlewareRouterConfig): Parameters<MiddlewareFactories['router']['deploy']>;
+    initializeArgs(config: MiddlewareRouterConfig): any;
+    deployContracts(chain: ChainName, config: MiddlewareRouterConfig): Promise<MiddlewareRouterContracts>;
 }
-export declare type InterchainQueryConfig = RouterConfig;
-export declare class InterchainQueryDeployer<Chain extends ChainName> extends MiddlewareRouterDeployer<Chain, InterchainQueryConfig, InterchainQueryContracts, InterchainQueryFactories> {
-    protected core: HyperlaneCore<Chain>;
-    protected create2salt: string;
-    constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, InterchainQueryConfig>, core: HyperlaneCore<Chain>, create2salt?: string);
-    deployContracts(chain: Chain, config: InterchainQueryConfig): Promise<InterchainQueryContracts>;
+declare type InterchainAccountConfig = RouterConfig;
+export declare class InterchainAccountDeployer extends MiddlewareRouterDeployer<InterchainAccountConfig, InterchainAccountContracts, InterchainAccountFactories> {
+    constructor(multiProvider: MultiProvider, configMap: ChainMap<InterchainAccountConfig>, create2salt?: string);
+}
+declare type InterchainQueryConfig = RouterConfig;
+export declare class InterchainQueryDeployer extends MiddlewareRouterDeployer<InterchainQueryConfig, InterchainQueryContracts, InterchainQueryFactories> {
+    constructor(multiProvider: MultiProvider, configMap: ChainMap<InterchainQueryConfig>, create2salt?: string);
 }
+export {};
 //# sourceMappingURL=deploy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAOhC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EAGzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,oBAAY,uBAAuB,GAAG,YAAY,CAAC;AAEnD,8BAAsB,wBAAwB,CAC5C,KAAK,SAAS,SAAS,EACvB,sBAAsB,SAAS,YAAY,EAC3C,yBAAyB,SAAS,eAAe,EACjD,mBAAmB,SAAS,eAAe,CAC3C,SAAQ,uBAAuB,CAC/B,KAAK,EACL,sBAAsB,EACtB,yBAAyB,EACzB,mBAAmB,CACpB;IACC,WAAW,CACT,MAAM,EAAE,sBAAsB,EAC9B,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,GACtC,MAAM;CAQV;AAED,qBAAa,yBAAyB,CACpC,KAAK,SAAS,SAAS,CACvB,SAAQ,wBAAwB,CAChC,KAAK,EACL,uBAAuB,EACvB,0BAA0B,EAC1B,0BAA0B,CAC3B;IAIG,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC;IACpC,SAAS,CAAC,WAAW;gBAHrB,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC,EACzC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,EAC1B,WAAW,SAAa;IAO9B,eAAe,CACnB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,0BAA0B,CAAC;CAavC;AAED,oBAAY,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAuB,CAClC,KAAK,SAAS,SAAS,CACvB,SAAQ,wBAAwB,CAChC,KAAK,EACL,qBAAqB,EACrB,wBAAwB,EACxB,wBAAwB,CACzB;IAIG,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC;IAEpC,SAAS,CAAC,WAAW;gBAJrB,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,EACvC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,EAE1B,WAAW,SAAa;IAO9B,eAAe,CACnB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,wBAAwB,CAAC;CAarC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,wBAAwB,EACxB,wBAAwB,EAGzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,8BAAsB,wBAAwB,CAC5C,sBAAsB,SAAS,YAAY,EAC3C,yBAAyB,SAAS,sBAAsB,EACxD,mBAAmB,SAAS,eAAe,CAC3C,SAAQ,uBAAuB,CAC/B,sBAAsB,EACtB,yBAAyB,EACzB,mBAAmB,CACpB;IAKG,SAAS,CAAC,WAAW;gBAHrB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAC3C,SAAS,EAAE,mBAAmB,EACpB,WAAW,SAAqB;IAK5C,eAAe,CACb,CAAC,EAAE,sBAAsB,GACxB,UAAU,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;IAItD,cAAc,CAAC,MAAM,EAAE,sBAAsB,GAAG,GAAG;IAS7C,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,yBAAyB,CAAC;CA4BtC;AAED,aAAK,uBAAuB,GAAG,YAAY,CAAC;AAE5C,qBAAa,yBAA0B,SAAQ,wBAAwB,CACrE,uBAAuB,EACvB,0BAA0B,EAC1B,0BAA0B,CAC3B;gBAEG,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,uBAAuB,CAAC,EAC5C,WAAW,SAAmB;CAIjC;AAED,aAAK,qBAAqB,GAAG,YAAY,CAAC;AAE1C,qBAAa,uBAAwB,SAAQ,wBAAwB,CACnE,qBAAqB,EACrB,wBAAwB,EACxB,wBAAwB,CACzB;gBAEG,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EAC1C,WAAW,SAAgB;CAI9B"}

package/dist/deploy/middleware/deploy.js

@@ -15,60 +15,47 @@ const core_1 = require("@hyperlane-xyz/core");
 const middleware_1 = require("../../middleware");
 const HyperlaneRouterDeployer_1 = require("../router/HyperlaneRouterDeployer");
 class MiddlewareRouterDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeployer {
-    getInitArgs(config, routerInterface) {
+    constructor(multiProvider, configMap, factories, create2salt = 'middlewarerouter') {
+        super(multiProvider, configMap, factories);
+        this.create2salt = create2salt;
+    }
+    constructorArgs(_) {
+        return [];
+    }
+    initializeArgs(config) {
         var _a;
-        return routerInterface.encodeFunctionData('initialize', [
+        return [
             config.mailbox,
             config.interchainGasPaymaster,
             (_a = config.interchainSecurityModule) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.AddressZero,
             config.owner,
-        ]);
-    }
-}
-exports.MiddlewareRouterDeployer = MiddlewareRouterDeployer;
-class InterchainAccountDeployer extends MiddlewareRouterDeployer {
-    constructor(multiProvider, configMap, core, create2salt = 'asdasdsd') {
-        super(multiProvider, configMap, middleware_1.interchainAccountFactories, {});
-        this.core = core;
-        this.create2salt = create2salt;
+        ];
     }
-    // Custom contract deployment logic can go here
-    // If no custom logic is needed, call deployContract for the router
     deployContracts(chain, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const initCalldata = this.getInitArgs(config, core_1.InterchainAccountRouter__factory.createInterface());
-            const router = yield this.deployContract(chain, 'router', [], {
-                create2Salt: this.create2salt + 'router',
-                initCalldata,
+            const proxyAdmin = yield this.deployContractFromFactory(chain, new core_1.ProxyAdmin__factory(), 'proxyAdmin', [], { create2Salt: this.create2salt });
+            const proxiedRouter = yield this.deployProxiedContract(chain, 'router', this.constructorArgs(config), proxyAdmin, this.initializeArgs(config), {
+                create2Salt: this.create2salt,
             });
+            yield this.multiProvider.handleTx(chain, proxyAdmin.transferOwnership(config.owner));
             return {
-                router,
+                proxyAdmin,
+                proxiedRouter,
+                router: proxiedRouter.contract, // for backwards compatibility
             };
         });
     }
 }
+exports.MiddlewareRouterDeployer = MiddlewareRouterDeployer;
+class InterchainAccountDeployer extends MiddlewareRouterDeployer {
+    constructor(multiProvider, configMap, create2salt = 'accountsrouter') {
+        super(multiProvider, configMap, middleware_1.interchainAccountFactories, create2salt);
+    }
+}
 exports.InterchainAccountDeployer = InterchainAccountDeployer;
 class InterchainQueryDeployer extends MiddlewareRouterDeployer {
-    constructor(multiProvider, configMap, core, 
-    // TODO replace salt with 'hyperlane' before next redeploy
-    create2salt = 'asdasdsd') {
-        super(multiProvider, configMap, middleware_1.interchainQueryFactories, {});
-        this.core = core;
-        this.create2salt = create2salt;
-    }
-    // Custom contract deployment logic can go here
-    // If no custom logic is needed, call deployContract for the router
-    deployContracts(chain, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const initCalldata = this.getInitArgs(config, core_1.InterchainQueryRouter__factory.createInterface());
-            const router = yield this.deployContract(chain, 'router', [], {
-                create2Salt: this.create2salt + 'router',
-                initCalldata,
-            });
-            return {
-                router,
-            };
-        });
+    constructor(multiProvider, configMap, create2salt = 'queryrouter') {
+        super(multiProvider, configMap, middleware_1.interchainQueryFactories, create2salt);
     }
 }
 exports.InterchainQueryDeployer = InterchainQueryDeployer;

package/dist/deploy/middleware/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,8CAG6B;AAG7B,iDAO0B;AAI1B,+EAA4E;AAK5E,MAAsB,wBAKpB,SAAQ,iDAKT;IACC,WAAW,CACT,MAA8B,EAC9B,eAAuC;;QAEvC,OAAO,eAAe,CAAC,kBAAkB,CAAC,YAAY,EAAE;YACtD,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,sBAAsB;YAC7B,MAAA,MAAM,CAAC,wBAAwB,mCAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC/D,MAAM,CAAC,KAAK;SACb,CAAC,CAAC;IACL,CAAC;CACF;AAtBD,4DAsBC;AAED,MAAa,yBAEX,SAAQ,wBAKT;IACC,YACE,aAAmC,EACnC,SAAmD,EACzC,IAA0B,EAC1B,cAAc,UAAU;QAElC,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,uCAA0B,EAAE,EAAE,CAAC,CAAC;QAHtD,SAAI,GAAJ,IAAI,CAAsB;QAC1B,gBAAW,GAAX,WAAW,CAAa;IAGpC,CAAC;IAED,+CAA+C;IAC/C,mEAAmE;IAC7D,eAAe,CACnB,KAAY,EACZ,MAA+B;;YAE/B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CACnC,MAAM,EACN,uCAAgC,CAAC,eAAe,EAAE,CACnD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC5D,WAAW,EAAE,IAAI,CAAC,WAAW,GAAG,QAAQ;gBACxC,YAAY;aACb,CAAC,CAAC;YACH,OAAO;gBACL,MAAM;aACP,CAAC;QACJ,CAAC;KAAA;CACF;AAnCD,8DAmCC;AAID,MAAa,uBAEX,SAAQ,wBAKT;IACC,YACE,aAAmC,EACnC,SAAiD,EACvC,IAA0B;IACpC,0DAA0D;IAChD,cAAc,UAAU;QAElC,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,qCAAwB,EAAE,EAAE,CAAC,CAAC;QAJpD,SAAI,GAAJ,IAAI,CAAsB;QAE1B,gBAAW,GAAX,WAAW,CAAa;IAGpC,CAAC;IAED,+CAA+C;IAC/C,mEAAmE;IAC7D,eAAe,CACnB,KAAY,EACZ,MAA6B;;YAE7B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CACnC,MAAM,EACN,qCAA8B,CAAC,eAAe,EAAE,CACjD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC5D,WAAW,EAAE,IAAI,CAAC,WAAW,GAAG,QAAQ;gBACxC,YAAY;aACb,CAAC,CAAC;YACH,OAAO;gBACL,MAAM;aACP,CAAC;QACJ,CAAC;KAAA;CACF;AApCD,0DAoCC"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,8CAA0D;AAE1D,iDAO0B;AAI1B,+EAA4E;AAG5E,MAAsB,wBAIpB,SAAQ,iDAIT;IACC,YACE,aAA4B,EAC5B,SAA2C,EAC3C,SAA8B,EACpB,cAAc,kBAAkB;QAE1C,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAFjC,gBAAW,GAAX,WAAW,CAAqB;IAG5C,CAAC;IAED,eAAe,CACb,CAAyB;QAEzB,OAAO,EAAS,CAAC;IACnB,CAAC;IAED,cAAc,CAAC,MAA8B;;QAC3C,OAAO;YACL,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,sBAAsB;YAC7B,MAAA,MAAM,CAAC,wBAAwB,mCAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC/D,MAAM,CAAC,KAAK;SACb,CAAC;IACJ,CAAC;IAEK,eAAe,CACnB,KAAgB,EAChB,MAA8B;;YAE9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACrD,KAAK,EACL,IAAI,0BAAmB,EAAE,EACzB,YAAY,EACZ,EAAE,EACF,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAClC,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACpD,KAAK,EACL,QAAQ,EACR,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAC5B,UAAU,EACV,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAC3B;gBACE,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CACF,CAAC;YACF,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK,EACL,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAC3C,CAAC;YACF,OAAO;gBACL,UAAU;gBACV,aAAa;gBACb,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,8BAA8B;aACxD,CAAC;QACX,CAAC;KAAA;CACF;AAhED,4DAgEC;AAID,MAAa,yBAA0B,SAAQ,wBAI9C;IACC,YACE,aAA4B,EAC5B,SAA4C,EAC5C,WAAW,GAAG,gBAAgB;QAE9B,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,uCAA0B,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;CACF;AAZD,8DAYC;AAID,MAAa,uBAAwB,SAAQ,wBAI5C;IACC,YACE,aAA4B,EAC5B,SAA0C,EAC1C,WAAW,GAAG,aAAa;QAE3B,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,qCAAwB,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC;CACF;AAZD,0DAYC"}

package/dist/deploy/router/GasRouterDeployer.d.ts

@@ -1,12 +1,12 @@
 import { GasRouter } from '@hyperlane-xyz/core';
 import { MultiProvider } from '../../providers/MultiProvider';
 import { RouterContracts, RouterFactories } from '../../router';
-import { ChainMap, ChainName } from '../../types';
+import { ChainMap } from '../../types';
 import { DeployerOptions } from '../HyperlaneDeployer';
 import { HyperlaneRouterDeployer } from './HyperlaneRouterDeployer';
 import { GasRouterConfig } from './types';
-export declare abstract class GasRouterDeployer<Chain extends ChainName, Config extends GasRouterConfig, Contracts extends RouterContracts<GasRouter>, Factories extends RouterFactories<GasRouter>> extends HyperlaneRouterDeployer<Chain, Config, Contracts, Factories> {
-    constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, Config>, factories: Factories, options?: DeployerOptions);
-    enrollRemoteRouters(contractsMap: ChainMap<Chain, Contracts>): Promise<void>;
+export declare abstract class GasRouterDeployer<Config extends GasRouterConfig, Contracts extends RouterContracts<GasRouter>, Factories extends RouterFactories<GasRouter>> extends HyperlaneRouterDeployer<Config, Contracts, Factories> {
+    constructor(multiProvider: MultiProvider, configMap: ChainMap<Config>, factories: Factories, options?: DeployerOptions);
+    enrollRemoteRouters(contractsMap: ChainMap<Contracts>): Promise<void>;
 }
 //# sourceMappingURL=GasRouterDeployer.d.ts.map

package/dist/deploy/router/GasRouterDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GasRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/GasRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,8BAAsB,iBAAiB,CACrC,KAAK,SAAS,SAAS,EACvB,MAAM,SAAS,eAAe,EAC9B,SAAS,SAAS,eAAe,CAAC,SAAS,CAAC,EAC5C,SAAS,SAAS,eAAe,CAAC,SAAS,CAAC,CAC5C,SAAQ,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;gBAElE,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,EAClC,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,eAAe;IAQrB,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC;CA+BjB"}
+{"version":3,"file":"GasRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/GasRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,8BAAsB,iBAAiB,CACrC,MAAM,SAAS,eAAe,EAC9B,SAAS,SAAS,eAAe,CAAC,SAAS,CAAC,EAC5C,SAAS,SAAS,eAAe,CAAC,SAAS,CAAC,CAC5C,SAAQ,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;gBAE3D,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,eAAe;IAQrB,mBAAmB,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CA6B5E"}