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

package/dist/deploy/middleware/TokenBridgeApp.js

@@ -0,0 +1,115 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenBridgeApp = void 0;
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
+const ethers_1 = require("ethers");
+const core_1 = require("@hyperlane-xyz/core");
+const HyperlaneApp_1 = require("../../HyperlaneApp");
+const chains_1 = require("../../consts/chains");
+const objects_1 = require("../../utils/objects");
+const TokenBridgeRouterDeployer_1 = require("./TokenBridgeRouterDeployer");
+const CircleBridgeInterface = core_1.ICircleBridge__factory.createInterface();
+const CircleBridgeAdapterInterface = core_1.CircleBridgeAdapter__factory.createInterface();
+const BridgedTokenTopic = CircleBridgeAdapterInterface.getEventTopic(CircleBridgeAdapterInterface.getEvent('BridgedToken'));
+class TokenBridgeApp extends HyperlaneApp_1.HyperlaneApp {
+    constructor(contractsMap, multiProvider, bridgeAdapterConfigs) {
+        super(contractsMap, multiProvider);
+        this.contractsMap = contractsMap;
+        this.multiProvider = multiProvider;
+        this.bridgeAdapterConfigs = bridgeAdapterConfigs;
+    }
+    circleBridgeAdapterConfig() {
+        return (0, objects_1.objMap)(this.bridgeAdapterConfigs, (_chain, config) => config.find((_) => _.type === TokenBridgeRouterDeployer_1.BridgeAdapterType.Circle));
+    }
+    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 response = yield req.json();
+            return response.result.map((_) => _.transactionHash).flat();
+        });
+    }
+    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 matchingLogs = receipt.logs
+                .map((_) => {
+                try {
+                    return [CircleBridgeInterface.parseLog(_)];
+                }
+                catch (_a) {
+                    try {
+                        return [CircleBridgeAdapterInterface.parseLog(_)];
+                    }
+                    catch (_b) {
+                        return [];
+                    }
+                }
+            })
+                .flat();
+            if (matchingLogs.length == 0)
+                return [];
+            const message = matchingLogs.find((_) => _.name === 'MessageSent').args
+                .message;
+            const nonce = matchingLogs.find((_) => _.name === 'BridgedToken').args
+                .nonce;
+            const remoteChain = message.chain === chains_1.Chains.fuji ? chains_1.Chains.goerli : chains_1.Chains.fuji;
+            return [
+                {
+                    chain,
+                    // @ts-ignore
+                    remoteChain,
+                    txHash,
+                    message,
+                    nonce,
+                    domain: 0,
+                    nonceHash: ethers_1.ethers.utils.solidityKeccak256(['uint32', 'uint256'], [0, nonce]),
+                },
+            ];
+        });
+    }
+    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.circleBridgeAdapterConfig()[message.remoteChain]
+                .messageTransmitterAddress, connection.signer);
+            const alreadyProcessed = yield transmitter.usedNonces(message.nonceHash);
+            if (alreadyProcessed) {
+                console.log(`Message sent on ${message.txHash} was already processed`);
+                return;
+            }
+            const messageHash = ethers_1.ethers.utils.keccak256(message.message);
+            const attestationsB = yield (0, cross_fetch_1.default)(`https://iris-api-sandbox.circle.com/attestations/${messageHash}`);
+            const attestations = yield attestationsB.json();
+            if (attestations.status !== 'complete') {
+                console.log(`Attestations not available for message nonce ${message.nonce} on ${message.txHash}`);
+                return;
+            }
+            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);
+        });
+    }
+}
+exports.TokenBridgeApp = TokenBridgeApp;
+//# sourceMappingURL=TokenBridgeApp.js.map

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

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

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

