@hyperlane-xyz/sdk 1.4.1 → 1.4.3-beta0

package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiquidityLayerDeployer = exports.BridgeAdapterType = void 0;
 const ethers_1 = require("ethers");
@@ -19,116 +10,103 @@ var BridgeAdapterType;
 (function (BridgeAdapterType) {
     BridgeAdapterType["Circle"] = "Circle";
     BridgeAdapterType["Portal"] = "Portal";
-})(BridgeAdapterType = exports.BridgeAdapterType || (exports.BridgeAdapterType = {}));
+})(BridgeAdapterType || (exports.BridgeAdapterType = BridgeAdapterType = {}));
 class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeployer {
     constructor(multiProvider) {
         super(multiProvider, contracts_1.liquidityLayerFactories);
         this.routerContractName = 'liquidityLayerRouter';
     }
-    constructorArgs(_, __) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [];
-        });
+    async constructorArgs(_, __) {
+        return [];
     }
-    initializeArgs(chain, config) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const owner = yield this.multiProvider.getSignerAddress(chain);
-            return [
-                config.mailbox,
-                config.interchainGasPaymaster,
-                (_a = config.interchainSecurityModule) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.AddressZero,
-                owner,
-            ];
-        });
+    async initializeArgs(chain, config) {
+        const owner = await this.multiProvider.getSignerAddress(chain);
+        if (typeof config.interchainSecurityModule === 'object') {
+            throw new Error('ISM as object unimplemented');
+        }
+        return [
+            config.mailbox,
+            config.interchainGasPaymaster,
+            config.interchainSecurityModule ?? ethers_1.ethers.constants.AddressZero,
+            owner,
+        ];
     }
-    enrollRemoteRouters(contractsMap, configMap, foreignRouters) {
-        const _super = Object.create(null, {
-            enrollRemoteRouters: { get: () => super.enrollRemoteRouters }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger(`Enroll LiquidityLayerRouters with each other`);
-            yield _super.enrollRemoteRouters.call(this, contractsMap, configMap, foreignRouters);
-            this.logger(`Enroll CircleBridgeAdapters with each other`);
-            // Hack to allow use of super.enrollRemoteRouters
-            yield _super.enrollRemoteRouters.call(this, (0, objects_1.objMap)((0, objects_1.objFilter)(contractsMap, (_, c) => !!c.circleBridgeAdapter), (_, contracts) => ({
-                liquidityLayerRouter: contracts.circleBridgeAdapter,
-            })), configMap, foreignRouters);
-            this.logger(`Enroll PortalAdapters with each other`);
-            // Hack to allow use of super.enrollRemoteRouters
-            yield _super.enrollRemoteRouters.call(this, (0, objects_1.objMap)((0, objects_1.objFilter)(contractsMap, (_, c) => !!c.portalAdapter), (_, contracts) => ({
-                liquidityLayerRouter: contracts.portalAdapter,
-            })), configMap, foreignRouters);
-        });
+    async enrollRemoteRouters(contractsMap, configMap, foreignRouters) {
+        this.logger(`Enroll LiquidityLayerRouters with each other`);
+        await super.enrollRemoteRouters(contractsMap, configMap, foreignRouters);
+        this.logger(`Enroll CircleBridgeAdapters with each other`);
+        // Hack to allow use of super.enrollRemoteRouters
+        await super.enrollRemoteRouters((0, objects_1.objMap)((0, objects_1.objFilter)(contractsMap, (_, c) => !!c.circleBridgeAdapter), (_, contracts) => ({
+            liquidityLayerRouter: contracts.circleBridgeAdapter,
+        })), configMap, foreignRouters);
+        this.logger(`Enroll PortalAdapters with each other`);
+        // Hack to allow use of super.enrollRemoteRouters
+        await super.enrollRemoteRouters((0, objects_1.objMap)((0, objects_1.objFilter)(contractsMap, (_, c) => !!c.portalAdapter), (_, contracts) => ({
+            liquidityLayerRouter: contracts.portalAdapter,
+        })), configMap, foreignRouters);
     }
     // 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* () {
-            // This is just the temp owner for contracts, and HyperlaneRouterDeployer#transferOwnership actually sets the configured owner
-            const deployer = yield this.multiProvider.getSignerAddress(chain);
-            const routerContracts = yield _super.deployContracts.call(this, chain, config);
-            const bridgeAdapters = {};
-            if (config.circle) {
-                bridgeAdapters.circleBridgeAdapter = yield this.deployCircleBridgeAdapter(chain, config.circle, deployer, routerContracts.liquidityLayerRouter);
-            }
-            if (config.portal) {
-                bridgeAdapters.portalAdapter = yield this.deployPortalAdapter(chain, config.portal, deployer, routerContracts.liquidityLayerRouter);
-            }
-            return Object.assign(Object.assign({}, routerContracts), bridgeAdapters);
-        });
+    async deployContracts(chain, config) {
+        // This is just the temp owner for contracts, and HyperlaneRouterDeployer#transferOwnership actually sets the configured owner
+        const deployer = await this.multiProvider.getSignerAddress(chain);
+        const routerContracts = await super.deployContracts(chain, config);
+        const bridgeAdapters = {};
+        if (config.circle) {
+            bridgeAdapters.circleBridgeAdapter = await this.deployCircleBridgeAdapter(chain, config.circle, deployer, routerContracts.liquidityLayerRouter);
+        }
+        if (config.portal) {
+            bridgeAdapters.portalAdapter = await this.deployPortalAdapter(chain, config.portal, deployer, routerContracts.liquidityLayerRouter);
+        }
+        return {
+            ...routerContracts,
+            ...bridgeAdapters,
+        };
     }
