npm - rocketh - Versions diffs - 0.15.0-testing.9 → 0.15.0 - Mend

rocketh 0.15.0-testing.9 → 0.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/CHANGELOG.md +74 -0
package/dist/cli.js +1 -1
package/dist/cli.js.map +1 -1
package/dist/environment/index.d.ts.map +1 -1
package/dist/environment/index.js +27 -21
package/dist/environment/index.js.map +1 -1
package/dist/environment/utils/chains.d.ts +3 -1
package/dist/environment/utils/chains.d.ts.map +1 -1
package/dist/environment/utils/chains.js +3 -3
package/dist/environment/utils/chains.js.map +1 -1
package/dist/executor/index.d.ts +2 -3
package/dist/executor/index.d.ts.map +1 -1
package/dist/executor/index.js +56 -43
package/dist/executor/index.js.map +1 -1
package/dist/executor/setup.test.js +1 -1
package/dist/executor/setup.test.js.map +1 -1
package/dist/index.d.ts +3 -2
package/dist/index.d.ts.map +1 -1
package/dist/index.js +3 -2
package/dist/index.js.map +1 -1
package/dist/types.d.ts +36 -33
package/dist/types.d.ts.map +1 -1
package/package.json +1 -1
package/src/cli.ts +1 -1
package/src/environment/index.ts +35 -22
package/src/environment/utils/chains.ts +4 -4
package/src/executor/index.ts +57 -44
package/src/executor/setup.test.ts +1 -1
package/src/index.ts +3 -2
package/src/types.ts +34 -31

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,79 @@
 # rocketh
+## 0.15.0
+### Minor Changes
+- 851378e: revamp the settings to be allowed to configure per chain as well as per target
+### Patch Changes
+- 8122cdb: fix
+- e6de720: fork
+- 1f2e044: fixes + support old hardhat-deploy
+- 9d920a8: fix
+- c682fd2: canonical chain names export
+- 0d7e7ed: fix export
+- 691d296: fixes
+- cb340e2: fix
+- 2b82b5b: fix
+- a0fcde6: fixes
+- 356f26c: executeDeployScriptsDirectly is now executeDeployScripts
+- 03f2406: fixes
+- 68151ae: rname target to environment
+- e2dbd6f: revamp of types and resolution
+- 4d1a814: fix cli
+- e260c6d: fix
+- feb4780: context only to be provided
+## 0.15.0-testing.17
+### Patch Changes
+- executeDeployScriptsDirectly is now executeDeployScripts
+## 0.15.0-testing.16
+### Patch Changes
+- fix
+## 0.15.0-testing.15
+### Patch Changes
+- context only to be provided
+## 0.15.0-testing.14
+### Patch Changes
+- fixes
+## 0.15.0-testing.13
+### Patch Changes
+- rname target to environment
+## 0.15.0-testing.12
+### Patch Changes
+- canonical chain names export
+## 0.15.0-testing.11
+### Patch Changes
+- fork
+## 0.15.0-testing.10
+### Patch Changes
+- fix export
 ## 0.15.0-testing.9
 ### Patch Changes

package/dist/cli.js CHANGED Viewed

@@ -17,7 +17,7 @@ program
     .option('--skip-gas-report', 'if set skip gas report')
     .option('--skip-prompts', 'if set skip any prompts')
     .option('--save-deployments', 'if set, save deployments')
