permissionless 0.3.6 → 0.3.7

package/accounts/thirdweb/utils/decodeCallData.ts

@@ -38,11 +38,15 @@ export const decodeCallData = async (callData: Hex) => {
         }[] = []
 
         for (let i = 0; i < decodedBatch.args[0].length; i++) {
-            calls.push({
-                to: decodedBatch.args[0][i],
-                value: decodedBatch.args[1][i],
-                data: decodedBatch.args[2][i]
-            })
+            const to = decodedBatch.args[0][i]
+            const value = decodedBatch.args[1][i]
+            const data = decodedBatch.args[2][i]
+
+            if (to === undefined || data === undefined) {
+                throw new Error("Invalid batch call data")
+            }
+
+            calls.push({ to, value, data })
         }
 
         return calls

package/accounts/trust/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/accounts/trust/index.d.ts",
+    "module": "../../_esm/accounts/trust/index.js",
+    "main": "../../_cjs/accounts/trust/index.js"
+}

package/accounts/trust/utils/decodeCallData.ts

@@ -38,11 +38,15 @@ export const decodeCallData = async (callData: Hex) => {
         }[] = []
 
         for (let i = 0; i < decodedBatch.args[0].length; i++) {
-            calls.push({
-                to: decodedBatch.args[0][i],
-                value: decodedBatch.args[1][i],
-                data: decodedBatch.args[2][i]
-            })
+            const to = decodedBatch.args[0][i]
+            const value = decodedBatch.args[1][i]
+            const data = decodedBatch.args[2][i]
+
+            if (to === undefined || data === undefined) {
+                throw new Error("Invalid batch call data")
+            }
+
+            calls.push({ to, value, data })
         }
 
         return calls

package/actions/{erc7579.ts → erc7579/index.ts}

@@ -3,40 +3,34 @@ import type {
     GetSmartAccountParameter,
     SmartAccount
 } from "viem/account-abstraction"
-import { accountId } from "./erc7579/accountId.js"
-import {
-    type InstallModuleParameters,
-    installModule
-} from "./erc7579/installModule.js"
+import { accountId } from "./accountId.js"
+import { type InstallModuleParameters, installModule } from "./installModule.js"
 import {
     type InstallModulesParameters,
     installModules
-} from "./erc7579/installModules.js"
+} from "./installModules.js"
 import {
     type IsModuleInstalledParameters,
     isModuleInstalled
-} from "./erc7579/isModuleInstalled.js"
+} from "./isModuleInstalled.js"
 import {
     type SupportsExecutionModeParameters,
     supportsExecutionMode
-} from "./erc7579/supportsExecutionMode.js"
-import type {
-    CallType,
-    ExecutionMode
-} from "./erc7579/supportsExecutionMode.js"
+} from "./supportsExecutionMode.js"
+import type { CallType, ExecutionMode } from "./supportsExecutionMode.js"
 import {
     type SupportsModuleParameters,
     supportsModule
-} from "./erc7579/supportsModule.js"
-import type { ModuleType } from "./erc7579/supportsModule.js"
+} from "./supportsModule.js"
+import type { ModuleType } from "./supportsModule.js"
 import {
     type UninstallModuleParameters,
     uninstallModule
-} from "./erc7579/uninstallModule.js"
+} from "./uninstallModule.js"
 import {
     type UninstallModulesParameters,
     uninstallModules
-} from "./erc7579/uninstallModules.js"
+} from "./uninstallModules.js"
 
 export type Erc7579Actions<TSmartAccount extends SmartAccount | undefined> = {
     accountId: (

package/actions/erc7579/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/actions/erc7579/index.d.ts",
+    "module": "../../_esm/actions/erc7579/index.js",
+    "main": "../../_cjs/actions/erc7579/index.js"
+}

package/actions/{etherspot.ts → etherspot/index.ts}

@@ -1,4 +1,4 @@
 export {
     type GetGasPriceResponseReturnType,
     getUserOperationGasPrice
-} from "./etherspot/getUserOperationGasPrice.js"
+} from "./getUserOperationGasPrice.js"

