bytes32 salt for deterministic deployment

Author: kumaryash90

packages/thirdweb/src/utils/any-evm/compute-deployment-address.ts

@@ -1,6 +1,7 @@
 import { type Hex, encodePacked } from "viem";
 import { getAddress } from "../address.js";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
+import { isHex } from "../encoding/hex.js";
 import { keccak256 } from "../hashing/keccak256.js";
 import { getSaltHash } from "./get-salt-hash.js";
 import { keccakId } from "./keccak-id.js";
@@ -33,7 +34,9 @@ export function computeDeploymentAddress(
 ) {
   const bytecode = ensureBytecodePrefix(options.bytecode);
   const saltHash = options.salt
-    ? keccakId(options.salt)
+    ? isHex(options.salt) && options.salt.length === 66
+      ? options.salt
+      : keccakId(options.salt)
     : getSaltHash(bytecode);
 
   // 1. create init bytecode hash with contract's bytecode and encoded args

packages/thirdweb/src/utils/any-evm/compute-published-contract-deploy-info.ts

@@ -96,5 +96,6 @@ export async function computeDeploymentInfoFromBytecode(args: {
     initBytecodeWithsalt,
     encodedArgs,
     create2FactoryAddress,
+    salt,
   };
 }

packages/thirdweb/src/utils/any-evm/get-init-bytecode-with-salt.ts

@@ -1,6 +1,6 @@
 import { encodePacked } from "viem/utils";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
-import { type Hex, uint8ArrayToHex } from "../encoding/hex.js";
+import { type Hex, isHex, uint8ArrayToHex } from "../encoding/hex.js";
 import { getSaltHash } from "./get-salt-hash.js";
 import { keccakId } from "./keccak-id.js";
 
@@ -29,8 +29,11 @@ export function getInitBytecodeWithSalt(
   options: GetInitiBytecodeWithSaltOptions,
 ): Hex {
   const bytecode = ensureBytecodePrefix(options.bytecode);
+
   const saltHash = options.salt
-    ? keccakId(options.salt)
+    ? isHex(options.salt) && options.salt.length === 66
+      ? options.salt
+      : keccakId(options.salt)
     : getSaltHash(bytecode);
 
   const encodedArgs =

packages/thirdweb/src/utils/any-evm/zksync/computeDeploymentAddress.ts

@@ -1,5 +1,5 @@
 import type { Address } from "../../address.js";
-import type { Hex } from "../../encoding/hex.js";
+import { type Hex, isHex } from "../../encoding/hex.js";
 import { keccakId } from "../keccak-id.js";
 import { create2Address } from "./create2Address.js";
 
@@ -13,7 +13,11 @@ type ComputeDeploymentAddressOptions = {
 export function computeDeploymentAddress(
   options: ComputeDeploymentAddressOptions,
 ) {
-  const saltHash = options.salt ? keccakId(options.salt) : keccakId("thirdweb");
+  const saltHash = options.salt
+    ? isHex(options.salt) && options.salt.length === 66
+      ? options.salt
+      : keccakId(options.salt)
+    : keccakId("thirdweb");
 
   return create2Address({
     sender: options.create2FactoryAddress,