-    deployPortalAdapter(chain, adapterConfig, owner, router) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const portalAdapter = yield this.deployContract(chain, 'portalAdapter', [], [
-                this.multiProvider.getDomainId(chain),
-                owner,
-                adapterConfig.portalBridgeAddress,
-                router.address,
-            ]);
-            for (const { wormholeDomain, hyperlaneDomain, } of adapterConfig.wormholeDomainMapping) {
-                const expectedCircleDomain = yield portalAdapter.hyperlaneDomainToWormholeDomain(hyperlaneDomain);
-                if (expectedCircleDomain === wormholeDomain)
-                    continue;
-                this.logger(`Set wormhole domain ${wormholeDomain} for hyperlane domain ${hyperlaneDomain}`);
-                yield this.runIfOwner(chain, portalAdapter, () => 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 this.runIfOwner(chain, portalAdapter, () => this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, portalAdapter.address)));
-            }
-            return portalAdapter;
-        });
+    async deployPortalAdapter(chain, adapterConfig, owner, router) {
+        const portalAdapter = await this.deployContract(chain, 'portalAdapter', [], [
+            this.multiProvider.getDomainId(chain),
+            owner,
+            adapterConfig.portalBridgeAddress,
+            router.address,
+        ]);
+        for (const { wormholeDomain, hyperlaneDomain, } of adapterConfig.wormholeDomainMapping) {
+            const expectedCircleDomain = await portalAdapter.hyperlaneDomainToWormholeDomain(hyperlaneDomain);
+            if (expectedCircleDomain === wormholeDomain)
+                continue;
+            this.logger(`Set wormhole domain ${wormholeDomain} for hyperlane domain ${hyperlaneDomain}`);
+            await this.runIfOwner(chain, portalAdapter, () => this.multiProvider.handleTx(chain, portalAdapter.addDomain(hyperlaneDomain, wormholeDomain)));
+        }
+        if (!utils_1.utils.eqAddress(await router.liquidityLayerAdapters('Portal'), portalAdapter.address)) {
+            this.logger('Set Portal as LiquidityLayerAdapter on Router');
+            await this.runIfOwner(chain, portalAdapter, () => 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 circleBridgeAdapter = yield this.deployContract(chain, 'circleBridgeAdapter', [], [
-                owner,
-                adapterConfig.tokenMessengerAddress,
-                adapterConfig.messageTransmitterAddress,
-                router.address,
-            ]);
-            if (!utils_1.utils.eqAddress(yield circleBridgeAdapter.tokenSymbolToAddress('USDC'), adapterConfig.usdcAddress)) {
-                this.logger(`Set USDC token contract`);
-                yield this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, circleBridgeAdapter.addToken(adapterConfig.usdcAddress, 'USDC')));
-            }
-            // Set domain mappings
-            for (const { circleDomain, hyperlaneDomain, } of adapterConfig.circleDomainMapping) {
-                const expectedCircleDomain = yield circleBridgeAdapter.hyperlaneDomainToCircleDomain(hyperlaneDomain);
-                if (expectedCircleDomain === circleDomain)
-                    continue;
-                this.logger(`Set circle domain ${circleDomain} for hyperlane domain ${hyperlaneDomain}`);
-                yield this.runIfOwner(chain, circleBridgeAdapter, () => 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 this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, circleBridgeAdapter.address)));
-            }
-            return circleBridgeAdapter;
-        });
+    async deployCircleBridgeAdapter(chain, adapterConfig, owner, router) {
+        const circleBridgeAdapter = await this.deployContract(chain, 'circleBridgeAdapter', [], [
+            owner,
+            adapterConfig.tokenMessengerAddress,
+            adapterConfig.messageTransmitterAddress,
+            router.address,
+        ]);
+        if (!utils_1.utils.eqAddress(await circleBridgeAdapter.tokenSymbolToAddress('USDC'), adapterConfig.usdcAddress)) {
+            this.logger(`Set USDC token contract`);
+            await this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, circleBridgeAdapter.addToken(adapterConfig.usdcAddress, 'USDC')));
+        }
+        // Set domain mappings
+        for (const { circleDomain, hyperlaneDomain, } of adapterConfig.circleDomainMapping) {
+            const expectedCircleDomain = await circleBridgeAdapter.hyperlaneDomainToCircleDomain(hyperlaneDomain);
+            if (expectedCircleDomain === circleDomain)
+                continue;
+            this.logger(`Set circle domain ${circleDomain} for hyperlane domain ${hyperlaneDomain}`);
+            await this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, circleBridgeAdapter.addDomain(hyperlaneDomain, circleDomain)));
+        }
+        if (!utils_1.utils.eqAddress(await router.liquidityLayerAdapters('Circle'), circleBridgeAdapter.address)) {
+            this.logger('Set Circle as LiquidityLayerAdapter on Router');
+            await this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, circleBridgeAdapter.address)));
+        }
+        return circleBridgeAdapter;
     }
 }
 exports.LiquidityLayerDeployer = LiquidityLayerDeployer;