package/actions/etherspot/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/actions/etherspot/index.d.ts",
+    "module": "../../_esm/actions/etherspot/index.js",
+    "main": "../../_cjs/actions/etherspot/index.js"
+}

package/actions/{passkeyServer.ts → passkeyServer/index.ts}

@@ -2,16 +2,16 @@ export {
     type StartRegistrationParameters,
     type StartRegistrationReturnType,
     startRegistration
-} from "./passkeyServer/startRegistration.js"
+} from "./startRegistration.js"
 
 export {
     type VerifyRegistrationParameters,
     type VerifyRegistrationReturnType,
     verifyRegistration
-} from "./passkeyServer/verifyRegistration.js"
+} from "./verifyRegistration.js"
 
 export {
     type GetCredentialsParameters,
     type GetCredentialsReturnType,
     getCredentials
-} from "./passkeyServer/getCredentials.js"
+} from "./getCredentials.js"

package/actions/passkeyServer/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/actions/passkeyServer/index.d.ts",
+    "module": "../../_esm/actions/passkeyServer/index.js",
+    "main": "../../_cjs/actions/passkeyServer/index.js"
+}

package/actions/pimlico/estimateErc20PaymasterCost.ts

@@ -76,9 +76,15 @@ export const estimateErc20PaymasterCost = async <
         chain
     })
 
-    const postOpGas = quotes[0].postOpGas
-    const exchangeRate = quotes[0].exchangeRate
-    const exchangeRateNativeToUsd = quotes[0].exchangeRateNativeToUsd
+    const quote = quotes[0]
+
+    if (quote === undefined) {
+        throw new Error(`No token quote found for ${token}`)
+    }
+
+    const postOpGas = quote.postOpGas
+    const exchangeRate = quote.exchangeRate
+    const exchangeRateNativeToUsd = quote.exchangeRateNativeToUsd
 
     const userOperationMaxCost = getRequiredPrefund({
         userOperation,

package/actions/{pimlico.ts → pimlico/index.ts}

@@ -2,37 +2,37 @@ export {
     type GetTokenQuotesParameters,
     type GetTokenQuotesReturnType,
     getTokenQuotes
-} from "./pimlico/getTokenQuotes.js"
+} from "./getTokenQuotes.js"
 
 export {
     type GetUserOperationGasPriceReturnType,
     getUserOperationGasPrice
-} from "./pimlico/getUserOperationGasPrice.js"
+} from "./getUserOperationGasPrice.js"
 
 export {
     type GetUserOperationStatusParameters,
     type GetUserOperationStatusReturnType,
     getUserOperationStatus
-} from "./pimlico/getUserOperationStatus.js"
+} from "./getUserOperationStatus.js"
 
 export {
     type SendCompressedUserOperationParameters,
     sendCompressedUserOperation
-} from "./pimlico/sendCompressedUserOperation.js"
+} from "./sendCompressedUserOperation.js"
 
 export {
     type PimlicoSponsorUserOperationParameters,
     type SponsorUserOperationReturnType,
     sponsorUserOperation
-} from "./pimlico/sponsorUserOperation.js"
+} from "./sponsorUserOperation.js"
 
 export {
     type PimlicoActions,
     pimlicoActions
-} from "../clients/decorators/pimlico.js"
+} from "../../clients/decorators/pimlico.js"
 
 export {
     type ValidateSponsorshipPolicies,
     type ValidateSponsorshipPoliciesParameters,
     validateSponsorshipPolicies
-} from "./pimlico/validateSponsorshipPolicies.js"
+} from "./validateSponsorshipPolicies.js"

package/actions/pimlico/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/actions/pimlico/index.d.ts",
+    "module": "../../_esm/actions/pimlico/index.js",
+    "main": "../../_cjs/actions/pimlico/index.js"
+}

package/actions/smartAccount/index.ts

@@ -0,0 +1,7 @@
+export { sendTransaction } from "./sendTransaction.js"
+
+export { signMessage } from "./signMessage.js"
+
+export { signTypedData } from "./signTypedData.js"
+
+export { writeContract } from "./writeContract.js"

