npm - rocketh - Versions diffs - 0.11.22-testing.8 → 0.12.1 - Mend

rocketh 0.11.22-testing.8 → 0.12.1

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 (13) hide show

package/CHANGELOG.md +26 -32
package/dist/environment/types.d.ts +8 -6
package/dist/environment/types.d.ts.map +1 -1
package/dist/executor/index.d.ts +14 -4
package/dist/executor/index.d.ts.map +1 -1
package/dist/executor/index.js +31 -8
package/dist/executor/index.js.map +1 -1
package/dist/executor/setup.test.js +4 -4
package/dist/executor/setup.test.js.map +1 -1
package/package.json +1 -1
package/src/environment/types.ts +12 -6
package/src/executor/index.ts +56 -10
package/src/executor/setup.test.ts +4 -4

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,31 @@
 # rocketh
+## 0.12.1
+### Patch Changes
+- Merge branch 'feat/create3-support'
+## 0.12.0
+### Minor Changes
+- switch to setup function
+## 0.11.22
+### Patch Changes
+- 5bf9962: allow to pass Extra date to environment
+- a76870d: signer protocols are specified via config
+- de97d9c: fix
+- 77c2ffd: fix
+- c841f17: use hard deps
+- 966bab6: fixes
+- c03812e: Extra type generic
+- 1148e1c: fix
+- 4d37f14: remove use of global, breakinmg change
 ## 0.11.22-testing.8
 ### Patch Changes
@@ -185,38 +211,6 @@
 - release as v0.11.1
-## 1.0.0-next.5
-### Patch Changes
-- 9a9b3c4: fix compatibility with hardhat-deploy v1 .chainId file
-## 1.0.0-next.4
-### Patch Changes
-- add @rocketh/read-execute
-## 1.0.0-next.3
-### Patch Changes
-- fix dist path
-## 1.0.0-next.2
-### Patch Changes
-- update deps
-## 1.0.0-next.1
-### Patch Changes
-- fixes
-## 1.0.0-next.0
 ### Major Changes
 - first alpha release

package/dist/environment/types.d.ts CHANGED Viewed

@@ -1,12 +1,11 @@
+import type { Abi, AbiConstructor, AbiError, AbiEvent, AbiFallback, AbiFunction, AbiReceive, Narrow } from 'abitype';
 import { EIP1193Account, EIP1193DATA, EIP1193ProviderWithoutEvents, EIP1193QUANTITY, EIP1193SignerProvider, EIP1193TransactionReceipt, EIP1193WalletProvider } from 'eip-1193';
-import { Abi, Narrow, AbiError, AbiEvent, AbiConstructor, AbiFallback, AbiFunction, AbiReceive } from 'abitype';
-import type { Address, DeployContractParameters } from 'viem';
-import type { Chain } from 'viem';
+import type { Address, Chain, DeployContractParameters } from 'viem';
+import { DeterministicDeploymentInfo, type Create2DeterministicDeploymentInfo, type Create3DeterministicDeploymentInfo } from '../executor/index.js';
 import { ProgressIndicator } from '../internal/logging.js';
 import { TransactionHashTracker } from './providers/TransactionHashTracker.js';
-import { DeterministicDeploymentInfo } from '../executor/index.js';
 import { SignerProtocolFunction } from './index.js';
-export type { Abi, AbiError, AbiEvent, AbiConstructor, AbiFallback, AbiFunction, AbiReceive };
+export type { Abi, AbiConstructor, AbiError, AbiEvent, AbiFallback, AbiFunction, AbiReceive };
 export type Libraries = {
     readonly [libraryName: string]: EIP1193Account;
 };
@@ -249,7 +248,10 @@ export type ResolvedConfig<AccountsType extends UnresolvedUnknownNamedAccounts =
         name: string;
         tags: string[];
         fork?: boolean;