package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js.map

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

package/dist/middleware/liquidity-layer/contracts.d.ts

@@ -1,9 +1,10 @@
-import { CircleBridgeAdapter__factory, LiquidityLayerRouter__factory, PortalAdapter__factory, ProxyAdmin__factory } from '@hyperlane-xyz/core';
+import { CircleBridgeAdapter__factory, LiquidityLayerRouter__factory, PortalAdapter__factory } from '@hyperlane-xyz/core';
 export declare const liquidityLayerFactories: {
+    proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
+    timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
     circleBridgeAdapter: CircleBridgeAdapter__factory;
     portalAdapter: PortalAdapter__factory;
-    proxyAdmin: ProxyAdmin__factory;
     liquidityLayerRouter: LiquidityLayerRouter__factory;
 };
-export declare type LiquidityLayerFactories = typeof liquidityLayerFactories;
+export type LiquidityLayerFactories = typeof liquidityLayerFactories;
 //# sourceMappingURL=contracts.d.ts.map

package/dist/middleware/liquidity-layer/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,uBAAuB;;;;;CAKnC,CAAC;AAEF,oBAAY,uBAAuB,GAAG,OAAO,uBAAuB,CAAC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,uBAAuB;;;;;;CAKnC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,OAAO,uBAAuB,CAAC"}

package/dist/middleware/liquidity-layer/contracts.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.liquidityLayerFactories = void 0;
 const core_1 = require("@hyperlane-xyz/core");
+const types_1 = require("../../router/types");
 exports.liquidityLayerFactories = {
     circleBridgeAdapter: new core_1.CircleBridgeAdapter__factory(),
     portalAdapter: new core_1.PortalAdapter__factory(),
-    proxyAdmin: new core_1.ProxyAdmin__factory(),
     liquidityLayerRouter: new core_1.LiquidityLayerRouter__factory(),
+    ...types_1.proxiedFactories,
 };
 //# sourceMappingURL=contracts.js.map

