@hyperlane-xyz/cli 7.3.0 → 8.0.0

package/dist/src/context/strategies/signer/MultiProtocolSignerManager.d.ts

@@ -0,0 +1,51 @@
+import { Signer } from 'ethers';
+import { Logger } from 'pino';
+import { ChainName, ChainSubmissionStrategy, MultiProvider } from '@hyperlane-xyz/sdk';
+import { IMultiProtocolSigner } from './BaseMultiProtocolSigner.js';
+export interface MultiProtocolSignerOptions {
+    logger?: Logger;
+    key?: string;
+}
+/**
+ * @title MultiProtocolSignerManager
+ * @dev Context manager for signers across multiple protocols
+ */
+export declare class MultiProtocolSignerManager {
+    protected readonly submissionStrategy: ChainSubmissionStrategy;
+    protected readonly chains: ChainName[];
+    protected readonly multiProvider: MultiProvider;
+    protected readonly options: MultiProtocolSignerOptions;
+    protected readonly signerStrategies: Map<ChainName, IMultiProtocolSigner>;
+    protected readonly signers: Map<ChainName, Signer>;
+    readonly logger: Logger;
+    constructor(submissionStrategy: ChainSubmissionStrategy, chains: ChainName[], multiProvider: MultiProvider, options?: MultiProtocolSignerOptions);
+    /**
+     * @notice Sets up chain-specific signer strategies
+     */
+    protected initializeStrategies(): void;
+    /**
+     * @dev Configures signers for EVM chains in MultiProvider
+     */
+    getMultiProvider(): Promise<MultiProvider>;
+    /**
+     * @notice Creates signer for specific chain
+     */
+    initSigner(chain: ChainName): Promise<Signer>;
+    /**
+     * @notice Creates signers for all chains
+     */
+    initAllSigners(): Promise<typeof this.signers>;
+    /**
+     * @notice Resolves all chain configurations
+     */
+    private resolveAllConfigs;
+    /**
+     * @notice Resolves single chain configuration
+     */
+    private resolveConfig;
+    /**
+     * @notice Gets private key from strategy
+     */
+    private extractPrivateKey;
+}
+//# sourceMappingURL=MultiProtocolSignerManager.d.ts.map

package/dist/src/context/strategies/signer/MultiProtocolSignerManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MultiProtocolSignerManager.d.ts","sourceRoot":"","sources":["../../../../../src/context/strategies/signer/MultiProtocolSignerManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EACL,SAAS,EACT,uBAAuB,EACvB,aAAa,EACd,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGpE,MAAM,WAAW,0BAA0B;IACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,qBAAa,0BAA0B;IAMnC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,uBAAuB;IAC9D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE;IACtC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B;IARxD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;IAC1E,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACnD,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAGV,kBAAkB,EAAE,uBAAuB,EAC3C,MAAM,EAAE,SAAS,EAAE,EACnB,aAAa,EAAE,aAAa,EAC5B,OAAO,GAAE,0BAA+B;IAY7D;;OAEG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAWtC;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAShD;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IASnD;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC;IAapD;;OAEG;YACW,iBAAiB;IAM/B;;OAEG;YACW,aAAa;IAuB3B;;OAEG;YACW,iBAAiB;CAehC"}

package/dist/src/context/strategies/signer/MultiProtocolSignerManager.js

