thirdweb 5.38.1-nightly-c82c524e139d7960794e08bca838a1a1b78a3532-20240725000333 → 5.40.0-nightly-3848327373e49aa83c5902e6a16d5b8e96cf1eeb-20240726000343

package/src/rpc/rpc.ts

@@ -61,12 +61,10 @@ export function getRpcClient(
   options: RPCOptions,
 ): EIP1193RequestFn<EIP1474Methods> {
   const rpcClientMap = getRpcClientMap(options.client);
-  const chainId = options.chain.id;
+  const rpcUrl = options.chain.rpc;
 
-  if (rpcClientMap.has(options.chain.rpc)) {
-    return rpcClientMap.get(
-      options.chain.rpc,
-    ) as EIP1193RequestFn<EIP1474Methods>;
+  if (rpcClientMap.has(rpcUrl)) {
+    return rpcClientMap.get(rpcUrl) as EIP1193RequestFn<EIP1474Methods>;
   }
 
   const rpcClient: EIP1193RequestFn<EIP1474Methods> = (() => {
@@ -242,6 +240,6 @@ export function getRpcClient(
     };
   })();
 
-  rpcClientMap.set(chainId, rpcClient);
+  rpcClientMap.set(rpcUrl, rpcClient);
   return rpcClient as EIP1193RequestFn<EIP1474Methods>;
 }

package/src/transaction/actions/to-serializable-transaction.test.ts

@@ -4,6 +4,8 @@ import { TEST_WALLET_B } from "../../../test/src/addresses.js";
 import { FORKED_ETHEREUM_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 
+import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
+import { ZERO_ADDRESS } from "../../constants/addresses.js";
 import { toWei } from "../../utils/units.js";
 import {
   type PreparedTransaction,
@@ -400,4 +402,19 @@ describe("toSerializableTransaction", () => {
       ).not.toThrow();
     });
   });
+
+  test("should respect 0 maxPriorityFeePerGas chains", async () => {
+    const serializableTransaction = await toSerializableTransaction({
+      transaction: prepareTransaction({
+        to: TEST_WALLET_B,
+        chain: arbitrumSepolia,
+        value: toWei("0.000001"),
+        client: TEST_CLIENT,
+      }),
+      from: ZERO_ADDRESS,
+    });
+
+    // gasPrice should be undefined for arbSepolia which has 0 maxPriorityFeePerGas
+    expect(serializableTransaction.gasPrice).toBe(undefined);
+  });
 });

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.38.1-nightly-c82c524e139d7960794e08bca838a1a1b78a3532-20240725000333";
+export const version = "5.40.0-nightly-3848327373e49aa83c5902e6a16d5b8e96cf1eeb-20240726000343";

package/src/wallets/ecosystem/types.ts

