@hyperlane-xyz/cli 3.10.1-beta1 → 3.20.0-beta0

package/dist/src/config/warp.js

@@ -1,28 +1,21 @@
 import { confirm, input } from '@inquirer/prompts';
 import { ethers } from 'ethers';
-import { TokenType, WarpRouteDeployConfigSchema, } from '@hyperlane-xyz/sdk';
+import { TokenType, WarpCoreConfigSchema, WarpRouteDeployConfigSchema, } from '@hyperlane-xyz/sdk';
 import { errorRed, logBlue, logGreen } from '../logger.js';
 import { runMultiChainSelectionStep, runSingleChainSelectionStep, } from '../utils/chains.js';
 import { readYamlOrJson, writeYamlOrJson } from '../utils/files.js';
-import { readChainConfigsIfExists } from './chain.js';
 export function readWarpRouteDeployConfig(filePath) {
     const config = readYamlOrJson(filePath);
     if (!config)
         throw new Error(`No warp route deploy config found at ${filePath}`);
-    const result = WarpRouteDeployConfigSchema.safeParse(config);
-    if (!result.success) {
-        const firstIssue = result.error.issues[0];
-        throw new Error(`Invalid warp config: ${firstIssue.path} => ${firstIssue.message}`);
-    }
-    return result.data;
+    return WarpRouteDeployConfigSchema.parse(config);
 }
 export function isValidWarpRouteDeployConfig(config) {
     return WarpRouteDeployConfigSchema.safeParse(config).success;
 }