@@ -0,0 +1,107 @@
+import { assert, rootLogger } from '@hyperlane-xyz/utils';
+import { ENV } from '../../../utils/env.js';
+import { MultiProtocolSignerFactory } from './MultiProtocolSignerFactory.js';
+/**
+ * @title MultiProtocolSignerManager
+ * @dev Context manager for signers across multiple protocols
+ */
+export class MultiProtocolSignerManager {
+    submissionStrategy;
+    chains;
+    multiProvider;
+    options;
+    signerStrategies;
+    signers;
+    logger;
+    constructor(submissionStrategy, chains, multiProvider, options = {}) {
+        this.submissionStrategy = submissionStrategy;
+        this.chains = chains;
+        this.multiProvider = multiProvider;
+        this.options = options;
+        this.logger =
+            options?.logger ||
+                rootLogger.child({
+                    module: 'MultiProtocolSignerManager',
+                });
+        this.signerStrategies = new Map();
+        this.signers = new Map();
+        this.initializeStrategies();
+    }
+    /**
+     * @notice Sets up chain-specific signer strategies
+     */
+    initializeStrategies() {
+        for (const chain of this.chains) {
+            const strategy = MultiProtocolSignerFactory.getSignerStrategy(chain, this.submissionStrategy, this.multiProvider);
+            this.signerStrategies.set(chain, strategy);
+        }
+    }
+    /**
+     * @dev Configures signers for EVM chains in MultiProvider
+     */
+    async getMultiProvider() {
+        for (const chain of this.chains) {
+            const signer = await this.initSigner(chain);
+            this.multiProvider.setSigner(chain, signer);
+        }
+        return this.multiProvider;
+    }
+    /**
+     * @notice Creates signer for specific chain
+     */
+    async initSigner(chain) {
+        const { privateKey } = await this.resolveConfig(chain);
+        const signerStrategy = this.signerStrategies.get(chain);
+        assert(signerStrategy, `No signer strategy found for chain ${chain}`);
+        return signerStrategy.getSigner({ privateKey });
+    }
+    /**
+     * @notice Creates signers for all chains
+     */
+    async initAllSigners() {
+        const signerConfigs = await this.resolveAllConfigs();
+        for (const { chain, privateKey } of signerConfigs) {
+            const signerStrategy = this.signerStrategies.get(chain);
+            if (signerStrategy) {
+                this.signers.set(chain, signerStrategy.getSigner({ privateKey }));
+            }
+        }
+        return this.signers;
+    }
+    /**
+     * @notice Resolves all chain configurations
+     */
+    async resolveAllConfigs() {
+        return Promise.all(this.chains.map((chain) => this.resolveConfig(chain)));
+    }
+    /**
+     * @notice Resolves single chain configuration
+     */
+    async resolveConfig(chain) {
+        const signerStrategy = this.signerStrategies.get(chain);
+        assert(signerStrategy, `No signer strategy found for chain ${chain}`);
+        let privateKey;
+        if (this.options.key) {
+            this.logger.debug(`Using private key passed via CLI --key flag for chain ${chain}`);
+            privateKey = this.options.key;
+        }
+        else if (ENV.HYP_KEY) {
+            this.logger.debug(`Using private key from .env for chain ${chain}`);
+            privateKey = ENV.HYP_KEY;
+        }
+        else {
+            privateKey = await this.extractPrivateKey(chain, signerStrategy);
+        }
+        return { chain, privateKey };
+    }
+    /**
+     * @notice Gets private key from strategy
+     */
+    async extractPrivateKey(chain, signerStrategy) {
+        const strategyConfig = await signerStrategy.getSignerConfig(chain);
+        assert(strategyConfig.privateKey, `No private key found for chain ${chain}`);
+        this.logger.debug(`Extracting private key from strategy config/user prompt for chain ${chain}`);
+        return strategyConfig.privateKey;
+    }
+}
+//# sourceMappingURL=MultiProtocolSignerManager.js.map

package/dist/src/context/strategies/signer/MultiProtocolSignerManager.js.map

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

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

@@ -1,7 +1,7 @@
 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';