@@ -0,0 +1,33 @@
+import { CircleBridgeAdapter, TokenBridgeRouter } from '@hyperlane-xyz/core';
+import { HyperlaneCore } from '../../core/HyperlaneCore';
+import { TokenBridgeContracts, TokenBridgeFactories } from '../../middleware';
+import { MultiProvider } from '../../providers/MultiProvider';
+import { ChainMap, ChainName } from '../../types';
+import { HyperlaneRouterDeployer } from '../router/HyperlaneRouterDeployer';
+import { RouterConfig } from '../router/types';
+export declare enum BridgeAdapterType {
+    Circle = "Circle"
+}
+export interface CircleBridgeAdapterConfig {
+    type: BridgeAdapterType.Circle;
+    circleBridgeAddress: string;
+    messageTransmitterAddress: string;
+    usdcAddress: string;
+    circleDomainMapping: {
+        hyperlaneDomain: number;
+        circleDomain: number;
+    }[];
+}
+export declare type BridgeAdapterConfig = CircleBridgeAdapterConfig;
+export declare type TokenBridgeConfig = RouterConfig & {
+    bridgeAdapterConfigs: BridgeAdapterConfig[];
+};
+export declare class TokenBridgeDeployer<Chain extends ChainName> extends HyperlaneRouterDeployer<Chain, TokenBridgeConfig, TokenBridgeContracts, TokenBridgeFactories> {
+    protected core: HyperlaneCore<Chain>;
+    protected create2salt: string;
+    constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, TokenBridgeConfig>, core: HyperlaneCore<Chain>, create2salt?: string);
+    enrollRemoteRouters(contractsMap: ChainMap<Chain, TokenBridgeContracts>): Promise<void>;
+    deployContracts(chain: Chain, config: TokenBridgeConfig): Promise<TokenBridgeContracts>;
+    deployCircleBridgeAdapter(chain: Chain, adapterConfig: CircleBridgeAdapterConfig, owner: string, router: TokenBridgeRouter): Promise<CircleBridgeAdapter>;
+}
+//# sourceMappingURL=TokenBridgeRouterDeployer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"TokenBridgeRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/TokenBridgeRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EAEnB,iBAAiB,EAElB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EAErB,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,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,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,oBAAY,mBAAmB,GAAG,yBAAyB,CAAC;AAE5D,oBAAY,iBAAiB,GAAG,YAAY,GAAG;IAC7C,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;CAC7C,CAAC;AAEF,qBAAa,mBAAmB,CAC9B,KAAK,SAAS,SAAS,CACvB,SAAQ,uBAAuB,CAC/B,KAAK,EACL,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,CACrB;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,iBAAiB,CAAC,EACnC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,EAC1B,WAAW,SAA4B;IAK7C,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,oBAAoB,CAAC,GAClD,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CACnB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,oBAAoB,CAAC;IA+B1B,yBAAyB,CAC7B,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,yBAAyB,EACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,mBAAmB,CAAC;CA2DhC"}

package/dist/deploy/middleware/TokenBridgeRouterDeployer.js

