permissionless 0.0.35 → 0.1.0

package/actions/smartAccount/sendUserOperation.ts

@@ -6,55 +6,88 @@ import type {
     Prettify,
     UserOperation
 } from "../../types/"
+import type {
+    ENTRYPOINT_ADDRESS_V06_TYPE,
+    EntryPoint,
+    GetEntryPointVersion
+} from "../../types/entrypoint"
 import { AccountOrClientNotFoundError, parseAccount } from "../../utils/"
 import { getAction } from "../../utils/getAction"
 import { sendUserOperation as sendUserOperationBundler } from "../bundler/sendUserOperation"
 import {
-    type SponsorUserOperationMiddleware,
+    type Middleware,
     prepareUserOperationRequest
 } from "./prepareUserOperationRequest"
 
 export type SendUserOperationParameters<
-    TAccount extends SmartAccount | undefined = SmartAccount | undefined
+    entryPoint extends EntryPoint,
+    TAccount extends SmartAccount<entryPoint> | undefined =
+        | SmartAccount<entryPoint>
+        | undefined
 > = {
-    userOperation: PartialBy<
-        UserOperation,
-        | "nonce"
-        | "sender"
-        | "initCode"
-        | "signature"
-        | "callGasLimit"
-        | "maxFeePerGas"
-        | "maxPriorityFeePerGas"
-        | "preVerificationGas"
-        | "verificationGasLimit"
-        | "paymasterAndData"
-    >
-} & GetAccountParameter<TAccount> &
-    SponsorUserOperationMiddleware
+    userOperation: entryPoint extends ENTRYPOINT_ADDRESS_V06_TYPE
+        ? PartialBy<
+              UserOperation<"v0.6">,
+              | "sender"
+              | "nonce"
+              | "initCode"
+              | "callGasLimit"
+              | "verificationGasLimit"
+              | "preVerificationGas"
+              | "maxFeePerGas"
+              | "maxPriorityFeePerGas"
+              | "paymasterAndData"
+              | "signature"
+          >
+        : PartialBy<
+              UserOperation<"v0.7">,
+              | "sender"
+              | "nonce"
+              | "factory"
+              | "factoryData"
+              | "callGasLimit"
+              | "verificationGasLimit"
+              | "preVerificationGas"
+              | "maxFeePerGas"
+              | "maxPriorityFeePerGas"
+              | "paymaster"
+              | "paymasterVerificationGasLimit"
+              | "paymasterPostOpGasLimit"
+              | "paymasterData"
+              | "signature"
+          >
+} & GetAccountParameter<entryPoint, TAccount> &
+    Middleware<entryPoint>
 
 export async function sendUserOperation<
+    entryPoint extends EntryPoint,
     TTransport extends Transport = Transport,
     TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends SmartAccount | undefined = SmartAccount | undefined
+    TAccount extends SmartAccount<entryPoint> | undefined =
+        | SmartAccount<entryPoint>
+        | undefined
 >(
     client: Client<TTransport, TChain, TAccount>,
-    args: Prettify<SendUserOperationParameters<TAccount>>
+    args: Prettify<SendUserOperationParameters<entryPoint, TAccount>>
 ): Promise<Hash> {
     const { account: account_ = client.account } = args
     if (!account_) throw new AccountOrClientNotFoundError()
 
-    const account = parseAccount(account_) as SmartAccount
+    const account = parseAccount(account_) as SmartAccount<entryPoint>
 
     const userOperation = await getAction(
         client,
-        prepareUserOperationRequest
+        prepareUserOperationRequest<entryPoint, TTransport, TChain, TAccount>
     )(args)
 
-    userOperation.signature = await account.signUserOperation(userOperation)
+    userOperation.signature = await account.signUserOperation(
+        userOperation as UserOperation<GetEntryPointVersion<entryPoint>>
+    )
 
     return sendUserOperationBundler(client, {
-        userOperation: userOperation,
+        userOperation: userOperation as UserOperation<
+            GetEntryPointVersion<entryPoint>
+        >,
         entryPoint: account.entryPoint
     })
 }

package/actions/smartAccount/signMessage.ts

@@ -6,6 +6,7 @@ import type {
     Transport
 } from "viem"
 import { type SmartAccount } from "../../accounts/types"