package/actions/smartAccount/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/actions/smartAccount/index.d.ts",
+    "module": "../../_esm/actions/smartAccount/index.js",
+    "main": "../../_cjs/actions/smartAccount/index.js"
+}

package/clients/createSmartAccountClient.ts

@@ -29,26 +29,25 @@ import {
  *  - Add docs
  *  - Fix typing, 'accounts' is required to signMessage, signTypedData, signTransaction, but not needed here, since account is embedded in the client
  */
-export type SmartAccountClient<
-    transport extends Transport = Transport,
-    chain extends Chain | undefined = Chain | undefined,
-    account extends SmartAccount | undefined = SmartAccount | undefined,
-    client extends Client | undefined = Client | undefined,
-    rpcSchema extends RpcSchema | undefined = undefined
-> = Prettify<
-    Client<
-        transport,
-        chain extends Chain
-            ? chain
-            : client extends Client<any, infer chain>
-              ? chain
-              : undefined,
-        account,
-        rpcSchema extends RpcSchema
-            ? [...BundlerRpcSchema, ...rpcSchema]
-            : BundlerRpcSchema,
-        BundlerActions<account> & SmartAccountActions<chain, account>
-    >
+type SmartAccountClientInner<
+    transport extends Transport,
+    chain extends Chain | undefined,
+    account extends SmartAccount | undefined,
+    client extends Client | undefined,
+    rpcSchema extends RpcSchema | undefined
+> = Client<
+    transport,
+    chain extends Chain
+        ? chain
+        : // biome-ignore lint/suspicious/noExplicitAny: We need any to infer the chain type
+          client extends Client<any, infer chain>
+          ? chain
+          : undefined,
+    account,
+    rpcSchema extends RpcSchema
+        ? [...BundlerRpcSchema, ...rpcSchema]
+        : BundlerRpcSchema,
+    BundlerActions<account> & SmartAccountActions<chain, account>
 > & {
     client: client
     paymaster: BundlerClientConfig["paymaster"] | undefined
@@ -56,6 +55,32 @@ export type SmartAccountClient<
     userOperation: BundlerClientConfig["userOperation"] | undefined
 }
 
+// Variance annotations referred from viem:
+// https://github.com/wevm/viem/blob/main/src/actions/public/simulateContract.ts#L129
+export type SmartAccountClient<
+    out transport extends Transport = Transport,
+    /** @ts-expect-error cast variance */
+    out chain extends Chain | undefined = Chain | undefined,
+    /** @ts-expect-error cast variance */
+    out account extends SmartAccount | undefined = SmartAccount | undefined,
+    out client extends Client | undefined = Client | undefined,
+    rpcSchema extends RpcSchema | undefined = undefined
+> = {
+    [key in keyof SmartAccountClientInner<
+        transport,
+        chain,
+        account,
+        client,
+        rpcSchema
+    >]: SmartAccountClientInner<
+        transport,
+        chain,
+        account,
+        client,
+        rpcSchema
+    >[key]
+}
+
 export type SmartAccountClientConfig<
     transport extends Transport = Transport,
     chain extends Chain | undefined = Chain | undefined,

package/clients/decorators/pimlico.ts

@@ -1,15 +1,5 @@
 import type { Address, Chain, Client, Hash, Prettify, Transport } from "viem"
 import type { EntryPointVersion } from "viem/account-abstraction"
-import {
-    type GetTokenQuotesParameters,
-    type GetTokenQuotesReturnType,
-    type SendCompressedUserOperationParameters,
-    type ValidateSponsorshipPolicies,
-    type ValidateSponsorshipPoliciesParameters,
-    getTokenQuotes,
-    sendCompressedUserOperation,
-    validateSponsorshipPolicies
-} from "../../actions/pimlico.js"
 import {
     type EstimateErc20PaymasterCostParameters,
     type EstimateErc20PaymasterCostReturnType,
@@ -24,6 +14,16 @@ import {
     type GetUserOperationStatusReturnType,
     getUserOperationStatus
 } from "../../actions/pimlico/getUserOperationStatus.js"
+import {
+    type GetTokenQuotesParameters,
+    type GetTokenQuotesReturnType,
+    type SendCompressedUserOperationParameters,
+    type ValidateSponsorshipPolicies,
+    type ValidateSponsorshipPoliciesParameters,
+    getTokenQuotes,
+    sendCompressedUserOperation,
+    validateSponsorshipPolicies
+} from "../../actions/pimlico/index.js"
 import {
     type PimlicoSponsorUserOperationParameters,
     type SponsorUserOperationReturnType,

package/clients/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../_types/clients/index.d.ts",
+    "module": "../_esm/clients/index.js",
+    "main": "../_cjs/clients/index.js"
+}

package/clients/{passkeyServer.ts → passkeyServer/index.ts}

@@ -8,25 +8,27 @@ import type {
     Transport
 } from "viem"
 import { createClient } from "viem"
-import type { PasskeyServerRpcSchema } from "../types/passkeyServer.js"
+import type { PasskeyServerRpcSchema } from "../../types/passkeyServer.js"
 import {
     type PasskeyServerActions,
     passkeyServerActions
-} from "./decorators/passkeyServer.js"
+} from "../decorators/passkeyServer.js"
+
+type PasskeyServerClientInner<rpcSchema extends RpcSchema | undefined> = Client<
+    Transport,
+    Chain | undefined,
+    Account | undefined,
+    rpcSchema extends RpcSchema
+        ? [...PasskeyServerRpcSchema, ...rpcSchema]
+        : [...PasskeyServerRpcSchema],
+    PasskeyServerActions
+>
 
 export type PasskeyServerClient<
     rpcSchema extends RpcSchema | undefined = undefined
-> = Prettify<
-    Client<
-        Transport,
-        Chain | undefined,
-        Account | undefined,
-        rpcSchema extends RpcSchema
-            ? [...PasskeyServerRpcSchema, ...rpcSchema]
-            : [...PasskeyServerRpcSchema],
-        PasskeyServerActions
-    >
->
+> = {
+    [key in keyof PasskeyServerClientInner<rpcSchema>]: PasskeyServerClientInner<rpcSchema>[key]
+}
 
 export type PasskeyServerClientConfig<
     rpcSchema extends RpcSchema | undefined = undefined

package/clients/passkeyServer/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/clients/passkeyServer/index.d.ts",
+    "module": "../../_esm/clients/passkeyServer/index.js",
+    "main": "../../_cjs/clients/passkeyServer/index.js"
+}