@@ -0,0 +1,93 @@
+"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.TokenBridgeDeployer = exports.BridgeAdapterType = void 0;
+const ethers_1 = require("ethers");
+const core_1 = require("@hyperlane-xyz/core");
+const middleware_1 = require("../../middleware");
+const objects_1 = require("../../utils/objects");
+const HyperlaneRouterDeployer_1 = require("../router/HyperlaneRouterDeployer");
+var BridgeAdapterType;
+(function (BridgeAdapterType) {
+    BridgeAdapterType["Circle"] = "Circle";
+})(BridgeAdapterType = exports.BridgeAdapterType || (exports.BridgeAdapterType = {}));
+class TokenBridgeDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeployer {
+    constructor(multiProvider, configMap, core, create2salt = 'TokenBridgeDeployerSalt') {
+        super(multiProvider, configMap, middleware_1.tokenBridgeFactories, {});
+        this.core = core;
+        this.create2salt = create2salt;
+    }
+    enrollRemoteRouters(contractsMap) {
+        const _super = Object.create(null, {
+            enrollRemoteRouters: { get: () => super.enrollRemoteRouters }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            // Enroll the TokenBridgeRouter with each other
+            yield _super.enrollRemoteRouters.call(this, contractsMap);
+            // Enroll the circle adapters with each other
+            yield _super.enrollRemoteRouters.call(this, (0, objects_1.objMap)(contractsMap, (_chain, contracts) => ({
+                router: contracts.circleBridgeAdapter,
+            })));
+        });
+    }
+    // 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 = core_1.TokenBridgeRouter__factory.createInterface().encodeFunctionData('initialize', [config.owner, config.connectionManager, config.interchainGasPaymaster]);
+            const router = yield this.deployContract(chain, 'router', [], {
+                create2Salt: this.create2salt,
+                initCalldata,
+            });
+            const bridgeAdapters = {};
+            for (const adapterConfig of config.bridgeAdapterConfigs) {
+                if (adapterConfig.type === BridgeAdapterType.Circle) {
+                    bridgeAdapters.circleBridgeAdapter =
+                        yield this.deployCircleBridgeAdapter(chain, adapterConfig, config.owner, router);
+                }
+            }
+            return Object.assign(Object.assign({}, bridgeAdapters), { router });
+        });
+    }
+    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.circleBridgeAddress,
+                adapterConfig.messageTransmitterAddress,
+                router.address,
+            ]);
+            const circleBridgeAdapter = yield this.deployContract(chain, 'circleBridgeAdapter', [], {
+                create2Salt: this.create2salt,
+                initCalldata,
+            });
+            if ((yield circleBridgeAdapter.tokenSymbolToAddress('USDC')) ===
+                ethers_1.ethers.constants.AddressZero) {
+                this.logger(`Set USDC token contract`);
+                yield cc.handleTx(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 cc.handleTx(circleBridgeAdapter.addDomain(hyperlaneDomain, circleDomain));
+            }
+            this.logger('Set CircleTokenBridgeAdapter on Router');
+            yield cc.handleTx(router.setTokenBridgeAdapter(adapterConfig.type, circleBridgeAdapter.address));
+            return circleBridgeAdapter;
+        });
+    }
+}
+exports.TokenBridgeDeployer = TokenBridgeDeployer;
+//# sourceMappingURL=TokenBridgeRouterDeployer.js.map

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

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

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

@@ -0,0 +1,17 @@
+import { HyperlaneCore } from '../../core/HyperlaneCore';
+import { V2CompatibilityContracts, V2CompatibilityFactories } from '../../middleware';
+import { MultiProvider } from '../../providers/MultiProvider';
+import { ChainMap, ChainName } from '../../types';
+import { HyperlaneRouterDeployer } from '../router/HyperlaneRouterDeployer';
+import { RouterConfig } from '../router/types';
+export declare type V2CompatibilityConfig = RouterConfig & {
+    v1Domains: number[];
+    v2Domains: number[];
+};
+export declare class V2CompatibilityRouterDeployer<Chain extends ChainName> extends HyperlaneRouterDeployer<Chain, V2CompatibilityConfig, V2CompatibilityContracts, V2CompatibilityFactories> {
+    protected core: HyperlaneCore<Chain>;
+    protected create2salt: string;
+    constructor(multiProvider: MultiProvider<Chain>, configMap: ChainMap<Chain, V2CompatibilityConfig>, core: HyperlaneCore<Chain>, create2salt?: string);
+    deployContracts(chain: Chain, config: V2CompatibilityConfig): Promise<V2CompatibilityContracts>;
+}
+//# sourceMappingURL=V2CompatibilityMiddlewareDeployer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"V2CompatibilityMiddlewareDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/V2CompatibilityMiddlewareDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EAEzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,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,qBAAqB,GAAG,YAAY,GAAG;IACjD,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,qBAAa,6BAA6B,CACxC,KAAK,SAAS,SAAS,CACvB,SAAQ,uBAAuB,CAC/B,KAAK,EACL,qBAAqB,EACrB,wBAAwB,EACxB,wBAAwB,CACzB;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,qBAAqB,CAAC,EACvC,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,EAC1B,WAAW,SAAa;IAO9B,eAAe,CACnB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,wBAAwB,CAAC;CAoBrC"}

package/dist/deploy/middleware/V2CompatibilityMiddlewareDeployer.js

