@hyperlane-xyz/sdk 41.3.1 → 42.0.0

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.js

@@ -0,0 +1,125 @@
+import { expect } from 'chai';
+import { Wallet, providers, } from 'ethers';
+import sinon from 'sinon';
+import { TestChainName } from '../../../../consts/testChains.js';
+import { randomAddress } from '../../../../test/testUtils.js';
+import { MultiProvider } from '../../../MultiProvider.js';
+import { EV5JsonRpcSubmissionError, EV5JsonRpcTxSubmitter, } from './EV5JsonRpcTxSubmitter.js';
+describe('EV5JsonRpcTxSubmitter', () => {
+    const chain = TestChainName.test1;
+    const chainId = 9913371;
+    const props = { type: 'jsonRpc', chain };
+    const tx = { chainId, to: randomAddress() };
+    let multiProvider;
+    let mainSigner;
+    let explicitSigner;
+    let connectedExplicitSigner;
+    let prepareTx;
+    beforeEach(() => {
+        const provider = new providers.JsonRpcProvider('http://127.0.0.1:8545');
+        mainSigner = Wallet.createRandom().connect(provider);
+        explicitSigner = Wallet.createRandom();
+        connectedExplicitSigner = explicitSigner.connect(provider);
+        multiProvider = MultiProvider.createTestMultiProvider({
+            signer: mainSigner,
+            provider,
+        });
+        sinon.stub(explicitSigner, 'connect').returns(connectedExplicitSigner);
+        prepareTx = sinon
+            .stub(multiProvider, 'prepareTx')
+            .callsFake(async (_, request) => request);
+    });
+    afterEach(() => sinon.restore());
+    it('uses an explicit signer instead of the MultiProvider signer', async () => {
+        const response = transactionResponse('0x01');
+        const receipt = transactionReceipt('0x01', 1);
+        const explicitSend = sinon
+            .stub(connectedExplicitSigner, 'sendTransaction')
+            .resolves(response);
+        const mainSend = sinon.stub(mainSigner, 'sendTransaction');
+        sinon.stub(multiProvider, 'handleTx').resolves(receipt);
+        const submitter = new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner);
+        expect(await submitter.submit(tx)).to.deep.equal([receipt]);
+        expect(explicitSend.calledOnce).to.equal(true);
+        expect(mainSend.called).to.equal(false);
+        expect(prepareTx.calledWith(chain, sinon.match.object, explicitSigner.address)).to.equal(true);
+    });
+    it('uses the MultiProvider signer when no explicit signer is supplied', async () => {
+        const response = transactionResponse('0x02');
+        const receipt = transactionReceipt('0x02', 1);
+        const mainSend = sinon
+            .stub(mainSigner, 'sendTransaction')
+            .resolves(response);
+        sinon.stub(multiProvider, 'handleTx').resolves(receipt);
+        const submitter = new EV5JsonRpcTxSubmitter(multiProvider, props);
+        expect(await submitter.submit(tx)).to.deep.equal([receipt]);
+        expect(mainSend.calledOnce).to.equal(true);
+        expect(prepareTx.calledWith(chain, sinon.match.object, mainSigner.address)).to.equal(true);
+    });
+    it('validates the complete batch before broadcasting', async () => {
+        const explicitSend = sinon.stub(connectedExplicitSigner, 'sendTransaction');
+        const submitter = new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner);
+        let error;
+        try {
+            await submitter.submit(tx, { ...tx, chainId: chainId + 1 });
+        }
+        catch (caught) {
+            error = caught instanceof Error ? caught : new Error(String(caught));
+        }
+        expect(error?.message).to.include('does not match submitter chainId');
+        expect(explicitSend.called).to.equal(false);
+    });
+    it('retains confirmed receipts and a pending hash on partial failure', async () => {
+        const firstResponse = transactionResponse('0x03');
+        const secondResponse = transactionResponse('0x04');
+        const firstReceipt = transactionReceipt('0x03', 1);
+        sinon
+            .stub(connectedExplicitSigner, 'sendTransaction')
+            .onFirstCall()
+            .resolves(firstResponse)
+            .onSecondCall()
+            .resolves(secondResponse);
+        sinon
+            .stub(multiProvider, 'handleTx')
+            .onFirstCall()
+            .resolves(firstReceipt)
+            .onSecondCall()
+            .rejects(new Error('confirmation timeout'));
+        const error = await captureSubmissionError(new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner).submit(tx, tx));
+        expect(error.submittedTransactions).to.deep.equal([
+            { transactionHash: firstResponse.hash, receipt: firstReceipt },
+            { transactionHash: secondResponse.hash },
+        ]);
+    });
+    it('retains a reverted receipt', async () => {
+        const response = transactionResponse('0x05');
+        const receipt = transactionReceipt('0x05', 0);
+        sinon.stub(connectedExplicitSigner, 'sendTransaction').resolves(response);
+        sinon.stub(multiProvider, 'handleTx').resolves(receipt);
+        const error = await captureSubmissionError(new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner).submit(tx));
+        expect(error.message).to.include(`Transaction ${response.hash} reverted`);
+        expect(error.submittedTransactions).to.deep.equal([
+            { transactionHash: response.hash, receipt },
+        ]);
+    });
+});
+async function captureSubmissionError(submission) {
+    try {
+        await submission;
+    }
+    catch (error) {
+        if (error instanceof EV5JsonRpcSubmissionError)
+            return error;
+        throw error;
+    }
+    throw new Error('Expected submission to fail');
+}
+function transactionResponse(hash) {
+    // CAST: minimal ethers response test double; only hash is read before handleTx.
+    return { hash };
+}
+function transactionReceipt(hash, status) {
+    // CAST: minimal ethers receipt test double; only hash/status are inspected.
+    return { transactionHash: hash, status };
+}
+//# sourceMappingURL=EV5JsonRpcTxSubmitter.test.js.map

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EV5JsonRpcTxSubmitter.test.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.ts"],"names":[],"mappings":"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"}

