@latticexyz/entrykit 2.2.22-fc522a899c932f53675e624805e97a4eeefca9e8 → 2.2.22

package/dist/tsup/exports/internal.js

@@ -139,8 +139,11 @@ var debug2 = debug.extend("quarry");
 
 // src/quarry/transports/userOpExecutor.ts
 import { setBalance } from "viem/actions";
-function userOpExecutor({ executor }) {
-  return () => {
+function userOpExecutor({
+  executor,
+  fallbackDefaultTransport
+}) {
+  return (opts) => {
     debug2("using a local user op executor", executor.account.address);
     if (executor.chain.id === 31337) {
       debug2("setting executor balance");
@@ -175,7 +178,9 @@ function userOpExecutor({ executor }) {
       if (method === "eth_estimateUserOperationGas") {
         return await estimateUserOperationGas(params);
       }
-      throw new Error(`userOpExecutor: method "${method}" not supported`);
+      debug2(`userOpExecutor: method "${method}" not overridden, falling back to fallback transport`);
+      const { request: fallbackRequest } = fallbackDefaultTransport(opts);
+      return fallbackRequest({ method, params });
     };
     return createTransport({
       key: "userOpExecutor",
@@ -187,20 +192,27 @@ function userOpExecutor({ executor }) {
 }
 
 // src/getBundlerTransport.ts
+import { wiresaw } from "@latticexyz/common/internal";
 function getBundlerTransport(chain) {
+  if ("wiresaw" in chain.rpcUrls) {
+    return wiresaw();
+  }
   const bundlerHttpUrl = chain.rpcUrls.bundler?.http[0];
-  const bundlerTransport = bundlerHttpUrl ? http(bundlerHttpUrl) : chain.id === 31337 ? userOpExecutor({
-    executor: createClient({
-      chain,
-      transport: fallback([webSocket(), http()]),
-      account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
-      pollingInterval: 10
-    }).extend(transactionQueue())
-  }) : null;
-  if (!bundlerTransport) {
-    throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
+  if (bundlerHttpUrl) {
+    return http(bundlerHttpUrl);
   }
-  return bundlerTransport;
+  if (chain.id === 31337) {
+    return userOpExecutor({
+      executor: createClient({
+        chain,
+        transport: fallback([webSocket(), http()]),
+        account: privateKeyToAccount(keccak256(stringToHex("local user op executor"))),
+        pollingInterval: 10
+      }).extend(transactionQueue()),
+      fallbackDefaultTransport: http()
+    });
+  }
+  throw new Error(`Chain ${chain.id} config did not include a bundler RPC URL.`);
 }
 
 // src/EntryKitConfigProvider.tsx
@@ -550,39 +562,13 @@ import { useEffect as useEffect15, useMemo as useMemo4, useRef as useRef5, useSt
 import { twMerge as twMerge18 } from "tailwind-merge";
 
 // src/onboarding/usePrerequisites.ts
-import { useClient as useClient6, useConfig } from "wagmi";
-import { getBalanceQueryOptions as getBalanceQueryOptions2 } from "wagmi/query";
-import { queryOptions as queryOptions6, skipToken as skipToken6, useQuery as useQuery7, useQueryClient } from "@tanstack/react-query";
+import { useClient as useClient7, useConfig as useConfig2 } from "wagmi";
+import { queryOptions as queryOptions7, useQuery as useQuery8, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
 
-// src/getPaymaster.ts
-function getPaymaster(chain) {
-  const contracts = chain.contracts ?? {};
-  if ("quarryPaymaster" in contracts && contracts.quarryPaymaster != null) {
-    if ("address" in contracts.quarryPaymaster) {
-      return {
-        type: "quarry",
-        address: contracts.quarryPaymaster.address,
-        isGasPass: !!chain.rpcUrls.quarryPassIssuer?.http?.[0]
-      };
-    }
-  }
-  if ("paymaster" in contracts && contracts.paymaster != null) {
-    if ("address" in contracts.paymaster) {
-      return {
-        type: "simple",
-        address: contracts.paymaster.address
-      };
-    }
-  }
-}
-
-// src/onboarding/quarry/useAllowance.ts
+// src/onboarding/quarry/useSpender.ts
 import { useClient } from "wagmi";
 import { queryOptions, skipToken, useQuery as useQuery2 } from "@tanstack/react-query";
 
-// src/quarry/getAllowance.ts
-import { numberToHex as numberToHex2 } from "viem";
-
 // src/quarry/common.ts
 import { defineStore } from "@latticexyz/store";
 import { parseAbi } from "viem";
@@ -659,64 +645,36 @@ var paymasterConfig = defineStore({
 });
 var paymasterTables = paymasterConfig.namespaces.root.tables;
 
-// src/quarry/getAllowance.ts
-import { getRecord, getStaticDataLocation } from "@latticexyz/store/internal";
-import { getKeyTuple } from "@latticexyz/protocol-parser/internal";
-import { setStorageAt } from "viem/actions";
-async function getAllowance({ client, userAddress }) {
-  const paymaster = getPaymaster(client.chain);
-  if (paymaster?.type !== "quarry") return null;
-  const record = await getRecord(client, {
-    address: paymaster.address,
-    table: paymasterTables.Allowance,
-    key: { user: userAddress },
-    blockTag: "pending"
-  });
-  return record.allowance;
-}
-async function setAllowanceSlot({ client, userAddress, allowance }) {
-  const paymaster = getPaymaster(client.chain);
-  if (paymaster?.type !== "quarry") return;
-  const slot = getStaticDataLocation(
-    paymasterTables.Allowance.tableId,
-    getKeyTuple(paymasterTables.Allowance, { user: userAddress })
-  );
-  await setStorageAt(
-    client.extend(() => ({ mode: "anvil" })),
-    {
-      address: paymaster.address,
-      index: slot,
-      value: numberToHex2(allowance, { size: 32 })
-    }
-  );
-}
+// src/onboarding/quarry/getSpender.ts
+import { getRecord } from "@latticexyz/store/internal";
 
-// src/onboarding/quarry/useAllowance.ts
-function getAllowanceQueryOptions({
-  client,
-  userAddress
-}) {
-  return queryOptions({
-    queryKey: ["getAllowance", client?.uid, userAddress],
-    queryFn: client && userAddress ? () => getAllowance({ client, userAddress }) : skipToken
-  });
-}
-function useAllowance(userAddress) {
-  const { chainId } = useEntryKitConfig();
-  const client = useClient({ chainId });
-  return useQuery2(getAllowanceQueryOptions({ client, userAddress }));
+// src/getPaymaster.ts
+function getPaymaster(chain) {
+  const contracts = chain.contracts ?? {};
+  if ("quarryPaymaster" in contracts && contracts.quarryPaymaster != null) {
+    if ("address" in contracts.quarryPaymaster) {
+      return {
+        type: "quarry",
+        address: contracts.quarryPaymaster.address,
+        isGasPass: !!chain.rpcUrls.quarryPassIssuer?.http?.[0]
+      };
+    }
+  }
+  if ("paymaster" in contracts && contracts.paymaster != null) {
+    if ("address" in contracts.paymaster) {
+      return {
+        type: "simple",
+        address: contracts.paymaster.address
+      };
+    }
+  }
 }
 
-// src/onboarding/quarry/useSpender.ts
-import { useClient as useClient2 } from "wagmi";
-import { queryOptions as queryOptions2, skipToken as skipToken2, useQuery as useQuery3 } from "@tanstack/react-query";
-
 // src/onboarding/quarry/getSpender.ts
-import { getRecord as getRecord2 } from "@latticexyz/store/internal";
 async function getSpender({ client, userAddress, sessionAddress }) {
   const paymaster = getPaymaster(client.chain);
   if (paymaster?.type !== "quarry") return null;
-  const record = await getRecord2(client, {
+  const record = await getRecord(client, {
     address: paymaster.address,
     table: paymasterTables.Spender,
     key: { spender: sessionAddress },
@@ -731,18 +689,18 @@ function getSpenderQueryOptions({
   userAddress,
   sessionAddress
 }) {
-  return queryOptions2({
+  return queryOptions({
     queryKey: ["getSpender", client?.uid, userAddress, sessionAddress],
-    queryFn: client && userAddress && sessionAddress ? () => getSpender({ client, userAddress, sessionAddress }) : skipToken2
+    queryFn: client && userAddress && sessionAddress ? () => getSpender({ client, userAddress, sessionAddress }) : skipToken
   });
 }
 
 // src/onboarding/useDelegation.ts
-import { useClient as useClient3 } from "wagmi";
-import { queryOptions as queryOptions3, skipToken as skipToken3, useQuery as useQuery4 } from "@tanstack/react-query";
+import { useClient as useClient2 } from "wagmi";
+import { queryOptions as queryOptions2, skipToken as skipToken2, useQuery as useQuery3 } from "@tanstack/react-query";
 
 // src/onboarding/getDelegation.ts
-import { getRecord as getRecord3 } from "@latticexyz/store/internal";
+import { getRecord as getRecord2 } from "@latticexyz/store/internal";
 
 // src/common.ts
 import { resourceToHex } from "@latticexyz/common";
@@ -766,7 +724,7 @@ async function getDelegation({
   // TODO: move everything to latest instead of pending
   blockTag = "pending"
 }) {
-  const record = await getRecord3(client, {
+  const record = await getRecord2(client, {
     address: worldAddress,
     table: worldTables.UserDelegationControl,
     key: { delegator: userAddress, delegatee: sessionAddress },
@@ -782,15 +740,15 @@ function getDelegationQueryOptions({
   userAddress,
   sessionAddress
 }) {
-  return queryOptions3({
+  return queryOptions2({
     queryKey: ["getDelegation", client?.uid, worldAddress, userAddress, sessionAddress],
-    queryFn: client && userAddress && sessionAddress ? () => getDelegation({ client, worldAddress, userAddress, sessionAddress }) : skipToken3
+    queryFn: client && userAddress && sessionAddress ? () => getDelegation({ client, worldAddress, userAddress, sessionAddress }) : skipToken2
   });
 }
 
 // src/useSessionAccount.ts
-import { useClient as useClient4 } from "wagmi";
-import { queryOptions as queryOptions4, skipToken as skipToken4, useQuery as useQuery5 } from "@tanstack/react-query";
+import { useClient as useClient3 } from "wagmi";
+import { queryOptions as queryOptions3, skipToken as skipToken3, useQuery as useQuery4 } from "@tanstack/react-query";
 
 // src/getSessionAccount.ts
 import { toSimpleSmartAccount } from "permissionless/accounts";
@@ -854,15 +812,73 @@ function getSessionAccountQueryOptions({
   client,
   userAddress
 }) {
-  return queryOptions4({
+  return queryOptions3({
     queryKey: ["getSessionAccount", client?.uid, userAddress],
-    queryFn: client && userAddress ? () => getSessionAccount({ client, userAddress }) : skipToken4,
+    queryFn: client && userAddress ? () => getSessionAccount({ client, userAddress }) : skipToken3,
     staleTime: Infinity,
     // TODO: replace with function to retry only connection errors
     retry: false
   });
 }
 
+// src/useFunds.ts
+import { useClient as useClient6, useConfig } from "wagmi";
+import { getBalanceQueryOptions as getBalanceQueryOptions2 } from "wagmi/query";
+import { queryOptions as queryOptions6, useQuery as useQuery7, useQueryClient } from "@tanstack/react-query";
+
+// src/onboarding/quarry/useAllowance.ts
+import { useClient as useClient4 } from "wagmi";
+import { queryOptions as queryOptions4, skipToken as skipToken4, useQuery as useQuery5 } from "@tanstack/react-query";
+
+// src/quarry/getAllowance.ts
+import { numberToHex as numberToHex2 } from "viem";
+import { getRecord as getRecord3, getStaticDataLocation } from "@latticexyz/store/internal";
+import { getKeyTuple } from "@latticexyz/protocol-parser/internal";
+import { setStorageAt } from "viem/actions";
+async function getAllowance({ client, userAddress }) {
+  const paymaster = getPaymaster(client.chain);
+  if (paymaster?.type !== "quarry") return null;
+  const record = await getRecord3(client, {
+    address: paymaster.address,
+    table: paymasterTables.Allowance,
+    key: { user: userAddress },
+    blockTag: "pending"
+  });
+  return record.allowance;
+}
+async function setAllowanceSlot({ client, userAddress, allowance }) {
+  const paymaster = getPaymaster(client.chain);
+  if (paymaster?.type !== "quarry") return;
+  const slot = getStaticDataLocation(
+    paymasterTables.Allowance.tableId,
+    getKeyTuple(paymasterTables.Allowance, { user: userAddress })
+  );
+  await setStorageAt(
+    client.extend(() => ({ mode: "anvil" })),
+    {
+      address: paymaster.address,
+      index: slot,
+      value: numberToHex2(allowance, { size: 32 })
+    }
+  );
+}
+
+// src/onboarding/quarry/useAllowance.ts
+function getAllowanceQueryOptions({
+  client,
+  userAddress
+}) {
+  return queryOptions4({
+    queryKey: ["getAllowance", client?.uid, userAddress],
+    queryFn: client && userAddress ? () => getAllowance({ client, userAddress }) : skipToken4
+  });
+}
+function useAllowance(userAddress) {
+  const { chainId } = useEntryKitConfig();
+  const client = useClient4({ chainId });
+  return useQuery5(getAllowanceQueryOptions({ client, userAddress }));
+}
+
 // src/onboarding/quarry/useBalance.ts
 import { useClient as useClient5 } from "wagmi";
 import { queryOptions as queryOptions5, skipToken as skipToken5, useQuery as useQuery6 } from "@tanstack/react-query";
@@ -897,6 +913,43 @@ function useBalance(userAddress) {
   return useQuery6(getBalanceQueryOptions({ client, userAddress }));
 }
 
+// src/useFunds.ts
+function getFundsQueryOptions({
+  queryClient,
+  config,
+  client,
+  userAddress
+}) {
+  return queryOptions6({
+    queryKey: ["getFunds", client?.uid, userAddress],
+    queryFn: async () => {
+      if (!client) throw new Error("Viem client not ready.");
+      if (!userAddress) throw new Error("User not connected.");
+      const {
+        account: { address: sessionAddress }
+      } = await queryClient.fetchQuery(getSessionAccountQueryOptions({ client, userAddress }));
+      const [sessionBalance, paymasterAllowance, paymasterBalance] = await Promise.all([
+        queryClient.fetchQuery(getBalanceQueryOptions2(config, { chainId: client.chain.id, address: sessionAddress })),
+        queryClient.fetchQuery(getAllowanceQueryOptions({ client, userAddress })),
+        queryClient.fetchQuery(getBalanceQueryOptions({ client, userAddress }))
+      ]);
+      return {
+        sessionBalance: sessionBalance?.value ?? null,
+        paymasterAllowance,
+        paymasterBalance
+      };
+    },
+    retry: false
+  });
+}
+function useFunds(userAddress) {
+  const queryClient = useQueryClient();
+  const config = useConfig();
+  const { chainId } = useEntryKitConfig();
+  const client = useClient6({ chainId });
+  return useQuery7(getFundsQueryOptions({ queryClient, config, client, userAddress }), queryClient);
+}
+
 // src/onboarding/usePrerequisites.ts
 function getPrequisitesQueryOptions({
   queryClient,
@@ -905,26 +958,23 @@ function getPrequisitesQueryOptions({
   userAddress,
   worldAddress
 }) {
-  return queryOptions6({
+  return queryOptions7({
     queryKey: ["getPrerequisites", client?.uid, userAddress],
-    queryFn: client && userAddress ? async () => {
-      const paymaster = getPaymaster(client.chain);
+    queryFn: async () => {
+      if (!client) throw new Error("Viem client not ready.");
+      if (!userAddress) throw new Error("User not connected.");
       const {
         account: { address: sessionAddress }
       } = await queryClient.fetchQuery(getSessionAccountQueryOptions({ client, userAddress }));
-      const [sessionBalance, allowance, spender, quarryBalance, hasDelegation] = await Promise.all([
-        !paymaster ? queryClient.fetchQuery(
-          getBalanceQueryOptions2(config, { chainId: client.chain.id, address: sessionAddress })
-        ) : null,
-        paymaster?.type === "quarry" ? queryClient.fetchQuery(getAllowanceQueryOptions({ client, userAddress })) : null,
-        paymaster?.type === "quarry" ? queryClient.fetchQuery(getSpenderQueryOptions({ client, userAddress, sessionAddress })) : null,
-        paymaster?.type === "quarry" ? queryClient.fetchQuery(getBalanceQueryOptions({ client, userAddress })) : null,
+      const [funds, spender, hasDelegation] = await Promise.all([
+        queryClient.fetchQuery(getFundsQueryOptions({ queryClient, config, client, userAddress })),
+        queryClient.fetchQuery(getSpenderQueryOptions({ client, userAddress, sessionAddress })),
         queryClient.fetchQuery(getDelegationQueryOptions({ client, worldAddress, userAddress, sessionAddress }))
       ]);
-      const hasAllowance = allowance == null || allowance > 0n;
+      const hasAllowance = funds.paymasterAllowance == null || funds.paymasterAllowance > 0n;
       const isSpender = spender == null ? true : spender;
-      const hasGasBalance = sessionBalance == null || sessionBalance.value > 0n;
-      const hasQuarryGasBalance = quarryBalance == null || quarryBalance > 0n;
+      const hasGasBalance = funds.sessionBalance == null || funds.sessionBalance > 0n;
+      const hasQuarryGasBalance = funds.paymasterBalance == null || funds.paymasterBalance > 0n;
       return {
         sessionAddress,
         hasAllowance,
@@ -935,16 +985,16 @@ function getPrequisitesQueryOptions({
         // we intentionally don't enforce an allowance/gas balance here
         complete: isSpender && hasDelegation
       };
-    } : skipToken6,
+    },
     retry: false
   });
 }
 function usePrerequisites(userAddress) {
-  const queryClient = useQueryClient();
-  const config = useConfig();
+  const queryClient = useQueryClient2();
+  const config = useConfig2();
   const { chainId, worldAddress } = useEntryKitConfig();
-  const client = useClient6({ chainId });
-  const prereqs = useQuery7(
+  const client = useClient7({ chainId });
+  const prereqs = useQuery8(
     getPrequisitesQueryOptions({
       queryClient,
       config,
@@ -961,10 +1011,10 @@ function usePrerequisites(userAddress) {
 import { useDisconnect } from "wagmi";
 
 // src/useENS.ts
-import { useQuery as useQuery8 } from "@tanstack/react-query";
+import { useQuery as useQuery9 } from "@tanstack/react-query";
 function useENS(address) {
   const normalizedAddress = address?.toLowerCase();
-  return useQuery8({
+  return useQuery9({
     enabled: !!normalizedAddress,
     queryKey: ["ens", normalizedAddress],
     queryFn: async () => {
@@ -1088,7 +1138,7 @@ import { parseEther as parseEther3 } from "viem";
 
 // src/onboarding/quarry/useClaimGasPass.ts
 import { parseEther as parseEther2 } from "viem";
-import { useMutation, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
+import { useMutation, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
 
 // src/quarry/transports/quarryPassIssuer.ts
 import { http as http2 } from "viem";
@@ -1117,11 +1167,11 @@ async function claimGasPass({ chain, userAddress }) {
 }
 
 // src/onboarding/quarry/useClaimGasPass.ts
-import { useClient as useClient7 } from "wagmi";
+import { useClient as useClient8 } from "wagmi";
 function useClaimGasPass() {
-  const queryClient = useQueryClient2();
+  const queryClient = useQueryClient3();
   const { chain } = useEntryKitConfig();
-  const client = useClient7({ chainId: chain.id });
+  const client = useClient8({ chainId: chain.id });
   const mutationKey = ["claimGasPass", chain.id];
   return useMutation({
     retry: 0,
@@ -1135,6 +1185,7 @@ function useClaimGasPass() {
       }
       await Promise.all([
         queryClient.invalidateQueries({ queryKey: ["getAllowance"] }),
+        queryClient.invalidateQueries({ queryKey: ["getFunds"] }),
         queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] })
       ]);
     }
@@ -1241,7 +1292,7 @@ import { useEffect as useEffect7 } from "react";
 
 // src/onboarding/useSetupSession.ts
 import { encodeFunctionData } from "viem";
-import { useMutation as useMutation2, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
+import { useMutation as useMutation2, useQueryClient as useQueryClient4 } from "@tanstack/react-query";
 import { getAction as getAction4 } from "viem/utils";
 import { sendUserOperation as sendUserOperation2, waitForUserOperationReceipt } from "viem/account-abstraction";
 import { waitForTransactionReceipt as waitForTransactionReceipt2 } from "viem/actions";
@@ -1252,7 +1303,7 @@ function defineCall(call) {
 }
 
 // src/onboarding/useSetupSession.ts
-import { useClient as useClient8 } from "wagmi";
+import { useClient as useClient9 } from "wagmi";
 import { resourceToHex as resourceToHex2 } from "@latticexyz/common";
 import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json";
 
@@ -1334,9 +1385,9 @@ async function callWithSignature({
 // src/onboarding/useSetupSession.ts
 import { systemsConfig as worldSystemsConfig } from "@latticexyz/world/mud.config";
 function useSetupSession({ userClient }) {
-  const queryClient = useQueryClient3();
+  const queryClient = useQueryClient4();
   const { chainId, worldAddress } = useEntryKitConfig();
-  const client = useClient8({ chainId });
+  const client = useClient9({ chainId });
   const mutationKey = ["setupSession", client?.chain.id, userClient.account.address];
   return useMutation2({
     retry: 0,
@@ -1443,12 +1494,11 @@ function useSetupSession({ userClient }) {
 }
 
 // src/useSessionClient.ts
-import { useClient as useClient9 } from "wagmi";
+import { useClient as useClient10 } from "wagmi";
 import {
-  queryOptions as queryOptions7,
-  skipToken as skipToken7,
-  useQuery as useQuery9,
-  useQueryClient as useQueryClient4
+  queryOptions as queryOptions8,
+  useQuery as useQuery10,
+  useQueryClient as useQueryClient5
 } from "@tanstack/react-query";
 
 // src/getSessionClient.ts
@@ -1485,7 +1535,7 @@ function createFeeEstimator(client) {
   if (client.chain.id === 31337) {
     return async () => ({ maxFeePerGas: 100000n, maxPriorityFeePerGas: 0n });
   }
-  if ([690, 17069, 17420, 695569].includes(client.chain.id)) {
+  if ([690, 17069, 695569].includes(client.chain.id)) {
     return () => getAction5(client, estimateFeesPerGas, "estimateFeesPerGas")({ chain: client.chain });
   }
 }
@@ -1532,9 +1582,10 @@ function getSessionClientQueryOptions({
   userAddress,
   worldAddress
 }) {
-  return queryOptions7({
+  return queryOptions8({
     queryKey: ["getSessionClient", client?.uid, userAddress, worldAddress],
-    queryFn: userAddress ? async () => {
+    queryFn: async () => {
+      if (!userAddress) throw new Error("User not connected.");
       const { account: sessionAccount, signer: sessionSigner } = await queryClient.fetchQuery(
         getSessionAccountQueryOptions({ client, userAddress })
       );
@@ -1544,17 +1595,17 @@ function getSessionClientQueryOptions({
         userAddress,
         worldAddress
       });
-    } : skipToken7,
+    },
     staleTime: Infinity,
     // TODO: replace with function to retry only connection errors
     retry: false
   });
 }
 function useSessionClient(userAddress) {
-  const queryClient = useQueryClient4();
+  const queryClient = useQueryClient5();
   const { chainId, worldAddress } = useEntryKitConfig();
-  const client = useClient9({ chainId });
-  return useQuery9(
+  const client = useClient10({ chainId });
+  return useQuery10(
     getSessionClientQueryOptions({
       queryClient,
       client,
@@ -1623,7 +1674,7 @@ function Session({ isActive, isExpanded, userClient, registerSpender, registerDe
 // src/onboarding/GasBalance.tsx
 import { useEffect as useEffect9, useState as useState2 } from "react";
 import { parseEther as parseEther4 } from "viem";
-import { useQueryClient as useQueryClient6 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient7 } from "@tanstack/react-query";
 import { useBalance as useBalance2, useWatchBlockNumber } from "wagmi";
 
 // src/data/relayChains.json
@@ -1907,13 +1958,13 @@ var relayChains_default = {
 };
 
 // src/onboarding/useSetBalance.ts
-import { useQueryClient as useQueryClient5, useMutation as useMutation3 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient6, useMutation as useMutation3 } from "@tanstack/react-query";
 import { setBalance as setBalance2 } from "viem/actions";
-import { useClient as useClient10 } from "wagmi";
+import { useClient as useClient11 } from "wagmi";
 function useSetBalance() {
-  const queryClient = useQueryClient5();
+  const queryClient = useQueryClient6();
   const { chainId } = useEntryKitConfig();
-  const client = useClient10({ chainId });
+  const client = useClient11({ chainId });
   return useMutation3({
     retry: 0,
     mutationKey: ["setBalance", chainId],
@@ -1922,6 +1973,7 @@ function useSetBalance() {
       await setBalance2({ ...client, mode: "anvil" }, params);
       await Promise.all([
         queryClient.invalidateQueries({ queryKey: ["balance"] }),
+        queryClient.invalidateQueries({ queryKey: ["getFunds"] }),
         queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] })
       ]);
       return null;
@@ -1991,7 +2043,7 @@ function CheckIcon(props) {
 // src/onboarding/GasBalance.tsx
 import { Fragment, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
 function GasBalance({ isActive, isExpanded, sessionAddress }) {
-  const queryClient = useQueryClient6();
+  const queryClient = useQueryClient7();
   const { chain } = useEntryKitConfig();
   const [copied, setCopied] = useState2(false);
   const balance = useShowQueryError(useBalance2({ chainId: chain.id, address: sessionAddress }));
@@ -2006,6 +2058,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
   };
   useEffect9(() => {
     if (balance.data != null && prevBalance?.value === 0n && balance.data.value > 0n) {
+      queryClient.invalidateQueries({ queryKey: ["getFunds"] });
       queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] });
     }
   }, [balance.data, prevBalance, setBalance3, sessionAddress, queryClient]);
@@ -2079,7 +2132,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
 
 // src/onboarding/quarry/GasBalance.tsx
 import { useEffect as useEffect14 } from "react";
-import { useQueryClient as useQueryClient9 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient10 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/DepositFormContainer.tsx
 import { useState as useState4 } from "react";
@@ -2088,7 +2141,7 @@ import { useChains as useChains4, useChainId } from "wagmi";
 // src/onboarding/deposit/DepositViaTransferForm.tsx
 import { useAccount as useAccount4, useWriteContract, usePrepareTransactionRequest, usePublicClient } from "wagmi";
 import { encodeFunctionData as encodeFunctionData2 } from "viem";
-import { useMutation as useMutation4, useQuery as useQuery12 } from "@tanstack/react-query";
+import { useMutation as useMutation4, useQuery as useQuery13 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/DepositForm.tsx
 import { useEffect as useEffect11, useRef as useRef4 } from "react";
@@ -2216,12 +2269,12 @@ import {
   createClient as createClient2,
   LogLevel
 } from "@reservoir0x/relay-sdk";
-import { useQuery as useQuery10 } from "@tanstack/react-query";
+import { useQuery as useQuery11 } from "@tanstack/react-query";
 function useRelay() {
   const { chain } = useEntryKitConfig();
   const appOrigin = location.host;
   const baseApiUrl = chain.testnet ? TESTNET_RELAY_API : MAINNET_RELAY_API;
-  return useQuery10({
+  return useQuery11({
     queryKey: ["relayChains", baseApiUrl, appOrigin],
     queryFn: async () => {
       debug("fetching relay chains from", baseApiUrl);
@@ -2245,13 +2298,13 @@ function useRelay() {
 // src/onboarding/deposit/useChainBalances.ts
 import { useAccount, useConfig as useWagmiConfig } from "wagmi";
 import { getBalance as getBalance2 } from "wagmi/actions";
-import { useQuery as useQuery11, skipToken as skipToken8 } from "@tanstack/react-query";
+import { useQuery as useQuery12, skipToken as skipToken6 } from "@tanstack/react-query";
 import { isNotNull } from "@latticexyz/common/utils";
 function useChainBalances({ chains }) {
   const { address: userAddress } = useAccount();
   const wagmiConfig = useWagmiConfig();
   const chainIds = chains.map((chain) => chain.id);
-  return useQuery11({
+  return useQuery12({
     queryKey: ["chainBalances", chainIds, userAddress],
     queryFn: userAddress ? async () => {
       const chainBalances = await Promise.allSettled(
@@ -2261,7 +2314,7 @@ function useChainBalances({ chains }) {
         })
       );
       return chainBalances.map((result) => result.status === "fulfilled" ? result.value : null).filter(isNotNull);
-    } : skipToken8,
+    } : skipToken6,
     refetchInterval: 1e3 * 60,
     retry: 1
   });
@@ -2600,7 +2653,7 @@ function DepositViaTransferForm({ amount, setAmount, sourceChain, setSourceChain
   if (!userAddress) {
     throw new Error("User address not found");
   }
-  const { data: gasPrice } = useQuery12({
+  const { data: gasPrice } = useQuery13({
     queryKey: ["gasPrice", sourceChain.id],
     queryFn: async () => {
       if (!publicClient) throw new Error("Public client not available");
@@ -2691,7 +2744,7 @@ function DepositViaTransferForm({ amount, setAmount, sourceChain, setSourceChain
 // src/onboarding/deposit/DepositViaRelayForm.tsx
 import { encodeFunctionData as encodeFunctionData3 } from "viem";
 import { useAccount as useAccount5, useWalletClient } from "wagmi";
-import { useMutation as useMutation5, useQuery as useQuery13 } from "@tanstack/react-query";
+import { useMutation as useMutation5, useQuery as useQuery14 } from "@tanstack/react-query";
 import { jsx as jsx31 } from "react/jsx-runtime";
 var ETH_ADDRESS = "0x0000000000000000000000000000000000000000";
 function DepositViaRelayForm({ amount, setAmount, sourceChain, setSourceChainId }) {
@@ -2702,7 +2755,7 @@ function DepositViaRelayForm({ amount, setAmount, sourceChain, setSourceChainId
   const { addDeposit } = useDeposits();
   const { data: relay } = useRelay();
   const relayClient = relay?.client;
-  const quote = useQuery13({
+  const quote = useQuery14({
     queryKey: ["relayBridgeQuote", sourceChain.id, amount?.toString()],
     queryFn: async () => {
       if (!relayClient) throw new Error("No Relay client found.");
@@ -2812,10 +2865,10 @@ function DepositViaRelayForm({ amount, setAmount, sourceChain, setSourceChainId
 
 // src/onboarding/deposit/Deposits.tsx
 import { useEffect as useEffect13 } from "react";
-import { useQuery as useQuery16, useQueryClient as useQueryClient7 } from "@tanstack/react-query";
+import { useQuery as useQuery17, useQueryClient as useQueryClient8 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/TransferDepositStatus.tsx
-import { useQuery as useQuery14 } from "@tanstack/react-query";
+import { useQuery as useQuery15 } from "@tanstack/react-query";
 
 // src/onboarding/deposit/DepositStatus.tsx
 import { useEffect as useEffect12, useState as useState3 } from "react";
@@ -2898,7 +2951,7 @@ function TransferDepositStatus({
 }) {
   const chains = useChains2();
   const chain = chains.find((chain2) => chain2.id === chainL1Id);
-  const receipt = useQuery14({
+  const receipt = useQuery15({
     queryKey: ["transferDepositStatus", hash],
     queryFn: () => receiptPromise
   });
@@ -2966,7 +3019,7 @@ function TransferDepositStatus({
 }
 
 // src/onboarding/deposit/RelayDepositStatus.tsx
-import { useQuery as useQuery15 } from "@tanstack/react-query";
+import { useQuery as useQuery16 } from "@tanstack/react-query";
 import { useChains as useChains3 } from "wagmi";
 import { Fragment as Fragment5, jsx as jsx35, jsxs as jsxs21 } from "react/jsx-runtime";
 function RelayDepositStatus({
@@ -2981,7 +3034,7 @@ function RelayDepositStatus({
   const chains = useChains3();
   const chainL1 = chains.find((chain) => chain.id === chainL1Id);
   const chainL2 = chains.find((chain) => chain.id === chainL2Id);
-  const deposit = useQuery15({
+  const deposit = useQuery16({
     queryKey: ["relayDepositPromise", chainL1Id, chainL2Id, amount.toString(), start.toISOString()],
     queryFn: () => depositPromise
   });
@@ -3022,15 +3075,15 @@ function RelayDepositStatus({
 }
 
 // src/onboarding/deposit/Deposits.tsx
-import { useAccount as useAccount6, useClient as useClient11 } from "wagmi";
+import { useAccount as useAccount6, useClient as useClient12 } from "wagmi";
 import { jsx as jsx36 } from "react/jsx-runtime";
 function Deposits() {
-  const queryClient = useQueryClient7();
+  const queryClient = useQueryClient8();
   const { chainId } = useEntryKitConfig();
-  const client = useClient11({ chainId });
+  const client = useClient12({ chainId });
   const { address: userAddress } = useAccount6();
   const { deposits, removeDeposit } = useDeposits();
-  const { data: isComplete } = useQuery16({
+  const { data: isComplete } = useQuery17({
     queryKey: ["depositsComplete", deposits.map((deposit) => deposit.uid)],
     queryFn: async () => {
       if (!deposits.length) return false;
@@ -3104,18 +3157,18 @@ function ArrowLeftIcon(props) {
 // src/onboarding/quarry/WithdrawGasBalanceButton.tsx
 import { getAction as getAction6 } from "viem/utils";
 import { waitForTransactionReceipt as waitForTransactionReceipt3 } from "viem/actions";
-import { useAccount as useAccount7, useClient as useClient12, useSwitchChain as useSwitchChain3, useWriteContract as useWriteContract2 } from "wagmi";
+import { useAccount as useAccount7, useClient as useClient13, useSwitchChain as useSwitchChain3, useWriteContract as useWriteContract2 } from "wagmi";
 import { twMerge as twMerge17 } from "tailwind-merge";
 import { useMutation as useMutation6 } from "@tanstack/react-query";
-import { useQueryClient as useQueryClient8 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient9 } from "@tanstack/react-query";
 import { jsx as jsx39, jsxs as jsxs23 } from "react/jsx-runtime";
 function WithdrawGasBalanceButton({ userAddress }) {
   const { writeContractAsync } = useWriteContract2();
   const { switchChain } = useSwitchChain3();
   const { chain, chainId } = useEntryKitConfig();
   const { chainId: userChainId } = useAccount7();
-  const queryClient = useQueryClient8();
-  const client = useClient12({ chainId });
+  const queryClient = useQueryClient9();
+  const client = useClient13({ chainId });
   const paymaster = getPaymaster(chain);
   const balance = useShowQueryError(useBalance(userAddress));
   const shouldSwitchChain = chainId != null && chainId !== userChainId;
@@ -3136,6 +3189,7 @@ function WithdrawGasBalanceButton({ userAddress }) {
         await getAction6(client, waitForTransactionReceipt3, "waitForTransactionReceipt")({ hash });
         await Promise.all([
           queryClient.invalidateQueries({ queryKey: ["balance"] }),
+          queryClient.invalidateQueries({ queryKey: ["getFunds"] }),
           queryClient.invalidateQueries({ queryKey: ["getPrerequisites"] })
         ]);
       } catch (error2) {
@@ -3185,7 +3239,7 @@ function WithdrawGasBalanceButton({ userAddress }) {
 // src/onboarding/quarry/GasBalance.tsx
 import { jsx as jsx40, jsxs as jsxs24 } from "react/jsx-runtime";
 function GasBalance2({ isActive, isExpanded, isFocused, setFocused, userAddress }) {
-  const queryClient = useQueryClient9();
+  const queryClient = useQueryClient10();
   const balance = useShowQueryError(useBalance(userAddress));
   const prevBalance = usePrevious(balance.data || 0n);
   useEffect14(() => {
@@ -3614,7 +3668,7 @@ function AccountButton() {
         "hover:bg-orange-400",
         "active:bg-orange-600"
       ),
-      "aria-busy": accountModalOpen,
+      "aria-busy": accountModalOpen || prereqs.isPending,
       onClick: openAccountModal,
       children: [
         /* @__PURE__ */ jsxs29("span", { className: "pointer-events-none inline-grid place-items-center -ml-3", children: [
@@ -3658,8 +3712,9 @@ function useSessionClientReady() {
   const userAddress = userClient.data?.account.address;
   const prerequisites = usePrerequisites(userAddress);
   const sessionClient = useSessionClient(userAddress);
-  if (!userClient.isSuccess) return { ...userClient, data: void 0 };
-  if (!prerequisites.isSuccess || !prerequisites.data.complete) return { ...prerequisites, data: void 0 };
+  if (!prerequisites.isSuccess || !prerequisites.data.complete) {
+    return { ...prerequisites, data: void 0 };
+  }
   return sessionClient;
 }
 
@@ -4087,9 +4142,11 @@ export {
   EntryKitProvider,
   createWagmiConfig,
   defineConfig,
+  getFundsQueryOptions,
   internal_validateSigner,
   useAccountModal,
   useEntryKitConfig,
+  useFunds,
   useSessionClientReady as useSessionClient
 };
 //# sourceMappingURL=internal.js.map