package/dist/middleware/liquidity-layer/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAK6B;AAEhB,QAAA,uBAAuB,GAAG;IACrC,mBAAmB,EAAE,IAAI,mCAA4B,EAAE;IACvD,aAAa,EAAE,IAAI,6BAAsB,EAAE;IAC3C,UAAU,EAAE,IAAI,0BAAmB,EAAE;IACrC,oBAAoB,EAAE,IAAI,oCAA6B,EAAE;CAC1D,CAAC"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAE7B,8CAAsD;AAEzC,QAAA,uBAAuB,GAAG;IACrC,mBAAmB,EAAE,IAAI,mCAA4B,EAAE;IACvD,aAAa,EAAE,IAAI,6BAAsB,EAAE;IAC3C,oBAAoB,EAAE,IAAI,oCAA6B,EAAE;IACzD,GAAG,wBAAgB;CACpB,CAAC"}

package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const hardhat_1 = require("hardhat");
@@ -22,7 +13,7 @@ const testUtils_1 = require("../../test/testUtils");
 const objects_1 = require("../../utils/objects");
 const LiquidityLayerApp_1 = require("./LiquidityLayerApp");
 const LiquidityLayerRouterDeployer_1 = require("./LiquidityLayerRouterDeployer");
-describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, function* () {
+describe('LiquidityLayerRouter', async () => {
     const localChain = chains_1.Chains.test1;
     const remoteChain = chains_1.Chains.test2;
     const localDomain = chainMetadata_1.chainMetadata[localChain].chainId;
@@ -37,23 +28,25 @@ describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, functio
     let circleTokenMessenger;
     let portalBridge;
     let messageTransmitter;
-    before(() => __awaiter(void 0, void 0, void 0, function* () {
-        [signer] = yield hardhat_1.ethers.getSigners();
+    before(async () => {
+        [signer] = await hardhat_1.ethers.getSigners();
         multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
         const coreDeployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
-        const coreContractsMaps = yield coreDeployer.deploy();
+        const coreContractsMaps = await coreDeployer.deploy();
         coreApp = new TestCoreApp_1.TestCoreApp(coreContractsMaps, multiProvider);
         const mockTokenF = new core_1.MockToken__factory(signer);
-        mockToken = yield mockTokenF.deploy();
+        mockToken = await mockTokenF.deploy();
         const portalBridgeF = new core_1.MockPortalBridge__factory(signer);
         const circleTokenMessengerF = new core_1.MockCircleTokenMessenger__factory(signer);
-        circleTokenMessenger = yield circleTokenMessengerF.deploy(mockToken.address);
-        portalBridge = yield portalBridgeF.deploy(mockToken.address);
+        circleTokenMessenger = await circleTokenMessengerF.deploy(mockToken.address);
+        portalBridge = await portalBridgeF.deploy(mockToken.address);
         const messageTransmitterF = new core_1.MockCircleMessageTransmitter__factory(signer);
-        messageTransmitter = yield messageTransmitterF.deploy(mockToken.address);
-        const routerConfig = yield (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreContractsMaps);
+        messageTransmitter = await messageTransmitterF.deploy(mockToken.address);
+        const routerConfig = await (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreContractsMaps);
         config = (0, objects_1.objMap)(routerConfig, (chain, config) => {
-            return Object.assign(Object.assign({}, config), { circle: {
+            return {
+                ...config,
+                circle: {
                     type: LiquidityLayerRouterDeployer_1.BridgeAdapterType.Circle,
                     tokenMessengerAddress: circleTokenMessenger.address,
                     messageTransmitterAddress: messageTransmitter.address,
@@ -68,7 +61,8 @@ describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, functio
                             circleDomain: remoteDomain,
                         },
                     ],
-                }, portal: {
+                },
+                portal: {
                     type: LiquidityLayerRouterDeployer_1.BridgeAdapterType.Portal,
                     portalBridgeAddress: portalBridge.address,
                     wormholeDomainMapping: [
@@ -81,40 +75,41 @@ describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, functio
                             wormholeDomain: remoteDomain,
                         },
                     ],
-                } });
+                },
+            };
         });
-    }));
-    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    beforeEach(async () => {
         const LiquidityLayer = new LiquidityLayerRouterDeployer_1.LiquidityLayerDeployer(multiProvider);
-        const contracts = yield LiquidityLayer.deploy(config);
+        const contracts = await LiquidityLayer.deploy(config);
         liquidityLayerApp = new LiquidityLayerApp_1.LiquidityLayerApp(contracts, multiProvider, config);
         local = liquidityLayerApp.getContracts(localChain).liquidityLayerRouter;
-    }));
-    it('can transfer tokens via Circle', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('can transfer tokens via Circle', async () => {
         const recipientF = new core_1.TestLiquidityLayerMessageRecipient__factory(signer);
-        const recipient = yield recipientF.deploy();
+        const recipient = await recipientF.deploy();
         const amount = 1000;
-        yield mockToken.mint(signer.address, amount);
-        yield mockToken.approve(local.address, amount);
-        yield local.dispatchWithTokens(remoteDomain, utils_1.utils.addressToBytes32(recipient.address), mockToken.address, amount, LiquidityLayerRouterDeployer_1.BridgeAdapterType.Circle, '0x01');
-        const transferNonce = yield circleTokenMessenger.nextNonce();
-        const nonceId = yield messageTransmitter.hashSourceAndNonce(localDomain, transferNonce);
-        yield messageTransmitter.process(nonceId, liquidityLayerApp.getContracts(remoteChain).circleBridgeAdapter.address, amount);
-        yield coreApp.processMessages();
-        (0, chai_1.expect)((yield mockToken.balanceOf(recipient.address)).toNumber()).to.eql(amount);
-    }));
-    it('can transfer tokens via Portal', () => __awaiter(void 0, void 0, void 0, function* () {
+        await mockToken.mint(signer.address, amount);
+        await mockToken.approve(local.address, amount);
+        await local.dispatchWithTokens(remoteDomain, utils_1.utils.addressToBytes32(recipient.address), mockToken.address, amount, LiquidityLayerRouterDeployer_1.BridgeAdapterType.Circle, '0x01');
+        const transferNonce = await circleTokenMessenger.nextNonce();
+        const nonceId = await messageTransmitter.hashSourceAndNonce(localDomain, transferNonce);
+        await messageTransmitter.process(nonceId, liquidityLayerApp.getContracts(remoteChain).circleBridgeAdapter.address, amount);
+        await coreApp.processMessages();
+        (0, chai_1.expect)((await mockToken.balanceOf(recipient.address)).toNumber()).to.eql(amount);
+    });
+    it('can transfer tokens via Portal', async () => {
         const recipientF = new core_1.TestLiquidityLayerMessageRecipient__factory(signer);
-        const recipient = yield recipientF.deploy();
+        const recipient = await recipientF.deploy();
         const amount = 1000;
-        yield mockToken.mint(signer.address, amount);
-        yield mockToken.approve(local.address, amount);
-        yield local.dispatchWithTokens(remoteDomain, utils_1.utils.addressToBytes32(recipient.address), mockToken.address, amount, LiquidityLayerRouterDeployer_1.BridgeAdapterType.Portal, '0x01');
+        await mockToken.mint(signer.address, amount);
+        await mockToken.approve(local.address, amount);
+        await local.dispatchWithTokens(remoteDomain, utils_1.utils.addressToBytes32(recipient.address), mockToken.address, amount, LiquidityLayerRouterDeployer_1.BridgeAdapterType.Portal, '0x01');
         const originAdapter = liquidityLayerApp.getContracts(localChain).portalAdapter;
         const destinationAdapter = liquidityLayerApp.getContracts(remoteChain).portalAdapter;
-        yield destinationAdapter.completeTransfer(yield portalBridge.mockPortalVaa(localDomain, yield originAdapter.nonce(), amount));
-        yield coreApp.processMessages();
-        (0, chai_1.expect)((yield mockToken.balanceOf(recipient.address)).toNumber()).to.eql(amount);
-    }));
-}));
+        await destinationAdapter.completeTransfer(await portalBridge.mockPortalVaa(localDomain, await originAdapter.nonce(), amount));
+        await coreApp.processMessages();
+        (0, chai_1.expect)((await mockToken.balanceOf(recipient.address)).toNumber()).to.eql(amount);
+    });
+});
 //# sourceMappingURL=liquidity-layer.hardhat-test.js.map