+import type { EntryPoint } from "../../types/entrypoint"
 import { AccountOrClientNotFoundError, parseAccount } from "../../utils/"
 
 /**
@@ -55,8 +56,9 @@ import { AccountOrClientNotFoundError, parseAccount } from "../../utils/"
  * })
  */
 export async function signMessage<
+    entryPoint extends EntryPoint,
     TChain extends Chain | undefined,
-    TAccount extends SmartAccount | undefined
+    TAccount extends SmartAccount<entryPoint> | undefined
 >(
     client: Client<Transport, TChain, TAccount>,
     {

package/actions/smartAccount/signTypedData.ts

@@ -10,6 +10,7 @@ import {
     validateTypedData
 } from "viem"
 import { type SmartAccount } from "../../accounts/types"
+import type { EntryPoint } from "../../types/entrypoint"
 import { AccountOrClientNotFoundError, parseAccount } from "../../utils/"
 
 /**
@@ -111,10 +112,11 @@ import { AccountOrClientNotFoundError, parseAccount } from "../../utils/"
  * })
  */
 export async function signTypedData<
+    entryPoint extends EntryPoint,
     const TTypedData extends TypedData | { [key: string]: unknown },
     TPrimaryType extends string,
     TChain extends Chain | undefined,
-    TAccount extends SmartAccount | undefined
+    TAccount extends SmartAccount<entryPoint> | undefined
 >(
     client: Client<Transport, TChain, TAccount>,
     {

package/actions/smartAccount/writeContract.ts

@@ -11,8 +11,9 @@ import {
     encodeFunctionData
 } from "viem"
 import { type SmartAccount } from "../../accounts/types"
+import type { EntryPoint } from "../../types/entrypoint"
 import { getAction } from "../../utils/getAction"
-import { type SponsorUserOperationMiddleware } from "./prepareUserOperationRequest"
+import { type Middleware } from "./prepareUserOperationRequest"
 import {
     type SendTransactionWithPaymasterParameters,
     sendTransaction
@@ -70,8 +71,11 @@ import {
  * const hash = await writeContract(client, request)
  */
 export type WriteContractWithPaymasterParameters<
+    entryPoint extends EntryPoint,
     TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends SmartAccount | undefined = SmartAccount | undefined,
+    TAccount extends SmartAccount<entryPoint> | undefined =
+        | SmartAccount<entryPoint>
+        | undefined,
     TAbi extends Abi | readonly unknown[] = Abi | readonly unknown[],
     TFunctionName extends ContractFunctionName<
         TAbi,
@@ -91,11 +95,12 @@ export type WriteContractWithPaymasterParameters<
     TAccount,
     TChainOverride
 > &
-    SponsorUserOperationMiddleware
+    Middleware<entryPoint>
 
 export async function writeContract<
+    entryPoint extends EntryPoint,
     TChain extends Chain | undefined,
-    TAccount extends SmartAccount | undefined,
+    TAccount extends SmartAccount<entryPoint> | undefined,
     const TAbi extends Abi | readonly unknown[],
     TFunctionName extends ContractFunctionName<
         TAbi,
@@ -117,6 +122,7 @@ export async function writeContract<
         functionName,
         ...request
     }: WriteContractWithPaymasterParameters<
+        entryPoint,
         TChain,
         TAccount,
         TAbi,
@@ -132,12 +138,13 @@ export async function writeContract<
     } as EncodeFunctionDataParameters<TAbi, TFunctionName>)
     const hash = await getAction(
         client,
-        sendTransaction<TChain, TAccount, TChainOverride>
+        sendTransaction<TChain, TAccount, entryPoint, TChainOverride>
     )({
         data: `${data}${dataSuffix ? dataSuffix.replace("0x", "") : ""}`,
         to: address,
         ...request
     } as unknown as SendTransactionWithPaymasterParameters<
+        entryPoint,
         TChain,
         TAccount,
         TChainOverride

package/actions/smartAccount.ts

@@ -4,9 +4,9 @@ import {
 } from "./smartAccount/deployContract"
 
 import {
+    type Middleware,
     type PrepareUserOperationRequestParameters,
     type PrepareUserOperationRequestReturnType,
-    type SponsorUserOperationMiddleware,
     prepareUserOperationRequest
 } from "./smartAccount/prepareUserOperationRequest"
 
@@ -46,7 +46,7 @@ export {
     signMessage,
     signTypedData,
     type SendTransactionWithPaymasterParameters,
-    type SponsorUserOperationMiddleware,
+    type Middleware,
     sendTransactions,
     type SendTransactionsWithPaymasterParameters,
     type WriteContractWithPaymasterParameters,

package/actions/stackup/accounts.ts

@@ -1,8 +1,9 @@
 import type { Address } from "viem"
 import type { StackupPaymasterClient } from "../../clients/stackup"
+import type { EntryPoint } from "../../types"
 
-export type AccountsParameters = {
-    entryPoint: Address
+export type AccountsParameters<entryPoint extends EntryPoint> = {
+    entryPoint: entryPoint
 }
 
 /**
@@ -27,13 +28,13 @@ export type AccountsParameters = {
  * }})
  *
  */
-export const accounts = async (
-    client: StackupPaymasterClient,
-    { entryPoint }: AccountsParameters
+export const accounts = async <entryPoint extends EntryPoint>(
+    client: StackupPaymasterClient<entryPoint>,
+    { entryPoint: entryPointAddress }: AccountsParameters<entryPoint>
 ): Promise<Address[]> => {
     const response = await client.request({
         method: "pm_accounts",
-        params: [entryPoint]
+        params: [entryPointAddress]
     })
 
     return response

package/actions/stackup/sponsorUserOperation.ts

@@ -1,26 +1,52 @@
-import type { Address } from "viem"
+import type { Address, Hex } from "viem"
 import type { PartialBy } from "viem/types/utils"
 import { type StackupPaymasterClient } from "../../clients/stackup"
-import type { StackupPaymasterContext } from "../../types/stackup"
 import type {
-    UserOperation,
-    UserOperationWithBigIntAsHex
-} from "../../types/userOperation"
+    ENTRYPOINT_ADDRESS_V06_TYPE,
+    EntryPoint
+} from "../../types/entrypoint"
+import type { StackupPaymasterContext } from "../../types/stackup"
+import type { UserOperation } from "../../types/userOperation"
 import { deepHexlify } from "../../utils/deepHexlify"
+import { ENTRYPOINT_ADDRESS_V06 } from "../../utils/getEntryPointVersion"
 
-export type SponsorUserOperationParameters = {
-    userOperation: PartialBy<
-        UserOperation,
-        | "callGasLimit"
-        | "preVerificationGas"
-        | "verificationGasLimit"
-        | "paymasterAndData"
-    >
-    entryPoint: Address
+export type SponsorUserOperationParameters<entryPoint extends EntryPoint> = {
+    userOperation: entryPoint extends ENTRYPOINT_ADDRESS_V06_TYPE
+        ? PartialBy<
+              UserOperation<"v0.6">,
+              "callGasLimit" | "preVerificationGas" | "verificationGasLimit"
+          >
+        : PartialBy<
+              UserOperation<"v0.7">,
+              | "callGasLimit"
+              | "preVerificationGas"
+              | "verificationGasLimit"
+              | "paymasterVerificationGasLimit"
+              | "paymasterPostOpGasLimit"
+          >
+    entryPoint: entryPoint
     context: StackupPaymasterContext
 }
 
-export type SponsorUserOperationReturnType = UserOperation
+export type SponsorUserOperationReturnType<entryPoint extends EntryPoint> =
+    entryPoint extends ENTRYPOINT_ADDRESS_V06_TYPE
+        ? Pick<
+              UserOperation<"v0.6">,
+              | "callGasLimit"
+              | "verificationGasLimit"
+              | "preVerificationGas"
+              | "paymasterAndData"
+          >
+        : Pick<
+              UserOperation<"v0.7">,
+              | "callGasLimit"
+              | "verificationGasLimit"
+              | "preVerificationGas"
+              | "paymaster"
+              | "paymasterVerificationGasLimit"
+              | "paymasterPostOpGasLimit"
+              | "paymasterData"
+          >
 
 /**
  * Returns paymasterAndData & updated gas parameters required to sponsor a userOperation.
@@ -47,26 +73,54 @@ export type SponsorUserOperationReturnType = UserOperation
  * }})
  *
  */
-export const sponsorUserOperation = async (
-    client: StackupPaymasterClient,
-    args: SponsorUserOperationParameters
-): Promise<SponsorUserOperationReturnType> => {
+export const sponsorUserOperation = async <entryPoint extends EntryPoint>(
+    client: StackupPaymasterClient<entryPoint>,
+    args: SponsorUserOperationParameters<entryPoint>
+): Promise<SponsorUserOperationReturnType<entryPoint>> => {
     const response = await client.request({
         method: "pm_sponsorUserOperation",
-        params: [
-            deepHexlify(args.userOperation) as UserOperationWithBigIntAsHex,
-            args.entryPoint,
-            args.context
-        ]
+        params: [deepHexlify(args.userOperation), args.entryPoint, args.context]
     })
 
-    const userOperation: UserOperation = {
-        ...args.userOperation,
-        paymasterAndData: response.paymasterAndData,
-        preVerificationGas: BigInt(response.preVerificationGas),
-        verificationGasLimit: BigInt(response.verificationGasLimit),
-        callGasLimit: BigInt(response.callGasLimit)
+    if (args.entryPoint === ENTRYPOINT_ADDRESS_V06) {
+        const responseV06 = response as {
+            paymasterAndData: Hex
+            preVerificationGas: Hex
+            verificationGasLimit: Hex
+            callGasLimit: Hex
+            paymaster?: never
+            paymasterVerificationGasLimit?: never
+            paymasterPostOpGasLimit?: never
+            paymasterData?: never
+        }
+        return {
+            paymasterAndData: responseV06.paymasterAndData,
+            preVerificationGas: BigInt(responseV06.preVerificationGas),
+            verificationGasLimit: BigInt(responseV06.verificationGasLimit),
+            callGasLimit: BigInt(responseV06.callGasLimit)
+        } as SponsorUserOperationReturnType<entryPoint>
+    }
+
+    const responseV07 = response as {
+        preVerificationGas: Hex
+        verificationGasLimit: Hex
+        callGasLimit: Hex
+        paymaster: Address
+        paymasterVerificationGasLimit: Hex
+        paymasterPostOpGasLimit: Hex
+        paymasterData: Hex
+        paymasterAndData?: never
     }
 
-    return userOperation
+    return {
+        callGasLimit: BigInt(responseV07.callGasLimit),
+        verificationGasLimit: BigInt(responseV07.verificationGasLimit),
+        preVerificationGas: BigInt(responseV07.preVerificationGas),
+        paymaster: responseV07.paymaster,
+        paymasterVerificationGasLimit: BigInt(
+            responseV07.paymasterVerificationGasLimit
+        ),
+        paymasterPostOpGasLimit: BigInt(responseV07.paymasterPostOpGasLimit),
+        paymasterData: responseV07.paymasterData
+    } as SponsorUserOperationReturnType<entryPoint>
 }

package/clients/createBundlerClient.ts

@@ -7,16 +7,18 @@ import type {
 } from "viem"
 import { createClient } from "viem"
 import type { BundlerRpcSchema } from "../types/bundler"
+import type { EntryPoint } from "../types/entrypoint"
 import { type BundlerActions, bundlerActions } from "./decorators/bundler"
 
 export type BundlerClient<
+    entryPoint extends EntryPoint,
     TChain extends Chain | undefined = Chain | undefined
 > = Client<
     Transport,
     TChain,
     Account | undefined,
-    BundlerRpcSchema,
-    BundlerActions
+    BundlerRpcSchema<entryPoint>,
+    BundlerActions<entryPoint>
 >
 /**
  * Creates a EIP-4337 compliant Bundler Client with a given [Transport](https://viem.sh/docs/clients/intro.html) configured for a [Chain](https://viem.sh/docs/clients/chains.html).
@@ -38,11 +40,14 @@ export type BundlerClient<
  * })
  */
 export const createBundlerClient = <
-    transport extends Transport,
+    entryPoint extends EntryPoint,
+    transport extends Transport = Transport,
     chain extends Chain | undefined = undefined
 >(
-    parameters: PublicClientConfig<transport, chain>
-): BundlerClient => {
+    parameters: PublicClientConfig<transport, chain> & {
+        entryPoint: entryPoint
+    }
+): BundlerClient<entryPoint> => {
     const { key = "public", name = "Bundler Client" } = parameters
     const client = createClient({
         ...parameters,
@@ -50,5 +55,5 @@ export const createBundlerClient = <
         name,
         type: "bundlerClient"
     })
-    return client.extend(bundlerActions)
+    return client.extend(bundlerActions(parameters.entryPoint))
 }

package/clients/createSmartAccountClient.ts

@@ -7,9 +7,10 @@ import type {
 } from "viem"
 import { createClient } from "viem"
 import { type SmartAccount } from "../accounts/types"
-import { type SponsorUserOperationMiddleware } from "../actions/smartAccount/prepareUserOperationRequest"
+import { type Middleware } from "../actions/smartAccount/prepareUserOperationRequest"
 import type { Prettify } from "../types/"
 import { type BundlerRpcSchema } from "../types/bundler"
+import type { EntryPoint } from "../types/entrypoint"
 import {
     type SmartAccountActions,
     smartAccountActions
@@ -21,30 +22,39 @@ import {
  *  - Fix typing, 'accounts' is required to signMessage, signTypedData, signTransaction, but not needed here, since account is embedded in the client
  */
 export type SmartAccountClient<
+    entryPoint extends EntryPoint,
     transport extends Transport = Transport,
     chain extends Chain | undefined = Chain | undefined,
-    account extends SmartAccount | undefined = SmartAccount | undefined
+    account extends SmartAccount<entryPoint> | undefined =
+        | SmartAccount<entryPoint>
+        | undefined
 > = Prettify<
     Client<
         transport,
         chain,
         account,
-        BundlerRpcSchema,
-        SmartAccountActions<chain, account>
+        BundlerRpcSchema<entryPoint>,
+        SmartAccountActions<entryPoint, chain, account>
     >
 >
 
 export type SmartAccountClientConfig<
+    entryPoint extends EntryPoint,
     transport extends Transport = Transport,
     chain extends Chain | undefined = Chain | undefined,
-    account extends SmartAccount | undefined = SmartAccount | undefined
+    account extends SmartAccount<entryPoint> | undefined =
+        | SmartAccount<entryPoint>
+        | undefined
 > = Prettify<
     Pick<
         ClientConfig<transport, chain, account>,
-        "cacheTime" | "chain" | "key" | "name" | "pollingInterval" | "transport"
+        "cacheTime" | "chain" | "key" | "name" | "pollingInterval"
     > & {
         account?: account
-    } & SponsorUserOperationMiddleware
+        bundlerTransport: Transport
+    } & Middleware<entryPoint> & {
+            entryPoint: entryPoint
+        }
 >
 
 /**
@@ -68,32 +78,36 @@ export type SmartAccountClientConfig<
  */
 
 export function createSmartAccountClient<
-    TTransport extends Transport,
-    TChain extends Chain | undefined = undefined,
-    TSmartAccount extends SmartAccount | undefined = undefined
+    entryPoint extends EntryPoint,
+    TSmartAccount extends SmartAccount<entryPoint> | undefined =
+        | SmartAccount<entryPoint>
+        | undefined,
+    TTransport extends Transport = Transport,
+    TChain extends Chain | undefined = undefined
 >(
-    parameters: SmartAccountClientConfig<TTransport, TChain, TSmartAccount>
-): SmartAccountClient<TTransport, TChain, TSmartAccount>
-
-export function createSmartAccountClient(
-    parameters: SmartAccountClientConfig
-): SmartAccountClient {
+    parameters: SmartAccountClientConfig<
+        entryPoint,
+        TTransport,
+        TChain,
+        TSmartAccount
+    >
+): SmartAccountClient<entryPoint, TTransport, TChain, TSmartAccount> {
     const {
         key = "Account",
         name = "Smart Account Client",
-        transport
+        bundlerTransport
     } = parameters
     const client = createClient({
         ...parameters,
         key,
         name,
-        transport: (opts) => transport({ ...opts, retryCount: 0 }),
+        transport: bundlerTransport,
         type: "smartAccountClient"
     })
 
     return client.extend(
         smartAccountActions({
-            sponsorUserOperation: parameters.sponsorUserOperation
+            middleware: parameters.middleware
         })
-    )
+    ) as SmartAccountClient<entryPoint, TTransport, TChain, TSmartAccount>
 }