thirdweb 5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413 → 5.55.0-nightly-8035923cdad943a47fc909e04522c351d06804f0-20240913000407

package/src/extensions/modules/common/installPublishedModule.ts

@@ -4,7 +4,7 @@ import type { Account } from "../../../wallets/interfaces/wallet.js";
 import { installModule } from "../__generated__/IModularCore/write/installModule.js";
 
 /**
- * @extension MODULAR
+ * @modules
  */
 export type InstallPublishedModuleOptions = {
   account: Account;
@@ -20,7 +20,7 @@ export type InstallPublishedModuleOptions = {
  * Install a published module on a modular contract
  * @param options - The options for installing a published module
  * @returns A prepared transaction to send
- * @extension MODULAR
+ * @modules
  * @example
  * ```ts
  * import { installPublishedModule } from "thirdweb/modules";

package/src/extensions/modules/common/uninstallModuleByProxy.ts

@@ -8,7 +8,7 @@ import { resolveImplementation } from "../../../utils/bytecode/resolveImplementa
 import { uninstallModule } from "../__generated__/IModularCore/write/uninstallModule.js";
 
 /**
- * @extension MODULAR
+ * @modules
  */
 export type UninstallModuleByProxyOptions = {
   client: ThirdwebClient;
@@ -22,7 +22,7 @@ export type UninstallModuleByProxyOptions = {
  * Uninstall an module by proxy
  * @param options - The options for uninstalling an module by proxy
  * @returns A prepared transaction to send
- * @extension MODULAR
+ * @modules
  * @example
  * ```ts
  * import { uninstallModuleByProxy } from "thirdweb/modules";

package/src/extensions/modules/common/uninstallPublishedModule.ts

@@ -3,7 +3,7 @@ import { getDeployedInfraContract } from "../../../contract/deployment/utils/inf
 import { uninstallModule } from "../__generated__/IModularCore/write/uninstallModule.js";
 
 /**
- * @extension MODULAR
+ * @modules
  */
 export type UninstallPublishedModuleOptions = {
   contract: ThirdwebContract;
@@ -17,7 +17,7 @@ export type UninstallPublishedModuleOptions = {
  * Uninstall a published module
  * @param options - The options for uninstalling a published module
  * @returns A prepared transaction to send
- * @extension MODULAR
+ * @modules
  * @example
  * ```ts
  * import { uninstallPublishedModule } from "thirdweb/modules";

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

@@ -61,10 +61,10 @@ export type DeployModularContractOptions = Prettify<
  * On chains where the thirdweb infrastructure contracts are not deployed, this function will deploy them as well.
  * @param options - The deployment options.
  * @returns The deployed contract address.
- * @extension DEPLOY
+ * @modules
  * @example
  * ```ts
- * import { deployModularContract } from "thirdweb/deploys";
+ * import { deployModularContract } from "thirdweb/modules";
  * const contractAddress = await deployModularContract({
  *  chain,
  *  client,

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

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
+import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
 import { ENTRYPOINT_ADDRESS_v0_6 } from "../../wallets/smart/lib/constants.js";
 import { deployPublishedContract } from "./deploy-published.js";
 
@@ -38,7 +39,13 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         },
         salt: "test",
       });
-      expect(address).toBe("0x75fc461544723c0dac7b46256027878e82ddc2cb");
+      expect(address).toBe("0x8a9e25cbf6daa2b56cc0df4669195b8c8c20cda8");
+      const isDeployed = await isContractDeployed({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        address,
+      });
+      expect(isDeployed).toBe(true);
     });
 
     it("should deploy a published autofactory contract", async () => {
@@ -69,6 +76,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         salt: "test",
       });
       expect(address).toBe("0x777151741260F8d4098dD492e45FdB536F442672");
+      const isDeployed = await isContractDeployed({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        address,
+      });
+      expect(isDeployed).toBe(true);
     });
 
     // TODO: Replace these tests' live contracts with mocks

package/src/extensions/split/read/getRecipientSplitPercentage.ts

@@ -20,6 +20,19 @@ export interface SplitRecipient {
   splitPercentage: number;
 }
 
