rocketh 0.9.2 → 0.10.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { EIP1193Account, EIP1193DATA, EIP1193QUANTITY, EIP1193SignerProvider, EIP1193ProviderWithoutEvents, EIP1193WalletProvider, EIP1193TransactionReceipt } from 'eip-1193';
+import { EIP1193Account, EIP1193DATA, EIP1193QUANTITY, EIP1193SignerProvider, EIP1193ProviderWithoutEvents, EIP1193WalletProvider, EIP1193TransactionReceipt, EIP1193GenericRequestProvider } from 'eip-1193';
 import * as abitype from 'abitype';
 import { Abi, Narrow } from 'abitype';
 export { Abi, AbiConstructor, AbiError, AbiEvent, AbiFallback, AbiFunction, AbiReceive } from 'abitype';
@@ -197,27 +197,38 @@ type Context<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccount
     accounts: NamedAccounts;
     artifacts: Artifacts;
 };
-type BaseConfig = {
-    networkName?: string;
+type NetworkConfigBase = {
+    name: string;
+    tags: string[];
+    fork?: boolean;
+};
+type NetworkConfigForJSONRPC = NetworkConfigBase & {
+    nodeUrl: string;
+};
+type NetworkConfigForEIP1193Provider = NetworkConfigBase & {
+    provider: EIP1193ProviderWithoutEvents;
+};
+type NetworkConfig = NetworkConfigForJSONRPC | NetworkConfigForEIP1193Provider;
+type Config = {
+    network: NetworkConfig;
+    networkTags?: string[];
     scripts?: string;
     deployments?: string;
+    saveDeployments?: boolean;
     tags?: string[];
     logLevel?: number;
     gasPricing?: {};
 };
-type ConfigForJSONRPC = BaseConfig & {
-    networkName: string;
-    nodeUrl: string;
-};
-type ConfigForEIP1193Provider = BaseConfig & {
-    provider: EIP1193ProviderWithoutEvents;
-};
-type Config = ConfigForJSONRPC | ConfigForEIP1193Provider;
 type ResolvedConfig = Config & {
     deployments: string;
     scripts: string;
     tags: string[];
-    networkName: string;
+    network: {
+        name: string;
+        tags: string[];
+        fork?: boolean;
+    };
+    saveDeployments?: boolean;
 };
 interface Environment<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Deployments extends UnknownDeployments = UnknownDeployments> {
     config: ResolvedConfig;
@@ -304,20 +315,22 @@ declare function execute<Artifacts extends UnknownArtifacts = UnknownArtifacts,
     dependencies?: string[];
 }): DeployScriptModule<Artifacts, NamedAccounts, ArgumentsType, Deployments>;
 type ConfigOptions = {
-    network: string;
+    network?: string | {
+        fork: string;
+    };
     deployments?: string;
     scripts?: string;
     tags?: string;
-};
-declare function readConfig(options: ConfigOptions, extra?: {
-    ignoreMissingRPC?: boolean;
-}): Config;
-declare function readAndResolveConfig(options: ConfigOptions, extra?: {
+    logLevel?: number;
+    provider?: EIP1193ProviderWithoutEvents | EIP1193GenericRequestProvider;
     ignoreMissingRPC?: boolean;
-}): ResolvedConfig;
+    saveDeployments?: boolean;
+};
+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>(config: Config, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment>;
-declare function loadAndExecuteDeployments<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, ArgumentsType = undefined, Deployments extends UnknownDeployments = UnknownDeployments>(config: Config, args?: ArgumentsType): Promise<Environment>;
+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>;
 
 type EnvironmentExtenstion = (env: Environment) => Environment;
@@ -325,7 +338,7 @@ declare function extendEnvironment(extension: EnvironmentExtenstion): void;
 type SignerProtocolFunction = (protocolString: string) => Promise<NamedSigner>;
 declare function handleSignerProtocol(protocol: string, getSigner: SignerProtocolFunction): void;
 
-declare function loadDeployments(deploymentsPath: string, subPath: string, onlyABIAndAddress?: boolean, expectedChain?: {
+declare function loadDeployments(deploymentsPath: string, networkName: string, onlyABIAndAddress?: boolean, expectedChain?: {
     chainId: string;
     genesisHash?: `0x${string}`;
     deleteDeploymentsIfDifferentGenesisHash?: boolean;
@@ -358,4 +371,4 @@ declare const chainById: {
 };
 declare function getChain(id: string): Chain$1;
 
-export { type AccountDefinition, type AccountType, type Artifact, 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 GasEstimate, type GasEstimates, type Libraries, type NamedSigner, type NoticeUserDoc, type PartialDeployment, type PendingDeployment, type PendingExecution, type PendingTransaction, type ProvidedContext, type ResolvedAccount, type ResolvedConfig, type ResolvedNamedAccounts, type ResolvedNamedSigners, type ScriptCallback, type Storage, type StorageLayout, type TypeDef, type UnknownArtifacts, type UnknownDeployments, type UnknownDeploymentsAcrossNetworks, type UnknownNamedAccounts, type UnresolvedUnknownNamedAccounts, type UserDoc, chainById, execute, executeDeployScripts, extendEnvironment, getChain, handleSignerProtocol, loadAndExecuteDeployments, loadDeployments, loadEnvironment, mergeArtifacts, readAndResolveConfig, readConfig, resolveConfig };
+export { type AccountDefinition, type AccountType, type Artifact, 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 GasEstimate, type GasEstimates, 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 ScriptCallback, type Storage, type StorageLayout, type TypeDef, type UnknownArtifacts, type UnknownDeployments, type UnknownDeploymentsAcrossNetworks, type UnknownNamedAccounts, type UnresolvedUnknownNamedAccounts, type UserDoc, chainById, execute, executeDeployScripts, extendEnvironment, getChain, handleSignerProtocol, loadAndExecuteDeployments, loadDeployments, loadEnvironment, mergeArtifacts, readAndResolveConfig, readConfig, resolveConfig };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { EIP1193Account, EIP1193DATA, EIP1193QUANTITY, EIP1193SignerProvider, EIP1193ProviderWithoutEvents, EIP1193WalletProvider, EIP1193TransactionReceipt } from 'eip-1193';
+import { EIP1193Account, EIP1193DATA, EIP1193QUANTITY, EIP1193SignerProvider, EIP1193ProviderWithoutEvents, EIP1193WalletProvider, EIP1193TransactionReceipt, EIP1193GenericRequestProvider } from 'eip-1193';
 import * as abitype from 'abitype';
 import { Abi, Narrow } from 'abitype';
 export { Abi, AbiConstructor, AbiError, AbiEvent, AbiFallback, AbiFunction, AbiReceive } from 'abitype';
@@ -197,27 +197,38 @@ type Context<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccount
     accounts: NamedAccounts;
     artifacts: Artifacts;
 };
-type BaseConfig = {
-    networkName?: string;
+type NetworkConfigBase = {
+    name: string;
+    tags: string[];
+    fork?: boolean;
+};
+type NetworkConfigForJSONRPC = NetworkConfigBase & {
+    nodeUrl: string;
+};
+type NetworkConfigForEIP1193Provider = NetworkConfigBase & {
+    provider: EIP1193ProviderWithoutEvents;
+};
+type NetworkConfig = NetworkConfigForJSONRPC | NetworkConfigForEIP1193Provider;
+type Config = {
+    network: NetworkConfig;
+    networkTags?: string[];
     scripts?: string;
     deployments?: string;
+    saveDeployments?: boolean;
     tags?: string[];
     logLevel?: number;
     gasPricing?: {};
 };
-type ConfigForJSONRPC = BaseConfig & {
-    networkName: string;
-    nodeUrl: string;
-};
-type ConfigForEIP1193Provider = BaseConfig & {
-    provider: EIP1193ProviderWithoutEvents;
-};
-type Config = ConfigForJSONRPC | ConfigForEIP1193Provider;
 type ResolvedConfig = Config & {
     deployments: string;
     scripts: string;
     tags: string[];
-    networkName: string;
+    network: {
+        name: string;
+        tags: string[];
+        fork?: boolean;
+    };
+    saveDeployments?: boolean;
 };
 interface Environment<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Deployments extends UnknownDeployments = UnknownDeployments> {
     config: ResolvedConfig;
@@ -304,20 +315,22 @@ declare function execute<Artifacts extends UnknownArtifacts = UnknownArtifacts,
     dependencies?: string[];
 }): DeployScriptModule<Artifacts, NamedAccounts, ArgumentsType, Deployments>;
 type ConfigOptions = {
-    network: string;
+    network?: string | {
+        fork: string;
+    };
     deployments?: string;
     scripts?: string;
     tags?: string;
-};
-declare function readConfig(options: ConfigOptions, extra?: {
-    ignoreMissingRPC?: boolean;
-}): Config;
-declare function readAndResolveConfig(options: ConfigOptions, extra?: {
+    logLevel?: number;
+    provider?: EIP1193ProviderWithoutEvents | EIP1193GenericRequestProvider;
     ignoreMissingRPC?: boolean;
-}): ResolvedConfig;
+    saveDeployments?: boolean;
+};
+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>(config: Config, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment>;
-declare function loadAndExecuteDeployments<Artifacts extends UnknownArtifacts = UnknownArtifacts, NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, ArgumentsType = undefined, Deployments extends UnknownDeployments = UnknownDeployments>(config: Config, args?: ArgumentsType): Promise<Environment>;
+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>;
 
 type EnvironmentExtenstion = (env: Environment) => Environment;
@@ -325,7 +338,7 @@ declare function extendEnvironment(extension: EnvironmentExtenstion): void;
 type SignerProtocolFunction = (protocolString: string) => Promise<NamedSigner>;
 declare function handleSignerProtocol(protocol: string, getSigner: SignerProtocolFunction): void;
 
-declare function loadDeployments(deploymentsPath: string, subPath: string, onlyABIAndAddress?: boolean, expectedChain?: {
+declare function loadDeployments(deploymentsPath: string, networkName: string, onlyABIAndAddress?: boolean, expectedChain?: {
     chainId: string;
     genesisHash?: `0x${string}`;
     deleteDeploymentsIfDifferentGenesisHash?: boolean;
@@ -358,4 +371,4 @@ declare const chainById: {
 };
 declare function getChain(id: string): Chain$1;
 
-export { type AccountDefinition, type AccountType, type Artifact, 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 GasEstimate, type GasEstimates, type Libraries, type NamedSigner, type NoticeUserDoc, type PartialDeployment, type PendingDeployment, type PendingExecution, type PendingTransaction, type ProvidedContext, type ResolvedAccount, type ResolvedConfig, type ResolvedNamedAccounts, type ResolvedNamedSigners, type ScriptCallback, type Storage, type StorageLayout, type TypeDef, type UnknownArtifacts, type UnknownDeployments, type UnknownDeploymentsAcrossNetworks, type UnknownNamedAccounts, type UnresolvedUnknownNamedAccounts, type UserDoc, chainById, execute, executeDeployScripts, extendEnvironment, getChain, handleSignerProtocol, loadAndExecuteDeployments, loadDeployments, loadEnvironment, mergeArtifacts, readAndResolveConfig, readConfig, resolveConfig };
+export { type AccountDefinition, type AccountType, type Artifact, 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 GasEstimate, type GasEstimates, 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 ScriptCallback, type Storage, type StorageLayout, type TypeDef, type UnknownArtifacts, type UnknownDeployments, type UnknownDeploymentsAcrossNetworks, type UnknownNamedAccounts, type UnresolvedUnknownNamedAccounts, type UserDoc, chainById, execute, executeDeployScripts, extendEnvironment, getChain, handleSignerProtocol, loadAndExecuteDeployments, loadDeployments, loadEnvironment, mergeArtifacts, readAndResolveConfig, readConfig, resolveConfig };

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   readAndResolveConfig,
   readConfig,
   resolveConfig
-} from "./chunk-34ZUTWTW.js";
+} from "./chunk-4RQLWJEN.js";
 export {
   chainById,
   execute,

package/package.json

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

package/src/cli.ts

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 import {loadEnv} from 'ldenv';
-import {loadAndExecuteDeployments, readConfig} from '.';
+import {ConfigOptions, loadAndExecuteDeployments, readConfig} from '.';
 import {Command} from 'commander';
 import pkg from '../package.json';
 
@@ -20,6 +20,5 @@ program
 	.parse(process.argv);
 
 const options = program.opts();
-const config = readConfig(options as any);
 
-loadAndExecuteDeployments({...config, logLevel: 1});
+loadAndExecuteDeployments({...(options as ConfigOptions), logLevel: 1});

package/src/environment/deployments.ts

@@ -5,12 +5,12 @@ import {UnknownDeployments} from './types';
 
 export function loadDeployments(
 	deploymentsPath: string,
-	subPath: string,
+	networkName: string,
 	onlyABIAndAddress?: boolean,
 	expectedChain?: {chainId: string; genesisHash?: `0x${string}`; deleteDeploymentsIfDifferentGenesisHash?: boolean}
 ): {deployments: UnknownDeployments; chainId?: string; genesisHash?: `0x${string}`} {
 	const deploymentsFound: UnknownDeployments = {};
-	const deployPath = path.join(deploymentsPath, subPath);
+	const deployPath = path.join(deploymentsPath, networkName);
 
 	let filesStats;
 	try {
@@ -34,7 +34,7 @@ export function loadDeployments(
 				genesisHash = chainData.genesisHash;
 			} else {
 				throw new Error(
-					`A '.chain' or '.chainId' file is expected to be present in the deployment folder for network ${subPath}`
+					`A '.chain' or '.chainId' file is expected to be present in the deployment folder for network ${networkName}`
 				);
 			}
 		}

package/src/environment/index.ts

@@ -85,7 +85,9 @@ export async function createEnvironment<
 	providedContext: ProvidedContext<Artifacts, NamedAccounts>
 ): Promise<{internal: InternalEnvironment; external: Environment<Artifacts, NamedAccounts, Deployments>}> {
 	const provider =
-		'provider' in config ? config.provider : (new JSONRPCHTTPProvider(config.nodeUrl) as EIP1193ProviderWithoutEvents);
+		'provider' in config.network
+			? config.network.provider
+			: (new JSONRPCHTTPProvider(config.network.nodeUrl) as EIP1193ProviderWithoutEvents);
 
 	const transport = custom(provider);
 	const viemClient = createPublicClient({transport});
@@ -100,24 +102,32 @@ export async function createEnvironment<
 
 	let networkName: string;
 	let saveDeployments: boolean;
-	let tags: {[tag: string]: boolean} = {};
+	let networkTags: {[tag: string]: boolean} = {};
+	for (const networkTag of config.network.tags) {
+		networkTags[networkTag] = true;
+	}
+
 	if ('nodeUrl' in config) {
-		networkName = config.networkName;
+		networkName = config.network.name;
 		saveDeployments = true;
 	} else {
-		if (config.networkName) {
-			networkName = config.networkName;
+		if (config.network.name) {
+			networkName = config.network.name;
 		} else {
 			networkName = 'memory';
 		}
 		if (networkName === 'memory' || networkName === 'hardhat') {
-			tags['memory'] = true;
+			networkTags['memory'] = true;
 			saveDeployments = false;
 		} else {
 			saveDeployments = true;
 		}
 	}
 
+	if (config.saveDeployments !== undefined) {
+		saveDeployments = config.saveDeployments;
+	}
+
 	const resolvedAccounts: {[name: string]: ResolvedAccount} = {};
 
 	const accountCache: {[name: string]: ResolvedAccount} = {};
@@ -205,16 +215,26 @@ export async function createEnvironment<
 		artifacts: providedContext.artifacts as Artifacts,
 		network: {
 			name: networkName,
+			fork: config.network.fork,
 			saveDeployments,
-			tags,
+			tags: networkTags,
 		},
 	};
 
-	const {deployments} = loadDeployments(config.deployments, context.network.name, false, {
-		chainId,
-		genesisHash,
-		deleteDeploymentsIfDifferentGenesisHash: true,
-	});
+	// console.log(`context`, JSON.stringify(context.network, null, 2));
+
+	const {deployments} = loadDeployments(
+		config.deployments,
+		context.network.name,
+		false,
+		context.network.fork
+			? undefined
+			: {
+					chainId,
+					genesisHash,
+					deleteDeploymentsIfDifferentGenesisHash: true,
+			  }
+	);
 
 	const namedAccounts: {[name: string]: EIP1193Account} = {};
 	const namedSigners: {[name: string]: NamedSigner} = {};

package/src/environment/types.ts

@@ -209,30 +209,47 @@ export type Context<
 	artifacts: Artifacts;
 };
 
-type BaseConfig = {
-	networkName?: string;
+type NetworkConfigBase = {
+	name: string;
+	tags: string[];
+	fork?: boolean;
+};
+type NetworkConfigForJSONRPC = NetworkConfigBase & {
+	nodeUrl: string;
+};
+
+type NetworkConfigForEIP1193Provider = NetworkConfigBase & {
+	provider: EIP1193ProviderWithoutEvents;
+};
+
+export type NetworkConfig = NetworkConfigForJSONRPC | NetworkConfigForEIP1193Provider;
+
+export type Config = {
+	network: NetworkConfig;
+	networkTags?: string[];
 	scripts?: string;
 	deployments?: string;
+	saveDeployments?: boolean;
 
 	tags?: string[];
+
 	logLevel?: number;
 	// TODO
 	gasPricing?: {};
 };
 
-type ConfigForJSONRPC = BaseConfig & {
-	networkName: string;
-	nodeUrl: string;
-};
-
-type ConfigForEIP1193Provider = BaseConfig & {
-	provider: EIP1193ProviderWithoutEvents;
+export type ResolvedConfig = Config & {
+	deployments: string;
+	scripts: string;
+	tags: string[];
+	network: {
+		name: string;
+		tags: string[];
+		fork?: boolean;
+	};
+	saveDeployments?: boolean;
 };
 
-export type Config = ConfigForJSONRPC | ConfigForEIP1193Provider;
-
-export type ResolvedConfig = Config & {deployments: string; scripts: string; tags: string[]; networkName: string};
-
 export interface Environment<
 	Artifacts extends UnknownArtifacts = UnknownArtifacts,
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts,

package/src/executor/index.ts

@@ -13,6 +13,7 @@ import type {
 import {createEnvironment} from '../environment';
 import {DeployScriptFunction, DeployScriptModule, ProvidedContext} from './types';
 import {logger, setLogLevel, spin} from '../internal/logging';
+import {EIP1193GenericRequestProvider, EIP1193ProviderWithoutEvents} from 'eip-1193';
 
 if (!process.env['ROCKETH_SKIP_ESBUILD']) {
 	require('esbuild-register/dist/node').register();
@@ -39,28 +40,70 @@ export function execute<
 	return scriptModule as unknown as DeployScriptModule<Artifacts, NamedAccounts, ArgumentsType, Deployments>;
 }
 
-export type ConfigOptions = {network: string; deployments?: string; scripts?: string; tags?: string};
+export type ConfigOptions = {
+	network?: string | {fork: string};
+	deployments?: string;
+	scripts?: string;
+	tags?: string;
+	logLevel?: number;
+	provider?: EIP1193ProviderWithoutEvents | EIP1193GenericRequestProvider;
+	ignoreMissingRPC?: boolean;
+	saveDeployments?: boolean;
+};
 
-export function readConfig(options: ConfigOptions, extra?: {ignoreMissingRPC?: boolean}): Config {
-	type Networks = {[name: string]: {rpcUrl: string}};
-	type ConfigFile = {networks: Networks};
+export function readConfig(options: ConfigOptions): Config {
+	type Networks = {[name: string]: {rpcUrl?: string; tags?: string[]}};
+	type ConfigFile = {networks: Networks; deployments?: string; scripts?: string};
 	let configFile: ConfigFile | undefined;
 	try {
 		const configString = fs.readFileSync('./rocketh.json', 'utf-8');
 		configFile = JSON.parse(configString);
 	} catch {}
 
-	let nodeUrl: string;
+	if (configFile) {
+		if (!options.deployments && configFile.deployments) {
+			options.deployments = configFile.deployments;
+		}
+		if (!options.scripts && configFile.scripts) {
+			options.scripts = configFile.scripts;
+		}
+	}
+
 	const fromEnv = process.env['ETH_NODE_URI_' + options.network];
-	if (typeof fromEnv === 'string') {
-		nodeUrl = fromEnv;
-	} else {
-		if (configFile) {
-			const network = configFile.networks && configFile.networks[options.network];
-			if (network) {
-				nodeUrl = network.rpcUrl;
+	const fork = typeof options.network !== 'string';
+	let networkName = 'memory';
+	if (options.network) {
+		if (typeof options.network === 'string') {
+			networkName = options.network;
+		} else if ('fork' in options.network) {
+			networkName = options.network.fork;
+		}
+	}
+
+	let networkTags: string[] = (configFile?.networks && configFile?.networks[networkName]?.tags) || [];
+	if (!options.provider) {
+		let nodeUrl: string;
+		if (typeof fromEnv === 'string') {
+			nodeUrl = fromEnv;
+		} else {
+			if (configFile) {
+				const network = configFile.networks && configFile.networks[networkName];
+				if (network && network.rpcUrl) {
+					nodeUrl = network.rpcUrl;
+				} else {
+					if (options?.ignoreMissingRPC) {
+						nodeUrl = '';
+					} else {
+						if (options.network === 'localhost') {
+							nodeUrl = 'http://127.0.0.1:8545';
+						} else {
+							logger.error(`network "${options.network}" is not configured. Please add it to the rocketh.json file`);
+							process.exit(1);
+						}
+					}
+				}
 			} else {
-				if (extra?.ignoreMissingRPC) {
+				if (options?.ignoreMissingRPC) {
 					nodeUrl = '';
 				} else {
 					if (options.network === 'localhost') {
@@ -71,40 +114,50 @@ export function readConfig(options: ConfigOptions, extra?: {ignoreMissingRPC?: b
 					}
 				}
 			}
-		} else {
-			if (extra?.ignoreMissingRPC) {
-				nodeUrl = '';
-			} else {
-				if (options.network === 'localhost') {
-					nodeUrl = 'http://127.0.0.1:8545';
-				} else {
-					logger.error(`network "${options.network}" is not configured. Please add it to the rocketh.json file`);
-					process.exit(1);
-				}
-			}
 		}
+		return {
+			network: {
+				nodeUrl,
+				name: networkName,
+				tags: networkTags,
+				fork,
+			},
+			deployments: options.deployments,
+			saveDeployments: options.saveDeployments,
+			scripts: options.scripts,
+			tags: typeof options.tags === 'undefined' ? undefined : options.tags.split(','),
+			logLevel: options.logLevel,
+		};
+	} else {
+		return {
+			network: {
+				provider: options.provider as EIP1193ProviderWithoutEvents,
+				name: networkName,
+				tags: networkTags,
+				fork,
+			},
+			deployments: options.deployments,
+			saveDeployments: options.saveDeployments,
+			scripts: options.scripts,
+			tags: typeof options.tags === 'undefined' ? undefined : options.tags.split(','),
+			logLevel: options.logLevel,
+		};
 	}
-
-	return {
-		nodeUrl,
-		networkName: options.network,
-		deployments: options.deployments,
-		scripts: options.scripts,
-		tags: typeof options.tags === 'undefined' ? undefined : options.tags.split(','),
-	};
 }
 
-export function readAndResolveConfig(options: ConfigOptions, extra?: {ignoreMissingRPC?: boolean}): ResolvedConfig {
-	return resolveConfig(readConfig(options, extra));
+export function readAndResolveConfig(options: ConfigOptions): ResolvedConfig {
+	return resolveConfig(readConfig(options));
 }
 
 export function resolveConfig(config: Config): ResolvedConfig {
 	const resolvedConfig: ResolvedConfig = {
 		...config,
-		networkName: config.networkName || 'memory',
+		network: config.network, // TODO default to || {name: 'memory'....}
 		deployments: config.deployments || 'deployments',
 		scripts: config.scripts || 'deploy',
 		tags: config.tags || [],
+		networkTags: config.networkTags || [],
+		saveDeployments: config.saveDeployments,
 	};
 	return resolvedConfig;
 }
@@ -112,8 +165,8 @@ export function resolveConfig(config: Config): ResolvedConfig {
 export async function loadEnvironment<
 	Artifacts extends UnknownArtifacts = UnknownArtifacts,
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts
->(config: Config, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment> {
-	const resolvedConfig = resolveConfig(config);
+>(options: ConfigOptions, context: ProvidedContext<Artifacts, NamedAccounts>): Promise<Environment> {
+	const resolvedConfig = readAndResolveConfig(options);
 	const {external, internal} = await createEnvironment(resolvedConfig, context);
 	return external;
 }
@@ -123,8 +176,10 @@ export async function loadAndExecuteDeployments<
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts,
 	ArgumentsType = undefined,
 	Deployments extends UnknownDeployments = UnknownDeployments
->(config: Config, args?: ArgumentsType): Promise<Environment> {
-	const resolvedConfig = resolveConfig(config);
+>(options: ConfigOptions, args?: ArgumentsType): Promise<Environment> {
+	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);
 }