thirdweb 5.105.17-nightly-84eaded1520ba3f346486bb62e5d998abacc2e93-20250721000428 → 5.105.17

package/src/engine/server-wallet.ts

@@ -181,6 +181,18 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
           chainId,
           type: "ERC4337",
         };
+      case "EOA":
+        return {
+          chainId,
+          from: address,
+          type: "EOA",
+        };
+      case "EIP7702":
+        return {
+          chainId,
+          from: address,
+          type: "EIP7702",
+        };
     }
   };
 
@@ -192,7 +204,7 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
     if (!chainId) {
       return {
         from: address,
-        type: "eoa",
+        type: "EOA",
       };
     }
 
@@ -212,7 +224,6 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
           type: "ERC4337",
         };
       }
-
       case "auto": {
         return {
           chainId,
@@ -220,6 +231,14 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
           type: "auto",
         };
       }
+      case "EIP7702":
+      case "EOA": {
+        return {
+          chainId,
+          from: address,
+          type: "EOA",
+        };
+      }
     }
   };
 
@@ -245,6 +264,7 @@ export function serverWallet(options: ServerWalletOptions): ServerWallet {
       params: transaction.map((t) => ({
         data: t.data,
         to: t.to,
+        gasLimit: t.gas ? Number(t.gas) : undefined,
         value: t.value?.toString(),
       })),
     };

package/src/react/core/hooks/transaction/useSendAndConfirmTransaction.ts

@@ -1,7 +1,7 @@
 import { type UseMutationResult, useMutation } from "@tanstack/react-query";
 import type { GaslessOptions } from "../../../../transaction/actions/gasless/types.js";
 import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
-import type { PreparedTransaction } from "../../../../transaction/prepare-transaction.js";
+import type { SendTransactionOptions } from "../../../../transaction/actions/send-transaction.js";
 import type { TransactionReceipt } from "../../../../transaction/types.js";
 import { useActiveAccount } from "../wallets/useActiveAccount.js";
 
