thirdweb 5.98.0 → 5.98.2

package/src/wallets/connection/autoConnectCore.ts

@@ -8,6 +8,7 @@ import type {
   AuthArgsType,
   AuthStoredTokenWithCookieReturnType,
 } from "../in-app/core/authentication/types.js";
+import { isInAppSigner } from "../in-app/core/wallet/is-in-app-signer.js";
 import { getUrlToken } from "../in-app/web/lib/get-url-token.js";
 import type { Wallet } from "../interfaces/wallet.js";
 import {
@@ -82,11 +83,11 @@ const _autoConnectCore = async ({
     getStoredActiveWalletId(storage),
   ]);
 
-  const result = getUrlToken();
+  const urlToken = getUrlToken();
 
   // If an auth cookie is found and this site supports the wallet, we'll set the auth cookie in the client storage
-  const wallet = wallets.find((w) => w.id === result?.walletId);
-  if (result?.authCookie && wallet) {
+  const wallet = wallets.find((w) => w.id === urlToken?.walletId);
+  if (urlToken?.authCookie && wallet) {
     const clientStorage = new ClientScopedStorage({
       storage,
       clientId: props.client.clientId,
@@ -97,17 +98,17 @@ const _autoConnectCore = async ({
           }
         : undefined,
     });
-    await clientStorage.saveAuthCookie(result.authCookie);
+    await clientStorage.saveAuthCookie(urlToken.authCookie);
   }
-  if (result?.walletId) {
-    lastActiveWalletId = result.walletId;
-    lastConnectedWalletIds = lastConnectedWalletIds?.includes(result.walletId)
+  if (urlToken?.walletId) {
+    lastActiveWalletId = urlToken.walletId;
+    lastConnectedWalletIds = lastConnectedWalletIds?.includes(urlToken.walletId)
       ? lastConnectedWalletIds
-      : [result.walletId, ...(lastConnectedWalletIds || [])];
+      : [urlToken.walletId, ...(lastConnectedWalletIds || [])];
   }
 
-  if (result?.authProvider) {
-    await setLastAuthProvider?.(result.authProvider, storage);
+  if (urlToken?.authProvider) {
+    await setLastAuthProvider?.(urlToken.authProvider, storage);
   }
 
   // if no wallets were last connected or we didn't receive an auth token
@@ -132,7 +133,7 @@ const _autoConnectCore = async ({
         wallet: activeWallet,
         client: props.client,
         lastConnectedChain,
-        authResult: result?.authResult,
+        authResult: urlToken?.authResult,
       }),
       {
         ms: timeout,
@@ -183,13 +184,33 @@ const _autoConnectCore = async ({
         wallet,
         client: props.client,
         lastConnectedChain,
-        authResult: result?.authResult,
+        authResult: urlToken?.authResult,
       });
       manager.addConnectedWallet(wallet);
     } catch {
       // no-op
     }
   }
+
+  // Auto-login with SIWE
+  const isIAW =
+    activeWallet &&
+    isInAppSigner({
+      wallet: activeWallet,
+      connectedWallets: activeWallet
+        ? [activeWallet, ...otherWallets]
+        : otherWallets,
+    });
+  if (
+    isIAW &&
+    props.siweAuth?.requiresAuth &&
+    !props.siweAuth?.isLoggedIn &&
+    !props.siweAuth?.isLoggingIn
+  ) {
+    await props.siweAuth?.doLogin().catch((err) => {
+      console.warn("Error signing in with SIWE:", err.message);
+    });
+  }
   manager.isAutoConnecting.setValue(false);
   return autoConnected; // useQuery needs a return value
 };

package/src/wallets/connection/types.ts

@@ -118,4 +118,14 @@ export type AutoConnectProps = {
    * Callback to be called when the connection is timeout-ed
    */
   onTimeout?: () => void;
+
+  /**
+   * @hidden
+   */
+  siweAuth?: {
+    requiresAuth: boolean;
+    doLogin: () => Promise<void>;
+    isLoggedIn: boolean | undefined;
+    isLoggingIn: boolean | undefined;
+  };
 };

package/src/wallets/engine/index.ts

@@ -102,12 +102,13 @@ export function engineAccount(options: EngineAccountOptions): Account {
         // engine wants a hex string here so we serialize it
         data: transaction.data || "0x",
         // value is always required
-        value: toHex(transaction.value ?? 0n),
+        value: transaction.value ?? 0n,
         // optional authorization list
         authorizationList: transaction.authorizationList,
 
         txOverrides: {
           gas: transaction.gas,
+          value: transaction.value,
         },
       };
 

package/src/wallets/in-app/core/wallet/is-in-app-signer.ts

@@ -0,0 +1,21 @@
+import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
+import type { Wallet } from "../../../interfaces/wallet.js";
+import { isSmartWallet } from "../../../smart/index.js";
+import { isInAppWallet } from "./index.js";
+
+export function isInAppSigner(options: {
+  wallet: Wallet;
+  connectedWallets: Wallet[];
+}) {
+  const isInAppOrEcosystem = (w: Wallet) =>
+    isInAppWallet(w) || isEcosystemWallet(w);
+  const isSmartWalletWithAdmin =
+    isSmartWallet(options.wallet) &&
+    options.connectedWallets.some(
+      (w) =>
+        isInAppOrEcosystem(w) &&
+        w.getAccount()?.address?.toLowerCase() ===
+          options.wallet.getAdminAccount?.()?.address?.toLowerCase(),
+    );
+  return isInAppOrEcosystem(options.wallet) || isSmartWalletWithAdmin;
+}