thirdweb 5.84.0 → 5.85.0

package/src/extensions/prebuilts/deploy-published.ts

@@ -50,7 +50,7 @@ export type DeployPublishedContractOptions = {
  * ```ts
  * import { deployPublishedContract } from "thirdweb/deploys";
  *
- * const address = await deployedPublishedContract({
+ * const address = await deployPublishedContract({
  *   client,
  *   chain,
  *   account,
@@ -68,7 +68,7 @@ export type DeployPublishedContractOptions = {
  * ```ts
  * import { deployPublishedContract } from "thirdweb/deploys";
  *
- * const address = await deployedPublishedContract({
+ * const address = await deployPublishedContract({
  *   client,
  *   chain,
  *   account,

package/src/gas/fee-data.ts

@@ -38,6 +38,7 @@ const FORCE_GAS_PRICE_CHAIN_IDS = [
   9768, // MainnetZ Testnet
   2442, // Polygon zkEVM Cardona Testnet
   1942999413, // Humanity Testnet
+  1952959480, // Lumia Testnet
 ];
 
 /**

package/src/react/core/hooks/transaction/useSendTransaction.ts

@@ -1,4 +1,5 @@
 import { type UseMutationResult, useMutation } from "@tanstack/react-query";
+import { trackPayEvent } from "../../../../analytics/track/pay.js";
 import type { Chain } from "../../../../chains/types.js";
 import type { BuyWithCryptoStatus } from "../../../../pay/buyWithCrypto/getStatus.js";
 import type { BuyWithFiatStatus } from "../../../../pay/buyWithFiat/getStatus.js";
@@ -146,6 +147,13 @@ export function useSendTransactionCore(args: {
       }
 
       if (!showPayModal) {
+        trackPayEvent({
+          client: tx.client,
+          walletAddress: account.address,
+          walletType: wallet?.id,
+          dstChainId: tx.chain.id,
+          event: "pay_transaction_modal_disabled",
+        });
         return sendTransaction({
           transaction: tx,
           account,
@@ -174,7 +182,17 @@ export function useSendTransactionCore(args: {
               await Promise.all([
                 resolvePromisedValue(tx.value),
                 resolvePromisedValue(tx.erc20Value),
-                fetchBuySupportedDestinations(tx.client).catch(() => null),
+                fetchBuySupportedDestinations(tx.client).catch((err) => {
+                  trackPayEvent({
+                    client: tx.client,
+                    walletAddress: account.address,
+                    walletType: wallet?.id,
+                    dstChainId: tx.chain.id,
+                    event: "pay_transaction_modal_pay_api_error",
+                    error: err?.message,
+                  });
+                  return null;
+                }),
               ]);
 
             if (!supportedDestinations) {
@@ -198,6 +216,14 @@ export function useSendTransactionCore(args: {
                     ),
                 ))
             ) {
+              trackPayEvent({
+                client: tx.client,
+                walletAddress: account.address,
+                walletType: wallet?.id,
+                dstChainId: tx.chain.id,
+                event: "pay_transaction_modal_chain_token_not_supported",
+                error: `chain ${tx.chain.id} ${_erc20Value ? `/ token ${_erc20Value?.tokenAddress}` : ""} not supported`,
+              });
               // chain/token not supported, just send the tx
               sendTx();
               return;
@@ -241,6 +267,13 @@ export function useSendTransactionCore(args: {
                 resolveTx: resolve,
               });
             } else {
+              trackPayEvent({
+                client: tx.client,
+                walletAddress: account.address,
+                walletType: wallet?.id,
+                dstChainId: tx.chain.id,
+                event: "pay_transaction_modal_has_enough_funds",
+              });
               sendTx();
             }
           } catch (e) {

package/src/react/web/ui/prebuilt/NFT/description.tsx

@@ -95,6 +95,7 @@ export function NFTDescription({
     queryKey: [
       "_internal_nft_description_",
       contract.chain.id,
+      contract.address,
       tokenId.toString(),
       {
         resolver:

package/src/react/web/ui/prebuilt/NFT/media.test.tsx

@@ -7,6 +7,8 @@ import {
 import { getFunctionId } from "../../../../../utils/function-id.js";
 import { fetchNftMedia, getQueryKey } from "./media.js";
 
+const testContractAddress = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
+
 describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
   it("fetchNftMedia should work with ERC721", async () => {
     const desc = await fetchNftMedia({
@@ -77,9 +79,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
   });
 
   it("getQueryKey should work without mediaResolver", () => {
-    expect(getQueryKey({ chainId: 1, tokenId: 1n })).toStrictEqual([
+    expect(
+      getQueryKey({
+        chainId: 1,
+        tokenId: 1n,
+        contractAddress: testContractAddress,
+      }),
+    ).toStrictEqual([
       "_internal_nft_media_",
       1,
+      testContractAddress,
       "1",
       {
         resolver: undefined,
@@ -90,6 +99,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
   it("getQueryKey should work with mediaResolver being an object", () => {
     expect(
       getQueryKey({
+        contractAddress: testContractAddress,
         chainId: 1,
         tokenId: 1n,
         mediaResolver: {
@@ -100,6 +110,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
     ).toStrictEqual([
       "_internal_nft_media_",
       1,
+      testContractAddress,
       "1",
       {
         resolver: {
@@ -119,12 +130,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTMedia", () => {
     expect(
       getQueryKey({
         chainId: 1,
+        contractAddress: testContractAddress,
         tokenId: 1n,
         mediaResolver: fn,
       }),
     ).toStrictEqual([
       "_internal_nft_media_",
       1,
+      testContractAddress,
       "1",
       {
         resolver: fnId,

package/src/react/web/ui/prebuilt/NFT/media.tsx

@@ -133,6 +133,7 @@ export function NFTMedia({
   const { contract, tokenId } = useNFTContext();
   const mediaQuery = useQuery({
     queryKey: getQueryKey({
+      contractAddress: contract.address,
       chainId: contract.chain.id,
       tokenId,
       mediaResolver,
@@ -164,6 +165,7 @@ export function NFTMedia({
  * @internal
  */
 export function getQueryKey(props: {
+  contractAddress: string;
   chainId: number;
   tokenId: bigint;
   mediaResolver?:
@@ -171,10 +173,11 @@ export function getQueryKey(props: {
     | (() => NFTMediaInfo)
     | (() => Promise<NFTMediaInfo>);
 }) {
-  const { chainId, tokenId, mediaResolver } = props;
+  const { chainId, tokenId, mediaResolver, contractAddress } = props;
   return [
     "_internal_nft_media_",
     chainId,
+    contractAddress,
     tokenId.toString(),
     {
       resolver:

package/src/react/web/ui/prebuilt/NFT/name.test.tsx

@@ -7,6 +7,8 @@ import {
 import { getFunctionId } from "../../../../../utils/function-id.js";
 import { fetchNftName, getQueryKey } from "./name.js";
 
+const testContractAddress = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
+
 describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
   it("fetchNftName should work with ERC721", async () => {
     const desc = await fetchNftName({
@@ -61,9 +63,16 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
   });
 
   it("getQueryKey should work without nameResolver", () => {
-    expect(getQueryKey({ chainId: 1, tokenId: 1n })).toStrictEqual([
+    expect(
+      getQueryKey({
+        chainId: 1,
+        tokenId: 1n,
+        contractAddress: testContractAddress,
+      }),
+    ).toStrictEqual([
       "_internal_nft_name_",
       1,
+      testContractAddress,
       "1",
       { resolver: undefined },
     ]);
@@ -71,16 +80,38 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
 
   it("getQueryKey should work with nameResolver being a string", () => {
     expect(
-      getQueryKey({ chainId: 1, tokenId: 1n, nameResolver: "test" }),
-    ).toStrictEqual(["_internal_nft_name_", 1, "1", { resolver: "test" }]);
+      getQueryKey({
+        chainId: 1,
+        tokenId: 1n,
+        nameResolver: "test",
+        contractAddress: testContractAddress,
+      }),
+    ).toStrictEqual([
+      "_internal_nft_name_",
+      1,
+      testContractAddress,
+      "1",
+      { resolver: "test" },
+    ]);
   });
 
   it("getQueryKey should work with nameResolver being a () => string", () => {
     const fn = () => "test";
     const fnId = getFunctionId(fn);
     expect(
-      getQueryKey({ chainId: 1, tokenId: 1n, nameResolver: fn }),
-    ).toStrictEqual(["_internal_nft_name_", 1, "1", { resolver: fnId }]);
+      getQueryKey({
+        chainId: 1,
+        tokenId: 1n,
+        nameResolver: fn,
+        contractAddress: testContractAddress,
+      }),
+    ).toStrictEqual([
+      "_internal_nft_name_",
+      1,
+      testContractAddress,
+      "1",
+      { resolver: fnId },
+    ]);
   });
 
   it("getQueryKey should work with nameResolver being a async () => string", () => {
@@ -91,7 +122,14 @@ describe.runIf(process.env.TW_SECRET_KEY)("NFTName", () => {
         chainId: 1,
         tokenId: 1n,
         nameResolver: fn,
+        contractAddress: testContractAddress,
       }),
-    ).toStrictEqual(["_internal_nft_name_", 1, "1", { resolver: fnId }]);
+    ).toStrictEqual([
+      "_internal_nft_name_",
+      1,
+      testContractAddress,
+      "1",
+      { resolver: fnId },
+    ]);
   });
 });

package/src/react/web/ui/prebuilt/NFT/name.tsx

@@ -95,6 +95,7 @@ export function NFTName({
 
   const nameQuery = useQuery({
     queryKey: getQueryKey({
+      contractAddress: contract.address,
       chainId: contract.chain.id,
       tokenId,
       nameResolver,
@@ -118,14 +119,16 @@ export function NFTName({
  * @internal
  */
 export function getQueryKey(props: {
+  contractAddress: string;
   chainId: number;
   tokenId: bigint;
   nameResolver?: string | (() => string) | (() => Promise<string>);
 }) {
-  const { chainId, tokenId, nameResolver } = props;
+  const { chainId, tokenId, nameResolver, contractAddress } = props;
   return [
     "_internal_nft_name_",
     chainId,
+    contractAddress,
     tokenId.toString(),
     {
       resolver:

package/src/utils/extensions/drops/get-claim-params.ts

@@ -32,7 +32,6 @@ export type GetClaimParamsOptions = {
  * Get the claim parameters for a given drop
  * @param options - The options for getting the claim parameters
  * @returns The claim parameters
- * @extension ERC1155
  * @example
  * ```ts
  * import { getClaimParams } from "thirdweb/utils";
@@ -45,7 +44,7 @@ export type GetClaimParamsOptions = {
  *  tokenId: 0n,
  * });
  * ```
- * @extension COMMON
+ * @utils
  */
 export async function getClaimParams(options: GetClaimParamsOptions) {
   const cc: ClaimCondition = await (async () => {

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.84.0";
+export const version = "5.85.0";

package/src/wallets/connection/autoConnect.ts

@@ -27,6 +27,7 @@ import type { AutoConnectProps } from "./types.js";
  * @param props - The auto-connect configuration properties
  * @param props.wallets - Array of wallet instances to consider for auto-connection
  * @returns {boolean} a promise resolving to true or false depending on whether the auto connect function connected to a wallet or not
+ * @walletConnection
  */
 export const autoConnect = async (
   props: AutoConnectProps & {