@@ -56,7 +56,11 @@ type SendAndConfirmTransactionConfig = {
  */
 export function useSendAndConfirmTransaction(
   config: SendAndConfirmTransactionConfig = {},
-): UseMutationResult<TransactionReceipt, Error, PreparedTransaction> {
+): UseMutationResult<
+  TransactionReceipt,
+  Error,
+  SendTransactionOptions["transaction"]
+> {
   const account = useActiveAccount();
   const { gasless } = config;
   return useMutation({

package/src/react/core/hooks/transaction/useSendBatchTransaction.ts

@@ -1,7 +1,7 @@
 import { type UseMutationResult, useMutation } from "@tanstack/react-query";
 import { sendBatchTransaction } from "../../../../transaction/actions/send-batch-transaction.js";
+import type { SendTransactionOptions } from "../../../../transaction/actions/send-transaction.js";
 import type { WaitForReceiptOptions } from "../../../../transaction/actions/wait-for-tx-receipt.js";
-import type { PreparedTransaction } from "../../../../transaction/prepare-transaction.js";
 import { useActiveAccount } from "../wallets/useActiveAccount.js";
 
 /**
@@ -20,7 +20,7 @@ import { useActiveAccount } from "../wallets/useActiveAccount.js";
 export function useSendBatchTransaction(): UseMutationResult<
   WaitForReceiptOptions,
   Error,
-  PreparedTransaction[]
+  SendTransactionOptions["transaction"][]
 > {
   const account = useActiveAccount();
   return useMutation({

package/src/react/core/hooks/transaction/useSendTransaction.ts

@@ -9,7 +9,10 @@ import type { BuyWithFiatStatus } from "../../../../pay/buyWithFiat/getStatus.js
 import type { PurchaseData } from "../../../../pay/types.js";
 import type { FiatProvider } from "../../../../pay/utils/commonTypes.js";
 import type { GaslessOptions } from "../../../../transaction/actions/gasless/types.js";
-import { sendTransaction } from "../../../../transaction/actions/send-transaction.js";
+import {
+  type SendTransactionOptions,
+  sendTransaction,
+} from "../../../../transaction/actions/send-transaction.js";
 import type { WaitForReceiptOptions } from "../../../../transaction/actions/wait-for-tx-receipt.js";
 import type { PreparedTransaction } from "../../../../transaction/prepare-transaction.js";
 import { getTransactionGasCost } from "../../../../transaction/utils.js";
@@ -132,7 +135,11 @@ export function useSendTransactionCore(args: {
   gasless?: GaslessOptions;
   wallet: Wallet | undefined;
   switchChain: (chain: Chain) => Promise<void>;
-}): UseMutationResult<WaitForReceiptOptions, Error, PreparedTransaction> {
+}): UseMutationResult<
+  WaitForReceiptOptions,
+  Error,
+  SendTransactionOptions["transaction"]
+> {
   const { showPayModal, gasless, wallet, switchChain } = args;
   let _account = wallet?.getAccount();
 

package/src/react/native/ui/connect/ConnectButton.tsx

@@ -16,7 +16,8 @@ import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.j
 import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import { useActiveWalletConnectionStatus } from "../../../core/hooks/wallets/useActiveWalletConnectionStatus.js";
 import { useConnectionManager } from "../../../core/providers/connection-manager.js";
-import { useAutoConnect } from "../../hooks/wallets/useAutoConnect.js";
+import { getDefaultWallets } from "../../wallets/defaultWallets.js";
+import { AutoConnect } from "../AutoConnect/AutoConnect.js";
 import { ThemedButton } from "../components/button.js";
 import { ThemedSpinner } from "../components/spinner.js";
 import { ThemedText } from "../components/text.js";
@@ -47,11 +48,6 @@ export function ConnectButton(props: ConnectButtonProps) {
   const status = useActiveWalletConnectionStatus();
   const connectionManager = useConnectionManager();
   const siweAuth = useSiweAuth(wallet, account, props.auth);
-  useAutoConnect({
-    ...props,
-    siweAuth: siweAuth,
-  });
-
   const fadeAnim = useRef(new Animated.Value(0)); // For background opacity
   const slideAnim = useRef(new Animated.Value(screenHeight)); // For bottom sheet position
 
@@ -109,6 +105,25 @@ export function ConnectButton(props: ConnectButtonProps) {
   const isConnectedAndNotAuth = isConnected && needsAuth;
   const isConnectedAndAuth = isConnected && !needsAuth;
 
+  const wallets = props.wallets || getDefaultWallets(props);
+
+  const autoConnectComp = props.autoConnect !== false && (
+    <AutoConnect
+      accountAbstraction={props.accountAbstraction}
+      appMetadata={props.appMetadata}
+      chain={props.chain}
+      client={props.client}
+      onConnect={props.onConnect}
+      siweAuth={siweAuth}
+      timeout={
+        typeof props.autoConnect === "boolean"
+          ? undefined
+          : props.autoConnect?.timeout
+      }
+      wallets={wallets}
+    />
+  );
+
   return (
     <View>
       {isConnectedAndAuth ? (
@@ -178,6 +193,7 @@ export function ConnectButton(props: ConnectButtonProps) {
           </Animated.View>
         </KeyboardAvoidingView>
       </Modal>
+      {autoConnectComp}
     </View>
   );
 }

package/src/react/native/ui/connect/ConnectModal.tsx

@@ -14,10 +14,12 @@ import type { ConnectEmbedProps } from "../../../core/hooks/connection/ConnectEm
 import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import { useDisconnect } from "../../../core/hooks/wallets/useDisconnect.js";
+import { useIsAutoConnecting } from "../../../core/hooks/wallets/useIsAutoConnecting.js";
 import { useConnectionManager } from "../../../core/providers/connection-manager.js";
 import { useWalletInfo } from "../../../core/utils/wallet.js";
 import { radius, spacing } from "../../design-system/index.js";
 import { getDefaultWallets } from "../../wallets/defaultWallets.js";
+import { AutoConnect } from "../AutoConnect/AutoConnect.js";
 import { ThemedButton, ThemedButtonWithIcon } from "../components/button.js";
 import { type ContainerType, Header } from "../components/Header.js";
 import { RNImage } from "../components/RNImage.js";
@@ -32,6 +34,7 @@ import { TW_ICON, WALLET_ICON } from "../icons/svgs.js";
 import { ErrorView } from "./ErrorView.js";
 import { AllWalletsList, ExternalWalletsList } from "./ExternalWalletsList.js";
 import { InAppWalletUI, OtpLogin, PasskeyView } from "./InAppWalletUI.js";
+import { LoadingView } from "./LoadingView.js";
 import WalletLoadingThumbnail from "./WalletLoadingThumbnail.js";
 
 export type ModalState =
@@ -74,14 +77,43 @@ export function ConnectEmbed(props: ConnectEmbedProps) {
     ...props,
     connectModal: { ...props },
   } as ConnectButtonProps;
-  return isConnected ? null : (
-    <ConnectModal
-      {...adaptedProps}
-      containerType="embed"
+  const isAutoConnecting = useIsAutoConnecting();
+  const wallets = props.wallets || getDefaultWallets(props);
+
+  const autoConnectComp = props.autoConnect !== false && (
+    <AutoConnect
+      accountAbstraction={props.accountAbstraction}
+      appMetadata={props.appMetadata}
+      chain={props.chain}
+      client={props.client}
+      onConnect={props.onConnect}
       siweAuth={siweAuth}
-      theme={theme}
+      timeout={
+        typeof props.autoConnect === "boolean"
+          ? undefined
+          : props.autoConnect?.timeout
+      }
+      wallets={wallets}
     />
   );
+
+  if (isAutoConnecting) {
+    return <LoadingView theme={theme} />;
+  }
+
+  return isConnected ? (
+    autoConnectComp
+  ) : (
+    <>
+      <ConnectModal
+        {...adaptedProps}
+        containerType="embed"
+        siweAuth={siweAuth}
+        theme={theme}
+      />
+      {autoConnectComp}
+    </>
+  );
 }
 
 export function ConnectModal(

package/src/react/web/ui/Bridge/TransactionPayment.tsx

@@ -361,12 +361,26 @@ export function TransactionPayment({
           fullWidth
           onClick={() => {
             if (transactionDataQuery.data?.tokenInfo) {
+              if (
+                userBalance &&
+                Number(userBalance) <
+                  Number(transactionDataQuery.data.totalCost)
+              ) {
+                // if user has funds, but not enough, we need to fund the wallet with the difference
+                onContinue(
+                  (
+                    Number(transactionDataQuery.data.totalCost) -
+                    Number(userBalance)
+                  ).toString(),
+                  transactionDataQuery.data.tokenInfo,
+                  getAddress(activeAccount.address),
+                );
+                return;
+              }
+
+              // otherwise, use the full transaction cost
               onContinue(
-                Math.max(
-                  0,
-                  Number(transactionDataQuery.data.totalCost) -
-                    Number(userBalance ?? "0"),
-                ).toString(),
+                transactionDataQuery.data.totalCost,
                 transactionDataQuery.data.tokenInfo,
                 getAddress(activeAccount.address),
               );

package/src/transaction/actions/send-batch-transaction.ts

@@ -3,12 +3,12 @@ import type {
   Account,
   SendTransactionOption,
 } from "../../wallets/interfaces/wallet.js";
-import type { PreparedTransaction } from "../prepare-transaction.js";
 import { encode } from "./encode.js";
+import type { SendTransactionOptions } from "./send-transaction.js";
 import type { WaitForReceiptOptions } from "./wait-for-tx-receipt.js";
 
 export type SendBatchTransactionOptions = {
-  transactions: PreparedTransaction[];
+  transactions: SendTransactionOptions["transaction"][];
   account: Account;
 };
 

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.105.17-nightly-84eaded1520ba3f346486bb62e5d998abacc2e93-20250721000428";
+export const version = "5.105.17";