-        deterministicDeployment: DeterministicDeploymentInfo;
+        deterministicDeployment: {
+            create2: Create2DeterministicDeploymentInfo;
+            create3: Create3DeterministicDeploymentInfo;
+        };
         nodeUrl?: string;
         publicInfo?: {
             name: string;

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

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

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

@@ -1,7 +1,7 @@
+import { EIP1193GenericRequestProvider, EIP1193ProviderWithoutEvents } from 'eip-1193';
 import type { Config, Environment, ResolvedConfig, UnknownDeployments, UnresolvedNetworkSpecificData, UnresolvedUnknownNamedAccounts } from '../environment/types.js';
 import { SignerProtocolFunction } from '../environment/index.js';
 import { DeployScriptFunction, DeployScriptModule, EnhancedDeployScriptFunction } from './types.js';
-import { EIP1193GenericRequestProvider, EIP1193ProviderWithoutEvents } from 'eip-1193';
 /**
  * Setup function that creates the execute function for deploy scripts. It allow to specify a set of functions that will be available in the environment.
  *
@@ -15,9 +15,9 @@ import { EIP1193GenericRequestProvider, EIP1193ProviderWithoutEvents } from 'eip
  *   verify: (env: Environment, address: string) => Promise<boolean>
  * };
  *
- * const execute = setup(functions);
+ * const deployScript = setup(functions);
  *
- * export default execute(async (env, args) => {
+ * export default deployScript(async (env, args) => {
  *   // env now includes both the original environment AND the curried functions
  *   await env.deploy('MyContract', []); // No need to pass env
  *   await env.verify('0x123...'); // No need to pass env
@@ -61,12 +61,22 @@ export type ConfigOptions<Extra extends Record<string, unknown> = Record<string,
     reportGasUse?: boolean;
     extra?: Extra;
 };
-export type DeterministicDeploymentInfo = {
+export type Create2DeterministicDeploymentInfo = {
     factory: `0x${string}`;
     deployer: `0x${string}`;
     funding: string;
     signedTx: `0x${string}`;
 };
+export type Create3DeterministicDeploymentInfo = {
+    salt?: `0x${string}`;
+    factory: `0x${string}`;
+    bytecode: `0x${string}`;
+    proxyBytecode: `0x${string}`;
+};
+export type DeterministicDeploymentInfo = Create2DeterministicDeploymentInfo | {
+    create2?: Create2DeterministicDeploymentInfo;
+    create3?: Create3DeterministicDeploymentInfo;
+};
 type Networks = {
     [name: string]: {
         rpcUrl?: string;

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":"~~AAGA~~,OAAO,KAAK,EACX,MAAM,EACN,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,6BAA6B,EAC7B,8BAA8B,EAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAoB,sBAAsB,EAAC,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAC,oBAAoB,EAAE,kBAAkB,EAAE,4BAA4B,EAAsB,MAAM,YAAY,CAAC;~~AAGvH,OAAO,EAAC,6BAA6B,EAAE,4BAA4B,EAAC,MAAM,UAAU,CAAC;AAMrF~~;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,KAAK,CACpB,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,GAAG,EAAE,EAC/F,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,WAAW,SAAS,kBAAkB,GAAG,kBAAkB,EAC3D,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9D,SAAS,EAAE,SAAS,IACW,aAAa,GAAG,SAAS,EACxD,UAAU,4BAA4B,CAAC,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,CAAC,EAClG,SAAS;IAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAC,KACrF,kBAAkB,CAAC,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,CAuB7E;AAED,MAAM,MAAM,2BAA2B,CACtC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,IACvE,CAAC,aAAa,GAAG,SAAS,EAAE,WAAW,SAAS,kBAAkB,GAAG,kBAAkB,EAC1F,QAAQ,EAAE,oBAAoB,CAAC,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,EAC/E,OAAO,EAAE;IAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAC,KAC5D,kBAAkB,CAAC,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,CAAC;CAC9C;AACD,MAAM,MAAM,sBAAsB,GAAG;IACpC,OAAO,CAAC,gBAAgB,EAAE,uBAAuB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACrE,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IAC5F,OAAO,CAAC,EAAE,MAAM,GAAG;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,4BAA4B,GAAG,6BAA6B,GAAG,sBAAsB,CAAC;IACjG,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,~~2BAA2B~~,GAAG;~~IACzC~~,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;CACxB,CAAC;~~AACF~~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~~CAuC1E~~;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,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAK9F;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,EAC9D,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAKpH;AAED,wBAAsB,oBAAoB,CACzC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,EACrF,IAAI,SAAS,6BAA6B,GAAG,6BAA6B,EAC1E,aAAa,GAAG,SAAS,EAEzB,MAAM,EAAE,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,EAC3C,IAAI,CAAC,EAAE,aAAa,GAClB,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAqN/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

@@ -1,13 +1,15 @@
-import { traverseMultipleDirectory } from '../utils/fs.js';
-import path from 'node:path';
 import fs from 'node:fs';
+import path from 'node:path';
+import prompts from 'prompts';
+import { tsImport as tsImport_ } from 'tsx/esm/api';
+import { formatEther } from 'viem';
 import { createEnvironment } from '../environment/index.js';
 import { withEnvironment } from '../utils/curry.js';
 import { logger, setLogLevel, spin } from '../internal/logging.js';
 import { getRoughGasPriceEstimate } from '../utils/eth.js';
-import prompts from 'prompts';
-import { formatEther } from 'viem';
-import { tsImport } from 'tsx/esm/api';
+import { traverseMultipleDirectory } from '../utils/fs.js';
+// @ts-ignore
+const tsImport = (path, opts) => (typeof Bun !== 'undefined' ? import(path) : tsImport_(path, opts));
 /**
  * Setup function that creates the execute function for deploy scripts. It allow to specify a set of functions that will be available in the environment.
  *
@@ -21,9 +23,9 @@ import { tsImport } from 'tsx/esm/api';
  *   verify: (env: Environment, address: string) => Promise<boolean>
  * };
  *
- * const execute = setup(functions);
+ * const deployScript = setup(functions);
  *
- * export default execute(async (env, args) => {
+ * export default deployScript(async (env, args) => {
  *   // env now includes both the original environment AND the curried functions
  *   await env.deploy('MyContract', []); // No need to pass env
  *   await env.verify('0x123...'); // No need to pass env
@@ -206,12 +208,33 @@ export async function readAndResolveConfig(options) {
     return resolveConfig(await readConfig(options));
 }
 export function resolveConfig(config) {
-    let deterministicDeployment = config.network.deterministicDeployment || {
+    const create2Info = {
         factory: '0x4e59b44847b379578588920ca78fbf26c0b4956c',
         deployer: '0x3fab184622dc19b6109349b94811493bf2a45362',
         funding: '10000000000000000',
         signedTx: '0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222',
     };
+    const create3Info = {
+        factory: '0x000000000004d4f168daE7DB3C610F408eE22F57',
+        salt: '0x5361109ca02853ca8e22046b7125306d9ec4ae4cdecc393c567b6be861df3db6',
+        bytecode: '0x6080604052348015600f57600080fd5b506103ca8061001f6000396000f3fe6080604052600436106100295760003560e01c8063360d0fad1461002e5780639881d19514610077575b600080fd5b34801561003a57600080fd5b5061004e610049366004610228565b61008a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b61004e61008536600461029c565b6100ee565b6040517fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606084901b166020820152603481018290526000906054016040516020818303038152906040528051906020012091506100e78261014c565b9392505050565b6040517fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003360601b166020820152603481018290526000906054016040516020818303038152906040528051906020012091506100e734848461015e565b600061015882306101ce565b92915050565b60006f67363d3d37363d34f03d5260086018f3600052816010806000f58061018e5763301164256000526004601cfd5b8060145261d69460005260016034536017601e20915060008085516020870188855af1823b026101c65763301164256000526004601cfd5b509392505050565b60006040518260005260ff600b53836020527f21c35dbe1b344a2488cf3321d6ce542f8e9f305544ff09e4993a62319a497c1f6040526055600b20601452806040525061d694600052600160345350506017601e20919050565b6000806040838503121561023b57600080fd5b823573ffffffffffffffffffffffffffffffffffffffff8116811461025f57600080fd5b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080604083850312156102af57600080fd5b823567ffffffffffffffff8111156102c657600080fd5b8301601f810185136102d757600080fd5b803567ffffffffffffffff8111156102f1576102f161026d565b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8501160116810181811067ffffffffffffffff8211171561035d5761035d61026d565b60405281815282820160200187101561037557600080fd5b816020840160208301376000602092820183015296940135945050505056fea264697066735822122059dcc5dc6453397d13ff28021e28472a80a45bbd97f3135f69bd2650773aeb0164736f6c634300081a0033',
+        proxyBytecode: '0x67363d3d37363d34f03d5260086018f3',
+    };
+    let deterministicDeployment = {
+        create2: (() => {
+            if (!config.network.deterministicDeployment)
+                return create2Info;
+            if (!('create3' in config.network.deterministicDeployment) &&
+                !('create2' in config.network.deterministicDeployment))
+                return create2Info;
+            return config.network.deterministicDeployment.create2 || create2Info;
+        })(),
+        create3: config.network.deterministicDeployment &&
+            'create3' in config.network.deterministicDeployment &&
+            config.network.deterministicDeployment.create3
+            ? config.network.deterministicDeployment.create3
+            : create3Info,
+    };
     let scripts = ['deploy'];
     if (config.scripts) {
         if (typeof config.scripts === 'string') {

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

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

package/dist/executor/setup.test.js CHANGED Viewed

@@ -25,9 +25,9 @@ const utilityFunctions = {
     },
 };
 // Create the enhanced execute function using setup
-const execute = setup(utilityFunctions);
+const deployScript = setup(utilityFunctions);
 // Test the enhanced execute function
-const testScript = execute(async (env, args) => {
+const testScript = deployScript(async (env, args) => {
     // Type test: env should have both original Environment properties AND curried functions
     // Test curried functions (no need to pass env)
     const address = await env.deployContract('MyToken', ['TokenName', 'TKN']);
@@ -84,9 +84,9 @@ export const exampleUsage = () => {
         },
     };
     // Create the enhanced execute function
-    const execute = setup(myFunctions);
+    const deployScript = setup(myFunctions);
     // Export your deployment script
-    return execute(async (env, args) => {
+    return deployScript(async (env, args) => {
         // Now you can use the functions without passing env each time
         const tokenAddress = await env.deployERC20('MyToken', 'MTK');
         await env.setupPermissions(tokenAddress, env.namedAccounts.deployer);

package/dist/executor/setup.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"setup.test.js","sourceRoot":"","sources":["../../src/executor/setup.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AAEjC,+BAA+B;AAC/B,MAAM,OAAO,GAAG,EAAiB,CAAC;AAElC,qEAAqE;AACrE,MAAM,gBAAgB,GAAG;IACxB,cAAc,EAAE,KAAK,EAAE,GAAgB,EAAE,YAAoB,EAAE,OAAc,EAAE,EAAmB,EAAE;QACnG,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,aAAa,EAAE,IAAI,CAAC,CAAC;QAC1D,OAAO,4CAA4C,CAAC;IACrD,CAAC;IAED,cAAc,EAAE,KAAK,EAAE,GAAgB,EAAE,OAAe,EAAoB,EAAE;QAC7E,OAAO,CAAC,GAAG,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,UAAU,EAAE,KAAK,EAAE,GAAgB,EAAE,OAAe,EAAmB,EAAE;QACxE,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,QAAQ;IAC/C,CAAC;IAED,YAAY,EAAE,CAAC,GAAgB,EAAE,SAAiB,EAAU,EAAE;QAC7D,OAAO,CAAC,GAAG,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,UAAU,EAAE,CAAC,GAAgB,EAAE,YAAoB,EAAW,EAAE;QAC/D,OAAO,CAAC,GAAG,CAAC,eAAe,YAAY,cAAc,CAAC,CAAC;QACvD,OAAO,KAAK,CAAC;IACd,CAAC;CACD,CAAC;AAEF,mDAAmD;AACnD,MAAM,~~OAAO~~,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;~~AAExC~~,qCAAqC;AACrC,MAAM,UAAU,GAAG,~~OAAO~~,~~CACzB~~,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACnB,wFAAwF;IAExF,+CAA+C;IAC/C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAE3C,iEAAiE;IACjE,4DAA4D;IAC5D,mDAAmD;IACnD,oDAAoD;IAEpD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;QAC5B,OAAO;QACP,UAAU;QACV,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;QAC3B,WAAW;QACX,QAAQ;KACR,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,CAAC,gDAAgD;AAC9D,CAAC,EACD;IACC,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,YAAY,EAAE,EAAE;IAChB,EAAE,EAAE,qBAAqB;CACzB,CACD,CAAC;AAEF,mDAAmD;AACnD,KAAK,UAAU,SAAS;IACvB,kDAAkD;IAClD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;IAEzC,oDAAoD;IACpD,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;IACzE,CAAC;AACF,CAAC;AAED,gEAAgE;AAChE,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAChC,gCAAgC;IAChC,MAAM,WAAW,GAAG;QACnB,WAAW,EAAE,KAAK,EAAE,GAAgB,EAAE,IAAY,EAAE,MAAc,EAAmB,EAAE;YACtF,gEAAgE;YAChE,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,gBAAgB,EAAE,KAAK,EAAE,GAAgB,EAAE,eAAuB,EAAE,KAAa,EAAiB,EAAE;YACnG,+CAA+C;QAChD,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,GAAgB,EAAE,OAAe,EAAE,eAAsB,EAAoB,EAAE;YACxG,iDAAiD;YACjD,OAAO,IAAI,CAAC;QACb,CAAC;KACD,CAAC;IAEF,uCAAuC;IACvC,MAAM,~~OAAO~~,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;~~IAEnC~~,gCAAgC;IAChC,OAAO,~~OAAO~~,~~CACb~~,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACnB,8DAA8D;QAC9D,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC7D,MAAM,GAAG,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACrE,MAAM,GAAG,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAE9D,iDAAiD;QACjD,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEtC,OAAO,IAAI,CAAC;IACb,CAAC,EACD;QACC,IAAI,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;QACzB,YAAY,EAAE,CAAC,OAAO,CAAC;QACvB,EAAE,EAAE,iBAAiB;KACrB,CACD,CAAC;AACH,CAAC,CAAC;AAEF,2CAA2C;AAC3C,OAAO,EAAC,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAC,CAAC"}
1	+ {"version":3,"file":"setup.test.js","sourceRoot":"","sources":["../../src/executor/setup.test.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "rocketh",
-  "version": "0.11.22-testing.8",
+  "version": "0.12.1",
   "description": "deploy smart contract on ethereum-compatible networks",
   "publishConfig": {
     "access": "public"

package/src/environment/types.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import type {Abi, AbiConstructor, AbiError, AbiEvent, AbiFallback, AbiFunction, AbiReceive, Narrow} from 'abitype';
 import {
 	EIP1193Account,
 	EIP1193DATA,
@@ -7,15 +8,17 @@ import {
 	EIP1193TransactionReceipt,
 	EIP1193WalletProvider,
 } from 'eip-1193';
-import {Abi, Narrow, AbiError, AbiEvent, AbiConstructor, AbiFallback, AbiFunction, AbiReceive} from 'abitype';
-import type {Address, DeployContractParameters} from 'viem';
-import type {Chain} from 'viem';
+import type {Address, Chain, DeployContractParameters} from 'viem';
+import {
+	DeterministicDeploymentInfo,
+	type Create2DeterministicDeploymentInfo,
+	type Create3DeterministicDeploymentInfo,
+} from '../executor/index.js';
 import {ProgressIndicator} from '../internal/logging.js';
 import {TransactionHashTracker} from './providers/TransactionHashTracker.js';
-import {DeterministicDeploymentInfo} from '../executor/index.js';
 import {SignerProtocolFunction} from './index.js';
-export type {Abi, AbiError, AbiEvent, AbiConstructor, AbiFallback, AbiFunction, AbiReceive};
+export type {Abi, AbiConstructor, AbiError, AbiEvent, AbiFallback, AbiFunction, AbiReceive};
 export type Libraries = {readonly [libraryName: string]: EIP1193Account};
 export type GasEstimate = 'infinite' | `${number}`;
@@ -294,7 +297,10 @@ export type ResolvedConfig<
 		name: string;
 		tags: string[];
 		fork?: boolean;
-		deterministicDeployment: DeterministicDeploymentInfo;
+		deterministicDeployment: {
+			create2: Create2DeterministicDeploymentInfo;
+			create3: Create3DeterministicDeploymentInfo;
+		};
 		nodeUrl?: string;
 		publicInfo?: {
 			name: string;

package/src/executor/index.ts CHANGED Viewed

@@ -1,6 +1,9 @@
-import {traverseMultipleDirectory} from '../utils/fs.js';
-import path from 'node:path';
+import {EIP1193GenericRequestProvider, EIP1193ProviderWithoutEvents} from 'eip-1193';
 import fs from 'node:fs';
+import path from 'node:path';
+import prompts from 'prompts';
+import {tsImport as tsImport_} from 'tsx/esm/api';
+import {formatEther} from 'viem';
 import type {
 	Config,
 	Environment,
@@ -13,11 +16,11 @@ import {createEnvironment, SignerProtocolFunction} from '../environment/index.js
 import {DeployScriptFunction, DeployScriptModule, EnhancedDeployScriptFunction, EnhancedEnvironment} from './types.js';
 import {withEnvironment} from '../utils/curry.js';
 import {logger, setLogLevel, spin} from '../internal/logging.js';
-import {EIP1193GenericRequestProvider, EIP1193ProviderWithoutEvents} from 'eip-1193';
 import {getRoughGasPriceEstimate} from '../utils/eth.js';
-import prompts from 'prompts';
-import {formatEther} from 'viem';
-import {tsImport} from 'tsx/esm/api';
+import {traverseMultipleDirectory} from '../utils/fs.js';
+// @ts-ignore
+const tsImport = (path: string, opts: any) => (typeof Bun !== 'undefined' ? import(path) : tsImport_(path, opts));
 /**
  * Setup function that creates the execute function for deploy scripts. It allow to specify a set of functions that will be available in the environment.
@@ -32,9 +35,9 @@ import {tsImport} from 'tsx/esm/api';
  *   verify: (env: Environment, address: string) => Promise<boolean>
  * };
  *
- * const execute = setup(functions);
+ * const deployScript = setup(functions);
  *
- * export default execute(async (env, args) => {
+ * export default deployScript(async (env, args) => {
  *   // env now includes both the original environment AND the curried functions
  *   await env.deploy('MyContract', []); // No need to pass env
  *   await env.verify('0x123...'); // No need to pass env
@@ -110,12 +113,27 @@ export type ConfigOptions<Extra extends Record<string, unknown> = Record<string,
 	extra?: Extra;
 };
-export type DeterministicDeploymentInfo = {
+export type Create2DeterministicDeploymentInfo = {
 	factory: `0x${string}`;
 	deployer: `0x${string}`;
 	funding: string;
 	signedTx: `0x${string}`;
 };
+export type Create3DeterministicDeploymentInfo = {
+	salt?: `0x${string}`;
+	factory: `0x${string}`;
+	bytecode: `0x${string}`;
+	proxyBytecode: `0x${string}`;
+};
+export type DeterministicDeploymentInfo =
+	| Create2DeterministicDeploymentInfo
+	| {
+			create2?: Create2DeterministicDeploymentInfo;
+			create3?: Create3DeterministicDeploymentInfo;
+	  };
 type Networks = {
 	[name: string]: {
 		rpcUrl?: string;
@@ -330,12 +348,40 @@ export function resolveConfig<
 	NamedAccounts extends UnresolvedUnknownNamedAccounts = UnresolvedUnknownNamedAccounts,
 	Data extends UnresolvedNetworkSpecificData = UnresolvedNetworkSpecificData
 >(config: Config<NamedAccounts, Data>): ResolvedConfig<NamedAccounts, Data> {
-	let deterministicDeployment: DeterministicDeploymentInfo = config.network.deterministicDeployment || {
+	const create2Info = {
 		factory: '0x4e59b44847b379578588920ca78fbf26c0b4956c',
 		deployer: '0x3fab184622dc19b6109349b94811493bf2a45362',
 		funding: '10000000000000000',
 		signedTx:
 			'0xf8a58085174876e800830186a08080b853604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf31ba02222222222222222222222222222222222222222222222222222222222222222a02222222222222222222222222222222222222222222222222222222222222222',
+	} as const;
+	const create3Info = {
+		factory: '0x000000000004d4f168daE7DB3C610F408eE22F57',
+		salt: '0x5361109ca02853ca8e22046b7125306d9ec4ae4cdecc393c567b6be861df3db6',
+		bytecode:
+			'0x6080604052348015600f57600080fd5b506103ca8061001f6000396000f3fe6080604052600436106100295760003560e01c8063360d0fad1461002e5780639881d19514610077575b600080fd5b34801561003a57600080fd5b5061004e610049366004610228565b61008a565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200160405180910390f35b61004e61008536600461029c565b6100ee565b6040517fffffffffffffffffffffffffffffffffffffffff000000000000000000000000606084901b166020820152603481018290526000906054016040516020818303038152906040528051906020012091506100e78261014c565b9392505050565b6040517fffffffffffffffffffffffffffffffffffffffff0000000000000000000000003360601b166020820152603481018290526000906054016040516020818303038152906040528051906020012091506100e734848461015e565b600061015882306101ce565b92915050565b60006f67363d3d37363d34f03d5260086018f3600052816010806000f58061018e5763301164256000526004601cfd5b8060145261d69460005260016034536017601e20915060008085516020870188855af1823b026101c65763301164256000526004601cfd5b509392505050565b60006040518260005260ff600b53836020527f21c35dbe1b344a2488cf3321d6ce542f8e9f305544ff09e4993a62319a497c1f6040526055600b20601452806040525061d694600052600160345350506017601e20919050565b6000806040838503121561023b57600080fd5b823573ffffffffffffffffffffffffffffffffffffffff8116811461025f57600080fd5b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080604083850312156102af57600080fd5b823567ffffffffffffffff8111156102c657600080fd5b8301601f810185136102d757600080fd5b803567ffffffffffffffff8111156102f1576102f161026d565b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8501160116810181811067ffffffffffffffff8211171561035d5761035d61026d565b60405281815282820160200187101561037557600080fd5b816020840160208301376000602092820183015296940135945050505056fea264697066735822122059dcc5dc6453397d13ff28021e28472a80a45bbd97f3135f69bd2650773aeb0164736f6c634300081a0033',
+		proxyBytecode: '0x67363d3d37363d34f03d5260086018f3',
+	} as const;
+	let deterministicDeployment: {
+		create2: Create2DeterministicDeploymentInfo;
+		create3: Create3DeterministicDeploymentInfo;
+	} = {
+		create2: (() => {
+			if (!config.network.deterministicDeployment) return create2Info;
+			if (
+				!('create3' in config.network.deterministicDeployment) &&
+				!('create2' in config.network.deterministicDeployment)
+			)
+				return create2Info;
+			return config.network.deterministicDeployment.create2 || create2Info;
+		})(),
+		create3:
+			config.network.deterministicDeployment &&
+			'create3' in config.network.deterministicDeployment &&
+			config.network.deterministicDeployment.create3
+				? config.network.deterministicDeployment.create3
+				: create3Info,
 	};
 	let scripts = ['deploy'];

package/src/executor/setup.test.ts CHANGED Viewed

@@ -33,10 +33,10 @@ const utilityFunctions = {
 };
 // Create the enhanced execute function using setup
-const execute = setup(utilityFunctions);
+const deployScript = setup(utilityFunctions);
 // Test the enhanced execute function
-const testScript = execute(
+const testScript = deployScript(
 	async (env, args) => {
 		// Type test: env should have both original Environment properties AND curried functions
@@ -105,10 +105,10 @@ export const exampleUsage = () => {
 	};
 	// Create the enhanced execute function
-	const execute = setup(myFunctions);
+	const deployScript = setup(myFunctions);
 	// Export your deployment script
-	return execute(
+	return deployScript(
 		async (env, args) => {
 			// Now you can use the functions without passing env each time
 			const tokenAddress = await env.deployERC20('MyToken', 'MTK');