package/dist/router/HyperlaneRouterDeployer.d.ts

@@ -10,7 +10,9 @@ export declare abstract class HyperlaneRouterDeployer<Config extends RouterConfi
     enrollRemoteRouters(deployedContractsMap: HyperlaneContractsMap<Factories>, _: ChainMap<Config>, foreignRouters?: ChainMap<Address>): Promise<void>;
     protected beforeTransferOwnership(_contractsMap: HyperlaneContractsMap<Factories>, _configMap: ChainMap<Config>): Promise<void>;
     transferOwnership(contractsMap: HyperlaneContractsMap<Factories>, configMap: ChainMap<Config>): Promise<void>;
-    deploy(configMap: ChainMap<Config>): Promise<HyperlaneContractsMap<Factories>>;
+    deploy(configMap: ChainMap<Config>, options?: {
+        deferRouterEnrollment?: boolean;
+    }): Promise<HyperlaneContractsMap<Factories>>;
     deployAndConfigureTokenFees(deployedContractsMap: HyperlaneContractsMap<Factories>, configMap: ChainMap<Config>): Promise<void>;
 }
 //# sourceMappingURL=HyperlaneRouterDeployer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IAE5D,gBAAgB,CACpB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAMf;IAEK,mBAAmB,CACvB,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACnB,cAAc,GAAE,QAAQ,CAAC,OAAO,CAAM,GACrC,OAAO,CAAC,IAAI,CAAC,CAoEf;IAED,UAAgB,uBAAuB,CACrC,aAAa,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC/C,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CAAG;IAEb,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAaf;IAEK,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CA4B3C;IAEK,2BAA2B,CAC/B,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAWf;CACF"}
+{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IAE5D,gBAAgB,CACpB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAMf;IAEK,mBAAmB,CACvB,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACnB,cAAc,GAAE,QAAQ,CAAC,OAAO,CAAM,GACrC,OAAO,CAAC,IAAI,CAAC,CAoEf;IAED,UAAgB,uBAAuB,CACrC,aAAa,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC/C,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC3B,OAAO,CAAC,IAAI,CAAC,CAAG;IAEb,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAaf;IAEK,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,OAAO,GAAE;QAAE,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAO,GAChD,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CA8B3C;IAEK,2BAA2B,CAC/B,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC,CAWf;CACF"}

package/dist/router/HyperlaneRouterDeployer.js

@@ -57,13 +57,15 @@ export class HyperlaneRouterDeployer extends HyperlaneDeployer {
             await this.transferOwnershipOfContracts(chain, configMap[chain], ownables);
         }
     }
