@cometh/connect-react-hooks 0.0.12-dev.3 → 0.1.0-dev.1

package/dist/index.js

@@ -9,7 +9,6 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
 
 // src/actions/createSmartAccount.ts
 import {
-  ENTRYPOINT_ADDRESS_V07,
   createComethPaymasterClient,
   createSafeSmartAccount,
   createSmartAccountClient
@@ -21,7 +20,7 @@ async function createSmartAccount(config) {
     paymasterUrl,
     apiKey,
     chain,
-    rpcUrl,
+    publicClient,
     baseUrl,
     comethSignerConfig,
     safeContractConfig,
@@ -30,10 +29,9 @@ async function createSmartAccount(config) {
   const account = await createSafeSmartAccount({
     apiKey,
     chain,
-    rpcUrl,
+    publicClient,
     baseUrl,
     smartAccountAddress,
-    entryPoint: ENTRYPOINT_ADDRESS_V07,
     comethSignerConfig,
     safeContractConfig
   });
@@ -42,27 +40,26 @@ async function createSmartAccount(config) {
     const paymasterClient = await createComethPaymasterClient({
       transport: http(paymasterUrl),
       chain,
-      entryPoint: ENTRYPOINT_ADDRESS_V07,
-      rpcUrl
+      publicClient
     });
     client = createSmartAccountClient({
       account,
-      entryPoint: ENTRYPOINT_ADDRESS_V07,
       chain,
       bundlerTransport: http(bundlerUrl),
-      middleware: {
-        sponsorUserOperation: paymasterClient.sponsorUserOperation,
-        gasPrice: paymasterClient.gasPrice
+      paymaster: paymasterClient,
+      userOperation: {
+        estimateFeesPerGas: async () => {
+          return await paymasterClient.getUserOperationGasPrice();
+        }
       },
-      rpcUrl
+      publicClient
     });
   } else {
     client = createSmartAccountClient({
       account,
-      entryPoint: ENTRYPOINT_ADDRESS_V07,
       chain,
       bundlerTransport: http(bundlerUrl),
-      rpcUrl
+      publicClient
     });
   }
   const address = client.account.address;
@@ -128,7 +125,7 @@ var ConnectProvider = ({
         console.log(e);
       }
     },
-    [config]
+    [config, config.networksConfig[0].chain]
   );
   const disconnectSmartAccount = useCallback(async () => {
     setSmartAccountClient(null);
@@ -230,7 +227,6 @@ var Subscribable = class {
 // ../../node_modules/@tanstack/query-core/build/modern/utils.js
 var isServer = typeof window === "undefined" || "Deno" in globalThis;
 function noop() {
-  return void 0;
 }
 function isValidTimeout(value) {
   return typeof value === "number" && value >= 0 && value !== Infinity;
@@ -322,6 +318,15 @@ function replaceData(prevData, data, options) {
   if (typeof options.structuralSharing === "function") {
     return options.structuralSharing(prevData, data);
   } else if (options.structuralSharing !== false) {
+    if (process.env.NODE_ENV !== "production") {
+      try {
+        return replaceEqualDeep(prevData, data);
+      } catch (error) {
+        console.error(
+          `Structural sharing requires data to be JSON serializable. To fix this, turn off structuralSharing or return JSON-serializable data from your queryFn. [${options.queryHash}]: ${error}`
+        );
+      }
+    }
     return replaceEqualDeep(prevData, data);
   }
   return data;
@@ -448,6 +453,39 @@ var OnlineManager = (_a2 = class extends Subscribable {
 }, _online = new WeakMap(), _cleanup2 = new WeakMap(), _setup2 = new WeakMap(), _a2);
 var onlineManager = new OnlineManager();
 
+// ../../node_modules/@tanstack/query-core/build/modern/thenable.js
+function pendingThenable() {
+  let resolve;
+  let reject;
+  const thenable = new Promise((_resolve, _reject) => {
+    resolve = _resolve;
+    reject = _reject;
+  });
+  thenable.status = "pending";
+  thenable.catch(() => {
+  });
+  function finalize(data) {
+    Object.assign(thenable, data);
+    delete thenable.resolve;
+    delete thenable.reject;
+  }
+  thenable.resolve = (value) => {
+    finalize({
+      status: "fulfilled",
+      value
+    });
+    resolve(value);
+  };
+  thenable.reject = (reason) => {
+    finalize({
+      status: "rejected",
+      reason
+    });
+    reject(reason);
+  };
+  return thenable;
+}
+
 // ../../node_modules/@tanstack/query-core/build/modern/retryer.js
 function canFetch(networkMode) {
   return (networkMode ?? "online") === "online" ? onlineManager.isOnline() : true;
@@ -464,22 +502,6 @@ function createNotifyManager() {
     callback();
   };
   let scheduleFn = (cb) => setTimeout(cb, 0);
-  const setScheduler = (fn) => {
-    scheduleFn = fn;
-  };
-  const batch = (callback) => {
-    let result;
-    transactions++;
-    try {
-      result = callback();
-    } finally {
-      transactions--;
-      if (!transactions) {
-        flush();
-      }
-    }
-    return result;
-  };
   const schedule = (callback) => {
     if (transactions) {
       queue.push(callback);
@@ -489,13 +511,6 @@ function createNotifyManager() {
       });
     }
   };
-  const batchCalls = (callback) => {
-    return (...args) => {
-      schedule(() => {
-        callback(...args);
-      });
-    };
-  };
   const flush = () => {
     const originalQueue = queue;
     queue = [];
@@ -509,19 +524,48 @@ function createNotifyManager() {
       });
     }
   };
-  const setNotifyFunction = (fn) => {
-    notifyFn = fn;
-  };
-  const setBatchNotifyFunction = (fn) => {
-    batchNotifyFn = fn;
-  };
   return {
-    batch,
-    batchCalls,
+    batch: (callback) => {
+      let result;
+      transactions++;
+      try {
+        result = callback();
+      } finally {
+        transactions--;
+        if (!transactions) {
+          flush();
+        }
+      }
+      return result;
+    },
+    /**
+     * All calls to the wrapped function will be batched.
+     */
+    batchCalls: (callback) => {
+      return (...args) => {
+        schedule(() => {
+          callback(...args);
+        });
+      };
+    },
     schedule,
-    setNotifyFunction,
-    setBatchNotifyFunction,
-    setScheduler
+    /**
+     * Use this method to set a custom notify function.
+     * This can be used to for example wrap notifications with `React.act` while running tests.
+     */
+    setNotifyFunction: (fn) => {
+      notifyFn = fn;
+    },
+    /**
+     * Use this method to set a custom function to batch notifications together into a single tick.
+     * By default React Query will use the batch function provided by ReactDOM or React Native.
+     */
+    setBatchNotifyFunction: (fn) => {
+      batchNotifyFn = fn;
+    },
+    setScheduler: (fn) => {
+      scheduleFn = fn;
+    }
   };
 }
 var notifyManager = createNotifyManager();
@@ -555,7 +599,7 @@ function getDefaultState() {
 }
 
 // ../../node_modules/@tanstack/query-core/build/modern/queryObserver.js
-var _client, _currentQuery, _currentQueryInitialState, _currentResult, _currentResultState, _currentResultOptions, _selectError, _selectFn, _selectResult, _lastQueryWithDefinedData, _staleTimeoutId, _refetchIntervalId, _currentRefetchInterval, _trackedProps, _QueryObserver_instances, executeFetch_fn, updateStaleTimeout_fn, computeRefetchInterval_fn, updateRefetchInterval_fn, updateTimers_fn, clearStaleTimeout_fn, clearRefetchInterval_fn, updateQuery_fn, notify_fn, _a3;
+var _client, _currentQuery, _currentQueryInitialState, _currentResult, _currentResultState, _currentResultOptions, _currentThenable, _selectError, _selectFn, _selectResult, _lastQueryWithDefinedData, _staleTimeoutId, _refetchIntervalId, _currentRefetchInterval, _trackedProps, _QueryObserver_instances, executeFetch_fn, updateStaleTimeout_fn, computeRefetchInterval_fn, updateRefetchInterval_fn, updateTimers_fn, clearStaleTimeout_fn, clearRefetchInterval_fn, updateQuery_fn, notify_fn, _a3;
 var QueryObserver = (_a3 = class extends Subscribable {
   constructor(client, options) {
     super();
@@ -566,6 +610,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
     __privateAdd(this, _currentResult);
     __privateAdd(this, _currentResultState);
     __privateAdd(this, _currentResultOptions);
+    __privateAdd(this, _currentThenable);
     __privateAdd(this, _selectError);
     __privateAdd(this, _selectFn);
     __privateAdd(this, _selectResult);
@@ -579,6 +624,12 @@ var QueryObserver = (_a3 = class extends Subscribable {
     this.options = options;
     __privateSet(this, _client, client);
     __privateSet(this, _selectError, null);
+    __privateSet(this, _currentThenable, pendingThenable());
+    if (!this.options.experimental_prefetchInRender) {
+      __privateGet(this, _currentThenable).reject(
+        new Error("experimental_prefetchInRender feature flag is not enabled")
+      );
+    }
     this.bindMethods();
     this.setOptions(options);
   }
@@ -699,7 +750,6 @@ var QueryObserver = (_a3 = class extends Subscribable {
   fetchOptimistic(options) {
     const defaultedOptions = __privateGet(this, _client).defaultQueryOptions(options);
     const query = __privateGet(this, _client).getQueryCache().build(__privateGet(this, _client), defaultedOptions);
-    query.isFetchingOptimistic = true;
     return query.fetch().then(() => this.createResult(query, defaultedOptions));
   }
   fetch(fetchOptions) {
@@ -818,9 +868,42 @@ var QueryObserver = (_a3 = class extends Subscribable {
       isPlaceholderData,
       isRefetchError: isError && hasData,
       isStale: isStale(query, options),
-      refetch: this.refetch
+      refetch: this.refetch,
+      promise: __privateGet(this, _currentThenable)
     };
-    return result;
+    const nextResult = result;
+    if (this.options.experimental_prefetchInRender) {
+      const finalizeThenableIfPossible = (thenable) => {
+        if (nextResult.status === "error") {
+          thenable.reject(nextResult.error);
+        } else if (nextResult.data !== void 0) {
+          thenable.resolve(nextResult.data);
+        }
+      };
+      const recreateThenable = () => {
+        const pending = __privateSet(this, _currentThenable, nextResult.promise = pendingThenable());
+        finalizeThenableIfPossible(pending);
+      };
+      const prevThenable = __privateGet(this, _currentThenable);
+      switch (prevThenable.status) {
+        case "pending":
+          if (query.queryHash === prevQuery.queryHash) {
+            finalizeThenableIfPossible(prevThenable);
+          }
+          break;
+        case "fulfilled":
+          if (nextResult.status === "error" || nextResult.data !== prevThenable.value) {
+            recreateThenable();
+          }
+          break;
+        case "rejected":
+          if (nextResult.status !== "error" || nextResult.error !== prevThenable.reason) {
+            recreateThenable();
+          }
+          break;
+      }
+    }
+    return nextResult;
   }
   updateResult(notifyOptions) {
     const prevResult = __privateGet(this, _currentResult);
@@ -867,7 +950,7 @@ var QueryObserver = (_a3 = class extends Subscribable {
       __privateMethod(this, _QueryObserver_instances, updateTimers_fn).call(this);
     }
   }
-}, _client = new WeakMap(), _currentQuery = new WeakMap(), _currentQueryInitialState = new WeakMap(), _currentResult = new WeakMap(), _currentResultState = new WeakMap(), _currentResultOptions = new WeakMap(), _selectError = new WeakMap(), _selectFn = new WeakMap(), _selectResult = new WeakMap(), _lastQueryWithDefinedData = new WeakMap(), _staleTimeoutId = new WeakMap(), _refetchIntervalId = new WeakMap(), _currentRefetchInterval = new WeakMap(), _trackedProps = new WeakMap(), _QueryObserver_instances = new WeakSet(), executeFetch_fn = function(fetchOptions) {
+}, _client = new WeakMap(), _currentQuery = new WeakMap(), _currentQueryInitialState = new WeakMap(), _currentResult = new WeakMap(), _currentResultState = new WeakMap(), _currentResultOptions = new WeakMap(), _currentThenable = new WeakMap(), _selectError = new WeakMap(), _selectFn = new WeakMap(), _selectResult = new WeakMap(), _lastQueryWithDefinedData = new WeakMap(), _staleTimeoutId = new WeakMap(), _refetchIntervalId = new WeakMap(), _currentRefetchInterval = new WeakMap(), _trackedProps = new WeakMap(), _QueryObserver_instances = new WeakSet(), executeFetch_fn = function(fetchOptions) {
   __privateMethod(this, _QueryObserver_instances, updateQuery_fn).call(this);
   let promise = __privateGet(this, _currentQuery).fetch(
     this.options,
@@ -1123,7 +1206,7 @@ function noop2() {
 
 // ../../node_modules/@tanstack/react-query/build/modern/errorBoundaryUtils.js
 var ensurePreventErrorBoundaryRetry = (options, errorResetBoundary) => {
-  if (options.suspense || options.throwOnError) {
+  if (options.suspense || options.throwOnError || options.experimental_prefetchInRender) {
     if (!errorResetBoundary.isReset()) {
       options.retryOnMount = false;
     }
@@ -1144,13 +1227,16 @@ var getHasError = ({
 };
 
 // ../../node_modules/@tanstack/react-query/build/modern/suspense.js
-var ensureStaleTime = (defaultedOptions) => {
+var ensureSuspenseTimers = (defaultedOptions) => {
+  const originalStaleTime = defaultedOptions.staleTime;
   if (defaultedOptions.suspense) {
-    if (typeof defaultedOptions.staleTime !== "number") {
-      defaultedOptions.staleTime = 1e3;
+    defaultedOptions.staleTime = typeof originalStaleTime === "function" ? (...args) => Math.max(originalStaleTime(...args), 1e3) : Math.max(originalStaleTime ?? 1e3, 1e3);
+    if (typeof defaultedOptions.gcTime === "number") {
+      defaultedOptions.gcTime = Math.max(defaultedOptions.gcTime, 1e3);
     }
   }
 };
+var willFetch = (result, isRestoring) => result.isLoading && result.isFetching && !isRestoring;
 var shouldSuspend = (defaultedOptions, result) => defaultedOptions?.suspense && result.isPending;
 var fetchOptimistic = (defaultedOptions, observer, errorResetBoundary) => observer.fetchOptimistic(defaultedOptions).catch(() => {
   errorResetBoundary.clearReset();
@@ -1174,9 +1260,10 @@ function useBaseQuery(options, Observer, queryClient) {
     defaultedOptions
   );
   defaultedOptions._optimisticResults = isRestoring ? "isRestoring" : "optimistic";
-  ensureStaleTime(defaultedOptions);
+  ensureSuspenseTimers(defaultedOptions);
   ensurePreventErrorBoundaryRetry(defaultedOptions, errorResetBoundary);
   useClearResetErrorBoundary(errorResetBoundary);
+  const isNewCacheEntry = !client.getQueryCache().get(defaultedOptions.queryHash);
   const [observer] = React6.useState(
     () => new Observer(
       client,
@@ -1187,7 +1274,7 @@ function useBaseQuery(options, Observer, queryClient) {
   React6.useSyncExternalStore(
     React6.useCallback(
       (onStoreChange) => {
-        const unsubscribe = isRestoring ? () => void 0 : observer.subscribe(notifyManager.batchCalls(onStoreChange));
+        const unsubscribe = isRestoring ? noop2 : observer.subscribe(notifyManager.batchCalls(onStoreChange));
         observer.updateResult();
         return unsubscribe;
       },
@@ -1215,6 +1302,18 @@ function useBaseQuery(options, Observer, queryClient) {
     defaultedOptions,
     result
   );
+  if (defaultedOptions.experimental_prefetchInRender && !isServer && willFetch(result, isRestoring)) {
+    const promise = isNewCacheEntry ? (
+      // Fetch immediately on render in order to ensure `.promise` is resolved even if the component is unmounted
+      fetchOptimistic(defaultedOptions, observer, errorResetBoundary)
+    ) : (
+      // subscribe to the "cache promise" so that we can finalize the currentThenable once data comes in
+      client.getQueryCache().get(defaultedOptions.queryHash)?.promise
+    );
+    promise?.catch(noop2).finally(() => {
+      observer.updateResult();
+    });
+  }
   return !defaultedOptions.notifyOnChangeProps ? observer.trackResult(result) : result;
 }
 
@@ -1266,12 +1365,12 @@ var useSendTransaction = (mutationProps) => {
         if (!smartAccountClient) {
           throw new Error("No smart account found");
         }
-        const { transactions } = variables;
-        if (!Array.isArray(transactions)) {
-          return smartAccountClient.sendTransaction(transactions);
+        const { calls } = variables;
+        if (!Array.isArray(calls)) {
+          return smartAccountClient.sendTransaction(calls);
         }
-        return smartAccountClient.sendTransactions({
-          transactions
+        return smartAccountClient.sendTransaction({
+          calls
         });
       },
       // Spread any additional mutation options provided
@@ -1328,78 +1427,6 @@ var useWriteContract = (mutationProps) => {
   };
 };
 
-// src/hooks/sessionKeys/useSendTransactionWithSessionKey.ts
-var useSendTransactionWithSessionKey = (mutationProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  const { mutate, mutateAsync, ...result } = useMutation(
-    {
-      mutationFn: (variables) => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        const { transactions } = variables;
-        if (!Array.isArray(transactions)) {
-          return smartAccountClient.sendTransactionWithSessionKey(
-            transactions
-          );
-        }
-        return smartAccountClient.sendTransactionsWithSessionKey({
-          transactions
-        });
-      },
-      ...mutationProps
-    },
-    queryClient
-  );
-  return {
-    data: result.data,
-    error: result.error,
-    isPending: result.isPending,
-    isSuccess: result.isSuccess,
-    isError: result.isError,
-    sendTransaction: mutate,
-    sendTransactionAsync: mutateAsync
-  };
-};
-
-// src/hooks/sessionKeys/useWriteContractWithSessionKey.ts
-import { encodeFunctionData as encodeFunctionData2 } from "viem";
-var useWriteContractWithSessionKey = (mutationProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  const { mutate, mutateAsync, ...result } = useMutation(
-    {
-      mutationFn: async (variables) => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        const { abi, address, functionName, args, value } = variables;
-        const data = encodeFunctionData2({
-          abi,
-          functionName,
-          args
-        });
-        const hash = await smartAccountClient.sendTransactionWithSessionKey({
-          to: address,
-          data,
-          value
-        });
-        return hash;
-      },
-      ...mutationProps
-    },
-    queryClient
-  );
-  return {
-    data: result.data,
-    error: result.error,
-    isPending: result.isPending,
-    isSuccess: result.isSuccess,
-    isError: result.isError,
-    writeContractWithSessionKey: mutate,
-    writeContractWithSessionKeyAsync: mutateAsync
-  };
-};
-
 // src/hooks/useConnect.ts
 import { useCallback as useCallback4, useContext as useContext6, useState as useState5 } from "react";
 var useConnect = () => {
@@ -1584,161 +1611,6 @@ var useGetEnrichedOwners = (queryProps) => {
   );
 };
 
-// src/hooks/sessionKeys/useSessionKeys.ts
-var useAddSessionKey = (mutationProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  const { mutate, mutateAsync, ...result } = useMutation(
-    {
-      mutationFn: async (params) => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        return await smartAccountClient.addSessionKey(params);
-      },
-      ...mutationProps
-    },
-    queryClient
-  );
-  return {
-    data: result.data,
-    error: result.error,
-    isPending: result.isPending,
-    isSuccess: result.isSuccess,
-    isError: result.isError,
-    addSessionKey: mutate,
-    addSessionKeyAsync: mutateAsync
-  };
-};
-var useRevokeSessionKey = (mutationProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  const { mutate, mutateAsync, ...result } = useMutation(
-    {
-      mutationFn: async ({
-        sessionKey
-      }) => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        return await smartAccountClient.revokeSessionKey({
-          sessionKey
-        });
-      },
-      ...mutationProps
-    },
-    queryClient
-  );
-  return {
-    data: result.data,
-    error: result.error,
-    isPending: result.isPending,
-    isSuccess: result.isSuccess,
-    isError: result.isError,
-    revokeSessionKey: mutate,
-    revokeSessionKeyAsync: mutateAsync
-  };
-};
-var useAddWhitelistDestination = (mutationProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  const { mutate, mutateAsync, ...result } = useMutation(
-    {
-      mutationFn: async ({
-        sessionKey,
-        destination
-      }) => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        return await smartAccountClient.addWhitelistDestination({
-          sessionKey,
-          destination
-        });
-      },
-      ...mutationProps
-    },
-    queryClient
-  );
-  return {
-    data: result.data,
-    error: result.error,
-    isPending: result.isPending,
-    isSuccess: result.isSuccess,
-    isError: result.isError,
-    addWhitelistDestination: mutate,
-    addWhitelistDestinationAsync: mutateAsync
-  };
-};
-var useRemoveWhitelistDestination = (mutationProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  const { mutate, mutateAsync, ...result } = useMutation(
-    {
-      mutationFn: async ({
-        sessionKey,
-        destination
-      }) => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        return await smartAccountClient.removeWhitelistDestination({
-          sessionKey,
-          destination
-        });
-      },
-      ...mutationProps
-    },
-    queryClient
-  );
-  return {
-    data: result.data,
-    error: result.error,
-    isPending: result.isPending,
-    isSuccess: result.isSuccess,
-    isError: result.isError,
-    removeWhitelistDestination: mutate,
-    removeWhitelistDestinationAsync: mutateAsync
-  };
-};
-var useGetSessionFromAddress = (sessionKey, queryProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  return useQuery(
-    {
-      queryKey: ["getSessionFromAddress", sessionKey],
-      queryFn: async () => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        return await smartAccountClient.getSessionFromAddress({
-          sessionKey
-        });
-      },
-      ...queryProps
-    },
-    queryClient
-  );
-};
-var useIsAddressWhitelistDestination = (sessionKey, targetAddress, queryProps) => {
-  const { smartAccountClient, queryClient } = useSmartAccount();
-  return useQuery(
-    {
-      queryKey: [
-        "isAddressWhitelistDestination",
-        sessionKey,
-        targetAddress
-      ],
-      queryFn: async () => {
-        if (!smartAccountClient) {
-          throw new Error("No smart account found");
-        }
-        return await smartAccountClient.isAddressWhitelistDestination({
-          sessionKey,
-          targetAddress
-        });
-      },
-      ...queryProps
-    },
-    queryClient
-  );
-};
-
 // src/hooks/owners/useValidateAddDevice.ts
 var useValidateAddDevice = (mutationProps) => {
   const { smartAccountClient, queryClient } = useSmartAccount();
@@ -2091,10 +1963,8 @@ function useSetUpRecovery() {
         }
         return smartAccountClient.setUpRecoveryModule({
           passKeyName: variables.passKeyName,
-          rpcUrl: variables.rpcUrl,
-          webAuthnOptions: variables.webAuthnOptions,
-          // biome-ignore lint/suspicious/noExplicitAny: TODO: remove any
-          middleware: variables.middleware
+          publicClient: variables.publicClient,
+          webAuthnOptions: variables.webAuthnOptions
         });
       }
     },
@@ -2116,7 +1986,7 @@ function useIsRecoveryActive(props = {}) {
   const { smartAccountClient, queryClient } = useSmartAccount();
   return useQuery(
     {
-      queryKey: ["isRecoveryActive", props.rpcUrl],
+      queryKey: ["isRecoveryActive", props.publicClient],
       queryFn: async () => {
         if (!smartAccountClient) {
           throw new Error("No smart account found");
@@ -2134,7 +2004,7 @@ function useGetRecoveryRequest(props = {}, queryOptions) {
   const { smartAccountClient, queryClient } = useSmartAccount();
   const { data, isLoading, isError, error } = useQuery(
     {
-      queryKey: ["getRecoveryRequest", props.rpcUrl],
+      queryKey: ["getRecoveryRequest", props.publicClient],
       queryFn: async () => {
         if (!smartAccountClient) {
           throw new Error("No smart account found");
@@ -2164,9 +2034,7 @@ function useCancelRecoveryRequest() {
           throw new Error("No smart account found");
         }
         return smartAccountClient.cancelRecoveryRequest({
-          rpcUrl: variables.rpcUrl,
-          // biome-ignore lint/suspicious/noExplicitAny: TODO: remove any
-          middleware: variables.middleware
+          publicClient: variables.publicClient
         });
       }
     },
@@ -2267,6 +2135,10 @@ var useSwitchChain = () => {
 };
 
 // src/hooks/useGetTransactionCost.ts
+import { http as http3 } from "viem";
+import {
+  createBundlerClient
+} from "viem/account-abstraction";
 var useGetTransactionCost = (mutationProps) => {
   const { smartAccountClient, queryClient } = useSmartAccount();
   const { mutate, mutateAsync, ...result } = useMutation(
@@ -2275,15 +2147,14 @@ var useGetTransactionCost = (mutationProps) => {
         if (!smartAccountClient) {
           throw new Error("No smart account found");
         }
-        const { transactions } = variables;
-        const userOperation = await smartAccountClient.account.buildUserOperation(
-          transactions
-        );
-        const estimateGas = await smartAccountClient.estimateGas({
-          userOperation
+        const bundlerClient = createBundlerClient({
+          account: smartAccountClient.account,
+          client: smartAccountClient,
+          transport: http3(smartAccountClient.transport.url)
         });
+        const estimateGas = await bundlerClient.estimateUserOperationGas(variables);
         const totalGas = estimateGas.preVerificationGas + estimateGas.verificationGasLimit + estimateGas.callGasLimit;
-        return { totalGasCost: totalGas * estimateGas.maxFeePerGas };
+        return { totalGasCost: totalGas };
       },
       ...mutationProps
     },
@@ -2301,6 +2172,12 @@ var useGetTransactionCost = (mutationProps) => {
 };
 
 // src/hooks/useEstimateGas.ts
+import { http as http4, createPublicClient as createPublicClient2 } from "viem";
+import {
+  createBundlerClient as createBundlerClient2
+} from "viem/account-abstraction";
+import { estimateFeesPerGas } from "viem/actions";
+import { getAction } from "viem/utils";
 var useEstimateGas = (mutationProps) => {
   const { smartAccountClient, queryClient } = useSmartAccount();
   const { mutate, mutateAsync, ...result } = useMutation(
@@ -2309,14 +2186,37 @@ var useEstimateGas = (mutationProps) => {
         if (!smartAccountClient) {
           throw new Error("No smart account found");
         }
-        const { transactions } = variables;
-        const userOperation = await smartAccountClient.account.buildUserOperation(
-          transactions
-        );
-        const estimateGas = await smartAccountClient.estimateGas({
-          userOperation
+        const publicClient = createPublicClient2({
+          chain: smartAccountClient.chain,
+          transport: http4(),
+          cacheTime: 6e4,
+          batch: {
+            multicall: { wait: 50 }
+          }
+        });
+        const maxGasPriceResult = await getAction(
+          publicClient,
+          estimateFeesPerGas,
+          "estimateFeesPerGas"
+        )({
+          chain: smartAccountClient.chain,
+          type: "eip1559"
         });
-        return estimateGas;
+        const bundlerClient = createBundlerClient2({
+          account: smartAccountClient.account,
+          client: smartAccountClient,
+          transport: http4(smartAccountClient.transport.url)
+        });
+        const estimateGas = await bundlerClient.estimateUserOperationGas(variables);
+        return {
+          callGasLimit: estimateGas.callGasLimit,
+          verificationGasLimit: estimateGas.verificationGasLimit,
+          preVerificationGas: estimateGas.preVerificationGas,
+          paymasterVerificationGasLimit: estimateGas.paymasterVerificationGasLimit,
+          paymasterPostOpGasLimit: estimateGas.paymasterPostOpGasLimit,
+          maxFeePerGas: maxGasPriceResult.maxFeePerGas,
+          maxPriorityFeePerGas: maxGasPriceResult.maxPriorityFeePerGas
+        };
       },
       ...mutationProps
     },
@@ -2336,8 +2236,6 @@ export {
   ConnectProvider,
   useAccount,
   useAddOwner,
-  useAddSessionKey,
-  useAddWhitelistDestination,
   useCancelRecoveryRequest,
   useConnect,
   useCreateNewSigner,
@@ -2348,23 +2246,17 @@ export {
   useGetGasPrice,
   useGetOwners,
   useGetRecoveryRequest,
-  useGetSessionFromAddress,
   useGetTransactionCost,
-  useIsAddressWhitelistDestination,
   useIsRecoveryActive,
   useRemoveOwner,
-  useRemoveWhitelistDestination,
   useRetrieveAccountAddressFromPasskeyId,
   useRetrieveAccountAddressFromPasskeys,
-  useRevokeSessionKey,
   useSendTransaction,
-  useSendTransactionWithSessionKey,
   useSerializeUrlWithSignerPayload,
   useSetUpRecovery,
   useSignMessage,
   useSwitchChain,
   useValidateAddDevice,
   useVerifyMessage,
-  useWriteContract,
-  useWriteContractWithSessionKey
+  useWriteContract
 };