@rocketh/deploy 0.12.0 → 0.13.0

package/dist/index.d.ts

@@ -7,7 +7,10 @@ export type DeployResult<TAbi extends Abi> = Deployment<TAbi> & {
 export type DeployFunction = <TAbi extends Abi, TChain extends Chain = Chain>(name: string, args: DeploymentConstruction<TAbi>, options?: DeployOptions) => Promise<DeployResult<TAbi>>;
 export type DeployOptions = {
     linkedData?: LinkedData;
-    deterministic?: boolean | `0x${string}`;
+    deterministic?: boolean | `0x${string}` | {
+        type: 'create2' | 'create3';
+        salt?: `0x${string}`;
+    };
     libraries?: {
         [name: string]: Address;
     };
@@ -16,6 +19,6 @@ export type DeployOptions = {
 } | {
     alwaysOverride?: boolean;
 });
-export declare function deploy<TAbi extends Abi>(env: Environment, name: string, // '' allow to not save it
-args: DeploymentConstruction<TAbi>, options?: DeployOptions): Promise<DeployResult<TAbi>>;
+export declare function deploy(env: Environment): <TAbi extends Abi>(name: string, // '' allow to not save it
+args: DeploymentConstruction<TAbi>, options?: DeployOptions) => Promise<DeployResult<TAbi>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAE5B,OAAO,KAAK,EACX,sBAAsB,EACtB,UAAU,EACV,WAAW,EAIX,UAAU,EACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,OAAO,EAAE,KAAK,EAA0B,MAAM,MAAM,CAAC;AAM7D,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG;IAAC,aAAa,EAAE,OAAO,CAAA;CAAC,CAAC;AAEzF,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,GAAG,KAAK,EAC3E,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,KACnB,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AAEjC,MAAM,MAAM,aAAa,GAAG;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,GAAG,KAAK,MAAM,EAAE,CAAC;IACxC,SAAS,CAAC,EAAE;QAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,CAAC;CACtC,GAAG,CACD;IACA,qBAAqB,CAAC,EAAE,OAAO,CAAC;CAC/B,GACD;IACA,cAAc,CAAC,EAAE,OAAO,CAAC;CACxB,CACH,CAAC;AAwFF,wBAAsB,MAAM,CAAC,IAAI,SAAS,GAAG,EAC5C,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EAAE,0BAA0B;AACxC,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CA8M7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAG5B,OAAO,KAAK,EACX,sBAAsB,EACtB,UAAU,EACV,WAAW,EACX,UAAU,EAIV,MAAM,SAAS,CAAC;AACjB,OAAO,EACN,OAAO,EACP,KAAK,EAQL,MAAM,MAAM,CAAC;AAId,MAAM,MAAM,YAAY,CAAC,IAAI,SAAS,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG;IAAC,aAAa,EAAE,OAAO,CAAA;CAAC,CAAC;AAEzF,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,SAAS,GAAG,EAAE,MAAM,SAAS,KAAK,GAAG,KAAK,EAC3E,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,KACnB,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;AAEjC,MAAM,MAAM,aAAa,GAAG;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,aAAa,CAAC,EACX,OAAO,GACP,KAAK,MAAM,EAAE,GACb;QACA,IAAI,EAAE,SAAS,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;KACpB,CAAC;IACL,SAAS,CAAC,EAAE;QAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAC,CAAC;CACtC,GAAG,CACD;IACA,qBAAqB,CAAC,EAAE,OAAO,CAAC;CAC/B,GACD;IACA,cAAc,CAAC,EAAE,OAAO,CAAC;CACxB,CACH,CAAC;AA6NF,wBAAgB,MAAM,CAAC,GAAG,EAAE,WAAW,GAAG,CAAC,IAAI,SAAS,GAAG,EAC1D,IAAI,EAAE,MAAM,EAAE,0BAA0B;AACxC,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,EAClC,OAAO,CAAC,EAAE,aAAa,KACnB,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CA0K/B"}

package/dist/index.js

@@ -1,6 +1,5 @@
-import { encodePacked, keccak256 } from 'viem';
-import { encodeDeployData } from 'viem';
 import { logs } from 'named-logs';
+import { encodeDeployData, encodeFunctionData, encodePacked, getCreate2Address, keccak256, parseAbi, zeroHash, } from 'viem';
 const logger = logs('@rocketh/deploy');
 async function broadcastTransaction(env, signer, params) {
     if (signer.type === 'wallet' || signer.type === 'remote') {
@@ -68,179 +67,259 @@ function linkLibraries(artifact, libraries) {
     // TODO return libraries object with path name <filepath.sol>:<name> for names
     return bytecode;
 }
-export async function deploy(env, name, // '' allow to not save it
-args, options) {
-    const nameToDisplay = name || '<no name>';
-    const skipIfAlreadyDeployed = options && 'skipIfAlreadyDeployed' in options && options.skipIfAlreadyDeployed;
-    const allwaysOverride = options && 'allwaysOverride' in options && options.allwaysOverride;
-    if (allwaysOverride && skipIfAlreadyDeployed) {
-        throw new Error(`conflicting options: "allwaysOverride" and "skipIfAlreadyDeployed"`);
-    }
-    const existingDeployment = name && env.getOrNull(name);
-    if (existingDeployment && skipIfAlreadyDeployed) {
-        logger.info(`deployment for ${nameToDisplay} at ${existingDeployment.address}, skipIfAlreadyDeployed: true => we skip`);
-        return { ...existingDeployment, newlyDeployed: false };
-    }
-    const { account, artifact, ...viemArgs } = args;
-    let address;
-    if (account.startsWith('0x')) {
-        address = account;
-    }
-    else {
-        if (env.namedAccounts) {
-            address = env.namedAccounts[account];
-            if (!address) {
-                throw new Error(`no address for ${account}`);
-            }
-        }
-        else {
-            throw new Error(`no accounts setup, cannot get address for ${account}`);
+async function getCreate2Factory(env, signer, params) {
+    const deploymentInfo = env.config.network.deterministicDeployment.create2;
+    if (!deploymentInfo)
+        throw new Error('create2 deterministic deployment info not found');
+    const factoryAddress = deploymentInfo.factory;
+    const factoryDeployerAddress = deploymentInfo.deployer;
+    const factoryDeploymentData = deploymentInfo.signedTx;
+    const funding = BigInt(deploymentInfo.funding);
+    const code = await env.network.provider.request({
+        method: 'eth_getCode',
+        params: [factoryAddress, 'latest'],
+    });
+    if (code === '0x') {
+        const balanceHexString = await env.network.provider.request({
+            method: 'eth_getBalance',
+            params: [factoryAddress, 'latest'],
+        });
+        const balance = BigInt(balanceHexString);
+        if (balance < funding) {
+            const need = funding - balance;
+            const balanceToSend = `0x${need.toString(16)}`;
+            const txHash = await broadcastTransaction(env, signer, [
+                {
+                    type: '0x2',
+                    chainId: params.chainId,
+                    from: params.address,
+                    to: factoryDeployerAddress,
+                    value: balanceToSend,
+                    gas: `0x${BigInt(21000).toString(16)}`,
+                    maxFeePerGas: params.maxFeePerGas,
+                    maxPriorityFeePerGas: params.maxPriorityFeePerGas,
+                },
+            ]);
+            await env.savePendingExecution({
+                type: 'execution', // TODO different type ?
+                transaction: { hash: txHash, origin: params.address },
+            });
         }
+        const txHash = await env.network.provider.request({
+            method: 'eth_sendRawTransaction',
+            params: [factoryDeploymentData],
+        });
+        await env.savePendingExecution({
+            type: 'execution', // TODO different type ?
+            transaction: { hash: txHash, origin: params.address },
+        });
     }
-    // TODO throw specific error if artifact not found
-    const artifactToUse = artifact;
-    const bytecode = linkLibraries(artifactToUse, options?.libraries);
-    const abi = artifactToUse.abi;
-    const argsToUse = {
-        ...viemArgs,
-        account,
-        abi,
-        bytecode,
+    return {
+        getExpectedAddress: ({ salt, bytecode }) => getCreate2Address({
+            bytecode,
+            from: factoryAddress,
+            salt,
+        }),
+        encodeData: ({ salt, bytecode }) => (salt + (bytecode.slice(2) || '')),
+        factoryAddress,
     };
-    const calldata = encodeDeployData(argsToUse); // TODO any
-    const argsData = `0x${calldata.replace(bytecode, '')}`;
-    if (existingDeployment) {
-        logger.info(`existing deployment for ${nameToDisplay} at ${existingDeployment.address}`);
+}
+async function getCreate3Factory(env, signer, params) {
+    const deploymentInfo = env.config.network.deterministicDeployment.create3;
+    if (!deploymentInfo)
+        throw new Error('create3 deterministic deployment info not found');
+    const factoryAddress = deploymentInfo.factory;
+    const factoryBytecode = deploymentInfo.bytecode;
+    const proxyBytecode = deploymentInfo.proxyBytecode;
+    const code = await env.network.provider.request({
+        method: 'eth_getCode',
+        params: [factoryAddress, 'latest'],
+    });
+    if (code === '0x') {
+        const create2 = await getCreate2Factory(env, signer, params);
+        const salt = deploymentInfo.salt || zeroHash;
+        const expectedAddress = create2.getExpectedAddress({ salt, bytecode: factoryBytecode });
+        if (expectedAddress.toLowerCase() !== factoryAddress.toLowerCase())
+            throw new Error(`create3 factory at ${factoryAddress} is not the expected address ${expectedAddress}`);
+        const txHash = await broadcastTransaction(env, signer, [
+            {
+                type: '0x2',
+                chainId: params.chainId,
+                from: params.address,
+                to: create2.factoryAddress,
+                data: create2.encodeData({ salt, bytecode: factoryBytecode }),
+                maxFeePerGas: params.maxFeePerGas,
+                maxPriorityFeePerGas: params.maxPriorityFeePerGas,
+            },
+        ]);
+        await env.savePendingExecution({
+            type: 'execution', // TODO different type ?
+            transaction: { hash: txHash, origin: params.address },
+        });
     }
-    if (existingDeployment && !allwaysOverride) {
-        const previousBytecode = existingDeployment.bytecode;
-        const previousArgsData = existingDeployment.argsData;
-        // we assume cbor encoding of hash at the end
-        // TODO option to remove it, can parse metadata but would rather avoid this here
-        const last2Bytes = previousBytecode.slice(-4);
-        const cborLength = parseInt(last2Bytes, 16);
-        const previousBytecodeWithoutCBOR = previousBytecode.slice(0, -cborLength * 2);
-        const newBytecodeWithoutCBOR = bytecode.slice(0, -cborLength * 2);
-        if (previousBytecodeWithoutCBOR === newBytecodeWithoutCBOR && previousArgsData === argsData) {
+    return {
+        getExpectedAddress: ({ salt }) => {
+            const namespacedSalt = keccak256(encodePacked(['address', 'bytes32'], [params.address, salt]));
+            const proxyAddress = getCreate2Address({
+                from: factoryAddress,
+                salt: namespacedSalt,
+                bytecode: proxyBytecode,
+            });
+            // This follows the RLP encoding rules for contract addresses created by CREATE
+            // prefix ++ address ++ nonce, where:
+            // prefix = 0xd6 (0xc0 + 0x16), where 0x16 is length of: 0x94 ++ address ++ 0x01
+            // 0x94 = 0x80 + 0x14 (0x14 is the length of an address)
+            const rlpEncodedData = encodePacked(['bytes1', 'bytes1', 'address', 'bytes1'], ['0xd6', '0x94', proxyAddress, '0x01']);
+            return `0x${keccak256(rlpEncodedData).slice(26)}`;
+        },
+        encodeData: ({ salt, bytecode }) => encodeFunctionData({
+            abi: parseAbi(['function deployDeterministic(bytes memory,bytes32) external returns (address)']),
+            args: [bytecode, salt],
+        }),
+        factoryAddress,
+    };
+}
+export function deploy(env) {
+    return async (name, args, options) => {
+        const nameToDisplay = name || '<no name>';
+        const skipIfAlreadyDeployed = options && 'skipIfAlreadyDeployed' in options && options.skipIfAlreadyDeployed;
+        const allwaysOverride = options && 'allwaysOverride' in options && options.allwaysOverride;
+        if (allwaysOverride && skipIfAlreadyDeployed) {
+            throw new Error(`conflicting options: "allwaysOverride" and "skipIfAlreadyDeployed"`);
+        }
+        const existingDeployment = name && env.getOrNull(name);
+        if (existingDeployment && skipIfAlreadyDeployed) {
+            logger.info(`deployment for ${nameToDisplay} at ${existingDeployment.address}, skipIfAlreadyDeployed: true => we skip`);
             return { ...existingDeployment, newlyDeployed: false };
         }
-        else {
-            // logger.info(`-------------- WITHOUT CBOR---------------------`);
-            // logger.info(previousBytecodeWithoutCBOR);
-            // logger.info(newBytecodeWithoutCBOR);
-            // logger.info(`-----------------------------------`);
-            // logger.info(`-------------- ARGS DATA ---------------------`);
-            // logger.info(previousArgsData);
-            // logger.info(argsData);
-            // logger.info(`-----------------------------------`);
+        const { account, artifact, ...viemArgs } = args;
+        let address;
+        if (account.startsWith('0x')) {
+            address = account;
         }
-    }
-    const partialDeployment = {
-        ...artifactToUse,
-        argsData,
-        linkedData: options?.linkedData,
-    };
-    const signer = env.addressSigners[address];
-    const chainId = `0x${env.network.chain.id.toString(16)}`;
-    const maxFeePerGas = viemArgs.maxFeePerGas && `0x${viemArgs.maxFeePerGas.toString(16)}`;
-    const maxPriorityFeePerGas = viemArgs.maxPriorityFeePerGas && `0x${viemArgs.maxPriorityFeePerGas.toString(16)}`;
-    const params = [
-        {
-            type: '0x2',
-            from: address,
-            chainId,
-            data: calldata,
-            gas: viemArgs.gas && `0x${viemArgs.gas.toString(16)}`,
-            maxFeePerGas,
-            maxPriorityFeePerGas,
-            // gasPrice: viemArgs.gasPrice && `0x${viemArgs.gasPrice.toString(16)}` as `0x${string}`,
-            // value: `0x${viemArgs.value?.toString(16)}` as `0x${string}`,
-            // nonce: viemArgs.nonce && (`0x${viemArgs.nonce.toString(16)}` as `0x${string}`),
-        },
-    ];
-    let expectedAddress = undefined;
-    if (options?.deterministic) {
-        const deterministicDeploymentInfo = env.config.network.deterministicDeployment;
-        const deterministicFactoryAddress = deterministicDeploymentInfo.factory;
-        const deterministicFactoryDeployerAddress = deterministicDeploymentInfo.deployer;
-        const factoryDeploymentData = deterministicDeploymentInfo.signedTx;
-        const funding = BigInt(deterministicDeploymentInfo.funding);
-        const code = await env.network.provider.request({
-            method: 'eth_getCode',
-            params: [deterministicFactoryAddress, 'latest'],
-        });
-        if (code === '0x') {
-            const balanceHexString = await env.network.provider.request({
-                method: 'eth_getBalance',
-                params: [deterministicFactoryDeployerAddress, 'latest'],
-            });
-            const balance = BigInt(balanceHexString);
-            if (balance < funding) {
-                const need = funding - balance;
-                const balanceToSend = `0x${need.toString(16)}`;
-                const txHash = await broadcastTransaction(env, signer, [
-                    {
-                        type: '0x2',
-                        chainId,
-                        from: address,
-                        to: deterministicFactoryDeployerAddress,
-                        value: balanceToSend,
-                        gas: `0x${BigInt(21000).toString(16)}`,
-                        maxFeePerGas,
-                        maxPriorityFeePerGas,
-                    },
-                ]);
-                await env.savePendingExecution({
-                    type: 'execution', // TODO different type ?
-                    transaction: { hash: txHash, origin: address },
-                });
+        else {
+            if (env.namedAccounts) {
+                address = env.namedAccounts[account];
+                if (!address) {
+                    throw new Error(`no address for ${account}`);
+                }
+            }
+            else {
+                throw new Error(`no accounts setup, cannot get address for ${account}`);
             }
-            const txHash = await env.network.provider.request({
-                method: 'eth_sendRawTransaction',
-                params: [factoryDeploymentData],
-            });
-            await env.savePendingExecution({
-                type: 'execution', // TODO different type ?
-                transaction: { hash: txHash, origin: address },
-            });
         }
-        // prepending the salt
-        const salt = (typeof options.deterministic === 'string'
-            ? `0x${options.deterministic.slice(2).padStart(64, '0')}`
-            : '0x0000000000000000000000000000000000000000000000000000000000000000');
-        const bytecode = params[0].data || '0x';
-        expectedAddress = ('0x' +
-            keccak256(`0xff${deterministicFactoryAddress.slice(2)}${salt.slice(2)}${keccak256(bytecode).slice(2)}`).slice(-40));
-        const codeAlreadyDeployed = await env.network.provider.request({
-            method: 'eth_getCode',
-            params: [expectedAddress, 'latest'],
-        });
-        if (codeAlreadyDeployed !== '0x') {
-            env.showMessage(`contract was already deterministically deployed at ${expectedAddress}`);
-            if (name) {
-                const deployment = await env.save(name, {
-                    address: expectedAddress,
-                    ...partialDeployment,
-                }, { doNotCountAsNewDeployment: true });
-                return { ...deployment, newlyDeployed: false };
+        // TODO throw specific error if artifact not found
+        const artifactToUse = artifact;
+        const bytecode = linkLibraries(artifactToUse, options?.libraries);
+        const abi = artifactToUse.abi;
+        const argsToUse = {
+            ...viemArgs,
+            account,
+            abi,
+            bytecode,
+        };
+        const calldata = encodeDeployData(argsToUse); // TODO any
+        const argsData = `0x${calldata.replace(bytecode, '')}`;
+        if (existingDeployment) {
+            logger.info(`existing deployment for ${nameToDisplay} at ${existingDeployment.address}`);
+        }
+        if (existingDeployment && !allwaysOverride) {
+            const previousBytecode = existingDeployment.bytecode;
+            const previousArgsData = existingDeployment.argsData;
+            // we assume cbor encoding of hash at the end
+            // TODO option to remove it, can parse metadata but would rather avoid this here
+            const last2Bytes = previousBytecode.slice(-4);
+            const cborLength = parseInt(last2Bytes, 16);
+            const previousBytecodeWithoutCBOR = previousBytecode.slice(0, -cborLength * 2);
+            const newBytecodeWithoutCBOR = bytecode.slice(0, -cborLength * 2);
+            if (previousBytecodeWithoutCBOR === newBytecodeWithoutCBOR && previousArgsData === argsData) {
+                return { ...existingDeployment, newlyDeployed: false };
             }
             else {
-                return { address: expectedAddress, ...partialDeployment, newlyDeployed: false };
+                // logger.info(`-------------- WITHOUT CBOR---------------------`);
+                // logger.info(previousBytecodeWithoutCBOR);
+                // logger.info(newBytecodeWithoutCBOR);
+                // logger.info(`-----------------------------------`);
+                // logger.info(`-------------- ARGS DATA ---------------------`);
+                // logger.info(previousArgsData);
+                // logger.info(argsData);
+                // logger.info(`-----------------------------------`);
             }
         }
-        params[0].data = (salt + (bytecode.slice(2) || ''));
-        params[0].to = deterministicFactoryAddress;
-    }
-    const txHash = await broadcastTransaction(env, signer, params);
-    const pendingDeployment = {
-        type: 'deployment',
-        expectedAddress,
-        partialDeployment,
-        transaction: { hash: txHash, origin: address },
-        name,
-        // TODO we should have the nonce, except for wallet like metamask where it is not usre you get the nonce you start with
+        const partialDeployment = {
+            ...artifactToUse,
+            argsData,
+            linkedData: options?.linkedData,
+        };
+        const signer = env.addressSigners[address];
+        const chainId = `0x${env.network.chain.id.toString(16)}`;
+        const maxFeePerGas = viemArgs.maxFeePerGas && `0x${viemArgs.maxFeePerGas.toString(16)}`;
+        const maxPriorityFeePerGas = viemArgs.maxPriorityFeePerGas && `0x${viemArgs.maxPriorityFeePerGas.toString(16)}`;
+        const params = [
+            {
+                type: '0x2',
+                from: address,
+                chainId,
+                data: calldata,
+                gas: viemArgs.gas && `0x${viemArgs.gas.toString(16)}`,
+                maxFeePerGas,
+                maxPriorityFeePerGas,
+                // gasPrice: viemArgs.gasPrice && `0x${viemArgs.gasPrice.toString(16)}` as `0x${string}`,
+                // value: `0x${viemArgs.value?.toString(16)}` as `0x${string}`,
+                // nonce: viemArgs.nonce && (`0x${viemArgs.nonce.toString(16)}` as `0x${string}`),
+            },
+        ];
+        let expectedAddress = undefined;
+        if (options?.deterministic) {
+            const [deterministicType, salt] = (() => {
+                const normalizeSalt = (salt) => typeof salt === 'string' ? `0x${salt.slice(2).padStart(64, '0')}` : zeroHash;
+                if (typeof options.deterministic !== 'object')
+                    return ['create2', normalizeSalt(options.deterministic)];
+                if (options.deterministic.type === 'create2')
+                    return ['create2', normalizeSalt(options.deterministic.salt)];
+                if (options.deterministic.type === 'create3')
+                    return ['create3', normalizeSalt(options.deterministic.salt)];
+                throw new Error(`unknown deterministic type: ${options.deterministic.type}`);
+            })();
+            const bytecode = params[0].data || '0x';
+            const factoryParams = { chainId, address, maxFeePerGas, maxPriorityFeePerGas };
+            const create = deterministicType === 'create2'
+                ? await getCreate2Factory(env, signer, factoryParams)
+                : await getCreate3Factory(env, signer, factoryParams);
+            expectedAddress = create.getExpectedAddress({ salt, bytecode });
+            const codeAlreadyDeployed = await env.network.provider.request({
+                method: 'eth_getCode',
+                params: [expectedAddress, 'latest'],
+            });
+            if (codeAlreadyDeployed !== '0x') {
+                if (deterministicType === 'create3' && codeAlreadyDeployed !== bytecode)
+                    throw new Error(`code already deployed at ${expectedAddress} but is not the expected bytecode`);
+                env.showMessage(`contract was already deterministically deployed at ${expectedAddress}`);
+                if (name) {
+                    const deployment = await env.save(name, {
+                        address: expectedAddress,
+                        ...partialDeployment,
+                    }, { doNotCountAsNewDeployment: true });
+                    return { ...deployment, newlyDeployed: false };
+                }
+                else {
+                    return { address: expectedAddress, ...partialDeployment, newlyDeployed: false };
+                }
+            }
+            params[0].data = create.encodeData({ salt, bytecode });
+            params[0].to = create.factoryAddress;
+        }
+        const txHash = await broadcastTransaction(env, signer, params);
+        const pendingDeployment = {
+            type: 'deployment',
+            expectedAddress,
+            partialDeployment,
+            transaction: { hash: txHash, origin: address },
+            name,
+            // TODO we should have the nonce, except for wallet like metamask where it is not usre you get the nonce you start with
+        };
+        const deployment = await env.savePendingDeployment(pendingDeployment);
+        return { ...deployment, newlyDeployed: true };
     };
-    const deployment = await env.savePendingDeployment(pendingDeployment);
-    return { ...deployment, newlyDeployed: true };
 }
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketh/deploy",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "provide deploy function for rocketh",
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,7 @@
     "eip-1193": "^0.6.2",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.2",
-    "rocketh": "0.12.0"
+    "rocketh": "0.13.0"
   },
   "dependencies": {
     "named-logs": "^0.3.2",