package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"liquidity-layer.hardhat-test.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/liquidity-layer.hardhat-test.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+BAA8B;AAC9B,qCAAiC;AAEjC,8CAW6B;AAC7B,gDAA6C;AAE7C,8DAA2D;AAC3D,gDAA6C;AAC7C,wDAAqD;AACrD,kEAA+D;AAC/D,iEAA8D;AAC9D,oDAAwE;AAExE,iDAA6C;AAE7C,2DAAwD;AACxD,iFAMwC;AAExC,QAAQ,CAAC,sBAAsB,EAAE,GAAS,EAAE;IAC1C,MAAM,UAAU,GAAG,eAAM,CAAC,KAAK,CAAC;IAChC,MAAM,WAAW,GAAG,eAAM,CAAC,KAAK,CAAC;IACjC,MAAM,WAAW,GAAG,6BAAa,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;IACtD,MAAM,YAAY,GAAG,6BAAa,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;IAExD,IAAI,MAAyB,CAAC;IAC9B,IAAI,KAA2B,CAAC;IAChC,IAAI,aAA4B,CAAC;IACjC,IAAI,OAAoB,CAAC;IAEzB,IAAI,iBAAoC,CAAC;IACzC,IAAI,MAAsC,CAAC;IAC3C,IAAI,SAAoB,CAAC;IACzB,IAAI,oBAA8C,CAAC;IACnD,IAAI,YAA8B,CAAC;IACnC,IAAI,kBAAgD,CAAC;IAErD,MAAM,CAAC,GAAS,EAAE;QAChB,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAErC,aAAa,GAAG,6BAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,mCAAgB,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC;QACtD,OAAO,GAAG,IAAI,yBAAW,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAE5D,MAAM,UAAU,GAAG,IAAI,yBAAkB,CAAC,MAAM,CAAC,CAAC;QAClD,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,IAAI,gCAAyB,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,qBAAqB,GAAG,IAAI,wCAAiC,CAAC,MAAM,CAAC,CAAC;QAC5E,oBAAoB,GAAG,MAAM,qBAAqB,CAAC,MAAM,CACvD,SAAS,CAAC,OAAO,CAClB,CAAC;QACF,YAAY,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC7D,MAAM,mBAAmB,GAAG,IAAI,4CAAqC,CACnE,MAAM,CACP,CAAC;QACF,kBAAkB,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,YAAY,GAAG,MAAM,IAAA,4CAAgC,EACzD,aAAa,EACb,MAAM,CAAC,OAAO,EACd,iBAAiB,CAClB,CAAC;QACF,MAAM,GAAG,IAAA,gBAAM,EAAC,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9C,uCACK,MAAM,KACT,MAAM,EAAE;oBACN,IAAI,EAAE,gDAAiB,CAAC,MAAM;oBAC9B,qBAAqB,EAAE,oBAAoB,CAAC,OAAO;oBACnD,yBAAyB,EAAE,kBAAkB,CAAC,OAAO;oBACrD,WAAW,EAAE,SAAS,CAAC,OAAO;oBAC9B,mBAAmB,EAAE;wBACnB;4BACE,eAAe,EAAE,WAAW;4BAC5B,YAAY,EAAE,WAAW;yBAC1B;wBACD;4BACE,eAAe,EAAE,YAAY;4BAC7B,YAAY,EAAE,YAAY;yBAC3B;qBACF;iBAC2B,EAC9B,MAAM,EAAE;oBACN,IAAI,EAAE,gDAAiB,CAAC,MAAM;oBAC9B,mBAAmB,EAAE,YAAY,CAAC,OAAO;oBACzC,qBAAqB,EAAE;wBACrB;4BACE,eAAe,EAAE,WAAW;4BAC5B,cAAc,EAAE,WAAW;yBAC5B;wBACD;4BACE,eAAe,EAAE,YAAY;4BAC7B,cAAc,EAAE,YAAY;yBAC7B;qBACF;iBACqB,IACxB;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CAAC;IAEH,UAAU,CAAC,GAAS,EAAE;QACpB,MAAM,cAAc,GAAG,IAAI,qDAAsB,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEtD,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,SAAS,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAE5E,KAAK,GAAG,iBAAiB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC;IAC1E,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAS,EAAE;QAC9C,MAAM,UAAU,GAAG,IAAI,kDAA2C,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QAE5C,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,KAAK,CAAC,kBAAkB,CAC5B,YAAY,EACZ,aAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EACzC,SAAS,CAAC,OAAO,EACjB,MAAM,EACN,gDAAiB,CAAC,MAAM,EACxB,MAAM,CACP,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,SAAS,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,kBAAkB,CACzD,WAAW,EACX,aAAa,CACd,CAAC;QAEF,MAAM,kBAAkB,CAAC,OAAO,CAC9B,OAAO,EACP,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,mBAAoB,CAAC,OAAO,EACxE,MAAM,CACP,CAAC;QACF,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QAEhC,IAAA,aAAM,EAAC,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CACtE,MAAM,CACP,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAS,EAAE;QAC9C,MAAM,UAAU,GAAG,IAAI,kDAA2C,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QAE5C,MAAM,MAAM,GAAG,IAAI,CAAC;QACpB,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,KAAK,CAAC,kBAAkB,CAC5B,YAAY,EACZ,aAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EACzC,SAAS,CAAC,OAAO,EACjB,MAAM,EACN,gDAAiB,CAAC,MAAM,EACxB,MAAM,CACP,CAAC;QAEF,MAAM,aAAa,GACjB,iBAAiB,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,aAAc,CAAC;QAC5D,MAAM,kBAAkB,GACtB,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,aAAc,CAAC;QAC7D,MAAM,kBAAkB,CAAC,gBAAgB,CACvC,MAAM,YAAY,CAAC,aAAa,CAC9B,WAAW,EACX,MAAM,aAAa,CAAC,KAAK,EAAE,EAC3B,MAAM,CACP,CACF,CAAC;QACF,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QAEhC,IAAA,aAAM,EAAC,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CACtE,MAAM,CACP,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"liquidity-layer.hardhat-test.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/liquidity-layer.hardhat-test.ts"],"names":[],"mappings":"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"}

