@latticexyz/entrykit 2.2.22-a3645c819959efe97ff2e50f6f5b88ebe77fa980 → 2.2.22-b94aca694dd82b32bf78de9e6408f61b32e5b8e2

package/dist/tsup/exports/internal.js

@@ -548,13 +548,9 @@ function ConnectWallet() {
 import { useEffect as useEffect8, useMemo as useMemo2, useRef as useRef2, useState as useState3 } from "react";
 import { twMerge as twMerge7 } from "tailwind-merge";
 
-// src/onboarding/common.ts
-import { parseEther as parseEther2 } from "viem";
-var minGasBalance = parseEther2("0.01");
-
 // src/onboarding/quarry/useAllowance.ts
 import { useClient } from "wagmi";
-import { queryOptions, useQuery as useQuery2 } from "@tanstack/react-query";
+import { queryOptions, skipToken, useQuery as useQuery2 } from "@tanstack/react-query";
 
 // src/quarry/getAllowance.ts
 import { numberToHex as numberToHex2 } from "viem";
@@ -684,13 +680,10 @@ function getAllowanceQueryOptions({
   client,
   userAddress
 }) {
-  const queryKey = ["getAllowance", client?.uid, userAddress];
-  return queryOptions(
-    client && userAddress ? {
-      queryKey,
-      queryFn: () => getAllowance({ client, userAddress })
-    } : { queryKey, enabled: false }
-  );
+  return queryOptions({
+    queryKey: ["getAllowance", client?.uid, userAddress],
+    queryFn: client && userAddress ? () => getAllowance({ client, userAddress }) : skipToken
+  });
 }
 function useAllowance(userAddress) {
   const { chainId } = useEntryKitConfig();
@@ -700,7 +693,7 @@ function useAllowance(userAddress) {
 
 // src/onboarding/quarry/useSpender.ts
 import { useClient as useClient2 } from "wagmi";
-import { queryOptions as queryOptions2, useQuery as useQuery3 } from "@tanstack/react-query";
+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";
@@ -722,18 +715,15 @@ function getSpenderQueryOptions({
   userAddress,
   sessionAddress
 }) {
-  const queryKey = ["getSpender", client?.uid, userAddress, sessionAddress];
-  return queryOptions2(
-    client && userAddress && sessionAddress ? {
-      queryKey,
-      queryFn: () => getSpender({ client, userAddress, sessionAddress })
-    } : { queryKey, enabled: false }
-  );
+  return queryOptions2({
+    queryKey: ["getSpender", client?.uid, userAddress, sessionAddress],
+    queryFn: client && userAddress && sessionAddress ? () => getSpender({ client, userAddress, sessionAddress }) : skipToken2
+  });
 }
 
 // src/onboarding/useDelegation.ts
 import { useClient as useClient3 } from "wagmi";
-import { queryOptions as queryOptions3, useQuery as useQuery4 } from "@tanstack/react-query";
+import { queryOptions as queryOptions3, skipToken as skipToken3, useQuery as useQuery4 } from "@tanstack/react-query";
 
 // src/onboarding/getDelegation.ts
 import { getRecord as getRecord3 } from "@latticexyz/store/internal";
@@ -776,22 +766,19 @@ function getDelegationQueryOptions({
   userAddress,
   sessionAddress
 }) {
-  const queryKey = ["getDelegation", client?.uid, worldAddress, userAddress, sessionAddress];
-  return queryOptions3(
-    client && userAddress && sessionAddress ? {
-      queryKey,
-      queryFn: () => getDelegation({ client, worldAddress, userAddress, sessionAddress })
-    } : { queryKey, enabled: false }
-  );
+  return queryOptions3({
+    queryKey: ["getDelegation", client?.uid, worldAddress, userAddress, sessionAddress],
+    queryFn: client && userAddress && sessionAddress ? () => getDelegation({ client, worldAddress, userAddress, sessionAddress }) : skipToken3
+  });
 }
 
 // src/onboarding/usePrerequisites.ts
-import { queryOptions as queryOptions5, useQuery as useQuery6, useQueryClient } from "@tanstack/react-query";
+import { queryOptions as queryOptions5, skipToken as skipToken5, useQuery as useQuery6, useQueryClient } from "@tanstack/react-query";
 import { useClient as useClient5, useConfig } from "wagmi";
 
 // src/useSessionAccount.ts
 import { useClient as useClient4 } from "wagmi";
-import { queryOptions as queryOptions4, useQuery as useQuery5 } from "@tanstack/react-query";
+import { queryOptions as queryOptions4, skipToken as skipToken4, useQuery as useQuery5 } from "@tanstack/react-query";
 
 // src/getSessionAccount.ts
 import { toSimpleSmartAccount } from "permissionless/accounts";
@@ -855,16 +842,13 @@ function getSessionAccountQueryOptions({
   client,
   userAddress
 }) {
-  const queryKey = ["getSessionAccount", client?.uid, userAddress];
-  return queryOptions4(
-    client && userAddress ? {
-      queryKey,
-      queryFn: () => getSessionAccount({ client, userAddress }),
-      staleTime: Infinity,
-      // TODO: replace with function to retry only connection errors
-      retry: false
-    } : { queryKey, enabled: false }
-  );
+  return queryOptions4({
+    queryKey: ["getSessionAccount", client?.uid, userAddress],
+    queryFn: client && userAddress ? () => getSessionAccount({ client, userAddress }) : skipToken4,
+    staleTime: Infinity,
+    // TODO: replace with function to retry only connection errors
+    retry: false
+  });
 }
 
 // src/onboarding/usePrerequisites.ts
@@ -876,39 +860,36 @@ function getPrequisitesQueryOptions({
   userAddress,
   worldAddress
 }) {
-  const queryKey = ["getPrerequisites", client?.uid, userAddress];
-  return queryOptions5(
-    client && userAddress ? {
-      queryKey,
-      async queryFn() {
-        const paymaster = getPaymaster(client.chain);
-        const {
-          account: { address: sessionAddress }
-        } = await queryClient.fetchQuery(getSessionAccountQueryOptions({ client, userAddress }));
-        const [sessionBalance, allowance, spender, hasDelegation] = await Promise.all([
-          !paymaster ? queryClient.fetchQuery(
-            getBalanceQueryOptions(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,
-          queryClient.fetchQuery(getDelegationQueryOptions({ client, worldAddress, userAddress, sessionAddress }))
-        ]);
-        const hasAllowance = allowance == null || allowance >= minGasBalance;
-        const isSpender = spender == null ? true : spender;
-        const hasGasBalance = sessionBalance == null || sessionBalance.value >= minGasBalance;
-        return {
-          sessionAddress,
-          hasAllowance,
-          isSpender,
-          hasGasBalance,
-          hasDelegation,
-          // we intentionally don't enforce an allowance/gas balance here
-          complete: isSpender && hasDelegation
-        };
-      },
-      retry: false
-    } : { queryKey, enabled: false }
-  );
+  return queryOptions5({
+    queryKey: ["getPrerequisites", client?.uid, userAddress],
+    queryFn: client && userAddress ? async () => {
+      const paymaster = getPaymaster(client.chain);
+      const {
+        account: { address: sessionAddress }
+      } = await queryClient.fetchQuery(getSessionAccountQueryOptions({ client, userAddress }));
+      const [sessionBalance, allowance, spender, hasDelegation] = await Promise.all([
+        !paymaster ? queryClient.fetchQuery(
+          getBalanceQueryOptions(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,
+        queryClient.fetchQuery(getDelegationQueryOptions({ client, worldAddress, userAddress, sessionAddress }))
+      ]);
+      const hasAllowance = allowance == null || allowance >= 0n;
+      const isSpender = spender == null ? true : spender;
+      const hasGasBalance = sessionBalance == null || sessionBalance.value >= 0n;
+      return {
+        sessionAddress,
+        hasAllowance,
+        isSpender,
+        hasGasBalance,
+        hasDelegation,
+        // we intentionally don't enforce an allowance/gas balance here
+        complete: isSpender && hasDelegation
+      };
+    } : skipToken5,
+    retry: false
+  });
 }
 function usePrerequisites(userAddress) {
   const queryClient = useQueryClient();
@@ -1054,8 +1035,11 @@ function Wallet({ isActive, isExpanded, userAddress }) {
   ] });
 }
 
-// src/onboarding/quarry/useClaimGasPass.ts
+// src/onboarding/quarry/Allowance.tsx
 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";
 
 // src/quarry/transports/quarryPassIssuer.ts
@@ -1097,7 +1081,7 @@ function useClaimGasPass() {
     mutationFn: async (userAddress) => {
       if (chain.id === 31337) {
         if (!client) throw new Error("No client?");
-        await setAllowanceSlot({ client, userAddress, allowance: parseEther3("1") });
+        await setAllowanceSlot({ client, userAddress, allowance: parseEther2("1") });
       } else {
         await claimGasPass({ chain, userAddress });
       }
@@ -1172,7 +1156,7 @@ function Allowance({ isActive, isExpanded, userAddress }) {
   const claimGasPass2 = useShowMutationError(useClaimGasPass());
   useEffect6(() => {
     const timer = setTimeout(() => {
-      if (isActive && claimGasPass2.status === "idle" && allowance.isSuccess && allowance.data != null && allowance.data < minGasBalance) {
+      if (isActive && claimGasPass2.status === "idle" && allowance.isSuccess && allowance.data != null && allowance.data < parseEther3("0.01")) {
         claimGasPass2.mutate(userAddress);
       }
     });
@@ -1403,13 +1387,14 @@ import { useEffect as useEffect7 } from "react";
 import { useClient as useClient8 } from "wagmi";
 import {
   queryOptions as queryOptions6,
+  skipToken as skipToken6,
   useQuery as useQuery8,
   useQueryClient as useQueryClient4
 } from "@tanstack/react-query";
 
 // src/getSessionClient.ts
 import { smartAccountActions } from "permissionless";
-import { callFrom } from "@latticexyz/world/internal";
+import { callFrom, sendUserOperationFrom } from "@latticexyz/world/internal";
 
 // src/createBundlerClient.ts
 import {
@@ -1468,6 +1453,12 @@ async function getSessionClient({
       delegatorAddress: userAddress,
       publicClient: client
     })
+  ).extend(
+    sendUserOperationFrom({
+      worldAddress,
+      delegatorAddress: userAddress,
+      publicClient: client
+    })
   ).extend(() => ({ userAddress, worldAddress, internal_signer: sessionSigner }));
   return sessionClient;
 }
@@ -1482,26 +1473,23 @@ function getSessionClientQueryOptions({
   userAddress,
   worldAddress
 }) {
-  const queryKey = ["getSessionClient", client?.uid, userAddress, worldAddress];
-  return queryOptions6(
-    userAddress ? {
-      queryKey,
-      async queryFn() {
-        const { account: sessionAccount, signer: sessionSigner } = await queryClient.fetchQuery(
-          getSessionAccountQueryOptions({ client, userAddress })
-        );
-        return await getSessionClient({
-          sessionAccount,
-          sessionSigner,
-          userAddress,
-          worldAddress
-        });
-      },
-      staleTime: Infinity,
-      // TODO: replace with function to retry only connection errors
-      retry: false
-    } : { queryKey, enabled: false }
-  );
+  return queryOptions6({
+    queryKey: ["getSessionClient", client?.uid, userAddress, worldAddress],
+    queryFn: userAddress ? async () => {
+      const { account: sessionAccount, signer: sessionSigner } = await queryClient.fetchQuery(
+        getSessionAccountQueryOptions({ client, userAddress })
+      );
+      return await getSessionClient({
+        sessionAccount,
+        sessionSigner,
+        userAddress,
+        worldAddress
+      });
+    } : skipToken6,
+    staleTime: Infinity,
+    // TODO: replace with function to retry only connection errors
+    retry: false
+  });
 }
 function useSessionClient(userAddress) {
   const queryClient = useQueryClient4();
@@ -1562,6 +1550,7 @@ function Session({ isActive, isExpanded, userClient, registerSpender, registerDe
 }
 
 // src/onboarding/GasBalance.tsx
+import { parseEther as parseEther4 } from "viem";
 import { useBalance, useWatchBlockNumber } from "wagmi";
 
 // src/data/relayChains.json
@@ -1890,7 +1879,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
           pending: balance.status === "pending" || setBalance3.status === "pending",
           onClick: () => setBalance3.mutate({
             address: sessionAddress,
-            value: minGasBalance + (balance.data?.value ?? 0n)
+            value: parseEther4("0.01") + (balance.data?.value ?? 0n)
           }),
           children: "Top up"
         }
@@ -1899,7 +1888,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
         /* @__PURE__ */ jsx16(
           "a",
           {
-            href: `${relayChain.bridgeUrl}?${new URLSearchParams({ toAddress: sessionAddress })}`,
+            href: `${relayChain.bridgeUrl}?${new URLSearchParams({ toAddress: sessionAddress, amount: "0.01" })}`,
             target: "_blank",
             rel: "noopener noreferrer",
             children: /* @__PURE__ */ jsx16(