-    .requiredOption('--target <value>', 'target context to use')
+    .requiredOption('-e, --environment <value>', 'environment to use')
     .parse(process.argv);
 const options = program.opts();
 loadAndExecuteDeployments({

package/dist/cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAkB,yBAAyB,EAAC,MAAM,YAAY,CAAC;AACtE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,GAAG,MAAM,iBAAiB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAC;AAEtD,OAAO,EAAE,CAAC;AAEV,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,OAAO;KACL,IAAI,CAAC,WAAW,CAAC;KACjB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,GAAG,WAAW,EAAE,CAAC;KACvB,WAAW,CAAC,kDAAkD,CAAC;KAC/D,MAAM,CAAC,uBAAuB,EAAE,0DAA0D,CAAC;KAC3F,MAAM,CAAC,oBAAoB,EAAE,yCAAyC,CAAC;KACvE,MAAM,CAAC,2BAA2B,EAAE,oCAAoC,CAAC;KACzE,MAAM,CAAC,mBAAmB,EAAE,wBAAwB,CAAC;KACrD,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;KACnD,MAAM,CAAC,oBAAoB,EAAE,0BAA0B,CAAC;KACxD,cAAc,CAAC,~~kBAAkB~~,EAAE,~~uBAAuB~~,CAAC;~~KAC3D~~,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAG/B,yBAAyB,CAAC;IACzB,GAAI,OAA2B;IAC/B,QAAQ,EAAE,CAAC;IACX,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;IACvD,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;IAClD,eAAe,EAAE,OAAO,CAAC,eAAe;CACxC,CAAC,CAAC"}
1	+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAkB,yBAAyB,EAAC,MAAM,YAAY,CAAC;AACtE,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAClC,OAAO,GAAG,MAAM,iBAAiB,CAAC,OAAM,IAAI,EAAE,MAAM,EAAC,CAAC;AAEtD,OAAO,EAAE,CAAC;AAEV,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,OAAO;KACL,IAAI,CAAC,WAAW,CAAC;KACjB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,GAAG,WAAW,EAAE,CAAC;KACvB,WAAW,CAAC,kDAAkD,CAAC;KAC/D,MAAM,CAAC,uBAAuB,EAAE,0DAA0D,CAAC;KAC3F,MAAM,CAAC,oBAAoB,EAAE,yCAAyC,CAAC;KACvE,MAAM,CAAC,2BAA2B,EAAE,oCAAoC,CAAC;KACzE,MAAM,CAAC,mBAAmB,EAAE,wBAAwB,CAAC;KACrD,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;KACnD,MAAM,CAAC,oBAAoB,EAAE,0BAA0B,CAAC;KACxD,cAAc,CAAC,2BAA2B,EAAE,oBAAoB,CAAC;KACjE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAG/B,yBAAyB,CAAC;IACzB,GAAI,OAA2B;IAC/B,QAAQ,EAAE,CAAC;IACX,mBAAmB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;IACvD,YAAY,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;IAClD,eAAe,EAAE,OAAO,CAAC,eAAe;CACxC,CAAC,CAAC"}

package/dist/environment/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/environment/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAIN,WAAW,EAOX,kBAAkB,EAClB,8BAA8B,EAC9B,6BAA6B,EAG7B,uBAAuB,EACvB,kBAAkB,EAElB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAgCzD,wBAAsB,iBAAiB,CACtC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,WAAW,SAAS,kBAAkB,GAAG,kBAAkB,EAE3D,UAAU,EAAE,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,EACnD,uBAAuB,EAAE,uBAAuB,GAC9C,OAAO,CAAC;IAAC,QAAQ,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;CAAC,CAAC,~~CA0mBnG~~"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/environment/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAIN,WAAW,EAOX,kBAAkB,EAClB,8BAA8B,EAC9B,6BAA6B,EAG7B,uBAAuB,EACvB,kBAAkB,EAElB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAgCzD,wBAAsB,iBAAiB,CACtC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,WAAW,SAAS,kBAAkB,GAAG,kBAAkB,EAE3D,UAAU,EAAE,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,EACnD,uBAAuB,EAAE,uBAAuB,GAC9C,OAAO,CAAC;IAAC,QAAQ,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;CAAC,CAAC,CAunBnG"}

package/dist/environment/index.js CHANGED Viewed

@@ -41,10 +41,10 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         console.error(`failed to get genesis block`);
     }
     const deploymentsFolder = userConfig.deployments;
-    const targetName = resolvedExecutionParams.target.name;
+    const environmentName = resolvedExecutionParams.environment.name;
     const saveDeployments = resolvedExecutionParams.saveDeployments;
     let networkTags = {};
