thirdweb 5.53.0 → 5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413

package/dist/types/wallets/types.d.ts

@@ -17,9 +17,9 @@ export type AppMetadata = {
      */
     logoUrl?: string;
 };
-export declare const socialAuthOptions: readonly ["google", "apple", "facebook", "discord", "farcaster", "telegram"];
+export declare const socialAuthOptions: readonly ["google", "apple", "facebook", "discord", "line", "farcaster", "telegram"];
 export type SocialAuthOption = (typeof socialAuthOptions)[number];
-export declare const authOptions: readonly ["google", "apple", "facebook", "discord", "farcaster", "telegram", "email", "phone", "passkey"];
+export declare const authOptions: readonly ["google", "apple", "facebook", "discord", "line", "farcaster", "telegram", "email", "phone", "passkey"];
 export type AuthOption = (typeof authOptions)[number];
 export type DisconnectFn = () => Promise<void>;
 export type SwitchChainFn = (chain: Chain) => Promise<void>;

package/dist/types/wallets/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/wallets/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,8EAOpB,CAAC;AACX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,eAAO,MAAM,WAAW,2GAKd,CAAC;AACX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAC/C,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/wallets/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,sFAQpB,CAAC;AACX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,eAAO,MAAM,WAAW,mHAKd,CAAC;AACX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAC/C,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.53.0",
+  "version": "5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -210,9 +210,9 @@
     "@radix-ui/react-focus-scope": "1.1.0",
     "@radix-ui/react-icons": "1.3.0",
     "@radix-ui/react-tooltip": "1.1.2",
-    "@tanstack/react-query": "5.54.1",
-    "@walletconnect/ethereum-provider": "2.15.2",
-    "@walletconnect/sign-client": "^2.13.3",
+    "@tanstack/react-query": "5.55.4",
+    "@walletconnect/ethereum-provider": "2.16.1",
+    "@walletconnect/sign-client": "2.16.1",
     "abitype": "1.0.5",
     "fast-text-encoding": "^1.0.6",
     "fuse.js": "7.0.0",
@@ -220,15 +220,14 @@
     "mipd": "0.0.7",
     "node-libs-browser": "2.2.1",
     "uqr": "0.1.2",
