thirdweb 5.53.1-nightly-865c5e3b16af70c3660f30ba8cffc5d6e360a389-20240911000352 → 5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413

package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatFlow.tsx

@@ -1,4 +1,5 @@
 import { useCallback, useState } from "react";
+import { trackPayEvent } from "../../../../../../../analytics/track.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
 import type { BuyWithFiatQuote } from "../../../../../../../pay/buyWithFiat/getQuote.js";
 import {
@@ -88,6 +89,12 @@ export function FiatFlow(props: {
         step={1}
         onContinue={() => {
           const popup = openOnrampPopup(props.quote.onRampLink, props.theme);
+          trackPayEvent({
+            event: "open_onramp_popup",
+            client: props.client,
+            walletAddress: props.payer.account.address,
+            walletType: props.payer.wallet.id,
+          });
           addPendingTx({
             type: "fiat",
             intentId: props.quote.intentId,

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx

@@ -1,5 +1,6 @@
 import { CrossCircledIcon } from "@radix-ui/react-icons";
 import { useState } from "react";
+import { trackPayEvent } from "../../../../../../../analytics/track.js";
 import type { Chain } from "../../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../../client/client.js";
 import type { BuyWithCryptoQuote } from "../../../../../../../pay/buyWithCrypto/getQuote.js";
@@ -190,6 +191,19 @@ export function SwapConfirmationScreen(props: {
               try {
                 setStatus("pending");
 
+                trackPayEvent({
+                  event: "prompt_swap_approval",
+                  client: props.client,
+                  walletAddress: props.payer.account.address,
+                  walletType: props.payer.wallet.id,
+                  fromToken: props.quote.swapDetails.fromToken.tokenAddress,
+                  fromAmount: props.quote.swapDetails.fromAmountWei,
+                  toToken: props.quote.swapDetails.toToken.tokenAddress,
+                  toAmount: props.quote.swapDetails.toAmountWei,
+                  chainId: props.quote.swapDetails.fromToken.chainId,
+                  dstChainId: props.quote.swapDetails.toToken.chainId,
+                });
+
                 const tx = await sendTransaction({
                   account: props.payer.account,
                   transaction: props.quote.approval,
@@ -198,6 +212,19 @@ export function SwapConfirmationScreen(props: {
                 await waitForReceipt({ ...tx, maxBlocksWaitTime: 50 });
                 // props.onQuoteFinalized(props.quote);
 
+                trackPayEvent({
+                  event: "swap_approval_success",
+                  client: props.client,
+                  walletAddress: props.payer.account.address,
+                  walletType: props.payer.wallet.id,
+                  fromToken: props.quote.swapDetails.fromToken.tokenAddress,
+                  fromAmount: props.quote.swapDetails.fromAmountWei,
+                  toToken: props.quote.swapDetails.toToken.tokenAddress,
+                  toAmount: props.quote.swapDetails.toAmountWei,
+                  chainId: props.quote.swapDetails.fromToken.chainId,
+                  dstChainId: props.quote.swapDetails.toToken.chainId,
+                });
+
                 setStep("swap");
                 setStatus("idle");
               } catch (e) {
@@ -223,6 +250,19 @@ export function SwapConfirmationScreen(props: {
                   };
                 }
 
+                trackPayEvent({
+                  event: "prompt_swap_execution",
+                  client: props.client,
+                  walletAddress: props.payer.account.address,
+                  walletType: props.payer.wallet.id,
+                  fromToken: props.quote.swapDetails.fromToken.tokenAddress,
+                  fromAmount: props.quote.swapDetails.fromAmountWei,
+                  toToken: props.quote.swapDetails.toToken.tokenAddress,
+                  toAmount: props.quote.swapDetails.toAmountWei,
+                  chainId: props.quote.swapDetails.fromToken.chainId,
+                  dstChainId: props.quote.swapDetails.toToken.chainId,
+                });
+
                 const _swapTx = await sendTransaction({
                   account: props.payer.account,
                   transaction: tx,
@@ -230,6 +270,19 @@ export function SwapConfirmationScreen(props: {
 
                 await waitForReceipt({ ..._swapTx, maxBlocksWaitTime: 50 });
 
+                trackPayEvent({
+                  event: "swap_execution_success",
+                  client: props.client,
+                  walletAddress: props.payer.account.address,
+                  walletType: props.payer.wallet.id,
+                  fromToken: props.quote.swapDetails.fromToken.tokenAddress,
+                  fromAmount: props.quote.swapDetails.fromAmountWei,
+                  toToken: props.quote.swapDetails.toToken.tokenAddress,
+                  toAmount: props.quote.swapDetails.toAmountWei,
+                  chainId: props.quote.swapDetails.toToken.chainId,
+                  dstChainId: props.quote.swapDetails.toToken.chainId,
+                });
+
                 // do not add pending tx if the swap is part of fiat flow
                 if (!props.isFiatFlow) {
                   addPendingTx({

package/src/react/web/ui/TransactionButton/TransactionModal.tsx

@@ -1,10 +1,14 @@
+import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
+import { trackPayEvent } from "../../../../analytics/track.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { WaitForReceiptOptions } from "../../../../transaction/actions/wait-for-tx-receipt.js";
 import type { PreparedTransaction } from "../../../../transaction/prepare-transaction.js";
 import { CustomThemeProvider } from "../../../core/design-system/CustomThemeProvider.js";
 import type { Theme } from "../../../core/design-system/index.js";
 import type { PayUIOptions } from "../../../core/hooks/connection/ConnectButtonProps.js";
+import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
+import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import type { SupportedTokens } from "../../../core/utils/defaultTokens.js";
 import { LoadingScreen } from "../../wallets/shared/LoadingScreen.js";
 import { useConnectLocale } from "../ConnectWallet/locale/getConnectLocale.js";
@@ -27,6 +31,23 @@ export type ModalProps = {
 };
 
 export function TransactionModal(props: ModalProps) {
+  const account = useActiveAccount();
+  const wallet = useActiveWallet();
+
+  useQuery({
+    queryKey: ["transaction-modal-event"],
+    queryFn: () => {
+      if (!account || !wallet) return;
+      trackPayEvent({
+        client: props.client,
+        walletAddress: account.address,
+        walletType: wallet.id,
+        event: "open_pay_transaction_modal",
+      });
+    },
+    enabled: !!wallet,
+  });
+
   return (
     <CustomThemeProvider theme={props.theme}>
       <Modal

package/src/social/profiles.ts

@@ -8,7 +8,7 @@ import type { SocialProfile } from "./types.js";
  * @param args - The arguments to use when fetching the social profiles.
  * @param args.address - The wallet address to fetch the social profiles for.
  * @param args.client - The Thirdweb client.
- * @returns A promise resolving to the retrieved social profiles for different protocols. If a profile is not available for a protocol, the value will be `null`.
+ * @returns A promise resolving to the array of social profiles for the given address.
  *
  * @example
  * ```ts
@@ -18,6 +18,7 @@ import type { SocialProfile } from "./types.js";
  *   client,
  * });
  * ```
+ * @social
  * @beta
  */
 export async function getSocialProfiles(args: {

package/src/transaction/actions/zksync/send-eip712-transaction.test.ts

@@ -35,19 +35,19 @@ describe("sendEip712Transaction", () => {
       client: TEST_CLIENT,
       chain: zkSyncSepolia, // TODO make zksync fork chain work
       account: TEST_ACCOUNT_A,
-      contractId: "DropERC1155",
-      contractParams: [
-        TEST_ACCOUNT_A.address, // defaultAdmin
-        "test", // name
-        "", // symbol
-        "", // contractURI
-        [], // trustedForwarders
-        TEST_ACCOUNT_A.address, // saleRecipient
-        TEST_ACCOUNT_A.address, // royaltyRecipient
-        0n, // royaltyBps
-        0n, // platformFeeBps
-        TEST_ACCOUNT_A.address, // platformFeeRecipient
-      ],
+      contractId: "DropERC721",
+      contractParams: {
+        defaultAdmin: TEST_ACCOUNT_A.address, // defaultAdmin
+        name: "test", // name
+        symbol: "test", // symbol
+        contractURI: "", // contractURI
+        trustedForwarders: [], // trustedForwarders
+        saleRecipient: TEST_ACCOUNT_A.address, // saleRecipient
+        royaltyRecipient: TEST_ACCOUNT_A.address, // royaltyRecipient
+        royaltyBps: 0n, // royaltyBps
+        platformFeeBps: 0n, // platformFeeBps
+        platformFeeRecipient: TEST_ACCOUNT_A.address, // platformFeeRecipient
+      },
     });
     console.log("deployed address", address);
     expect(address).toBeDefined();

package/src/utils/abi/normalizeFunctionParams.ts

@@ -0,0 +1,29 @@
+import type { AbiConstructor, AbiFunction } from "abitype";
+
+export function normalizeFunctionParams(
+  abiFunction: AbiFunction | AbiConstructor | undefined,
+  params: Record<string, unknown> = {},
+): unknown[] {
+  if (!abiFunction) {
+    return [];
+  }
+  if (abiFunction.inputs?.length !== Object.keys(params).length) {
+    throw new Error(
+      `Expected ${abiFunction.inputs?.length || 0} parameters, but got ${Object.keys(params).length}`,
+    );
+  }
+  return abiFunction.inputs.map((input, index) => {
+    const value = input.name;
+    if (value === undefined) {
+      throw new Error(
+        `Missing named parameter for ${"name" in abiFunction ? abiFunction.name : "constructor"} at index ${index}`,
+      );
+    }
+    const valueWithoutUnderscore = value.replace(/^_+/, "");
+    const normalizedValue = params[value] ?? params[valueWithoutUnderscore]; // handle _name, _symbol, etc passed without underscore in the keys
+    if (normalizedValue === undefined) {
+      throw new Error(`Missing value for parameter ${value} at index ${index}`);
+    }
+    return normalizedValue;
+  });
+}

package/src/utils/any-evm/compute-published-contract-address.ts

@@ -1,10 +1,8 @@
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
+import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { computeDeploymentAddress } from "./compute-deployment-address.js";
-import {
-  computeDeploymentInfoFromContractId,
-  computeDeploymentInfoFromMetadata,
-} from "./compute-published-contract-deploy-info.js";
+import { computeDeploymentInfoFromMetadata } from "./compute-published-contract-deploy-info.js";
 import type { FetchDeployMetadataResult } from "./deploy-metadata.js";
 
 /**
@@ -34,13 +32,24 @@ export async function computePublishedContractAddress(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractId: string;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   publisher?: string;
   version?: string;
   salt?: string;
 }): Promise<string> {
-  const info = await computeDeploymentInfoFromContractId(args);
-  return computeDeploymentAddress(info);
+  const contractMetadata = await fetchPublishedContractMetadata({
+    client: args.client,
+    contractId: args.contractId,
+    publisher: args.publisher,
+    version: args.version,
+  });
+  return computeContractAddress({
+    client: args.client,
+    chain: args.chain,
+    contractMetadata,
+    constructorParams: args.constructorParams,
+    salt: args.salt,
+  });
 }
 
 /**
@@ -50,7 +59,7 @@ export async function computeContractAddress(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractMetadata: FetchDeployMetadataResult;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   salt?: string;
 }): Promise<string> {
   const info = await computeDeploymentInfoFromMetadata(args);

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

@@ -1,9 +1,12 @@
-import type { AbiConstructor } from "abitype";
+import type { Abi, AbiConstructor } from "abitype";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { computeCreate2FactoryAddress } from "../../contract/deployment/utils/create-2-factory.js";
 import { encodeAbiParameters } from "../abi/encodeAbiParameters.js";
+import { normalizeFunctionParams } from "../abi/normalizeFunctionParams.js";
+import { ensureBytecodePrefix } from "../bytecode/prefix.js";
+import type { Hex } from "../encoding/hex.js";
 import type { FetchDeployMetadataResult } from "./deploy-metadata.js";
 import { getInitBytecodeWithSalt } from "./get-init-bytecode-with-salt.js";
 
@@ -14,7 +17,7 @@ export async function computeDeploymentInfoFromContractId(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractId: string;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   publisher?: string;
   version?: string;
   salt?: string;
@@ -42,22 +45,39 @@ export async function computeDeploymentInfoFromMetadata(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractMetadata: FetchDeployMetadataResult;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   salt?: string;
 }) {
-  const { client, chain, contractMetadata, constructorParams, salt } = args;
+  return computeDeploymentInfoFromBytecode({
+    client: args.client,
+    chain: args.chain,
+    abi: args.contractMetadata.abi,
+    bytecode: args.contractMetadata.bytecode,
+    constructorParams: args.constructorParams,
+    salt: args.salt,
+  });
+}
+
+export async function computeDeploymentInfoFromBytecode(args: {
+  client: ThirdwebClient;
+  chain: Chain;
+  abi: Abi;
+  bytecode: Hex;
+  constructorParams?: Record<string, unknown>;
+  salt?: string;
+}) {
+  const { client, chain, constructorParams, salt } = args;
   const create2FactoryAddress = await computeCreate2FactoryAddress({
     client,
     chain,
   });
-  const bytecode = contractMetadata.bytecode;
-  const constructorAbi =
-    (contractMetadata.abi.find(
-      (abi) => abi.type === "constructor",
-    ) as AbiConstructor) || [];
+  const bytecode = ensureBytecodePrefix(args.bytecode);
+  const constructorAbi = args.abi.find((abi) => abi.type === "constructor") as
+    | AbiConstructor
+    | undefined;
   const encodedArgs = encodeAbiParameters(
-    constructorAbi.inputs ?? [],
-    constructorParams,
+    constructorAbi?.inputs ?? [],
+    normalizeFunctionParams(constructorAbi, constructorParams),
   );
   const initBytecodeWithsalt = getInitBytecodeWithSalt({
     bytecode,

package/src/utils/bytecode/resolveImplementation.test.ts

@@ -1,4 +1,4 @@
-import type { AbiConstructor } from "abitype";
+import type { Abi } from "abitype";
 import { describe, expect, it } from "vitest";
 import {
   DUMMY_BYTECODE,
@@ -46,8 +46,7 @@ describe("Resolve implementation", async () => {
       chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
       bytecode: DUMMY_BYTECODE,
-      constructorAbi: {} as AbiConstructor,
-      constructorParams: [],
+      abi: [],
     });
 
     const proxyAddress = await deployContract({
@@ -55,8 +54,11 @@ describe("Resolve implementation", async () => {
       chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
       bytecode: ERC1967_PROXY_BYTECODE,
-      constructorAbi: ERC1967_PROXY_CONSTRUCTOR_ABI as AbiConstructor,
-      constructorParams: [implementationAddress, ""],
+      abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
+      constructorParams: {
+        logic: implementationAddress,
+        data: "",
+      },
     });
 
     const proxy = getContract({

package/src/utils/caching/lru.test.ts

@@ -0,0 +1,38 @@
+import { expect, test } from "vitest";
+import { LruMap } from "./lru.js";
+
+test("default", () => {
+  const cache = new LruMap(5);
+  cache.set("a", 1);
+  cache.set("b", 2);
+  cache.set("c", 3);
+  cache.set("d", 4);
+  cache.set("e", 5);
+  cache.set("f", 6);
+  cache.set("g", 7);
+  expect(cache.size).toBe(5);
+  expect(cache.has("a")).toBe(false);
+  expect(cache.has("b")).toBe(false);
+  expect(cache.get("c")).toBe(3);
+  expect(cache.get("d")).toBe(4);
+  expect(cache.get("e")).toBe(5);
+  expect(cache.get("f")).toBe(6);
+  expect(cache.get("g")).toBe(7);
+});
+
+test("update touched keys", () => {
+  const cache = new LruMap(5);
+  cache.set("a", 1);
+  cache.set("b", 2);
+  cache.set("c", 3);
+  cache.set("d", 4);
+  cache.set("e", 5);
+  expect(cache.size).toBe(5);
+  cache.get("a");
+  cache.set("f", 6);
+  cache.set("g", 7);
+  expect(cache.has("a")).toBe(true);
+  expect(cache.has("b")).toBe(false);
+  expect(cache.has("c")).toBe(false);
+  expect(cache.has("d")).toBe(true);
+});

package/src/utils/caching/lru.ts

@@ -1,30 +1,34 @@
 /**
- * Represents a Least Recently Used (LRU) Map.
- * Extends the built-in Map class.
+ * Map with a LRU (Least recently used) policy.
+ *
+ * @link https://en.wikipedia.org/wiki/Cache_replacement_policies#LRU
  */
 export class LruMap<value = unknown> extends Map<string, value> {
   maxSize: number;
 
-  /**
-   *
-   * @param size
-   * @internal
-   */
   constructor(size: number) {
     super();
     this.maxSize = size;
   }
 
-  /**
-   *
-   * @param key
-   * @param value
-   * @internal
-   */
+  override get(key: string) {
+    const value = super.get(key);
+
+    if (super.has(key) && value !== undefined) {
+      this.delete(key);
+      super.set(key, value);
+    }
+
+    return value;
+  }
+
   override set(key: string, value: value) {
     super.set(key, value);
     if (this.maxSize && this.size > this.maxSize) {
-      this.delete(this.keys().next().value);
+      const firstKey = this.keys().next().value;
+      if (firstKey) {
+        this.delete(firstKey);
+      }
     }
     return this;
   }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.53.1-nightly-865c5e3b16af70c3660f30ba8cffc5d6e360a389-20240911000352";
+export const version = "5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413";

package/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts

@@ -3,6 +3,7 @@ import { eth_getTransactionReceipt } from "../../../../rpc/actions/eth_getTransa
 import { getRpcClient } from "../../../../rpc/rpc.js";
 import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
 import { sendBatchTransaction } from "../../../../transaction/actions/send-batch-transaction.js";
+import { LruMap } from "../../../../utils/caching/lru.js";
 import type { Hex } from "../../../../utils/encoding/hex.js";
 import { randomBytesHex } from "../../../../utils/random.js";
 import type { PreparedSendCall } from "../../../eip5792/send-calls.js";
@@ -13,19 +14,7 @@ import type {
 } from "../../../eip5792/types.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 
-const bundlesToTransactions = new Map<string, Hex[]>();
-const MAX_BUNDLE_ENTRIES = 1000;
-
-/**
- * @internal
- */
-function setBundleId(bundleId: Hex, hashes: Hex[]) {
-  if (bundlesToTransactions.size >= MAX_BUNDLE_ENTRIES) {
-    const lru = bundlesToTransactions.keys().next().value;
-    bundlesToTransactions.delete(lru);
-  }
-  bundlesToTransactions.set(bundleId, hashes);
-}
+const bundlesToTransactions = new LruMap<Hex[]>(1000);
 
 /**
  * @internal
@@ -45,7 +34,7 @@ export async function inAppWalletSendCalls(args: {
       transactions: calls,
     });
     hashes.push(receipt.transactionHash);
-    setBundleId(bundleId, hashes);
+    bundlesToTransactions.set(bundleId, hashes);
   } else {
     for (const tx of calls) {
       const receipt = await sendAndConfirmTransaction({