Version Packages (#1487)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+## Problem solved
+
+Short description of the bug fixed or feature added
+
+## Changes made
+
+- [ ] Public API changes: list the public API changes made if any
+- [ ] Internal API changes: explain the internal logic changes
+
+## How to test
+
+- [ ] Automated tests: link to unit test file
+- [ ] Manual tests: step by step instructions on how to test

.github/workflows/build-test-lint.yml

@@ -17,6 +17,7 @@ concurrency:
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+  TW_SECRET_KEY: ${{ secrets.TW_SECRET_KEY }}
 
 jobs:
   build:

package.json

@@ -31,7 +31,7 @@
     "hotlink-revert": "node ./scripts/hotlink/hotlink-revert.mjs",
     "explain:major": "node ./scripts/changeset-explain-major.mjs"
   },
-  "packageManager": "pnpm@8.1.0",
+  "packageManager": "pnpm@8.6.12",
   "dependencies": {
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",

packages/auth/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @thirdweb-dev/auth
 
+## 3.2.32
+
+### Patch Changes
+
+- Updated dependencies [[`07fb1b5f`](https://github.com/thirdweb-dev/js/commit/07fb1b5ffa4c170e252df31070852ddb9a81dec9)]:
+  - @thirdweb-dev/wallets@1.1.15
+
+## 3.2.31
+
+### Patch Changes
+
+- Updated dependencies [[`39e2af6f`](https://github.com/thirdweb-dev/js/commit/39e2af6f2f4d933dca1b3de4a37de76375bafd74)]:
+  - @thirdweb-dev/wallets@1.1.14
+
+## 3.2.30
+
+### Patch Changes
+
+- Updated dependencies [[`34b31599`](https://github.com/thirdweb-dev/js/commit/34b315993c0abaccb9640a5d5804c2c93af569c2)]:
+  - @thirdweb-dev/wallets@1.1.13
+
+## 3.2.29
+
+### Patch Changes
+
+- Updated dependencies [[`73462ef1`](https://github.com/thirdweb-dev/js/commit/73462ef10800aeeb5976634e2bc6fb5d3e8501e4), [`70c4a119`](https://github.com/thirdweb-dev/js/commit/70c4a119d691a37ec999d9f6087902d532cc82ed)]:
+  - @thirdweb-dev/wallets@1.1.12
+
+## 3.2.28
+
+### Patch Changes
+
+- Updated dependencies [[`4b0e63dc`](https://github.com/thirdweb-dev/js/commit/4b0e63dcc0ca871ce9cef76f8a41ff290316741c)]:
+  - @thirdweb-dev/wallets@1.1.11
+
+## 3.2.27
+
+### Patch Changes
+
+- [#1392](https://github.com/thirdweb-dev/js/pull/1392) [`dfd120a3`](https://github.com/thirdweb-dev/js/commit/dfd120a3a9d1582c8b174265c92bf43dbbaf5c86) Thanks [@adam-maj](https://github.com/adam-maj)! - Expose functions from auth and update useAuth
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@1.1.10
+
+## 3.2.26
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@1.1.9
+
 ## 3.2.25
 
 ### Patch Changes

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/auth",
-  "version": "3.2.25",
+  "version": "3.2.32",
   "main": "dist/thirdweb-dev-auth.cjs.js",
   "module": "dist/thirdweb-dev-auth.esm.js",
   "browser": {

packages/auth/src/core/auth.ts

@@ -1,28 +1,28 @@
 import {
-  THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
-  THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
-} from "../constants";
+  authenticateJWT,
+  generateJWT,
+  parseJWT,
+  refreshJWT,
+} from "./functions/jwt";
 import {
-  LoginOptions,
-  LoginPayload,
-  GenerateOptions,
-  LoginPayloadData,
-  LoginPayloadDataSchema,
-  AuthenticationPayloadDataSchema,
-  AuthenticationPayloadData,
-  VerifyOptionsSchema,
-  VerifyOptions,
-  GenerateOptionsSchema,
-  AuthenticateOptionsSchema,
-  AuthenticateOptions,
-  User,
-  Json,
-  LoginOptionsSchema,
-  AuthenticationPayload,
-  AuthenticationPayloadDataInput,
-} from "./schema";
-import { isBrowser } from "./utils";
+  buildAndSignLoginPayload,
+  buildLoginPayload,
+  signLoginPayload,
+  verifyLoginPayload,
+} from "./functions/login";
 import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { Json, User } from "./schema/common";
+import {
+  LoginOptionsWithOptionalDomain,
+  LoginPayload,
+  LoginPayloadData,
+} from "./schema/login";
+import { VerifyOptionsWithOptionalDomain } from "./schema/verify";
+import { GenerateOptionsWithOptionalDomain } from "./schema/generate";
+import {
+  AuthenticateOptionsWithOptionalDomain,
+  AuthenticationPayload,
+} from "./schema/authenticate";
 
 export class ThirdwebAuth {
   private domain: string;
@@ -37,432 +37,82 @@ export class ThirdwebAuth {
     this.wallet = wallet;
   }
 
-  public async payload(options?: LoginOptions): Promise<LoginPayloadData> {
-    const parsedOptions = LoginOptionsSchema.parse(options);
-
-    let chainId: string | undefined = parsedOptions?.chainId;
-    if (!chainId && this.wallet.getChainId) {
-      try {
-        chainId = (await this.wallet.getChainId()).toString();
-      } catch {
-        // ignore error
-      }
-    }
-
-    return LoginPayloadDataSchema.parse({
-      type: this.wallet.type,
-      domain: parsedOptions?.domain || this.domain,
-      address: parsedOptions?.address || (await this.wallet.getAddress()),
-      statement: parsedOptions?.statement,
-      version: parsedOptions?.version,
-      uri: parsedOptions?.uri,
-      chain_id: chainId,
-      nonce: parsedOptions?.nonce,
-      expiration_time:
-        parsedOptions?.expirationTime ||
-        new Date(
-          Date.now() +
-            1000 * THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
-        ),
-      invalid_before:
-        parsedOptions?.invalidBefore ||
-        new Date(
-          Date.now() -
-            1000 * THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
-        ),
-      resources: parsedOptions?.resources,
+  public async payload(
+    options?: LoginOptionsWithOptionalDomain,
+  ): Promise<LoginPayloadData> {
+    return buildLoginPayload({
+      wallet: this.wallet,
+      options: this.formatOptions(options),
     });
   }
 
   public async loginWithPayload(
     payload: LoginPayloadData,
   ): Promise<LoginPayload> {
-    const message = this.generateMessage(payload);
-    const signature = await this.wallet.signMessage(message);
-
-    return {
-      payload,
-      signature,
-    };
+    return signLoginPayload({ wallet: this.wallet, payload });
   }
 
-  public async login(options?: LoginOptions): Promise<LoginPayload> {
-    const payloadData = await this.payload(options);
-    return await this.loginWithPayload(payloadData);
+  public async login(
+    options?: LoginOptionsWithOptionalDomain,
+  ): Promise<LoginPayload> {
+    return buildAndSignLoginPayload({
+      wallet: this.wallet,
+      options: this.formatOptions(options),
+    });
   }
 
   public async verify(
     payload: LoginPayload,
-    options?: VerifyOptions,
+    options?: VerifyOptionsWithOptionalDomain,
   ): Promise<string> {
-    const parsedOptions = VerifyOptionsSchema.parse(options);
-
-    if (payload.payload.type !== this.wallet.type) {
-      throw new Error(
-        `Expected chain type '${this.wallet.type}' does not match chain type on payload '${payload.payload.type}'`,
-      );
-    }
-
-    // Check that the intended domain matches the domain of the payload
-    const domain = parsedOptions?.domain || this.domain;
-    if (payload.payload.domain !== domain) {
-      throw new Error(
-        `Expected domain '${domain}' does not match domain on payload '${payload.payload.domain}'`,
-      );
-    }
-
-    // Check that the payload statement matches the expected statement
-    if (parsedOptions?.statement) {
-      if (payload.payload.statement !== parsedOptions.statement) {
-        throw new Error(
-          `Expected statement '${parsedOptions.statement}' does not match statement on payload '${payload.payload.statement}'`,
-        );
-      }
-    }
-
-    // Check that the intended URI matches the URI of the payload
-    if (parsedOptions?.uri) {
-      if (payload.payload.uri !== parsedOptions.uri) {
-        throw new Error(
-          `Expected URI '${parsedOptions.uri}' does not match URI on payload '${payload.payload.uri}'`,
-        );
-      }
-    }
-
-    // Check that the intended version matches the version of the payload
-    if (parsedOptions?.version) {
-      if (payload.payload.version !== parsedOptions.version) {
-        throw new Error(
-          `Expected version '${parsedOptions.version}' does not match version on payload '${payload.payload.version}'`,
-        );
-      }
-    }
-
-    // Check that the intended chain ID matches the chain ID of the payload
-    if (parsedOptions?.chainId) {
-      if (payload.payload.chain_id !== parsedOptions.chainId) {
-        throw new Error(
-          `Expected chain ID '${parsedOptions.chainId}' does not match chain ID on payload '${payload.payload.chain_id}'`,
-        );
-      }
-    }
-
-    // Check that the payload nonce is valid
-    if (parsedOptions?.validateNonce !== undefined) {
-      try {
-        await parsedOptions.validateNonce(payload.payload.nonce);
-      } catch (err) {
-        throw new Error(`Login request nonce is invalid`);
-      }
-    }
-
-    // Check that it isn't before the invalid before time
-    const currentTime = new Date();
-    if (currentTime < new Date(payload.payload.invalid_before)) {
-      throw new Error(`Login request is not yet valid`);
-    }
-
-    // Check that the payload hasn't expired
-    if (currentTime > new Date(payload.payload.expiration_time)) {
-      throw new Error(`Login request has expired`);
-    }
-
-    // Check that the specified resources are present on the payload
-    if (parsedOptions?.resources) {
-      const missingResources = parsedOptions.resources.filter(
-        (resource) => !payload.payload.resources?.includes(resource),
-      );
-      if (missingResources.length > 0) {
-        throw new Error(
-          `Login request is missing required resources: ${missingResources.join(
-            ", ",
-          )}`,
-        );
-      }
-    }
-
-    // Check that the signing address is the claimed wallet address
-    const message = this.generateMessage(payload.payload);
-    const chainId =
-      this.wallet.type === "evm" && payload.payload.chain_id
-        ? parseInt(payload.payload.chain_id)
-        : undefined;
-    const verified = await this.verifySignature(
-      message,
-      payload.signature,
-      payload.payload.address,
-      chainId,
-    );
-    if (!verified) {
-      throw new Error(
-        `Signer address does not match payload address '${payload.payload.address.toLowerCase()}'`,
-      );
-    }
-
-    return payload.payload.address;
+    return verifyLoginPayload({
+      wallet: this.wallet,
+      payload,
+      options: this.formatOptions(options),
+    });
   }
 
   public async generate(
     payload: LoginPayload,
-    options?: GenerateOptions,
+    options?: GenerateOptionsWithOptionalDomain,
   ): Promise<string> {
-    if (isBrowser()) {
-      throw new Error(
-        "Authentication tokens should not be generated in the browser, as they must be signed by a server-side admin wallet.",
-      );
-    }
-
-    const parsedOptions = GenerateOptionsSchema.parse(options);
-
-    const domain = parsedOptions?.domain || this.domain;
-    const userAddress = await this.verify(payload, {
-      domain,
-      ...parsedOptions?.verifyOptions,
-    });
-
-    let session: Json | undefined = undefined;
-    if (typeof parsedOptions?.session === "function") {
-      const sessionTrigger = (await parsedOptions.session(userAddress)) as Json;
-      if (sessionTrigger) {
-        session = sessionTrigger;
-      }
-    } else {
-      session = parsedOptions?.session;
-    }
-
-    const adminAddress = await this.wallet.getAddress();
-    return this.createToken({
-      iss: adminAddress,
-      sub: userAddress,
-      aud: domain,
-      nbf: parsedOptions?.invalidBefore || new Date(),
-      exp:
-        parsedOptions?.expirationTime ||
-        new Date(
-          Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
-        ),
-      iat: new Date(),
-      jti: parsedOptions?.tokenId,
-      ctx: session,
-    });
-  }
-
-  public async refresh(token: string, expirationTime?: Date): Promise<string> {
-    const { payload } = this.parseToken(token);
-    return this.createToken({
-      iss: payload.iss,
-      sub: payload.sub,
-      aud: payload.aud,
-      nbf: new Date(),
-      exp:
-        expirationTime ||
-        new Date(
-          Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
-        ),
-      iat: new Date(),
-      ctx: payload.ctx,
-    });
-  }
-
-  /**
-   * Authenticate With Token
-   * @remarks Server-side function that authenticates the provided JWT token. This function verifies that
-   * the provided authentication token is valid and returns the address of the authenticated wallet.
-   *
-   * @param domain - The domain of the server-side application doing authentication
-   * @param token - The authentication token being used
-   * @returns The address of the authenticated wallet
-   *
-   * @example
-   * ```javascript
-   * const domain = "example.com";
-   * const loginPayload = await sdk.auth.login(domain);
-   * const token = await sdk.auth.generateAuthToken(domain, loginPayload);
-   *
-   * // Authenticate the token and get the address of authenticating users wallet
-   * const address = sdk.auth.authenticate(domain, token);
-   * ```
-   */
-  public async authenticate<TSession extends Json = Json>(
-    token: string,
-    options?: AuthenticateOptions,
-  ): Promise<User<TSession>> {
-    if (isBrowser()) {
-      throw new Error(
-        "Should not authenticate tokens in the browser, as they must be verified by the server-side admin wallet.",
-      );
-    }
-
-    const parsedOptions = AuthenticateOptionsSchema.parse(options);
-    const domain = parsedOptions?.domain || this.domain;
-
-    const { payload, signature } = this.parseToken(token);
-
-    // Check that the payload unique ID is valid
-    if (parsedOptions?.validateTokenId !== undefined) {
-      try {
-        await parsedOptions.validateTokenId(payload.jti);
-      } catch (err) {
-        throw new Error(`Token ID is invalid`);
-      }
-    }
-
-    // Check that the token audience matches the domain
-    if (payload.aud !== domain) {
-      throw new Error(
-        `Expected token to be for the domain '${domain}', but found token with domain '${payload.aud}'`,
-      );
-    }
-
-    // Check that the token is past the invalid before time
-    const currentTime = Math.floor(new Date().getTime() / 1000);
-    if (currentTime < payload.nbf) {
-      throw new Error(
-        `This token is invalid before epoch time '${payload.nbf}', current epoch time is '${currentTime}'`,
-      );
-    }
-
-    // Check that the token hasn't expired
-    if (currentTime > payload.exp) {
-      throw new Error(
-        `This token expired at epoch time '${payload.exp}', current epoch time is '${currentTime}'`,
-      );
-    }
-
-    // Check that the connected wallet matches the token issuer
-    const connectedAddress = await this.wallet.getAddress();
-    if (connectedAddress.toLowerCase() !== payload.iss.toLowerCase()) {
-      throw new Error(
-        `Expected the connected wallet address '${connectedAddress}' to match the token issuer address '${payload.iss}'`,
-      );
-    }
-
-    let chainId: number | undefined = undefined;
-    if (this.wallet.getChainId) {
-      try {
-        chainId = await this.wallet.getChainId();
-      } catch {
-        // ignore error
-      }
-    }
-
-    const verified = await this.verifySignature(
-      JSON.stringify(payload),
-      signature,
-      connectedAddress,
-      chainId,
-    );
-    if (!verified) {
-      throw new Error(
-        `The connected wallet address '${connectedAddress}' did not sign the token`,
-      );
-    }
-
-    return {
-      address: payload.sub,
-      session: payload.ctx as TSession | undefined,
-    };
-  }
-
-  public parseToken(token: string): AuthenticationPayload {
-    const encodedPayload = token.split(".")[1];
-    const encodedSignature = token.split(".")[2];
-    const payload: AuthenticationPayloadData = JSON.parse(
-      Buffer.from(encodedPayload, "base64").toString(),
-    );
-    const signature = Buffer.from(encodedSignature, "base64").toString();
-
-    return {
+    return generateJWT({
+      wallet: this.wallet,
       payload,
-      signature,
-    };
+      options: this.formatOptions(options),
+    });
   }
 
-  private async createToken(
-    payload: AuthenticationPayloadDataInput,
-  ): Promise<string> {
-    const payloadData = AuthenticationPayloadDataSchema.parse(payload);
-
-    const message = JSON.stringify(payloadData);
-    const signature = await this.wallet.signMessage(message);
-
-    // Header used for JWT token specifying hash algorithm
-    const header = {
-      // Specify ECDSA with SHA-256 for hashing algorithm
-      alg: "ES256",
-      typ: "JWT",
-    };
-
-    const encodedHeader = Buffer.from(JSON.stringify(header)).toString(
-      "base64",
-    );
-    const encodedData = Buffer.from(JSON.stringify(payloadData))
-      .toString("base64")
-      .replace(/=/g, "");
-    const encodedSignature = Buffer.from(signature).toString("base64");
-
-    // Generate a JWT token with base64 encoded header, payload, and signature
-    const token = `${encodedHeader}.${encodedData}.${encodedSignature}`;
-
-    return token;
+  public async refresh(jwt: string, expirationTime?: Date): Promise<string> {
+    return refreshJWT({
+      wallet: this.wallet,
+      jwt,
+      options: { expirationTime },
+    });
   }
 
-  private async verifySignature(
-    message: string,
-    signature: string,
-    address: string,
-    chainId?: number,
-  ) {
-    return this.wallet.verifySignature(message, signature, address, chainId);
+  public async authenticate<TSession extends Json = Json>(
+    jwt: string,
+    options?: AuthenticateOptionsWithOptionalDomain,
+  ): Promise<User<TSession>> {
+    return authenticateJWT({
+      wallet: this.wallet,
+      jwt,
+      options: this.formatOptions(options),
+    });
   }
 
-  /**
-   * Generates a EIP-4361 & CAIP-122 compliant message to sign based on the login payload
-   */
-  private generateMessage(payload: LoginPayloadData): string {
-    const typeField = payload.type === "evm" ? "Ethereum" : "Solana";
-    const header = `${payload.domain} wants you to sign in with your ${typeField} account:`;
-    let prefix = [header, payload.address].join("\n");
-    prefix = [prefix, payload.statement].join("\n\n");
-    if (payload.statement) {
-      prefix += "\n";
-    }
+  public parseToken(jwt: string): AuthenticationPayload {
+    return parseJWT(jwt);
+  }
 
-    const suffixArray = [];
-    if (payload.uri) {
-      const uriField = `URI: ${payload.uri}`;
-      suffixArray.push(uriField);
-    }
-
-    const versionField = `Version: ${payload.version}`;
-    suffixArray.push(versionField);
-
-    if (payload.chain_id) {
-      const chainField = `Chain ID: ` + payload.chain_id || "1";
-      suffixArray.push(chainField);
-    }
-
-    const nonceField = `Nonce: ${payload.nonce}`;
-    suffixArray.push(nonceField);
-
-    const issuedAtField = `Issued At: ${payload.issued_at}`;
-    suffixArray.push(issuedAtField);
-
-    const expiryField = `Expiration Time: ${payload.expiration_time}`;
-    suffixArray.push(expiryField);
-
-    if (payload.invalid_before) {
-      const invalidBeforeField = `Not Before: ${payload.invalid_before}`;
-      suffixArray.push(invalidBeforeField);
-    }
-
-    if (payload.resources) {
-      suffixArray.push(
-        [`Resources:`, ...payload.resources.map((x) => `- ${x}`)].join("\n"),
-      );
-    }
-
-    const suffix = suffixArray.join("\n");
-    return [prefix, suffix].join("\n");
+  private formatOptions<TOptions extends { domain?: string }>(
+    options?: TOptions,
+  ): Omit<TOptions, "domain"> & { domain: string } {
+    return options
+      ? { ...options, domain: options?.domain || this.domain }
+      : ({ domain: this.domain } as Omit<TOptions, "domain"> & {
+          domain: string;
+        });
   }
 }

packages/auth/src/core/functions/jwt.ts

@@ -0,0 +1,226 @@
+import {
+  AuthenticateOptionsSchema,
+  AuthenticationPayload,
+  AuthenticationPayloadData,
+  AuthenticationPayloadDataSchema,
+} from "../schema/authenticate";
+import { Json, User } from "../schema/common";
+import {
+  BuildJwtParams,
+  RefreshJwtParams,
+  GenerateJwtParams,
+  AuthenticateJwtParams,
+} from "../schema/functions";
+import { GenerateOptionsSchema } from "../schema/generate";
+import { RefreshOptionsSchema } from "../schema/refresh";
+import { verifyLoginPayload } from "./login";
+
+function isBrowser() {
+  return typeof window !== "undefined";
+}
+
+function base64encode(data: string): string {
+  if (isBrowser()) {
+    return window.btoa(data);
+  }
+
+  return Buffer.from(data).toString("base64").replace(/=/g, "");
+}
+
+function base64decode(data: string): string {
+  if (isBrowser()) {
+    return window.atob(data);
+  }
+
+  return Buffer.from(data, "base64").toString();
+}
+
+/**
+ * Build JWT token based on the authentication payload
+ */
+async function buildJWT({ wallet, payload }: BuildJwtParams): Promise<string> {
+  const payloadData = AuthenticationPayloadDataSchema.parse(payload);
+
+  const message = JSON.stringify(payloadData);
+  const signature = await wallet.signMessage(message);
+
+  // Header used for JWT token specifying hash algorithm
+  const header = {
+    // Specify ECDSA with SHA-256 for hashing algorithm
+    alg: "ES256",
+    typ: "JWT",
+  };
+
+  const encodedHeader = base64encode(JSON.stringify(header));
+  const encodedData = base64encode(JSON.stringify(payloadData));
+  const encodedSignature = base64encode(signature);
+
+  // Generate a JWT with base64 encoded header, payload, and signature
+  const jwt = `${encodedHeader}.${encodedData}.${encodedSignature}`;
+
+  return jwt;
+}
+
+/**
+ * Generate a new JWT using a login payload
+ */
+export async function generateJWT({
+  wallet,
+  payload,
+  options,
+}: GenerateJwtParams): Promise<string> {
+  const parsedOptions = GenerateOptionsSchema.parse(options);
+  const userAddress = await verifyLoginPayload({
+    wallet,
+    payload,
+    options: {
+      domain: parsedOptions.domain,
+      ...parsedOptions.verifyOptions,
+    },
+  });
+
+  let session: Json | undefined = undefined;
+  if (typeof parsedOptions?.session === "function") {
+    const sessionTrigger = (await parsedOptions.session(userAddress)) as Json;
+    if (sessionTrigger) {
+      session = sessionTrigger;
+    }
+  } else {
+    session = parsedOptions?.session;
+  }
+
+  const adminAddress = await wallet.getAddress();
+  return buildJWT({
+    wallet,
+    payload: {
+      iss: adminAddress,
+      sub: userAddress,
+      aud: parsedOptions.domain,
+      nbf: parsedOptions?.invalidBefore || new Date(),
+      exp: parsedOptions.expirationTime,
+      iat: new Date(),
+      jti: parsedOptions?.tokenId,
+      ctx: session,
+    },
+  });
+}
+
+/**
+ * Parse data from an encoded auth JWT
+ */
+export function parseJWT(jwt: string): AuthenticationPayload {
+  const encodedPayload = jwt.split(".")[1];
+  const encodedSignature = jwt.split(".")[2];
+  const payload: AuthenticationPayloadData = JSON.parse(
+    base64decode(encodedPayload),
+  );
+  const signature = base64decode(encodedSignature);
+
+  return {
+    payload,
+    signature,
+  };
+}
+
+/**
+ * Refresh an existing JWT
+ */
+export async function refreshJWT({
+  wallet,
+  jwt,
+  options,
+}: RefreshJwtParams): Promise<string> {
+  const { payload } = parseJWT(jwt);
+  const parsedOptions = RefreshOptionsSchema.parse(options);
+  return buildJWT({
+    wallet,
+    payload: {
+      iss: payload.iss,
+      sub: payload.sub,
+      aud: payload.aud,
+      nbf: new Date(),
+      exp: parsedOptions.expirationTime,
+      iat: new Date(),
+      ctx: payload.ctx,
+    },
+  });
+}
+
+/**
+ * Validate a JWT and extract the user's info
+ */
+export async function authenticateJWT<TSession extends Json = Json>({
+  wallet,
+  jwt,
+  options,
+}: AuthenticateJwtParams): Promise<User<TSession>> {
+  const parsedOptions = AuthenticateOptionsSchema.parse(options);
+  const { payload, signature } = parseJWT(jwt);
+
+  // Check that the payload unique ID is valid
+  if (parsedOptions?.validateTokenId !== undefined) {
+    try {
+      await parsedOptions.validateTokenId(payload.jti);
+    } catch (err) {
+      throw new Error(`Token ID is invalid`);
+    }
+  }
+
+  // Check that the token audience matches the domain
+  if (payload.aud !== parsedOptions.domain) {
+    throw new Error(
+      `Expected token to be for the domain '${parsedOptions.domain}', but found token with domain '${payload.aud}'`,
+    );
+  }
+
+  // Check that the token is past the invalid before time
+  const currentTime = Math.floor(new Date().getTime() / 1000);
+  if (currentTime < payload.nbf) {
+    throw new Error(
+      `This token is invalid before epoch time '${payload.nbf}', current epoch time is '${currentTime}'`,
+    );
+  }
+
+  // Check that the token hasn't expired
+  if (currentTime > payload.exp) {
+    throw new Error(
+      `This token expired at epoch time '${payload.exp}', current epoch time is '${currentTime}'`,
+    );
+  }
+
+  // Check that the connected wallet matches the token issuer
+  const issuerAddress = parsedOptions.issuerAddress
+    ? parsedOptions.issuerAddress
+    : await wallet.getAddress();
+  if (issuerAddress.toLowerCase() !== payload.iss.toLowerCase()) {
+    throw new Error(
+      `The expected issuer address '${issuerAddress}' did not match the token issuer address '${payload.iss}'`,
+    );
+  }
+
+  let chainId: number | undefined = undefined;
+  if (wallet.getChainId) {
+    try {
+      chainId = await wallet.getChainId();
+    } catch {
+      // ignore error
+    }
+  }
+
+  const verified = await wallet.verifySignature(
+    JSON.stringify(payload),
+    signature,
+    issuerAddress,
+    chainId,
+  );
+  if (!verified) {
+    throw new Error(
+      `The expected signer address '${issuerAddress}' did not sign the token`,
+    );
+  }
+
+  return {
+    address: payload.sub,
+    session: payload.ctx as TSession | undefined,
+  };
+}

packages/auth/src/core/functions/login.ts

@@ -0,0 +1,224 @@
+import {
+  BuildLoginPayloadParams,
+  SignLoginPayloadParams,
+  VerifyLoginPayloadParams,
+} from "../schema/functions";
+import {
+  LoginOptionsSchema,
+  LoginPayload,
+  LoginPayloadData,
+  LoginPayloadDataSchema,
+} from "../schema/login";
+import { VerifyOptionsSchema } from "../schema/verify";
+
+/**
+ * Create an EIP-4361 & CAIP-122 compliant message to sign based on the login payload
+ */
+function createLoginMessage(payload: LoginPayloadData): string {
+  const typeField = payload.type === "evm" ? "Ethereum" : "Solana";
+  const header = `${payload.domain} wants you to sign in with your ${typeField} account:`;
+  let prefix = [header, payload.address].join("\n");
+  prefix = [prefix, payload.statement].join("\n\n");
+  if (payload.statement) {
+    prefix += "\n";
+  }
+
+  const suffixArray = [];
+  if (payload.uri) {
+    const uriField = `URI: ${payload.uri}`;
+    suffixArray.push(uriField);
+  }
+
+  const versionField = `Version: ${payload.version}`;
+  suffixArray.push(versionField);
+
+  if (payload.chain_id) {
+    const chainField = `Chain ID: ` + payload.chain_id || "1";
+    suffixArray.push(chainField);
+  }
+
+  const nonceField = `Nonce: ${payload.nonce}`;
+  suffixArray.push(nonceField);
+
+  const issuedAtField = `Issued At: ${payload.issued_at}`;
+  suffixArray.push(issuedAtField);
+
+  const expiryField = `Expiration Time: ${payload.expiration_time}`;
+  suffixArray.push(expiryField);
+
+  if (payload.invalid_before) {
+    const invalidBeforeField = `Not Before: ${payload.invalid_before}`;
+    suffixArray.push(invalidBeforeField);
+  }
+
+  if (payload.resources) {
+    suffixArray.push(
+      [`Resources:`, ...payload.resources.map((x) => `- ${x}`)].join("\n"),
+    );
+  }
+
+  const suffix = suffixArray.join("\n");
+  return [prefix, suffix].join("\n");
+}
+
+export async function buildLoginPayload({
+  wallet,
+  options,
+}: BuildLoginPayloadParams): Promise<LoginPayloadData> {
+  const parsedOptions = LoginOptionsSchema.parse(options);
+
+  let chainId: string | undefined = parsedOptions?.chainId;
+  if (!chainId && wallet.getChainId) {
+    try {
+      chainId = (await wallet.getChainId()).toString();
+    } catch {
+      // ignore error
+    }
+  }
+
+  return LoginPayloadDataSchema.parse({
+    type: wallet.type,
+    domain: parsedOptions.domain,
+    address: parsedOptions?.address || (await wallet.getAddress()),
+    statement: parsedOptions?.statement,
+    version: parsedOptions?.version,
+    uri: parsedOptions?.uri,
+    chain_id: chainId,
+    nonce: parsedOptions?.nonce,
+    expiration_time: parsedOptions.expirationTime,
+    invalid_before: parsedOptions.invalidBefore,
+    resources: parsedOptions?.resources,
+  });
+}
+
+export async function signLoginPayload({
+  wallet,
+  payload,
+}: SignLoginPayloadParams): Promise<LoginPayload> {
+  const message = createLoginMessage(payload);
+  const signature = await wallet.signMessage(message);
+
+  return {
+    payload,
+    signature,
+  };
+}
+
+export async function buildAndSignLoginPayload({
+  wallet,
+  options,
+}: BuildLoginPayloadParams): Promise<LoginPayload> {
+  const payload = await buildLoginPayload({ wallet, options });
+  return signLoginPayload({ wallet, payload });
+}
+
+export async function verifyLoginPayload({
+  wallet,
+  payload,
+  options,
+}: VerifyLoginPayloadParams): Promise<string> {
+  const parsedOptions = VerifyOptionsSchema.parse(options);
+
+  if (payload.payload.type !== wallet.type) {
+    throw new Error(
+      `Expected chain type '${wallet.type}' does not match chain type on payload '${payload.payload.type}'`,
+    );
+  }
+
+  // Check that the intended domain matches the domain of the payload
+  if (payload.payload.domain !== parsedOptions.domain) {
+    throw new Error(
+      `Expected domain '${parsedOptions.domain}' does not match domain on payload '${payload.payload.domain}'`,
+    );
+  }
+
+  // Check that the payload statement matches the expected statement
+  if (parsedOptions?.statement) {
+    if (payload.payload.statement !== parsedOptions.statement) {
+      throw new Error(
+        `Expected statement '${parsedOptions.statement}' does not match statement on payload '${payload.payload.statement}'`,
+      );
+    }
+  }
+
+  // Check that the intended URI matches the URI of the payload
+  if (parsedOptions?.uri) {
+    if (payload.payload.uri !== parsedOptions.uri) {
+      throw new Error(
+        `Expected URI '${parsedOptions.uri}' does not match URI on payload '${payload.payload.uri}'`,
+      );
+    }
+  }
+
+  // Check that the intended version matches the version of the payload
+  if (parsedOptions?.version) {
+    if (payload.payload.version !== parsedOptions.version) {
+      throw new Error(
+        `Expected version '${parsedOptions.version}' does not match version on payload '${payload.payload.version}'`,
+      );
+    }
+  }
+
+  // Check that the intended chain ID matches the chain ID of the payload
+  if (parsedOptions?.chainId) {
+    if (payload.payload.chain_id !== parsedOptions.chainId) {
+      throw new Error(
+        `Expected chain ID '${parsedOptions.chainId}' does not match chain ID on payload '${payload.payload.chain_id}'`,
+      );
+    }
+  }
+
+  // Check that the payload nonce is valid
+  if (parsedOptions?.validateNonce !== undefined) {
+    try {
+      await parsedOptions.validateNonce(payload.payload.nonce);
+    } catch (err) {
+      throw new Error(`Login request nonce is invalid`);
+    }
+  }
+
+  // Check that it isn't before the invalid before time
+  const currentTime = new Date();
+  if (currentTime < new Date(payload.payload.invalid_before)) {
+    throw new Error(`Login request is not yet valid`);
+  }
+
+  // Check that the payload hasn't expired
+  if (currentTime > new Date(payload.payload.expiration_time)) {
+    throw new Error(`Login request has expired`);
+  }
+
+  // Check that the specified resources are present on the payload
+  if (parsedOptions?.resources) {
+    const missingResources = parsedOptions.resources.filter(
+      (resource) => !payload.payload.resources?.includes(resource),
+    );
+    if (missingResources.length > 0) {
+      throw new Error(
+        `Login request is missing required resources: ${missingResources.join(
+          ", ",
+        )}`,
+      );
+    }
+  }
+
+  // Check that the signing address is the claimed wallet address
+  const message = createLoginMessage(payload.payload);
+  const chainId =
+    wallet.type === "evm" && payload.payload.chain_id
+      ? parseInt(payload.payload.chain_id)
+      : undefined;
+  const verified = await wallet.verifySignature(
+    message,
+    payload.signature,
+    payload.payload.address,
+    chainId,
+  );
+  if (!verified) {
+    throw new Error(
+      `Signer address does not match payload address '${payload.payload.address.toLowerCase()}'`,
+    );
+  }
+
+  return payload.payload.address;
+}

packages/auth/src/core/index.ts

@@ -1,2 +1,25 @@
+// Export thirdweb auth class
 export { ThirdwebAuth } from "./auth";
-export * from "./schema";
+
+// Export individual auth functions
+export {
+  generateJWT,
+  parseJWT,
+  refreshJWT,
+  authenticateJWT,
+} from "./functions/jwt";
+export {
+  buildLoginPayload,
+  signLoginPayload,
+  buildAndSignLoginPayload,
+  verifyLoginPayload,
+} from "./functions/login";
+
+// Export schema files individually
+export * from "./schema/authenticate";
+export * from "./schema/common";
+export * from "./schema/functions";
+export * from "./schema/generate";
+export * from "./schema/login";
+export * from "./schema/refresh";
+export * from "./schema/verify";

packages/auth/src/core/schema.ts

@@ -1,216 +0,0 @@
-import { utils, BigNumber } from "ethers";
-import { v4 as uuidv4 } from "uuid";
-import { z } from "zod";
-
-export const AddressSchema = z.string().refine(
-  (arg) => utils.isAddress(arg),
-  (out) => {
-    return {
-      message: `${out} is not a valid address`,
-    };
-  },
-);
-
-export const RawDateSchema = z.date().transform((i) => {
-  return BigNumber.from(Math.floor(i.getTime() / 1000));
-});
-
-export const AccountTypeSchema = z.union([
-  z.literal("evm"),
-  z.literal("solana"),
-]);
-
-const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
-type Literal = z.infer<typeof literalSchema>;
-export type Json = Literal | { [key: string]: Json } | Json[];
-const JsonSchema: z.ZodType<Json> = z.lazy(
-  () => z.union([literalSchema, z.array(JsonSchema), z.record(JsonSchema)]),
-  { invalid_type_error: "Provided value was not valid JSON" },
-);
-
-/**
- * @internal
- */
-export const LoginOptionsSchema = z
-  .object({
-    domain: z.string().optional(),
-    address: z.string().optional(),
-    statement: z.string().optional(),
-    uri: z.string().optional(),
-    version: z.string().optional(),
-    chainId: z.string().optional(),
-    nonce: z.string().optional(),
-    expirationTime: z.date().optional(),
-    invalidBefore: z.date().optional(),
-    resources: z.array(z.string()).optional(),
-  })
-  .optional();
-
-/**
- * @internal
- */
-export const LoginPayloadDataSchema = z.object({
-  type: AccountTypeSchema,
-  domain: z.string(),
-  address: z.string(),
-  statement: z
-    .string()
-    .default(
-      "Please ensure that the domain above matches the URL of the current website.",
-    ),
-  uri: z.string().optional(),
-  version: z.string().default("1"),
-  chain_id: z.string().optional(),
-  nonce: z.string().default(uuidv4()),
-  issued_at: z
-    .date()
-    .default(new Date())
-    .transform((d) => d.toISOString()),
-  expiration_time: z.date().transform((d) => d.toISOString()),
-  invalid_before: z
-    .date()
-    .default(new Date())
-    .transform((d) => d.toISOString()),
-  resources: z.array(z.string()).optional(),
-});
-
-/**
- * @internal
- */
-export const LoginPayloadSchema = z.object({
-  payload: LoginPayloadDataSchema,
-  signature: z.string(),
-});
-
-/**
- * @internal
- */
-const VerifyOptionsSchemaRequired = z.object({
-  domain: z.string().optional(),
-  statement: z.string().optional(),
-  uri: z.string().optional(),
-  version: z.string().optional(),
-  chainId: z.string().optional(),
-  validateNonce: z.function().args(z.string()).optional(),
-  resources: z.array(z.string()).optional(),
-});
-
-/**
- * @internal
- */
-export const VerifyOptionsSchema = VerifyOptionsSchemaRequired.optional();
-
-/**
- * @internal
- */
-export const GenerateOptionsSchema = z
-  .object({
-    domain: z.string().optional(),
-    tokenId: z.string().optional(),
-    expirationTime: z.date().optional(),
-    invalidBefore: z.date().optional(),
-    session: z.union([JsonSchema, z.function().args(z.string())]).optional(),
-    verifyOptions: VerifyOptionsSchemaRequired.omit({
-      domain: true,
-    }).optional(),
-  })
-  .optional();
-
-/**
- * @internal
- */
-export const AuthenticationPayloadDataSchema = z.object({
-  iss: z.string(),
-  sub: z.string(),
-  aud: z.string(),
-  exp: RawDateSchema.transform((b) => b.toNumber()),
-  nbf: RawDateSchema.transform((b) => b.toNumber()),
-  iat: RawDateSchema.transform((b) => b.toNumber()),
-  jti: z.string().default(uuidv4()),
-  ctx: JsonSchema.optional(),
-});
-
-/**
- * @internal
- */
-export const AuthenticationPayloadSchema = z.object({
-  payload: AuthenticationPayloadDataSchema,
-  signature: z.string(),
-});
-
-/**
- * @internal
- */
-export const AuthenticateOptionsSchema = z
-  .object({
-    domain: z.string().optional(),
-    validateTokenId: z.function().args(z.string()).optional(),
-  })
-  .optional();
-
-/**
- * @public
- */
-export type LoginOptions = z.input<typeof LoginOptionsSchema>;
-
-/**
- * @public
- */
-export type LoginPayloadData = z.output<typeof LoginPayloadDataSchema>;
-
-/**
- * @public
- */
-export type LoginPayload = z.output<typeof LoginPayloadSchema>;
-
-/**
- * @public
- */
-export type VerifyOptions = z.input<typeof VerifyOptionsSchema>;
-
-/**
- * @public
- */
-export type GenerateOptions = z.input<typeof GenerateOptionsSchema>;
-
-/**
- * @public
- */
-export type AuthenticationPayloadData = z.output<
-  typeof AuthenticationPayloadDataSchema
->;
-
-/**
- * @internal
- */
-export type AuthenticationPayloadDataInput = z.input<
-  typeof AuthenticationPayloadDataSchema
->;
-
-/**
- * @public
- */
-export type AuthenticationPayload = z.output<
-  typeof AuthenticationPayloadSchema
->;
-
-/**
- * @public
- */
-export type AuthenticateOptions = z.output<typeof AuthenticateOptionsSchema>;
-
-/**
- * @public
- */
-export type User<TContext extends Json = Json> = {
-  address: string;
-  session?: TContext;
-};
-
-export const LoginPayloadOutputSchema = LoginPayloadSchema.extend({
-  payload: LoginPayloadDataSchema.extend({
-    issued_at: z.string(),
-    expiration_time: z.string(),
-    invalid_before: z.string(),
-  }),
-});

packages/auth/src/core/schema/authenticate.ts

@@ -0,0 +1,46 @@
+import { z } from "zod";
+import { v4 as uuidv4 } from "uuid";
+import { AddressSchema, JsonSchema, RawDateSchema } from "./common";
+
+export const AuthenticationPayloadDataSchema = z.object({
+  iss: z.string(),
+  sub: z.string(),
+  aud: z.string(),
+  exp: RawDateSchema,
+  nbf: RawDateSchema,
+  iat: RawDateSchema,
+  jti: z.string().default(uuidv4()),
+  ctx: JsonSchema.optional(),
+});
+
+export const AuthenticationPayloadSchema = z.object({
+  payload: AuthenticationPayloadDataSchema,
+  signature: z.string(),
+});
+
+export const AuthenticateOptionsSchema = z.object({
+  domain: z.string(),
+  issuerAddress: AddressSchema.optional(),
+  validateTokenId: z.function().args(z.string()).optional(),
+});
+
+export type AuthenticationPayloadDataInput = z.input<
+  typeof AuthenticationPayloadDataSchema
+>;
+
+export type AuthenticationPayloadData = z.output<
+  typeof AuthenticationPayloadDataSchema
+>;
+
+export type AuthenticationPayload = z.output<
+  typeof AuthenticationPayloadSchema
+>;
+
+export type AuthenticateOptions = z.output<typeof AuthenticateOptionsSchema>;
+
+export type AuthenticateOptionsWithOptionalDomain = Omit<
+  AuthenticateOptions,
+  "domain"
+> & {
+  domain?: string;
+};

packages/auth/src/core/schema/common.ts

@@ -0,0 +1,34 @@
+import { utils } from "ethers";
+import { z } from "zod";
+
+const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
+type Literal = z.infer<typeof literalSchema>;
+export type Json = Literal | { [key: string]: Json } | Json[];
+
+export const JsonSchema: z.ZodType<Json> = z.lazy(
+  () => z.union([literalSchema, z.array(JsonSchema), z.record(JsonSchema)]),
+  { invalid_type_error: "Provided value was not valid JSON" },
+);
+
+export const AddressSchema = z.string().refine(
+  (arg) => utils.isAddress(arg),
+  (out) => {
+    return {
+      message: `${out} is not a valid address`,
+    };
+  },
+);
+
+export const RawDateSchema = z.date().transform((i) => {
+  return Math.floor(i.getTime() / 1000);
+});
+
+export const AccountTypeSchema = z.union([
+  z.literal("evm"),
+  z.literal("solana"),
+]);
+
+export type User<TContext extends Json = Json> = {
+  address: string;
+  session?: TContext;
+};

packages/auth/src/core/schema/functions.ts

@@ -0,0 +1,48 @@
+import { GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { LoginOptions, LoginPayload, LoginPayloadData } from "./login";
+import { VerifyOptions } from "./verify";
+import {
+  AuthenticateOptions,
+  AuthenticationPayloadDataInput,
+} from "./authenticate";
+import { RefreshOptions } from "./refresh";
+import { GenerateOptions } from "./generate";
+
+export type BuildLoginPayloadParams = {
+  wallet: GenericAuthWallet;
+  options: LoginOptions;
+};
+
+export type SignLoginPayloadParams = {
+  wallet: GenericAuthWallet;
+  payload: LoginPayloadData;
+};
+
+export type VerifyLoginPayloadParams = {
+  wallet: GenericAuthWallet;
+  payload: LoginPayload;
+  options: VerifyOptions;
+};
+
+export type BuildJwtParams = {
+  wallet: GenericAuthWallet;
+  payload: AuthenticationPayloadDataInput;
+};
+
+export type GenerateJwtParams = {
+  wallet: GenericAuthWallet;
+  payload: LoginPayload;
+  options: GenerateOptions;
+};
+
+export type RefreshJwtParams = {
+  wallet: GenericAuthWallet;
+  jwt: string;
+  options?: RefreshOptions;
+};
+
+export type AuthenticateJwtParams = {
+  wallet: GenericAuthWallet;
+  jwt: string;
+  options: AuthenticateOptions;
+};

packages/auth/src/core/schema/generate.ts

@@ -0,0 +1,31 @@
+import { z } from "zod";
+import { VerifyOptionsSchema } from "./verify";
+import { JsonSchema } from "./common";
+import { THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS } from "../../constants";
+
+export const GenerateOptionsSchema = z.object({
+  domain: z.string(),
+  tokenId: z.string().optional(),
+  expirationTime: z
+    .date()
+    .default(
+      () =>
+        new Date(
+          Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
+        ),
+    ),
+  invalidBefore: z.date().optional(),
+  session: z.union([JsonSchema, z.function().args(z.string())]).optional(),
+  verifyOptions: VerifyOptionsSchema.omit({
+    domain: true,
+  }).optional(),
+});
+
+export type GenerateOptions = z.input<typeof GenerateOptionsSchema>;
+
+export type GenerateOptionsWithOptionalDomain = Omit<
+  GenerateOptions,
+  "domain"
+> & {
+  domain?: string;
+};

packages/auth/src/core/schema/login.ts

@@ -0,0 +1,81 @@
+import { z } from "zod";
+import { v4 as uuidv4 } from "uuid";
+import { AccountTypeSchema } from "./common";
+import { THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS } from "../../constants";
+
+export const LoginOptionsSchema = z.object({
+  domain: z.string(),
+  address: z.string().optional(),
+  statement: z.string().optional(),
+  uri: z.string().optional(),
+  version: z.string().optional(),
+  chainId: z.string().optional(),
+  nonce: z.string().optional(),
+  expirationTime: z
+    .date()
+    .default(
+      () =>
+        new Date(
+          Date.now() +
+            1000 * THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
+        ),
+    ),
+  invalidBefore: z
+    .date()
+    .default(
+      () =>
+        new Date(
+          Date.now() -
+            1000 * THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
+        ),
+    ),
+  resources: z.array(z.string()).optional(),
+});
+
+export const LoginPayloadDataSchema = z.object({
+  type: AccountTypeSchema,
+  domain: z.string(),
+  address: z.string(),
+  statement: z
+    .string()
+    .default(
+      "Please ensure that the domain above matches the URL of the current website.",
+    ),
+  uri: z.string().optional(),
+  version: z.string().default("1"),
+  chain_id: z.string().optional(),
+  nonce: z.string().default(uuidv4()),
+  issued_at: z
+    .date()
+    .default(new Date())
+    .transform((d) => d.toISOString()),
+  expiration_time: z.date().transform((d) => d.toISOString()),
+  invalid_before: z
+    .date()
+    .default(new Date())
+    .transform((d) => d.toISOString()),
+  resources: z.array(z.string()).optional(),
+});
+
+export const LoginPayloadSchema = z.object({
+  payload: LoginPayloadDataSchema,
+  signature: z.string(),
+});
+
+export const LoginPayloadOutputSchema = LoginPayloadSchema.extend({
+  payload: LoginPayloadDataSchema.extend({
+    issued_at: z.string(),
+    expiration_time: z.string(),
+    invalid_before: z.string(),
+  }),
+});
+
+export type LoginOptions = z.input<typeof LoginOptionsSchema>;
+
+export type LoginPayloadData = z.output<typeof LoginPayloadDataSchema>;
+
+export type LoginPayload = z.output<typeof LoginPayloadSchema>;
+
+export type LoginOptionsWithOptionalDomain = Omit<LoginOptions, "domain"> & {
+  domain?: string;
+};

packages/auth/src/core/schema/refresh.ts

@@ -0,0 +1,15 @@
+import { z } from "zod";
+import { THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS } from "../../constants";
+
+export const RefreshOptionsSchema = z.object({
+  expirationTime: z
+    .date()
+    .default(
+      () =>
+        new Date(
+          Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
+        ),
+    ),
+});
+
+export type RefreshOptions = z.input<typeof RefreshOptionsSchema>;

packages/auth/src/core/schema/verify.ts

@@ -0,0 +1,17 @@
+import { z } from "zod";
+
+export const VerifyOptionsSchema = z.object({
+  domain: z.string(),
+  statement: z.string().optional(),
+  uri: z.string().optional(),
+  version: z.string().optional(),
+  chainId: z.string().optional(),
+  validateNonce: z.function().args(z.string()).optional(),
+  resources: z.array(z.string()).optional(),
+});
+
+export type VerifyOptions = z.input<typeof VerifyOptionsSchema>;
+
+export type VerifyOptionsWithOptionalDomain = Omit<VerifyOptions, "domain"> & {
+  domain?: string;
+};

packages/auth/src/core/utils.ts

@@ -1,9 +0,0 @@
-/**
- * @internal
- */
-export const isBrowser = () => typeof window !== "undefined";
-
-/**
- * @internal
- */
-export const isNode = () => !isBrowser();

packages/auth/src/express/types/index.ts

@@ -1,5 +1,5 @@
 import { ThirdwebAuth } from "../../core";
-import { Json, LoginPayloadOutputSchema, User } from "../../core/schema";
+import { Json, LoginPayloadOutputSchema, User } from "../../core";
 import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
 import { Request } from "express";
 import { z } from "zod";

packages/auth/src/next/types/index.ts

@@ -1,5 +1,4 @@
-import { ThirdwebAuth } from "../../core";
-import { Json, LoginPayloadOutputSchema, User } from "../../core/schema";
+import { Json, LoginPayloadOutputSchema, ThirdwebAuth, User } from "../../core";
 import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
 import { GetServerSidePropsContext, NextApiRequest } from "next";
 import { NextRequest } from "next/server";

packages/auth/test/evm.test.ts

@@ -3,7 +3,7 @@ import { EthersWallet } from "@thirdweb-dev/wallets/evm/wallets/ethers";
 import { expect } from "chai";
 import { Wallet } from "ethers";
 
-describe("Wallet Authentication", async () => {
+describe("Wallet Authentication - EVM", async () => {
   let adminWallet: any, signerWallet: any, attackerWallet: any;
   let auth: ThirdwebAuth;
 
@@ -272,7 +272,7 @@ describe("Wallet Authentication", async () => {
       expect.fail();
     } catch (err: any) {
       expect(err.message).to.contain(
-        `Expected the connected wallet address '${await signerWallet.getAddress()}' to match the token issuer address '${await adminWallet.getAddress()}'`,
+        `The expected issuer address '${await signerWallet.getAddress()}' did not match the token issuer address '${await adminWallet.getAddress()}'`,
       );
     }
   });
@@ -350,4 +350,24 @@ describe("Wallet Authentication", async () => {
       role: "admin",
     });
   });
+
+  it("Should authenticate with issuer address", async () => {
+    const payload = await auth.login();
+
+    auth.updateWallet(adminWallet);
+    const token = await auth.generate(payload);
+
+    auth.updateWallet(attackerWallet);
+    try {
+      await auth.authenticate(token);
+      expect.fail();
+    } catch (err: any) {
+      expect(err.message).to.contain("The expected issuer address");
+    }
+
+    const user = await auth.authenticate(token, {
+      issuerAddress: await adminWallet.getAddress(),
+    });
+    expect(user.address).to.equal(await signerWallet.getAddress());
+  });
 });

packages/auth/test/solana.test.ts

@@ -3,7 +3,7 @@ import { Keypair } from "@solana/web3.js";
 import { KeypairWallet } from "@thirdweb-dev/wallets/solana/wallets/keypair";
 import { expect } from "chai";
 
-describe("Wallet Authentication", async () => {
+describe("Wallet Authentication - Solana", async () => {
   let adminWallet: any, signerWallet: any, attackerWallet: any;
   let auth: ThirdwebAuth;
 
@@ -272,7 +272,7 @@ describe("Wallet Authentication", async () => {
       expect.fail();
     } catch (err: any) {
       expect(err.message).to.contain(
-        `Expected the connected wallet address '${await signerWallet.getAddress()}' to match the token issuer address '${await adminWallet.getAddress()}'`,
+        `The expected issuer address '${await signerWallet.getAddress()}' did not match the token issuer address '${await adminWallet.getAddress()}'`,
       );
     }
   });

packages/chains/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @thirdweb-dev/chains
 
+## 0.1.44
+
+### Patch Changes
+
+- [#1499](https://github.com/thirdweb-dev/js/pull/1499) [`8f3b685a`](https://github.com/thirdweb-dev/js/commit/8f3b685ad2bd73cb4d5d8c8aa25c04ffc10fb7cf) Thanks [@Marfuen](https://github.com/Marfuen)! - Update deploy command from CLI to use show a public gateway url temporarily. Updated chains too.
+
+## 0.1.43
+
+### Patch Changes
+
+- [#1469](https://github.com/thirdweb-dev/js/pull/1469) [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308) Thanks [@jnsdls](https://github.com/jnsdls)! - update chains
+
+- [#1474](https://github.com/thirdweb-dev/js/pull/1474) [`a1732663`](https://github.com/thirdweb-dev/js/commit/a17326634e758c3bf42f0cc3869b8792f1e18cc9) Thanks [@adam-maj](https://github.com/adam-maj)! - Add back scroll-alpha-testnet
+
+- [#1458](https://github.com/thirdweb-dev/js/pull/1458) [`588b2106`](https://github.com/thirdweb-dev/js/commit/588b21060139a7c0bf5805e2c629a16792ed2c76) Thanks [@kien-ngo](https://github.com/kien-ngo)! - Update chains
+
+- [#1461](https://github.com/thirdweb-dev/js/pull/1461) [`269e68c0`](https://github.com/thirdweb-dev/js/commit/269e68c0a15e8f78cb5b68c9456ca8094b9e1f30) Thanks [@0xFirekeeper](https://github.com/0xFirekeeper)! - add xai-goerli chain and support BigInteger from Unity
+
+## 0.1.42
+
+### Patch Changes
+
+- [#1450](https://github.com/thirdweb-dev/js/pull/1450) [`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - update chains
+
 ## 0.1.41
 
 ### Patch Changes

packages/chains/chains/10081.ts

@@ -0,0 +1,29 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Japan Open Chain Testnet",
+  "chain": "JOCT",
+  "rpc": [
+    "https://japan-open-chain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc-1.testnet.japanopenchain.org:8545",
+    "https://rpc-2.testnet.japanopenchain.org:8545"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Japan Open Chain Testnet Token",
+    "symbol": "JOCT",
+    "decimals": 18
+  },
+  "infoURL": "https://www.japanopenchain.org/",
+  "shortName": "joct",
+  "chainId": 10081,
+  "networkId": 10081,
+  "explorers": [
+    {
+      "name": "Testnet Block Explorer",
+      "url": "https://explorer.testnet.japanopenchain.org",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "japan-open-chain-testnet"
+} as const satisfies Chain;

packages/chains/chains/10201.ts

@@ -0,0 +1,38 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "MaxxChain Mainnet",
+  "chain": "MaxxChain",
+  "rpc": [
+    "https://maxxchain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.maxxchain.org",
+    "https://rpc1.maxxchain.org",
+    "https://rpc2.maxxchain.org"
+  ],
+  "faucets": [
+    "https://faucet.maxxchain.org"
+  ],
+  "nativeCurrency": {
+    "name": "Power",
+    "symbol": "PWR",
+    "decimals": 18
+  },
+  "icon": {
+    "url": "ipfs://QmRhQG9TZrXDdbQeTzBmjg3pqgwaD5TKVZj8k4kaz8AoZx",
+    "width": 1021,
+    "height": 1021,
+    "format": "png"
+  },
+  "infoURL": "https://www.maxxchain.org/",
+  "shortName": "PWR",
+  "chainId": 10201,
+  "networkId": 10201,
+  "explorers": [
+    {
+      "name": "MaxxChain Block Explorer",
+      "url": "https://explorer.maxxchain.org",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": false,
+  "slug": "maxxchain"
+} as const satisfies Chain;

packages/chains/chains/1230.ts

@@ -3,7 +3,7 @@ export default {
   "name": "Ultron Testnet",
   "chain": "Ultron",
   "icon": {
-    "url": "ipfs://QmS4W4kY7XYBA4f52vuuytXh3YaTcNBXF14V9tEY6SNqhz",
+    "url": "ipfs://QmPC6odFVyAQrXJQaZJVFpEQfRNbzZ5BjDZ7KBKmXPaYDw",
     "width": 512,
     "height": 512,
     "format": "png"
@@ -27,7 +27,7 @@ export default {
       "name": "Ultron Testnet Explorer",
       "url": "https://explorer.ultron-dev.io",
       "icon": {
-        "url": "ipfs://QmS4W4kY7XYBA4f52vuuytXh3YaTcNBXF14V9tEY6SNqhz",
+        "url": "ipfs://QmPC6odFVyAQrXJQaZJVFpEQfRNbzZ5BjDZ7KBKmXPaYDw",
         "width": 512,
         "height": 512,
         "format": "png"

packages/chains/chains/1231.ts

@@ -3,7 +3,7 @@ export default {
   "name": "Ultron Mainnet",
   "chain": "Ultron",
   "icon": {
-    "url": "ipfs://QmS4W4kY7XYBA4f52vuuytXh3YaTcNBXF14V9tEY6SNqhz",
+    "url": "ipfs://QmPC6odFVyAQrXJQaZJVFpEQfRNbzZ5BjDZ7KBKmXPaYDw",
     "width": 512,
     "height": 512,
     "format": "png"
@@ -27,7 +27,7 @@ export default {
       "name": "Ultron Explorer",
       "url": "https://ulxscan.com",
       "icon": {
-        "url": "ipfs://QmS4W4kY7XYBA4f52vuuytXh3YaTcNBXF14V9tEY6SNqhz",
+        "url": "ipfs://QmPC6odFVyAQrXJQaZJVFpEQfRNbzZ5BjDZ7KBKmXPaYDw",
         "width": 512,
         "height": 512,
         "format": "png"

packages/chains/chains/1291.ts

@@ -0,0 +1,44 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Swisstronik Testnet",
+  "chain": "SWTR",
+  "rpc": [
+    "https://swisstronik-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://json-rpc.testnet.swisstronik.com"
+  ],
+  "faucets": [
+    "https://faucet.testnet.swisstronik.com"
+  ],
+  "nativeCurrency": {
+    "name": "Swisstronik",
+    "symbol": "SWTR",
+    "decimals": 18
+  },
+  "features": [
+    {
+      "name": "EIP155"
+    },
+    {
+      "name": "EIP1559"
+    }
+  ],
+  "infoURL": "https://www.swisstronik.com",
+  "shortName": "swtr",
+  "chainId": 1291,
+  "networkId": 1291,
+  "icon": {
+    "url": "ipfs://bafybeihuintkoipxalwans23vhxajbwjnozpy34ww7ia7ds7nay3rpylzi",
+    "width": 256,
+    "height": 256,
+    "format": "svg"
+  },
+  "explorers": [
+    {
+      "name": "Swisstronik Scout",
+      "url": "https://explorer-evm.testnet.swisstronik.com",
+      "standard": "none"
+    }
+  ],
+  "testnet": true,
+  "slug": "swisstronik-testnet"
+} as const satisfies Chain;

packages/chains/chains/13308.ts

@@ -1,10 +1,10 @@
 import type { Chain } from "../src/types";
 export default {
-  "name": "Credit Smartchain Mainnet",
+  "name": "Credit Smart Chain",
   "chain": "CREDIT",
   "rpc": [
-    "https://credit-smartchain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
-    "https://mainnet-rpc.cscscan.io"
+    "https://credit-smart-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.creditsmartchain.com"
   ],
   "faucets": [],
   "nativeCurrency": {
@@ -23,7 +23,7 @@ export default {
   "infoURL": "https://creditsmartchain.com",
   "shortName": "Credit",
   "chainId": 13308,
-  "networkId": 1,
+  "networkId": 13308,
   "icon": {
     "url": "ipfs://bafkreifbso3gd4wu5wxl27xyurxctmuae2jyuy37guqtzx23nga6ba4ag4",
     "width": 1000,
@@ -32,8 +32,8 @@ export default {
   },
   "explorers": [
     {
-      "name": "CSC Scan",
-      "url": "https://explorer.cscscan.io",
+      "name": "Creditscan",
+      "url": "https://scan.creditsmartchain.com",
       "icon": {
         "url": "ipfs://bafkreifbso3gd4wu5wxl27xyurxctmuae2jyuy37guqtzx23nga6ba4ag4",
         "width": 1000,
@@ -44,5 +44,5 @@ export default {
     }
   ],
   "testnet": false,
-  "slug": "credit-smartchain"
+  "slug": "credit-smart-chain"
 } as const satisfies Chain;

packages/chains/chains/13337.ts

@@ -0,0 +1,33 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Beam Testnet",
+  "chain": "BEAM",
+  "rpc": [
+    "https://beam-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://subnets.avax.network/beam/testnet/rpc"
+  ],
+  "features": [
+    {
+      "name": "EIP1559"
+    }
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Merit Circle",
+    "symbol": "MC",
+    "decimals": 18
+  },
+  "infoURL": "https://gaming.meritcircle.io",
+  "shortName": "BEAM",
+  "chainId": 13337,
+  "networkId": 13337,
+  "explorers": [
+    {
+      "name": "Beam Explorer",
+      "url": "https://subnets-test.avax.network/beam",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "beam-testnet"
+} as const satisfies Chain;

packages/chains/chains/14853.ts

@@ -0,0 +1,24 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Humanode Testnet 5 Israfel",
+  "chain": "Humanode Testnet 5",
+  "rpc": [
+    "https://humanode-testnet-5-israfel.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://explorer-rpc-http.testnet5.stages.humanode.io"
+  ],
+  "faucets": [
+    "https://t.me/HumanodeTestnet5FaucetBot"
+  ],
+  "nativeCurrency": {
+    "name": "HMND",
+    "symbol": "HMND",
+    "decimals": 18
+  },
+  "infoURL": "https://humanode.io",
+  "shortName": "hmnd-t5",
+  "chainId": 14853,
+  "networkId": 14853,
+  "explorers": [],
+  "testnet": true,
+  "slug": "humanode-testnet-5-israfel"
+} as const satisfies Chain;

packages/chains/chains/17000.ts

@@ -0,0 +1,44 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Holesky",
+  "chain": "ETH",
+  "rpc": [
+    "https://holesky.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.holesky.ethpandaops.io"
+  ],
+  "faucets": [
+    "https://faucet.holesky.ethpandaops.io",
+    "https://holesky-faucet.pk910.de"
+  ],
+  "nativeCurrency": {
+    "name": "Testnet ETH",
+    "symbol": "ETH",
+    "decimals": 18
+  },
+  "infoURL": "https://holesky.ethpandaops.io",
+  "shortName": "holesky",
+  "chainId": 17000,
+  "networkId": 17000,
+  "icon": {
+    "url": "ipfs://QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
+    "width": 1000,
+    "height": 1628,
+    "format": "png"
+  },
+  "status": "incubating",
+  "explorers": [
+    {
+      "name": "Holesky Explorer",
+      "url": "https://holesky.beaconcha.in",
+      "icon": {
+        "url": "ipfs://QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
+        "width": 1000,
+        "height": 1628,
+        "format": "png"
+      },
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "holesky"
+} as const satisfies Chain;

packages/chains/chains/1890.ts

@@ -3,9 +3,9 @@ export default {
   "name": "Lightlink Phoenix Mainnet",
   "chain": "Lightlink Phoenix Mainnet",
   "icon": {
-    "url": "ipfs://QmNRUoMgx16hurD3au3ou5A9rmTLYmre8WiGmQEPFmP2Vo",
-    "width": 600,
-    "height": 600,
+    "url": "ipfs://QmXMDj6iAFn2ducQcUU1M87PMMdT2jfyL3Tp3Lz5uUD5Lv",
+    "width": 200,
+    "height": 200,
     "format": "png"
   },
   "rpc": [
@@ -33,9 +33,9 @@ export default {
       "name": "phoenix",
       "url": "https://phoenix.lightlink.io",
       "icon": {
-        "url": "ipfs://QmNRUoMgx16hurD3au3ou5A9rmTLYmre8WiGmQEPFmP2Vo",
-        "width": 600,
-        "height": 600,
+        "url": "ipfs://QmXMDj6iAFn2ducQcUU1M87PMMdT2jfyL3Tp3Lz5uUD5Lv",
+        "width": 200,
+        "height": 200,
         "format": "png"
       },
       "standard": "EIP3091"

packages/chains/chains/1891.ts

@@ -3,9 +3,9 @@ export default {
   "name": "Lightlink Pegasus Testnet",
   "chain": "Lightlink Pegasus Testnet",
   "icon": {
-    "url": "ipfs://QmNRUoMgx16hurD3au3ou5A9rmTLYmre8WiGmQEPFmP2Vo",
-    "width": 600,
-    "height": 600,
+    "url": "ipfs://QmXMDj6iAFn2ducQcUU1M87PMMdT2jfyL3Tp3Lz5uUD5Lv",
+    "width": 200,
+    "height": 200,
     "format": "png"
   },
   "rpc": [
@@ -35,9 +35,9 @@ export default {
       "name": "pegasus",
       "url": "https://pegasus.lightlink.io",
       "icon": {
-        "url": "ipfs://QmNRUoMgx16hurD3au3ou5A9rmTLYmre8WiGmQEPFmP2Vo",
-        "width": 600,
-        "height": 600,
+        "url": "ipfs://QmXMDj6iAFn2ducQcUU1M87PMMdT2jfyL3Tp3Lz5uUD5Lv",
+        "width": 200,
+        "height": 200,
         "format": "png"
       },
       "standard": "EIP3091"

packages/chains/chains/221231.ts

@@ -4,7 +4,7 @@ export default {
   "chain": "REAP",
   "rpc": [
     "https://reapchain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
-    "https://test-rpc.reapchain.org"
+    "https://test-eth.reapchain.org"
   ],
   "faucets": [
     "http://faucet.reapchain.com"

packages/chains/chains/2484.ts

@@ -0,0 +1,42 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Unicorn Ultra Nebulas Testnet",
+  "chain": "u2u",
+  "rpc": [
+    "https://unicorn-ultra-nebulas-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc-nebulas-testnet.uniultra.xyz"
+  ],
+  "faucets": [
+    "https://faucet.uniultra.xyz"
+  ],
+  "nativeCurrency": {
+    "name": "Unicorn Ultra Nebulas Testnet",
+    "symbol": "U2U",
+    "decimals": 18
+  },
+  "infoURL": "https://uniultra.xyz",
+  "shortName": "u2u_nebulas",
+  "chainId": 2484,
+  "networkId": 2484,
+  "icon": {
+    "url": "ipfs://QmcW64RgqQVHnNbVFyfaMNKt7dJvFqEbfEHZmeyeK8dpEa",
+    "width": 512,
+    "height": 512,
+    "format": "png"
+  },
+  "explorers": [
+    {
+      "icon": {
+        "url": "ipfs://QmcW64RgqQVHnNbVFyfaMNKt7dJvFqEbfEHZmeyeK8dpEa",
+        "width": 512,
+        "height": 512,
+        "format": "png"
+      },
+      "name": "U2U Explorer",
+      "url": "https://testnet.u2uscan.xyz",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "unicorn-ultra-nebulas-testnet"
+} as const satisfies Chain;

packages/chains/chains/4460.ts

@@ -0,0 +1,39 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Orderly Sepolia Testnet",
+  "chain": "ETH",
+  "rpc": [
+    "https://orderly-sepolia-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://l2-orderly-l2-4460-sepolia-8tc3sd7dvy.t.conduit.xyz"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Sepolia Ether",
+    "symbol": "ETH",
+    "decimals": 18
+  },
+  "shortName": "orderlyl2",
+  "chainId": 4460,
+  "networkId": 4460,
+  "icon": {
+    "url": "ipfs://QmSpwp3RAVhZsErAQrCQxEmjnGqJQMigarzZbfqr9Ktakb",
+    "width": 512,
+    "height": 512,
+    "format": "png"
+  },
+  "explorers": [
+    {
+      "name": "basescout",
+      "url": "https://explorerl2new-orderly-l2-4460-sepolia-8tc3sd7dvy.t.conduit.xyz",
+      "icon": {
+        "url": "ipfs://QmYtUimyqHkkFxYdbXXRbUqNg2VLPUg6Uu2C2nmFWowiZM",
+        "width": 551,
+        "height": 540,
+        "format": "png"
+      },
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "orderly-sepolia-testnet"
+} as const satisfies Chain;

packages/chains/chains/47279324479.ts

@@ -0,0 +1,27 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Xai Goerli Orbit",
+  "chain": "Xai Goerli Orbit Testnet",
+  "shortName": "xai-goerli",
+  "chainId": 47279324479,
+  "testnet": true,
+  "nativeCurrency": {
+    "name": "Xai Goerli Ether",
+    "symbol": "ETH",
+    "decimals": 18
+  },
+  "rpc": [
+    "https://xai-goerli-orbit.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://testnet.xai-chain.net/rpc"
+  ],
+  "explorers": [
+    {
+      "name": "Xai Goerli Testnet Explorer",
+      "url": "https://testnet-explorer.xai-chain.net",
+      "standard": "EIP3091"
+    }
+  ],
+  "faucets": [],
+  "infoURL": "https://xai.games/",
+  "slug": "xai-goerli-orbit"
+} as const satisfies Chain;

packages/chains/chains/534351.ts

@@ -2,8 +2,11 @@ import type { Chain } from "../src/types";
 export default {
   "name": "Scroll Sepolia Testnet",
   "chain": "ETH",
-  "status": "incubating",
-  "rpc": [],
+  "status": "active",
+  "rpc": [
+    "https://scroll-sepolia-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://sepolia-rpc.scroll.io/"
+  ],
   "faucets": [],
   "nativeCurrency": {
     "name": "Ether",
@@ -14,11 +17,21 @@ export default {
   "shortName": "scr-sepolia",
   "chainId": 534351,
   "networkId": 534351,
-  "explorers": [],
+  "explorers": [
+    {
+      "name": "Scroll Sepolia Testnet Block Explorer",
+      "url": "https://sepolia-blockscout.scroll.io",
+      "standard": "EIP3091"
+    }
+  ],
   "parent": {
     "type": "L2",
     "chain": "eip155-11155111",
-    "bridges": []
+    "bridges": [
+      {
+        "url": "https://scroll.io/bridge"
+      }
+    ]
   },
   "testnet": true,
   "slug": "scroll-sepolia-testnet"

packages/chains/chains/534352.ts

@@ -3,7 +3,10 @@ export default {
   "name": "Scroll",
   "chain": "ETH",
   "status": "incubating",
-  "rpc": [],
+  "rpc": [
+    "https://scroll.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.scroll.io"
+  ],
   "faucets": [],
   "nativeCurrency": {
     "name": "Ether",
@@ -14,11 +17,21 @@ export default {
   "shortName": "scr",
   "chainId": 534352,
   "networkId": 534352,
-  "explorers": [],
+  "explorers": [
+    {
+      "name": "Scroll Mainnet Block Explorer",
+      "url": "https://blockscout.scroll.io",
+      "standard": "EIP3091"
+    }
+  ],
   "parent": {
     "type": "L2",
     "chain": "eip155-1",
-    "bridges": []
+    "bridges": [
+      {
+        "url": "https://scroll.io/bridge"
+      }
+    ]
   },
   "testnet": false,
   "slug": "scroll"

packages/chains/chains/534353.ts

@@ -2,7 +2,7 @@ import type { Chain } from "../src/types";
 export default {
   "name": "Scroll Alpha Testnet",
   "chain": "ETH",
-  "status": "active",
+  "status": "deprecated",
   "rpc": [
     "https://scroll-alpha-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
     "https://alpha-rpc.scroll.io/l2"
@@ -20,12 +20,7 @@ export default {
   "explorers": [
     {
       "name": "Scroll Alpha Testnet Block Explorer",
-      "url": "https://blockscout.scroll.io",
-      "standard": "EIP3091"
-    },
-    {
-      "name": "Scroll Alpha Testnet Block Explorer",
-      "url": "https://scrollscan.co",
+      "url": "https://alpha-blockscout.scroll.io",
       "standard": "EIP3091"
     }
   ],

packages/chains/chains/542.ts

@@ -0,0 +1,28 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "PAWCHAIN Testnet",
+  "chain": "PAW",
+  "rpc": [
+    "https://pawchain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://pawchainx.com/"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "PAW",
+    "symbol": "PAW",
+    "decimals": 18
+  },
+  "infoURL": "https://pawchainx.com/",
+  "shortName": "PAW",
+  "chainId": 542,
+  "networkId": 542,
+  "explorers": [
+    {
+      "name": "PAWCHAIN Testnet",
+      "url": "https://pawscan.io",
+      "standard": "none"
+    }
+  ],
+  "testnet": true,
+  "slug": "pawchain-testnet"
+} as const satisfies Chain;

packages/chains/chains/57.ts

@@ -7,7 +7,8 @@ export default {
     "https://rpc.syscoin.org",
     "https://rpc.ankr.com/syscoin/${ANKR_API_KEY}",
     "https://syscoin.public-rpc.com",
-    "wss://rpc.syscoin.org/wss"
+    "wss://rpc.syscoin.org/wss",
+    "https://syscoin-evm.publicnode.com"
   ],
   "faucets": [
     "https://faucet.syscoin.org"

packages/chains/chains/5700.ts

@@ -5,7 +5,8 @@ export default {
   "rpc": [
     "https://syscoin-tanenbaum-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
     "https://rpc.tanenbaum.io",
-    "wss://rpc.tanenbaum.io/wss"
+    "wss://rpc.tanenbaum.io/wss",
+    "https://syscoin-tanenbaum-evm.publicnode.com"
   ],
   "faucets": [
     "https://faucet.tanenbaum.io"

packages/chains/chains/761412.ts

@@ -0,0 +1,34 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Miexs Smartchain",
+  "chain": "MiexsSmartchain",
+  "icon": {
+    "url": "ipfs://bafkreic6tcc6swh5kzljwqnswj6rlemcm7n6ra7xkgttwv5v3fv7ozj5zu",
+    "width": 1500,
+    "height": 1500,
+    "format": "png"
+  },
+  "rpc": [
+    "https://miexs-smartchain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://mainnet-rpc.miexs.com"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Miexs Coin",
+    "symbol": "MIX",
+    "decimals": 18
+  },
+  "infoURL": "https://miexs.com",
+  "shortName": "Miexs",
+  "chainId": 761412,
+  "networkId": 761412,
+  "explorers": [
+    {
+      "name": "Miexs Smartchain Explorer",
+      "url": "https://miexs.com",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": false,
+  "slug": "miexs-smartchain"
+} as const satisfies Chain;

packages/chains/chains/813.ts

@@ -9,7 +9,11 @@ export default {
     "https://evm-dataseed3.meerscan.io",
     "https://evm-dataseed.meerscan.com",
     "https://evm-dataseed1.meerscan.com",
-    "https://evm-dataseed2.meerscan.com"
+    "https://evm-dataseed2.meerscan.com",
+    "https://qng.rpc.qitmeer.io",
+    "https://mainnet.meerlabs.com",
+    "https://rpc.dimai.ai",
+    "https://rpc.woowow.io"
   ],
   "faucets": [],
   "nativeCurrency": {
@@ -37,7 +41,7 @@ export default {
         "height": 512,
         "format": "png"
       },
-      "url": "https://evm.meerscan.com",
+      "url": "https://qng.meerscan.io",
       "standard": "none"
     }
   ],

packages/chains/chains/8131.ts

@@ -2,8 +2,15 @@ import type { Chain } from "../src/types";
 export default {
   "name": "Qitmeer Network Testnet",
   "chain": "MEER",
-  "rpc": [],
-  "faucets": [],
+  "rpc": [
+    "https://qitmeer-network-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://testnet-qng.rpc.qitmeer.io",
+    "https://testnet.meerlabs.com",
+    "https://meer.testnet.meerfans.club"
+  ],
+  "faucets": [
+    "https://faucet.qitmeer.io"
+  ],
   "nativeCurrency": {
     "name": "Qitmeer Testnet",
     "symbol": "MEER-T",
@@ -28,7 +35,7 @@ export default {
         "height": 512,
         "format": "png"
       },
-      "url": "https://testnet.qng.meerscan.io",
+      "url": "https://qng-testnet.meerscan.io",
       "standard": "none"
     }
   ],

packages/chains/chains/9818.ts

@@ -2,7 +2,11 @@ import type { Chain } from "../src/types";
 export default {
   "name": "IMPERIUM TESTNET",
   "chain": "tIMP",
-  "rpc": [],
+  "rpc": [
+    "https://imperium-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://data-aws-testnet.imperiumchain.com",
+    "https://data-aws2-testnet.imperiumchain.com"
+  ],
   "faucets": [
     "https://faucet.imperiumchain.com/"
   ],

packages/chains/chains/9819.ts

@@ -2,7 +2,11 @@ import type { Chain } from "../src/types";
 export default {
   "name": "IMPERIUM MAINNET",
   "chain": "IMP",
-  "rpc": [],
+  "rpc": [
+    "https://imperium.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://data-aws-mainnet.imperiumchain.com",
+    "https://data-aws2-mainnet.imperiumchain.com"
+  ],
   "faucets": [
     "https://faucet.imperiumchain.com/"
   ],

packages/chains/chains/9996.ts

@@ -11,7 +11,8 @@ export default {
   "rpc": [
     "https://mind-smart-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
     "https://rpc-msc.mindchain.info/",
-    "https://seednode.mindchain.info"
+    "https://seednode.mindchain.info",
+    "wss://seednode.mindchain.info/ws"
   ],
   "faucets": [],
   "nativeCurrency": {

packages/chains/data/additional/47279324479.mjs

@@ -0,0 +1,26 @@
+// @ts-check
+/** @typedef { import("../../src/types").Chain } Chain */
+
+/** @type {Omit<Chain, "slug">} */
+export default {
+  name: "Xai Goerli Orbit",
+  chain: "Xai Goerli Orbit Testnet",
+  shortName: "xai-goerli",
+  chainId: 47279324479,
+  testnet: true,
+  nativeCurrency: {
+    name: "Xai Goerli Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  rpc: ["https://testnet.xai-chain.net/rpc"],
+  explorers: [
+    {
+      name: "Xai Goerli Testnet Explorer",
+      url: "https://testnet-explorer.xai-chain.net",
+      standard: "EIP3091",
+    },
+  ],
+  faucets: [],
+  infoURL: "https://xai.games/",
+};

packages/chains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/chains",
-  "version": "0.1.41",
+  "version": "0.1.44",
   "main": "dist/thirdweb-dev-chains.cjs.js",
   "module": "dist/thirdweb-dev-chains.esm.js",
   "browser": {

packages/chains/scripts/generate-package.mjs

@@ -105,7 +105,8 @@ for (const file of additionalChainsFiles) {
 }
 
 chains = chains
-  .filter((c) => c.status !== "deprecated")
+  // Keep scroll-alpha-testnet for now even though its deprecated
+  .filter((c) => c.status !== "deprecated" || c.chainId === 534353)
   .map((chain) => {
     if (overrides[chain.chainId]) {
       chain = merge(chain, overrides[chain.chainId], {

packages/cli/CHANGELOG.md

@@ -1,5 +1,64 @@
 # thirdweb
 
+## 0.11.15
+
+### Patch Changes
+
+- [#1499](https://github.com/thirdweb-dev/js/pull/1499) [`8f3b685a`](https://github.com/thirdweb-dev/js/commit/8f3b685ad2bd73cb4d5d8c8aa25c04ffc10fb7cf) Thanks [@Marfuen](https://github.com/Marfuen)! - Update deploy command from CLI to use show a public gateway url temporarily. Updated chains too.
+
+- Updated dependencies [[`d248aa2c`](https://github.com/thirdweb-dev/js/commit/d248aa2c5a89a297dd2623c961793026de1de346), [`d248aa2c`](https://github.com/thirdweb-dev/js/commit/d248aa2c5a89a297dd2623c961793026de1de346), [`8f3b685a`](https://github.com/thirdweb-dev/js/commit/8f3b685ad2bd73cb4d5d8c8aa25c04ffc10fb7cf), [`28975765`](https://github.com/thirdweb-dev/js/commit/2897576513eb6f497a9f92e3e473182b4fc9681b), [`b91d3e99`](https://github.com/thirdweb-dev/js/commit/b91d3e990198b77dc1358e738c11dc4acaa67491)]:
+  - @thirdweb-dev/sdk@3.10.51
+  - @thirdweb-dev/storage@1.2.6
+  - @thirdweb-dev/chains@0.1.44
+
+## 0.11.14
+
+### Patch Changes
+
+- Updated dependencies [[`a5ba9e4f`](https://github.com/thirdweb-dev/js/commit/a5ba9e4fbfee228e5b9ac27cd0157187e3a50117), [`39e2af6f`](https://github.com/thirdweb-dev/js/commit/39e2af6f2f4d933dca1b3de4a37de76375bafd74)]:
+  - @thirdweb-dev/sdk@3.10.50
+
+## 0.11.13
+
+### Patch Changes
+
+- Updated dependencies [[`7f531122`](https://github.com/thirdweb-dev/js/commit/7f5311222b14da04877df056baae36409dff4696)]:
+  - @thirdweb-dev/sdk@3.10.49
+
+## 0.11.12
+
+### Patch Changes
+
+- Updated dependencies [[`73462ef1`](https://github.com/thirdweb-dev/js/commit/73462ef10800aeeb5976634e2bc6fb5d3e8501e4), [`27c225a5`](https://github.com/thirdweb-dev/js/commit/27c225a51221417592b5940887abd1ccb8b67e47), [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308), [`70c4a119`](https://github.com/thirdweb-dev/js/commit/70c4a119d691a37ec999d9f6087902d532cc82ed), [`a1732663`](https://github.com/thirdweb-dev/js/commit/a17326634e758c3bf42f0cc3869b8792f1e18cc9), [`f0443bd9`](https://github.com/thirdweb-dev/js/commit/f0443bd989dbba50d0836d1cf274bfb2f44a53fd), [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308), [`588b2106`](https://github.com/thirdweb-dev/js/commit/588b21060139a7c0bf5805e2c629a16792ed2c76), [`269e68c0`](https://github.com/thirdweb-dev/js/commit/269e68c0a15e8f78cb5b68c9456ca8094b9e1f30)]:
+  - @thirdweb-dev/storage@1.2.5
+  - @thirdweb-dev/sdk@3.10.48
+  - @thirdweb-dev/chains@0.1.43
+
+## 0.11.11
+
+### Patch Changes
+
+- Updated dependencies [[`4c37af49`](https://github.com/thirdweb-dev/js/commit/4c37af49aa4fa66beb8ffe8ef556068a29f3c5d4)]:
+  - @thirdweb-dev/storage@1.2.4
+  - @thirdweb-dev/sdk@3.10.47
+
+## 0.11.10
+
+### Patch Changes
+
+- Updated dependencies [[`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf), [`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf)]:
+  - @thirdweb-dev/chains@0.1.42
+  - @thirdweb-dev/sdk@3.10.46
+
+## 0.11.9
+
+### Patch Changes
+
+- [#1442](https://github.com/thirdweb-dev/js/pull/1442) [`7f54012e`](https://github.com/thirdweb-dev/js/commit/7f54012ec648b727b60784990e71b0efb4690934) Thanks [@Marfuen](https://github.com/Marfuen)! - - Warn users on windows to not use the powershell as there are some compatibility issues with it at the moment.
+  - Warn users if they are pasting a client id instead of a secret key.
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+
 ## 0.11.8
 
 ### Patch Changes

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thirdweb",
   "main": "dist/cli/index.js",
-  "version": "0.11.8",
+  "version": "0.11.15",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/cli/src/auth/index.ts

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import prompts from "prompts";
 import Cache, { CacheEntry } from "sync-disk-cache";
 import { ApiResponse } from "../lib/types";
+import os from "os";
 
 export async function loginUser(
   cache: Cache,
@@ -40,6 +41,10 @@ export function getSession(cache: Cache) {
 
 export async function createSession(cache: Cache) {
   try {
+    const isWindows = os.type() === "Windows_NT";
+    if (isWindows) {
+      console.log(chalk.yellow("Windows detected: if you are using powershell, there are some known issues with it that we are actively working on, please use git bash or the command prompt. Thank you for your understanding."));
+    }
     const response = await prompts({
       type: "invisible",
       name: "apiSecretKey",
@@ -48,6 +53,20 @@ export async function createSession(cache: Cache) {
       )}`,
     });
 
+    const keyPassed = response.apiSecretKey;
+    if (!keyPassed) {
+      console.log(chalk.red("You need to pass an API secret key"));
+      process.exit(1);
+    }
+
+    if (keyPassed.length === 32) {
+      console.log(chalk.red(`This is not a valid secret key. To get your secret key
+1. Create an API key at https://thirdweb.com/create-api-key 
+2. Store and copy your Secret Key. This will be shown only once.
+3. Paste it in the CLI when prompted`));
+      process.exit(1);
+    }
+
     try {
       await validateKey(response.apiSecretKey);
     } catch (error) {

packages/cli/src/deploy/app.ts

@@ -70,7 +70,10 @@ export async function deployApp(
 
   try {
     const uri = await upload(storage, distPath);
-    return storage.resolveScheme(uri);
+    return `${uri.replace(
+      "ipfs://",
+      "https://cf-ipfs.com/ipfs/",
+    )}`;
   } catch (err) {
     console.error("Can't upload project", err);
     return Promise.reject("Can't upload project");

packages/cli/src/generate/command.ts

@@ -199,13 +199,15 @@ export async function generate(options: GenerateOptions, apiSecretKey: string) {
   }
 
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-  if (packageJson.scripts?.postinstall?.includes("thirdweb generate") || packageJson.scripts?.postinstall?.includes("thirdweb@latest generate")) {
+  if (
+    packageJson.scripts?.postinstall?.includes("thirdweb generate") ||
+    packageJson.scripts?.postinstall?.includes("thirdweb@latest generate")
+  ) {
     return;
   }
 
   const postinstall = packageJson.scripts?.postinstall
-    ? packageJson.scripts.postinstall +
-      `npx --yes thirdweb@latest generate`
+    ? packageJson.scripts.postinstall + `npx --yes thirdweb@latest generate`
     : `npx --yes thirdweb@latest generate`;
 
   fs.writeFileSync(

packages/react-core/CHANGELOG.md

@@ -1,5 +1,81 @@
 # @thirdweb-dev/react-core
 
+## 3.14.32
+
+### Patch Changes
+
+- [#1489](https://github.com/thirdweb-dev/js/pull/1489) [`07fb1b5f`](https://github.com/thirdweb-dev/js/commit/07fb1b5ffa4c170e252df31070852ddb9a81dec9) Thanks [@iketw](https://github.com/iketw)! - Cleanup and minor bug fix in ReactCore
+
+- [#1486](https://github.com/thirdweb-dev/js/pull/1486) [`300a3c6f`](https://github.com/thirdweb-dev/js/commit/300a3c6f04d0ea7e25dfdb0a4c28b3a5796fcadf) Thanks [@iketw](https://github.com/iketw)! - Add better error messages when using hooks outside the <ThirdwebProvider />
+
+- Updated dependencies [[`07fb1b5f`](https://github.com/thirdweb-dev/js/commit/07fb1b5ffa4c170e252df31070852ddb9a81dec9), [`d248aa2c`](https://github.com/thirdweb-dev/js/commit/d248aa2c5a89a297dd2623c961793026de1de346), [`d248aa2c`](https://github.com/thirdweb-dev/js/commit/d248aa2c5a89a297dd2623c961793026de1de346), [`8f3b685a`](https://github.com/thirdweb-dev/js/commit/8f3b685ad2bd73cb4d5d8c8aa25c04ffc10fb7cf), [`28975765`](https://github.com/thirdweb-dev/js/commit/2897576513eb6f497a9f92e3e473182b4fc9681b), [`b91d3e99`](https://github.com/thirdweb-dev/js/commit/b91d3e990198b77dc1358e738c11dc4acaa67491)]:
+  - @thirdweb-dev/wallets@1.1.15
+  - @thirdweb-dev/sdk@3.10.51
+  - @thirdweb-dev/storage@1.2.6
+  - @thirdweb-dev/chains@0.1.44
+  - @thirdweb-dev/auth@3.2.32
+
+## 3.14.31
+
+### Patch Changes
+
+- Updated dependencies [[`39e2af6f`](https://github.com/thirdweb-dev/js/commit/39e2af6f2f4d933dca1b3de4a37de76375bafd74), [`a5ba9e4f`](https://github.com/thirdweb-dev/js/commit/a5ba9e4fbfee228e5b9ac27cd0157187e3a50117), [`39e2af6f`](https://github.com/thirdweb-dev/js/commit/39e2af6f2f4d933dca1b3de4a37de76375bafd74)]:
+  - @thirdweb-dev/wallets@1.1.14
+  - @thirdweb-dev/sdk@3.10.50
+  - @thirdweb-dev/auth@3.2.31
+
+## 3.14.30
+
+### Patch Changes
+
+- Updated dependencies [[`34b31599`](https://github.com/thirdweb-dev/js/commit/34b315993c0abaccb9640a5d5804c2c93af569c2), [`7f531122`](https://github.com/thirdweb-dev/js/commit/7f5311222b14da04877df056baae36409dff4696)]:
+  - @thirdweb-dev/wallets@1.1.13
+  - @thirdweb-dev/sdk@3.10.49
+  - @thirdweb-dev/auth@3.2.30
+
+## 3.14.29
+
+### Patch Changes
+
+- Updated dependencies [[`73462ef1`](https://github.com/thirdweb-dev/js/commit/73462ef10800aeeb5976634e2bc6fb5d3e8501e4), [`27c225a5`](https://github.com/thirdweb-dev/js/commit/27c225a51221417592b5940887abd1ccb8b67e47), [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308), [`70c4a119`](https://github.com/thirdweb-dev/js/commit/70c4a119d691a37ec999d9f6087902d532cc82ed), [`a1732663`](https://github.com/thirdweb-dev/js/commit/a17326634e758c3bf42f0cc3869b8792f1e18cc9), [`f0443bd9`](https://github.com/thirdweb-dev/js/commit/f0443bd989dbba50d0836d1cf274bfb2f44a53fd), [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308), [`588b2106`](https://github.com/thirdweb-dev/js/commit/588b21060139a7c0bf5805e2c629a16792ed2c76), [`269e68c0`](https://github.com/thirdweb-dev/js/commit/269e68c0a15e8f78cb5b68c9456ca8094b9e1f30)]:
+  - @thirdweb-dev/storage@1.2.5
+  - @thirdweb-dev/wallets@1.1.12
+  - @thirdweb-dev/sdk@3.10.48
+  - @thirdweb-dev/chains@0.1.43
+  - @thirdweb-dev/auth@3.2.29
+
+## 3.14.28
+
+### Patch Changes
+
+- [#1460](https://github.com/thirdweb-dev/js/pull/1460) [`4b0e63dc`](https://github.com/thirdweb-dev/js/commit/4b0e63dcc0ca871ce9cef76f8a41ff290316741c) Thanks [@MananTank](https://github.com/MananTank)! - Save `oAuthRedirectResult` when autoconnecting Magic Link via social login
+
+- Updated dependencies [[`4c37af49`](https://github.com/thirdweb-dev/js/commit/4c37af49aa4fa66beb8ffe8ef556068a29f3c5d4), [`4b0e63dc`](https://github.com/thirdweb-dev/js/commit/4b0e63dcc0ca871ce9cef76f8a41ff290316741c)]:
+  - @thirdweb-dev/storage@1.2.4
+  - @thirdweb-dev/wallets@1.1.11
+  - @thirdweb-dev/sdk@3.10.47
+  - @thirdweb-dev/auth@3.2.28
+
+## 3.14.27
+
+### Patch Changes
+
+- [#1392](https://github.com/thirdweb-dev/js/pull/1392) [`dfd120a3`](https://github.com/thirdweb-dev/js/commit/dfd120a3a9d1582c8b174265c92bf43dbbaf5c86) Thanks [@adam-maj](https://github.com/adam-maj)! - Expose functions from auth and update useAuth
+
+- Updated dependencies [[`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf), [`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf), [`dfd120a3`](https://github.com/thirdweb-dev/js/commit/dfd120a3a9d1582c8b174265c92bf43dbbaf5c86)]:
+  - @thirdweb-dev/chains@0.1.42
+  - @thirdweb-dev/sdk@3.10.46
+  - @thirdweb-dev/auth@3.2.27
+  - @thirdweb-dev/wallets@1.1.10
+
+## 3.14.26
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+  - @thirdweb-dev/wallets@1.1.9
+
 ## 3.14.25
 
 ### Patch Changes

packages/react-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react-core",
-  "version": "3.14.25",
+  "version": "3.14.32",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-core",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",
@@ -104,6 +104,7 @@
     "@thirdweb-dev/sdk": "workspace:*",
     "@thirdweb-dev/storage": "workspace:*",
     "@thirdweb-dev/wallets": "workspace:*",
+    "@thirdweb-dev/auth": "workspace:*",
     "mime": "3.0.0",
     "tiny-invariant": "^1.2.0"
   },

packages/react-core/src/core/providers/thirdweb-wallet-provider.tsx

@@ -229,7 +229,11 @@ export function ThirdwebWalletProvider(
 
     try {
       const parsedWallet = JSON.parse(lastConnectedWallet as string);
-      parsedWallet.connectParams.chainId = chainId;
+      if (parsedWallet.connectParams) {
+        parsedWallet.connectParams.chainId = chainId;
+      } else {
+        parsedWallet.connectParams = { chainId };
+      }
       await lastConnectedWalletStorage.setItem(
         LAST_CONNECTED_WALLET_STORAGE_KEY,
         JSON.stringify(parsedWallet),
@@ -317,7 +321,7 @@ export function ThirdwebWalletProvider(
               ),
               {
                 ms: autoConnectTimeout,
-                message: "Failed to Auto connect. Auto connect timed out.",
+                message: autoConnectTimeoutErrorMessage,
               },
             );
           } catch (e) {
@@ -346,7 +350,7 @@ export function ThirdwebWalletProvider(
         setConnectionStatus("connecting");
         await timeoutPromise(wallet.autoConnect(walletInfo.connectParams), {
           ms: autoConnectTimeout,
-          message: "Failed to Auto connect. Auto connect timed out.",
+          message: autoConnectTimeoutErrorMessage,
         });
         setConnectedWallet(wallet, walletInfo.connectParams, true);
       } catch (e) {
@@ -552,3 +556,5 @@ function timeoutPromise<T>(
     );
   });
 }
+
+const autoConnectTimeoutErrorMessage = `Failed to Auto connect. Auto connect timed out. You can increase the timeout duration using the autoConnectTimeout prop on <ThirdwebProvider />`;

packages/react-core/src/evm/contexts/thirdweb-config.tsx

@@ -1,15 +1,15 @@
-import { Chain, defaultChains } from "@thirdweb-dev/chains";
+import { Chain } from "@thirdweb-dev/chains";
 import React, { createContext, PropsWithChildren, useContext } from "react";
+import invariant from "tiny-invariant";
 
 interface ThirdwebConfigContext {
   chains: Chain[];
   clientId?: string;
 }
 
-const ThirdwebConfigContext =
-  /* @__PURE__ */ createContext<ThirdwebConfigContext>({
-    chains: defaultChains,
-  });
+export const ThirdwebConfigContext = /* @__PURE__ */ createContext<
+  ThirdwebConfigContext | undefined
+>(undefined);
 
 export const ThirdwebConfigProvider: React.FC<
   PropsWithChildren<{
@@ -22,5 +22,10 @@ export const ThirdwebConfigProvider: React.FC<
 );
 
 export function useThirdwebConfigContext() {
-  return useContext(ThirdwebConfigContext);
+  const context = useContext(ThirdwebConfigContext);
+  invariant(
+    context,
+    "useThirdwebConfigContext() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context;
 }

packages/react-core/src/evm/contexts/thirdweb-wallet.tsx

@@ -11,6 +11,7 @@ import React, {
   useState,
 } from "react";
 import { useSDK } from "../hooks/useSDK";
+import invariant from "tiny-invariant";
 
 interface ThirdwebConnectedWalletContext {
   wallet: UserWallet | undefined;
@@ -26,10 +27,9 @@ const INITIAL_CONTEXT_VALUE: ThirdwebConnectedWalletContext = {
   signer: undefined,
 };
 
-const ThirdwebConnectedWalletContext =
-  /* @__PURE__ */ createContext<ThirdwebConnectedWalletContext>(
-    INITIAL_CONTEXT_VALUE,
-  );
+export const ThirdwebConnectedWalletContext = /* @__PURE__ */ createContext<
+  ThirdwebConnectedWalletContext | undefined
+>(undefined);
 
 export const ThirdwebConnectedWalletProvider: React.FC<
   PropsWithChildren<{ signer?: Signer }>
@@ -115,5 +115,10 @@ export const ThirdwebConnectedWalletProvider: React.FC<
 };
 
 export function useThirdwebConnectedWalletContext() {
-  return useContext(ThirdwebConnectedWalletContext);
+  const context = useContext(ThirdwebConnectedWalletContext);
+  invariant(
+    context,
+    "useThirdwebConnectedWalletContext() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context;
 }

packages/react-core/src/evm/hooks/auth/index.ts

@@ -1,10 +1,9 @@
-import { LoginOptions } from "@thirdweb-dev/auth";
+import { ThirdwebAuth } from "@thirdweb-dev/auth";
 import { useWallet } from "../../../core/hooks/wallet-hooks";
 import { useThirdwebAuthContext } from "../../contexts/thirdweb-auth";
-import { doLogin } from "./useLogin";
-import invariant from "tiny-invariant";
+import { useMemo } from "react";
 
-export { useLogin, doLogin } from "./useLogin";
+export { useLogin } from "./useLogin";
 export { useLogout } from "./useLogout";
 export type { UserWithData } from "./useUser";
 export { useUser } from "./useUser";
@@ -14,17 +13,15 @@ export function useAuth() {
   const wallet = useWallet();
   const authConfig = useThirdwebAuthContext();
 
-  return {
-    login: async (options?: LoginOptions) => {
-      invariant(
-        authConfig,
-        "Please specify an authConfig in the ThirdwebProvider",
-      );
-      invariant(wallet, "Need a connected a wallet!");
-      return doLogin(wallet, {
-        domain: authConfig.domain,
-        ...options,
-      });
-    },
-  };
+  return useMemo(() => {
+    if (!authConfig?.domain) {
+      return undefined;
+    }
+
+    if (!wallet) {
+      return undefined;
+    }
+
+    return new ThirdwebAuth(wallet, authConfig.domain);
+  }, [wallet, authConfig?.domain]);
 }

packages/react-core/src/evm/hooks/auth/useLogin.ts

@@ -2,12 +2,7 @@ import { useWallet } from "../../../core/hooks/wallet-hooks";
 import { useThirdwebAuthContext } from "../../contexts/thirdweb-auth";
 import { cacheKeys } from "../../utils/cache-keys";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import type {
-  LoginOptions,
-  LoginPayload,
-  LoginPayloadData,
-} from "@thirdweb-dev/auth";
-import { GenericAuthWallet } from "@thirdweb-dev/wallets";
+import { signLoginPayload, type LoginPayloadData } from "@thirdweb-dev/auth";
 import invariant from "tiny-invariant";
 import { AUTH_TOKEN_STORAGE_KEY } from "../../../core/constants/auth";
 
@@ -59,7 +54,7 @@ export function useLogin() {
         throw new Error(`Failed to get payload`);
       }
 
-      const payload = await doLoginWithPayload(wallet, payloadData);
+      const payload = await signLoginPayload({ wallet, payload: payloadData });
 
       res = await fetch(`${authConfig.authUrl}/login`, {
         method: "POST",
@@ -93,106 +88,3 @@ export function useLogin() {
     isLoading: login.isLoading,
   };
 }
-
-export async function doLoginWithPayload(
-  wallet: GenericAuthWallet,
-  payload: LoginPayloadData,
-): Promise<LoginPayload> {
-  const message = generateMessage(payload);
-  const signature = await wallet.signMessage(message);
-
-  return {
-    payload,
-    signature,
-  };
-}
-
-export async function doLogin(
-  wallet: GenericAuthWallet,
-  options?: LoginOptions,
-): Promise<LoginPayload> {
-  let chainId: string | undefined = options?.chainId;
-  if (!chainId && wallet.getChainId) {
-    try {
-      chainId = (await wallet.getChainId()).toString();
-    } catch {
-      // ignore error
-    }
-  }
-
-  invariant(options?.domain, "Please specify a domain to login with.");
-  // generate a pseudo-random nonce if none is provided
-  const nonce =
-    options?.nonce || Math.floor(Math.random() * 1000000000).toString();
-
-  const payloadData: LoginPayloadData = {
-    type: wallet.type,
-    domain: options.domain,
-    address: await wallet.getAddress(),
-    statement:
-      options?.statement ||
-      "Please ensure that the domain above matches the URL of the current website.",
-    version: options?.version || "1",
-    uri: options?.uri,
-    chain_id: chainId,
-    nonce: options?.nonce || nonce,
-    issued_at: new Date().toISOString(),
-    expiration_time: new Date(
-      options?.expirationTime || Date.now() + 1000 * 60 * 10,
-    ).toISOString(),
-    invalid_before: new Date(
-      options?.invalidBefore || Date.now() - 1000 * 60 * 10,
-    ).toISOString(),
-    resources: options?.resources,
-  };
-
-  return doLoginWithPayload(wallet, payloadData);
-}
-
-// generate straight from auth
-function generateMessage(payload: LoginPayloadData): string {
-  const typeField = payload.type === "evm" ? "Ethereum" : "Solana";
-  const header = `${payload.domain} wants you to sign in with your ${typeField} account:`;
-  let prefix = [header, payload.address].join("\n");
-  prefix = [prefix, payload.statement].join("\n\n");
-  if (payload.statement) {
-    prefix += "\n";
-  }
-
-  const suffixArray = [];
-  if (payload.uri) {
-    const uriField = `URI: ${payload.uri}`;
-    suffixArray.push(uriField);
-  }
-
-  const versionField = `Version: ${payload.version}`;
-  suffixArray.push(versionField);
-
-  if (payload.chain_id) {
-    const chainField = `Chain ID: ` + payload.chain_id || "1";
-    suffixArray.push(chainField);
-  }
-
-  const nonceField = `Nonce: ${payload.nonce}`;
-  suffixArray.push(nonceField);
-
-  const issuedAtField = `Issued At: ${payload.issued_at}`;
-  suffixArray.push(issuedAtField);
-
-  const expiryField = `Expiration Time: ${payload.expiration_time}`;
-  suffixArray.push(expiryField);
-
-  if (payload.invalid_before) {
-    const invalidBeforeField = `Not Before: ${payload.invalid_before}`;
-    suffixArray.push(invalidBeforeField);
-  }
-
-  if (payload.resources) {
-    suffixArray.push(
-      [`Resources:`, ...payload.resources.map((x) => `- ${x}`)].join("\n"),
-    );
-  }
-
-  const suffix = suffixArray.join("\n");
-  return [prefix, suffix].join("\n");
-}

packages/react-core/src/evm/hooks/useSigner.ts

@@ -1,10 +1,17 @@
-import { useThirdwebConnectedWalletContext } from "../contexts/thirdweb-wallet";
+import { useContext } from "react";
+import { ThirdwebConnectedWalletContext } from "../contexts/thirdweb-wallet";
 import type { Signer } from "ethers";
+import invariant from "tiny-invariant";
 
 /**
  *
  * @internal
  */
 export function useSigner(): Signer | undefined {
-  return useThirdwebConnectedWalletContext().signer;
+  const context = useContext(ThirdwebConnectedWalletContext);
+  invariant(
+    context,
+    "useSigner() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context.signer;
 }

packages/react-core/src/evm/hooks/useSupportedChains.ts

@@ -1,5 +1,12 @@
-import { useThirdwebConfigContext } from "../contexts/thirdweb-config";
+import { useContext } from "react";
+import invariant from "tiny-invariant";
+import { ThirdwebConfigContext } from "../contexts/thirdweb-config";
 
 export function useSupportedChains() {
-  return useThirdwebConfigContext().chains;
+  const context = useContext(ThirdwebConfigContext);
+  invariant(
+    context,
+    "useSupportedChains() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context.chains;
 }

packages/react-core/src/evm/hooks/wallet.ts

@@ -1,10 +1,14 @@
-import { useThirdwebConnectedWalletContext } from "../contexts/thirdweb-wallet";
+import invariant from "tiny-invariant";
+import {
+  ThirdwebConnectedWalletContext,
+  useThirdwebConnectedWalletContext,
+} from "../contexts/thirdweb-wallet";
 import { ContractAddress } from "../types";
 import { cacheKeys } from "../utils/cache-keys";
 import { useSupportedChains } from "./useSupportedChains";
 import { useQuery } from "@tanstack/react-query";
 import { Chain, defaultChains } from "@thirdweb-dev/chains";
-import { useMemo } from "react";
+import { useContext, useMemo } from "react";
 
 /**
  * A hook to get the native or (optional) ERC20 token balance of the connected wallet.
@@ -40,7 +44,12 @@ export function useBalance(tokenAddress?: ContractAddress) {
  * @internal
  */
 export function useConnectedWallet() {
-  return useThirdwebConnectedWalletContext().wallet;
+  const context = useContext(ThirdwebConnectedWalletContext);
+  invariant(
+    context,
+    "useConnectedWallet() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context.signer;
 }
 
 /**
@@ -71,7 +80,12 @@ export function useConnectedWallet() {
  * @public
  */
 export function useAddress(): string | undefined {
-  return useThirdwebConnectedWalletContext().address;
+  const context = useContext(ThirdwebConnectedWalletContext);
+  invariant(
+    context,
+    "useAddress() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context.address;
 }
 
 /**
@@ -96,7 +110,12 @@ export function useAddress(): string | undefined {
  * @public
  */
 export function useChainId(): number | undefined {
-  return useThirdwebConnectedWalletContext().chainId;
+  const context = useContext(ThirdwebConnectedWalletContext);
+  invariant(
+    context,
+    "useChainId() hook must be used within a <ThirdwebProvider/>",
+  );
+  return context.chainId;
 }
 
 /**

packages/react-native-compat/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @thirdweb-dev/react-native-compat
 
+## 0.2.51
+
+## 0.2.50
+
+## 0.2.49
+
+## 0.2.48
+
+## 0.2.47
+
+## 0.2.46
+
+## 0.2.45
+
 ## 0.2.44
 
 ## 0.2.43

packages/react-native-compat/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thirdweb-dev/react-native-compat",
   "description": "Shims for Thirdweb in React Native Projects",
-  "version": "0.2.44",
+  "version": "0.2.51",
   "author": "thirdweb eng <[email protected]>",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native-compat",
   "license": "Apache-2.0",

packages/react-native/CHANGELOG.md

@@ -1,5 +1,118 @@
 # @thirdweb-dev/react-native
 
+## 0.2.51
+
+### Patch Changes
+
+- [#1489](https://github.com/thirdweb-dev/js/pull/1489) [`07fb1b5f`](https://github.com/thirdweb-dev/js/commit/07fb1b5ffa4c170e252df31070852ddb9a81dec9) Thanks [@iketw](https://github.com/iketw)! - Adding walletConnect as a supportedWallet in React Native
+
+  ```javascript
+  import {
+    localWallet,
+    ThirdwebProvider,
+    walletConnect,
+  } from "@thirdweb-dev/react-native";
+  import { Ethereum } from "@thirdweb-dev/chains";
+
+  const App = () => {
+    const activeChain = Ethereum;
+    return (
+      <ThirdwebProvider
+        activeChain={activeChain}
+        supportedChains={[activeChain]}
+        clientId="your-client-id"
+        supportedWallets={[
+          localWallet(),
+          walletConnect({
+            projectId: "your-wallet-connect-project-id", // optional, but we recommend you get your own for production
+          }),
+        ]}
+      >
+        <AppInner />
+      </ThirdwebProvider>
+    );
+  };
+  ```
+
+- [#1496](https://github.com/thirdweb-dev/js/pull/1496) [`26349f31`](https://github.com/thirdweb-dev/js/commit/26349f311d144d692c69a6c2a7ec0f34949851d4) Thanks [@iketw](https://github.com/iketw)! - Improves loading states when disconnecting and fetching balances
+
+- Updated dependencies [[`07fb1b5f`](https://github.com/thirdweb-dev/js/commit/07fb1b5ffa4c170e252df31070852ddb9a81dec9), [`300a3c6f`](https://github.com/thirdweb-dev/js/commit/300a3c6f04d0ea7e25dfdb0a4c28b3a5796fcadf), [`d248aa2c`](https://github.com/thirdweb-dev/js/commit/d248aa2c5a89a297dd2623c961793026de1de346), [`d248aa2c`](https://github.com/thirdweb-dev/js/commit/d248aa2c5a89a297dd2623c961793026de1de346), [`8f3b685a`](https://github.com/thirdweb-dev/js/commit/8f3b685ad2bd73cb4d5d8c8aa25c04ffc10fb7cf), [`28975765`](https://github.com/thirdweb-dev/js/commit/2897576513eb6f497a9f92e3e473182b4fc9681b), [`b91d3e99`](https://github.com/thirdweb-dev/js/commit/b91d3e990198b77dc1358e738c11dc4acaa67491)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
+## 0.2.50
+
+### Patch Changes
+
+- Updated dependencies [[`39e2af6f`](https://github.com/thirdweb-dev/js/commit/39e2af6f2f4d933dca1b3de4a37de76375bafd74), [`a5ba9e4f`](https://github.com/thirdweb-dev/js/commit/a5ba9e4fbfee228e5b9ac27cd0157187e3a50117), [`39e2af6f`](https://github.com/thirdweb-dev/js/commit/39e2af6f2f4d933dca1b3de4a37de76375bafd74)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
+## 0.2.49
+
+### Patch Changes
+
+- [#1479](https://github.com/thirdweb-dev/js/pull/1479) [`14d9a71c`](https://github.com/thirdweb-dev/js/commit/14d9a71c928019907618cc8694af0bc631e94b68) Thanks [@iketw](https://github.com/iketw)! - Deprecates magicWallet in favor of magicLink for consistency with our React package
+
+- [#1477](https://github.com/thirdweb-dev/js/pull/1477) [`34b31599`](https://github.com/thirdweb-dev/js/commit/34b315993c0abaccb9640a5d5804c2c93af569c2) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Pass unauth'd RPCs to wallets when adding new chains
+
+- Updated dependencies [[`34b31599`](https://github.com/thirdweb-dev/js/commit/34b315993c0abaccb9640a5d5804c2c93af569c2), [`7f531122`](https://github.com/thirdweb-dev/js/commit/7f5311222b14da04877df056baae36409dff4696)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
+## 0.2.48
+
+### Patch Changes
+
+- [#1458](https://github.com/thirdweb-dev/js/pull/1458) [`588b2106`](https://github.com/thirdweb-dev/js/commit/588b21060139a7c0bf5805e2c629a16792ed2c76) Thanks [@kien-ngo](https://github.com/kien-ngo)! - Add `hideTestnetFaucet` to hide the "Request Testnet funds" button in ConnectWallet details dropdown in `@thirdweb-dev/react-native` and `@thirdweb-dev/react`.
+
+  ```ts
+  <ConnectWallet hideTestnetFaucet={true} />
+  ```
+
+- Updated dependencies [[`73462ef1`](https://github.com/thirdweb-dev/js/commit/73462ef10800aeeb5976634e2bc6fb5d3e8501e4), [`27c225a5`](https://github.com/thirdweb-dev/js/commit/27c225a51221417592b5940887abd1ccb8b67e47), [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308), [`70c4a119`](https://github.com/thirdweb-dev/js/commit/70c4a119d691a37ec999d9f6087902d532cc82ed), [`a1732663`](https://github.com/thirdweb-dev/js/commit/a17326634e758c3bf42f0cc3869b8792f1e18cc9), [`f0443bd9`](https://github.com/thirdweb-dev/js/commit/f0443bd989dbba50d0836d1cf274bfb2f44a53fd), [`cb1c9937`](https://github.com/thirdweb-dev/js/commit/cb1c9937fadb2d06eb148cf9819f2b3601376308), [`588b2106`](https://github.com/thirdweb-dev/js/commit/588b21060139a7c0bf5805e2c629a16792ed2c76), [`269e68c0`](https://github.com/thirdweb-dev/js/commit/269e68c0a15e8f78cb5b68c9456ca8094b9e1f30)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
+## 0.2.47
+
+### Patch Changes
+
+- Updated dependencies [[`4c37af49`](https://github.com/thirdweb-dev/js/commit/4c37af49aa4fa66beb8ffe8ef556068a29f3c5d4), [`4b0e63dc`](https://github.com/thirdweb-dev/js/commit/4b0e63dcc0ca871ce9cef76f8a41ff290316741c)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
+## 0.2.46
+
+### Patch Changes
+
+- [#1452](https://github.com/thirdweb-dev/js/pull/1452) [`3ba8ba42`](https://github.com/thirdweb-dev/js/commit/3ba8ba428845f5b2ae90ca73855be275fc78373c) Thanks [@iketw](https://github.com/iketw)! - Upgrade Coinbase wallet SDK; it adds support for React Native 0.72.3
+
+- Updated dependencies [[`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf), [`262edc6a`](https://github.com/thirdweb-dev/js/commit/262edc6a46792da88f49ff6ef0a756a932a6a0cf), [`dfd120a3`](https://github.com/thirdweb-dev/js/commit/dfd120a3a9d1582c8b174265c92bf43dbbaf5c86)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
+## 0.2.45
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+  - @thirdweb-dev/[email protected]
+
 ## 0.2.44
 
 ### Patch Changes

packages/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react-native",
-  "version": "0.2.44",
+  "version": "0.2.51",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",
@@ -24,7 +24,7 @@
     "android"
   ],
   "dependencies": {
-    "@coinbase/wallet-mobile-sdk": "1.0.6",
+    "@coinbase/wallet-mobile-sdk": "1.0.7",
     "@magic-sdk/provider": "17.2.0",
     "@magic-sdk/react-native-bare": "^18.5.0",
     "@shopify/restyle": "^2.4.2",

packages/react-native/src/core/storage/uploader.ts

@@ -128,7 +128,7 @@ export class IpfsUploader implements IStorageUploader<IpfsUploadBatchOptions> {
           ) {
             return reject(
               new Error(
-                `This looks like a network error, the endpoint might be blocked by an internet provider or a firewall. ${xhr.responseText}`,
+                `Upload failed due to a network error. ${xhr.responseText}`,
               ),
             );
           }

packages/react-native/src/evm/components/ConnectWallet.tsx

@@ -19,6 +19,13 @@ export type ConnectWalletProps = {
    * render custom rows in the Connect Wallet Details modal
    */
   extraRows?: ConnectWalletDetailsProps["extraRows"];
+
+  /**
+   * Hide option to request testnet funds for testnets in dropdown
+   *
+   * @default false
+   */
+  hideTestnetFaucet?: boolean;
 } & ConnectWalletButtonProps;
 
 export const ConnectWallet = ({
@@ -27,6 +34,7 @@ export const ConnectWallet = ({
   buttonTitle,
   modalTitle,
   extraRows,
+  hideTestnetFaucet,
 }: ConnectWalletProps) => {
   const fadeAnim = useRef(new Animated.Value(0)).current;
   const address = useAddress();
@@ -47,6 +55,7 @@ export const ConnectWallet = ({
             address={address}
             detailsButton={detailsButton}
             extraRows={extraRows}
+            hideTestnetFaucet={hideTestnetFaucet}
           />
         ) : (
           <ConnectWalletButton

packages/react-native/src/evm/components/ConnectWalletDetails/ConnectWalletDetailsModal.tsx

@@ -32,11 +32,13 @@ export const ConnectWalletDetailsModal = ({
   onClosePress,
   extraRows,
   address,
+  hideTestnetFaucet,
 }: {
   isVisible: boolean;
   onClosePress: () => void;
   extraRows?: React.FC;
   address?: string;
+  hideTestnetFaucet?: boolean;
 }) => {
   const theme = useAppTheme();
   const [isExportModalVisible, setIsExportModalVisible] = useState(false);
@@ -198,7 +200,7 @@ export const ConnectWalletDetailsModal = ({
             <Text variant="bodySmallSecondary">Current Network</Text>
           </View>
           <NetworkButton chain={chain} enableSwitchModal={true} />
-          {chain?.testnet && chain?.faucets?.length ? (
+          {!hideTestnetFaucet && chain?.testnet && chain?.faucets?.length ? (
             <IconTextButton
               mt="xs"
               text="Request Testnet Funds"

packages/react-native/src/evm/components/ConnectWalletDetails/WalletDetailsButton.tsx

@@ -3,27 +3,29 @@ import BaseButton from "../base/BaseButton";
 import { ChainIcon } from "../base/ChainIcon";
 import Text from "../base/Text";
 import { WalletIcon } from "../base/WalletIcon";
-import { useWallet, useBalance, useChain } from "@thirdweb-dev/react-core";
+import { useWallet, useChain } from "@thirdweb-dev/react-core";
 import { StyleSheet, View } from "react-native";
 import { LocalWallet } from "@thirdweb-dev/wallets";
 import Box from "../base/Box";
 import { ConnectWalletDetailsModal } from "./ConnectWalletDetailsModal";
 import { useState } from "react";
+import { TextBalance } from "../base/TextBalance";
 
 export type ConnectWalletDetailsProps = {
   address?: string;
   detailsButton?: React.FC<{ onPress: () => void }>;
   extraRows?: React.FC;
+  hideTestnetFaucet?: boolean;
 };
 
 export const WalletDetailsButton = ({
   address,
   detailsButton,
   extraRows,
+  hideTestnetFaucet,
 }: ConnectWalletDetailsProps) => {
   const activeWallet = useWallet();
   const chain = useChain();
-  const balanceQuery = useBalance();
   const [isModalVisible, setIsModalVisible] = useState(false);
 
   const onPress = () => {
@@ -46,6 +48,7 @@ export const WalletDetailsButton = ({
         onClosePress={onPress}
         extraRows={extraRows}
         address={address}
+        hideTestnetFaucet={hideTestnetFaucet}
       />
       {detailsButton ? (
         detailsButton({ onPress })
@@ -61,12 +64,7 @@ export const WalletDetailsButton = ({
               <ChainIcon size={32} chainIconUrl={chain?.icon?.url} />
             </View>
             <Box justifyContent="center" alignItems="flex-start">
-              <Text variant="bodySmall">
-                {balanceQuery.data
-                  ? Number(balanceQuery.data.displayValue).toFixed(3)
-                  : ""}{" "}
-                {balanceQuery.data?.symbol}
-              </Text>
+              <TextBalance textVariant="bodySmall" />
               {activeWallet?.walletId === LocalWallet.id ? (
                 <Text variant="error">Guest</Text>
               ) : (

packages/react-native/src/evm/components/ConnectWalletDetails/WalletDetailsModalHeader.tsx

@@ -2,14 +2,14 @@ import { Icon } from "../../assets/icon";
 import { useAppTheme } from "../../styles/hooks";
 import { AddressDisplay } from "../base/AddressDisplay";
 import BaseButton from "../base/BaseButton";
-import Text from "../base/Text";
 import { WalletIcon } from "../base/WalletIcon";
-import { useWallet, useBalance } from "@thirdweb-dev/react-core";
+import { useWallet } from "@thirdweb-dev/react-core";
 import { ActivityIndicator, StyleSheet, View } from "react-native";
 import * as Clipboard from "expo-clipboard";
 import Box from "../base/Box";
 import CopyIcon from "../../assets/copy";
 import { useState } from "react";
+import { TextBalance } from "../base/TextBalance";
 
 interface WalletDetailsModalHeaderProps {
   address?: string;
@@ -24,7 +24,6 @@ export const WalletDetailsModalHeader = ({
   onAddressCopied,
 }: WalletDetailsModalHeaderProps) => {
   const theme = useAppTheme();
-  const balanceQuery = useBalance();
   const activeWallet = useWallet();
   const [showLoading, setShowLoading] = useState(false);
 
@@ -38,7 +37,9 @@ export const WalletDetailsModalHeader = ({
 
   const onDisconnectPressInternal = () => {
     setShowLoading(true);
-    onDisconnectPress();
+    setTimeout(() => {
+      onDisconnectPress();
+    }, 0);
   };
 
   return (
@@ -65,12 +66,7 @@ export const WalletDetailsModalHeader = ({
               color={theme.colors.textSecondary}
             />
           </Box>
-          <Text variant="bodySmallSecondary">
-            {balanceQuery.data
-              ? Number(balanceQuery.data.displayValue).toFixed(3)
-              : ""}{" "}
-            {balanceQuery.data?.symbol}
-          </Text>
+          <TextBalance textVariant="bodySmallSecondary" />
         </BaseButton>
         {showLoading ? (
           <ActivityIndicator size="small" color={theme.colors.iconHighlight} />

packages/react-native/src/evm/components/ConnectWalletFlow/ConnectWalletFlow.tsx

@@ -89,6 +89,10 @@ export const ConnectWalletFlow = () => {
     setIsConnecting(false);
   };
 
+  const handleClose = useCallback(() => {
+    onClose(true);
+  }, [onClose]);
+
   const getComponentForWallet = useCallback(() => {
     switch (activeWallet?.id) {
       case SmartWallet.id:
@@ -100,7 +104,7 @@ export const ConnectWalletFlow = () => {
         <activeWallet.connectUI
           theme={theme || "dark"}
           goBack={onBackPress}
-          close={() => onClose(true)}
+          close={handleClose}
           isOpen={modalVisible}
           open={onOpenModal}
           walletConfig={activeWallet}
@@ -112,6 +116,7 @@ export const ConnectWalletFlow = () => {
     }
   }, [
     activeWallet,
+    handleClose,
     modalVisible,
     onBackPress,
     onClose,

packages/react-native/src/evm/components/MainModal.tsx

@@ -64,6 +64,7 @@ const styles = StyleSheet.create({
     borderTopLeftRadius: 24,
     borderTopRightRadius: 24,
     padding: 24,
+    paddingBottom: 40,
   },
   contentContainer: {
     maxHeight: MODAL_HEIGHT,

packages/react-native/src/evm/components/base/ImageSvgUri.tsx

@@ -3,6 +3,7 @@ import { useState } from "react";
 import { Image } from "react-native";
 import { SvgUri } from "react-native-svg";
 import { isAppBundleIdPresentInGlobal } from "../../utils/global";
+import Box from "./Box";
 
 const ImageSvgUri = ({
   imageUrl = "",
@@ -29,29 +30,29 @@ const ImageSvgUri = ({
     return null;
   }
 
-  if (error) {
-    return (
-      <SvgUri
-        width={width}
-        height={height}
-        uri={resolvedImageUrl}
-        onError={(err) => {
-          console.warn("Error loading an svg image: ", err);
-        }}
-      />
-    );
-  } else {
-    // always try to render Image first, if error then try to render svg
-    // Image from RN handles onError better than SvgUri
-    return (
-      <Image
-        alt={imageAlt}
-        source={{ uri: resolvedImageUrl }}
-        style={[{ width: width, height: height }]}
-        onError={() => setError(true)}
-      />
-    );
-  }
+  return (
+    <Box style={{ width: width, height: height }}>
+      {error ? (
+        <SvgUri
+          width={width}
+          height={height}
+          uri={resolvedImageUrl}
+          onError={(err) => {
+            console.warn("Error loading an svg image: ", err);
+          }}
+        />
+      ) : (
+        // always try to render Image first, if error then try to render svg
+        // Image from RN handles onError better than SvgUri
+        <Image
+          alt={imageAlt}
+          source={{ uri: resolvedImageUrl }}
+          style={[{ width: width, height: height }]}
+          onError={() => setError(true)}
+        />
+      )}
+    </Box>
+  );
 };
 
 export default ImageSvgUri;

packages/react-native/src/evm/components/base/LoadingTextAnimation.tsx

@@ -0,0 +1,67 @@
+import React, { useCallback, useEffect, useRef } from "react";
+import { View, Animated, Easing, StyleSheet } from "react-native";
+import { baseTheme } from "../../styles/theme";
+import { useAppTheme } from "../../styles/hooks";
+
+type LoadingTextAnimationProps = {
+  text: string;
+  textVariant: keyof typeof baseTheme.textVariants;
+};
+
+const LoadingTextAnimation = ({
+  text,
+  textVariant,
+}: LoadingTextAnimationProps) => {
+  const fadeAnim = useRef(new Animated.Value(0)).current;
+  const theme = useAppTheme();
+
+  const fadeInOut = useCallback(() => {
+    Animated.loop(
+      Animated.sequence([
+        Animated.timing(fadeAnim, {
+          toValue: 1,
+          duration: 600,
+          easing: Easing.linear,
+          useNativeDriver: true,
+        }),
+        Animated.timing(fadeAnim, {
+          toValue: 0,
+          duration: 600,
+          easing: Easing.linear,
+          useNativeDriver: true,
+        }),
+      ]),
+      { iterations: -1 },
+    ).start();
+  }, [fadeAnim]);
+
+  useEffect(() => {
+    fadeInOut();
+  }, [fadeInOut]);
+
+  return (
+    <View style={styles.animatedView}>
+      <Animated.Text
+        style={{
+          color: theme.colors.textSecondary,
+          fontWeight: theme.textVariants[textVariant].fontWeight as any,
+          fontSize: theme.textVariants[textVariant].fontSize,
+          lineHeight: theme.textVariants[textVariant].lineHeight,
+          opacity: fadeAnim,
+        }}
+      >
+        {text}
+      </Animated.Text>
+    </View>
+  );
+};
+
+export default LoadingTextAnimation;
+
+const styles = StyleSheet.create({
+  animatedView: {
+    flexDirection: "row",
+    justifyContent: "flex-start",
+    flex: 1,
+  },
+});

packages/react-native/src/evm/components/base/TextBalance.tsx

@@ -0,0 +1,21 @@
+import { useBalance } from "@thirdweb-dev/react-core";
+import Text from "./Text";
+import LoadingTextAnimation from "./LoadingTextAnimation";
+import { baseTheme } from "../../styles/theme";
+
+type TextBalance = {
+  textVariant: keyof typeof baseTheme.textVariants;
+};
+
+export const TextBalance = ({ textVariant }: TextBalance) => {
+  const balanceQuery = useBalance();
+
+  return !balanceQuery.data ? (
+    <LoadingTextAnimation text="Fetching..." textVariant={textVariant} />
+  ) : (
+    <Text variant={textVariant}>
+      {Number(balanceQuery.data?.displayValue).toFixed(3)}{" "}
+      {balanceQuery.data.symbol}
+    </Text>
+  );
+};

packages/react-native/src/evm/components/base/modal/TWModal.tsx

@@ -3,7 +3,12 @@ import Modal, { ModalProps } from "react-native-modal";
 // Populate with the data...
 export function TWModal(props: Partial<ModalProps>) {
   return (
-    <Modal {...props} useNativeDriver hideModalContentWhileAnimating={true}>
+    <Modal
+      {...props}
+      avoidKeyboard
+      useNativeDriver
+      hideModalContentWhileAnimating={true}
+    >
       {props.children}
     </Modal>
   );

packages/react-native/src/evm/constants/walletConnect.ts

@@ -1,2 +1,7 @@
 export const TW_WC_PROJECT_ID = "145769e410f16970a79ff77b2d89a1e0";
 export const WC_RELAY_URL = "wss://relay.walletconnect.com";
+
+export const WC_LINKS = {
+  native: "wc://",
+  universal: "wc://",
+};

packages/react-native/src/evm/hooks/useDebounceCallback.ts

@@ -0,0 +1,40 @@
+import { useCallback, useEffect, useRef } from "react";
+
+interface Props {
+  callback: (args: any) => void;
+  delay?: number;
+}
+
+export function useDebounceCallback({ callback, delay = 250 }: Props) {
+  const timeoutRef = useRef<NodeJS.Timeout | null>(null);
+  const callbackRef = useRef(callback);
+
+  useEffect(() => {
+    callbackRef.current = callback;
+  }, [callback]);
+
+  const debouncedCallback = useCallback(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore args can be any in this case
+    (args) => {
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+      }
+
+      timeoutRef.current = setTimeout(() => {
+        callbackRef.current(args);
+      }, delay);
+    },
+    [delay],
+  );
+
+  useEffect(() => {
+    return () => {
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+      }
+    };
+  }, []);
+
+  return debouncedCallback;
+}

packages/react-native/src/evm/index.ts

@@ -15,9 +15,13 @@ export { TrustWallet, trustWallet } from "./wallets/wallets/trust-wallet";
 export { smartWallet } from "./wallets/wallets/smart-wallet";
 export { localWallet } from "./wallets/wallets/local-wallet";
 export { LocalWallet } from "./wallets/wallets/LocalWallet";
-export { magicWallet } from "./wallets/wallets/magic-wallet";
-export { MagicWallet } from "./wallets/wallets/MagicWallet";
-export * from "./wallets/wallets/WalletConnectV2";
+export { magicWallet } from "./wallets/wallets/magic-link";
+export { MagicWallet } from "./wallets/wallets/MagicLink";
+export { MagicLink } from "./wallets/wallets/MagicLink";
+export { magicLink } from "./wallets/wallets/magic-link";
+export * from "./wallets/wallets/wallet-connect/WalletConnectBase";
+export { WalletConnect } from "./wallets/wallets/wallet-connect/WalletConnect";
+export { walletConnect } from "./wallets/wallets/wallet-connect/wallet-connect";
 export type { WCMeta } from "./wallets/types/wc";
 
 export { useCoinbaseWallet } from "./wallets/hooks/useCoinbaseWallet";

packages/react-native/src/evm/providers/context-provider.tsx

@@ -7,47 +7,47 @@ import {
   useState,
 } from "react";
 import { useWalletConnectListener } from "../wallets/hooks/useWalletConnectListener";
-import { MagicWallet } from "../wallets/wallets/MagicWallet";
+import { MagicLink } from "../wallets/wallets/MagicLink";
 import { useWalletContext } from "@thirdweb-dev/react-core";
 
 type DappContextType = {
   smartWallet?: SmartWallet;
   setSmartWallet?: (value?: SmartWallet) => void;
-  magicWallet?: MagicWallet;
-  setMagicWallet?: (value?: MagicWallet) => void;
+  magicLink?: MagicLink;
+  setMagicLink?: (value?: MagicLink) => void;
 };
 
 const DappContext = createContext<DappContextType>({});
 
 export const DappContextProvider = (props: React.PropsWithChildren) => {
   const [smartWallet, setSmartWallet] = useState<SmartWallet | undefined>();
-  const [magicWallet, setMagicWallet] = useState<MagicWallet | undefined>();
+  const [magicLink, setMagicLink] = useState<MagicLink | undefined>();
   const createdWalletInstance = useWalletContext().createdWalletInstance;
 
   useEffect(() => {
     if (createdWalletInstance?.walletId === walletIds.magicLink) {
-      setMagicWallet(createdWalletInstance as MagicWallet);
+      setMagicLink(createdWalletInstance as MagicLink);
     }
-  }, [createdWalletInstance, setMagicWallet]);
+  }, [createdWalletInstance, setMagicLink]);
 
   useWalletConnectListener();
 
   const magicSDK = useCallback(() => {
-    if (magicWallet) {
-      const magic = magicWallet.getMagicSDK();
+    if (magicLink) {
+      const magic = magicLink.getMagicSDK();
       return <magic.Relayer />;
     }
 
     return null;
-  }, [magicWallet]);
+  }, [magicLink]);
 
   return (
     <DappContext.Provider
       value={{
         smartWallet,
         setSmartWallet,
-        magicWallet: magicWallet,
-        setMagicWallet: setMagicWallet,
+        magicLink: magicLink,
+        setMagicLink: setMagicLink,
       }}
     >
       {props.children}
@@ -66,11 +66,11 @@ export const useSmartWallet = () => {
   return [context.smartWallet, context.setSmartWallet] as const;
 };
 
-export const useMagicWallet = () => {
+export const useMagicLink = () => {
   const context = useContext(DappContext);
 
   return {
-    magicWallet: context.magicWallet,
-    setMagicWallet: context.setMagicWallet,
+    magicLink: context.magicLink,
+    setMagicLink: context.setMagicLink,
   } as const;
 };

packages/react-native/src/evm/types/wc.ts

@@ -0,0 +1,8 @@
+export type WCWallet = {
+  iconURL: string;
+  name: string;
+  links: {
+    native: string;
+    universal: string;
+  };
+};

packages/react-native/src/evm/utils/uri.ts

@@ -1,3 +1,4 @@
+import { Chain, getValidChainRPCs } from "@thirdweb-dev/chains";
 import { WCMeta } from "../wallets/types/wc";
 
 /**
@@ -20,3 +21,19 @@ export function formatWalletConnectDisplayUri(
       }wc?uri=${encodedUri}`
     : `${uri}`;
 }
+
+export function getValidPublicRPCUrl(chain: Chain) {
+  return getValidChainRPCs(chain).map((rpc) => {
+    try {
+      const url = new URL(rpc);
+      // remove client id from url
+      if (url.hostname.endsWith(".thirdweb.com")) {
+        url.pathname = "";
+        url.search = "";
+      }
+      return url.toString();
+    } catch (e) {
+      return rpc;
+    }
+  });
+}

packages/react-native/src/evm/wallets/connectors/coinbase-wallet/index.ts

@@ -4,7 +4,6 @@ import type {
   WalletMobileSDKProviderOptions,
 } from "@coinbase/wallet-mobile-sdk/build/WalletMobileSDKEVMProvider";
 import type { ConfigurationParams } from "@coinbase/wallet-mobile-sdk/src/CoinbaseWalletSDK.types";
-import { getValidChainRPCs } from "@thirdweb-dev/chains";
 import {
   UserRejectedRequestError,
   ChainNotConfiguredError,
@@ -18,6 +17,7 @@ import {
 } from "@thirdweb-dev/wallets";
 import type { Address } from "abitype";
 import { providers, utils } from "ethers";
+import { getValidPublicRPCUrl } from "evm/utils/uri";
 
 export type CoinbaseWalletConnectorOptions = WalletMobileSDKProviderOptions &
   ConfigurationParams & {
@@ -227,7 +227,7 @@ export class CoinbaseWalletConnector extends WagmiConnector<
                 chainId: id,
                 chainName: chain.name,
                 nativeCurrency: chain.nativeCurrency,
-                rpcUrls: [getValidChainRPCs(chain)],
+                rpcUrls: getValidPublicRPCUrl(chain), // no client id on purpose here
                 blockExplorerUrls: this.getBlockExplorerUrls(chain),
               },
             ],

packages/react-native/src/evm/wallets/types/wc.ts

@@ -2,7 +2,7 @@ export type WCMeta = {
   name: string;
   iconURL: string;
   links: {
-    native?: string;
-    universal?: string;
+    native: string;
+    universal: string;
   };
 };

packages/react-native/src/evm/wallets/wallets/MagicLink.ts

@@ -6,7 +6,7 @@ import {
 import type { MagicConnector as MagicConnectorType } from "../connectors/magic/magic-connector";
 import { MagicConnector } from "../connectors/magic/magic-connector";
 
-export class MagicWallet extends AbstractClientWallet<
+export class MagicLink extends AbstractClientWallet<
   MagicLinkOptions,
   MagicConnectorOptions
 > {
@@ -68,3 +68,10 @@ export class MagicWallet extends AbstractClientWallet<
     return super.disconnect();
   }
 }
+
+/**
+ * @deprecated Use `MagicLink` instead
+ *
+ * Renamed for consistency with our React package
+ */
+export class MagicWallet extends MagicLink {}

packages/react-native/src/evm/wallets/wallets/magic-link.tsx

@@ -10,22 +10,22 @@ import {
   useWalletContext,
 } from "@thirdweb-dev/react-core";
 import { MagicLinkOptions } from "../connectors/magic/types";
-import { MagicWallet } from "./MagicWallet";
+import { MagicLink } from "./MagicLink";
 import { useEffect, useRef } from "react";
 import Box from "../../components/base/Box";
 import { TextInput } from "../../components/base/TextInput";
 import Text from "../../components/base/Text";
 import { ActivityIndicator } from "react-native";
-import { useMagicWallet } from "../../providers/context-provider";
+import { useMagicLink } from "../../providers/context-provider";
 
-export const magicWallet = (
+export const magicLink = (
   magicLinkOptions: MagicLinkOptions,
-): WalletConfig<MagicWallet> => {
+): WalletConfig<MagicLink> => {
   return {
     id: walletIds.magicLink,
-    meta: MagicWallet.meta,
+    meta: MagicLink.meta,
     create: (options: WalletOptions) => {
-      return new MagicWallet({
+      return new MagicLink({
         ...options,
         ...magicLinkOptions,
         chainId: options.chain.chainId,
@@ -42,7 +42,7 @@ export const magicWallet = (
     /**
      * UI for selecting wallet - this UI is rendered in the wallet selection screen
      */
-    selectUI: (props: SelectUIProps<MagicWallet>) => {
+    selectUI: (props: SelectUIProps<MagicLink>) => {
       return (
         <Box flex={1}>
           <TextInput
@@ -71,23 +71,23 @@ export const magicWallet = (
 };
 
 const MagicConnectionUI: React.FC<
-  ConnectUIProps<MagicWallet> & { magicLinkOptions: MagicLinkOptions }
+  ConnectUIProps<MagicLink> & { magicLinkOptions: MagicLinkOptions }
 > = ({ selectionData, walletConfig, close, magicLinkOptions }) => {
   const createWalletInstance = useCreateWalletInstance();
   const setConnectedWallet = useSetConnectedWallet();
   const chainToConnect = useWalletContext().chainToConnect;
   const setConnectionStatus = useSetConnectionStatus();
-  const { magicWallet: ctxMagicWallet, setMagicWallet } = useMagicWallet();
+  const { magicLink: ctxMagicLink, setMagicLink } = useMagicLink();
 
   useEffect(() => {
     const inst = createWalletInstance(walletConfig);
-    setMagicWallet?.(inst);
-  }, [createWalletInstance, setMagicWallet, walletConfig]);
+    setMagicLink?.(inst);
+  }, [createWalletInstance, setMagicLink, walletConfig]);
 
   const connectPrompted = useRef(false);
 
   useEffect(() => {
-    if (connectPrompted.current || !ctxMagicWallet) {
+    if (connectPrompted.current || !ctxMagicLink) {
       return;
     }
     connectPrompted.current = true;
@@ -105,10 +105,10 @@ const MagicConnectionUI: React.FC<
             : { phoneNumber: selectionData }),
         };
         close();
-        await ctxMagicWallet.connect(connectParams);
-        await ctxMagicWallet.getMagicSDK().user.getMetadata();
+        await ctxMagicLink.connect(connectParams);
+        await ctxMagicLink.getMagicSDK().user.getMetadata();
 
-        setConnectedWallet(ctxMagicWallet, connectParams);
+        setConnectedWallet(ctxMagicLink, connectParams);
         setConnectionStatus("connected");
       } catch (e) {
         setConnectionStatus("disconnected");
@@ -119,7 +119,7 @@ const MagicConnectionUI: React.FC<
     selectionData,
     walletConfig,
     close,
-    ctxMagicWallet,
+    ctxMagicLink,
     setConnectedWallet,
     setConnectionStatus,
     chainToConnect?.chainId,
@@ -129,6 +129,14 @@ const MagicConnectionUI: React.FC<
   return (
     <Box minHeight={500}>
       <ActivityIndicator size="small" />
+      <TextInput placeholder="Enter the OTP sent to your email / phone number" />
     </Box>
   );
 };
+
+/**
+ * @deprecated Use `magicLink()` instead
+ *
+ * Renamed for consistency with our React package
+ */
+export const magicWallet = magicLink;

packages/react-native/src/evm/wallets/wallets/metamask-wallet.ts

@@ -1,9 +1,9 @@
 import { walletIds } from "@thirdweb-dev/wallets";
 import { WalletOptions, WalletConfig } from "@thirdweb-dev/react-core";
-import { WalletConnectV2 } from "./WalletConnectV2";
 import { WCMeta } from "../types/wc";
+import { WalletConnectBase } from "./wallet-connect/WalletConnectBase";
 
-export class MetaMaskWallet extends WalletConnectV2 {
+export class MetaMaskWallet extends WalletConnectBase {
   static id = walletIds.metamask;
   static meta = {
     name: "MetaMask",

packages/react-native/src/evm/wallets/wallets/rainbow-wallet.ts

@@ -2,9 +2,9 @@ import {
   WalletOptions as WalletOptionsRC,
   WalletConfig,
 } from "@thirdweb-dev/react-core";
-import { WalletConnectV2 } from "./WalletConnectV2";
+import { WalletConnectBase } from "./wallet-connect/WalletConnectBase";
 
-export class RainbowWallet extends WalletConnectV2 {
+export class RainbowWallet extends WalletConnectBase {
   static id = "rainbow" as const;
   static meta = {
     name: "Rainbow",

packages/react-native/src/evm/wallets/wallets/trust-wallet.ts

@@ -1,8 +1,8 @@
 import { WalletOptions, WalletConfig } from "@thirdweb-dev/react-core";
-import { WalletConnectV2 } from "./WalletConnectV2";
 import { WCMeta } from "../types/wc";
+import { WalletConnectBase } from "./wallet-connect/WalletConnectBase";
 
-export class TrustWallet extends WalletConnectV2 {
+export class TrustWallet extends WalletConnectBase {
   static id = "trust" as const;
   static meta = {
     name: "Trust Wallet",
@@ -31,5 +31,5 @@ export const trustWallet = (config?: TrustWalletConfig) => {
         walletId: "trust",
         projectId: config?.projectId,
       }),
-  } satisfies WalletConfig<WalletConnectV2>;
+  } satisfies WalletConfig<WalletConnectBase>;
 };

packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnect.ts

@@ -0,0 +1,48 @@
+import { MMKV } from "react-native-mmkv";
+import { WC2Options, WalletConnectBase } from "./WalletConnectBase";
+
+const PREFIX = "__TW__WALLET__CONNECT__";
+
+export class WalletConnect extends WalletConnectBase {
+  static id = "WalletConnect" as const;
+  static meta = {
+    name: "WalletConnect",
+    iconURL:
+      "ipfs://QmX58KPRaTC9JYZ7KriuBzeoEaV2P9eZcA3qbFnTHZazKw/wallet-connect.svg",
+    links: {
+      native: "wc:",
+      universal: "wc:",
+    },
+  };
+
+  storage: MMKV;
+  links: { native: string; universal: string };
+
+  constructor(options: WC2Options) {
+    super(options);
+
+    this.storage = new MMKV();
+
+    const storedLinksStr = this.storage.getString(PREFIX + "links");
+
+    this.links = storedLinksStr
+      ? JSON.parse(storedLinksStr)
+      : {
+          native: "wc:",
+          universal: "wc:",
+        };
+
+    this.on("disconnect", () => {
+      this.storage.delete(PREFIX + "links");
+    });
+  }
+
+  getMeta() {
+    return { ...WalletConnect.meta, links: this.links };
+  }
+
+  setWCLinks(links: { native: string; universal: string }) {
+    this.storage.set(PREFIX + "links", JSON.stringify(links));
+    this.links = links;
+  }
+}

packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectBase.ts

@@ -1,13 +1,14 @@
-import { TW_WC_PROJECT_ID } from "../../constants/walletConnect";
-import { formatWalletConnectDisplayUri } from "../../utils/uri";
 import type {
   WalletConnectOptions,
   WalletOptions,
 } from "@thirdweb-dev/wallets";
 import { WalletConnect as WalletConnectV2Wallets } from "@thirdweb-dev/wallets";
 import { Linking } from "react-native";
-import { WCMeta } from "../types/wc";
-import { createAsyncLocalStorage } from "../../../core/AsyncStorage";
+import { TW_WC_PROJECT_ID } from "../../../constants/walletConnect";
+import { createAsyncLocalStorage } from "../../../../core/AsyncStorage";
+import { WCMeta } from "../../types/wc";
+import { formatWalletConnectDisplayUri } from "../../../utils/uri";
+import AsyncStorage from "@react-native-async-storage/async-storage";
 
 export type WC2Options = {
   /**
@@ -24,7 +25,7 @@ export type WC2Options = {
     walletId: NonNullable<WalletOptions["walletId"]>;
   };
 
-export abstract class WalletConnectV2 extends WalletConnectV2Wallets {
+export abstract class WalletConnectBase extends WalletConnectV2Wallets {
   constructor(options: WC2Options) {
     super({
       ...options,
@@ -41,9 +42,21 @@ export abstract class WalletConnectV2 extends WalletConnectV2Wallets {
     this.on("disconnect", () => {
       this.removeListener("display_uri", this._onWCOpenWallet);
       this.removeListener("wc_session_request_sent", this._onWCOpenWallet);
+      this.cleanAsyncStorage();
     });
   }
 
+  async cleanAsyncStorage() {
+    const allKeys = await AsyncStorage.getAllKeys();
+    for (const key of allKeys) {
+      if (key.includes("wc@2")) {
+        await AsyncStorage.removeItem(key);
+      }
+    }
+
+    await AsyncStorage.removeItem(".sdk-comm");
+  }
+
   abstract getMeta(): WCMeta;
 
   _onWCOpenWallet(uri?: string) {
@@ -60,3 +73,10 @@ export abstract class WalletConnectV2 extends WalletConnectV2Wallets {
     }
   }
 }
+
+/**
+ * @deprecated There's no longer the need to define V1/V2 for walletConnect.
+ *
+ * Use WalletConnectBase instead.
+ */
+export abstract class WalletConnectV2 extends WalletConnectBase {}

packages/react-native/src/evm/wallets/wallets/wallet-connect/WalletConnectButton.tsx

@@ -0,0 +1,82 @@
+import { Image, StyleSheet } from "react-native";
+import BaseButton from "../../../components/base/BaseButton";
+import { WCWallet } from "../../../types/wc";
+import Text from "../../../components/base/Text";
+import { WCMeta } from "../../types/wc";
+import { useState } from "react";
+import WalletLoadingThumbnail from "./WalletLoadingThumbnail";
+
+export const WALLET_MARGIN = 8;
+export const WALLET_HEIGHT = 80;
+
+export const WalletConnectButton = ({
+  item,
+  onPress,
+}: {
+  item: WCWallet;
+  onPress: (item: WCMeta) => void;
+}) => {
+  const [isAnimating, setIsAnimating] = useState(false);
+
+  const onWalletPress = () => {
+    setIsAnimating(true);
+    onPress(item);
+  };
+
+  return (
+    <BaseButton
+      flexDirection="column"
+      style={styles.buttonContainer}
+      onPress={onWalletPress}
+    >
+      {isAnimating ? (
+        <WalletLoadingThumbnail>
+          <Image
+            alt={item.name}
+            source={{ uri: item.iconURL }}
+            style={[
+              {
+                borderWidth: 1,
+                height: 50,
+                width: 50,
+                borderRadius: 30 / 3.5,
+              },
+            ]}
+          />
+        </WalletLoadingThumbnail>
+      ) : (
+        <Image
+          alt={item.name}
+          source={{ uri: item.iconURL }}
+          style={[
+            {
+              borderWidth: 0,
+              height: 50,
+              width: 50,
+              borderRadius: 30 / 3.5,
+            },
+          ]}
+        />
+      )}
+      <Text variant="bodySmallSecondary" fontSize={12} numberOfLines={1}>
+        {item.name.split(" ")[0]}
+      </Text>
+    </BaseButton>
+  );
+};
+
+const styles = StyleSheet.create({
+  imageWrapper: {
+    width: 50,
+    height: 50,
+    overflow: "hidden",
+    position: "relative",
+  },
+  buttonContainer: {
+    flex: 1,
+    height: WALLET_HEIGHT,
+    justifyContent: "center",
+    alignItems: "center",
+    marginVertical: WALLET_MARGIN,
+  },
+});