thirdweb 5.51.0 → 5.52.0

package/src/react/web/ui/ConnectWallet/ConnectButton.tsx

@@ -544,9 +544,6 @@ function ConnectButtonInner(
         showAllWallets: props.showAllWallets,
         walletConnect: props.walletConnect,
         wallets: props.wallets,
-        hideReceiveFunds: props.detailsModal?.hideReceiveFunds,
-        hideSendFunds: props.detailsModal?.hideSendFunds,
-        hideBuyFunds: props.detailsModal?.hideBuyFunds,
       }}
     />
   );

package/src/react/web/ui/ConnectWallet/Details.tsx

@@ -131,13 +131,12 @@ export const ConnectedWalletDetails: React.FC<{
   const activeAccount = useActiveAccount();
   const walletChain = useActiveWalletChain();
 
-  const { ensAvatarQuery, addressOrENS, balanceQuery } =
-    useConnectedWalletDetails(
-      client,
-      walletChain,
-      activeAccount,
-      props.detailsButton?.displayBalanceToken,
-    );
+  const { pfp, name, balanceQuery } = useConnectedWalletDetails(
+    client,
+    walletChain,
+    activeAccount,
+    props.detailsButton?.displayBalanceToken,
+  );
 
   function closeModal() {
     setRootEl(null);
@@ -185,8 +184,7 @@ export const ConnectedWalletDetails: React.FC<{
     );
   }
 
-  const avatarSrc =
-    props.detailsButton?.connectedAccountAvatarUrl ?? ensAvatarQuery.data;
+  const avatarSrc = props.detailsButton?.connectedAccountAvatarUrl || pfp;
 
   return (
     <WalletInfoButton
@@ -235,7 +233,7 @@ export const ConnectedWalletDetails: React.FC<{
           weight={500}
           className={`${TW_CONNECTED_WALLET}__address`}
         >
-          {props.detailsButton?.connectedAccountName ?? addressOrENS}
+          {props.detailsButton?.connectedAccountName ?? name}
         </Text>
 
         {/* Balance */}
@@ -280,13 +278,12 @@ function DetailsModal(props: {
   const { client, locale } = props;
   const walletChain = useActiveWalletChain();
   const activeAccount = useActiveAccount();
-  const { ensAvatarQuery, addressOrENS, balanceQuery } =
-    useConnectedWalletDetails(
-      client,
-      walletChain,
-      activeAccount,
-      props.displayBalanceToken,
-    );
+  const { pfp, name, balanceQuery } = useConnectedWalletDetails(
+    client,
+    walletChain,
+    activeAccount,
+    props.displayBalanceToken,
+  );
   const theme = parseTheme(props.theme);
 
   const activeWallet = useActiveWallet();
@@ -370,8 +367,7 @@ function DetailsModal(props: {
     </MenuButton>
   );
 
-  const avatarSrc =
-    props.detailsModal?.connectedAccountAvatarUrl ?? ensAvatarQuery.data;
+  const avatarSrc = props.detailsModal?.connectedAccountAvatarUrl ?? pfp;
 
   const { hideSendFunds, hideReceiveFunds, hideBuyFunds } =
     props.detailsModal || {};
@@ -483,7 +479,7 @@ function DetailsModal(props: {
             }}
           >
             <Text color="primaryText" weight={500} size="md">
-              {props.detailsModal?.connectedAccountName ?? addressOrENS}
+              {props.detailsModal?.connectedAccountName ?? name}
             </Text>
             <IconButton>
               <CopyIcon
@@ -1154,9 +1150,6 @@ export type DetailsModalConnectOptions = {
   chains?: Chain[];
   recommendedWallets?: Wallet[];
   showAllWallets?: boolean;
-  hideSendFunds?: boolean;
-  hideReceiveFunds?: boolean;
-  hideBuyFunds?: boolean;
 };
 
 export type UseWalletDetailsModalOptions = {
@@ -1380,6 +1373,27 @@ export type UseWalletDetailsModalOptions = {
    * Use custom avatar URL for the connected wallet image in the `ConnectButton` Details Modal, overriding ENS avatar or Blobbie icon.
    */
   connectedAccountAvatarUrl?: string;
+
+  /**
+   * Hide the "Send Funds" button in the Details Modal.
+   *
+   * By default the "Send Funds" button is shown.
+   */
+  hideSendFunds?: boolean;
+
+  /**
+   * Hide the "Receive Funds" button in the Details Modal.
+   *
+   * By default the "Receive Funds" button is shown.
+   */
+  hideReceiveFunds?: boolean;
+
+  /**
+   * Hide the "Buy Funds" button in the Details Modal.
+   *
+   * By default the "Buy Funds" button is shown.
+   */
+  hideBuyFunds?: boolean;
 };
 
 /**
@@ -1434,6 +1448,9 @@ export function useWalletDetailsModal() {
               showTestnetFaucet: props.showTestnetFaucet,
               connectedAccountName: props.connectedAccountName,
               connectedAccountAvatarUrl: props.connectedAccountAvatarUrl,
+              hideBuyFunds: props.hideBuyFunds,
+              hideReceiveFunds: props.hideReceiveFunds,
+              hideSendFunds: props.hideSendFunds,
             }}
             displayBalanceToken={props.displayBalanceToken}
             theme={props.theme || "dark"}

package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx

@@ -97,7 +97,13 @@ export type BuyScreenProps = {
  * @internal
  */
 export default function BuyScreen(props: BuyScreenProps) {
-  const supportedDestinationsQuery = useBuySupportedDestinations(props.client);
+  const isTestMode = props.payOptions.buyWithCrypto
+    ? props.payOptions.buyWithCrypto.testMode
+    : undefined;
+  const supportedDestinationsQuery = useBuySupportedDestinations(
+    props.client,
+    isTestMode,
+  );
 
   if (!supportedDestinationsQuery.data) {
     return <LoadingScreen />;

package/src/react/web/ui/ConnectWallet/screens/Buy/main/useUISelectionStates.ts

@@ -50,7 +50,8 @@ export function useToTokenSelectionStates(options: {
       // use active chain if its supported as destination
       supportedDestinations.find((x) => x.chain.id === activeChain?.id)
         ?.chain ||
-      // default to polygon
+      // default to the first chain in supportedDestinations, or polygon if nothing is found at all
+      supportedDestinations[0]?.chain ||
       polygon,
   );
 

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/useSwapSupportedChains.ts

@@ -36,11 +36,14 @@ export type SupportedChainAndTokens = Array<{
 
 export async function fetchBuySupportedDestinations(
   client: ThirdwebClient,
+  isTestMode?: boolean,
 ): Promise<SupportedChainAndTokens> {
   return withCache(
     async () => {
       const fetchWithHeaders = getClientFetch(client);
-      const res = await fetchWithHeaders(getPaySupportedDestinations());
+      const res = await fetchWithHeaders(
+        `${getPaySupportedDestinations()}?isTestMode=${isTestMode}`,
+      );
       const data = (await res.json()) as Response;
       return data.result.map((item) => ({
         chain: defineChain({
@@ -59,11 +62,14 @@ export async function fetchBuySupportedDestinations(
 /**
  * @internal
  */
-export function useBuySupportedDestinations(client: ThirdwebClient) {
+export function useBuySupportedDestinations(
+  client: ThirdwebClient,
+  isTestMode?: boolean,
+) {
   return useQuery({
     queryKey: ["destination-tokens", client],
     queryFn: async () => {
-      return fetchBuySupportedDestinations(client);
+      return fetchBuySupportedDestinations(client, isTestMode);
     },
   });
 }

package/src/social/profiles.ts

@@ -0,0 +1,46 @@
+import type { ThirdwebClient } from "../client/client.js";
+import { getThirdwebBaseUrl } from "../utils/domains.js";
+import { getClientFetch } from "../utils/fetch.js";
+import type { SocialProfiles } from "./types.js";
+
+/**
+ * Fetches the wallet's available social profiles.
+ * @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`.
+ *
+ * @example
+ * ```ts
+ * import { getProfiles } from "thirdweb/social";
+ * const profiles = await getProfiles({
+ *   address: "0x...",
+ *   client,
+ * });
+ * ```
+ * @beta
+ */
+export async function getSocialProfiles(args: {
+  address: string;
+  client: ThirdwebClient;
+}): Promise<SocialProfiles> {
+  const { address, client } = args;
+
+  const clientFetch = getClientFetch(client);
+  const response = await clientFetch(
+    `${getThirdwebBaseUrl("social")}/v1/profiles/${address}`,
+  );
+
+  if (response.status !== 200) {
+    try {
+      const errorBody = await response.json();
+      throw new Error(`Failed to fetch profile: ${errorBody.message}`);
+    } catch {
+      throw new Error(
+        `Failed to fetch profile: ${response.status}\n${await response.text()}`,
+      );
+    }
+  }
+
+  return (await response.json()).data as SocialProfiles;
+}

package/src/social/types.ts

@@ -0,0 +1,43 @@
+export type FarcasterProfile = {
+  fid?: number;
+  bio?: string;
+  pfp?: string;
+  display?: string;
+  username?: string;
+  custodyAddress?: string;
+  addresses?: string[];
+};
+
+export type LensProfile = {
+  name?: string;
+  bio?: string;
+  picture?: string;
+  coverPicture?: string;
+};
+
+export type EnsProfile = {
+  name?: string;
+  address?: string;
+  avatar?: string;
+  display?: string;
+  description?: string;
+  keywords?: string[];
+  email?: string;
+  mail?: string;
+  notice?: string;
+  location?: string;
+  phone?: string;
+  url?: string;
+  twitter?: string;
+  github?: string;
+  discord?: string;
+  telegram?: string;
+};
+
+export type SocialProfiles = {
+  type: "farcaster" | "lens" | "ens";
+  name?: string;
+  avatar?: string;
+  bio?: string;
+  metadata?: FarcasterProfile | LensProfile | EnsProfile;
+}[];

package/src/utils/any-evm/deploy-metadata.ts

@@ -144,6 +144,11 @@ export type ExtendedMetadata = {
         publisherAddress: string;
       }[]
     | undefined;
+  defaultModules?: {
+    moduleName: string;
+    moduleVersion: string;
+    publisherAddress: string;
+  }[];
   publisher?: string | undefined;
   audit?: string | undefined;
   logo?: string | undefined;

package/src/utils/domains.ts

@@ -4,6 +4,11 @@ type DomainOverrides = {
    * @default "rpc.thirdweb.com"
    */
   rpc?: string;
+  /**
+   * The base URL for the social service.
+   * @default "social.thirdweb.com"
+   */
+  social?: string;
   /**
    * The base URL for the in-app wallet service
    * @default "embedded-wallet.thirdweb.com"
@@ -28,6 +33,7 @@ type DomainOverrides = {
 
 export const DEFAULT_RPC_URL = "rpc.thirdweb.com";
 const DEFAULT_IN_APP_WALLET_URL = "embedded-wallet.thirdweb.com";
+const DEFAULT_SOCIAL_URL = "social.thirdweb.com";
 const DEFAULT_PAY_URL = "pay.thirdweb.com";
 const DEFAULT_STORAGE_URL = "storage.thirdweb.com";
 const DEFAULT_BUNDLER_URL = "bundler.thirdweb.com";
@@ -35,6 +41,7 @@ const DEFAULT_BUNDLER_URL = "bundler.thirdweb.com";
 let domains: { [k in keyof DomainOverrides]-?: string } = {
   rpc: DEFAULT_RPC_URL,
   inAppWallet: DEFAULT_IN_APP_WALLET_URL,
+  social: DEFAULT_SOCIAL_URL,
   pay: DEFAULT_PAY_URL,
   storage: DEFAULT_STORAGE_URL,
   bundler: DEFAULT_BUNDLER_URL,
@@ -47,6 +54,7 @@ export const setThirdwebDomains = (DomainOverrides: DomainOverrides) => {
   domains = {
     rpc: DomainOverrides.rpc ?? DEFAULT_RPC_URL,
     inAppWallet: DomainOverrides.inAppWallet ?? DEFAULT_IN_APP_WALLET_URL,
+    social: DomainOverrides.social ?? DEFAULT_SOCIAL_URL,
     pay: DomainOverrides.pay ?? DEFAULT_PAY_URL,
     storage: DomainOverrides.storage ?? DEFAULT_STORAGE_URL,
     bundler: DomainOverrides.bundler ?? DEFAULT_BUNDLER_URL,

package/src/utils/extensions/convert-erc20-amount.ts

@@ -7,7 +7,7 @@ import { toUnits } from "../units.js";
 
 export type AmountOrAmountInWei =
   | {
-      amount: string;
+      amount: string | number;
     }
   | {
       amountInWei: bigint;

package/src/utils/extensions/drops/fetch-proofs-for-claimers.ts

@@ -1,15 +1,18 @@
+import type { Chain } from "../../../chains/types.js";
+import type { ThirdwebClient } from "../../../client/client.js";
 import {
   ZERO_ADDRESS,
   isNativeTokenAddress,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
-import { getContractMetadata } from "../../../extensions/common/read/getContractMetadata.js";
 import { MerkleTree } from "../../../merkletree/MerkleTree.js";
 import { download } from "../../../storage/download.js";
 import type { Address } from "../../address.js";
+import type { Hex } from "../../encoding/hex.js";
 import { convertQuantity } from "./convert-quantity.js";
 import { hashEntry } from "./hash-entry.js";
 import type {
+  OverrideEntry,
   OverrideProof,
   ShardData,
   ShardedMerkleTreeInfo,
@@ -18,24 +21,22 @@ import type {
 export async function fetchProofsForClaimer(options: {
   contract: ThirdwebContract;
   claimer: string;
-  merkleRoot: string;
+  merkleTreeUri: string;
   tokenDecimals: number;
+  hashEntry?: (options: {
+    entry: OverrideEntry;
+    chain: Chain;
+    client: ThirdwebClient;
+    tokenDecimals: number;
+  }) => Promise<Hex>;
 }): Promise<OverrideProof | null> {
-  const { contract, merkleRoot, claimer } = options;
-  // 1. fetch merkle data from contract URI
-  const metadata = await getContractMetadata({
-    contract,
-  });
-  const merkleData: Record<string, string> = metadata.merkle || {};
-  const snapshotUri = merkleData[merkleRoot];
+  const { contract, merkleTreeUri, claimer } = options;
+  const hashEntryFn = options.hashEntry || hashEntry;
 
-  if (!snapshotUri) {
-    return null;
-  }
   // 2. download snapshot data
   const response = await download({
     client: contract.client,
-    uri: snapshotUri,
+    uri: merkleTreeUri,
   });
   const merkleInfo: ShardedMerkleTreeInfo = await response.json();
 
@@ -61,7 +62,7 @@ export async function fetchProofsForClaimer(options: {
   // 4. hash all the entries in that shard and construct the sub merkle tree
   const hashedEntries = await Promise.all(
     shardData.entries.map(async (entry) => {
-      return hashEntry({
+      return hashEntryFn({
         entry,
         chain: contract.chain,
         client: contract.client,
@@ -79,7 +80,7 @@ export async function fetchProofsForClaimer(options: {
   }
   const proof = tree
     .getHexProof(
-      await hashEntry({
+      await hashEntryFn({
         entry,
         chain: contract.chain,
         client: contract.client,

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

@@ -4,6 +4,7 @@ import {
   isNativeTokenAddress,
 } from "../../../constants/addresses.js";
 import type { ThirdwebContract } from "../../../contract/contract.js";
+import { getContractMetadata } from "../../../extensions/common/read/getContractMetadata.js";
 import type { Hex } from "../../encoding/hex.js";
 import type { OverrideProof } from "./types.js";
 
@@ -96,10 +97,26 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
       "./fetch-proofs-for-claimers.js"
     );
 
+    // 1. fetch merkle data from contract URI
+    const metadata = await getContractMetadata({
+      contract: options.contract,
+    });
+    const merkleData: Record<string, string> = metadata.merkle || {};
+    const snapshotUri = merkleData[cc.merkleRoot];
+
+    if (!snapshotUri) {
+      return {
+        currency: ZERO_ADDRESS,
+        proof: [],
+        quantityLimitPerWallet: 0n,
+        pricePerToken: maxUint256,
+      } satisfies OverrideProof;
+    }
+
     const allowListProof = await fetchProofsForClaimer({
       contract: options.contract,
       claimer: options.from || options.to, // receiver and claimer can be different, always prioritize the claimer for allowlists
-      merkleRoot: cc.merkleRoot,
+      merkleTreeUri: snapshotUri,
       tokenDecimals,
     });
     // if no proof is found, we'll try the empty proof

package/src/utils/extensions/drops/process-override-list.ts

@@ -16,7 +16,14 @@ export async function processOverrideList(options: {
   overrides: OverrideEntry[];
   tokenDecimals: number;
   shardNybbles?: number;
+  hashEntry?: (options: {
+    entry: OverrideEntry;
+    chain: Chain;
+    client: ThirdwebClient;
+    tokenDecimals: number;
+  }) => Promise<Hex>;
 }) {
+  const hashEntryFn = options.hashEntry || hashEntry;
   const shardNybbles = options.shardNybbles || 2;
   // 2. shard them into a map where the key is the first n digits of the address
   const shards: Record<string, OverrideEntry[]> = {};
@@ -37,7 +44,7 @@ export async function processOverrideList(options: {
       new MerkleTree(
         await Promise.all(
           entries.map(async (entry) => {
-            return hashEntry({
+            return hashEntryFn({
               entry,
               chain: options.chain,
               client: options.client,

package/src/utils/extensions/drops/types.ts

@@ -2,7 +2,7 @@ import type { Address } from "../../address.js";
 import type { Hex } from "../../encoding/hex.js";
 
 export type ShardedMerkleTreeInfo = {
-  merkleRoot: string;
+  merkleRoot: Hex;
   baseUri: string;
   originalEntriesUri: string;
   shardNybbles: number;
@@ -38,12 +38,7 @@ export type ClaimConditionsInput = {
   merkleRootHash?: string;
   overrideList?: OverrideEntry[];
   metadata?: string | Record<string, unknown>;
-} & (
-  | {
-      price?: string | number;
-    }
-  | { priceInWei?: bigint }
-);
+};
 
 export type ClaimCondition = {
   startTimestamp: bigint;
@@ -55,3 +50,40 @@ export type ClaimCondition = {
   currency: string;
   metadata: string;
 };
+
+// Modular Drops
+
+/**
+ * Represents the input data for creating a claim condition for a Modular Drop contract.
+ * @extension MODULAR
+ */
+export type ClaimConditionInput = {
+  /**
+   * The start time of the claim condition, defaults to now.
+   */
+  startTime?: Date;
+  /**
+   * The end time of the claim condition, defaults to 10 years from now.
+   */
+  endTime?: Date;
+  /**
+   * The currency address to pay with, defaults to native currency.
+   */
+  currencyAddress?: string;
+  /**
+   * The price per token to pay, defaults to 0.
+   */
+  pricePerToken?: number | string;
+  /**
+   * The maximum amount of tokens that can be claimed, defaults to unlimited.
+   */
+  maxClaimableSupply?: number | string;
+  /**
+   * The maximum amount of tokens that can be claimed per wallet, defaults to unlimited.
+   */
+  maxClaimablePerWallet?: number | string;
+  /**
+   * List of overrides per wallet address.
+   */
+  allowList?: string[];
+};

package/src/utils/function-id.ts

@@ -1,11 +1,9 @@
-import { sha256 } from "@noble/hashes/sha256";
-import { uint8ArrayToHex } from "./encoding/hex.js";
+import { randomBytesHex } from "./random.js";
 
 // biome-ignore lint/suspicious/noExplicitAny: the whoel point here is to accept anything
 type AnyFunction = (...args: any[]) => any;
 
-// WeakMap should be fine, if we de-reference the function, it should be garbage collected
-const functionIdCache = new WeakMap<AnyFunction, string>();
+const functionIdCache = new Map<AnyFunction, string>();
 
 /**
  * Retrieves the unique identifier for a given function.
@@ -20,7 +18,7 @@ export function getFunctionId(fn: AnyFunction) {
     // biome-ignore lint/style/noNonNullAssertion: the `has` above ensures that this will always be set
     return functionIdCache.get(fn)!;
   }
-  const id = uint8ArrayToHex(sha256(fn.toString()));
+  const id = randomBytesHex();
   functionIdCache.set(fn, id);
   return id;
 }

package/src/utils/ipfs.test.ts

@@ -1,6 +1,10 @@
 import { describe, expect, it } from "vitest";
 import { createThirdwebClient } from "../client/client.js";
-import { findIPFSCidFromUri, resolveScheme } from "./ipfs.js";
+import {
+  findIPFSCidFromUri,
+  getBaseUriFromBatch,
+  resolveScheme,
+} from "./ipfs.js";
 
 describe("resolveScheme", () => {
   it("should resolve ipfs scheme when not passing a gateway override", () => {
@@ -70,3 +74,55 @@ describe("resolveScheme", () => {
     expect(findIPFSCidFromUri(uri)).toBe(cid);
   });
 });
+
+describe("getBaseUriFromBatch", () => {
+  it("should return the base uri", () => {
+    const batchOfUris = ["ipfs://Qm.../0", "ipfs://Qm.../1", "ipfs://Qm.../2"];
+    const baseUri = getBaseUriFromBatch(batchOfUris);
+    expect(baseUri).toMatchInlineSnapshot(`"ipfs://Qm.../"`);
+  });
+  it("should throw if the batch is empty", () => {
+    expect(() => getBaseUriFromBatch([])).toThrowErrorMatchingInlineSnapshot(
+      "[Error: Batch of URIs is empty]",
+    );
+  });
+
+  it("should throw if an element of the array does not have the same base", () => {
+    const batchOfUris = ["ipfs://Qm.../0", "ipfs://Qm.../1", "ipfs://Qm2.../2"];
+    expect(() =>
+      getBaseUriFromBatch(batchOfUris),
+    ).toThrowErrorMatchingInlineSnapshot(
+      "[Error: All URIs in the batch must have the same base URI]",
+    );
+  });
+
+  it("should work with a custom domain", () => {
+    const batchOfUris = [
+      "https://example.com/0",
+      "https://example.com/1",
+      "https://example.com/2",
+    ];
+    const baseUri = getBaseUriFromBatch(batchOfUris);
+    expect(baseUri).toMatchInlineSnapshot(`"https://example.com/"`);
+  });
+
+  it("should work with a custom domain and path", () => {
+    const batchOfUris = [
+      "https://example.com/path/0",
+      "https://example.com/path/1",
+      "https://example.com/path/2",
+    ];
+    const baseUri = getBaseUriFromBatch(batchOfUris);
+    expect(baseUri).toMatchInlineSnapshot(`"https://example.com/path/"`);
+  });
+
+  it("should work with a custom domain and path with trailing slash", () => {
+    const batchOfUris = [
+      "https://example.com/path/0/",
+      "https://example.com/path/1/",
+      "https://example.com/path/2/",
+    ];
+    const baseUri = getBaseUriFromBatch(batchOfUris);
+    expect(baseUri).toMatchInlineSnapshot(`"https://example.com/path/"`);
+  });
+});