package/clients/{pimlico.ts → pimlico/index.ts}

@@ -18,34 +18,61 @@ import {
     entryPoint07Address,
     paymasterActions
 } from "viem/account-abstraction"
-import type { PimlicoRpcSchema } from "../types/pimlico.js"
-import { type PimlicoActions, pimlicoActions } from "./decorators/pimlico.js"
+import type { PimlicoRpcSchema } from "../../types/pimlico.js"
+import { type PimlicoActions, pimlicoActions } from "../decorators/pimlico.js"
 
+type PimlicoClientInner<
+    entryPointVersion extends EntryPointVersion,
+    transport extends Transport,
+    chain extends Chain | undefined,
+    account extends SmartAccount | undefined,
+    client extends Client | undefined,
+    rpcSchema extends RpcSchema | undefined
+> = Client<
+    transport,
+    chain extends Chain
+        ? chain
+        : // biome-ignore lint/suspicious/noExplicitAny: We need any to infer the chain type
+          client extends Client<any, infer chain>
+          ? chain
+          : undefined,
+    account,
+    rpcSchema extends RpcSchema
+        ? [...BundlerRpcSchema, ...PimlicoRpcSchema, ...rpcSchema]
+        : [...BundlerRpcSchema, ...PimlicoRpcSchema],
+    BundlerActions<account> &
+        PaymasterActions &
+        PimlicoActions<chain, entryPointVersion>
+>
+
+// Variance annotations referred from viem:
+// https://github.com/wevm/viem/blob/main/src/actions/public/simulateContract.ts#L129
 export type PimlicoClient<