-    "viem": "2.21.2"
+    "viem": "2.21.4"
   },
   "peerDependencies": {
     "@aws-sdk/client-lambda": "^3",
     "@aws-sdk/credential-providers": "^3",
     "@coinbase/wallet-mobile-sdk": "^1",
     "@mobile-wallet-protocol/client": "^0.0.2",
-    "@react-native-async-storage/async-storage": "^1",
-    "@react-native-clipboard/clipboard": "*",
+    "@react-native-async-storage/async-storage": "^1 || ^2",
     "amazon-cognito-identity-js": "^6",
     "aws-amplify": "^5",
     "ethers": "^5 || ^6",
@@ -287,9 +286,6 @@
     "@react-native-async-storage/async-storage": {
       "optional": true
     },
-    "@react-native-clipboard/clipboard": {
-      "optional": true
-    },
     "@coinbase/wallet-mobile-sdk": {
       "optional": true
     },
@@ -301,14 +297,13 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@aws-sdk/client-lambda": "3.577.0",
-    "@aws-sdk/credential-providers": "3.577.0",
+    "@aws-sdk/client-lambda": "3.592.0",
+    "@aws-sdk/credential-providers": "3.592.0",
     "@chromatic-com/storybook": "^1.5.0",
     "@codspeed/vitest-plugin": "3.1.1",
     "@coinbase/wallet-mobile-sdk": "1.0.13",
     "@mobile-wallet-protocol/client": "0.0.2",
-    "@react-native-async-storage/async-storage": "^1.23.1",
-    "@react-native-clipboard/clipboard": "1.14.1",
+    "@react-native-async-storage/async-storage": "1.24.0",
     "@storybook/addon-essentials": "^8.2.9",
     "@storybook/addon-interactions": "^8.2.9",
     "@storybook/addon-links": "^8.2.9",
@@ -325,21 +320,21 @@
     "@vitejs/plugin-react": "^4.3.1",
     "@vitest/ui": "2.0.5",
     "amazon-cognito-identity-js": "6.3.12",
-    "aws-amplify": "5.3.18",
+    "aws-amplify": "5.3.19",
     "cross-spawn": "7.0.3",
     "ethers5": "npm:ethers@5.7.2",
     "ethers6": "npm:ethers@6.13.2",
     "expo-linking": "6.3.1",
     "expo-web-browser": "13.0.3",
     "happy-dom": "^14.12.0",
-    "msw": "^2.3.4",
-    "react-native": "0.74.5",
+    "msw": "2.4.4",
+    "react-native": "0.75.2",
     "react-native-aes-gcm-crypto": "0.2.2",
     "react-native-passkey": "3.0.0-beta2",
     "react-native-quick-crypto": "0.7.0-rc.6",
     "react-native-svg": "15.3.0",
     "storybook": "^8.2.9",
-    "typescript": "5.5.4",
+    "typescript": "5.6.2",
     "vite": "5.4.3"
   },
   "scripts": {
@@ -352,11 +347,11 @@
     "build:generate": "bun scripts/generate/generate.ts",
     "build:generate-wallets": "bun scripts/wallets/generate.ts",
     "dev": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
-    "dev:cjs": "printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json && tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false --watch",
-    "dev:esm": "printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json && tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
+    "dev:cjs": "printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json && tsc --noCheck --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false --watch",
+    "dev:esm": "printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json && tsc --noCheck --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm --watch",
     "build": "pnpm clean && pnpm build:cjs && pnpm build:esm && pnpm build:types",
-    "build:cjs": "tsc --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
-    "build:esm": "tsc --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
+    "build:cjs": "tsc --noCheck --project ./tsconfig.build.json --module commonjs --outDir ./dist/cjs --verbatimModuleSyntax false && printf '{\"type\":\"commonjs\"}' > ./dist/cjs/package.json",
+    "build:esm": "tsc --noCheck --project ./tsconfig.build.json --module es2020 --outDir ./dist/esm && printf '{\"type\": \"module\",\"sideEffects\":false}' > ./dist/esm/package.json",
     "build:types": "tsc --project ./tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "clean": "rimraf dist",
     "push": "yalc push",

package/src/analytics/track.ts

@@ -20,6 +20,35 @@ export function trackConnect(args: {
   });
 }
 
+/**
+ * @internal
+ */
+export function trackPayEvent(args: {
+  client: ThirdwebClient;
+  event: string;
+  walletAddress?: string;
+  walletType?: string;
+  fromToken?: string;
+  fromAmount?: string;
+  toToken?: string;
+  toAmount?: string;
+  chainId?: number;
+  dstChainId?: number;
+}) {
+  track(args.client, {
+    source: "pay",
+    action: args.event,
+    clientId: args.client.clientId,
+    chainId: args.chainId,
+    walletAddress: args.walletAddress,
+    walletType: args.walletType,
+    tokenAddress: args.fromToken,
+    amountWei: args.fromAmount,
+    dstTokenAddress: args.toToken,
+    dstChainId: args.chainId,
+  });
+}
+
 /**
  * @internal
  */

package/src/chains/chain-definitions/polygon.ts

