thirdweb 5.45.2-nightly-b15aa4cdff3f3b233025da285780668a18fe29ab-20240813000336 → 5.46.0-nightly-814024ae249141ad1446ce7f21793b1d37b95d13-20240814000405

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.45.2-nightly-b15aa4cdff3f3b233025da285780668a18fe29ab-20240813000336",
+  "version": "5.46.0-nightly-814024ae249141ad1446ce7f21793b1d37b95d13-20240814000405",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -297,7 +297,7 @@
     "expo-web-browser": "13.0.3",
     "happy-dom": "^14.12.0",
     "msw": "^2.3.4",
-    "react-native": "0.74.2",
+    "react-native": "0.74.5",
     "react-native-aes-gcm-crypto": "0.2.2",
     "react-native-quick-crypto": "0.7.0-rc.6",
     "react-native-svg": "15.3.0",

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

@@ -0,0 +1,40 @@
+import type { ThirdwebContract } from "../contract.js";
+import { formatCompilerMetadata } from "./compiler-metadata.js";
+
+/**
+ * Down the compiled metadata from thirdweb contract api and format it
+ * @param metadata The (json) data returned from https://contract.thirdweb.com/metadata/<chainId>/<contractAddress>
+ *
+ * @example
+ * ```ts
+ * import { getCompilerMetadata, getContract } from "thirdweb/contracts";
+ *
+ * const contract = getContract({
+ *   address: "0x...",
+ *   chain: ethereum,
+ *   client: "",
+ * });
+ * const metadata = await getCompilerMetadata(contract);
+ * ```
+ * @returns
+ */
+export async function getCompilerMetadata(contract: ThirdwebContract) {
+  const { address, chain } = contract;
+  const response = await fetch(
+    `https://contract.thirdweb.com/metadata/${chain.id}/${address}`,
+    {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    },
+  );
+  if (!response.ok) {
+    const errorMsg = await response.json();
+    throw new Error(
+      errorMsg.message || errorMsg.error || "Failed to get compiler metadata",
+    );
+  }
+  const data = await response.json();
+  return formatCompilerMetadata(data);
+}

package/src/exports/contract.ts

@@ -34,3 +34,5 @@ export {
   type PrepareDirectDeployTransactionOptions,
 } from "../contract/deployment/deploy-with-abi.js";
 export { prepareAutoFactoryDeployTransaction } from "../contract/deployment/deploy-via-autofactory.js";
+
+export { getCompilerMetadata } from "../contract/actions/get-compiler-metadata.js";

package/src/exports/extensions/erc1155.ts

@@ -99,6 +99,12 @@ export {
   updateMetadata,
   type UpdateMetadataParams,
 } from "../../extensions/erc1155/drops/write/updateMetadata.js";