package/dist/middleware/query/InterchainQueryDeployer.d.ts

@@ -2,7 +2,7 @@ import { MultiProvider } from '../../providers/MultiProvider';
 import { ProxiedRouterDeployer } from '../../router/ProxiedRouterDeployer';
 import { RouterConfig } from '../../router/types';
 import { InterchainQueryFactories } from './contracts';
-export declare type InterchainQueryConfig = RouterConfig;
+export type InterchainQueryConfig = RouterConfig;
 export declare class InterchainQueryDeployer extends ProxiedRouterDeployer<InterchainQueryConfig, InterchainQueryFactories, 'interchainQueryRouter'> {
     readonly routerContractName = "interchainQueryRouter";
     constructor(multiProvider: MultiProvider);

package/dist/middleware/query/InterchainQueryDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InterchainQueryDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EACL,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AAErB,oBAAY,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAwB,SAAQ,qBAAqB,CAChE,qBAAqB,EACrB,wBAAwB,EACxB,uBAAuB,CACxB;IACC,QAAQ,CAAC,kBAAkB,2BAA2B;gBAE1C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAGzD,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;CASF"}
+{"version":3,"file":"InterchainQueryDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EACL,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAwB,SAAQ,qBAAqB,CAChE,qBAAqB,EACrB,wBAAwB,EACxB,uBAAuB,CACxB;IACC,QAAQ,CAAC,kBAAkB,2BAA2B;gBAE1C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAGzD,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;CAYF"}

package/dist/middleware/query/InterchainQueryDeployer.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InterchainQueryDeployer = void 0;
 const ethers_1 = require("ethers");
@@ -18,22 +9,20 @@ class InterchainQueryDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeplo
         super(multiProvider, contracts_1.interchainQueryFactories);
         this.routerContractName = 'interchainQueryRouter';
     }
