update imports

packages/entrykit/package.json

@@ -44,8 +44,10 @@
     "@latticexyz/common": "workspace:*",
     "@latticexyz/config": "workspace:*",
     "@latticexyz/explorer": "workspace:*",
+    "@latticexyz/paymaster": "workspace:*",
     "@latticexyz/protocol-parser": "workspace:*",
     "@latticexyz/store": "workspace:*",
+    "@latticexyz/wiresaw": "workspace:*",
     "@latticexyz/world": "workspace:*",
     "@latticexyz/world-modules": "workspace:*",
     "@noble/curves": "^1.6.0",

packages/entrykit/src/createWagmiConfig.ts

@@ -3,7 +3,7 @@ import { WalletList, connectorsForWallets, getDefaultWallets } from "@rainbow-me
 import { Config, CreateConfigParameters, createConfig } from "wagmi";
 import { passkeyWallet } from "./passkey/passkeyWallet";
 import { mapObject } from "@latticexyz/common/utils";
-import { wiresaw } from "./transports/wiresaw";
+import { wiresaw } from "@latticexyz/wiresaw/internal";
 
 export type CreateWagmiConfigOptions<
   chains extends readonly [Chain, ...Chain[]] = readonly [Chain, ...Chain[]],

packages/entrykit/src/exports/internal.ts

@@ -15,8 +15,5 @@ export { createWagmiConfig, type CreateWagmiConfigOptions } from "../createWagmi
 // And some additional internal things
 export * from "../passkey/passkeyWallet";
 export * from "../passkey/passkeyConnector";
-export * from "../smart-account/toCoinbaseSmartAccount";
-export * from "../smart-account/isCoinbaseSmartAccount";
 export * from "../getConnectors";
 export * from "../getWallets";
-export * from "../transports/wiresaw";

packages/entrykit/src/getBundlerTransport.ts

@@ -1,14 +1,14 @@
 import { transactionQueue } from "@latticexyz/common/actions";
 import { Chain, createClient, fallback, http, webSocket } from "viem";
 import { privateKeyToAccount, generatePrivateKey } from "viem/accounts";
-import { userOpExecutor } from "./transports/userOpExecutor";
-import { gasEstimator } from "./transports/gasEstimator";
-import { wiresaw } from "./transports/wiresaw";
+import { wiresaw } from "@latticexyz/wiresaw/internal";
+import { gasEstimator, userOpExecutor } from "@latticexyz/paymaster/internal";
 
 export function getBundlerTransport(chain: Chain) {
   const bundlerHttpUrl = chain.rpcUrls.bundler?.http[0];
-  const bundlerTransport = chain.rpcUrls.bundler?.http[0]
-    ? wiresaw(gasEstimator(http(bundlerHttpUrl)))
+  // TODO: bundler websocket
+  const bundlerTransport = bundlerHttpUrl
+    ? gasEstimator(wiresaw(http(bundlerHttpUrl)))
     : chain.id === 31337
       ? userOpExecutor({
           executor: createClient({

packages/entrykit/src/getSessionAccount.ts

@@ -1,7 +1,7 @@
 import { Address, Chain, Client, Transport } from "viem";
-import { getSessionSigner } from "./getSessionSigner";
-import { toCoinbaseSmartAccount } from "./smart-account/toCoinbaseSmartAccount";
 import { SmartAccount } from "viem/account-abstraction";
+import { toCoinbaseSmartAccount } from "@latticexyz/common/accounts";
+import { getSessionSigner } from "./getSessionSigner";
 
 export async function getSessionAccount<chain extends Chain>({
   client,

packages/entrykit/src/onboarding/useClaimGasPass.ts

@@ -1,7 +1,7 @@
 import { Address } from "viem";
 import { useEntryKitConfig } from "../EntryKitConfigProvider";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { quarryPassIssuer } from "../transports/quarryPassIssuer";
+import { claimGasPass } from "@latticexyz/paymaster/internal";
 
 export function useClaimGasPass() {
   const queryClient = useQueryClient();
@@ -12,16 +12,9 @@ export function useClaimGasPass() {
     mutationKey,
     onError: (error) => console.error(error),
     mutationFn: async (userAddress: Address) => {
-      const transport = quarryPassIssuer()({ chain });
       // TODO: handle case where you already have a pass?
-      await transport.request({
-        method: "quarry_issuePass",
-        params: ["0x01", userAddress],
-      });
-      await transport.request({
-        method: "quarry_claimAllowance",
-        params: ["0x01", userAddress],
-      });
+      // TODO: get returned tx hashes to check if success
+      await claimGasPass({ chain, userAddress });
 
       await Promise.all([
         queryClient.invalidateQueries({ queryKey: ["getAllowance"] }),

packages/entrykit/src/passkey/getAccount.ts

@@ -2,7 +2,7 @@ import { Client } from "viem";
 import { toWebAuthnAccount } from "viem/account-abstraction";
 import { cache } from "./cache";
 import { P256Credential } from "webauthn-p256";
-import { toCoinbaseSmartAccount, ToCoinbaseSmartAccountReturnType } from "../smart-account/toCoinbaseSmartAccount";
+import { toCoinbaseSmartAccount, ToCoinbaseSmartAccountReturnType } from "@latticexyz/common/accounts";
 
 export async function getAccount(client: Client, id: P256Credential["id"]): Promise<ToCoinbaseSmartAccountReturnType> {
   const { publicKeys } = cache.getState();

packages/entrykit/src/passkey/passkeyConnector.ts

@@ -20,7 +20,7 @@ import { createBundlerClient } from "../createBundlerClient";
 import { observer } from "@latticexyz/explorer/observer";
 import { getPaymasterAddress } from "../getPaymasterAddress";
 import { getBundlerTransport } from "../getBundlerTransport";
-import { wiresaw } from "../transports/wiresaw";
+import { wiresaw } from "@latticexyz/wiresaw/internal";
 
 export type PasskeyConnectorOptions = {
   // TODO: figure out what we wanna do across chains