+
+export {
+  updateTokenURI,
+  type UpdateTokenURIParams,
+} from "../../extensions/erc1155/write/updateTokenURI.js";
+
 export {
   getClaimConditionById,
   type GetClaimConditionByIdParams,

package/src/exports/extensions/erc721.ts

@@ -167,3 +167,7 @@ export {
   updateMetadata,
   type UpdateMetadataParams,
 } from "../../extensions/erc721/drops/write/updateMetadata.js";
+export {
+  updateTokenURI,
+  type UpdateTokenURIParams,
+} from "../../extensions/erc721/write/updateTokenURI.js";

package/src/extensions/erc1155/write/updateTokenURI.ts

@@ -0,0 +1,97 @@
+import { upload } from "../../../storage/upload.js";
+import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type { NFTInput } from "../../../utils/nft/parseNft.js";
+import {
+  type SetTokenURIParams,
+  setTokenURI,
+} from "../../erc1155/__generated__/INFTMetadata/write/setTokenURI.js";
+
+/**
+ * @extension ERC1155
+ */
+export type UpdateTokenURIParams = {
+  tokenId: bigint;
+  newMetadata: NFTInput;
+};
+
+/**
+ * This function is an abstracted layer of the [`setTokenURI` extension](https://portal.thirdweb.com/references/typescript/v5/erc1155/setTokenURI),
+ * which means it uses `setTokenURI` under the hood.
+ * While the `setTokenURI` method only takes in a uri string, this extension takes in a user-friendly [`NFTInput`](https://portal.thirdweb.com/references/typescript/v5/NFTInput),
+ * upload that content to IPFS and pass the IPFS URI (of said `NFTInput`) to the underlying `setTokenURI` method.
+ *
+ * This extension does not validate the NFTInput so make sure you are passing the proper content that you want to update.
+ *
+ * @extension ERC1155
+ * @returns the prepared transaction from `setTokenURI`
+ * @example
+ * ```ts
+ * import { updateTokenURI } from "thirdweb/extensions/erc1155";
+ *
+ * const transaction = updateTokenURI({
+ *   tokenId: 0n,
+ *   nft: {
+ *     name: "new name",
+ *     description: "new description",
+ *     image: "https://image-host.com/new-image.png",
+ *   },
+ * });
+ * ```
+ */
+export function updateTokenURI(
+  options: BaseTransactionOptions<UpdateTokenURIParams>,
+) {
+  const { contract } = options;
+  return setTokenURI({
+    contract,
+    asyncParams: async () => getUpdateTokenParams(options),
+  });
+}
+
+export async function getUpdateTokenParams(
+  options: BaseTransactionOptions<UpdateTokenURIParams>,
+): Promise<SetTokenURIParams> {
+  const { tokenId, newMetadata } = options;
+  const batch: Promise<string>[] = [
+    // image URI resolution
+    (async () => {
+      if (!newMetadata.image) {
+        return "";
+      }
+      if (typeof newMetadata.image === "string") {
+        return newMetadata.image;
+      }
+      return await upload({
+        client: options.contract.client,
+        files: [newMetadata.image],
+      });
+    })(),
+    // animation URI resolution
+    (async () => {
+      if (!newMetadata.animation_url) {
+        return "";
+      }
+      if (typeof newMetadata.animation_url === "string") {
+        return newMetadata.animation_url;
+      }
+      return await upload({
+        client: options.contract.client,
+        files: [newMetadata.animation_url],
+      });
+    })(),
+  ];
+
+  const [imageURI, animationURI] = await Promise.all(batch);
+  if (newMetadata.image && imageURI) {
+    newMetadata.image = imageURI;
+  }
+  if (newMetadata.animation_url && animationURI) {
+    newMetadata.animation_url = animationURI;
+  }
+
+  const uri = await upload({
+    client: options.contract.client,
+    files: [newMetadata],
+  });
+  return { tokenId, uri };
+}

package/src/extensions/erc721/write/updateTokenURI.ts

@@ -0,0 +1,97 @@
+import { upload } from "../../../storage/upload.js";
+import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type { NFTInput } from "../../../utils/nft/parseNft.js";
+import {
+  type SetTokenURIParams,
+  setTokenURI,
+} from "../../erc721/__generated__/INFTMetadata/write/setTokenURI.js";
+
+/**
+ * @extension ERC721
+ */
+export type UpdateTokenURIParams = {
+  tokenId: bigint;
+  newMetadata: NFTInput;
+};
+
+/**
+ * This function is an abstracted layer of the [`setTokenURI` extension](https://portal.thirdweb.com/references/typescript/v5/erc721/setTokenURI),
+ * which means it uses `setTokenURI` under the hood.
+ * While the `setTokenURI` method only takes in a uri string, this extension takes in a user-friendly [`NFTInput`](https://portal.thirdweb.com/references/typescript/v5/NFTInput),
+ * upload that content to IPFS and pass the IPFS URI (of said `NFTInput`) to the underlying `setTokenURI` method.
+ *
+ * This extension does not validate the NFTInput so make sure you are passing the proper content that you want to update.
+ *
+ * @extension ERC721
+ * @returns the prepared transaction from `setTokenURI`
+ * @example
+ * ```ts
+ * import { updateTokenURI } from "thirdweb/extensions/erc721";
+ *
+ * const transaction = updateTokenURI({
+ *   tokenId: 0n,
+ *   nft: {
+ *     name: "new name",
+ *     description: "new description",
+ *     image: "https://image-host.com/new-image.png",
+ *   },
+ * });
+ * ```
+ */
+export function updateTokenURI(
+  options: BaseTransactionOptions<UpdateTokenURIParams>,
+) {
+  const { contract } = options;
+  return setTokenURI({
+    contract,
+    asyncParams: async () => getUpdateTokenParams(options),
+  });
+}
+
+export async function getUpdateTokenParams(
+  options: BaseTransactionOptions<UpdateTokenURIParams>,
+): Promise<SetTokenURIParams> {
+  const { tokenId, newMetadata } = options;
+  const batch: Promise<string>[] = [
+    // image URI resolution
+    (async () => {
+      if (!newMetadata.image) {
+        return "";
+      }
+      if (typeof newMetadata.image === "string") {
+        return newMetadata.image;
+      }
+      return await upload({
+        client: options.contract.client,
+        files: [newMetadata.image],
+      });
+    })(),
+    // animation URI resolution
+    (async () => {
+      if (!newMetadata.animation_url) {
+        return "";
+      }
+      if (typeof newMetadata.animation_url === "string") {
+        return newMetadata.animation_url;
+      }
+      return await upload({
+        client: options.contract.client,
+        files: [newMetadata.animation_url],
+      });
+    })(),
+  ];
+
+  const [imageURI, animationURI] = await Promise.all(batch);
+  if (newMetadata.image && imageURI) {
+    newMetadata.image = imageURI;
+  }
+  if (newMetadata.animation_url && animationURI) {
+    newMetadata.animation_url = animationURI;
+  }
+
+  const uri = await upload({
+    client: options.contract.client,
+    files: [newMetadata],
+  });
+  return { tokenId, uri };
+}

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

@@ -5,7 +5,7 @@ import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { isAddress } from "../../utils/address.js";
 import { deploySplitContract } from "./deploy-split.js";
 
-describe("deploy-split contract", () => {
+describe.runIf(process.env.TW_SECRET_KEY)("deploy-split contract", () => {
   it("should deploy Split contract", async () => {
     const address = await deploySplitContract({
       account: TEST_ACCOUNT_A,

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

@@ -1,5 +1,6 @@
 import type { Abi } from "abitype";
 import type { ThirdwebClient } from "../../client/client.js";
+import { formatCompilerMetadata } from "../../contract/actions/compiler-metadata.js";
 import { download } from "../../storage/download.js";
 import type { Hex } from "../encoding/hex.js";
 import type { Prettify } from "../type-utils.js";
@@ -89,34 +90,6 @@ async function fetchAndParseCompilerMetadata(
   return formatCompilerMetadata(metadata);
 }
 
-// biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
-function formatCompilerMetadata(metadata: any): ParsedCompilerMetadata {
-  const abi = metadata.output.abi;
-  const compilationTarget = metadata.settings.compilationTarget;
-  const targets = Object.keys(compilationTarget);
-  const name = compilationTarget[targets[0] as keyof typeof compilationTarget];
-  const info = {
-    title: metadata.output.devdoc.title,
-    author: metadata.output.devdoc.author,
-    details: metadata.output.devdoc.detail,
-    notice: metadata.output.userdoc.notice,
-  };
-  const licenses: string[] = [
-    ...new Set(
-      // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
-      Object.entries(metadata.sources).map(([, src]) => (src as any).license),
-    ),
-  ];
-  return {
-    name,
-    abi,
-    metadata,
-    info,
-    licenses,
-    isPartialAbi: metadata.isPartialAbi,
-  };
-}
-
 // types
 
 type RawCompilerMetadata = {

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.45.2-nightly-b15aa4cdff3f3b233025da285780668a18fe29ab-20240813000336";
+export const version = "5.46.0-nightly-814024ae249141ad1446ce7f21793b1d37b95d13-20240814000405";

package/src/wallets/in-app/core/authentication/getLoginPath.ts

@@ -1,8 +1,20 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
-import type { AuthOption } from "../../../../wallets/types.js";
+import { type AuthOption, authOptions } from "../../../../wallets/types.js";
 import type { Ecosystem } from "../../web/types.js";
 
+const getLoginOptionRoute = (option: AuthOption) => {
+  if (!authOptions.includes(option)) {
+    throw new Error(`Unknown auth option ${option}`);
+  }
+  switch (option) {
+    case "wallet":
+      return "siwe";
+    default:
+      return option;
+  }
+};
+
 export const getLoginUrl = ({
   authOption,
   client,
@@ -16,7 +28,8 @@ export const getLoginUrl = ({
   mode?: "popup" | "redirect" | "mobile";
   redirectUrl?: string;
 }) => {
-  let baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}?clientId=${client.clientId}`;
+  const route = getLoginOptionRoute(authOption);
+  let baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${route}?clientId=${client.clientId}`;
   if (ecosystem?.partnerId) {
     baseUrl = `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
   } else if (ecosystem) {
@@ -49,7 +62,8 @@ export const getLoginCallbackUrl = ({
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
 }): string => {
-  let baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}/callback?clientId=${client.clientId}`;
+  const route = getLoginOptionRoute(authOption);
+  let baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${route}/callback?clientId=${client.clientId}`;
   if (ecosystem?.partnerId) {
     baseUrl = `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
   } else if (ecosystem) {

package/src/wallets/in-app/core/authentication/siwe.ts

@@ -1,9 +1,9 @@
 import { signLoginPayload } from "../../../../auth/core/sign-login-payload.js";
 import type { LoginPayload } from "../../../../auth/core/types.js";
+import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getClientFetch } from "../../../../utils/fetch.js";
-import type { InjectedSupportedWalletIds } from "../../../../wallets/__generated__/wallet-ids.js";
-import { createWallet } from "../../../../wallets/create-wallet.js";
+import type { Wallet } from "../../../interfaces/wallet.js";
 import type { Ecosystem } from "../../web/types.js";
 import { getLoginCallbackUrl, getLoginUrl } from "./getLoginPath.js";
 import type { AuthStoredTokenWithCookieReturnType } from "./types.js";
@@ -12,23 +12,23 @@ import type { AuthStoredTokenWithCookieReturnType } from "./types.js";
  * @internal
  */
 export async function siweAuthenticate(args: {
-  walletId: InjectedSupportedWalletIds;
-  chainId: number;
+  wallet: Wallet;
+  chain: Chain;
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
 }): Promise<AuthStoredTokenWithCookieReturnType> {
-  const wallet = createWallet(args.walletId);
+  const { wallet, chain } = args;
   const account = await wallet.connect({ client: args.client });
   const clientFetch = getClientFetch(args.client, args.ecosystem);
 
   const payload = await (async () => {
     const path = getLoginUrl({
-      authOption: "siwe",
+      authOption: "wallet",
       client: args.client,
       ecosystem: args.ecosystem,
     });
     const res = await clientFetch(
-      `${path}&address=${account.address}&chainId=${args.chainId}`,
+      `${path}&address=${account.address}&chainId=${chain.id}`,
     );
 
     if (!res.ok) throw new Error("Failed to generate SIWE login payload");
@@ -39,7 +39,7 @@ export async function siweAuthenticate(args: {
 
   const authResult = await (async () => {
     const path = getLoginCallbackUrl({
-      authOption: "siwe",
+      authOption: "wallet",
       client: args.client,
       ecosystem: args.ecosystem,
     });

package/src/wallets/in-app/core/authentication/types.ts

@@ -1,8 +1,9 @@
 import type { AuthType } from "@passwordless-id/webauthn/dist/esm/types.js";
+import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Address } from "../../../../utils/address.js";
-import type { InjectedSupportedWalletIds } from "../../../../wallets/__generated__/wallet-ids.js";
 import type { Account } from "../../../interfaces/wallet.js";
+import type { Wallet } from "../../../interfaces/wallet.js";
 import type { AuthOption, SocialAuthOption } from "../../../types.js";
 import type { Ecosystem } from "../../web/types.js";
 
@@ -42,9 +43,9 @@ export type SingleStepAuthArgsType =
       authenticatorType?: AuthType;
     }
   | {
-      strategy: "siwe";
-      walletId: InjectedSupportedWalletIds;
-      chainId: number;
+      strategy: "wallet";
+      wallet: Wallet;
+      chain: Chain;
     };
 
 export type AuthArgsType = (MultiStepAuthArgsType | SingleStepAuthArgsType) & {

package/src/wallets/in-app/native/auth/native-auth.ts

@@ -1,6 +1,7 @@
 import * as WebBrowser from "expo-web-browser";
+import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
-import type { InjectedSupportedWalletIds } from "../../../../wallets/__generated__/wallet-ids.js";
+import type { Wallet } from "../../../interfaces/wallet.js";
 import { getLoginUrl } from "../../core/authentication/getLoginPath.js";
 import { siweAuthenticate } from "../../core/authentication/siwe.js";
 import type {
@@ -125,15 +126,15 @@ export async function socialLogin(
 
 export async function siweLogin(
   client: ThirdwebClient,
-  walletId: InjectedSupportedWalletIds,
-  chainId: number,
+  wallet: Wallet,
+  chain: Chain,
   ecosystem?: Ecosystem,
 ): Promise<AuthStoredTokenWithCookieReturnType> {
   const { storedToken } = await siweAuthenticate({
     client,
     ecosystem,
-    walletId,
-    chainId,
+    wallet,
+    chain,
   });
   try {
     const toStoreToken: AuthStoredTokenWithCookieReturnType["storedToken"] = {

package/src/wallets/in-app/native/native-connector.ts

@@ -1,6 +1,6 @@
+import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
-import type { InjectedSupportedWalletIds } from "../../../wallets/__generated__/wallet-ids.js";
-import type { Account } from "../../interfaces/wallet.js";
+import type { Account, Wallet } from "../../interfaces/wallet.js";
 import { siweAuthenticate } from "../core/authentication/siwe.js";
 import {
   type AuthArgsType,
@@ -91,11 +91,11 @@ export class InAppNativeConnector implements InAppConnector {
       case "phone": {
         return verifyOtp(params);
       }
-      case "siwe": {
+      case "wallet": {
         return siweAuthenticate({
           client: this.options.client,
-          walletId: params.walletId,
-          chainId: params.chainId,
+          wallet: params.wallet,
+          chain: params.chain,
         });
       }
       case "google":
@@ -145,10 +145,10 @@ export class InAppNativeConnector implements InAppConnector {
           redirectUrl,
         });
       }
-      case "siwe": {
+      case "wallet": {
         return this.siweLogin({
-          walletId: params.walletId,
-          chainId: params.chainId,
+          wallet: params.wallet,
+          chain: params.chain,
         });
       }
       case "jwt": {
@@ -230,14 +230,14 @@ export class InAppNativeConnector implements InAppConnector {
   }
 
   private async siweLogin(options: {
-    walletId: InjectedSupportedWalletIds;
-    chainId: number;
+    wallet: Wallet;
+    chain: Chain;
   }): Promise<AuthLoginReturnType> {
     try {
       const { storedToken } = await siweLogin(
         this.options.client,
-        options.walletId,
-        options.chainId,
+        options.wallet,
+        options.chain,
       );
       const account = await this.getAccount();
       return {
@@ -250,15 +250,15 @@ export class InAppNativeConnector implements InAppConnector {
       };
     } catch (error) {
       console.error(
-        `Error while signing in with: ${options.walletId}. ${error}`,
+        `Error while signing in with: ${options.wallet.id}. ${error}`,
       );
       if (error instanceof Error) {
         throw new Error(
-          `Error signing in with ${options.walletId}: ${error.message}`,
+          `Error signing in with ${options.wallet.id}: ${error.message}`,
         );
       }
       throw new Error(
-        `An unknown error occurred signing in with ${options.walletId}`,
+        `An unknown error occurred signing in with ${options.wallet.id}`,
       );
     }
   }

package/src/wallets/in-app/web/in-app.ts

@@ -63,6 +63,21 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  * });
  * ```
  *
+ * ### Login with SIWE
+ * ```ts
+ * import { inAppWallet, createWallet } from "thirdweb/wallets";
+ *
+ * const rabby = createWallet("io.rabby");
+ * const inAppWallet = inAppWallet();
+ *
+ * const account = await inAppWallet.connect({
+ *    strategy: "wallet",
+ *    chain: mainnet,
+ *    wallet: rabby,
+ *    client: MY_CLIENT
+ * });
+ * ```
+ *
  * ### Login with phone number
  * ```ts
  * import { inAppWallet, preAuthenticate } from "thirdweb/wallets/in-app";

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -222,12 +222,12 @@ export class InAppWebConnector implements InAppConnector {
           openedWindow: args.openedWindow,
         });
       }
-      case "siwe": {
+      case "wallet": {
         return siweAuthenticate({
-          client: this.wallet.client,
           ecosystem: this.wallet.ecosystem,
-          walletId: args.walletId,
-          chainId: args.chainId,
+          client: this.wallet.client,
+          wallet: args.wallet,
+          chain: args.chain,
         });
       }
     }
@@ -280,7 +280,7 @@ export class InAppWebConnector implements InAppConnector {
       }
       case "phone":
       case "email":
-      case "siwe":
+      case "wallet":
       case "apple":
       case "facebook":
       case "google":

package/src/wallets/types.ts

@@ -29,12 +29,14 @@ export const socialAuthOptions = [
 ] as const;
 export type SocialAuthOption = (typeof socialAuthOptions)[number];
 
-export type AuthOption =
-  | "email"
-  | "phone"
-  | "passkey"
-  | "siwe"
-  | SocialAuthOption;
+export const authOptions = [
+  ...socialAuthOptions,
+  "email",
+  "phone",
+  "passkey",
+  "wallet",
+] as const;
+export type AuthOption = (typeof authOptions)[number];
 
 export type DisconnectFn = () => Promise<void>;
 export type SwitchChainFn = (chain: Chain) => Promise<void>;