-    async deploy(configMap) {
+    async deploy(configMap, options = {}) {
         // Only deploy on chains that don't have foreign deployments.
         const configMapToDeploy = objFilter(configMap, (_chainName, config) => !config.foreignDeployment);
         // Create a map of chains that have foreign deployments.
         const foreignDeployments = objFilter(objMap(configMap, (_, config) => config.foreignDeployment), (_chainName, foreignDeployment) => foreignDeployment !== undefined);
         const deployedContractsMap = await super.deploy(configMapToDeploy);
-        await this.enrollRemoteRouters(deployedContractsMap, configMap, foreignDeployments);
+        if (!options.deferRouterEnrollment) {
+            await this.enrollRemoteRouters(deployedContractsMap, configMap, foreignDeployments);
+        }
         await this.deployAndConfigureTokenFees(deployedContractsMap, configMap);
         await this.configureClients(deployedContractsMap, configMap);
         await this.beforeTransferOwnership(deployedContractsMap, configMap);

package/dist/router/HyperlaneRouterDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterDeployer.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAGnC,OAAO,EAEL,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,GACT,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAMnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE,MAAM,OAAgB,uBAGpB,SAAQ,iBAAoC;IAG5C,KAAK,CAAC,gBAAgB,CACpB,YAA8C,EAC9C,SAA2B;QAE3B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9C,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YACtC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAChC,MAAM,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,oBAAsD,EACtD,CAAmB,EACnB,cAAc,GAAsB,EAAE;QAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,gEAAgE,CACjE,CAAC;QAEF,wCAAwC;QAExC,8BAA8B;QAC9B,MAAM,eAAe,GAAsB,MAAM,CAC/C,oBAAoB,EACpB,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CACjD,CAAC;QACF,uFAAuF;QACvF,MAAM,UAAU,GAAG,QAAQ,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAE7D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE;YACpE,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa;iBACvC,eAAe,CAAC,KAAK,CAAC;iBACtB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAExC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACnC,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBACnE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;gBACtD,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACrE,CAAC,CAAC,CACH,CAAC;YACF,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAClC,CAAC,KAAK,EAA6B,EAAE,CAAC,KAAK,KAAK,SAAS,CAC1D,CAAC;YACF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;YAExD,oCAAoC;YACpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,IAAI,EAAE;gBAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAChC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC,CACpC,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,6BAA6B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAC9D,CAAC;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACtE,MAAM,QAAQ,GACZ,WAAW,CAAC,QAAQ,IAAI,IAAI;oBAC1B,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;oBACtC,CAAC,CAAC,mBAAmB,CACjB,MAAM,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAC1C,OAAO,EACP,SAAS,CACV,CACF,CAAC;gBACR,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAC/C,OAAO,EACP,SAAS,EACT,EAAE,GAAG,WAAW,EAAE,QAAQ,EAAE,CAC7B,CAAC;gBACF,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,uBAAuB,CACrC,aAA+C,EAC/C,UAA4B,IACZ,CAAC;IAEnB,KAAK,CAAC,iBAAiB,CACrB,YAA8C,EAC9C,SAA2B;QAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9C,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,CAAC,MAAM,sBAAsB,CAAC,SAAS,CAAC,CAExD,CAAC;YACF,MAAM,IAAI,CAAC,4BAA4B,CACrC,KAAK,EACL,SAAS,CAAC,KAAK,CAAC,EAChB,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CACV,SAA2B;QAE3B,6DAA6D;QAC7D,MAAM,iBAAiB,GAAG,SAAS,CACjC,SAAS,EACT,CAAC,UAAU,EAAE,MAAM,EAAoB,EAAE,CAAC,CAAC,MAAM,CAAC,iBAAiB,CACpE,CAAC;QAEF,wDAAwD;QACxD,MAAM,kBAAkB,GAAsB,SAAS,CACrD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAC1D,CAAC,UAAU,EAAE,iBAAiB,EAA+B,EAAE,CAC7D,iBAAiB,KAAK,SAAS,CAClC,CAAC;QAEF,MAAM,oBAAoB,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAEnE,MAAM,IAAI,CAAC,mBAAmB,CAC5B,oBAAoB,EACpB,SAAS,EACT,kBAAkB,CACnB,CAAC;QACF,MAAM,IAAI,CAAC,2BAA2B,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QACxE,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAEzE,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC/B,oBAAsD,EACtD,SAA2B;QAE3B,8CAA8C;QAC9C,4EAA4E;QAC5E,4EAA4E;QAC5E,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACtD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,QAAQ;gBAAE,SAAS;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,gCAAgC,KAAK,qEAAqE,CAC3G,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"HyperlaneRouterDeployer.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"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"}