@@ -0,0 +1,42 @@
+"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.V2CompatibilityRouterDeployer = void 0;
+const core_1 = require("@hyperlane-xyz/core");
+const middleware_1 = require("../../middleware");
+const HyperlaneRouterDeployer_1 = require("../router/HyperlaneRouterDeployer");
+class V2CompatibilityRouterDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeployer {
+    constructor(multiProvider, configMap, core, create2salt = 'asdasdsd') {
+        super(multiProvider, configMap, middleware_1.v2CompatibilityFactories, {});
+        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 = core_1.V2CompatibilityRouter__factory.createInterface().encodeFunctionData('initialize', [config.owner, config.connectionManager, config.interchainGasPaymaster]);
+            const router = yield this.deployContract(chain, 'router', [], {
+                create2Salt: this.create2salt + 'router',
+                initCalldata,
+            });
+            this.logger(`Set domain mapping`, config.v1Domains, config.v2Domains);
+            yield this.multiProvider
+                .getChainConnection(chain)
+                .handleTx(router.mapDomains(config.v1Domains, config.v2Domains));
+            return {
+                router,
+            };
+        });
+    }
+}
+exports.V2CompatibilityRouterDeployer = V2CompatibilityRouterDeployer;
+//# sourceMappingURL=V2CompatibilityMiddlewareDeployer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"V2CompatibilityMiddlewareDeployer.js","sourceRoot":"","sources":["../../../src/deploy/middleware/V2CompatibilityMiddlewareDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAqE;AAGrE,iDAI0B;AAG1B,+EAA4E;AAQ5E,MAAa,6BAEX,SAAQ,iDAKT;IACC,YACE,aAAmC,EACnC,SAAiD,EACvC,IAA0B,EAC1B,cAAc,UAAU;QAElC,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,qCAAwB,EAAE,EAAE,CAAC,CAAC;QAHpD,SAAI,GAAJ,IAAI,CAAsB;QAC1B,gBAAW,GAAX,WAAW,CAAa;IAGpC,CAAC;IAED,+CAA+C;IAC/C,mEAAmE;IAC7D,eAAe,CACnB,KAAY,EACZ,MAA6B;;YAE7B,MAAM,YAAY,GAChB,qCAA8B,CAAC,eAAe,EAAE,CAAC,kBAAkB,CACjE,YAAY,EACZ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,sBAAsB,CAAC,CACxE,CAAC;YACJ,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;YAEH,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACtE,MAAM,IAAI,CAAC,aAAa;iBACrB,kBAAkB,CAAC,KAAK,CAAC;iBACzB,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;YAEnE,OAAO;gBACL,MAAM;aACP,CAAC;QACJ,CAAC;KAAA;CACF;AA1CD,sEA0CC"}

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":"AAKA,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,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,qBAAa,yBAAyB,CACpC,KAAK,SAAS,SAAS,CACvB,SAAQ,uBAAuB,CAC/B,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;CAkBvC;AAED,oBAAY,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAuB,CAClC,KAAK,SAAS,SAAS,CACvB,SAAQ,uBAAuB,CAC/B,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;CAkBrC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":"AAKA,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,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,qBAAa,yBAAyB,CACpC,KAAK,SAAS,SAAS,CACvB,SAAQ,uBAAuB,CAC/B,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;CAcvC;AAED,oBAAY,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAuB,CAClC,KAAK,SAAS,SAAS,CACvB,SAAQ,uBAAuB,CAC/B,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;CAcrC"}

package/dist/deploy/middleware/deploy.js