+import type { ChainMap, ChainMetadata, MultiProvider, WarpCoreConfig } from '@hyperlane-xyz/sdk';
 export interface ContextSettings {
     registryUri: string;
     registryOverrideUri: string;
@@ -10,6 +10,7 @@ export interface ContextSettings {
     requiresKey?: boolean;
     disableProxy?: boolean;
     skipConfirmation?: boolean;
+    strategyPath?: string;
 }
 export interface CommandContext {
     registry: IRegistry;
@@ -17,7 +18,9 @@ export interface CommandContext {
     multiProvider: MultiProvider;
     skipConfirmation: boolean;
     key?: string;
-    signer?: ethers.Signer;
+    signerAddress?: string;
+    warpCoreConfig?: WarpCoreConfig;
+    strategyPath?: string;
 }
 export interface WriteCommandContext extends CommandContext {
     key: string;

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

@@ -1 +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,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,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"}
+{"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,EACb,cAAc,EACf,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,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;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;IAEb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;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/deploy/agent.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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,iBA0DA"}

package/dist/src/deploy/agent.js

@@ -4,8 +4,9 @@ import { logBlue, logGreen } from '../logger.js';
 import { runMultiChainSelectionStep, runSingleChainSelectionStep, } from '../utils/chains.js';
 import { readJson, runFileSelectionStep } from '../utils/files.js';
 export async function runKurtosisAgentDeploy({ context, originChain, relayChains, agentConfigurationPath, }) {
+    // Future works: decide what to do with this, since its handled in MultiChainResolver - AGENT_KURTOSIS mode
     if (!originChain) {
-        originChain = await runSingleChainSelectionStep(context.chainMetadata, 'Select the origin chain');
+        originChain = await runSingleChainSelectionStep(context.chainMetadata, 'Select the origin chain:');
     }
     if (!relayChains) {
         const selectedRelayChains = await runMultiChainSelectionStep({

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;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,CAAC;YAC3D,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,OAAO,EAAE,gCAAgC;YACzC,aAAa,EAAE,CAAC;SACjB,CAAC,CAAC;QACH,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,uDAAuD,EACvD,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,2GAA2G;IAC3G,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,WAAW,GAAG,MAAM,2BAA2B,CAC7C,OAAO,CAAC,aAAa,EACrB,0BAA0B,CAC3B,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,mBAAmB,GAAG,MAAM,0BAA0B,CAAC;YAC3D,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,OAAO,EAAE,gCAAgC;YACzC,aAAa,EAAE,CAAC;SACjB,CAAC,CAAC;QACH,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,uDAAuD,EACvD,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.js

@@ -13,7 +13,7 @@ import { completeDeploy, prepareDeploy, runDeployPlanStep, runPreflightChecksFor
 export async function runCoreDeploy(params) {
     const { context, config } = params;
     let chain = params.chain;
-    const { signer, isDryRun, chainMetadata, dryRunChain, registry, skipConfirmation, multiProvider, } = context;
+    const { isDryRun, chainMetadata, dryRunChain, registry, skipConfirmation, multiProvider, } = context;
     // Select a dry-run chain if it's not supplied
     if (dryRunChain) {
         chain = dryRunChain;
@@ -26,8 +26,9 @@ export async function runCoreDeploy(params) {
     let apiKeys = {};
     if (!skipConfirmation)
         apiKeys = await requestAndSaveApiKeys([chain], chainMetadata, registry);
+    const signer = multiProvider.getSigner(chain);
     const deploymentParams = {
-        context,
+        context: { ...context, signer },
         chain,
         config,
     };

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

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

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

@@ -14,6 +14,6 @@ export declare function runDeployPlanStep({ context, chain, }: {
 }): Promise<void>;
 export declare function isISMConfig(config: ChainMap<MultisigConfig> | ChainMap<IsmConfig>): boolean;
 export declare function isZODISMConfig(filepath: string): boolean;
-export declare function prepareDeploy(context: WriteCommandContext, userAddress: Address, chains: ChainName[]): Promise<Record<string, BigNumber>>;
-export declare function completeDeploy(context: WriteCommandContext, command: string, initialBalances: Record<string, BigNumber>, userAddress: Address, chains: ChainName[]): Promise<void>;
+export declare function prepareDeploy(context: WriteCommandContext, userAddress: Address | null, chains: ChainName[]): Promise<Record<string, BigNumber>>;
+export declare function completeDeploy(context: WriteCommandContext, command: string, initialBalances: Record<string, BigNumber>, userAddress: Address | null, chains: ChainName[]): Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/deploy/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAE3C,OAAO,EACL,QAAQ,EAER,SAAS,EACT,SAAS,EACT,cAAc,EAEf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAgB,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAAkB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAe1E,wBAAsB,2BAA2B,CAAC,EAChD,OAAO,EACP,MAAM,EACN,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IAGf,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;CAChC,iBAsBA;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,KAAK,GACN,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,KAAK,EAAE,SAAS,CAAC;CAClB,iBAsBA;AAoBD,wBAAgB,WAAW,CACzB,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,GACrD,OAAO,CAET;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,SAAS,EAAE,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAapC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAC1C,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,SAAS,EAAE,iBAqBpB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/deploy/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAE3C,OAAO,EACL,QAAQ,EAER,SAAS,EACT,SAAS,EACT,cAAc,EAEf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAgB,MAAM,sBAAsB,CAAC;AAG7D,OAAO,EAAkB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAe1E,wBAAsB,2BAA2B,CAAC,EAChD,OAAO,EACP,MAAM,EACN,MAAM,EACN,gBAAgB,GACjB,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IAGf,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;CAChC,iBAsBA;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,KAAK,GACN,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,KAAK,EAAE,SAAS,CAAC;CAClB,iBA2BA;AAoBD,wBAAgB,WAAW,CACzB,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,GACrD,OAAO,CAET;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,OAAO,GAAG,IAAI,EAC3B,MAAM,EAAE,SAAS,EAAE,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAepC;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAC1C,WAAW,EAAE,OAAO,GAAG,IAAI,EAC3B,MAAM,EAAE,SAAS,EAAE,iBAuBpB"}

package/dist/src/deploy/utils.js

@@ -10,7 +10,7 @@ import { assertSigner } from '../utils/keys.js';
 import { completeDryRun } from './dry-run.js';
 export async function runPreflightChecksForChains({ context, chains, minGas, chainsToGasCheck, }) {
     log('Running pre-flight checks for chains...');
-    const { signer, multiProvider } = context;
+    const { multiProvider, skipConfirmation } = context;
     if (!chains?.length)
         throw new Error('Empty chain selection');
     for (const chain of chains) {
@@ -19,15 +19,16 @@ export async function runPreflightChecksForChains({ context, chains, minGas, cha
             throw new Error(`No chain config found for ${chain}`);
         if (metadata.protocol !== ProtocolType.Ethereum)
             throw new Error('Only Ethereum chains are supported for now');
+        const signer = multiProvider.getSigner(chain);
+        assertSigner(signer);
+        logGreen(`✅ ${chain} signer is valid`);
     }
     logGreen('✅ Chains are valid');
-    assertSigner(signer);
-    logGreen('✅ Signer is valid');
-    await nativeBalancesAreSufficient(multiProvider, signer, chainsToGasCheck ?? chains, minGas);
+    await nativeBalancesAreSufficient(multiProvider, chainsToGasCheck ?? chains, minGas, skipConfirmation);
 }
 export async function runDeployPlanStep({ context, chain, }) {
-    const { signer, chainMetadata: chainMetadataMap, skipConfirmation } = context;
-    const address = await signer.getAddress();
+    const { chainMetadata: chainMetadataMap, multiProvider, skipConfirmation, } = context;
+    const address = await multiProvider.getSigner(chain).getAddress();
     logBlue('\nDeployment plan');
     logGray('===============');
     log(`Transaction signer and owner of new contracts: ${address}`);
@@ -71,7 +72,8 @@ export async function prepareDeploy(context, userAddress, chains) {
         const provider = isDryRun
             ? getLocalProvider(ENV.ANVIL_IP_ADDR, ENV.ANVIL_PORT)
             : multiProvider.getProvider(chain);
-        const currentBalance = await provider.getBalance(userAddress);
+        const address = userAddress ?? (await multiProvider.getSigner(chain).getAddress());
+        const currentBalance = await provider.getBalance(address);
         initialBalances[chain] = currentBalance;
     }));
     return initialBalances;
@@ -84,7 +86,8 @@ export async function completeDeploy(context, command, initialBalances, userAddr
         const provider = isDryRun
             ? getLocalProvider(ENV.ANVIL_IP_ADDR, ENV.ANVIL_PORT)
             : multiProvider.getProvider(chain);
-        const currentBalance = await provider.getBalance(userAddress);
+        const address = userAddress ?? (await multiProvider.getSigner(chain).getAddress());
+        const currentBalance = await provider.getBalance(address);
         const balanceDelta = initialBalances[chain].sub(currentBalance);
         if (isDryRun && balanceDelta.lt(0))
             break;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/deploy/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/deploy/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAa,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAML,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAW,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EACL,GAAG,EACH,OAAO,EACP,OAAO,EACP,QAAQ,EACR,OAAO,EACP,QAAQ,GACT,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,EAChD,OAAO,EACP,MAAM,EACN,MAAM,EACN,gBAAgB,GAQjB;IACC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IAC/C,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAEpD,IAAI,CAAC,MAAM,EAAE,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,aAAa,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,EAAE,CAAC,CAAC;QACrE,IAAI,QAAQ,CAAC,QAAQ,KAAK,YAAY,CAAC,QAAQ;YAC7C,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9C,YAAY,CAAC,MAAM,CAAC,CAAC;QACrB,QAAQ,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC;IACzC,CAAC;IACD,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAE/B,MAAM,2BAA2B,CAC/B,aAAa,EACb,gBAAgB,IAAI,MAAM,EAC1B,MAAM,EACN,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,KAAK,GAIN;IACC,MAAM,EACJ,aAAa,EAAE,gBAAgB,EAC/B,aAAa,EACb,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC;IAElE,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC7B,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3B,GAAG,CAAC,kDAAkD,OAAO,EAAE,CAAC,CAAC;IACjE,GAAG,CAAC,wCAAwC,KAAK,EAAE,CAAC,CAAC;IACrD,MAAM,wBAAwB,GAAG,gCAAgC,CAC/D,gBAAgB,CAAC,KAAK,CAAC,CACxB,CAAC;IACF,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IACnC,GAAG,CACD,uHAAuH,CACxH,CAAC;IAEF,IAAI,gBAAgB;QAAE,OAAO;IAC7B,MAAM,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC;QAChC,OAAO,EAAE,kCAAkC;KAC5C,CAAC,CAAC;IACH,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;AAC5D,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAuB,EACvB,KAAgB;IAEhB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAClE,IAAI,SAAS,EAAE,OAAO,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC;YAChC,OAAO,EAAE,6BAA6B,SAAS,CAAC,OAAO,4FAA4F;YACnJ,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;AACH,CAAC;AAED,oBAAoB;AACpB,MAAM,UAAU,WAAW,CACzB,MAAsD;IAEtD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,yBAAyB;AACzB,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA4B,EAC5B,WAA2B,EAC3B,MAAmB;IAEnB,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC5C,MAAM,eAAe,GAA8B,EAAE,CAAC;IACtD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAgB,EAAE,EAAE;QACpC,MAAM,QAAQ,GAAG,QAAQ;YACvB,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;YACrD,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,OAAO,GACX,WAAW,IAAI,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;QACrE,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC1D,eAAe,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC;IAC1C,CAAC,CAAC,CACH,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAA4B,EAC5B,OAAe,EACf,eAA0C,EAC1C,WAA2B,EAC3B,MAAmB;IAEnB,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC5C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC1D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,QAAQ;YACvB,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;YACrD,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,OAAO,GACX,WAAW,IAAI,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;QACrE,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,QAAQ,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;YAAE,MAAM;QAC1C,OAAO,CACL,wBAAwB,OAAO,IAC7B,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QACzB,OAAO,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,IACrD,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,MAAM,IAAI,KAC/D,EAAE,CACH,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QAAE,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,gCAAgC,CAAC,aAA4B;IACpE,OAAO;QACL,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,cAAc,EAAE,aAAa,CAAC,WAAW;QACzC,UAAU,EAAE,aAAa,CAAC,OAAO;QACjC,WAAW,EAAE,aAAa,CAAC,QAAQ;QACnC,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;QAC7C,sBAAsB,EAAE,aAAa,CAAC,WAAW,EAAE,MAAM;QACzD,oBAAoB,EAAE,aAAa,CAAC,WAAW,EAAE,IAAI;QACrD,wBAAwB,EAAE,aAAa,CAAC,WAAW,EAAE,QAAQ;KAC9D,CAAC;AACJ,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../../src/deploy/warp.ts"],"names":[],"mappings":"AAMA,OAAO,EAKL,uBAAuB,EA6BvB,cAAc,EAEd,qBAAqB,EAStB,MAAM,oBAAoB,CAAC;AAe5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAiB1D,UAAU,YAAY;IACpB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,gBAAgB,EAAE,qBAAqB,CAAC;CACzC;AAED,UAAU,eAAgB,SAAQ,YAAY;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,kBAAkB,CAAC,EACvC,OAAO,EACP,6BAA6B,GAC9B,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,6BAA6B,CAAC,EAAE,MAAM,CAAC;CACxC,iBAuEA;AAiRD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAuCf;AAuHD;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,0BAA0B,EAAE,MAAM,GACjC,uBAAuB,CAKzB"}
+{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../../src/deploy/warp.ts"],"names":[],"mappings":"AAOA,OAAO,EAKL,uBAAuB,EAgCvB,cAAc,EAEd,qBAAqB,EAQtB,MAAM,oBAAoB,CAAC;AAe5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAiB1D,UAAU,YAAY;IACpB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,gBAAgB,EAAE,qBAAqB,CAAC;CACzC;AAED,UAAU,eAAgB,SAAQ,YAAY;IAC5C,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,kBAAkB,CAAC,EACvC,OAAO,EACP,6BAA6B,GAC9B,EAAE;IACD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,6BAA6B,CAAC,EAAE,MAAM,CAAC;CACxC,iBA4DA;AAsVD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAuCf;AAuHD;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,0BAA0B,EAAE,MAAM,GACjC,uBAAuB,CAKzB"}

package/dist/src/deploy/warp.js

@@ -1,8 +1,9 @@
 import { confirm } from '@inquirer/prompts';
 import { groupBy } from 'lodash-es';
 import { stringify as yamlStringify } from 'yaml';
+import { ProxyAdmin__factory } from '@hyperlane-xyz/core';
 import { buildArtifact as coreBuildArtifact } from '@hyperlane-xyz/core/buildArtifact.js';
-import { ChainSubmissionStrategySchema, ContractVerifier, EvmERC20WarpModule, EvmERC20WarpRouteReader, EvmIsmModule, ExplorerLicenseType, HypERC20Deployer, HypERC721Deployer, HyperlaneProxyFactoryDeployer, IsmType, TOKEN_TYPE_TO_STANDARD, TxSubmitterType, WarpCoreConfigSchema, WarpRouteDeployConfigSchema, attachContractsMap, connectContractsMap, getTokenConnectionId, hypERC20factories, isCollateralConfig, isTokenMetadata, serializeContracts, } from '@hyperlane-xyz/sdk';
+import { ChainSubmissionStrategySchema, ContractVerifier, EvmERC20WarpModule, EvmERC20WarpRouteReader, EvmHookModule, EvmIsmModule, ExplorerLicenseType, HypERC20Deployer, HypERC721Deployer, HyperlaneProxyFactoryDeployer, IsmType, TOKEN_TYPE_TO_STANDARD, TxSubmitterType, WarpCoreConfigSchema, WarpRouteDeployConfigSchema, attachContractsMap, connectContractsMap, getTokenConnectionId, hypERC20factories, isCollateralTokenConfig, isTokenMetadata, } from '@hyperlane-xyz/sdk';
 import { ProtocolType, assert, objFilter, objKeys, objMap, promiseObjAll, retryAsync, } from '@hyperlane-xyz/utils';
 import { readWarpRouteDeployConfig } from '../config/warp.js';
 import { MINIMUM_WARP_DEPLOY_GAS } from '../consts.js';
@@ -12,7 +13,7 @@ import { getSubmitterBuilder } from '../submit/submit.js';
 import { indentYamlOrJson, isFile, readYamlOrJson, runFileSelectionStep, writeYamlOrJson, } from '../utils/files.js';
 import { completeDeploy, prepareDeploy, runPreflightChecksForChains, } from './utils.js';
 export async function runWarpRouteDeploy({ context, warpRouteDeploymentConfigPath, }) {
-    const { signer, skipConfirmation, chainMetadata, registry } = context;
+    const { skipConfirmation, chainMetadata, registry } = context;
     if (!warpRouteDeploymentConfigPath ||
         !isFile(warpRouteDeploymentConfigPath)) {
         if (skipConfirmation)
@@ -39,12 +40,11 @@ export async function runWarpRouteDeploy({ context, warpRouteDeploymentConfigPat
         chains: ethereumChains,
         minGas: MINIMUM_WARP_DEPLOY_GAS,
     });
-    const userAddress = await signer.getAddress();
-    const initialBalances = await prepareDeploy(context, userAddress, ethereumChains);
+    const initialBalances = await prepareDeploy(context, null, ethereumChains);
     const deployedContracts = await executeDeploy(deploymentParams, apiKeys);
     const warpCoreConfig = await getWarpCoreConfig(deploymentParams, deployedContracts);
     await writeDeploymentArtifacts(warpCoreConfig, context);
-    await completeDeploy(context, 'warp', initialBalances, userAddress, ethereumChains);
+    await completeDeploy(context, 'warp', initialBalances, null, ethereumChains);
 }
 async function runDeployPlanStep({ context, warpDeployConfig }) {
     const { skipConfirmation } = context;
@@ -59,7 +59,7 @@ async function runDeployPlanStep({ context, warpDeployConfig }) {
 }
 async function executeDeploy(params, apiKeys) {
     logBlue('🚀 All systems ready, captain! Beginning deployment...');
-    const { warpDeployConfig, context: { registry, multiProvider, isDryRun, dryRunChain }, } = params;
+    const { warpDeployConfig, context: { multiProvider, isDryRun, dryRunChain }, } = params;
     const deployer = warpDeployConfig.isNft
         ? new HypERC721Deployer(multiProvider)
         : new HypERC20Deployer(multiProvider); // TODO: replace with EvmERC20WarpModule
@@ -69,8 +69,8 @@ async function executeDeploy(params, apiKeys) {
     const contractVerifier = new ContractVerifier(multiProvider, apiKeys, coreBuildArtifact, ExplorerLicenseType.MIT);
     const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer(multiProvider, contractVerifier);
     // For each chain in WarpRouteConfig, deploy each Ism Factory, if it's not in the registry
-    // Then return a modified config with the ism address as a string
-    const modifiedConfig = await deployAndResolveWarpIsm(config, multiProvider, registry, ismFactoryDeployer, contractVerifier);
+    // Then return a modified config with the ism and/or hook address as a string
+    const modifiedConfig = await resolveWarpIsmAndHook(config, params.context, ismFactoryDeployer, contractVerifier);
     const deployedContracts = await deployer.deploy(modifiedConfig);
     logGreen('✅ Warp contract deployments complete');
     return deployedContracts;
@@ -82,33 +82,29 @@ async function writeDeploymentArtifacts(warpCoreConfig, context) {
     }
     log(indentYamlOrJson(yamlStringify(warpCoreConfig, null, 2), 4));
 }
-async function deployAndResolveWarpIsm(warpConfig, multiProvider, registry, ismFactoryDeployer, contractVerifier) {
+async function resolveWarpIsmAndHook(warpConfig, context, ismFactoryDeployer, contractVerifier) {
     return promiseObjAll(objMap(warpConfig, async (chain, config) => {
-        if (!config.interchainSecurityModule ||
-            typeof config.interchainSecurityModule === 'string') {
-            logGray(`Config Ism is ${!config.interchainSecurityModule
-                ? 'empty'
-                : config.interchainSecurityModule}, skipping deployment.`);
-            return config;
-        }
-        logBlue(`Loading registry factory addresses for ${chain}...`);
-        let chainAddresses = await registry.getChainAddresses(chain);
+        const chainAddresses = await context.registry.getChainAddresses(chain);
         if (!chainAddresses) {
-            logGray(`Registry factory addresses not found for ${chain}. Deploying...`);
-            chainAddresses = serializeContracts(await ismFactoryDeployer.deployContracts(chain));
+            throw `Registry factory addresses not found for ${chain}.`;
         }
-        logGray(`Creating ${config.interchainSecurityModule.type} ISM for ${config.type} token on ${chain} chain...`);
-        const deployedIsm = await createWarpIsm(chain, warpConfig, multiProvider, {
-            domainRoutingIsmFactory: chainAddresses.domainRoutingIsmFactory,
-            staticAggregationHookFactory: chainAddresses.staticAggregationHookFactory,
-            staticAggregationIsmFactory: chainAddresses.staticAggregationIsmFactory,
-            staticMerkleRootMultisigIsmFactory: chainAddresses.staticMerkleRootMultisigIsmFactory,
-            staticMessageIdMultisigIsmFactory: chainAddresses.staticMessageIdMultisigIsmFactory,
-            staticMerkleRootWeightedMultisigIsmFactory: chainAddresses.staticMerkleRootWeightedMultisigIsmFactory,
-            staticMessageIdWeightedMultisigIsmFactory: chainAddresses.staticMessageIdWeightedMultisigIsmFactory,
-        }, contractVerifier);
-        logGreen(`Finished creating ${config.interchainSecurityModule.type} ISM for ${config.type} token on ${chain} chain.`);
-        return { ...warpConfig[chain], interchainSecurityModule: deployedIsm };
+        config.interchainSecurityModule = await createWarpIsm({
+            chain,
+            chainAddresses,
+            context,
+            contractVerifier,
+            ismFactoryDeployer,
+            warpConfig: config,
+        }); // TODO write test
+        config.hook = await createWarpHook({
+            chain,
+            chainAddresses,
+            context,
+            contractVerifier,
+            ismFactoryDeployer,
+            warpConfig: config,
+        });
+        return config;
     }));
 }
 /**
@@ -116,12 +112,21 @@ async function deployAndResolveWarpIsm(warpConfig, multiProvider, registry, ismF
  *
  * @returns The deployed ism address
  */
-async function createWarpIsm(chain, warpConfig, multiProvider, factoryAddresses, contractVerifier) {
-    const { domainRoutingIsmFactory, staticAggregationHookFactory, staticAggregationIsmFactory, staticMerkleRootMultisigIsmFactory, staticMessageIdMultisigIsmFactory, staticMerkleRootWeightedMultisigIsmFactory, staticMessageIdWeightedMultisigIsmFactory, } = factoryAddresses;
+async function createWarpIsm({ chain, chainAddresses, context, contractVerifier, warpConfig, }) {
+    const { interchainSecurityModule } = warpConfig;
+    if (!interchainSecurityModule ||
+        typeof interchainSecurityModule === 'string') {
+        logGray(`Config Ism is ${!interchainSecurityModule ? 'empty' : interchainSecurityModule}, skipping deployment.`);
+        return interchainSecurityModule;
+    }
+    logBlue(`Loading registry factory addresses for ${chain}...`);
+    logGray(`Creating ${interchainSecurityModule.type} ISM for token on ${chain} chain...`);
+    logGreen(`Finished creating ${interchainSecurityModule.type} ISM for token on ${chain} chain.`);
+    const { mailbox, domainRoutingIsmFactory, staticAggregationHookFactory, staticAggregationIsmFactory, staticMerkleRootMultisigIsmFactory, staticMessageIdMultisigIsmFactory, staticMerkleRootWeightedMultisigIsmFactory, staticMessageIdWeightedMultisigIsmFactory, } = chainAddresses;
     const evmIsmModule = await EvmIsmModule.create({
         chain,
-        multiProvider,
-        mailbox: warpConfig[chain].mailbox,
+        mailbox,
+        multiProvider: context.multiProvider,
         proxyFactoryFactories: {
             domainRoutingIsmFactory,
             staticAggregationHookFactory,
@@ -131,12 +136,48 @@ async function createWarpIsm(chain, warpConfig, multiProvider, factoryAddresses,
             staticMerkleRootWeightedMultisigIsmFactory,
             staticMessageIdWeightedMultisigIsmFactory,
         },
-        config: warpConfig[chain].interchainSecurityModule,
+        config: interchainSecurityModule,
         contractVerifier,
     });
     const { deployedIsm } = evmIsmModule.serialize();
     return deployedIsm;
 }
+async function createWarpHook({ chain, chainAddresses, context, contractVerifier, warpConfig, }) {
+    const { hook } = warpConfig;
+    if (!hook || typeof hook === 'string') {
+        logGray(`Config Hook is ${!hook ? 'empty' : hook}, skipping deployment.`);
+        return hook;
+    }
+    logBlue(`Loading registry factory addresses for ${chain}...`);
+    logGray(`Creating ${hook.type} Hook for token on ${chain} chain...`);
+    const { mailbox, domainRoutingIsmFactory, staticAggregationHookFactory, staticAggregationIsmFactory, staticMerkleRootMultisigIsmFactory, staticMessageIdMultisigIsmFactory, staticMerkleRootWeightedMultisigIsmFactory, staticMessageIdWeightedMultisigIsmFactory, } = chainAddresses;
+    const proxyFactoryFactories = {
+        domainRoutingIsmFactory,
+        staticAggregationHookFactory,
+        staticAggregationIsmFactory,
+        staticMerkleRootMultisigIsmFactory,
+        staticMessageIdMultisigIsmFactory,
+        staticMerkleRootWeightedMultisigIsmFactory,
+        staticMessageIdWeightedMultisigIsmFactory,
+    };
+    // If config.proxyadmin.address exists, then use that. otherwise deploy a new proxyAdmin
+    const proxyAdminAddress = warpConfig.proxyAdmin?.address ??
+        (await context.multiProvider.handleDeploy(chain, new ProxyAdmin__factory(), [])).address;
+    const evmHookModule = await EvmHookModule.create({
+        chain,
+        multiProvider: context.multiProvider,
+        coreAddresses: {
+            mailbox,
+            proxyAdmin: proxyAdminAddress,
+        },
+        config: hook,
+        contractVerifier,
+        proxyFactoryFactories,
+    });
+    logGreen(`Finished creating ${hook.type} Hook for token on ${chain} chain.`);
+    const { deployedHook } = evmHookModule.serialize();
+    return deployedHook;
+}
 async function getWarpCoreConfig({ warpDeployConfig, context }, contracts) {
     const warpCoreConfig = { tokens: [] };
     // TODO: replace with warp read
@@ -154,7 +195,7 @@ async function getWarpCoreConfig({ warpDeployConfig, context }, contracts) {
 function generateTokenConfigs(warpCoreConfig, warpDeployConfig, contracts, symbol, name, decimals) {
     for (const [chainName, contract] of Object.entries(contracts)) {
         const config = warpDeployConfig[chainName];
-        const collateralAddressOrDenom = isCollateralConfig(config)
+        const collateralAddressOrDenom = isCollateralTokenConfig(config)
             ? config.token // gets set in the above deriveTokenMetadata()
             : undefined;
         warpCoreConfig.tokens.push({