+/**
+ * Get the split percentage of a recipient
+ * @param options - The options for the transaction
+ * @param options.recipientAddress - The address of the recipient
+ * @returns The split percentage of the recipient
+ * @extension SPLIT
+ * @example
+ * ```ts
+ * import { getRecipientSplitPercentage } from "thirdweb/extensions/split";
+ *
+ * const percentage = await getRecipientSplitPercentage({ recipientAddress: "0x..." });
+ * ```
+ */
 export async function getRecipientSplitPercentage(
   options: BaseTransactionOptions<{ recipientAddress: string }>,
 ): Promise<SplitRecipient> {

package/src/react/core/hooks/others/useProfiles.ts

@@ -18,7 +18,7 @@ import { useActiveWallet } from "../wallets/useActiveWallet.js";
  * const { data: profiles } = useProfiles();
  *
  * console.log("Type:", profiles[0].type); // "discord"
- * console.log("Email:", profiles[0].email); // "john.doe@example.com"
+ * console.log("Email:", profiles[0].details.email); // "john.doe@example.com"
  * ```
  *
  * @wallet

package/src/react/core/utils/defaultTokens.ts

@@ -342,6 +342,20 @@ export const defaultTokens = DEFAULT_TOKENS as unknown as SupportedTokens;
 type SupportedSymbol =
   (typeof DEFAULT_TOKENS)[keyof typeof DEFAULT_TOKENS][number]["symbol"];
 
+/**
+ * Get the default token for a given chain and symbol
+ * @param chain - The chain to get the token for
+ * @param symbol - The symbol of the token to get
+ * @returns The default token for the given chain and symbol
+ * @example
+ * ```ts
+ * import { getDefaultToken } from "thirdweb/react";
+ * import { ethereum } from "thirdweb/chains";
+ *
+ * const token = getDefaultToken(ethereum, "USDC");
+ * ```
+ * @utils
+ */
 export function getDefaultToken(chain: Chain, symbol: SupportedSymbol) {
   const tokens = defaultTokens[chain.id];
   return tokens?.find((t) => t.symbol === symbol);

package/src/react/web/ui/ConnectWallet/screens/LinkedProfilesScreen.tsx

@@ -4,6 +4,7 @@ import { shortenAddress } from "../../../../../utils/address.js";
 import type { Profile } from "../../../../../wallets/in-app/core/authentication/types.js";
 import { fontSize, iconSize } from "../../../../core/design-system/index.js";
 import { useProfiles } from "../../../../core/hooks/others/useProfiles.js";
+import { useSocialProfiles } from "../../../../core/social/useSocialProfiles.js";
 import { getWalletIcon } from "../../../../core/utils/walletIcon.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
 import { Img } from "../../components/Img.js";
@@ -88,41 +89,11 @@ export function LinkedProfilesScreen(props: {
             </MenuButton>
             <Spacer y="xs" />
             {connectedProfiles?.map((profile) => (
-              <MenuButton
+              <LinkedProfile
                 key={`${profile.type}-${getProfileDisplayName(profile)}`}
-                onClick={() => {
-                  props.setScreen("linked-profiles");
-                }}
-                style={{
-                  fontSize: fontSize.sm,
-                  cursor: "default",
-                }}
-                disabled // disabled until we have more data to show on a dedicated profile screen
-              >
-                {profile.type === "wallet" && profile.details.address ? (
-                  <Container
-                    style={{
-                      width: "24px",
-                      height: "24px",
-                      borderRadius: "100%",
-                      overflow: "hidden",
-                    }}
-                  >
-                    <Blobbie address={profile.details.address} size={24} />
-                  </Container>
-                ) : (
-                  <Img
-                    src={getWalletIcon(profile.type)}
-                    width={iconSize.md}
-                    height={iconSize.md}
-                    loading="eager"
-                    client={props.client}
-                  />
-                )}
-                <Text color="primaryText">
-                  {getProfileDisplayName(profile)}
-                </Text>
-              </MenuButton>
+                profile={profile}
+                client={props.client}
+              />
             ))}
           </Container>
           <Spacer y="md" />
@@ -131,3 +102,75 @@ export function LinkedProfilesScreen(props: {
     </Container>
   );
 }
+
+function LinkedProfile({
+  profile,
+  client,
+}: { profile: Profile; client: ThirdwebClient }) {
+  const { data: socialProfiles } = useSocialProfiles({
+    client,
+    address: profile.details.address,
+  });
+
+  return (
+    <MenuButton
+      style={{
+        fontSize: fontSize.sm,
+        cursor: "default",
+      }}
+      disabled // disabled until we have more data to show on a dedicated profile screen
+    >
+      {socialProfiles?.some((p) => p.avatar) ? (
+        <Img
+          src={socialProfiles?.find((p) => p.avatar)?.avatar}
+          width={iconSize.lg}
+          height={iconSize.lg}
+          loading="eager"
+          client={client}
+          style={{
+            borderRadius: "100%",
+          }}
+        />
+      ) : profile.details.address !== undefined ? (
+        <Container
+          style={{
+            width: "32px",
+            height: "32px",
+            borderRadius: "100%",
+            overflow: "hidden",
+          }}
+        >
+          <Blobbie address={profile.details.address} size={32} />
+        </Container>
+      ) : (
+        <Img
+          src={getWalletIcon(profile.type)}
+          width={iconSize.lg}
+          height={iconSize.lg}
+          loading="eager"
+          client={client}
+        />
+      )}
+      <div
+        style={{
+          display: "flex",
+          flexDirection: "row",
+          justifyContent: "space-between",
+          alignItems: "center",
+          flexGrow: 1,
+        }}
+      >
+        <Text color="primaryText">
+          {socialProfiles?.find((p) => p.avatar)?.name ||
+            getProfileDisplayName(profile)}
+        </Text>
+        {socialProfiles?.find((p) => p.avatar)?.name &&
+          profile.details.address && (
+            <Text color="secondaryText" size="sm">
+              {shortenAddress(profile.details.address, 4)}
+            </Text>
+          )}
+      </div>
+    </MenuButton>
+  );
+}

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

@@ -57,7 +57,7 @@ describe("Resolve implementation", async () => {
       abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
       constructorParams: {
         logic: implementationAddress,
-        data: "",
+        data: "0x",
       },
     });
 

package/src/utils/ens/avatar.ts

@@ -1,20 +1,40 @@
-import { getCachedChain } from "../../chains/utils.js";
 import type { ThirdwebClient } from "../../client/client.js";
-import { getContract } from "../../contract/contract.js";
-import { isAddress } from "../address.js";
 import { getClientFetch } from "../fetch.js";
 import { resolveScheme } from "../ipfs.js";
+import { parseNftUri } from "../nft/parseNft.js";
 
-type AvatarOptions = {
+export type ParseAvatarOptions = {
   client: ThirdwebClient;
   uri: string;
 };
 
 /**
- * @internal
+ * Parses an ENS or similar avatar record. Supports NFT URIs, IPFS scheme, and HTTPS URIs.
+ * @param options - The options for parsing an ENS avatar record.
+ * @param options.client - The Thirdweb client.
+ * @param options.uri - The URI to parse.
+ * @returns A promise that resolves to the avatar URL, or null if the URI could not be parsed.
+ * @example
+ * ```ts
+ * import { parseAvatarRecord } from "thirdweb/utils/ens";
+ * const avatarUrl = await parseAvatarRecord({
+ *    client,
+ *    uri: "ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/",
+ * });
+ *
+ * console.log(avatarUrl); // "https://ipfs.io/ipfs/bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/"
+ *
+ * const avatarUrl2 = await parseAvatarRecord({
+ *    client,
+ *    uri: "eip155:1/erc1155:0xb32979486938aa9694bfc898f35dbed459f44424/10063",
+ * });
+ *
+ * console.log(avatarUrl2); // "https://opensea.io/assets/0xb32979486938aa9694bfc898f35dbed459f44424/10063"
+ * ```
+ * @extension ENS
  */
 export async function parseAvatarRecord(
-  options: AvatarOptions,
+  options: ParseAvatarOptions,
 ): Promise<string | null> {
   let uri: string | null = options.uri;
   if (/eip155:/i.test(options.uri)) {
@@ -36,71 +56,7 @@ export async function parseAvatarRecord(
   return null;
 }
 
-/**
- * @internal
- */
-async function parseNftUri(options: AvatarOptions): Promise<string | null> {
-  let uri = options.uri;
-  // parse valid nft spec (CAIP-22/CAIP-29)
-  // @see: https://github.com/ChainAgnostic/CAIPs/tree/master/CAIPs
-  if (uri.startsWith("did:nft:")) {
-    // convert DID to CAIP
-    uri = uri.replace("did:nft:", "").replace(/_/g, "/");
-  }
-
-  const [reference = "", asset_namespace = "", tokenID = ""] = uri.split("/");
-  const [eip_namespace, chainID] = reference.split(":");
-  const [erc_namespace, contractAddress] = asset_namespace.split(":");
-
-  if (!eip_namespace || eip_namespace.toLowerCase() !== "eip155") {
-    throw new Error(
-      `Invalid EIP namespace, expected EIP155, got: "${eip_namespace}"`,
-    );
-  }
-  if (!chainID) {
-    throw new Error("Chain ID not found");
-  }
-  if (!contractAddress || !isAddress(contractAddress)) {
-    throw new Error("Contract address not found");
-  }
-  if (!tokenID) {
-    throw new Error("Token ID not found");
-  }
-  const chain = getCachedChain(Number(chainID));
-  const contract = getContract({
-    client: options.client,
-    chain,
-    address: contractAddress,
-  });
-  switch (erc_namespace) {
-    case "erc721": {
-      const { getNFT } = await import("../../extensions/erc721/read/getNFT.js");
-      const nft = await getNFT({
-        contract,
-        tokenId: BigInt(tokenID),
-      });
-      return nft.metadata.image ?? null;
-    }
-    case "erc1155": {
-      const { getNFT } = await import(
-        "../../extensions/erc1155/read/getNFT.js"
-      );
-      const nft = await getNFT({
-        contract,
-        tokenId: BigInt(tokenID),
-      });
-      return nft.metadata.image ?? null;
-    }
-
-    default: {
-      throw new Error(
-        `Invalid ERC namespace, expected ERC721 or ERC1155, got: "${erc_namespace}"`,
-      );
-    }
-  }
-}
-
-async function isImageUri(options: AvatarOptions): Promise<boolean> {
+async function isImageUri(options: ParseAvatarOptions): Promise<boolean> {
   try {
     const res = await getClientFetch(options.client)(options.uri, {
       method: "HEAD",

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

@@ -55,7 +55,9 @@ export type ClaimCondition = {
 
 /**
  * Represents the input data for creating a claim condition for a Modular Drop contract.
- * @extension MODULAR
+ * @modules ClaimableERC20
+ * @modules ClaimableERC721
+ * @modules ClaimableERC1155
  */
 export type ClaimConditionInput = {
   /**

package/src/utils/nft/parseNft.ts

@@ -1,4 +1,8 @@
+import { getCachedChain } from "../../chains/utils.js";
+import type { ThirdwebClient } from "../../client/client.js";
+import { getContract } from "../../contract/contract.js";
 import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import { isAddress } from "../address.js";
 import type { Prettify } from "../type-utils.js";
 
 /**
@@ -95,3 +99,88 @@ export function parseNFT(base: NFTMetadata, options: ParseNFTOptions): NFT {
       throw new Error("Invalid NFT type");
   }
 }
+
+/**
+ * Parses an NFT URI.
+ * @param options - The options for parsing an NFT URI.
+ * @param options.client - The Thirdweb client.
+ * @param options.uri - The NFT URI to parse.
+ * @returns A promise that resolves to the NFT URI, or null if the URI could not be parsed.
+ *
+ * @example
+ * ```ts
+ * import { parseNftUri } from "thirdweb/utils/ens";
+ * const nftUri = await parseNftUri({
+ *    client,
+ *    uri: "eip155:1/erc1155:0xb32979486938aa9694bfc898f35dbed459f44424/10063",
+ * });
+ *
+ * console.log(nftUri); // ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/
+ * ```
+ *
+ * @extension ENS
+ *
+ */
+export async function parseNftUri(options: {
+  client: ThirdwebClient;
+  uri: string;
+}): Promise<string | null> {
+  let uri = options.uri;
+  // parse valid nft spec (CAIP-22/CAIP-29)
+  // @see: https://github.com/ChainAgnostic/CAIPs/tree/master/CAIPs
+  if (uri.startsWith("did:nft:")) {
+    // convert DID to CAIP
+    uri = uri.replace("did:nft:", "").replace(/_/g, "/");
+  }
+
+  const [reference = "", asset_namespace = "", tokenID = ""] = uri.split("/");
+  const [eip_namespace, chainID] = reference.split(":");
+  const [erc_namespace, contractAddress] = asset_namespace.split(":");
+
+  if (!eip_namespace || eip_namespace.toLowerCase() !== "eip155") {
+    throw new Error(
+      `Invalid EIP namespace, expected EIP155, got: "${eip_namespace}"`,
+    );
+  }
+  if (!chainID) {
+    throw new Error("Chain ID not found");
+  }
+  if (!contractAddress || !isAddress(contractAddress)) {
+    throw new Error("Contract address not found");
+  }
+  if (!tokenID) {
+    throw new Error("Token ID not found");
+  }
+  const chain = getCachedChain(Number(chainID));
+  const contract = getContract({
+    client: options.client,
+    chain,
+    address: contractAddress,
+  });
+  switch (erc_namespace) {
+    case "erc721": {
+      const { getNFT } = await import("../../extensions/erc721/read/getNFT.js");
+      const nft = await getNFT({
+        contract,
+        tokenId: BigInt(tokenID),
+      });
+      return nft.metadata.image ?? null;
+    }
+    case "erc1155": {
+      const { getNFT } = await import(
+        "../../extensions/erc1155/read/getNFT.js"
+      );
+      const nft = await getNFT({
+        contract,
+        tokenId: BigInt(tokenID),
+      });
+      return nft.metadata.image ?? null;
+    }
+
+    default: {
+      throw new Error(
+        `Invalid ERC namespace, expected ERC721 or ERC1155, got: "${erc_namespace}"`,
+      );
+    }
+  }
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413";
+export const version = "5.55.0-nightly-8035923cdad943a47fc909e04522c351d06804f0-20240913000407";

package/src/wallets/in-app/core/users/getUser.ts

@@ -0,0 +1,112 @@
+import type { ThirdwebClient } from "../../../../client/client.js";
+import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import { getClientFetch } from "../../../../utils/fetch.js";
+import type { OneOf, Prettify } from "../../../../utils/type-utils.js";
+import type { Profile } from "../authentication/types.js";
+
+export type GetUserResult = {
+  userId: string;
+  walletAddress: string;
+  email?: string;
+  phone?: string;
+  createdAt: string;
+  profiles: Profile[];
+};
+
+/**
+ * Gets user based on the provided query parameters.
+ * @note This function is only available on the server (a secret key is required in the client).
+ *
+ * @param options - The options for the find users function.
+ * @param options.client - The Thirdweb client with a secret key included.
+ * @param [options.walletAddress] - The wallet address to query by.
+ * @param [options.email] - The email to query by.
+ * @param [options.phone] - The phone number to query by.
+ * @param [options.id] - The user ID to query by.
+ *
+ * @returns An array of user objects.
+ *
+ * @example
+ * ```ts
+ * import { getUser } from "thirdweb/wallets";
+ *
+ * const user = await getUser({
+ *   client,
+ *   walletAddress: "0x123...",
+ * });
+ * ```
+ *
+ * @wallet
+ */
+export async function getUser({
+  client,
+  walletAddress,
+  email,
+  phone,
+  id,
+}: Prettify<
+  {
+    client: ThirdwebClient;
+  } & OneOf<{
+    walletAddress?: string;
+    email?: string;
+    phone?: string;
+    id?: string;
+  }>
+>): Promise<GetUserResult | null> {
+  if (!client.secretKey) {
+    throw new Error(
+      "A secret key is required to query for users. If you're making this request from the server, please add a secret key to your client.",
+    );
+  }
+
+  const url = new URL(
+    `${getThirdwebBaseUrl("inAppWallet")}/api/2023-11-30/embedded-wallet/user-details`,
+  );
+
+  if (walletAddress) {
+    url.searchParams.set("queryBy", "walletAddress");
+    url.searchParams.set("walletAddress", walletAddress);
+  } else if (email) {
+    url.searchParams.set("queryBy", "email");
+    url.searchParams.set("email", email);
+  } else if (phone) {
+    url.searchParams.set("queryBy", "phone");
+    url.searchParams.set("phone", phone);
+  } else if (id) {
+    url.searchParams.set("queryBy", "id");
+    url.searchParams.set("id", id);
+  } else {
+    throw new Error(
+      "Please provide a walletAddress, email, phone, or id to query for users.",
+    );
+  }
+
+  const clientFetch = getClientFetch(client);
+
+  const res = await clientFetch(url.toString());
+
+  if (!res.ok) {
+    throw new Error("Failed to get profiles");
+  }
+
+  const data = (await res.json()) as {
+    userId: string;
+    walletAddress: string;
+    email?: string;
+    phone?: string;
+    createdAt: string;
+    linkedAccounts: Profile[];
+  }[];
+
+  return (
+    data.map((item) => ({
+      userId: item.userId,
+      walletAddress: item.walletAddress,
+      email: item.email,
+      phone: item.phone,
+      createdAt: item.createdAt,
+      profiles: item.linkedAccounts,
+    }))[0] || null
+  );
+}

package/src/wallets/smart/index.ts

@@ -45,6 +45,7 @@ import {
 } from "./lib/calls.js";
 import { getDefaultAccountFactory } from "./lib/constants.js";
 import {
+  clearAccountDeploying,
   createUnsignedUserOp,
   signUserOp,
   waitForUserOpReceipt,
@@ -597,6 +598,9 @@ async function _sendUserOp(args: {
     userOpHash,
   });
 
+  // reset the isDeploying flag after every transaction
+  clearAccountDeploying(options.accountContract);
+
   return {
     client: options.client,
     chain: options.chain,