@@ -23,11 +23,7 @@ class InterchainAccountDeployer extends HyperlaneRouterDeployer_1.HyperlaneRoute
     // If no custom logic is needed, call deployContract for the router
     deployContracts(chain, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const initCalldata = core_1.InterchainAccountRouter__factory.createInterface().encodeFunctionData('initialize', [
-                config.mailbox,
-                config.interchainGasPaymaster,
-                config.interchainSecurityModule,
-            ]);
+            const initCalldata = core_1.InterchainAccountRouter__factory.createInterface().encodeFunctionData('initialize', [config.owner, config.connectionManager, config.interchainGasPaymaster]);
             const router = yield this.deployContract(chain, 'router', [], {
                 create2Salt: this.create2salt + 'router',
                 initCalldata,
@@ -51,11 +47,7 @@ class InterchainQueryDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterD
     // If no custom logic is needed, call deployContract for the router
     deployContracts(chain, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const initCalldata = core_1.InterchainQueryRouter__factory.createInterface().encodeFunctionData('initialize(address,address,address)', [
-                config.mailbox,
-                config.interchainGasPaymaster,
-                config.interchainSecurityModule,
-            ]);
+            const initCalldata = core_1.InterchainQueryRouter__factory.createInterface().encodeFunctionData('initialize', [config.owner, config.connectionManager, config.interchainGasPaymaster]);
             const router = yield this.deployContract(chain, 'router', [], {
                 create2Salt: this.create2salt + 'router',
                 initCalldata,

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAG6B;AAG7B,iDAO0B;AAG1B,+EAA4E;AAK5E,MAAa,yBAEX,SAAQ,iDAKT;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,GAChB,uCAAgC,CAAC,eAAe,EAAE,CAAC,kBAAkB,CACnE,YAAY,EACZ;gBACE,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,sBAAsB;gBAC7B,MAAM,CAAC,wBAAwB;aAChC,CACF,CAAC;YACJ,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;AAxCD,8DAwCC;AAID,MAAa,uBAEX,SAAQ,iDAKT;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,GAChB,qCAA8B,CAAC,eAAe,EAAE,CAAC,kBAAkB,CACjE,qCAAqC,EACrC;gBACE,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,sBAAsB;gBAC7B,MAAM,CAAC,wBAAwB;aAChC,CACF,CAAC;YACJ,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;AAzCD,0DAyCC"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/deploy/middleware/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAG6B;AAG7B,iDAO0B;AAG1B,+EAA4E;AAK5E,MAAa,yBAEX,SAAQ,iDAKT;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,GAChB,uCAAgC,CAAC,eAAe,EAAE,CAAC,kBAAkB,CACnE,YAAY,EACZ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,sBAAsB,CAAC,CACxE,CAAC;YACJ,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,8DAoCC;AAID,MAAa,uBAEX,SAAQ,iDAKT;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,GAChB,qCAA8B,CAAC,eAAe,EAAE,CAAC,kBAAkB,CACjE,YAAY,EACZ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,sBAAsB,CAAC,CACxE,CAAC;YACJ,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;AArCD,0DAqCC"}

package/dist/deploy/proxy.d.ts

@@ -1,18 +1,17 @@
 import { ethers } from 'ethers';
 import type { types } from '@hyperlane-xyz/utils';
-import { TransparentProxyAddresses } from '../proxy';
+import { BeaconProxyAddresses } from '../proxy';
 import { ChainName } from '../types';
 import { CheckerViolation } from './types';
-export interface ProxyViolation extends CheckerViolation {
-    type: TransparentProxyAddresses['kind'];
+export interface UpgradeBeaconViolation extends CheckerViolation {
+    type: BeaconProxyAddresses['kind'];
     data: {
-        proxyAddresses: TransparentProxyAddresses;
+        proxiedAddress: BeaconProxyAddresses;
         name: string;
     };
     actual: string;
     expected: string;
 }
-export declare function proxyImplementation(provider: ethers.providers.Provider, proxy: types.Address): Promise<types.Address>;
-export declare function proxyAdmin(provider: ethers.providers.Provider, proxy: types.Address): Promise<types.Address>;
-export declare function proxyViolation<Chain extends ChainName>(chain: Chain, name: string, proxyAddresses: TransparentProxyAddresses, actual: types.Address): ProxyViolation;
+export declare function upgradeBeaconImplementation(provider: ethers.providers.Provider, beacon: types.Address): Promise<types.Address>;
+export declare function upgradeBeaconViolation<Chain extends ChainName>(chain: Chain, name: string, proxiedAddress: BeaconProxyAddresses, actual: types.Address): UpgradeBeaconViolation;
 //# sourceMappingURL=proxy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,IAAI,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,EAAE;QACJ,cAAc,EAAE,yBAAyB,CAAC;QAC1C,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,KAAK,EAAE,KAAK,CAAC,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAOxB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,KAAK,EAAE,KAAK,CAAC,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAOxB;AAED,wBAAgB,cAAc,CAAC,KAAK,SAAS,SAAS,EACpD,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,yBAAyB,EACzC,MAAM,EAAE,KAAK,CAAC,OAAO,GACpB,cAAc,CAWhB"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,EAAE;QACJ,cAAc,EAAE,oBAAoB,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EACnC,MAAM,EAAE,KAAK,CAAC,OAAO,GACpB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAIxB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,SAAS,SAAS,EAC5D,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,oBAAoB,EACpC,MAAM,EAAE,KAAK,CAAC,OAAO,GACpB,sBAAsB,CAWxB"}

package/dist/deploy/proxy.js

@@ -9,35 +9,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyViolation = exports.proxyAdmin = exports.proxyImplementation = void 0;
+exports.upgradeBeaconViolation = exports.upgradeBeaconImplementation = void 0;
 const ethers_1 = require("ethers");
-function proxyImplementation(provider, proxy) {
+function upgradeBeaconImplementation(provider, beacon) {
     return __awaiter(this, void 0, void 0, function* () {
-        // Hardcoded storage slot for implementation per EIP-1967
-        const storageValue = yield provider.getStorageAt(proxy, '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc');
+        // TODO: This should check the correct upgrade beacon controller
+        const storageValue = yield provider.getStorageAt(beacon, 0);
         return ethers_1.ethers.utils.getAddress(storageValue.slice(26));
     });
 }
-exports.proxyImplementation = proxyImplementation;
-function proxyAdmin(provider, proxy) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Hardcoded storage slot for admin per EIP-1967
-        const storageValue = yield provider.getStorageAt(proxy, '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103');
-        return ethers_1.ethers.utils.getAddress(storageValue.slice(26));
-    });
-}
-exports.proxyAdmin = proxyAdmin;
-function proxyViolation(chain, name, proxyAddresses, actual) {
+exports.upgradeBeaconImplementation = upgradeBeaconImplementation;
+function upgradeBeaconViolation(chain, name, proxiedAddress, actual) {
     return {
         chain,
-        type: proxyAddresses.kind,
+        type: proxiedAddress.kind,
         actual,
-        expected: proxyAddresses.implementation,
+        expected: proxiedAddress.implementation,
         data: {
             name,
-            proxyAddresses,
+            proxiedAddress,
         },
     };
 }
-exports.proxyViolation = proxyViolation;
+exports.upgradeBeaconViolation = upgradeBeaconViolation;
 //# sourceMappingURL=proxy.js.map

package/dist/deploy/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAmBhC,SAAsB,mBAAmB,CACvC,QAAmC,EACnC,KAAoB;;QAEpB,yDAAyD;QACzD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAC9C,KAAK,EACL,oEAAoE,CACrE,CAAC;QACF,OAAO,eAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;CAAA;AAVD,kDAUC;AAED,SAAsB,UAAU,CAC9B,QAAmC,EACnC,KAAoB;;QAEpB,gDAAgD;QAChD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAC9C,KAAK,EACL,oEAAoE,CACrE,CAAC;QACF,OAAO,eAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;CAAA;AAVD,gCAUC;AAED,SAAgB,cAAc,CAC5B,KAAY,EACZ,IAAY,EACZ,cAAyC,EACzC,MAAqB;IAErB,OAAO;QACL,KAAK;QACL,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,MAAM;QACN,QAAQ,EAAE,cAAc,CAAC,cAAc;QACvC,IAAI,EAAE;YACJ,IAAI;YACJ,cAAc;SACf;KACF,CAAC;AACJ,CAAC;AAhBD,wCAgBC"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAmBhC,SAAsB,2BAA2B,CAC/C,QAAmC,EACnC,MAAqB;;QAErB,gEAAgE;QAChE,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5D,OAAO,eAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;CAAA;AAPD,kEAOC;AAED,SAAgB,sBAAsB,CACpC,KAAY,EACZ,IAAY,EACZ,cAAoC,EACpC,MAAqB;IAErB,OAAO;QACL,KAAK;QACL,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,MAAM;QACN,QAAQ,EAAE,cAAc,CAAC,cAAc;QACvC,IAAI,EAAE;YACJ,IAAI;YACJ,cAAc;SACf;KACF,CAAC;AACJ,CAAC;AAhBD,wDAgBC"}

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

@@ -8,6 +8,7 @@ export declare class HyperlaneRouterChecker<Chain extends ChainName, App extends
     checkOwnership(chain: Chain): Promise<void>;
     checkChain(chain: Chain): Promise<void>;
     checkEnrolledRouters(chain: Chain): Promise<void>;
+    checkConnectionManager(chain: Chain): Promise<void>;
     ownables(chain: Chain): Ownable[];
 }
 //# sourceMappingURL=HyperlaneRouterChecker.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterChecker.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,qBAAa,sBAAsB,CACjC,KAAK,SAAS,SAAS,EACvB,GAAG,SAAS,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,EAC1C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,CACjC,SAAQ,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC;IAC/C,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAavD,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE;CAGlC"}
+{"version":3,"file":"HyperlaneRouterChecker.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,qBAAa,sBAAsB,CACjC,KAAK,SAAS,SAAS,EACvB,GAAG,SAAS,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,EAC1C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,CACjC,SAAQ,mBAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC;IAC/C,cAAc,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAYzD,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,EAAE;CAGlC"}

package/dist/deploy/router/HyperlaneRouterChecker.js

@@ -23,6 +23,7 @@ class HyperlaneRouterChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.checkEnrolledRouters(chain);
             yield this.checkOwnership(chain);
+            yield this.checkConnectionManager(chain);
         });
     }
     checkEnrolledRouters(chain) {
@@ -36,6 +37,14 @@ class HyperlaneRouterChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
             })));
         });
     }