-    constructorArgs(_, __) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [];
-        });
+    async constructorArgs(_, __) {
+        return [];
     }
-    initializeArgs(chain, config) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const owner = yield this.multiProvider.getSignerAddress(chain);
-            return [
-                config.mailbox,
-                config.interchainGasPaymaster,
-                (_a = config.interchainSecurityModule) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.AddressZero,
-                owner,
-            ];
-        });
+    async initializeArgs(chain, config) {
+        const owner = await this.multiProvider.getSignerAddress(chain);
+        if (typeof config.interchainSecurityModule === 'object') {
+            throw new Error('ISM as object unimplemented');
+        }
+        return [
+            config.mailbox,
+            config.interchainGasPaymaster,
+            config.interchainSecurityModule ?? ethers_1.ethers.constants.AddressZero,
+            owner,
+        ];
     }
 }
 exports.InterchainQueryDeployer = InterchainQueryDeployer;

package/dist/middleware/query/InterchainQueryDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterchainQueryDeployer.js","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAGhC,8EAA2E;AAG3E,2CAGqB;AAIrB,MAAa,uBAAwB,SAAQ,6CAI5C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,oCAAwB,CAAC,CAAC;QAHxC,uBAAkB,GAAG,uBAAuB,CAAC;IAItD,CAAC;IAEK,eAAe,CAAC,CAAS,EAAE,EAAgB;;YAC/C,OAAO,EAAE,CAAC;QACZ,CAAC;KAAA;IACK,cAAc,CAClB,KAAa,EACb,MAAoB;;;YASpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC/D,OAAO;gBACL,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,sBAAsB;gBAC7B,MAAA,MAAM,CAAC,wBAAwB,mCAAI,eAAM,CAAC,SAAS,CAAC,WAAW;gBAC/D,KAAK;aACN,CAAC;;KACH;CACF;AAjCD,0DAiCC"}
+{"version":3,"file":"InterchainQueryDeployer.js","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAGhC,8EAA2E;AAG3E,2CAGqB;AAIrB,MAAa,uBAAwB,SAAQ,6CAI5C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,oCAAwB,CAAC,CAAC;QAHxC,uBAAkB,GAAG,uBAAuB,CAAC;IAItD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAS,EAAE,EAAgB;QAC/C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,cAAc,CAClB,KAAa,EACb,MAAoB;QASpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EAAE;YACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;QACD,OAAO;YACL,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,sBAAsB;YAC7B,MAAM,CAAC,wBAAwB,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC/D,KAAK;SACN,CAAC;IACJ,CAAC;CACF;AApCD,0DAoCC"}