@@ -6,6 +6,9 @@ import type { Ecosystem } from "../in-app/web/types.js";
 
 export type EcosystemWalletCreationOptions = {
   partnerId?: string;
+  auth?: {
+    mode?: "popup" | "redirect";
+  };
 };
 
 export type EcosystemWalletConnectionOptions = InAppWalletConnectionOptions & {

package/src/wallets/in-app/core/interfaces/connector.ts

@@ -1,7 +1,9 @@
+import type { SocialAuthOption } from "../../../../wallets/types.js";
 import type { Account } from "../../../interfaces/wallet.js";
 import type {
   AuthArgsType,
   AuthLoginReturnType,
+  AuthStoredTokenWithCookieReturnType,
   GetUser,
   LogoutReturnType,
   PreAuthArgsType,
@@ -12,6 +14,10 @@ export interface InAppConnector {
   getUser(): Promise<GetUser>;
   getAccount(): Promise<Account>;
   preAuthenticate(args: PreAuthArgsType): Promise<SendEmailOtpReturnType>;
+  authenticateWithRedirect?(strategy: SocialAuthOption): void;
+  loginWithAuthToken?(
+    authResult: AuthStoredTokenWithCookieReturnType,
+  ): Promise<AuthLoginReturnType>;
   authenticate(args: AuthArgsType): Promise<AuthLoginReturnType>;
   logout(): Promise<LogoutReturnType>;
 }

package/src/wallets/in-app/core/wallet/index.ts

@@ -1,6 +1,10 @@
 import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import {
+  type SocialAuthOption,
+  socialAuthOptions,
+} from "../../../../wallets/types.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import type { EcosystemWalletId, WalletId } from "../../../wallet-types.js";
 import type {
@@ -35,6 +39,20 @@ export async function connectInAppWallet(
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
 ): Promise<[Account, Chain]> {
+  if (
+    createOptions?.auth?.mode === "redirect" &&
+    connector.authenticateWithRedirect
+  ) {
+    const strategy = options.strategy;
+    if (!socialAuthOptions.includes(strategy as SocialAuthOption)) {
+      throw new Error("This authentication method does not support redirects");
+    }
+    connector.authenticateWithRedirect(strategy as SocialAuthOption);
+  }
+  // If we don't have authenticateWithRedirect then it's likely react native, so the default is to redirect and we can carry on
+  // IF WE EVER ADD MORE CONNECTOR TYPES, this could cause redirect to be ignored despite being specified
+  // TODO: In V6, make everything redirect auth
+
   const authResult = await connector.authenticate(options);
   const authAccount = authResult.user.account;
 
@@ -66,6 +84,10 @@ export async function autoConnectInAppWallet(
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
 ): Promise<[Account, Chain]> {
+  if (options.authResult && connector.loginWithAuthToken) {
+    await connector.loginWithAuthToken(options.authResult);
+  }
+
   const user = await getAuthenticatedUser(connector);
   if (!user) {
     throw new Error("Failed to authenticate user.");

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

@@ -3,6 +3,7 @@ import type { ThirdwebClient } from "../../../../client/client.js";
 import type { SmartWalletOptions } from "../../../smart/types.js";
 import type { AuthOption, SocialAuthOption } from "../../../types.js";
 import type {
+  AuthStoredTokenWithCookieReturnType,
   MultiStepAuthArgsType,
   SingleStepAuthArgsType,
 } from "../authentication/type.js";
@@ -13,10 +14,12 @@ export type InAppWalletConnectionOptions = (
 ) & {
   client: ThirdwebClient;
   chain?: Chain;
+  redirect?: boolean;
 };
 
 export type InAppWalletAutoConnectOptions = {
   client: ThirdwebClient;
+  authResult?: AuthStoredTokenWithCookieReturnType;
   chain?: Chain;
 };
 
@@ -27,6 +30,7 @@ export type InAppWalletCreationOptions =
   | {
       auth?: {
         options: InAppWalletAuth[];
+        mode?: "popup" | "redirect";
       };
       metadata?: {
         image?: {

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

@@ -53,6 +53,16 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  *  hidePrivateKeyExport: true
  * });
  * ```
+ *
+ * Open the Oauth window in the same tab
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ * const wallet = inAppWallet({
+ *  auth: {
+ *    mode: "redirect"
+ *  }
+ * });
+ * ```
  * @wallet
  */
 export function inAppWallet(

package/src/wallets/in-app/web/lib/auth/index.ts

@@ -1,7 +1,8 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import type { OneOf } from "../../../../../utils/type-utils.js";
+import type { SocialAuthOption } from "../../../../../wallets/types.js";
 import {
   type AuthArgsType,
-  type AuthLoginReturnType,
   type GetAuthenticatedUserParams,
   type PreAuthArgsType,
   UserWalletStatus,
@@ -143,8 +144,18 @@ export async function preAuthenticate(args: PreAuthArgsType) {
  * @wallet
  */
 export async function authenticate(
-  args: AuthArgsType,
-): Promise<AuthLoginReturnType> {
+  args: OneOf<
+    | AuthArgsType
+    | {
+        strategy: SocialAuthOption;
+        client: ThirdwebClient;
+        ecosystem?: Ecosystem;
+        redirect: boolean;
+      }
+  >,
+) {
   const connector = await getInAppWalletConnector(args.client, args.ecosystem);
+  if (args.redirect && connector.authenticateWithRedirect)
+    return connector.authenticateWithRedirect(args.strategy);
   return connector.authenticate(args);
 }

package/src/wallets/in-app/web/lib/auth/oauth.ts

@@ -40,6 +40,18 @@ export const getSocialAuthLoginPath = (
   return baseUrl;
 };
 
+export const loginWithOauthRedirect = (options: {
+  authOption: SocialAuthOption;
+  client: ThirdwebClient;
+  ecosystem?: Ecosystem;
+}): void => {
+  const redirectUrl = new URL(window.location.href);
+  redirectUrl.searchParams.set("walletId", options.ecosystem?.id || "inApp");
+  redirectUrl.searchParams.set("authProvider", options.authOption);
+  const loginUrl = `${getSocialAuthLoginPath(options.authOption, options.client, options.ecosystem)}&redirectUrl=${encodeURIComponent(redirectUrl.toString())}`;
+  window.location.href = loginUrl;
+};
+
 export const loginWithOauth = async (options: {
   authOption: SocialAuthOption;
   client: ThirdwebClient;

package/src/wallets/in-app/web/lib/get-url-token.ts

@@ -0,0 +1,36 @@
+import type { AuthOption } from "../../../../wallets/types.js";
+import type { WalletId } from "../../../wallet-types.js";
+import type { AuthStoredTokenWithCookieReturnType } from "../../core/authentication/type.js";
+
+/**
+ * Checks for an auth token and associated metadata in the current URL
+ */
+export function getUrlToken(): {
+  walletId?: WalletId;
+  authResult?: AuthStoredTokenWithCookieReturnType;
+  authProvider?: AuthOption;
+} {
+  if (!window) {
+    throw new Error("Attempted to fetch a URL token on the server");
+  }
+
+  const queryString = window.location.search;
+  const params = new URLSearchParams(queryString);
+  const authResultString = params.get("authResult");
+  const walletId = params.get("walletId") as WalletId | undefined;
+  const authProvider = params.get("authProvider") as AuthOption | undefined;
+
+  if (authResultString && walletId) {
+    const authResult = JSON.parse(authResultString);
+    params.delete("authResult");
+    params.delete("walletId");
+    params.delete("authProvider");
+    window.history.pushState(
+      {},
+      "",
+      `${window.location.pathname}?${params.toString()}`,
+    );
+    return { walletId, authResult, authProvider };
+  }
+  return {};
+}

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

@@ -1,8 +1,10 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import type { SocialAuthOption } from "../../../../wallets/types.js";
 import type { Account } from "../../../interfaces/wallet.js";
 import {
   type AuthLoginReturnType,
+  type AuthStoredTokenWithCookieReturnType,
   type GetUser,
   type LogoutReturnType,
   type MultiStepAuthArgsType,
@@ -15,7 +17,7 @@ import type { InAppConnector } from "../../core/interfaces/connector.js";
 import type { InAppWalletConstructorType } from "../types.js";
 import { InAppWalletIframeCommunicator } from "../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 import { Auth, type AuthQuerierTypes } from "./auth/iframe-auth.js";
-import { loginWithOauth } from "./auth/oauth.js";
+import { loginWithOauth, loginWithOauthRedirect } from "./auth/oauth.js";
 import { loginWithPasskey, registerPasskey } from "./auth/passkeys.js";
 import { IFrameWallet } from "./in-app-account.js";
 
@@ -151,6 +153,18 @@ export class InAppWebConnector implements InAppConnector {
     }
   }
 
+  authenticateWithRedirect(strategy: SocialAuthOption): void {
+    loginWithOauthRedirect({
+      authOption: strategy,
+      client: this.wallet.client,
+      ecosystem: this.wallet.ecosystem,
+    });
+  }
+
+  async loginWithAuthToken(authResult: AuthStoredTokenWithCookieReturnType) {
+    return this.auth.loginWithAuthToken(authResult);
+  }
+
   async authenticate(
     args: MultiStepAuthArgsType | SingleStepAuthArgsType,
   ): Promise<AuthLoginReturnType> {
@@ -196,14 +210,14 @@ export class InAppWebConnector implements InAppConnector {
             authenticatorType: args.authenticatorType,
             username: args.passkeyName,
           });
-          return this.auth.loginWithAuthToken(authToken);
+          return this.loginWithAuthToken(authToken);
         }
         const authToken = await loginWithPasskey({
           client: this.wallet.client,
           ecosystem: this.wallet.ecosystem,
           authenticatorType: args.authenticatorType,
         });
-        return this.auth.loginWithAuthToken(authToken);
+        return this.loginWithAuthToken(authToken);
       }
       case "apple":
       case "facebook":
@@ -216,7 +230,7 @@ export class InAppWebConnector implements InAppConnector {
           closeOpenedWindow: args.closeOpenedWindow,
           openedWindow: args.openedWindow,
         });
-        return this.auth.loginWithAuthToken(authToken);
+        return this.loginWithAuthToken(authToken);
       }
 
       default:

package/dist/cjs/react/web/wallets/shared/openOauthSignInWindow.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"openOauthSignInWindow.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/openOauthSignInWindow.ts"],"names":[],"mappings":";;AA8CA,sDAqCC;AAlFD,oGAAwG;AAKxG,SAAS,YAAY,CAAC,UAAiC;IACrD,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,2BAA2B,CAAC;QACrC;YACE,OAAO,aAAa,UAAU;iBAC3B,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;iBACX,WAAW,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAiC;IAC1D,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,UAAU;YACb,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACrC;YACE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACvC,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,UAAiC,EACjC,MAAsB,EACtB,SAAqB;IAErB,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,OAAO,CAAC;QACb,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,IAAA,wCAAsB,EAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,QAAQ,EACR,MAAM,EACN,SAAS,GAMV;IACC,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CACrB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAChD,SAAS,EACT,SAAS,KAAK,YAAY,MAAM,SAAS,GAAG,UAAU,IAAI,EAAE,CAC7D,CAAC;IACF,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QACvC,GAAG,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC;QAChD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;QAC7D,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC;IAC7D,CAAC;IAED,sDAAsD;IACtD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,GAAG,EAAE;YAC3C,GAAG,EAAE,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDzB,CAAC"}

package/dist/esm/react/web/wallets/shared/openOauthSignInWindow.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"openOauthSignInWindow.js","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/openOauthSignInWindow.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAC;AAKxG,SAAS,YAAY,CAAC,UAAiC;IACrD,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,2BAA2B,CAAC;QACrC;YACE,OAAO,aAAa,UAAU;iBAC3B,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;iBACX,WAAW,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAiC;IAC1D,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,UAAU;YACb,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACrC;YACE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACvC,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,UAAiC,EACjC,MAAsB,EACtB,SAAqB;IAErB,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,OAAO,CAAC;QACb,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,EACpC,UAAU,EACV,QAAQ,EACR,MAAM,EACN,SAAS,GAMV;IACC,6CAA6C;IAC7C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CACrB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAChD,SAAS,EACT,SAAS,KAAK,YAAY,MAAM,SAAS,GAAG,UAAU,IAAI,EAAE,CAC7D,CAAC;IACF,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QACvC,GAAG,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC;QAChD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;QAC7D,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC;IAC7D,CAAC;IAED,sDAAsD;IACtD,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,GAAG,EAAE;YAC3C,GAAG,EAAE,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDzB,CAAC"}

package/dist/types/react/web/wallets/shared/openOauthSignInWindow.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"openOauthSignInWindow.d.ts","sourceRoot":"","sources":["../../../../../../src/react/web/wallets/shared/openOauthSignInWindow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AAC7F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAsClE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,QAAQ,EACR,MAAM,EACN,SAAS,GACV,EAAE;IACD,UAAU,EAAE,qBAAqB,CAAC;IAClC,QAAQ,EAAE,KAAK,CAAC;IAChB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,iBA2BA"}