+    checkConnectionManager(chain) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const router = this.app.getContracts(chain).router;
+            const expectedConnectionManager = this.configMap[chain].connectionManager;
+            const routerConnectionManager = yield router.abacusConnectionManager();
+            utils_1.utils.assert(expectedConnectionManager === routerConnectionManager, `Incorrect ConnectionManager for ${chain}. Expected ${expectedConnectionManager}, found ${routerConnectionManager}`);
+        });
+    }
     ownables(chain) {
         return [this.app.getContracts(chain).router];
     }

package/dist/deploy/router/HyperlaneRouterChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAA6C;AAG7C,8DAA2D;AAG3D,gEAA6D;AAI7D,MAAa,sBAKX,SAAQ,yCAAuC;IAC/C,cAAc,CAAC,KAAY;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAEK,UAAU,CAAC,KAAY;;YAC3B,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;KAAA;IAEK,oBAAoB,CAAC,KAAY;;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;YAEnD,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;gBAC/D,MAAM,aAAa,GAAG,6BAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;gBACpD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACpD,aAAK,CAAC,MAAM,CAAC,OAAO,KAAK,aAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAED,QAAQ,CAAC,KAAY;QACnB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACF;AAjCD,wDAiCC"}
+{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAA6C;AAG7C,8DAA2D;AAG3D,gEAA6D;AAI7D,MAAa,sBAKX,SAAQ,yCAAuC;IAC/C,cAAc,CAAC,KAAY;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAEK,UAAU,CAAC,KAAY;;YAC3B,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACjC,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;KAAA;IAEK,oBAAoB,CAAC,KAAY;;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;YAEnD,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;gBAC/D,MAAM,aAAa,GAAG,6BAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;gBACpD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACpD,aAAK,CAAC,MAAM,CAAC,OAAO,KAAK,aAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,sBAAsB,CAAC,KAAY;;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;YACnD,MAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC;YAE1E,MAAM,uBAAuB,GAAG,MAAM,MAAM,CAAC,uBAAuB,EAAE,CAAC;YAEvE,aAAK,CAAC,MAAM,CACV,yBAAyB,KAAK,uBAAuB,EACrD,mCAAmC,KAAK,cAAc,yBAAyB,WAAW,uBAAuB,EAAE,CACpH,CAAC;QACJ,CAAC;KAAA;IAED,QAAQ,CAAC,KAAY;QACnB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACF;AA9CD,wDA8CC"}

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAOA,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;AAElD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,KAAK,SAAS,SAAS,EACvB,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,EACjC,SAAS,SAAS,eAAe,CACjC,SAAQ,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;gBAE5D,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,oBAAoB,CACxB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC;IAgCV,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;IAiDV,iBAAiB,CACrB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC;IAsBV,MAAM,CACV,iBAAiB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,GACpD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;CASvC"}
+{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAMA,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;AAElD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,KAAK,SAAS,SAAS,EACvB,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,EACjC,SAAS,SAAS,eAAe,CACjC,SAAQ,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;gBAE5D,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,oBAAoB,CACxB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC;IAmCV,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;IA+CV,iBAAiB,CACrB,YAAY,EAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC;IAsBV,MAAM,CACV,iBAAiB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,GACpD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;CASvC"}

package/dist/deploy/router/HyperlaneRouterDeployer.js

@@ -14,7 +14,6 @@ const debug_1 = require("debug");
 const ethers_1 = require("ethers");
 const utils_1 = require("@hyperlane-xyz/utils");
 const chainMetadata_1 = require("../../consts/chainMetadata");
-const domains_1 = require("../../domains");
 const objects_1 = require("../../utils/objects");
 const HyperlaneDeployer_1 = require("../HyperlaneDeployer");
 class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
@@ -26,12 +25,13 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
             this.logger(`Initializing connection clients (if not already)...`);
             yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(contractsMap, (local, contracts) => __awaiter(this, void 0, void 0, function* () {
                 const chainConnection = this.multiProvider.getChainConnection(local);
-                // set mailbox if not already set (and configured)
-                const mailbox = this.configMap[local].mailbox;
-                if (mailbox &&
-                    (yield contracts.router.mailbox()) === ethers_1.ethers.constants.AddressZero) {
-                    this.logger(`Set mailbox on ${local}`);
-                    yield chainConnection.handleTx(contracts.router.setMailbox(mailbox));
+                // set hyperlane connection manager if not already set
+                if (
+                // TODO rename ACM methods in router contract
+                (yield contracts.router.abacusConnectionManager()) ===
+                    ethers_1.ethers.constants.AddressZero) {
+                    this.logger(`Set abacus connection manager on ${local}`);
+                    yield chainConnection.handleTx(contracts.router.setAbacusConnectionManager(this.configMap[local].connectionManager));
                 }
                 // set interchain gas paymaster if not already set (and configured)
                 const interchainGasPaymaster = this.configMap[local].interchainGasPaymaster;
@@ -54,28 +54,26 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
             const deployedChains = Object.keys(contractsMap);
             for (const [chain, contracts] of Object.entries(contractsMap)) {
                 const local = chain;
-                this.logger({ local });
                 const chainConnection = this.multiProvider.getChainConnection(local);
                 // only enroll chains which are deployed
                 const deployedRemoteChains = this.multiProvider
                     .remoteChains(local)
                     .filter((c) => deployedChains.includes(c));
-                this.logger({ deployedRemoteChains });
                 const enrollEntries = yield Promise.all(deployedRemoteChains.map((remote) => __awaiter(this, void 0, void 0, function* () {
                     const remoteDomain = chainMetadata_1.chainMetadata[remote].id;
                     const current = yield contracts.router.routers(remoteDomain);
                     const expected = utils_1.utils.addressToBytes32(contractsMap[remote].router.address);
-                    return current !== expected ? [remoteDomain, expected] : undefined;
+                    return current !== expected ? [remote, expected] : undefined;
                 })));
                 const entries = enrollEntries.filter((entry) => entry !== undefined);
-                this.logger({ entries });
-                const domains = entries.map(([id]) => id);
+                const domains = entries.map(([chain]) => chainMetadata_1.chainMetadata[chain].id);
                 const addresses = entries.map(([, address]) => address);
-                yield _super.runIfOwner.call(this, local, contracts.router, () => __awaiter(this, void 0, void 0, function* () {
-                    const chains = domains.map((id) => domains_1.DomainIdToChainName[id]);
-                    this.logger(`Enroll remote (${chains}) routers on ${local}`);
-                    yield chainConnection.handleTx(contracts.router.enrollRemoteRouters(domains, addresses, chainConnection.overrides));
-                }));
+                if (domains.length > 0) {
+                    yield _super.runIfOwner.call(this, local, contracts.router, () => __awaiter(this, void 0, void 0, function* () {
+                        this.logger(`Enroll remote (${domains}) routers on ${local}`);
+                        yield chainConnection.handleTx(contracts.router.enrollRemoteRouters(domains, addresses, chainConnection.overrides));
+                    }));
+                }
             }
         });
     }