@@ -6,7 +6,7 @@ import { defineChain } from "../utils.js";
 export const polygon = /*@__PURE__*/ defineChain({
   id: 137,
   name: "Polygon",
-  nativeCurrency: { name: "MATIC", symbol: "MATIC", decimals: 18 },
+  nativeCurrency: { name: "POL", symbol: "POL", decimals: 18 },
   blockExplorers: [
     {
       name: "PolygonScan",

package/src/contract/actions/compiler-metadata.ts

@@ -3,7 +3,7 @@ import type { Abi } from "abitype";
 /**
  * @contract
  */
-export type PublishedMetadata = {
+export type CompilerMetadata = {
   name: string;
   abi: Abi;
   // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later by updating this type to match the specs here: https://docs.soliditylang.org/en/latest/metadata.html
@@ -27,7 +27,7 @@ export type PublishedMetadata = {
  * @internal
  */
 // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
-export function formatCompilerMetadata(metadata: any): PublishedMetadata {
+export function formatCompilerMetadata(metadata: any): CompilerMetadata {
   const compilationTarget = metadata.settings.compilationTarget;
   const targets = Object.keys(compilationTarget);
   const name = compilationTarget[targets[0] as keyof typeof compilationTarget];

package/src/contract/deployment/deploy-deterministic.test.ts

@@ -18,13 +18,19 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
       contractId: "AccountFactory",
-      constructorParams: [TEST_ACCOUNT_A.address, ENTRYPOINT_ADDRESS_v0_6],
+      constructorParams: {
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        entrypoint: ENTRYPOINT_ADDRESS_v0_6,
+      },
     });
     const tx2 = prepareDeterministicDeployTransaction({
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
       contractId: "AccountFactory",
-      constructorParams: [TEST_ACCOUNT_A.address, ENTRYPOINT_ADDRESS_v0_6],
+      constructorParams: {
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        entrypoint: ENTRYPOINT_ADDRESS_v0_6,
+      },
     });
     const [tx1Result, tx2Result] = await Promise.all([
       simulateTransaction({ transaction: tx1 }),
@@ -38,14 +44,20 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       chain: FORKED_ETHEREUM_CHAIN,
       client: TEST_CLIENT,
       contractId: "AccountFactory",
-      constructorParams: [TEST_ACCOUNT_A.address, ENTRYPOINT_ADDRESS_v0_6],
+      constructorParams: {
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        entrypoint: ENTRYPOINT_ADDRESS_v0_6,
+      },
       salt: "some-salt",
     });
     const tx2 = prepareDeterministicDeployTransaction({
       chain: FORKED_OPTIMISM_CHAIN,
       client: TEST_CLIENT,
       contractId: "AccountFactory",
-      constructorParams: [TEST_ACCOUNT_A.address, ENTRYPOINT_ADDRESS_v0_6],
+      constructorParams: {
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        entrypoint: ENTRYPOINT_ADDRESS_v0_6,
+      },
     });
     const [tx1Result, tx2Result] = await Promise.all([
       simulateTransaction({ transaction: tx1 }),
@@ -60,7 +72,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
       chain: ANVIL_CHAIN,
       contractId: "Counter",
       publisher: "0x4a706de5CE9bfe2f9C37BA945805e396d1810824",
-      constructorParams: [],
     });
 
     const txResult = await simulateTransaction({ transaction: tx });

package/src/contract/deployment/deploy-deterministic.ts

@@ -1,5 +1,10 @@
+import type { Abi } from "abitype";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
-import { computeDeploymentInfoFromContractId } from "../../utils/any-evm/compute-published-contract-deploy-info.js";
+import {
+  computeDeploymentInfoFromBytecode,
+  computeDeploymentInfoFromContractId,
+} from "../../utils/any-evm/compute-published-contract-deploy-info.js";
+import type { Hex } from "../../utils/encoding/hex.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChain } from "../../utils/types.js";
 import { computeCreate2FactoryAddress } from "./utils/create-2-factory.js";
@@ -10,7 +15,7 @@ import { computeCreate2FactoryAddress } from "./utils/create-2-factory.js";
 export type DeployDetemisiticParams = Prettify<
   ClientAndChain & {
     contractId: string;
-    constructorParams: unknown[];
+    constructorParams?: Record<string, unknown>;
     publisher?: string;
     version?: string;
     salt?: string;
@@ -56,3 +61,31 @@ export function prepareDeterministicDeployTransaction(
     },
   });
 }
+
+/**
+ * @internal
+ */
+export function prepareDeterministicDeployTransactionFromBytecode(
+  options: ClientAndChain & {
+    abi: Abi;
+    bytecode: Hex;
+    constructorParams?: Record<string, unknown>;
+    salt?: string;
+  },
+) {
+  const { client, chain } = options;
+  return prepareTransaction({
+    client,
+    chain,
+    to: () =>
+      computeCreate2FactoryAddress({
+        client,
+        chain,
+      }),
+    data: async () => {
+      const infraContractInfo =
+        await computeDeploymentInfoFromBytecode(options);
+      return infraContractInfo.initBytecodeWithsalt;
+    },
+  });
+}

package/src/contract/deployment/deploy-via-autofactory.test.ts

@@ -39,7 +39,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         contractId: "DropERC721",
-        constructorParams: [],
       });
       if (!implementationContract) {
         throw new Error("Clone factory not found");
@@ -87,7 +86,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployFromMetadata", () => {
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,
         contractId: "DropERC721",
-        constructorParams: [],
       });
       if (!implementationContract) {
         throw new Error("Clone factory not found");

package/src/contract/deployment/deploy-via-autofactory.ts

@@ -70,6 +70,7 @@ export async function deployViaAutoFactory(
     account,
     cloneFactoryContract,
     initializeTransaction,
+    salt,
   } = options;
 
   if (isZkSyncChain(chain)) {
@@ -79,6 +80,7 @@ export async function deployViaAutoFactory(
       account,
       cloneFactoryContract,
       initializeTransaction,
+      salt,
     });
   }
 
@@ -87,6 +89,7 @@ export async function deployViaAutoFactory(
     client,
     cloneFactoryContract,
     initializeTransaction,
+    salt,
   });
   const receipt = await sendAndConfirmTransaction({
     transaction: tx,

package/src/contract/deployment/deploy-with-abi.ts

@@ -1,11 +1,10 @@
-import type {
-  AbiConstructor,
-  AbiParameter,
-  AbiParametersToPrimitiveTypes,
-} from "abitype";
+import type { Abi, AbiConstructor } from "abitype";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
 import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
+import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
+import { computeDeploymentAddress } from "../../utils/any-evm/compute-deployment-address.js";
+import { computeDeploymentInfoFromBytecode } from "../../utils/any-evm/compute-published-contract-deploy-info.js";
 import { ensureBytecodePrefix } from "../../utils/bytecode/prefix.js";
 import { concatHex } from "../../utils/encoding/helpers/concat-hex.js";
 import { type Hex, isHex } from "../../utils/encoding/hex.js";
@@ -16,16 +15,11 @@ import type { Account } from "../../wallets/interfaces/wallet.js";
 /**
  * @extension DEPLOY
  */
-export type PrepareDirectDeployTransactionOptions<
-  TConstructor extends AbiConstructor,
-  TParams = AbiParametersToPrimitiveTypes<TConstructor["inputs"]>,
-> = Prettify<
+export type PrepareDirectDeployTransactionOptions = Prettify<
   ClientAndChain & {
-    constructorAbi: TConstructor;
+    abi: Abi;
     bytecode: Hex;
-    constructorParams: TParams extends readonly AbiParameter[]
-      ? TParams
-      : readonly unknown[];
+    constructorParams?: Record<string, unknown>;
   }
 >;
 
@@ -51,13 +45,16 @@ export type PrepareDirectDeployTransactionOptions<
  * ```
  * @extension DEPLOY
  */
-export function prepareDirectDeployTransaction<
-  const TConstructor extends AbiConstructor,
->(options: PrepareDirectDeployTransactionOptions<TConstructor>) {
+export function prepareDirectDeployTransaction(
+  options: PrepareDirectDeployTransactionOptions,
+) {
   const bytecode = ensureBytecodePrefix(options.bytecode);
   if (!isHex(bytecode)) {
     throw new Error(`Contract bytecode is invalid.\n\n${bytecode}`);
   }
+  const constructorAbi = options.abi.find(
+    (abi) => abi.type === "constructor",
+  ) as AbiConstructor | undefined;
   // prepare the tx
   return prepareTransaction({
     chain: options.chain,
@@ -66,8 +63,8 @@ export function prepareDirectDeployTransaction<
     data: concatHex([
       bytecode,
       encodeAbiParameters(
-        options.constructorAbi.inputs ?? [], // Leave an empty array if there's no constructor
-        options.constructorParams,
+        constructorAbi?.inputs || [], // Leave an empty array if there's no constructor
+        normalizeFunctionParams(constructorAbi, options.constructorParams),
       ),
     ]),
   });
@@ -78,6 +75,9 @@ export function prepareDirectDeployTransaction<
  * @param options - the deploy options
  * @returns - a promise that resolves to the deployed contract address
  * @example
+ *
+ * ## Deploying a regular contract from ABI and bytecode
+ *
  * ```ts
  * import { deployContract } from "thirdweb/deployContract";
  *
@@ -85,20 +85,59 @@ export function prepareDirectDeployTransaction<
  *  client,
  *  chain,
  *  bytecode: "0x...",
- *  constructorAbi: {
- *    inputs: [{ type: "uint256", name: "value" }],
- *    type: "constructor",
+ *  abi: contractAbi,
+ *  constructorParams: {
+ *    param1: "value1",
+ *    param2: 123,
  *  },
- *  constructorParams: [123],
+ *  salt, // optional: salt enables deterministic deploys
+ * });
+ * ```
+ *
+ * ## Deploying a contract deterministically
+ *
+ * ```ts
+ * import { deployContract } from "thirdweb/deployContract";
+ *
+ * const address = await deployContract({
+ *  client,
+ *  chain,
+ *  bytecode: "0x...",
+ *  abi: contractAbi,
+ *  constructorParams: {
+ *    param1: "value1",
+ *    param2: 123,
+ *  },
+ *  salt, // passing a salt will enable deterministic deploys
  * });
  * ```
  * @extension DEPLOY
  */
-export async function deployContract<const TConstructor extends AbiConstructor>(
-  options: PrepareDirectDeployTransactionOptions<TConstructor> & {
+export async function deployContract(
+  options: PrepareDirectDeployTransactionOptions & {
     account: Account;
+    salt?: string;
   },
 ) {
+  if (options.salt !== undefined) {
+    // Deploy with CREATE2 if salt is provided
+    const info = await computeDeploymentInfoFromBytecode(options);
+    sendAndConfirmTransaction({
+      account: options.account,
+      transaction: prepareTransaction({
+        chain: options.chain,
+        client: options.client,
+        to: info.create2FactoryAddress,
+        data: info.initBytecodeWithsalt,
+      }),
+    });
+    return computeDeploymentAddress({
+      bytecode: options.bytecode,
+      encodedArgs: info.encodedArgs,
+      create2FactoryAddress: info.create2FactoryAddress,
+    });
+  }
+
   const deployTx = prepareDirectDeployTransaction(options);
   const receipt = await sendAndConfirmTransaction({
     account: options.account,

package/src/contract/deployment/publisher.test.ts

@@ -15,7 +15,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("fetchPublishedContract", () => {
       client: TEST_CLIENT,
     });
 
-    expect(result.extendedMetadata?.version).toEqual("1.0.2");
+    expect(result?.version).toEqual("1.0.2");
   });
 
   it("fetches a specific version when specified", async () => {
@@ -26,7 +26,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("fetchPublishedContract", () => {
       version: "1.0.1",
     });
 
-    expect(result.extendedMetadata?.version).toEqual("1.0.1");
+    expect(result?.version).toEqual("1.0.1");
   });
 
   it("throws an error when an invalid version is specified", async () => {

package/src/contract/deployment/utils/bootstrap.test.ts

@@ -27,7 +27,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       contractId: "Forwarder",
-      constructorParams: [],
     });
     expect(forwarder).not.toBeNull();
     if (!forwarder) {
@@ -37,7 +36,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       contractId: "TWCloneFactory",
-      constructorParams: [forwarder.address],
+      constructorParams: {
+        _trustedForwarder: forwarder.address,
+      },
     });
     expect(cloneFactory).not.toBeNull();
   });

package/src/contract/deployment/utils/bootstrap.ts

@@ -1,4 +1,5 @@
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import type { FetchDeployMetadataResult } from "../../../utils/any-evm/deploy-metadata.js";
 import { isZkSyncChain } from "../../../utils/any-evm/zksync/isZkSyncChain.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
 import { type ThirdwebContract, getContract } from "../../contract.js";
@@ -13,7 +14,8 @@ import {
 import {
   type InfraContractId,
   getDeployedInfraContract,
-  prepareInfraContractDeployTransaction,
+  getDeployedInfraContractFromMetadata,
+  prepareInfraContractDeployTransactionFromMetadata,
 } from "./infra.js";
 
 /**
@@ -22,7 +24,7 @@ import {
 export async function getOrDeployInfraForPublishedContract(
   args: ClientAndChainAndAccount & {
     contractId: string;
-    constructorParams: unknown[];
+    constructorParams?: Record<string, unknown>;
     publisher?: string;
     version?: string;
   },
@@ -46,7 +48,7 @@ export async function getOrDeployInfraForPublishedContract(
       client,
       account,
     });
-    const { compilerMetadata } = await fetchPublishedContractMetadata({
+    const compilerMetadata = await fetchPublishedContractMetadata({
       client,
       contractId: `${contractId}_ZkSync`, // different contract id for zkSync
       publisher,
@@ -124,14 +126,13 @@ export async function deployCloneFactory(options: ClientAndChainAndAccount) {
   const forwarder = await getOrDeployInfraContract({
     ...options,
     contractId: "Forwarder",
-    constructorParams: [],
   });
 
   // clone factory
   return getOrDeployInfraContract({
     ...options,
     contractId: "TWCloneFactory",
-    constructorParams: [forwarder.address],
+    constructorParams: { _trustedForwarder: forwarder.address },
   });
 }
 
@@ -142,7 +143,7 @@ export async function deployCloneFactory(options: ClientAndChainAndAccount) {
 export async function deployImplementation(
   options: ClientAndChainAndAccount & {
     contractId: string;
-    constructorParams?: unknown[];
+    constructorParams?: Record<string, unknown>;
     publisher?: string;
     version?: string;
   },
@@ -150,7 +151,7 @@ export async function deployImplementation(
   return getOrDeployInfraContract({
     ...options,
     contractId: options.contractId,
-    constructorParams: options.constructorParams || [],
+    constructorParams: options.constructorParams,
     publisher: options.publisher,
     version: options.version,
   });
@@ -163,23 +164,46 @@ export async function deployImplementation(
 export async function getOrDeployInfraContract(
   options: ClientAndChainAndAccount & {
     contractId: InfraContractId;
-    constructorParams: unknown[];
+    constructorParams?: Record<string, unknown>;
     publisher?: string;
     version?: string;
   },
 ) {
-  const infraContract = await getDeployedInfraContract(options);
+  const contractMetadata = await fetchPublishedContractMetadata({
+    client: options.client,
+    contractId: options.contractId,
+    publisher: options.publisher,
+    version: options.version,
+  });
+  return getOrDeployInfraContractFromMetadata({
+    account: options.account,
+    chain: options.chain,
+    client: options.client,
+    constructorParams: options.constructorParams,
+    contractMetadata,
+  });
+}
+
+export async function getOrDeployInfraContractFromMetadata(
+  options: ClientAndChainAndAccount & {
+    contractMetadata: FetchDeployMetadataResult;
+    constructorParams?: Record<string, unknown>;
+  },
+) {
+  const infraContract = await getDeployedInfraContractFromMetadata(options);
   if (infraContract) {
     return infraContract;
   }
-  const transaction = prepareInfraContractDeployTransaction(options);
+  const transaction =
+    prepareInfraContractDeployTransactionFromMetadata(options);
   await sendAndConfirmTransaction({
     transaction,
     account: options.account,
   });
-  const deployedInfraContract = await getDeployedInfraContract(options);
+  const deployedInfraContract =
+    await getDeployedInfraContractFromMetadata(options);
   if (!deployedInfraContract) {
-    throw new Error(`Failed to deploy ${options.contractId}`);
+    throw new Error(`Failed to deploy ${options.contractMetadata.name}`);
   }
   return deployedInfraContract;
 }

package/src/contract/deployment/utils/clone-factory.ts

@@ -9,7 +9,6 @@ export async function getDeployedCloneFactoryContract(args: ClientAndChain) {
   const forwarder = await getDeployedInfraContract({
     ...args,
     contractId: "Forwarder",
-    constructorParams: [],
   });
   if (!forwarder) {
     return null;
@@ -19,7 +18,7 @@ export async function getDeployedCloneFactoryContract(args: ClientAndChain) {
   const cloneFactory = await getDeployedInfraContract({
     ...args,
     contractId: "TWCloneFactory",
-    constructorParams: [forwarder.address],
+    constructorParams: { _trustedForwarder: forwarder.address },
   });
   if (!cloneFactory) {
     return null;