-    entryPointVersion extends EntryPointVersion = EntryPointVersion,
-    transport extends Transport = Transport,
-    chain extends Chain | undefined = Chain | undefined,
-    account extends SmartAccount | undefined = SmartAccount | undefined,
-    client extends Client | undefined = Client | undefined,
+    /** @ts-expect-error cast variance */
+    out entryPointVersion extends EntryPointVersion = EntryPointVersion,
+    out transport extends Transport = Transport,
+    /** @ts-expect-error cast variance */
+    out chain extends Chain | undefined = Chain | undefined,
+    out account extends SmartAccount | undefined = SmartAccount | undefined,
+    out client extends Client | undefined = Client | undefined,
     rpcSchema extends RpcSchema | undefined = undefined
-> = Prettify<
-    Client<
+> = {
+    [key in keyof PimlicoClientInner<
+        entryPointVersion,
         transport,
-        chain extends Chain
-            ? chain
-            : // biome-ignore lint/suspicious/noExplicitAny: We need any to infer the chain type
-              client extends Client<any, infer chain>
-              ? chain
-              : undefined,
+        chain,
         account,
-        rpcSchema extends RpcSchema
-            ? [...BundlerRpcSchema, ...PimlicoRpcSchema, ...rpcSchema]
-            : [...BundlerRpcSchema, ...PimlicoRpcSchema],
-        BundlerActions<account> &
-            PaymasterActions &
-            PimlicoActions<chain, entryPointVersion>
-    >
->
+        client,
+        rpcSchema
+    >]: PimlicoClientInner<
+        entryPointVersion,
+        transport,
+        chain,
+        account,
+        client,
+        rpcSchema
+    >[key]
+}
 
 export type PimlicoClientConfig<
     entryPointVersion extends EntryPointVersion = EntryPointVersion,

package/clients/pimlico/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/clients/pimlico/index.d.ts",
+    "module": "../../_esm/clients/pimlico/index.js",
+    "main": "../../_cjs/clients/pimlico/index.js"
+}

package/errors/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../_types/errors/index.d.ts",
+    "module": "../_esm/errors/index.js",
+    "main": "../_cjs/errors/index.js"
+}

package/experimental/pimlico/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "module",
+    "types": "../../_types/experimental/pimlico/index.d.ts",
+    "module": "../../_esm/experimental/pimlico/index.js",
+    "main": "../../_cjs/experimental/pimlico/index.js"
+}

package/experimental/pimlico/utils/prepareUserOperationForErc20Paymaster.ts

@@ -25,7 +25,7 @@ import {
 } from "viem/account-abstraction"
 import { getChainId as getChainId_, readContract } from "viem/actions"
 import { getAction, parseAccount } from "viem/utils"
-import { getTokenQuotes } from "../../../actions/pimlico.js"
+import { getTokenQuotes } from "../../../actions/pimlico/index.js"
 import { erc20BalanceOverride } from "../../../utils/erc20BalanceOverride.js"
 
 const MAINNET_USDT_ADDRESS = getAddress(
@@ -111,7 +111,9 @@ export const prepareUserOperationForErc20Paymaster =
                 entryPointAddress: account.entryPoint.address
             })
 
-            if (quotes.length === 0) {
+            const quote = quotes[0]
+
+            if (quote === undefined) {
                 throw new RpcError(new Error("Quotes not found"), {
                     shortMessage:
                         "client didn't return token quotes, check if the token is supported"
@@ -122,7 +124,7 @@ export const prepareUserOperationForErc20Paymaster =
                 postOpGas,
                 exchangeRate,
                 paymaster: paymasterERC20Address
-            } = quotes[0]
+            } = quote
 
             let calls = parameters.calls
 
@@ -155,7 +157,7 @@ export const prepareUserOperationForErc20Paymaster =
             // Call prepareUserOperation
             ////////////////////////////////////////////////////////////////////////////////
 
-            const balanceSlot = _balanceSlot ?? quotes[0].balanceSlot
+            const balanceSlot = _balanceSlot ?? quote.balanceSlot
             const hasBalanceSlot = balanceSlot !== undefined
 
             if (!hasBalanceSlot && balanceOverride) {