@latticexyz/entrykit 2.2.23-2ade90f493b15b4dbe56c08e97e4f8e97b716c3f → 2.2.23-65e4592911440a38680d2d5d525deb6242614125

package/dist/tsup/exports/internal.js

@@ -58,10 +58,16 @@ import { privateKeyToAccount } from "viem/accounts";
 // src/quarry/transports/userOpExecutor.ts
 import {
   createTransport,
+  getAbiItem,
   numberToHex,
   parseEther
 } from "viem";
-import { entryPoint07Address as entryPoint07Address2 } from "viem/account-abstraction";
+import {
+  entryPoint06Abi,
+  entryPoint06Address,
+  entryPoint07Address as entryPoint07Address2,
+  entryPoint08Address
+} from "viem/account-abstraction";
 
 // src/quarry/transports/methods/estimateUserOperationGas.ts
 import { formatUserOperationRequest } from "viem/account-abstraction";
@@ -138,7 +144,8 @@ error.log = console.error.bind(console);
 var debug2 = debug.extend("quarry");
 
 // src/quarry/transports/userOpExecutor.ts
-import { setBalance } from "viem/actions";
+import { getLogs, getTransactionReceipt, setBalance } from "viem/actions";
+import { getUserOperationReceipt } from "@latticexyz/common/internal";
 function userOpExecutor({
   executor,
   fallbackDefaultTransport
@@ -172,8 +179,38 @@ function userOpExecutor({
         }
       }
       if (method === "eth_getUserOperationReceipt") {
-        const [hash] = params;
-        return receipts.get(hash) ?? null;
+        const [userOpHash] = params;
+        if (receipts.has(userOpHash)) return receipts.get(userOpHash);
+        const event = getAbiItem({
+          abi: entryPoint06Abi,
+          name: "UserOperationEvent"
+        });
+        const log = (await getLogs(executor, {
+          address: [entryPoint06Address, entryPoint07Address2, entryPoint08Address],
+          event,
+          args: { userOpHash }
+        })).at(0);
+        if (!log) return null;
+        const hash = log.transactionHash;
+        const receipt = await getTransactionReceipt(executor, { hash });
+        const userOpReceipt = getUserOperationReceipt(userOpHash, {
+          ...receipt,
+          blobGasPrice: receipt.blobGasPrice ? numberToHex(receipt.blobGasPrice) : void 0,
+          blobGasUsed: receipt.blobGasUsed ? numberToHex(receipt.blobGasUsed) : void 0,
+          blockNumber: numberToHex(receipt.blockNumber),
+          cumulativeGasUsed: numberToHex(receipt.cumulativeGasUsed),
+          effectiveGasPrice: numberToHex(receipt.effectiveGasPrice),
+          gasUsed: numberToHex(receipt.gasUsed),
+          logs: receipt.logs.map((log2) => ({
+            ...log2,
+            blockNumber: numberToHex(log2.blockNumber),
+            logIndex: numberToHex(log2.logIndex),
+            transactionIndex: numberToHex(log2.transactionIndex)
+          })),
+          status: receipt.status,
+          transactionIndex: numberToHex(receipt.transactionIndex)
+        });
+        return userOpReceipt;
       }
       if (method === "eth_estimateUserOperationGas") {
         return await estimateUserOperationGas(params);
@@ -525,37 +562,73 @@ function AppInfo() {
 // src/ConnectWallet.tsx
 import { twMerge as twMerge5 } from "tailwind-merge";
 import { useEffect as useEffect3, useRef as useRef2 } from "react";
-import { jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
+import { useConnect, useConnectors } from "wagmi";
+import { isIdPlaceConnector } from "@latticexyz/id.place/internal";
+import { Fragment, jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
 function ConnectWallet() {
-  const { open, setOpen } = useModal();
-  const hasAutoOpenedRef = useRef2(false);
-  useEffect3(() => {
-    if (!open && !hasAutoOpenedRef.current) {
-      setOpen(true);
-      hasAutoOpenedRef.current = true;
-    }
-  }, [open, setOpen]);
+  const connectors = useConnectors();
+  const porto = connectors.find(isIdPlaceConnector);
   return /* @__PURE__ */ jsxs7(
     "div",
     {
       className: twMerge5("flex flex-col gap-6 p-6", "animate-in animate-duration-300 fade-in slide-in-from-bottom-8"),
       children: [
         /* @__PURE__ */ jsx9("div", { className: "p-4", children: /* @__PURE__ */ jsx9(AppInfo, {}) }),
-        /* @__PURE__ */ jsx9("div", { className: "self-center flex flex-col gap-2 w-60", children: /* @__PURE__ */ jsx9(
-          Button,
-          {
-            variant: "secondary",
-            className: "self-auto flex justify-center",
-            onClick: () => setOpen(true),
-            autoFocus: true,
-            children: "Connect wallet"
-          },
-          "create"
-        ) })
+        /* @__PURE__ */ jsx9("div", { className: "self-center flex flex-col gap-2 w-60", children: porto ? /* @__PURE__ */ jsx9(AccountButton, { connector: porto }) : /* @__PURE__ */ jsx9(WalletButton, {}) })
       ]
     }
   );
 }
+function AccountButton({ connector }) {
+  const { setOpen } = useModal();
+  const { connect, isPending, error: error2 } = useConnect();
+  if (error2) {
+    console.error("connect error", error2);
+  }
+  return /* @__PURE__ */ jsxs7(Fragment, { children: [
+    /* @__PURE__ */ jsx9(
+      Button,
+      {
+        variant: "secondary",
+        className: "self-auto flex justify-center",
+        pending: isPending,
+        onClick: () => connect({ connector }),
+        autoFocus: true,
+        children: "Sign in"
+      },
+      "signin"
+    ),
+    /* @__PURE__ */ jsx9(
+      "button",
+      {
+        className: "text-sm self-center transition text-neutral-500 hover:text-white p-2",
+        onClick: () => setOpen(true),
+        children: "Already have a wallet?"
+      }
+    )
+  ] });
+}
+function WalletButton() {
+  const { open, setOpen } = useModal();
+  const hasAutoOpenedRef = useRef2(false);
+  useEffect3(() => {
+    if (!open && !hasAutoOpenedRef.current) {
+      setOpen(true);
+      hasAutoOpenedRef.current = true;
+    }
+  }, [open, setOpen]);
+  return /* @__PURE__ */ jsx9(Fragment, { children: /* @__PURE__ */ jsx9(
+    Button,
+    {
+      variant: "secondary",
+      className: "self-auto flex justify-center",
+      onClick: () => setOpen(true),
+      autoFocus: true,
+      children: "Connect wallet"
+    },
+    "create"
+  ) });
+}
 
 // src/onboarding/ConnectedSteps.tsx
 import { useEffect as useEffect15, useMemo as useMemo4, useRef as useRef5, useState as useState5 } from "react";
@@ -573,26 +646,35 @@ import { queryOptions, skipToken, useQuery as useQuery2 } from "@tanstack/react-
 import { defineStore } from "@latticexyz/store";
 import { parseAbi } from "viem";
 var paymasterAbi = parseAbi([
+  // AllowanceSystem
+  "error AllowanceSystem_InsufficientAllowance(uint256 allowance, uint256 required)",
+  "error AllowanceSystem_NotAuthorized(address caller, address sponsor, address user)",
+  "error AllowanceSystem_NotFound(address user, address sponsor)",
+  "function removeAllowance(address user, address sponsor)",
+  "function getAllowance(address user) view returns (uint256)",
+  // GrantSystem
+  "error GrantSystem_AllowanceBelowMinimum(uint256 allowance, uint256 min)",
+  "error GrantSystem_AllowancesLimitReached(uint256 length, uint256 max)",
+  "error GrantSystem_InsufficientBalance(uint256 balance, uint256 required)",
+  "function grantAllowance(address user, uint256 allowance) payable",
+  // BalanceSystem
+  "error BalanceSystem_InsufficientBalance(address user, uint256 amount, uint256 balance)",
+  "function depositTo(address to) payable",
+  "function withdrawTo(address to, uint256 amount)",
+  // SpenderSystem
   "error SpenderSystem_AlreadyRegistered(address spender, address user)",
   "error SpenderSystem_HasOwnBalance(address spender)",
-  "error BalanceSystem_BalanceTooHigh(address user, uint256 balance, uint256 max)",
-  "error BalanceSystem_InsufficientBalance(address user, uint256 amount, uint256 balance)",
   "function registerSpender(address spender)",
-  "function depositTo(address to) payable",
-  "function withdrawTo(address to, uint256 amount)"
+  // PaymasterSystem
+  "error PaymasterSystem_InsufficientFunds(address user, uint256 maxCost, uint256 availableAllowance, uint256 availableBalance)",
+  "error PaymasterSystem_OnlyEntryPoint()"
 ]);
 var paymasterConfig = defineStore({
   namespaces: {
     root: {
       namespace: "",
       tables: {
-        Allowance: {
-          schema: {
-            user: "address",
-            allowance: "uint256"
-          },
-          key: ["user"]
-        },
+        // Balance gets deposited and is withdrawable
         Balance: {
           schema: {
             user: "address",
@@ -600,31 +682,26 @@ var paymasterConfig = defineStore({
           },
           key: ["user"]
         },
-        Grantor: {
-          schema: {
-            grantor: "address",
-            allowance: "uint256"
-          },
-          key: ["grantor"]
-        },
-        PassHolder: {
+        // Allowance gets granted and is not withdrawable
+        // Allowance is organized as a linked list and gets spent from smallest to largest
+        Allowance: {
+          name: "AllowanceV2",
           schema: {
             user: "address",
-            passId: "bytes32",
-            lastRenewed: "uint256",
-            lastClaimed: "uint256"
+            sponsor: "address",
+            allowance: "uint256",
+            next: "address",
+            previous: "address"
           },
-          key: ["user", "passId"]
+          key: ["user", "sponsor"]
         },
-        PassConfig: {
+        AllowanceList: {
           schema: {
-            passId: "bytes32",
-            claimAmount: "uint256",
-            claimInterval: "uint256",
-            validityPeriod: "uint256",
-            grantor: "address"
+            user: "address",
+            first: "address",
+            length: "uint256"
           },
-          key: ["passId"]
+          key: ["user"]
         },
         Spender: {
           schema: {
@@ -656,7 +733,7 @@ function getPaymaster(chain) {
       return {
         type: "quarry",
         address: contracts.quarryPaymaster.address,
-        isGasPass: !!chain.rpcUrls.quarryPassIssuer?.http?.[0]
+        canSponsor: !!chain.rpcUrls.quarrySponsor?.http?.[0]
       };
     }
   }
@@ -831,36 +908,21 @@ 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";
+import { readContract } from "viem/actions";
+import { getAction as getAction2 } from "viem/utils";
 async function getAllowance({ client, userAddress }) {
   const paymaster = getPaymaster(client.chain);
   if (paymaster?.type !== "quarry") return null;
-  const record = await getRecord3(client, {
+  return await getAction2(
+    client,
+    readContract,
+    "readContract"
+  )({
     address: paymaster.address,
-    table: paymasterTables.Allowance,
-    key: { user: userAddress },
-    blockTag: "pending"
+    abi: paymasterAbi,
+    functionName: "getAllowance",
+    args: [userAddress]
   });
-  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
@@ -884,11 +946,11 @@ import { useClient as useClient5 } from "wagmi";
 import { queryOptions as queryOptions5, skipToken as skipToken5, useQuery as useQuery6 } from "@tanstack/react-query";
 
 // src/quarry/getBalance.ts
-import { getRecord as getRecord4 } from "@latticexyz/store/internal";
+import { getRecord as getRecord3 } from "@latticexyz/store/internal";
 async function getBalance({ client, userAddress }) {
   const paymaster = getPaymaster(client.chain);
   if (paymaster?.type !== "quarry") return null;
-  const record = await getRecord4(client, {
+  const record = await getRecord3(client, {
     address: paymaster.address,
     table: paymasterTables.Balance,
     key: { user: userAddress },
@@ -1134,55 +1196,42 @@ function Wallet({ isActive, isExpanded, userAddress }) {
 }
 
 // src/onboarding/quarry/Allowance.tsx
-import { parseEther as parseEther3 } from "viem";
-
-// src/onboarding/quarry/useClaimGasPass.ts
 import { parseEther as parseEther2 } from "viem";
+
+// src/onboarding/quarry/useRequestAllowance.ts
 import { useMutation, useQueryClient as useQueryClient3 } from "@tanstack/react-query";
 
-// src/quarry/transports/quarryPassIssuer.ts
+// src/quarry/transports/quarrySponsor.ts
 import { http as http2 } from "viem";
-function quarryPassIssuer() {
+function quarrySponsor() {
   return ({ chain }) => {
-    if (!chain) throw new Error("No chain provided to issuer transport.");
-    const url = "quarryPassIssuer" in chain.rpcUrls ? chain.rpcUrls.quarryPassIssuer.http[0] : void 0;
-    if (!url) throw new Error(`No \`quarryPassIssuer\` RPC URL found for chain ${chain.id}.`);
+    if (!chain) throw new Error("No chain provided to quarrySponsor transport.");
+    const url = "quarrySponsor" in chain.rpcUrls ? chain.rpcUrls.quarrySponsor.http[0] : void 0;
+    if (!url) throw new Error(`No \`quarrySponsor\` RPC URL found for chain ${chain.id}.`);
     return http2(url)({ chain, retryCount: 0 });
   };
 }
 
-// src/quarry/claimGasPass.ts
-async function claimGasPass({ chain, userAddress }) {
-  const transport = quarryPassIssuer()({ chain });
-  debug2("Issuing gas pass to", userAddress);
-  await transport.request({
-    method: "quarry_issuePass",
-    params: ["0x01", userAddress]
-  });
-  debug2("Claiming gas allowance for", userAddress);
+// src/quarry/requestAllowance.ts
+async function requestAllowance({ chain, userAddress }) {
+  const transport = quarrySponsor()({ chain });
+  debug2("Requesting allowance for", userAddress);
   await transport.request({
-    method: "quarry_claimAllowance",
-    params: ["0x01", userAddress]
+    method: "sponsor_requestAllowance",
+    params: [userAddress]
   });
 }
 
-// src/onboarding/quarry/useClaimGasPass.ts
-import { useClient as useClient8 } from "wagmi";
-function useClaimGasPass() {
+// src/onboarding/quarry/useRequestAllowance.ts
+function useRequestAllowance() {
   const queryClient = useQueryClient3();
   const { chain } = useEntryKitConfig();
-  const client = useClient8({ chainId: chain.id });
-  const mutationKey = ["claimGasPass", chain.id];
+  const mutationKey = ["requestAllowance", chain.id];
   return useMutation({
     retry: 0,
     mutationKey,
     mutationFn: async (userAddress) => {
-      if (chain.id === 31337) {
-        if (!client) throw new Error("No client?");
-        await setAllowanceSlot({ client, userAddress, allowance: parseEther2("1") });
-      } else {
-        await claimGasPass({ chain, userAddress });
-      }
+      await requestAllowance({ chain, userAddress });
       await Promise.all([
         queryClient.invalidateQueries({ queryKey: ["getAllowance"] }),
         queryClient.invalidateQueries({ queryKey: ["getFunds"] }),
@@ -1256,15 +1305,15 @@ function useShowQueryError(result) {
 import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 function Allowance({ isActive, isExpanded, userAddress }) {
   const allowance = useShowQueryError(useAllowance(userAddress));
-  const claimGasPass2 = useShowMutationError(useClaimGasPass());
+  const requestAllowance2 = useShowMutationError(useRequestAllowance());
   useEffect6(() => {
     const timer = setTimeout(() => {
-      if (isActive && claimGasPass2.status === "idle" && allowance.isSuccess && allowance.data != null && allowance.data < parseEther3("0.01")) {
-        claimGasPass2.mutate(userAddress);
+      if (isActive && requestAllowance2.status === "idle" && allowance.isSuccess && allowance.data != null && allowance.data < parseEther2("0.01")) {
+        requestAllowance2.mutate(userAddress);
       }
     });
     return () => clearTimeout(timer);
-  }, [allowance.data, allowance.isSuccess, claimGasPass2, isActive, userAddress]);
+  }, [allowance.data, allowance.isSuccess, requestAllowance2, isActive, userAddress]);
   return /* @__PURE__ */ jsxs12("div", { className: "flex flex-col gap-4", children: [
     /* @__PURE__ */ jsxs12("div", { className: "flex justify-between gap-4", children: [
       /* @__PURE__ */ jsxs12("div", { children: [
@@ -1277,8 +1326,8 @@ function Allowance({ isActive, isExpanded, userAddress }) {
           variant: isActive ? "primary" : "tertiary",
           className: "flex-shrink-0 text-sm p-1 w-28",
           autoFocus: isActive || isExpanded,
-          pending: allowance.status === "pending" || claimGasPass2.status === "pending",
-          onClick: () => claimGasPass2.mutate(userAddress),
+          pending: allowance.status === "pending" || requestAllowance2.status === "pending",
+          onClick: () => requestAllowance2.mutate(userAddress),
           children: "Top up"
         }
       )
@@ -1291,11 +1340,11 @@ function Allowance({ isActive, isExpanded, userAddress }) {
 import { useEffect as useEffect7 } from "react";
 
 // src/onboarding/useSetupSession.ts
-import { encodeFunctionData } from "viem";
+import { encodeFunctionData, parseEventLogs as parseEventLogs2, zeroAddress } from "viem";
 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";
+import { getAction as getAction5 } from "viem/utils";
+import { entryPoint07Abi as entryPoint07Abi2, sendUserOperation as sendUserOperation2, waitForUserOperationReceipt } from "viem/account-abstraction";
+import { sendCalls, waitForTransactionReceipt as waitForTransactionReceipt2 } from "viem/actions";
 
 // src/utils/defineCall.ts
 function defineCall(call) {
@@ -1303,23 +1352,23 @@ function defineCall(call) {
 }
 
 // src/onboarding/useSetupSession.ts
-import { useClient as useClient9 } from "wagmi";
+import { useClient as useClient8 } from "wagmi";
 import { resourceToHex as resourceToHex2 } from "@latticexyz/common";
 import IBaseWorldAbi from "@latticexyz/world/out/IBaseWorld.sol/IBaseWorld.abi.json";
 
 // src/utils/callWithSignature.ts
 import { parseErc6492Signature } from "viem";
 import { writeContract as viem_writeContract } from "viem/actions";
-import { getAction as getAction3 } from "viem/utils";
+import { getAction as getAction4 } from "viem/utils";
 
 // src/utils/signCall.ts
 import { toHex } from "viem";
 import { signTypedData } from "viem/actions";
 import { callWithSignatureTypes } from "@latticexyz/world-module-callwithsignature/internal";
-import { getRecord as getRecord5 } from "@latticexyz/store/internal";
+import { getRecord as getRecord4 } from "@latticexyz/store/internal";
 import moduleConfig from "@latticexyz/world-module-callwithsignature/mud.config";
 import { hexToResource } from "@latticexyz/common";
-import { getAction as getAction2 } from "viem/utils";
+import { getAction as getAction3 } from "viem/utils";
 async function signCall({
   userClient,
   worldAddress,
@@ -1328,14 +1377,14 @@ async function signCall({
   nonce: initialNonce,
   client
 }) {
-  const nonce = initialNonce ?? (client ? (await getRecord5(client, {
+  const nonce = initialNonce ?? (client ? (await getRecord4(client, {
     address: worldAddress,
     table: moduleConfig.tables.CallWithSignatureNonces,
     key: { signer: userClient.account.address },
     blockTag: "pending"
   })).nonce : 0n);
   const { namespace: systemNamespace, name: systemName } = hexToResource(systemId);
-  return await getAction2(
+  return await getAction3(
     userClient,
     signTypedData,
     "signTypedData"
@@ -1370,7 +1419,7 @@ async function callWithSignature({
       "ERC-6492 signatures, like from Coinbase Smart Wallet, are not yet supported. Try using a different wallet?"
     );
   }
-  return getAction3(
+  return getAction4(
     sessionClient,
     viem_writeContract,
     "writeContract"
@@ -1384,10 +1433,65 @@ async function callWithSignature({
 
 // src/onboarding/useSetupSession.ts
 import { systemsConfig as worldSystemsConfig } from "@latticexyz/world/mud.config";
-function useSetupSession({ userClient }) {
+
+// src/createBundlerClient.ts
+import {
+  createBundlerClient as viem_createBundlerClient
+} from "viem/account-abstraction";
+
+// src/actions/cachedFeesPerGas.ts
+import { estimateFeesPerGas } from "viem/actions";
+function cachedFeesPerGas(client, options = { refreshInterval: 1e4 }) {
+  let fees = null;
+  async function refreshFees() {
+    fees = await estimateFeesPerGas(client);
+  }
+  refreshFees();
+  setInterval(refreshFees, options.refreshInterval);
+  return async () => {
+    if (fees) return fees;
+    fees = await estimateFeesPerGas(client);
+    return fees;
+  };
+}
+
+// src/createBundlerClient.ts
+function createBundlerClient(config) {
+  const client = config.client;
+  if (!client) throw new Error("No `client` provided to `createBundlerClient`.");
+  const chain = config.chain ?? client.chain;
+  const paymaster = chain ? getPaymaster(chain) : void 0;
+  return viem_createBundlerClient({
+    ...defaultClientConfig,
+    paymaster: paymaster ? {
+      getPaymasterData: async () => ({
+        paymaster: paymaster.address,
+        paymasterData: "0x"
+      })
+    } : void 0,
+    userOperation: {
+      estimateFeesPerGas: createFeeEstimator(client)
+    },
+    ...config
+  });
+}
+function createFeeEstimator(client) {
+  if (!client.chain) return;
+  if (client.chain.id === 31337) {
+    return async () => ({ maxFeePerGas: 100000n, maxPriorityFeePerGas: 0n });
+  }
+  if ([690, 17069, 695569].includes(client.chain.id)) {
+    return cachedFeesPerGas(client);
+  }
+}
+
+// src/onboarding/useSetupSession.ts
+import { isIdPlaceConnector as isIdPlaceConnector2 } from "@latticexyz/id.place/internal";
+import { storeEventsAbi } from "@latticexyz/store";
+function useSetupSession({ connector, userClient }) {
   const queryClient = useQueryClient4();
   const { chainId, worldAddress } = useEntryKitConfig();
-  const client = useClient9({ chainId });
+  const client = useClient8({ chainId });
   const mutationKey = ["setupSession", client?.chain.id, userClient.account.address];
   return useMutation2({
     retry: 0,
@@ -1400,8 +1504,88 @@ function useSetupSession({ userClient }) {
       if (!client) throw new Error("Client not ready.");
       const paymaster = getPaymaster(client.chain);
       const sessionAddress = sessionClient.account.address;
-      console.log("setting up session");
-      if (userClient.account.type === "smart") {
+      console.log("setting up session", userClient);
+      if (isIdPlaceConnector2(connector)) {
+        const calls = [];
+        if (registerSpender && paymaster?.type === "quarry") {
+          console.log("registering spender");
+          calls.push(
+            defineCall({
+              to: paymaster.address,
+              abi: paymasterAbi,
+              functionName: "registerSpender",
+              args: [sessionAddress]
+            })
+          );
+        }
+        if (registerDelegation) {
+          console.log("registering delegation");
+          calls.push(
+            defineCall({
+              to: worldAddress,
+              abi: worldAbi,
+              functionName: "registerDelegation",
+              args: [sessionAddress, unlimitedDelegationControlId, "0x"]
+            })
+          );
+        }
+        if (!calls.length) return;
+        console.log("setting up account with", calls, userClient.account.address, sessionAddress);
+        const { id } = await getAction5(
+          userClient,
+          sendCalls,
+          "sendCalls"
+        )({
+          account: userClient.account,
+          calls
+        });
+        console.log("got send calls ID", id);
+        const bundlerClient = createBundlerClient({
+          transport: getBundlerTransport(client.chain),
+          client
+        });
+        console.log("waiting for receipt");
+        const receipt = await getAction5(
+          bundlerClient,
+          waitForUserOperationReceipt,
+          "waitForUserOperationReceipt"
+        )({ hash: id });
+        console.log("got result", receipt);
+        console.log(
+          "parsed logs",
+          worldAddress,
+          parseEventLogs2({
+            logs: receipt.logs,
+            abi: [
+              ...entryPoint07Abi2,
+              // TODO: export account abi from id package
+              // ...abi,
+              ...worldAbi,
+              ...storeEventsAbi,
+              ...calls.flatMap((call) => call.abi)
+            ]
+          })
+        );
+        await (async () => {
+          console.log("creating session account by sending empty user op");
+          const hash = await getAction5(
+            sessionClient,
+            sendUserOperation2,
+            "sendUserOperation"
+          )({
+            calls: [{ to: zeroAddress }]
+          });
+          const receipt2 = await getAction5(
+            bundlerClient,
+            waitForUserOperationReceipt,
+            "waitForUserOperationReceipt"
+          )({ hash });
+          console.log("got user op receipt", receipt2);
+          if (!receipt2.success) {
+            console.error("not successful?", receipt2);
+          }
+        })();
+      } else if (userClient.account.type === "smart") {
         const calls = [];
         if (registerSpender && paymaster?.type === "quarry") {
           console.log("registering spender");
@@ -1427,9 +1611,9 @@ function useSetupSession({ userClient }) {
         }
         if (!calls.length) return;
         console.log("setting up account with", calls, userClient);
-        const hash = await getAction4(userClient, sendUserOperation2, "sendUserOperation")({ calls });
+        const hash = await getAction5(userClient, sendUserOperation2, "sendUserOperation")({ calls });
         console.log("got user op hash", hash);
-        const receipt = await getAction4(
+        const receipt = await getAction5(
           userClient,
           waitForUserOperationReceipt,
           "waitForUserOperationReceipt"
@@ -1477,7 +1661,7 @@ function useSetupSession({ userClient }) {
         if (!txs.length) return;
         console.log("waiting for", txs.length, "receipts");
         for (const hash of txs) {
-          const receipt = await getAction4(client, waitForTransactionReceipt2, "waitForTransactionReceipt")({ hash });
+          const receipt = await getAction5(client, waitForTransactionReceipt2, "waitForTransactionReceipt")({ hash });
           console.log("got tx receipt", receipt);
           if (receipt.status === "reverted") {
             console.error("tx reverted?", receipt);
@@ -1494,7 +1678,7 @@ function useSetupSession({ userClient }) {
 }
 
 // src/useSessionClient.ts
-import { useClient as useClient10 } from "wagmi";
+import { useClient as useClient9 } from "wagmi";
 import {
   queryOptions as queryOptions8,
   useQuery as useQuery10,
@@ -1504,43 +1688,6 @@ import {
 // src/getSessionClient.ts
 import { smartAccountActions } from "permissionless";
 import { callFrom, sendUserOperationFrom } from "@latticexyz/world/internal";
-
-// src/createBundlerClient.ts
-import {
-  createBundlerClient as viem_createBundlerClient
-} from "viem/account-abstraction";
-import { getAction as getAction5 } from "viem/utils";
-import { estimateFeesPerGas } from "viem/actions";
-function createBundlerClient(config) {
-  const client = config.client;
-  if (!client) throw new Error("No `client` provided to `createBundlerClient`.");
-  const chain = config.chain ?? client.chain;
-  const paymaster = chain ? getPaymaster(chain) : void 0;
-  return viem_createBundlerClient({
-    ...defaultClientConfig,
-    paymaster: paymaster ? {
-      getPaymasterData: async () => ({
-        paymaster: paymaster.address,
-        paymasterData: "0x"
-      })
-    } : void 0,
-    userOperation: {
-      estimateFeesPerGas: createFeeEstimator(client)
-    },
-    ...config
-  });
-}
-function createFeeEstimator(client) {
-  if (!client.chain) return;
-  if (client.chain.id === 31337) {
-    return async () => ({ maxFeePerGas: 100000n, maxPriorityFeePerGas: 0n });
-  }
-  if ([690, 17069, 695569].includes(client.chain.id)) {
-    return () => getAction5(client, estimateFeesPerGas, "estimateFeesPerGas")({ chain: client.chain });
-  }
-}
-
-// src/getSessionClient.ts
 async function getSessionClient({
   userAddress,
   sessionAccount,
@@ -1604,7 +1751,7 @@ function getSessionClientQueryOptions({
 function useSessionClient(userAddress) {
   const queryClient = useQueryClient5();
   const { chainId, worldAddress } = useEntryKitConfig();
-  const client = useClient10({ chainId });
+  const client = useClient9({ chainId });
   return useQuery10(
     getSessionClientQueryOptions({
       queryClient,
@@ -1617,20 +1764,15 @@ function useSessionClient(userAddress) {
 
 // src/onboarding/Session.tsx
 import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
-function Session({ isActive, isExpanded, userClient, registerSpender, registerDelegation }) {
+function Session({ isActive, isExpanded, connector, userClient, registerSpender, registerDelegation }) {
   const sessionClient = useShowQueryError(useSessionClient(userClient.account.address));
-  const setup = useShowMutationError(useSetupSession({ userClient }));
+  const setup = useShowMutationError(useSetupSession({ userClient, connector }));
   const hasSession = !registerDelegation && !registerDelegation;
   const { data: prerequisites } = usePrerequisites(userClient.account.address);
   const { hasAllowance, hasGasBalance, hasQuarryGasBalance } = prerequisites ?? {};
   useEffect7(() => {
     const timer = setTimeout(() => {
       if (isActive && setup.status === "idle" && sessionClient.data && !hasSession && (hasAllowance || hasGasBalance || hasQuarryGasBalance)) {
-        setup.mutate({
-          sessionClient: sessionClient.data,
-          registerSpender,
-          registerDelegation
-        });
       }
     });
     return () => clearTimeout(timer);
@@ -1673,7 +1815,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 { parseEther as parseEther3 } from "viem";
 import { useQueryClient as useQueryClient7 } from "@tanstack/react-query";
 import { useBalance as useBalance2, useWatchBlockNumber } from "wagmi";
 
@@ -1960,11 +2102,11 @@ var relayChains_default = {
 // src/onboarding/useSetBalance.ts
 import { useQueryClient as useQueryClient6, useMutation as useMutation3 } from "@tanstack/react-query";
 import { setBalance as setBalance2 } from "viem/actions";
-import { useClient as useClient11 } from "wagmi";
+import { useClient as useClient10 } from "wagmi";
 function useSetBalance() {
   const queryClient = useQueryClient6();
   const { chainId } = useEntryKitConfig();
-  const client = useClient11({ chainId });
+  const client = useClient10({ chainId });
   return useMutation3({
     retry: 0,
     mutationKey: ["setBalance", chainId],
@@ -2041,7 +2183,7 @@ function CheckIcon(props) {
 }
 
 // src/onboarding/GasBalance.tsx
-import { Fragment, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx19, jsxs as jsxs14 } from "react/jsx-runtime";
 function GasBalance({ isActive, isExpanded, sessionAddress }) {
   const queryClient = useQueryClient7();
   const { chain } = useEntryKitConfig();
@@ -2077,7 +2219,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
           pending: balance.status === "pending" || setBalance3.status === "pending",
           onClick: () => setBalance3.mutate({
             address: sessionAddress,
-            value: parseEther4("0.01") + (balance.data?.value ?? 0n)
+            value: parseEther3("0.01") + (balance.data?.value ?? 0n)
           }),
           children: "Top up"
         }
@@ -2103,7 +2245,7 @@ function GasBalance({ isActive, isExpanded, sessionAddress }) {
         )
       ) : null
     ] }),
-    isExpanded ? /* @__PURE__ */ jsxs14(Fragment, { children: [
+    isExpanded ? /* @__PURE__ */ jsxs14(Fragment2, { children: [
       /* @__PURE__ */ jsx19("p", { className: "text-sm", children: "Your session's gas balance is used to pay for onchain computation." }),
       /* @__PURE__ */ jsxs14("p", { className: "text-sm", children: [
         "Send funds to",
@@ -2321,7 +2463,7 @@ function useChainBalances({ chains }) {
 }
 
 // src/onboarding/deposit/ChainSelect.tsx
-import { Fragment as Fragment2, jsx as jsx25, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx25, jsxs as jsxs15 } from "react/jsx-runtime";
 function ChainSelect({ value, onChange }) {
   const theme = useTheme();
   const { frame } = useFrame();
@@ -2373,7 +2515,7 @@ function ChainSelect({ value, onChange }) {
               className: "w-8"
             }
           ) }),
-          /* @__PURE__ */ jsx25(Select.Icon, { asChild: true, children: /* @__PURE__ */ jsxs15(Fragment2, { children: [
+          /* @__PURE__ */ jsx25(Select.Icon, { asChild: true, children: /* @__PURE__ */ jsxs15(Fragment3, { children: [
             /* @__PURE__ */ jsx25(ChevronDownIcon, { className: "text-sm -mr-1 group-aria-expanded:hidden" }),
             /* @__PURE__ */ jsx25(ChevronUpIcon, { className: "text-sm -mr-1 hidden group-aria-expanded:inline" })
           ] }) })
@@ -2418,7 +2560,7 @@ function ChainSelect({ value, onChange }) {
 }
 
 // src/onboarding/deposit/AmountInput.tsx
-import { formatEther as formatEther3, parseEther as parseEther5 } from "viem";
+import { formatEther as formatEther3, parseEther as parseEther4 } from "viem";
 import { twMerge as twMerge13 } from "tailwind-merge";
 import { forwardRef as forwardRef3 } from "react";
 import { jsx as jsx26, jsxs as jsxs16 } from "react/jsx-runtime";
@@ -2445,7 +2587,7 @@ var AmountInput = forwardRef3(function AmountInput2({ initialAmount, onChange },
             return input.setCustomValidity("Invalid amount.");
           }
           input.setCustomValidity("");
-          onChange(parseEther5(value));
+          onChange(parseEther4(value));
         }
       }
     ),
@@ -2456,7 +2598,7 @@ var AmountInput = forwardRef3(function AmountInput2({ initialAmount, onChange },
 // src/onboarding/deposit/SubmitButton.tsx
 import { useAccount as useAccount2, useBalance as useBalance3, useSwitchChain as useSwitchChain2 } from "wagmi";
 import { twMerge as twMerge14 } from "tailwind-merge";
-import { parseEther as parseEther6 } from "viem";
+import { parseEther as parseEther5 } from "viem";
 import { jsx as jsx27, jsxs as jsxs17 } from "react/jsx-runtime";
 var MAX_DEPOSIT_AMOUNT = "0.1";
 function SubmitButton({ amount, chainId, className, ...buttonProps }) {
@@ -2477,7 +2619,7 @@ function SubmitButton({ amount, chainId, className, ...buttonProps }) {
       }
     );
   } else if (amount) {
-    if (amount > parseEther6(MAX_DEPOSIT_AMOUNT)) {
+    if (amount > parseEther5(MAX_DEPOSIT_AMOUNT)) {
       return /* @__PURE__ */ jsxs17(Button, { type: "button", className: twMerge14("w-full", className), disabled: true, children: [
         "Max amount is ",
         MAX_DEPOSIT_AMOUNT,
@@ -2514,7 +2656,7 @@ function formatGas(wei) {
 }
 
 // src/onboarding/deposit/DepositForm.tsx
-import { Fragment as Fragment3, jsx as jsx29, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx29, jsxs as jsxs18 } from "react/jsx-runtime";
 function DepositForm({
   sourceChain,
   setSourceChainId,
@@ -2579,7 +2721,7 @@ function DepositForm({
               /* @__PURE__ */ jsx29("dt", { children: "Gas balance after deposit" }),
               /* @__PURE__ */ jsx29("dd", { children: /* @__PURE__ */ jsx29(Balance, { wei: (quarryBalance.data ?? 0n) + (amount ?? 0n) }) }),
               /* @__PURE__ */ jsx29("dt", { children: "Estimated fee" }),
-              /* @__PURE__ */ jsx29("dd", { children: estimatedFee.fee ? /* @__PURE__ */ jsxs18(Fragment3, { children: [
+              /* @__PURE__ */ jsx29("dd", { children: estimatedFee.fee ? /* @__PURE__ */ jsxs18(Fragment4, { children: [
                 formatGas(estimatedFee.fee),
                 " gwei"
               ] }) : estimatedFee.error ? /* @__PURE__ */ jsx29("span", { title: String(estimatedFee.error), children: /* @__PURE__ */ jsx29(WarningIcon, { className: "inline-block text-amber-500" }) }) : estimatedFee.isLoading ? /* @__PURE__ */ jsx29(PendingIcon, { className: "inline-block text-xs" }) : null }),
@@ -2939,7 +3081,7 @@ function DepositStatus({ status, progress, children, onDismiss }) {
 
 // src/onboarding/deposit/TransferDepositStatus.tsx
 import { useChains as useChains2 } from "wagmi";
-import { Fragment as Fragment4, jsx as jsx34, jsxs as jsxs20 } from "react/jsx-runtime";
+import { Fragment as Fragment5, jsx as jsx34, jsxs as jsxs20 } from "react/jsx-runtime";
 function TransferDepositStatus({
   amount,
   chainL1Id,
@@ -2967,7 +3109,7 @@ function TransferDepositStatus({
       children: (() => {
         const blockExplorer = chain.blockExplorers?.default.url;
         if (receipt.status === "pending") {
-          return /* @__PURE__ */ jsxs20(Fragment4, { children: [
+          return /* @__PURE__ */ jsxs20(Fragment5, { children: [
             "Confirming deposit on",
             " ",
             /* @__PURE__ */ jsx34(
@@ -2983,7 +3125,7 @@ function TransferDepositStatus({
           ] });
         }
         if (receipt.status === "error") {
-          return /* @__PURE__ */ jsxs20(Fragment4, { children: [
+          return /* @__PURE__ */ jsxs20(Fragment5, { children: [
             "Could not find deposit on",
             " ",
             /* @__PURE__ */ jsx34(
@@ -2998,7 +3140,7 @@ function TransferDepositStatus({
             "."
           ] });
         }
-        return /* @__PURE__ */ jsxs20(Fragment4, { children: [
+        return /* @__PURE__ */ jsxs20(Fragment5, { children: [
           "Successfully",
           " ",
           /* @__PURE__ */ jsx34(
@@ -3021,7 +3163,7 @@ function TransferDepositStatus({
 // src/onboarding/deposit/RelayDepositStatus.tsx
 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";
+import { Fragment as Fragment6, jsx as jsx35, jsxs as jsxs21 } from "react/jsx-runtime";
 function RelayDepositStatus({
   amount,
   chainL1Id,
@@ -3049,20 +3191,20 @@ function RelayDepositStatus({
       onDismiss,
       children: (() => {
         if (deposit.status === "pending") {
-          return /* @__PURE__ */ jsxs21(Fragment5, { children: [
+          return /* @__PURE__ */ jsxs21(Fragment6, { children: [
             "Relay bridge deposit pending on ",
             chainL1.name,
             "\u2026"
           ] });
         }
         if (deposit.status === "error") {
-          return /* @__PURE__ */ jsxs21(Fragment5, { children: [
+          return /* @__PURE__ */ jsxs21(Fragment6, { children: [
             "Relay bridge deposit to ",
             chainL2.name,
             " failed."
           ] });
         }
-        return /* @__PURE__ */ jsxs21(Fragment5, { children: [
+        return /* @__PURE__ */ jsxs21(Fragment6, { children: [
           "Successfully bridged ",
           /* @__PURE__ */ jsx35(Balance, { wei: amount }),
           " to ",
@@ -3075,12 +3217,12 @@ function RelayDepositStatus({
 }
 
 // src/onboarding/deposit/Deposits.tsx
-import { useAccount as useAccount6, useClient as useClient12 } from "wagmi";
+import { useAccount as useAccount6, useClient as useClient11 } from "wagmi";
 import { jsx as jsx36 } from "react/jsx-runtime";
 function Deposits() {
   const queryClient = useQueryClient8();
   const { chainId } = useEntryKitConfig();
-  const client = useClient12({ chainId });
+  const client = useClient11({ chainId });
   const { address: userAddress } = useAccount6();
   const { deposits, removeDeposit } = useDeposits();
   const { data: isComplete } = useQuery17({
@@ -3157,7 +3299,7 @@ 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 useClient13, useSwitchChain as useSwitchChain3, useWriteContract as useWriteContract2 } from "wagmi";
+import { useAccount as useAccount7, useClient as useClient12, 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 useQueryClient9 } from "@tanstack/react-query";
@@ -3168,7 +3310,7 @@ function WithdrawGasBalanceButton({ userAddress }) {
   const { chain, chainId } = useEntryKitConfig();
   const { chainId: userChainId } = useAccount7();
   const queryClient = useQueryClient9();
-  const client = useClient13({ chainId });
+  const client = useClient12({ chainId });
   const paymaster = getPaymaster(chain);
   const balance = useShowQueryError(useBalance(userAddress));
   const shouldSwitchChain = chainId != null && chainId !== userChainId;
@@ -3288,7 +3430,7 @@ function GasBalance2({ isActive, isExpanded, isFocused, setFocused, userAddress
 
 // src/onboarding/ConnectedSteps.tsx
 import { jsx as jsx41 } from "react/jsx-runtime";
-function ConnectedSteps({ userClient, initialUserAddress }) {
+function ConnectedSteps({ connector, userClient, initialUserAddress }) {
   const { chain } = useEntryKitConfig();
   const paymaster = getPaymaster(chain);
   const [focusedId, setFocusedId] = useState5(null);
@@ -3340,7 +3482,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
         });
       }
     } else if (paymaster.type === "quarry") {
-      if (paymaster.isGasPass) {
+      if (paymaster.canSponsor) {
         steps2.push({
           id: "allowance",
           isComplete: !!hasAllowance,
@@ -3357,7 +3499,16 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
     steps2.push({
       id: "session",
       isComplete: !!isSpender && !!hasDelegation,
-      content: (props) => /* @__PURE__ */ jsx41(Session, { ...props, userClient, registerSpender: !isSpender, registerDelegation: !hasDelegation })
+      content: (props) => /* @__PURE__ */ jsx41(
+        Session,
+        {
+          ...props,
+          userClient,
+          connector,
+          registerSpender: !isSpender,
+          registerDelegation: !hasDelegation
+        }
+      )
     });
     return steps2;
   }, [
@@ -3369,7 +3520,8 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
     paymaster,
     sessionAddress,
     userAddress,
-    userClient
+    userClient,
+    connector
   ]);
   const [selectedStepId] = useState5(null);
   const nextStep = steps.find((step) => step.content != null && !step.isComplete);
@@ -3412,13 +3564,20 @@ import { useRef as useRef6 } from "react";
 import { jsx as jsx42 } from "react/jsx-runtime";
 function AccountModalContent() {
   const { chainId } = useEntryKitConfig();
-  const userClient = useConnectorClient({ chainId });
-  const { address: userAddress } = useAccount8();
+  const { address: userAddress, connector } = useAccount8();
+  const userClient = useConnectorClient({ chainId, connector });
   const initialUserAddress = useRef6(userAddress);
   if (userClient.status !== "success") {
     return /* @__PURE__ */ jsx42(ConnectWallet, {});
   }
-  return /* @__PURE__ */ jsx42(ConnectedSteps, { userClient: userClient.data, initialUserAddress: initialUserAddress.current });
+  return /* @__PURE__ */ jsx42(
+    ConnectedSteps,
+    {
+      connector,
+      userClient: userClient.data,
+      initialUserAddress: initialUserAddress.current
+    }
+  );
 }
 
 // src/AccountModal.tsx
@@ -3429,7 +3588,7 @@ import { ErrorBoundary } from "react-error-boundary";
 import { wait } from "@latticexyz/common/utils";
 import { useEffect as useEffect16 } from "react";
 import { twMerge as twMerge19 } from "tailwind-merge";
-import { Fragment as Fragment6, jsx as jsx43, jsxs as jsxs25 } from "react/jsx-runtime";
+import { Fragment as Fragment7, jsx as jsx43, jsxs as jsxs25 } from "react/jsx-runtime";
 function ErrorOverlay({ error: error2, retry, dismiss }) {
   useEffect16(() => {
     if (error2) {
@@ -3455,7 +3614,7 @@ function ErrorOverlay({ error: error2, retry, dismiss }) {
           "transition duration-300",
           error2 ? "translate-y-0 opacity-100 pointer-events-auto" : "-translate-y-4 opacity-0"
         ),
-        children: error2 ? /* @__PURE__ */ jsx43(Fragment6, { children: /* @__PURE__ */ jsxs25("div", { className: "w-full max-h-full bg-blue-700 text-white/80 overflow-auto", children: [
+        children: error2 ? /* @__PURE__ */ jsx43(Fragment7, { children: /* @__PURE__ */ jsxs25("div", { className: "w-full max-h-full bg-blue-700 text-white/80 overflow-auto", children: [
           /* @__PURE__ */ jsxs25("div", { className: "space-y-6 px-8 pt-8", children: [
             /* @__PURE__ */ jsx43("div", { className: "text-white text-lg font-bold", children: "Oops! It broke :(" }),
             /* @__PURE__ */ jsx43("div", { className: "font-mono text-xs whitespace-pre-wrap", children: error2.message.trim() }),
@@ -3584,11 +3743,11 @@ import { twMerge as twMerge22 } from "tailwind-merge";
 
 // src/AccountName.tsx
 import { twMerge as twMerge21 } from "tailwind-merge";
-import { Fragment as Fragment7, jsx as jsx48, jsxs as jsxs28 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx48, jsxs as jsxs28 } from "react/jsx-runtime";
 function AccountName({ address }) {
   const { data: ens } = useENS(address);
   const avatar = usePreloadImage(ens?.avatar);
-  return /* @__PURE__ */ jsxs28(Fragment7, { children: [
+  return /* @__PURE__ */ jsxs28(Fragment8, { children: [
     /* @__PURE__ */ jsxs28("span", { className: "flex-shrink-0 w-6 h-6 -my-1 -mx-0.5 grid place-items-center", children: [
       /* @__PURE__ */ jsx48(
         "img",
@@ -3632,7 +3791,7 @@ var secondaryClassNames = twMerge22(
 var secondaryInteractiveClassNames = twMerge22(
   "cursor-pointer outline-none hover:bg-neutral-200 data-[highlighted]:bg-neutral-200 dark:hover:bg-neutral-700"
 );
-function AccountButton() {
+function AccountButton2() {
   const { openAccountModal, accountModalOpen } = useAccountModal();
   const { status, address: userAddress } = useAccount9();
   const initialUserAddress = useRef7(userAddress);
@@ -3721,6 +3880,8 @@ function useSessionClientReady() {
 // src/createWagmiConfig.ts
 import { createConfig } from "wagmi";
 import { getDefaultConfig } from "connectkit";
+
+// src/getDefaultConnectors.ts
 import { injected, coinbaseWallet, safe } from "wagmi/connectors";
 
 // src/connectors/walletConnect.ts
@@ -3729,7 +3890,7 @@ import {
   SwitchChainError,
   UserRejectedRequestError,
   getAddress,
-  numberToHex as numberToHex3
+  numberToHex as numberToHex2
 } from "viem";
 walletConnect.type = "walletConnect";
 function walletConnect(parameters) {
@@ -3926,7 +4087,7 @@ function walletConnect(parameters) {
           }),
           provider.request({
             method: "wallet_switchEthereumChain",
-            params: [{ chainId: numberToHex3(chainId) }]
+            params: [{ chainId: numberToHex2(chainId) }]
           })
         ]);
         const requestedChains = await this.getRequestedChainsIds();
@@ -3945,7 +4106,7 @@ function walletConnect(parameters) {
           else rpcUrls = [...chain.rpcUrls.default.http];
           const addEthereumChain = {
             blockExplorerUrls,
-            chainId: numberToHex3(chainId),
+            chainId: numberToHex2(chainId),
             chainName: addEthereumChainParameter?.chainName ?? chain.name,
             iconUrls: addEthereumChainParameter?.iconUrls,
             nativeCurrency: addEthereumChainParameter?.nativeCurrency ?? chain.nativeCurrency,
@@ -4056,8 +4217,8 @@ function extractRpcUrls(parameters) {
   return transports.map(({ value }) => value?.url || fallbackUrl);
 }
 
-// src/createWagmiConfig.ts
-function createWagmiConfig(config) {
+// src/getDefaultConnectors.ts
+function getDefaultConnectors(config) {
   const connectors = [];
   const shouldUseSafeConnector = !(typeof window === "undefined") && window?.parent !== window;
   if (shouldUseSafeConnector) {
@@ -4082,6 +4243,12 @@ function createWagmiConfig(config) {
       })
     );
   }
+  return connectors;
+}
+
+// src/createWagmiConfig.ts
+function createWagmiConfig(config) {
+  const connectors = config.connectors ?? getDefaultConnectors(config);
   const configParams = getDefaultConfig({
     chains: config.chains,
     transports: config.transports,
@@ -4094,8 +4261,27 @@ function createWagmiConfig(config) {
   return createConfig(configParams);
 }
 
+// src/utils/withFeeCache.ts
+import { createClient as createClient3, http as http3 } from "viem";
+function withFeeCache(chain, options = { refreshInterval: 1e4 }) {
+  if (chain.fees?.estimateFeesPerGas) {
+    throw new Error("withFeeCache: estimateFeesPerGas already defined in chain config");
+  }
+  const client = createClient3({
+    chain,
+    transport: http3()
+  });
+  return {
+    ...chain,
+    fees: {
+      ...chain.fees,
+      estimateFeesPerGas: cachedFeesPerGas(client, options)
+    }
+  };
+}
+
 // src/validateSigner.ts
-import { readContract } from "viem/actions";
+import { readContract as readContract2 } from "viem/actions";
 async function internal_validateSigner({
   client,
   worldAddress,
@@ -4103,7 +4289,7 @@ async function internal_validateSigner({
   sessionAddress,
   signerAddress
 }) {
-  const ownerAddress = await readContract(client, {
+  const ownerAddress = await readContract2(client, {
     address: sessionAddress,
     abi: simpleAccountAbi,
     functionName: "owner"
@@ -4138,15 +4324,20 @@ var simpleAccountAbi = [
   }
 ];
 export {
-  AccountButton,
+  AccountButton2 as AccountButton,
   EntryKitProvider,
+  createBundlerClient,
   createWagmiConfig,
+  defineCall,
   defineConfig,
+  getBundlerTransport,
+  getDefaultConnectors,
   getFundsQueryOptions,
   internal_validateSigner,
   useAccountModal,
   useEntryKitConfig,
   useFunds,
-  useSessionClientReady as useSessionClient
+  useSessionClientReady as useSessionClient,
+  withFeeCache
 };
 //# sourceMappingURL=internal.js.map