@latticexyz/entrykit 2.2.21-c3d156de242e9e234d4b23b55d6391a258bfc2c4 → 2.2.21-c67535174198d5cace8b7fdafaaff54a580f128a

package/dist/tsup/exports/internal.d.ts

@@ -1,5 +1,5 @@
 import { Address } from 'viem/accounts';
-import { Chain, Client, Transport, Account, Address as Address$1 } from 'viem';
+import { Chain, Client, Transport, Account, Address as Address$1, LocalAccount } from 'viem';
 import { SmartAccount } from 'viem/account-abstraction';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
@@ -68,6 +68,12 @@ declare function defineConfig(input: EntryKitConfigInput): EntryKitConfig;
 type ConnectedClient<chain extends Chain = Chain> = Client<Transport, chain, Account>;
 type SessionClient<chain extends Chain = Chain> = Client<Transport, chain, SmartAccount> & {
     readonly userAddress: Address$1;
+    /**
+     * World address used for delegated calls. Assumes a delegation has been set up between the user account and session account.
+     */
+    readonly worldAddress: Address$1;
+    /** @internal */
+    readonly internal_signer: LocalAccount;
 };
 
 type Props = {
@@ -120,4 +126,15 @@ declare function getWallets(_config: {
     readonly chainId: number;
 }): WalletList;
 
-export { AccountButton, type ConnectedClient, type CreateWagmiConfigOptions, type EntryKitConfig, type EntryKitConfigInput, EntryKitProvider, type SessionClient, createWagmiConfig, defineConfig, getConnectors, getWallets, useAccountModal, useEntryKitConfig, useSessionClientReady as useSessionClient };
+/**
+ * @internal
+ */
+declare function internal_validateSigner({ client, worldAddress, userAddress, sessionAddress, signerAddress, }: {
+    client: Client;
+    worldAddress: Address$1;
+    userAddress: Address$1;
+    sessionAddress: Address$1;
+    signerAddress: Address$1;
+}): Promise<void>;
+
+export { AccountButton, type ConnectedClient, type CreateWagmiConfigOptions, type EntryKitConfig, type EntryKitConfigInput, EntryKitProvider, type SessionClient, createWagmiConfig, defineConfig, getConnectors, getWallets, internal_validateSigner, useAccountModal, useEntryKitConfig, useSessionClientReady as useSessionClient };

package/dist/tsup/exports/internal.js

@@ -8,7 +8,14 @@ function defineConfig(input) {
 }
 
 // src/ui/Modal.tsx
-import { Root as DialogRoot, DialogPortal, DialogContent } from "@radix-ui/react-dialog";
+import { useEffect as useEffect2 } from "react";
+import {
+  Root as DialogRoot,
+  DialogPortal,
+  DialogContent,
+  DialogTitle,
+  DialogDescription
+} from "@radix-ui/react-dialog";
 
 // src/ui/Shadow.tsx
 import { forwardRef, useEffect, useRef, useState } from "react";
@@ -165,7 +172,7 @@ function userOpExecutor({ executor }) {
       if (method === "eth_estimateUserOperationGas") {
         return await estimateUserOperationGas(params);
       }
-      throw new Error("Method not implemented.");
+      throw new Error(`userOpExecutor: method "${method}" not supported`);
     };
     return createTransport({
       key: "userOpExecutor",
@@ -300,6 +307,19 @@ var Shadow = forwardRef(function Shadow2({ mode, children }, forwardedRef) {
 import { twMerge } from "tailwind-merge";
 import { jsx as jsx4, jsxs as jsxs2 } from "react/jsx-runtime";
 function Modal({ open, onOpenChange, children }) {
+  useEffect2(() => {
+    function onKeyDown(event) {
+      if (event.defaultPrevented) return;
+      if (event.key === "Escape" && open) {
+        event.preventDefault();
+        onOpenChange?.(false);
+      }
+    }
+    window.addEventListener("keydown", onKeyDown);
+    return () => {
+      window.removeEventListener("keydown", onKeyDown);
+    };
+  }, [onOpenChange, open]);
   return /* @__PURE__ */ jsx4(DialogRoot, { open, onOpenChange, children: /* @__PURE__ */ jsx4(DialogPortal, { children: /* @__PURE__ */ jsxs2(Shadow, { mode: "modal", children: [
     /* @__PURE__ */ jsx4("div", { className: twMerge("fixed inset-0", "bg-neutral-800/85", "animate-in animate-duration-300 fade-in") }),
     /* @__PURE__ */ jsx4(
@@ -310,17 +330,11 @@ function Modal({ open, onOpenChange, children }) {
           "grid items-end sm:items-center",
           "animate-in animate-duration-300 fade-in slide-in-from-bottom-16"
         ),
-        children: /* @__PURE__ */ jsx4("div", { children: /* @__PURE__ */ jsx4(
-          DialogContent,
-          {
-            className: "outline-none w-full max-w-[26rem] mx-auto",
-            "aria-describedby": void 0,
-            onOpenAutoFocus: (event) => {
-              event.preventDefault();
-            },
-            children
-          }
-        ) })
+        children: /* @__PURE__ */ jsx4("div", { children: /* @__PURE__ */ jsxs2(DialogContent, { className: "outline-none w-full max-w-[26rem] mx-auto", children: [
+          /* @__PURE__ */ jsx4(DialogTitle, { className: "sr-only", children: "EntryKit" }),
+          /* @__PURE__ */ jsx4(DialogDescription, { className: "sr-only", children: "Sign in to this app" }),
+          children
+        ] }) })
       }
     )
   ] }) }) });
@@ -495,13 +509,13 @@ function AppInfo() {
 
 // src/ConnectWallet.tsx
 import { twMerge as twMerge5 } from "tailwind-merge";
-import { useEffect as useEffect2, useState as useState2 } from "react";
+import { useEffect as useEffect3, useState as useState2 } from "react";
 import { jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
 function ConnectWallet() {
   const userAccount = useAccount();
   const { openConnectModal, connectModalOpen } = useConnectModal();
   const [hasAutoOpened, setHasAutoOpened] = useState2(false);
-  useEffect2(() => {
+  useEffect3(() => {
     if (!connectModalOpen && !hasAutoOpened) {
       openConnectModal?.();
       setHasAutoOpened(true);
@@ -531,7 +545,7 @@ function ConnectWallet() {
 }
 
 // src/onboarding/ConnectedSteps.tsx
-import { useEffect as useEffect7, useMemo as useMemo2, useRef as useRef2, useState as useState3 } from "react";
+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
@@ -738,12 +752,19 @@ var worldAbi = parseAbi2([
 ]);
 
 // src/onboarding/getDelegation.ts
-async function getDelegation({ client, worldAddress, userAddress, sessionAddress }) {
+async function getDelegation({
+  client,
+  worldAddress,
+  userAddress,
+  sessionAddress,
+  // TODO: move everything to latest instead of pending
+  blockTag = "pending"
+}) {
   const record = await getRecord3(client, {
     address: worldAddress,
     table: worldTables.UserDelegationControl,
     key: { delegator: userAddress, delegatee: sessionAddress },
-    blockTag: "pending"
+    blockTag
   });
   return record.delegationControlId === unlimitedDelegationControlId;
 }
@@ -826,7 +847,7 @@ async function getSessionAccount({
 }) {
   const signer = getSessionSigner(userAddress);
   const account = await toSimpleSmartAccount({ client, owner: signer });
-  return account;
+  return { account, signer };
 }
 
 // src/useSessionAccount.ts
@@ -861,9 +882,9 @@ function getPrequisitesQueryOptions({
       queryKey,
       async queryFn() {
         const paymaster = getPaymaster(client.chain);
-        const { address: sessionAddress } = await queryClient.fetchQuery(
-          getSessionAccountQueryOptions({ client, userAddress })
-        );
+        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 })
@@ -992,10 +1013,10 @@ function removeError(error2) {
 }
 
 // src/errors/useShowMutationError.ts
-import { useEffect as useEffect3 } from "react";
+import { useEffect as useEffect4 } from "react";
 function useShowMutationError(result) {
   const { error: error2, reset } = result;
-  useEffect3(() => {
+  useEffect4(() => {
     if (!error2) return;
     return addError({ error: error2, dismiss: reset });
   }, [error2, reset]);
@@ -1130,13 +1151,13 @@ function Balance({ wei }) {
 }
 
 // src/onboarding/quarry/Allowance.tsx
-import { useEffect as useEffect5 } from "react";
+import { useEffect as useEffect6 } from "react";
 
 // src/errors/useShowQueryError.ts
-import { useEffect as useEffect4 } from "react";
+import { useEffect as useEffect5 } from "react";
 function useShowQueryError(result) {
   const { error: error2, refetch } = result;
-  useEffect4(() => {
+  useEffect5(() => {
     if (!error2) return;
     return addError({ error: error2, retry: refetch, dismiss: () => {
     } });
@@ -1149,7 +1170,7 @@ 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());
-  useEffect5(() => {
+  useEffect6(() => {
     const timer = setTimeout(() => {
       if (isActive && claimGasPass2.status === "idle" && allowance.isSuccess && allowance.data != null && allowance.data < minGasBalance) {
         claimGasPass2.mutate(userAddress);
@@ -1376,7 +1397,7 @@ function useSetupSession({ userClient }) {
 }
 
 // src/onboarding/Session.tsx
-import { useEffect as useEffect6 } from "react";
+import { useEffect as useEffect7 } from "react";
 
 // src/useSessionClient.ts
 import { useClient as useClient8 } from "wagmi";
@@ -1426,9 +1447,11 @@ function createFeeEstimator(client) {
 }
 
 // src/getSessionClient.ts
+import { internal_getFeeRef } from "@latticexyz/common";
 async function getSessionClient({
   userAddress,
   sessionAccount,
+  sessionSigner,
   worldAddress
 }) {
   const client = sessionAccount.client;
@@ -1438,7 +1461,20 @@ async function getSessionClient({
   const bundlerClient = createBundlerClient({
     transport: getBundlerTransport(client.chain),
     client,
-    account: sessionAccount
+    account: sessionAccount,
+    userOperation: {
+      estimateFeesPerGas: async ({ userOperation }) => {
+        const { fees } = await internal_getFeeRef({ client, refreshInterval: 5e3 });
+        if (fees.maxFeePerGas == null || fees.maxPriorityFeePerGas == null) {
+          throw new Error("Unexpected undefined fee per gas");
+        }
+        console.log("estimated fees per gas", { fees, userOperation });
+        return {
+          maxFeePerGas: userOperation.maxFeePerGas ?? fees.maxFeePerGas,
+          maxPriorityFeePerGas: userOperation.maxPriorityFeePerGas ?? fees.maxPriorityFeePerGas
+        };
+      }
+    }
   });
   const sessionClient = bundlerClient.extend(smartAccountActions).extend(
     callFrom({
@@ -1446,7 +1482,7 @@ async function getSessionClient({
       delegatorAddress: userAddress,
       publicClient: client
     })
-  ).extend(() => ({ userAddress }));
+  ).extend(() => ({ userAddress, worldAddress, internal_signer: sessionSigner }));
   return sessionClient;
 }
 function clientHasChain(client) {
@@ -1465,9 +1501,12 @@ function getSessionClientQueryOptions({
     userAddress ? {
       queryKey,
       async queryFn() {
-        const sessionAccount = await queryClient.fetchQuery(getSessionAccountQueryOptions({ client, userAddress }));
+        const { account: sessionAccount, signer: sessionSigner } = await queryClient.fetchQuery(
+          getSessionAccountQueryOptions({ client, userAddress })
+        );
         return await getSessionClient({
           sessionAccount,
+          sessionSigner,
           userAddress,
           worldAddress
         });
@@ -1498,7 +1537,7 @@ function Session({ isActive, isExpanded, userClient, registerSpender, registerDe
   const sessionClient = useShowQueryError(useSessionClient(userClient.account.address));
   const setup = useShowMutationError(useSetupSession({ userClient }));
   const hasSession = !registerDelegation && !registerDelegation;
-  useEffect6(() => {
+  useEffect7(() => {
     const timer = setTimeout(() => {
       if (isActive && setup.status === "idle" && sessionClient.data && !hasSession) {
         setup.mutate({
@@ -1556,9 +1595,15 @@ var relayChains_default = {
   "111": {
     bridgeUrl: "https://testnets.relay.link/bridge/bob"
   },
+  "130": {
+    bridgeUrl: "https://relay.link/bridge/unichain"
+  },
   "137": {
     bridgeUrl: "https://relay.link/bridge/polygon"
   },
+  "146": {
+    bridgeUrl: "https://relay.link/bridge/sonic"
+  },
   "185": {
     bridgeUrl: "https://relay.link/bridge/mint"
   },
@@ -1577,6 +1622,9 @@ var relayChains_default = {
   "690": {
     bridgeUrl: "https://relay.link/bridge/redstone"
   },
+  "747": {
+    bridgeUrl: "https://relay.link/bridge/flow-evm"
+  },
   "919": {
     bridgeUrl: "https://testnets.relay.link/bridge/mode-testnet"
   },
@@ -1592,18 +1640,30 @@ var relayChains_default = {
   "1329": {
     bridgeUrl: "https://relay.link/bridge/sei"
   },
+  "1424": {
+    bridgeUrl: "https://relay.link/bridge/perennial"
+  },
+  "1514": {
+    bridgeUrl: "https://relay.link/bridge/story"
+  },
   "1625": {
     bridgeUrl: "https://relay.link/bridge/gravity"
   },
   "1868": {
     bridgeUrl: "https://relay.link/bridge/soneium"
   },
+  "1923": {
+    bridgeUrl: "https://relay.link/bridge/swellchain"
+  },
   "1993": {
     bridgeUrl: "https://testnets.relay.link/bridge/b3"
   },
   "1996": {
     bridgeUrl: "https://relay.link/bridge/sanko"
   },
+  "2187": {
+    bridgeUrl: "https://relay.link/bridge/game7"
+  },
   "2741": {
     bridgeUrl: "https://relay.link/bridge/abstract"
   },
@@ -1673,6 +1733,9 @@ var relayChains_default = {
   "42170": {
     bridgeUrl: "https://relay.link/bridge/arbitrum-nova"
   },
+  "42220": {
+    bridgeUrl: "https://relay.link/bridge/celo"
+  },
   "43114": {
     bridgeUrl: "https://relay.link/bridge/avalanche"
   },
@@ -1703,12 +1766,18 @@ var relayChains_default = {
   "80002": {
     bridgeUrl: "https://testnets.relay.link/bridge/amoy"
   },
+  "80094": {
+    bridgeUrl: "https://relay.link/bridge/berachain"
+  },
   "81457": {
     bridgeUrl: "https://relay.link/bridge/blast"
   },
   "84532": {
     bridgeUrl: "https://testnets.relay.link/bridge/base-sepolia"
   },
+  "167000": {
+    bridgeUrl: "https://relay.link/bridge/taiko"
+  },
   "167009": {
     bridgeUrl: "https://testnets.relay.link/bridge/hekla"
   },
@@ -1724,6 +1793,9 @@ var relayChains_default = {
   "660279": {
     bridgeUrl: "https://relay.link/bridge/xai"
   },
+  "695569": {
+    bridgeUrl: "https://testnets.relay.link/bridge/pyrope"
+  },
   "911867": {
     bridgeUrl: "https://testnets.relay.link/bridge/odyssey"
   },
@@ -1736,6 +1808,9 @@ var relayChains_default = {
   "3397901": {
     bridgeUrl: "https://testnets.relay.link/bridge/funki-testnet"
   },
+  "3441006": {
+    bridgeUrl: "https://testnets.relay.link/bridge/manta-pacific-testnet"
+  },
   "4457845": {
     bridgeUrl: "https://testnets.relay.link/bridge/zero-sepolia"
   },
@@ -1763,6 +1838,9 @@ var relayChains_default = {
   "792703809": {
     bridgeUrl: "https://relay.link/bridge/solana"
   },
+  "845320008": {
+    bridgeUrl: "https://testnets.relay.link/bridge/lordchain-testnet"
+  },
   "888888888": {
     bridgeUrl: "https://relay.link/bridge/ancient8"
   },
@@ -1874,7 +1952,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
   const paymaster = getPaymaster(chain);
   const userAddress = userClient.account.address;
   const { data: prerequisites, error: prerequisitesError } = usePrerequisites(userAddress);
-  useEffect7(() => {
+  useEffect8(() => {
     if (prerequisitesError) {
       console.error("Could not get prerequisites", prerequisitesError);
     }
@@ -1882,7 +1960,7 @@ function ConnectedSteps({ userClient, initialUserAddress }) {
   const { closeAccountModal } = useAccountModal();
   const isNewConnection = userAddress !== initialUserAddress;
   const initialPrerequisites = useRef2(prerequisites);
-  useEffect7(() => {
+  useEffect8(() => {
     if (prerequisites == null) return;
     if (initialPrerequisites.current == null) {
       initialPrerequisites.current = prerequisites;
@@ -1971,7 +2049,7 @@ function AccountModalContent() {
 }
 
 // src/AccountModal.tsx
-import { DialogClose, DialogTitle } from "@radix-ui/react-dialog";
+import { DialogClose } from "@radix-ui/react-dialog";
 
 // src/icons/IconSVG.tsx
 import { twMerge as twMerge8 } from "tailwind-merge";
@@ -2011,11 +2089,11 @@ import { ErrorBoundary } from "react-error-boundary";
 
 // src/errors/ErrorOverlay.tsx
 import { wait } from "@latticexyz/common/utils";
-import { useEffect as useEffect8 } from "react";
+import { useEffect as useEffect9 } from "react";
 import { twMerge as twMerge9 } from "tailwind-merge";
 import { Fragment as Fragment2, jsx as jsx21, jsxs as jsxs15 } from "react/jsx-runtime";
 function ErrorOverlay({ error: error2, retry, dismiss }) {
-  useEffect8(() => {
+  useEffect9(() => {
     if (error2) {
       console.error(error2);
     }
@@ -2109,51 +2187,48 @@ function ErrorsOverlay() {
 import { jsx as jsx24, jsxs as jsxs16 } from "react/jsx-runtime";
 function AccountModal() {
   const { accountModalOpen, toggleAccountModal } = useAccountModal();
-  return /* @__PURE__ */ jsxs16(Modal, { open: accountModalOpen, onOpenChange: toggleAccountModal, children: [
-    /* @__PURE__ */ jsx24(DialogTitle, { className: "sr-only", children: "Connect with EntryKit" }),
-    accountModalOpen ? /* @__PURE__ */ jsxs16(
-      "div",
-      {
-        className: twMerge10(
-          "relative py-2 ring-1",
-          "bg-neutral-900 text-neutral-400 ring-neutral-700/50",
-          "links:font-medium links:underline links:underline-offset-4",
-          "links:text-white",
-          "links:decoration-neutral-500 hover:links:decoration-orange-500"
+  return /* @__PURE__ */ jsx24(Modal, { open: accountModalOpen, onOpenChange: toggleAccountModal, children: accountModalOpen ? /* @__PURE__ */ jsxs16(
+    "div",
+    {
+      className: twMerge10(
+        "relative py-2 ring-1",
+        "bg-neutral-900 text-neutral-400 ring-neutral-700/50",
+        "links:font-medium links:underline links:underline-offset-4",
+        "links:text-white",
+        "links:decoration-neutral-500 hover:links:decoration-orange-500"
+      ),
+      children: [
+        /* @__PURE__ */ jsxs16(ErrorBoundary, { FallbackComponent: ErrorFallback, children: [
+          /* @__PURE__ */ jsx24(AccountModalContent, {}),
+          /* @__PURE__ */ jsx24(ErrorsOverlay, {})
+        ] }),
+        /* @__PURE__ */ jsxs16(
+          "a",
+          {
+            href: "https://mud.dev",
+            target: "_blank",
+            rel: "noreferrer noopener",
+            className: "group self-center p-3 flex items-center justify-center gap-2 links-unset text-sm font-mono transition text-neutral-400 hover:text-white",
+            children: [
+              /* @__PURE__ */ jsx24("span", { className: "block w-4 h-4", children: /* @__PURE__ */ jsx24(Logo, { className: "w-full h-full text-orange-500 group-hover:rotate-90 transition duration-300" }) }),
+              /* @__PURE__ */ jsx24("span", { children: "Powered by MUD" })
+            ]
+          }
         ),
-        children: [
-          /* @__PURE__ */ jsx24("div", { className: "absolute top-0 right-0", children: /* @__PURE__ */ jsx24(
-            DialogClose,
-            {
-              className: twMerge10(
-                "pointer-events-auto leading-none p-2 transition",
-                "text-white/20 hover:text-white/40"
-              ),
-              title: "Close",
-              children: /* @__PURE__ */ jsx24(CloseIcon, { className: "m-0" })
-            }
-          ) }),
-          /* @__PURE__ */ jsxs16(ErrorBoundary, { FallbackComponent: ErrorFallback, children: [
-            /* @__PURE__ */ jsx24(AccountModalContent, {}),
-            /* @__PURE__ */ jsx24(ErrorsOverlay, {})
-          ] }),
-          /* @__PURE__ */ jsxs16(
-            "a",
-            {
-              href: "https://mud.dev",
-              target: "_blank",
-              rel: "noreferrer noopener",
-              className: "group self-center p-3 flex items-center justify-center gap-2 links-unset text-sm font-mono transition text-neutral-400 hover:text-white",
-              children: [
-                /* @__PURE__ */ jsx24("span", { className: "block w-4 h-4", children: /* @__PURE__ */ jsx24(Logo, { className: "w-full h-full text-orange-500 group-hover:rotate-90 transition duration-300" }) }),
-                /* @__PURE__ */ jsx24("span", { children: "Powered by MUD" })
-              ]
-            }
-          )
-        ]
-      }
-    ) : null
-  ] });
+        /* @__PURE__ */ jsx24("div", { className: "absolute top-0 right-0", children: /* @__PURE__ */ jsx24(
+          DialogClose,
+          {
+            className: twMerge10(
+              "pointer-events-auto leading-none p-2 transition",
+              "text-white/20 hover:text-white/40"
+            ),
+            title: "Close",
+            children: /* @__PURE__ */ jsx24(CloseIcon, { className: "m-0" })
+          }
+        ) })
+      ]
+    }
+  ) : null });
 }
 
 // src/EntryKitProvider.tsx
@@ -2344,6 +2419,50 @@ function getConnectors({
     projectId: config.walletConnectProjectId
   });
 }
+
+// src/validateSigner.ts
+import { readContract } from "viem/actions";
+async function internal_validateSigner({
+  client,
+  worldAddress,
+  userAddress,
+  sessionAddress,
+  signerAddress
+}) {
+  const ownerAddress = await readContract(client, {
+    address: sessionAddress,
+    abi: simpleAccountAbi,
+    functionName: "owner"
+  });
+  if (ownerAddress.toLowerCase() !== signerAddress.toLowerCase()) {
+    throw new Error(`Session account owner (${ownerAddress}) does not match message signer (${signerAddress}).`);
+  }
+  const hasDelegation = await getDelegation({
+    client,
+    worldAddress,
+    sessionAddress,
+    userAddress,
+    blockTag: "latest"
+  });
+  if (!hasDelegation) {
+    throw new Error(`Session account (${sessionAddress}) does not have delegation for user account (${userAddress}).`);
+  }
+}
+var simpleAccountAbi = [
+  {
+    inputs: [],
+    name: "owner",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+];
 export {
   AccountButton,
   EntryKitProvider,
@@ -2351,6 +2470,7 @@ export {
   defineConfig,
   getConnectors,
   getWallets,
+  internal_validateSigner,
   useAccountModal,
   useEntryKitConfig,
   useSessionClientReady as useSessionClient