-export async function createWarpRouteDeployConfig({ format, outPath, chainConfigPath, }) {
+export async function createWarpRouteDeployConfig({ context, outPath, }) {
     logBlue('Creating a new warp route deployment config');
-    const customChains = readChainConfigsIfExists(chainConfigPath);
-    const baseChain = await runSingleChainSelectionStep(customChains, 'Select base chain with the original token to warp');
+    const baseChain = await runSingleChainSelectionStep(context.chainMetadata, 'Select base chain with the original token to warp');
     const isNative = await confirm({
         message: 'Are you creating a route for the native token of the base chain (e.g. Ether on Ethereum)?',
     });
@@ -38,7 +31,7 @@ export async function createWarpRouteDeployConfig({ format, outPath, chainConfig
     const baseAddress = isNative
         ? ethers.constants.AddressZero
         : await input({ message: addressMessage });
-    const syntheticChains = await runMultiChainSelectionStep(customChains, 'Select chains to which the base token will be connected');
+    const syntheticChains = await runMultiChainSelectionStep(context.chainMetadata, 'Select chains to which the base token will be connected');
     // TODO add more prompts here to support customizing the token metadata
     let result;
     if (isNative) {
@@ -64,11 +57,19 @@ export async function createWarpRouteDeployConfig({ format, outPath, chainConfig
     });
     if (isValidWarpRouteDeployConfig(result)) {
         logGreen(`Warp Route config is valid, writing to file ${outPath}`);
-        writeYamlOrJson(outPath, result, format);
+        writeYamlOrJson(outPath, result);
     }
     else {
         errorRed(`Warp route deployment config is invalid, please see https://github.com/hyperlane-xyz/hyperlane-monorepo/blob/main/typescript/cli/examples/warp-route-deployment.yaml for an example`);
         throw new Error('Invalid multisig config');
     }
 }
+// Note, this is different than the function above which reads a config
+// for a DEPLOYMENT. This gets a config for using a warp route (aka WarpCoreConfig)
+export function readWarpRouteConfig(filePath) {
+    const config = readYamlOrJson(filePath);
+    if (!config)
+        throw new Error(`No warp route config found at ${filePath}`);
+    return WarpCoreConfigSchema.parse(config);
+}
 //# sourceMappingURL=warp.js.map

package/dist/src/config/warp.js.map

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

package/dist/src/context/context.d.ts

@@ -0,0 +1,14 @@
+import { ChainName } from '@hyperlane-xyz/sdk';
+import { CommandContext, ContextSettings } from './types.js';
+export declare function contextMiddleware(argv: Record<string, any>): Promise<void>;
+/**
+ * Retrieves context for the user-selected command
+ * @returns context for the current command
+ */
+export declare function getContext({ registryUri, registryOverrideUri, key, requiresKey, skipConfirmation, }: ContextSettings): Promise<CommandContext>;
+/**
+ * Retrieves dry-run context for the user-selected command
+ * @returns dry-run context for the current command
+ */
+export declare function getDryRunContext({ registryUri, registryOverrideUri, key, skipConfirmation }: ContextSettings, chain?: ChainName): Promise<CommandContext>;
+//# sourceMappingURL=context.d.ts.map

package/dist/src/context/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/context/context.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAiB,MAAM,oBAAoB,CAAC;AAQ9D,OAAO,EACL,cAAc,EACd,eAAe,EAEhB,MAAM,YAAY,CAAC;AAEpB,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,iBAchE;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,EAC/B,WAAW,EACX,mBAAmB,EACnB,GAAG,EACH,WAAW,EACX,gBAAgB,GACjB,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAiB3C;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,gBAAgB,EAAE,EAAE,eAAe,EAC5E,KAAK,CAAC,EAAE,SAAS,GAChB,OAAO,CAAC,cAAc,CAAC,CA+BzB"}

package/dist/src/context/context.js

@@ -0,0 +1,100 @@
+import { MultiProvider } from '@hyperlane-xyz/sdk';
+import { isSignCommand } from '../commands/signCommands.js';
+import { forkNetworkToMultiProvider } from '../deploy/dry-run.js';
+import { MergedRegistry } from '../registry/MergedRegistry.js';
+import { runSingleChainSelectionStep } from '../utils/chains.js';
+import { getImpersonatedSigner, getSigner } from '../utils/keys.js';
+export async function contextMiddleware(argv) {
+    const isDryRun = !!argv.dryRun;
+    const requiresKey = isSignCommand(argv);
+    const settings = {
+        registryUri: argv.registry,
+        registryOverrideUri: argv.overrides,
+        key: argv.key,
+        requiresKey,
+        skipConfirmation: argv.yes,
+    };
+    const context = isDryRun
+        ? await getDryRunContext(settings, argv.dryRun)
+        : await getContext(settings);
+    argv.context = context;
+}
+/**
+ * Retrieves context for the user-selected command
+ * @returns context for the current command
+ */
+export async function getContext({ registryUri, registryOverrideUri, key, requiresKey, skipConfirmation, }) {
+    const registry = getRegistry(registryUri, registryOverrideUri);
+    let signer = undefined;
+    if (requiresKey) {
+        ({ key, signer } = await getSigner({ key, skipConfirmation }));
+    }
+    const multiProvider = await getMultiProvider(registry, signer);
+    return {
+        registry,
+        chainMetadata: multiProvider.metadata,
+        multiProvider,
+        key,
+        signer,
+        skipConfirmation: !!skipConfirmation,
+    };
+}
+/**
+ * Retrieves dry-run context for the user-selected command
+ * @returns dry-run context for the current command
+ */
+export async function getDryRunContext({ registryUri, registryOverrideUri, key, skipConfirmation }, chain) {
+    const registry = getRegistry(registryUri, registryOverrideUri, true);
+    const chainMetadata = await registry.getMetadata();
+    if (!chain) {
+        if (skipConfirmation)
+            throw new Error('No chains provided');
+        chain = await runSingleChainSelectionStep(chainMetadata, 'Select chain to dry-run against:');
+    }
+    const multiProvider = await getMultiProvider(registry);
+    await forkNetworkToMultiProvider(multiProvider, chain);
+    const { key: impersonatedKey, signer: impersonatedSigner } = await getImpersonatedSigner({
+        key,
+        skipConfirmation,
+    });
+    multiProvider.setSharedSigner(impersonatedSigner);
+    return {
+        registry,
+        chainMetadata: multiProvider.metadata,
+        key: impersonatedKey,
+        signer: impersonatedSigner,
+        multiProvider: multiProvider,
+        skipConfirmation: !!skipConfirmation,
+        isDryRun: true,
+        dryRunChain: chain,
+    };
+}
+/**
+ * Creates a new MergedRegistry using the provided URIs
+ * The intention of the MergedRegistry is to join the common data
+ * from a primary URI (such as the Hyperlane default Github repo)
+ * and an override one (such as a local directory)
+ * @returns a new MergedRegistry
+ */
+function getRegistry(primaryRegistryUri, overrideRegistryUri, isDryRun) {
+    const registryUris = [primaryRegistryUri, overrideRegistryUri]
+        .map((r) => r.trim())
+        .filter((r) => !!r);
+    return new MergedRegistry({
+        registryUris,
+        isDryRun,
+    });
+}
+/**
+ * Retrieves a new MultiProvider based on all known chain metadata & custom user chains
+ * @param customChains Custom chains specified by the user
+ * @returns a new MultiProvider
+ */
+async function getMultiProvider(registry, signer) {
+    const chainMetadata = await registry.getMetadata();
+    const multiProvider = new MultiProvider(chainMetadata);
+    if (signer)
+        multiProvider.setSharedSigner(signer);
+    return multiProvider;
+}
+//# sourceMappingURL=context.js.map

package/dist/src/context/context.js.map

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

package/dist/src/context/types.d.ts

@@ -0,0 +1,32 @@
+import type { ethers } from 'ethers';
+import type { CommandModule } from 'yargs';
+import type { IRegistry } from '@hyperlane-xyz/registry';
+import type { ChainMap, ChainMetadata, MultiProvider } from '@hyperlane-xyz/sdk';
+export interface ContextSettings {
+    registryUri: string;
+    registryOverrideUri: string;
+    key?: string;
+    requiresKey?: boolean;
+    skipConfirmation?: boolean;
+}
+export interface CommandContext {
+    registry: IRegistry;
+    chainMetadata: ChainMap<ChainMetadata>;
+    multiProvider: MultiProvider;
+    skipConfirmation: boolean;
+    key?: string;
+    signer?: ethers.Signer;
+}
+export interface WriteCommandContext extends CommandContext {
+    key: string;
+    signer: ethers.Signer;
+    isDryRun?: boolean;
+    dryRunChain?: string;
+}
+export type CommandModuleWithContext<Args> = CommandModule<{}, Args & {
+    context: CommandContext;
+}>;
+export type CommandModuleWithWriteContext<Args> = CommandModule<{}, Args & {
+    context: WriteCommandContext;
+}>;
+//# sourceMappingURL=types.d.ts.map

package/dist/src/context/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/context/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,SAAS,CAAC;IACpB,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACzD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,wBAAwB,CAAC,IAAI,IAAI,aAAa,CACxD,EAAE,EACF,IAAI,GAAG;IAAE,OAAO,EAAE,cAAc,CAAA;CAAE,CACnC,CAAC;AAEF,MAAM,MAAM,6BAA6B,CAAC,IAAI,IAAI,aAAa,CAC7D,EAAE,EACF,IAAI,GAAG;IAAE,OAAO,EAAE,mBAAmB,CAAA;CAAE,CACxC,CAAC"}

package/dist/src/context/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/src/context/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/context/types.ts"],"names":[],"mappings":""}

package/dist/src/deploy/agent.d.ts

@@ -1,7 +1,8 @@
-export declare function runKurtosisAgentDeploy({ originChain, relayChains, chainConfigPath, agentConfigurationPath, }: {
-    originChain: string;
-    relayChains: string;
-    chainConfigPath: string;
-    agentConfigurationPath: string;
+import { CommandContext } from '../context/types.js';
+export declare function runKurtosisAgentDeploy({ context, originChain, relayChains, agentConfigurationPath, }: {
+    context: CommandContext;
+    originChain?: string;
+    relayChains?: string;
+    agentConfigurationPath?: string;
 }): Promise<void>;
 //# sourceMappingURL=agent.d.ts.map

package/dist/src/deploy/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../src/deploy/agent.ts"],"names":[],"mappings":"AAYA,wBAAsB,sBAAsB,CAAC,EAC3C,WAAW,EACX,WAAW,EACX,eAAe,EACf,sBAAsB,GACvB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,sBAAsB,EAAE,MAAM,CAAC;CAChC,iBA2DA"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../../src/deploy/agent.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAQrD,wBAAsB,sBAAsB,CAAC,EAC3C,OAAO,EACP,WAAW,EACX,WAAW,EACX,sBAAsB,GACvB,EAAE;IACD,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC,iBAyDA"}

package/dist/src/deploy/agent.js

@@ -1,21 +1,19 @@
 import terminalLink from 'terminal-link';
 import { toBase64 } from '@hyperlane-xyz/utils';
-import { getContext } from '../context.js';
 import { logBlue, logGreen } from '../logger.js';
 import { runMultiChainSelectionStep, runSingleChainSelectionStep, } from '../utils/chains.js';
 import { readJson, runFileSelectionStep } from '../utils/files.js';
-export async function runKurtosisAgentDeploy({ originChain, relayChains, chainConfigPath, agentConfigurationPath, }) {
-    const { customChains } = await getContext({ chainConfigPath });
+export async function runKurtosisAgentDeploy({ context, originChain, relayChains, agentConfigurationPath, }) {
     if (!originChain) {
-        originChain = await runSingleChainSelectionStep(customChains, 'Select the origin chain');
+        originChain = await runSingleChainSelectionStep(context.chainMetadata, 'Select the origin chain');
     }
     if (!relayChains) {
-        const selectedRelayChains = await runMultiChainSelectionStep(customChains, 'Select chains to relay between', true);
+        const selectedRelayChains = await runMultiChainSelectionStep(context.chainMetadata, 'Select chains to relay between', true);
         relayChains = selectedRelayChains.join(',');
     }
     if (!agentConfigurationPath) {
         logBlue('\n', 'No agent config json was provided. Please specify the agent config json filepath.');
-        agentConfigurationPath = await runFileSelectionStep('./artifacts', 'agent config json', 'agent-config');
+        agentConfigurationPath = await runFileSelectionStep('./configs', 'agent config json', 'agent-config');
     }
     const agentConfigObject = readJson(agentConfigurationPath);
     const hyperlanePackageArgs = {

package/dist/src/deploy/agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../src/deploy/agent.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,WAAW,EACX,WAAW,EACX,eAAe,EACf,sBAAsB,GAMvB;IACC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAE/D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,WAAW,GAAG,MAAM,2BAA2B,CAC7C,YAAY,EACZ,yBAAyB,CAC1B,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,mBAAmB,GAAG,MAAM,0BAA0B,CAC1D,YAAY,EACZ,gCAAgC,EAChC,IAAI,CACL,CAAC;QACF,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,OAAO,CACL,IAAI,EACJ,mFAAmF,CACpF,CAAC;QACF,sBAAsB,GAAG,MAAM,oBAAoB,CACjD,aAAa,EACb,mBAAmB,EACnB,cAAc,CACf,CAAC;IACJ,CAAC;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAM,sBAAsB,CAAC,CAAC;IAEhE,MAAM,oBAAoB,GAAG;QAC3B,IAAI,EAAE,IAAI;QACV,iBAAiB,EAAE,WAAW;QAC9B,YAAY,EAAE,WAAW;QACzB,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC;KACrD,CAAC;IAEF,MAAM,qBAAqB,GAAG;QAC5B,eAAe,EAAE,IAAI;QACrB,IAAI,EAAE,oBAAoB;KAC3B,CAAC;IAEF,MAAM,0BAA0B,GAAG,QAAQ,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;IACzE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,0BAA0B,CAAC,CAAC;IAEzE,MAAM,iBAAiB,GAAG,YAAY,CACpC,8BAA8B,EAC9B,gBAAgB,EAChB,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CACrC,CAAC;IAEF,QAAQ,CACN,IAAI,EACJ,0EAA0E,EAC1E,IAAI,EACJ,GAAG,iBAAiB,EAAE,CACvB,CAAC;IACF,OAAO;AACT,CAAC;AAED,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAE,EAAE,CACnD,qHAAqH,YAAY,EAAE,CAAC"}
+{"version":3,"file":"agent.js","sourceRoot":"","sources":["../../../src/deploy/agent.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,0BAA0B,EAC1B,2BAA2B,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EAC3C,OAAO,EACP,WAAW,EACX,WAAW,EACX,sBAAsB,GAMvB;IACC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,WAAW,GAAG,MAAM,2BAA2B,CAC7C,OAAO,CAAC,aAAa,EACrB,yBAAyB,CAC1B,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,mBAAmB,GAAG,MAAM,0BAA0B,CAC1D,OAAO,CAAC,aAAa,EACrB,gCAAgC,EAChC,IAAI,CACL,CAAC;QACF,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,OAAO,CACL,IAAI,EACJ,mFAAmF,CACpF,CAAC;QACF,sBAAsB,GAAG,MAAM,oBAAoB,CACjD,WAAW,EACX,mBAAmB,EACnB,cAAc,CACf,CAAC;IACJ,CAAC;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAM,sBAAsB,CAAC,CAAC;IAEhE,MAAM,oBAAoB,GAAG;QAC3B,IAAI,EAAE,IAAI;QACV,iBAAiB,EAAE,WAAW;QAC9B,YAAY,EAAE,WAAW;QACzB,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC;KACrD,CAAC;IAEF,MAAM,qBAAqB,GAAG;QAC5B,eAAe,EAAE,IAAI;QACrB,IAAI,EAAE,oBAAoB;KAC3B,CAAC;IAEF,MAAM,0BAA0B,GAAG,QAAQ,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;IACzE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,0BAA0B,CAAC,CAAC;IAEzE,MAAM,iBAAiB,GAAG,YAAY,CACpC,8BAA8B,EAC9B,gBAAgB,EAChB,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CACrC,CAAC;IAEF,QAAQ,CACN,IAAI,EACJ,0EAA0E,EAC1E,IAAI,EACJ,GAAG,iBAAiB,EAAE,CACvB,CAAC;IACF,OAAO;AACT,CAAC;AAED,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAE,EAAE,CACnD,qHAAqH,YAAY,EAAE,CAAC"}

package/dist/src/deploy/core.d.ts

@@ -1,18 +1,15 @@
 import { ChainMap, ChainName, IgpConfig, MultisigConfig } from '@hyperlane-xyz/sdk';
 import { Address } from '@hyperlane-xyz/utils';
+import { WriteCommandContext } from '../context/types.js';
 /**
  * Executes the core deploy command.
  */
-export declare function runCoreDeploy({ key, chainConfigPath, chains, ismConfigPath, hookConfigPath, artifactsPath, outPath, skipConfirmation, dryRun, }: {
-    key?: string;
-    chainConfigPath: string;
+export declare function runCoreDeploy({ context, chains, ismConfigPath, hookConfigPath, agentOutPath, }: {
+    context: WriteCommandContext;
     chains?: ChainName[];
     ismConfigPath?: string;
     hookConfigPath?: string;
-    artifactsPath?: string;
-    outPath: string;
-    skipConfirmation: boolean;
-    dryRun: string;
+    agentOutPath: string;
 }): Promise<void>;
 export declare function buildIgpConfigMap(owner: Address, chains: ChainName[], multisigConfigs: ChainMap<MultisigConfig>): ChainMap<IgpConfig>;
 //# sourceMappingURL=core.d.ts.map

package/dist/src/deploy/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/deploy/core.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,QAAQ,EACR,SAAS,EAYT,SAAS,EAIT,cAAc,EAOf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAsCpE;;GAEG;AACH,wBAAsB,aAAa,CAAC,EAClC,GAAG,EACH,eAAe,EACf,MAAM,EACN,aAAa,EACb,cAAc,EACd,aAAa,EACb,OAAO,EACP,gBAAgB,EAChB,MAAM,GACP,EAAE;IACD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB,iBA+EA;AA+QD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,SAAS,EAAE,EACnB,eAAe,EAAE,QAAQ,CAAC,cAAc,CAAC,GACxC,QAAQ,CAAC,SAAS,CAAC,CA6BrB"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/deploy/core.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EACR,SAAS,EAUT,SAAS,EAGT,cAAc,EAOf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAA+B,MAAM,sBAAsB,CAAC;AAM5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAsB1D;;GAEG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAO,EACP,MAAM,EACN,aAAa,EACb,cAAc,EACd,YAAY,GACb,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,iBA4CA;AAoPD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,SAAS,EAAE,EACnB,eAAe,EAAE,QAAQ,CAAC,cAAc,CAAC,GACxC,QAAQ,CAAC,SAAS,CAAC,CA6BrB"}

package/dist/src/deploy/core.js

@@ -1,45 +1,28 @@
 import { confirm } from '@inquirer/prompts';
 import { ethers } from 'ethers';
 import { GasOracleContractType, HyperlaneCore, HyperlaneCoreDeployer, HyperlaneIsmFactory, HyperlaneProxyFactoryDeployer, IsmType, buildAgentConfig, buildAggregationIsmConfigs, defaultMultisigConfigs, multisigIsmVerificationCost, serializeContractsMap, } from '@hyperlane-xyz/sdk';
-import { objFilter, objMerge } from '@hyperlane-xyz/utils';
-import { Command } from '../commands/deploy.js';
-import { runDeploymentArtifactStep } from '../config/artifacts.js';
+import { objFilter, objMap, objMerge } from '@hyperlane-xyz/utils';
 import { presetHookConfigs, readHooksConfigMap } from '../config/hooks.js';
 import { readIsmConfig } from '../config/ism.js';
 import { readMultisigConfig } from '../config/multisig.js';
 import { MINIMUM_CORE_DEPLOY_GAS } from '../consts.js';
-import { getContext, getDryRunContext, getMergedContractAddresses, sdkContractAddressesMap, } from '../context.js';
 import { log, logBlue, logBoldUnderlinedRed, logGray, logGreen, logRed, } from '../logger.js';
 import { runMultiChainSelectionStep } from '../utils/chains.js';
-import { getArtifactsFiles, prepNewArtifactsFiles, runFileSelectionStep, writeJson, } from '../utils/files.js';
+import { runFileSelectionStep, writeJson } from '../utils/files.js';
 import { completeDeploy, isISMConfig, isZODISMConfig, prepareDeploy, runPreflightChecksForChains, } from './utils.js';
+const CONTRACT_CACHE_EXCLUSIONS = ['interchainGasPaymaster'];
 /**
  * Executes the core deploy command.
  */
-export async function runCoreDeploy({ key, chainConfigPath, chains, ismConfigPath, hookConfigPath, artifactsPath, outPath, skipConfirmation, dryRun, }) {
-    const context = dryRun
-        ? await getDryRunContext({
-            chainConfigPath,
-            chains: [dryRun],
-            keyConfig: { key },
-            skipConfirmation,
-        })
-        : await getContext({
-            chainConfigPath,
-            keyConfig: { key },
-            skipConfirmation,
-        });
-    const customChains = context.customChains;
-    const multiProvider = context.multiProvider;
-    const signer = context.signer;
-    if (dryRun)
-        chains = context.chains;
+export async function runCoreDeploy({ context, chains, ismConfigPath, hookConfigPath, agentOutPath, }) {
+    const { chainMetadata, signer, dryRunChain, skipConfirmation } = context;
+    if (dryRunChain)
+        chains = [dryRunChain];
     else if (!chains?.length) {
         if (skipConfirmation)
             throw new Error('No chains provided');
-        chains = await runMultiChainSelectionStep(customChains, 'Select chains to connect:', true);
+        chains = await runMultiChainSelectionStep(chainMetadata, 'Select chains to connect:', true);
     }
-    const artifacts = await runArtifactStep(chains, skipConfirmation, artifactsPath);
     const result = await runIsmStep(chains, skipConfirmation, ismConfigPath);
     // we can either specify the full ISM config or just the multisig config
     const isIsmConfig = isISMConfig(result);
@@ -49,35 +32,22 @@ export async function runCoreDeploy({ key, chainConfigPath, chains, ismConfigPat
         : result;
     const hooksConfig = await runHookStep(chains, hookConfigPath);
     const deploymentParams = {
+        context,
         chains,
-        signer,
-        multiProvider,
-        artifacts,
         ismConfigs,
         multisigConfigs,
         hooksConfig,
-        outPath,
-        skipConfirmation,
-        dryRun,
+        agentOutPath,
     };
     await runDeployPlanStep(deploymentParams);
     await runPreflightChecksForChains({
         ...deploymentParams,
         minGas: MINIMUM_CORE_DEPLOY_GAS,
     });
-    const userAddress = dryRun ? key : await signer.getAddress();
-    const initialBalances = await prepareDeploy(multiProvider, userAddress, chains);
+    const userAddress = await signer.getAddress();
+    const initialBalances = await prepareDeploy(context, userAddress, chains);
     await executeDeploy(deploymentParams);
-    await completeDeploy(Command.CORE, initialBalances, multiProvider, userAddress, chains, dryRun);
-}
-function runArtifactStep(selectedChains, skipConfirmation, artifactsPath, dryRun) {
-    logBlue('\nDeployments can be totally new or can use some existing contract addresses.');
-    return runDeploymentArtifactStep({
-        artifactsPath,
-        selectedChains,
-        skipConfirmation,
-        dryRun,
-    });
+    await completeDeploy(context, 'core', initialBalances, userAddress, chains);
 }
 async function runIsmStep(selectedChains, skipConfirmation, ismConfigPath) {
     if (!ismConfigPath) {
@@ -122,13 +92,14 @@ async function runHookStep(_selectedChains, hookConfigPath) {
         return {};
     return readHooksConfigMap(hookConfigPath);
 }
-async function runDeployPlanStep({ chains, signer, artifacts, skipConfirmation, }) {
+async function runDeployPlanStep({ context, chains }) {
+    const { signer, skipConfirmation } = context;
     const address = await signer.getAddress();
     logBlue('\nDeployment plan');
     logGray('===============');
     log(`Transaction signer and owner of new contracts will be ${address}`);
     log(`Deploying to ${chains.join(', ')}`);
-    log(`There are several contracts required for each chain but contracts in the Hyperlane SDK ${artifacts ? 'or your artifacts ' : ''}will be skipped`);
+    log(`There are several contracts required for each chain but contracts in your provided registries will be skipped`);
     if (skipConfirmation)
         return;
     const isConfirmed = await confirm({
@@ -137,41 +108,38 @@ async function runDeployPlanStep({ chains, signer, artifacts, skipConfirmation,
     if (!isConfirmed)
         throw new Error('Deployment cancelled');
 }
-async function executeDeploy({ chains, signer, multiProvider, outPath, artifacts = {}, ismConfigs = {}, multisigConfigs = {}, hooksConfig = {}, dryRun, }) {
+async function executeDeploy({ context, chains, ismConfigs = {}, multisigConfigs = {}, hooksConfig = {}, agentOutPath, }) {
     logBlue('All systems ready, captain! Beginning deployment...');
-    const [contractsFilePath, agentFilePath] = prepNewArtifactsFiles(outPath, getArtifactsFiles([
-        { filename: 'core-deployment', description: 'Contract addresses' },
-        { filename: 'agent-config', description: 'Agent configs' },
-    ], dryRun));
+    const { signer, multiProvider, registry } = context;
+    let chainAddresses = await registry.getAddresses();
+    chainAddresses = filterAddressesToCache(chainAddresses);
     const owner = await signer.getAddress();
-    const mergedContractAddrs = getMergedContractAddresses(artifacts, chains);
+    let artifacts = {};
     // 1. Deploy ISM factories to all deployable chains that don't have them.
     logBlue('Deploying ISM factory contracts');
     const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer(multiProvider);
-    ismFactoryDeployer.cacheAddressesMap(mergedContractAddrs);
+    ismFactoryDeployer.cacheAddressesMap(chainAddresses);
     const ismFactoryConfig = chains.reduce((chainMap, curr) => {
         chainMap[curr] = {};
         return chainMap;
     }, {});
     const ismFactoryContracts = await ismFactoryDeployer.deploy(ismFactoryConfig);
-    artifacts = writeMergedAddresses(contractsFilePath, artifacts, ismFactoryContracts);
+    artifacts = await updateChainAddresses(registry, ismFactoryContracts, artifacts);
     logGreen('ISM factory contracts deployed');
     // Build an IsmFactory that covers all chains so that we can
     // use it to deploy ISMs to remote chains.
-    const ismFactory = HyperlaneIsmFactory.fromAddressesMap(mergedContractAddrs, multiProvider);
+    const ismFactory = HyperlaneIsmFactory.fromAddressesMap(chainAddresses, multiProvider);
     // 3. Construct ISM configs for all deployable chains
-    const ismContracts = {};
     const defaultIsms = {};
     for (const ismOrigin of chains) {
         defaultIsms[ismOrigin] =
             ismConfigs[ismOrigin] ??
                 buildIsmConfig(owner, ismOrigin, chains, multisigConfigs);
     }
-    artifacts = writeMergedAddresses(contractsFilePath, artifacts, ismContracts);
     // 4. Deploy core contracts to chains
     logBlue(`Deploying core contracts to ${chains.join(', ')}`);
     const coreDeployer = new HyperlaneCoreDeployer(multiProvider, ismFactory);
-    coreDeployer.cacheAddressesMap(mergedContractAddrs);
+    coreDeployer.cacheAddressesMap(chainAddresses);
     const coreConfigs = buildCoreConfigMap(owner, chains, defaultIsms, hooksConfig);
     const coreContracts = await coreDeployer.deploy(coreConfigs);
     // 4.5 recover the toplevel ISM address
@@ -182,14 +150,18 @@ async function executeDeploy({ chains, signer, multiProvider, outPath, artifacts
         };
     }
     artifacts = objMerge(artifacts, isms);
-    artifacts = writeMergedAddresses(contractsFilePath, artifacts, coreContracts);
+    artifacts = await updateChainAddresses(registry, coreContracts, artifacts);
     logGreen('✅ Core contracts deployed');
-    log('Writing agent configs');
-    await writeAgentConfig(agentFilePath, artifacts, chains, multiProvider);
-    logGreen('Agent configs written');
+    log(JSON.stringify(artifacts, null, 2));
+    await writeAgentConfig(context, artifacts, chains, agentOutPath);
     logBlue('Deployment is complete!');
-    logBlue(`Contract address artifacts are in ${contractsFilePath}`);
-    logBlue(`Agent configs are in ${agentFilePath}`);
+}
+function filterAddressesToCache(addressesMap) {
+    // Filter out the certain addresses that must always be
+    // deployed when deploying to a PI chain.
+    // See https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/2983
+    // And https://github.com/hyperlane-xyz/hyperlane-monorepo/pull/3183
+    return objMap(addressesMap, (_chain, addresses) => objFilter(addresses, (contract, _address) => !CONTRACT_CACHE_EXCLUSIONS.includes(contract)));
 }
 function buildIsmConfig(owner, local, chains, multisigIsmConfigs) {
     const aggregationIsmConfigs = buildAggregationIsmConfigs(local, chains, multisigIsmConfigs);
@@ -239,28 +211,44 @@ export function buildIgpConfigMap(owner, chains, multisigConfigs) {
     }
     return configMap;
 }
-function writeMergedAddresses(filePath, aAddresses, bContracts) {
-    const bAddresses = serializeContractsMap(bContracts);
-    const mergedAddresses = objMerge(aAddresses, bAddresses);
-    writeJson(filePath, mergedAddresses);
+async function updateChainAddresses(registry, newContracts, otherAddresses) {
+    let newAddresses = serializeContractsMap(newContracts);
+    // The HyperlaneCoreDeployer is returning a nested object with ISM addresses
+    // from other chains, which don't need to be in the artifacts atm.
+    newAddresses = objMap(newAddresses, (_, newChainAddresses) => {
+        // For each chain in the addresses chainmap, filter the values to those that are just strings
+        return objFilter(newChainAddresses, (_, value) => typeof value === 'string');
+    });
+    const mergedAddresses = objMerge(otherAddresses, newAddresses);
+    for (const chainName of Object.keys(newContracts)) {
+        await registry.updateChain({
+            chainName,
+            addresses: mergedAddresses[chainName],
+        });
+    }
     return mergedAddresses;
 }
-async function writeAgentConfig(filePath, artifacts, chains, multiProvider) {
+async function writeAgentConfig(context, artifacts, chains, outPath) {
+    if (context.isDryRun)
+        return;
+    log('Writing agent configs');
+    const { multiProvider, registry } = context;
     const startBlocks = {};
     const core = HyperlaneCore.fromAddressesMap(artifacts, multiProvider);
     for (const chain of chains) {
         const mailbox = core.getContracts(chain).mailbox;
         startBlocks[chain] = (await mailbox.deployedBlock()).toNumber();
     }
-    const mergedAddressesMap = objMerge(sdkContractAddressesMap, artifacts);
+    const chainAddresses = await registry.getAddresses();
     for (const chain of chains) {
-        if (!mergedAddressesMap[chain].interchainGasPaymaster) {
-            mergedAddressesMap[chain].interchainGasPaymaster =
+        if (!chainAddresses[chain].interchainGasPaymaster) {
+            chainAddresses[chain].interchainGasPaymaster =
                 ethers.constants.AddressZero;
         }
     }
     const agentConfig = buildAgentConfig(chains, // Use only the chains that were deployed to
-    multiProvider, mergedAddressesMap, startBlocks);
-    writeJson(filePath, agentConfig);
+    multiProvider, chainAddresses, startBlocks);
+    writeJson(outPath, agentConfig);
+    logGreen('Agent configs written');
 }
 //# sourceMappingURL=core.js.map