package/dist/middleware/query/contracts.d.ts

@@ -1,7 +1,8 @@
-import { InterchainQueryRouter__factory, ProxyAdmin__factory } from '@hyperlane-xyz/core';
+import { InterchainQueryRouter__factory } from '@hyperlane-xyz/core';
 export declare const interchainQueryFactories: {
+    proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
+    timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
     interchainQueryRouter: InterchainQueryRouter__factory;
-    proxyAdmin: ProxyAdmin__factory;
 };
-export declare type InterchainQueryFactories = typeof interchainQueryFactories;
+export type InterchainQueryFactories = typeof interchainQueryFactories;
 //# sourceMappingURL=contracts.d.ts.map

package/dist/middleware/query/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/query/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,wBAAwB;;;CAGpC,CAAC;AAEF,oBAAY,wBAAwB,GAAG,OAAO,wBAAwB,CAAC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/query/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAIrE,eAAO,MAAM,wBAAwB;;;;CAGpC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,OAAO,wBAAwB,CAAC"}

package/dist/middleware/query/contracts.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interchainQueryFactories = void 0;
 const core_1 = require("@hyperlane-xyz/core");
+const types_1 = require("../../router/types");
 exports.interchainQueryFactories = {
     interchainQueryRouter: new core_1.InterchainQueryRouter__factory(),
-    proxyAdmin: new core_1.ProxyAdmin__factory(),
+    ...types_1.proxiedFactories,
 };
 //# sourceMappingURL=contracts.js.map

package/dist/middleware/query/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/query/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAG6B;AAEhB,QAAA,wBAAwB,GAAG;IACtC,qBAAqB,EAAE,IAAI,qCAA8B,EAAE;IAC3D,UAAU,EAAE,IAAI,0BAAmB,EAAE;CACtC,CAAC"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/query/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAAqE;AAErE,8CAAsD;AAEzC,QAAA,wBAAwB,GAAG;IACtC,qBAAqB,EAAE,IAAI,qCAA8B,EAAE;IAC3D,GAAG,wBAAgB;CACpB,CAAC"}