-    for (const networkTag of resolvedExecutionParams.target.tags) {
+    for (const networkTag of resolvedExecutionParams.environment.tags) {
         networkTags[networkTag] = true;
     }
     const resolvedAccounts = {};
@@ -110,7 +110,7 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         }
         else {
             // TODO allow for canonical chain name ?
-            const accountForNetwork = accountDef[targetName] || accountDef[chainId] || accountDef['default'];
+            const accountForNetwork = accountDef[environmentName] || accountDef[chainId] || accountDef['default'];
             if (typeof accountForNetwork !== undefined) {
                 const accountFetched = await getAccount(name, accounts, accountForNetwork);
                 if (accountFetched) {
@@ -123,13 +123,16 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
     if (userConfig.accounts) {
         const accountNames = Object.keys(userConfig.accounts);
         for (const accountName of accountNames) {
-            let account = await getAccount(accountName, userConfig.accounts, userConfig.accounts[accountName]);
+            const account = await getAccount(accountName, userConfig.accounts, userConfig.accounts[accountName]);
+            if (!account) {
+                throw new Error(`cannot get account for ${accountName} = ${JSON.stringify(userConfig.accounts[accountName], null, 2)}\n You might need to connect to a account-aware provider.`);
+            }
             resolvedAccounts[accountName] = account;
         }
     }
     const resolvedData = {};
     async function getData(name, dataDef) {
-        const dataForNetwork = dataDef[targetName] || dataDef[chainId] || dataDef['default'];
+        const dataForNetwork = dataDef[environmentName] || dataDef[chainId] || dataDef['default'];
         return dataForNetwork;
     }
     if (userConfig.data) {
@@ -142,14 +145,12 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
     const context = {
         accounts: resolvedAccounts,
         data: resolvedData,
-        network: {
-            fork: resolvedExecutionParams.target.fork,
-            saveDeployments,
-            tags: networkTags,
-        },
+        fork: resolvedExecutionParams.environment.fork,
+        saveDeployments,
+        tags: networkTags,
     };
     // console.log(`context`, JSON.stringify(context.network, null, 2));
-    const { deployments, migrations } = loadDeployments(deploymentsFolder, targetName, false, context.network.fork
+    const { deployments, migrations } = loadDeployments(deploymentsFolder, environmentName, false, context.fork
         ? undefined
         : {
             chainId,
@@ -174,8 +175,11 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         };
     }
     const perliminaryEnvironment = {
-        name: targetName,
-        tags: context.network.tags,
+        context: {
+            saveDeployments: context.saveDeployments,
+        },
+        name: environmentName,
+        tags: context.tags,
         deployments: deployments,
         namedAccounts: namedAccounts,
         data: resolvedData,
@@ -184,14 +188,16 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         addressSigners: addressSigners,
         network: {
             chain: resolvedExecutionParams.chain,
-            fork: context.network.fork,
+            fork: context.fork,
             provider,
-            deterministicDeployment: resolvedExecutionParams.target.deterministicDeployment,
+            deterministicDeployment: resolvedExecutionParams.environment.deterministicDeployment,
+            // for backward compatibility
+            tags: context.tags,
         },
         extra: resolvedExecutionParams.extra || {},
     };
     function getDeploymentFolder() {
-        const folderPath = path.join(deploymentsFolder, targetName);
+        const folderPath = path.join(deploymentsFolder, environmentName);
         return folderPath;
     }
     function ensureDeploymentFolder() {
@@ -237,7 +243,7 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
     }
     function recordMigration(id) {
         migrations[id] = Math.floor(Date.now() / 1000);
-        if (context.network.saveDeployments) {
+        if (context.saveDeployments) {
             const folderPath = ensureDeploymentFolder();
             fs.writeFileSync(`${folderPath}/.migrations.json`, JSON.stringify(migrations));
         }
@@ -278,14 +284,14 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         else {
             deployments[name] = { ...deployment, numDeployments: 1 };
         }
-        if (context.network.saveDeployments) {
+        if (context.saveDeployments) {
             const folderPath = ensureDeploymentFolder();
             fs.writeFileSync(`${folderPath}/${name}.json`, JSONToString(deployment, 2));
         }
         return deployment;
     }
     async function recoverTransactionsIfAny() {
-        if (!context.network.saveDeployments) {
+        if (!context.saveDeployments) {
             return;
         }
         const folderPath = getDeploymentFolder();
@@ -331,7 +337,7 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         }
     }
     async function savePendingTransaction(pendingTransaction) {
-        if (context.network.saveDeployments) {
+        if (context.saveDeployments) {
             const folderPath = ensureDeploymentFolder();
             const filepath = path.join(folderPath, '.pending_transactions.json');
             let existingPendinTransactions;
@@ -363,7 +369,7 @@ export async function createEnvironment(userConfig, resolvedExecutionParams) {
         return receipt;
     }
     async function deleteTransaction(hash) {
-        if (context.network.saveDeployments) {
+        if (context.saveDeployments) {
             const folderPath = ensureDeploymentFolder();
             const filepath = path.join(folderPath, '.pending_transactions.json');
             let existingPendinTransactions;

package/dist/environment/index.js.map CHANGED Viewed

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

package/dist/environment/utils/chains.d.ts CHANGED Viewed

@@ -6,7 +6,9 @@ export declare const chainTypes: {
 export declare const chainById: {
     [chainId: string]: ChainInfo;
 };
-export declare const allChains: any;
+export declare const allChains: {
+    [chainExportName: string]: ChainInfo;
+};
 export declare const chainByCanonicalName: {
     [canonicalName: string]: ChainInfo;
 };

package/dist/environment/utils/chains.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../../../src/environment/utils/chains.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,WAAW,EACX,SAAS,EAIT,kBAAkB,EAClB,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;AAuBnE,eAAO,MAAM,UAAU,EAAE;IAAC,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,CAAC;AAE7D,eAAO,MAAM,SAAS,EAAE;IAAC,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,CAAC;AAC5D,eAAO,MAAM,SAAS,~~KAA2C~~,CAAC;~~AAalE~~,eAAO,MAAM,oBAAoB,EAAE;IAAC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,CAAC;AAO7E,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAIvE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAGlE;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,WAAW,CAmHlF"}
1	+ {"version":3,"file":"chains.d.ts","sourceRoot":"","sources":["../../../src/environment/utils/chains.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,WAAW,EACX,SAAS,EAIT,kBAAkB,EAClB,MAAM,gBAAgB,CAAC;AAExB,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;AAuBnE,eAAO,MAAM,UAAU,EAAE;IAAC,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,CAAC;AAE7D,eAAO,MAAM,SAAS,EAAE;IAAC,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,CAAC;AAC5D,eAAO,MAAM,SAAS,EAAE;IAAC,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;CAA4C,CAAC;AAa1G,eAAO,MAAM,oBAAoB,EAAE;IAAC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAA;CAAM,CAAC;AAO7E,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAIvE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAGlE;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,WAAW,CAmHlF"}

package/dist/environment/utils/chains.js CHANGED Viewed

@@ -31,11 +31,11 @@ for (const key of Object.keys(allChains)) {
     if (specificChainType) {
         chainTypes[chainId] = specificChainType;
     }
-    chainById[chainId] = chain;
+    chainById[chainId] = { ...chain, chainType: specificChainType };
 }
 export const chainByCanonicalName = {};
-for (const key of Object.keys(allChains)) {
-    const chain = allChains[key];
+for (const key of Object.keys(chainById)) {
+    const chain = chainById[key];
     const canonicalName = kebabCase(chain.name);
     chainByCanonicalName[canonicalName] = chain;
 }

package/dist/environment/utils/chains.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chains.js","sourceRoot":"","sources":["../../../src/environment/utils/chains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAYtC,MAAM,iBAAiB,GAA2C;IACjE,IAAI,EAAE,UAAU;IAChB,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,UAAU;IACvB,QAAQ,EAAE,UAAU;IACpB,cAAc,EAAE,UAAU;IAC1B,eAAe,EAAE,UAAU;IAC3B,GAAG,EAAE,UAAU;IACf,UAAU,EAAE,UAAU;IACtB,IAAI,EAAE,UAAU;IAChB,WAAW,EAAE,UAAU;IACvB,WAAW,EAAE,UAAU;IACvB,QAAQ,EAAE,UAAU;IACpB,eAAe,EAAE,UAAU;IAC3B,aAAa,EAAE,MAAM;IACrB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,aAAa,EAAE,QAAQ;IACvB,oBAAoB,EAAE,QAAQ;CAC9B,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAmC,EAAE,CAAC;AAE7D,MAAM,CAAC,MAAM,SAAS,GAAmC,EAAE,CAAC;AAC5D,MAAM,CAAC,MAAM,SAAS,~~GAAG~~,EAAC,GAAG,CAAE,MAAc,CAAC,OAAO,IAAI,MAAM,CAAC,EAAC,CAAC;~~AAClE~~,SAAS,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAE9C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAI,SAAiB,CAAC,GAAG,CAAc,CAAC;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;IACpC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,iBAAiB,EAAE,CAAC;QACvB,UAAU,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC;IACzC,CAAC;IACD,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;~~AAC5B~~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"}
1	+ {"version":3,"file":"chains.js","sourceRoot":"","sources":["../../../src/environment/utils/chains.ts"],"names":[],"mappings":"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"}

package/dist/executor/index.d.ts CHANGED Viewed

@@ -40,10 +40,9 @@ export declare function enhanceEnvIfNeeded<Extensions extends Record<string, (en
 export declare function readConfig<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData>(): Promise<UserConfig>;
 export declare function resolveConfig<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData>(configFile: UserConfig, overrides?: ConfigOverrides): ResolvedUserConfig<NamedAccounts, Data>;
 export declare function readAndResolveConfig<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData>(overrides?: ConfigOverrides): Promise<ResolvedUserConfig<NamedAccounts, Data>>;
-export declare function getChainIdForTarget(config: ResolvedUserConfig, targetName: string, provider?: EIP1193ProviderWithoutEvents): Promise<number>;
+export declare function getChainIdForEnvironment(config: ResolvedUserConfig, environmentName: string, provider?: EIP1193ProviderWithoutEvents): Promise<number>;
 export declare function resolveExecutionParams<Extra extends Record<string, unknown> = Record<string, unknown>>(config: ResolvedUserConfig, executionParameters: ExecutionParams<Extra>, chainId: number): ResolvedExecutionParams<Extra>;
 export declare function loadEnvironment<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData, Extra extends Record<string, unknown> = Record<string, unknown>>(executionParams: ExecutionParams<Extra>): Promise<Environment<NamedAccounts, Data, UnknownDeployments>>;
 export declare function loadAndExecuteDeployments<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData, ArgumentsType = undefined, Extra extends Record<string, unknown> = Record<string, unknown>>(executionParams: ExecutionParams<Extra>, args?: ArgumentsType): Promise<Environment<NamedAccounts, Data, UnknownDeployments>>;
-export declare function executeDeployScriptsDirectly<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData, ArgumentsType = undefined, Extra extends Record<string, unknown> = Record<string, unknown>>(userConfig: UserConfig, executionParams?: ExecutionParams<Extra>, args?: ArgumentsType): Promise<Environment<NamedAccounts, Data, UnknownDeployments>>;
-export declare function executeDeployScripts<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData, ArgumentsType = undefined>(userConfig: ResolvedUserConfig<NamedAccounts, Data>, resolvedExecutionParams: ResolvedExecutionParams, args?: ArgumentsType): Promise<Environment<NamedAccounts, Data, UnknownDeployments>>;
+export declare function executeDeployScripts<NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts, Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData, ArgumentsType = undefined, Extra extends Record<string, unknown> = Record<string, unknown>>(userConfig: UserConfig, executionParams?: ExecutionParams<Extra>, args?: ArgumentsType): Promise<Environment<NamedAccounts, Data, UnknownDeployments>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/executor/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/executor/index.ts"],"names":[],"mappings":"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~~mBAAmB~~,~~CACxC~~,MAAM,EAAE,kBAAkB,EAC1B,~~UAAU~~,EAAE,MAAM,~~EAClB~~,QAAQ,CAAC,EAAE,4BAA4B,~~mBAiBvC~~;AAgBD,wBAAgB,sBAAsB,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrG,MAAM,EAAE,kBAAkB,EAC1B,mBAAmB,EAAE,eAAe,CAAC,KAAK,CAAC,EAC3C,OAAO,EAAE,MAAM,GACb,uBAAuB,CAAC,KAAK,CAAC,~~CA8EhC~~;AAED,wBAAsB,eAAe,CACpC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,eAAe,EAAE,eAAe,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAWxG;AAED,wBAAsB,yBAAyB,CAC9C,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,aAAa,GAAG,SAAS,EACzB,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAE/D,eAAe,EAAE,eAAe,CAAC,KAAK,CAAC,EACvC,IAAI,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAQ/D;AAED,wBAAsB,~~4BAA4B~~,~~CACjD~~,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,aAAa,GAAG,SAAS,EACzB,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAE/D,UAAU,EAAE,UAAU,EACtB,eAAe,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,EACxC,IAAI,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAO/D;AAED,wBAAsB,oBAAoB,CACzC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,aAAa,GAAG,SAAS,EAEzB,UAAU,EAAE,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,EACnD,uBAAuB,EAAE,uBAAuB,EAChD,IAAI,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAwN/D"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/executor/index.ts"],"names":[],"mappings":"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"}

package/dist/executor/index.js CHANGED Viewed

@@ -142,12 +142,24 @@ export async function readAndResolveConfig(overrides) {
     const configFile = await readConfig();
     return resolveConfig(configFile, overrides);
 }
-export async function getChainIdForTarget(config, targetName, provider) {
-    if (config?.targets?.[targetName]?.chainId) {
-        return config.targets[targetName].chainId;
+export async function getChainIdForEnvironment(config, environmentName, provider) {
+    if (config?.environments?.[environmentName]?.chain) {
+        const chainAsNumber = typeof config.environments[environmentName].chain === 'number'
+            ? config.environments[environmentName].chain
+            : parseInt(config.environments[environmentName].chain);
+        if (!isNaN(chainAsNumber)) {
+            return chainAsNumber;
+        }
+        const chainFound = getChainByName(config.environments[environmentName].chain);
+        if (chainFound) {
+            return chainFound.id;
+        }
+        else {
+            throw new Error(`environment ${environmentName} chain id cannot be found, specify it in the rocketh config`);
+        }
     }
     else {
-        const chainFound = getChainByName(targetName);
+        const chainFound = getChainByName(environmentName);
         if (chainFound) {
             return chainFound.id;
         }
@@ -157,60 +169,61 @@ export async function getChainIdForTarget(config, targetName, provider) {
                 return Number(chainIdAsHex);
             }
             else {
-                throw new Error(`target ${targetName} chain id cannot be found, specify it in the rocketh config`);
+                throw new Error(`environment ${environmentName} chain id cannot be found, specify it in the rocketh config`);
             }
         }
     }
 }
-function getTargetName(executionParams) {
-    const targetProvided = executionParams.target || executionParams.network;
-    let targetName = 'memory';
-    if (targetProvided) {
-        if (typeof targetProvided === 'string') {
-            targetName = targetProvided;
+function getEnvironmentName(executionParams) {
+    const environmentProvided = executionParams.environment || executionParams.network;
+    let environmentName = 'memory';
+    if (environmentProvided) {
+        if (typeof environmentProvided === 'string') {
+            environmentName = environmentProvided;
         }
-        else if ('fork' in targetProvided) {
-            targetName = targetProvided.fork;
+        else if ('fork' in environmentProvided) {
+            environmentName = environmentProvided.fork;
         }
     }
-    const fork = typeof targetProvided !== 'string';
-    return { name: targetName, fork };
+    const fork = typeof environmentProvided !== 'string';
+    return { name: environmentName, fork };
 }
 export function resolveExecutionParams(config, executionParameters, chainId) {
-    const { name: targetName, fork } = getTargetName(executionParameters);
-    let chainConfig = getChainConfig(chainId, config);
+    const { name: environmentName, fork } = getEnvironmentName(executionParameters);
+    // TODO fork chainId resolution option to keep the network being used
+    let chainConfig = getChainConfig(fork ? 31337 : chainId, config);
     let chainInfo = chainConfig.info;
-    const targetConfig = config?.targets?.[targetName];
-    const actualChainConfig = targetConfig?.overrides
+    const environmentConfig = config?.environments?.[environmentName];
+    const actualChainConfig = environmentConfig?.overrides
         ? {
             ...chainConfig,
-            ...targetConfig.overrides,
+            ...environmentConfig.overrides,
             properties: {
                 ...chainConfig?.properties,
-                ...targetConfig.overrides.properties,
+                ...environmentConfig.overrides.properties,
             },
         }
         : chainConfig;
     if (actualChainConfig?.properties) {
         chainInfo = { ...chainInfo, properties: actualChainConfig.properties };
     }
-    // let targetTags: string[] = actualChainConfig.tags.concat(targetConfig?.tags); // TODO
-    const targetTags = actualChainConfig.tags;
+    // let environmentTags: string[] = actualChainConfig.tags.concat(environmentConfig?.tags); // TODO
+    const environmentTags = actualChainConfig.tags;
     let scripts = ['deploy'];
     if (config.scripts) {
         if (typeof config.scripts === 'string') {
             scripts = [config.scripts];
         }
         else {
-            scripts = config.scripts;
+            scripts = [...config.scripts];
         }
     }
-    if (targetConfig?.scripts) {
-        if (typeof targetConfig.scripts === 'string') {
-            scripts = [targetConfig.scripts];
+    if (environmentConfig?.scripts) {
+        if (typeof environmentConfig.scripts === 'string') {
+            scripts = [environmentConfig.scripts];
         }
         else {
-            scripts = targetConfig.scripts;
+            scripts = [...environmentConfig.scripts];
         }
     }
     const provider = executionParameters.provider || new JSONRPCHTTPProvider(actualChainConfig.rpcUrl);
@@ -220,7 +233,7 @@ export function resolveExecutionParams(config, executionParameters, chainId) {
             saveDeployments = true;
         }
         else {
-            if (targetName === 'memory' || targetName === 'hardhat' || targetName === 'default') {
+            if (environmentName === 'memory' || environmentName === 'hardhat' || environmentName === 'default') {
                 // networkTags['memory'] = true;
                 saveDeployments = false;
             }
@@ -237,9 +250,9 @@ export function resolveExecutionParams(config, executionParameters, chainId) {
         reportGasUse: executionParameters.reportGasUse || false,
         saveDeployments,
         tags: executionParameters.tags || [],
-        target: {
-            name: targetName,
-            tags: targetTags,
+        environment: {
+            name: environmentName,
+            tags: environmentTags,
             fork,
             deterministicDeployment: actualChainConfig.deterministicDeployment,
         },
@@ -250,8 +263,8 @@ export function resolveExecutionParams(config, executionParameters, chainId) {
 }
 export async function loadEnvironment(executionParams) {
     const userConfig = await readAndResolveConfig(executionParams.config);
-    const { name: targetName, fork } = getTargetName(executionParams);
-    const chainId = await getChainIdForTarget(userConfig, targetName, executionParams.provider);
+    const { name: environmentName, fork } = getEnvironmentName(executionParams);
+    const chainId = await getChainIdForEnvironment(userConfig, environmentName, executionParams.provider);
     const resolvedExecutionParams = resolveExecutionParams(userConfig, executionParams, chainId);
     // console.log(JSON.stringify(resolvedConfig, null, 2));
     const { external, internal } = await createEnvironment(userConfig, resolvedExecutionParams);
@@ -259,22 +272,22 @@ export async function loadEnvironment(executionParams) {
 }
 export async function loadAndExecuteDeployments(executionParams, args) {
     const userConfig = await readAndResolveConfig(executionParams.config);
-    const { name: targetName, fork } = getTargetName(executionParams);
-    const chainId = await getChainIdForTarget(userConfig, targetName, executionParams.provider);
+    const { name: environmentName, fork } = getEnvironmentName(executionParams);
+    const chainId = await getChainIdForEnvironment(userConfig, environmentName, executionParams.provider);
     const resolvedExecutionParams = resolveExecutionParams(userConfig, executionParams, chainId);
     // console.log(JSON.stringify(options, null, 2));
     // console.log(JSON.stringify(resolvedConfig, null, 2));
-    return executeDeployScripts(userConfig, resolvedExecutionParams, args);
+    return _executeDeployScripts(userConfig, resolvedExecutionParams, args);
 }
-export async function executeDeployScriptsDirectly(userConfig, executionParams, args) {
+export async function executeDeployScripts(userConfig, executionParams, args) {
     executionParams = executionParams || {};
-    const resolveduserConfig = resolveConfig(userConfig);
-    const { name: targetName, fork } = getTargetName(executionParams);
-    const chainId = await getChainIdForTarget(resolveduserConfig, targetName, executionParams.provider);
+    const resolveduserConfig = resolveConfig(userConfig, executionParams.config);
+    const { name: environmentName, fork } = getEnvironmentName(executionParams);
+    const chainId = await getChainIdForEnvironment(resolveduserConfig, environmentName, executionParams.provider);
     const resolvedExecutionParams = resolveExecutionParams(resolveduserConfig, executionParams, chainId);
-    return executeDeployScripts(resolveduserConfig, resolvedExecutionParams, args);
+    return _executeDeployScripts(resolveduserConfig, resolvedExecutionParams, args);
 }
-export async function executeDeployScripts(userConfig, resolvedExecutionParams, args) {
+async function _executeDeployScripts(userConfig, resolvedExecutionParams, args) {
     setLogLevel(typeof resolvedExecutionParams.logLevel === 'undefined' ? 0 : resolvedExecutionParams.logLevel);
     let filepaths;
     filepaths = traverseMultipleDirectory(resolvedExecutionParams.scripts);