rocketh 0.10.9 → 0.10.11

package/dist/index.d.ts

@@ -1132,7 +1132,7 @@ type AccountType = AccountDefinition | {
 };
 type ResolvedAccount = {
     address: EIP1193Account;
-} & NamedSigner;
+} & Signer;
 type UnknownDeployments = Record<string, Deployment<Abi>>;
 type UnknownArtifacts = {
     [name: string]: Artifact;
@@ -1146,7 +1146,7 @@ type UnresolvedUnknownNamedAccounts = {
 type ResolvedNamedAccounts<T extends UnresolvedUnknownNamedAccounts> = {
     [Property in keyof T]: EIP1193Account;
 };
-type NamedSigner = {
+type Signer = {
     type: 'signerOnly';
     signer: EIP1193SignerProvider;
 } | {
@@ -1157,7 +1157,7 @@ type NamedSigner = {
     signer: EIP1193WalletProvider;
 };
 type ResolvedNamedSigners<T extends UnknownNamedAccounts> = {
-    [Property in keyof T]: NamedSigner;
+    [Property in keyof T]: Signer;
 };
 type UnknownDeploymentsAcrossNetworks = Record<string, UnknownDeployments>;
 type Context<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnknownNamedAccounts = UnknownNamedAccounts> = {
@@ -1219,10 +1219,11 @@ interface Environment<Artifacts extends UnknownArtifacts = UnknownArtifacts, Nam
         provider: TransactionHashTracker;
     };
     deployments: Deployments;
-    accounts: ResolvedNamedAccounts<NamedAccounts>;
-    signers: ResolvedNamedSigners<ResolvedNamedAccounts<NamedAccounts>>;
+    namedAccounts: ResolvedNamedAccounts<NamedAccounts>;
+    namedSigners: ResolvedNamedSigners<ResolvedNamedAccounts<NamedAccounts>>;
+    unnamedAccounts: EIP1193Account[];
     addressSigners: {
-        [name: `0x${string}`]: NamedSigner;
+        [name: `0x${string}`]: Signer;
     };
     artifacts: Artifacts;
     save<TAbi extends Abi = Abi>(name: string, deployment: Deployment<TAbi>): Promise<Deployment<TAbi>>;
@@ -1309,13 +1310,13 @@ type ConfigOptions = {
 declare function readConfig(options: ConfigOptions): Config;
 declare function readAndResolveConfig(options: ConfigOptions): ResolvedConfig;
 declare function resolveConfig(config: Config): ResolvedConfig;
-declare function loadEnvironment<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts>(options: ConfigOptions, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment>;
-declare function loadAndExecuteDeployments<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, ArgumentsType = undefined, Deployments extends UnknownDeployments = UnknownDeployments>(options: ConfigOptions, args?: ArgumentsType): Promise<Environment>;
-declare function executeDeployScripts<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, ArgumentsType = undefined, Deployments extends UnknownDeployments = UnknownDeployments>(config: ResolvedConfig, args?: ArgumentsType): Promise<Environment>;
+declare function loadEnvironment<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts>(options: ConfigOptions, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment<Artifacts, NamedAccounts, UnknownDeployments>>;
+declare function loadAndExecuteDeployments<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, ArgumentsType = undefined>(options: ConfigOptions, context?: ProvidedContext<Artifacts, NamedAccounts>, args?: ArgumentsType): Promise<Environment<Artifacts, NamedAccounts, UnknownDeployments>>;
+declare function executeDeployScripts<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, ArgumentsType = undefined>(config: ResolvedConfig, context?: ProvidedContext<Artifacts, NamedAccounts>, args?: ArgumentsType): Promise<Environment<Artifacts, NamedAccounts, UnknownDeployments>>;
 
 type EnvironmentExtenstion = (env: Environment) => Environment;
 declare function extendEnvironment(extension: EnvironmentExtenstion): void;
-type SignerProtocolFunction = (protocolString: string) => Promise<NamedSigner>;
+type SignerProtocolFunction = (protocolString: string) => Promise<Signer>;
 declare function handleSignerProtocol(protocol: string, getSigner: SignerProtocolFunction): void;
 
 declare function loadDeployments(deploymentsPath: string, networkName: string, onlyABIAndAddress?: boolean, expectedChain?: {
@@ -1380,4 +1381,4 @@ type RoughEstimateGasPriceResult = {
 declare function getGasPriceEstimate(provider: EIP1193ProviderWithoutEvents, options?: Partial<EstimateGasPriceOptions>): Promise<EstimateGasPriceResult>;
 declare function getRoughGasPriceEstimate(provider: EIP1193ProviderWithoutEvents, options?: Partial<RoughEstimateGasPriceOptions>): Promise<RoughEstimateGasPriceResult>;
 
-export { type Abi, type AbiConstructor, type AbiError, type AbiEvent, type AbiFallback, type AbiFunction, type AbiReceive, type AccountDefinition, type AccountType, type Artifact, type ChainType, type Config, type ConfigOptions, type Context, type CreationGasEstimate, type DeployScriptFunction, type DeployScriptModule, type Deployment, type DeploymentConstruction, type DevDoc, type DevErrorDoc, type DevEventDoc, type DevMethodDoc, type Environment, type EstimateGasPriceOptions, type EstimateGasPriceResult, type GasEstimate, type GasEstimates, type GasPrice, type Libraries, type NamedSigner, type NetworkConfig, type NoticeUserDoc, type PartialDeployment, type PendingDeployment, type PendingExecution, type PendingTransaction, type ProvidedContext, type ResolvedAccount, type ResolvedConfig, type ResolvedNamedAccounts, type ResolvedNamedSigners, type RoughEstimateGasPriceOptions, type RoughEstimateGasPriceResult, type ScriptCallback, type Storage, type StorageLayout, type TypeDef, type UnknownArtifacts, type UnknownDeployments, type UnknownDeploymentsAcrossNetworks, type UnknownNamedAccounts, type UnresolvedUnknownNamedAccounts, type UserDoc, chainById, chainTypes, execute, executeDeployScripts, extendEnvironment, getChain, getGasPriceEstimate, getRoughGasPriceEstimate, handleSignerProtocol, loadAndExecuteDeployments, loadDeployments, loadEnvironment, mergeArtifacts, readAndResolveConfig, readConfig, resolveConfig };
+export { type Abi, type AbiConstructor, type AbiError, type AbiEvent, type AbiFallback, type AbiFunction, type AbiReceive, type AccountDefinition, type AccountType, type Artifact, type ChainType, type Config, type ConfigOptions, type Context, type CreationGasEstimate, type DeployScriptFunction, type DeployScriptModule, type Deployment, type DeploymentConstruction, type DevDoc, type DevErrorDoc, type DevEventDoc, type DevMethodDoc, type Environment, type EstimateGasPriceOptions, type EstimateGasPriceResult, type GasEstimate, type GasEstimates, type GasPrice, type Libraries, type NetworkConfig, type NoticeUserDoc, type PartialDeployment, type PendingDeployment, type PendingExecution, type PendingTransaction, type ProvidedContext, type ResolvedAccount, type ResolvedConfig, type ResolvedNamedAccounts, type ResolvedNamedSigners, type RoughEstimateGasPriceOptions, type RoughEstimateGasPriceResult, type ScriptCallback, type Signer, type Storage, type StorageLayout, type TypeDef, type UnknownArtifacts, type UnknownDeployments, type UnknownDeploymentsAcrossNetworks, type UnknownNamedAccounts, type UnresolvedUnknownNamedAccounts, type UserDoc, chainById, chainTypes, execute, executeDeployScripts, extendEnvironment, getChain, getGasPriceEstimate, getRoughGasPriceEstimate, handleSignerProtocol, loadAndExecuteDeployments, loadDeployments, loadEnvironment, mergeArtifacts, readAndResolveConfig, readConfig, resolveConfig };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { j as chainById, i as chainTypes, a as execute, g as executeDeployScripts, e as extendEnvironment, k as getChain, n as getGasPriceEstimate, o as getRoughGasPriceEstimate, h as handleSignerProtocol, f as loadAndExecuteDeployments, l as loadDeployments, d as loadEnvironment, m as mergeArtifacts, b as readAndResolveConfig, r as readConfig, c as resolveConfig } from './index-DOSnToHV.mjs';
+export { j as chainById, i as chainTypes, a as execute, g as executeDeployScripts, e as extendEnvironment, k as getChain, n as getGasPriceEstimate, o as getRoughGasPriceEstimate, h as handleSignerProtocol, f as loadAndExecuteDeployments, l as loadDeployments, d as loadEnvironment, m as mergeArtifacts, b as readAndResolveConfig, r as readConfig, c as resolveConfig } from './index-Cs7zkNfV.mjs';
 import 'module';
 import 'node:fs';
 import 'node:path';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocketh",
-  "version": "0.10.9",
+  "version": "0.10.11",
   "description": "deploy smart contract on ethereum-compatible networks",
   "publishConfig": {
     "access": "public"

package/src/environment/index.ts

@@ -7,7 +7,7 @@ import {
 	Artifact,
 	Deployment,
 	Environment,
-	NamedSigner,
+	Signer,
 	PendingDeployment,
 	PendingTransaction,
 	ResolvedAccount,
@@ -48,7 +48,7 @@ export function extendEnvironment(extension: EnvironmentExtenstion): void {
 	(globalThis as any).extensions.push(extension);
 }
 
-export type SignerProtocolFunction = (protocolString: string) => Promise<NamedSigner>;
+export type SignerProtocolFunction = (protocolString: string) => Promise<Signer>;
 export type SignerProtocol = {
 	getSigner: SignerProtocolFunction;
 };
@@ -133,7 +133,9 @@ export async function createEnvironment<
 
 	const resolvedAccounts: {[name: string]: ResolvedAccount} = {};
 
+	const allRemoteAccounts = await provider.request({method: 'eth_accounts'});
 	const accountCache: {[name: string]: ResolvedAccount} = {};
+
 	async function getAccount(
 		name: string,
 		accounts: UnresolvedUnknownNamedAccounts,
@@ -144,8 +146,7 @@ export async function createEnvironment<
 		}
 		let account: ResolvedAccount | undefined;
 		if (typeof accountDef === 'number') {
-			const accounts = await provider.request({method: 'eth_accounts'});
-			const accountPerIndex = accounts[accountDef];
+			const accountPerIndex = allRemoteAccounts[accountDef];
 			if (accountPerIndex) {
 				accountCache[name] = account = {
 					type: 'remote',
@@ -240,8 +241,8 @@ export async function createEnvironment<
 	);
 
 	const namedAccounts: {[name: string]: EIP1193Account} = {};
-	const namedSigners: {[name: string]: NamedSigner} = {};
-	const addressSigners: {[name: `0x${string}`]: NamedSigner} = {};
+	const namedSigners: {[name: string]: Signer} = {};
+	const addressSigners: {[name: `0x${string}`]: Signer} = {};
 
 	for (const entry of Object.entries(resolvedAccounts)) {
 		const name = entry[0];
@@ -251,11 +252,20 @@ export async function createEnvironment<
 		namedSigners[name] = namedSigner;
 	}
 
+	const unnamedAccounts = allRemoteAccounts.filter((v) => !addressSigners[v]);
+	for (const account of unnamedAccounts) {
+		addressSigners[account] = {
+			type: 'remote',
+			signer: provider,
+		};
+	}
+
 	const perliminaryEnvironment = {
 		config,
 		deployments: deployments as Deployments,
-		accounts: namedAccounts as ResolvedNamedAccounts<NamedAccounts>,
-		signers: namedSigners as ResolvedNamedSigners<ResolvedNamedAccounts<NamedAccounts>>,
+		namedAccounts: namedAccounts as ResolvedNamedAccounts<NamedAccounts>,
+		namedSigners: namedSigners as ResolvedNamedSigners<ResolvedNamedAccounts<NamedAccounts>>,
+		unnamedAccounts,
 		addressSigners: addressSigners,
 		artifacts: context.artifacts,
 		network: {

package/src/environment/types.ts

@@ -170,7 +170,7 @@ export type AccountType =
 
 export type ResolvedAccount = {
 	address: EIP1193Account;
-} & NamedSigner;
+} & Signer;
 
 export type UnknownDeployments = Record<string, Deployment<Abi>>;
 export type UnknownArtifacts = {[name: string]: Artifact};
@@ -186,13 +186,13 @@ export type ResolvedNamedAccounts<T extends UnresolvedUnknownNamedAccounts> = {
 	[Property in keyof T]: EIP1193Account;
 };
 
-export type NamedSigner =
+export type Signer =
 	| {type: 'signerOnly'; signer: EIP1193SignerProvider}
 	| {type: 'remote'; signer: EIP1193ProviderWithoutEvents}
 	| {type: 'wallet'; signer: EIP1193WalletProvider};
 
 export type ResolvedNamedSigners<T extends UnknownNamedAccounts> = {
-	[Property in keyof T]: NamedSigner;
+	[Property in keyof T]: Signer;
 };
 
 export type UnknownDeploymentsAcrossNetworks = Record<string, UnknownDeployments>;
@@ -268,9 +268,11 @@ export interface Environment<
 		provider: TransactionHashTracker;
 	};
 	deployments: Deployments;
-	accounts: ResolvedNamedAccounts<NamedAccounts>;
-	signers: ResolvedNamedSigners<ResolvedNamedAccounts<NamedAccounts>>;
-	addressSigners: {[name: `0x${string}`]: NamedSigner};
+	namedAccounts: ResolvedNamedAccounts<NamedAccounts>;
+	namedSigners: ResolvedNamedSigners<ResolvedNamedAccounts<NamedAccounts>>;
+	unnamedAccounts: EIP1193Account[];
+	// unnamedSigners: {type: 'remote'; signer: EIP1193ProviderWithoutEvents}[];
+	addressSigners: {[name: `0x${string}`]: Signer};
 	artifacts: Artifacts;
 	save<TAbi extends Abi = Abi>(name: string, deployment: Deployment<TAbi>): Promise<Deployment<TAbi>>;
 	savePendingDeployment<TAbi extends Abi = Abi>(pendingDeployment: PendingDeployment<TAbi>): Promise<Deployment<TAbi>>;

package/src/executor/index.ts

@@ -174,7 +174,10 @@ export function resolveConfig(config: Config): ResolvedConfig {
 export async function loadEnvironment<
 	Artifacts extends UnknownArtifacts = UnknownArtifacts,
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts
->(options: ConfigOptions, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment> {
+>(
+	options: ConfigOptions,
+	context: ProvidedContext<Artifacts, NamedAccounts>
+): Promise<Environment<Artifacts, NamedAccounts, UnknownDeployments>> {
 	const resolvedConfig = readAndResolveConfig(options);
 	const {external, internal} = await createEnvironment(resolvedConfig, context);
 	return external;
@@ -183,21 +186,27 @@ export async function loadEnvironment<
 export async function loadAndExecuteDeployments<
 	Artifacts extends UnknownArtifacts = UnknownArtifacts,
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts,
-	ArgumentsType = undefined,
-	Deployments extends UnknownDeployments = UnknownDeployments
->(options: ConfigOptions, args?: ArgumentsType): Promise<Environment> {
+	ArgumentsType = undefined
+>(
+	options: ConfigOptions,
+	context?: ProvidedContext<Artifacts, NamedAccounts>,
+	args?: ArgumentsType
+): Promise<Environment<Artifacts, NamedAccounts, UnknownDeployments>> {
 	const resolvedConfig = readAndResolveConfig(options);
 	// console.log(JSON.stringify(options, null, 2));
 	// console.log(JSON.stringify(resolvedConfig, null, 2));
-	return executeDeployScripts<Artifacts, NamedAccounts, ArgumentsType, Deployments>(resolvedConfig, args);
+	return executeDeployScripts<Artifacts, NamedAccounts, ArgumentsType>(resolvedConfig, context, args);
 }
 
 export async function executeDeployScripts<
 	Artifacts extends UnknownArtifacts = UnknownArtifacts,
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts,
-	ArgumentsType = undefined,
-	Deployments extends UnknownDeployments = UnknownDeployments
->(config: ResolvedConfig, args?: ArgumentsType): Promise<Environment> {
+	ArgumentsType = undefined
+>(
+	config: ResolvedConfig,
+	context?: ProvidedContext<Artifacts, NamedAccounts>,
+	args?: ArgumentsType
+): Promise<Environment<Artifacts, NamedAccounts, UnknownDeployments>> {
 	setLogLevel(typeof config.logLevel === 'undefined' ? 0 : config.logLevel);
 
 	let filepaths;
@@ -214,7 +223,8 @@ export async function executeDeployScripts<
 			return 0;
 		});
 
-	let providedContext: ProvidedContext<Artifacts, NamedAccounts> | undefined;
+	let providedContext: ProvidedContext<Artifacts, NamedAccounts> | undefined = context;
+	const providedFromArguments = !!providedContext;
 
 	const scriptModuleByFilePath: {[filename: string]: DeployScriptModule<Artifacts, NamedAccounts, ArgumentsType>} = {};
 	const scriptPathBags: {[tag: string]: string[]} = {};
@@ -237,10 +247,12 @@ export async function executeDeployScripts<
 				}
 			}
 			scriptModuleByFilePath[scriptFilePath] = scriptModule;
-			if (providedContext && providedContext !== scriptModule.providedContext) {
-				throw new Error(`context between 2 scripts is different, please share the same across them`);
+			if (!providedFromArguments) {
+				if (providedContext && providedContext !== scriptModule.providedContext) {
+					throw new Error(`context between 2 scripts is different, please share the same across them`);
+				}
+				providedContext = scriptModule.providedContext as ProvidedContext<Artifacts, NamedAccounts>;
 			}
-			providedContext = scriptModule.providedContext as ProvidedContext<Artifacts, NamedAccounts>;
 		} catch (e) {
 			logger.error(`could not import ${filepath}`);
 			throw e;