permissionless 0.0.20 → 0.0.22

package/accounts/signerToSimpleSmartAccount.ts

@@ -1,3 +1,4 @@
+import type { TypedData } from "abitype"
 import {
     type Address,
     type Chain,
@@ -5,6 +6,7 @@ import {
     type Hex,
     type LocalAccount,
     type Transport,
+    type TypedDataDefinition,
     concatHex,
     encodeFunctionData
 } from "viem"
@@ -106,7 +108,7 @@ export async function signerToSimpleSmartAccount<
     TSource extends string = "custom",
     TAddress extends Address = Address
 >(
-    client: Client<TTransport, TChain>,
+    client: Client<TTransport, TChain, undefined>,
     {
         signer,
         factoryAddress,
@@ -147,8 +149,19 @@ export async function signerToSimpleSmartAccount<
         async signTransaction(_, __) {
             throw new SignTransactionNotSupportedBySmartAccount()
         },
-        async signTypedData(typedData) {
-            return signTypedData(client, { account: viemSigner, ...typedData })
+        async signTypedData<
+            const TTypedData extends TypedData | Record<string, unknown>,
+            TPrimaryType extends
+                | keyof TTypedData
+                | "EIP712Domain" = keyof TTypedData
+        >(typedData: TypedDataDefinition<TTypedData, TPrimaryType>) {
+            return signTypedData<TTypedData, TPrimaryType, TChain, undefined>(
+                client,
+                {
+                    account: viemSigner,
+                    ...typedData
+                }
+            )
         }
     })
 

package/accounts/types.ts

@@ -3,11 +3,10 @@ import {
     type Address,
     BaseError,
     type Client,
-    type GetConstructorArgs,
     type Hex,
     type LocalAccount
 } from "viem"
-import type { Chain, Transport } from "viem"
+import type { Chain, EncodeDeployDataParameters, Transport } from "viem"
 import { type UserOperation } from "../types/index.js"
 
 export class SignTransactionNotSupportedBySmartAccount extends BaseError {
@@ -53,7 +52,7 @@ export type SmartAccount<
         abi,
         args,
         bytecode
-    }: { abi: TAbi; bytecode: Hex } & GetConstructorArgs<TAbi>) => Promise<Hex>
+    }: EncodeDeployDataParameters<TAbi>) => Promise<Hex>
     signUserOperation: (userOperation: UserOperation) => Promise<Hex>
 }
 

package/actions/bundler/waitForUserOperationReceipt.ts

@@ -97,18 +97,22 @@ export const waitForUserOperationReceipt = <
                         fn()
                         unobserve()
                     }
+                    try {
+                        const _userOperationReceipt = await getAction(
+                            bundlerClient,
+                            getUserOperationReceipt
+                        )({ hash })
 
-                    const _userOperationReceipt = await getAction(
-                        bundlerClient,
-                        getUserOperationReceipt
-                    )({ hash })
+                        if (_userOperationReceipt !== null) {
+                            userOperationReceipt = _userOperationReceipt
+                        }
 
-                    if (_userOperationReceipt !== null) {
-                        userOperationReceipt = _userOperationReceipt
-                    }
-
-                    if (userOperationReceipt) {
-                        done(() => emit.resolve(userOperationReceipt))
+                        if (userOperationReceipt) {
+                            done(() => emit.resolve(userOperationReceipt))
+                            return
+                        }
+                    } catch (err) {
+                        done(() => emit.reject(err))
                         return
                     }
                 }, pollingInterval)

package/actions/smartAccount/deployContract.ts

@@ -51,10 +51,8 @@ export type DeployContractParametersWithPaymaster<
  * })
  */
 export async function deployContract<
-    const TAbi extends Abi | readonly unknown[],
     TChain extends Chain | undefined,
-    TAccount extends SmartAccount | undefined,
-    TChainOverride extends Chain | undefined
+    TAccount extends SmartAccount | undefined
 >(
     client: Client<Transport, TChain, TAccount>,
     {
@@ -88,12 +86,7 @@ export async function deployContract<
                 abi,
                 args,
                 bytecode
-            } as unknown as DeployContractParameters<
-                TAbi,
-                TChain,
-                TAccount,
-                TChainOverride
-            >)
+            })
         },
         account: account,
         sponsorUserOperation

package/actions/smartAccount/writeContract.ts

@@ -2,6 +2,8 @@ import {
     type Abi,
     type Chain,
     type Client,
+    type ContractFunctionArgs,
+    type ContractFunctionName,
     type EncodeFunctionDataParameters,
     type Transport,
     type WriteContractParameters,
@@ -71,11 +73,20 @@ export type WriteContractWithPaymasterParameters<
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends SmartAccount | undefined = SmartAccount | undefined,
     TAbi extends Abi | readonly unknown[] = Abi | readonly unknown[],
-    TFunctionName extends string = string,
+    TFunctionName extends ContractFunctionName<
+        TAbi,
+        "nonpayable" | "payable"
+    > = ContractFunctionName<TAbi, "nonpayable" | "payable">,
+    TArgs extends ContractFunctionArgs<
+        TAbi,
+        "nonpayable" | "payable",
+        TFunctionName
+    > = ContractFunctionArgs<TAbi, "nonpayable" | "payable", TFunctionName>,
     TChainOverride extends Chain | undefined = undefined
 > = WriteContractParameters<
     TAbi,
     TFunctionName,
+    TArgs,
     TChain,
     TAccount,
     TChainOverride
@@ -86,7 +97,15 @@ export async function writeContract<
     TChain extends Chain | undefined,
     TAccount extends SmartAccount | undefined,
     const TAbi extends Abi | readonly unknown[],
-    TFunctionName extends string,
+    TFunctionName extends ContractFunctionName<
+        TAbi,
+        "nonpayable" | "payable"
+    > = ContractFunctionName<TAbi, "nonpayable" | "payable">,
+    TArgs extends ContractFunctionArgs<
+        TAbi,
+        "nonpayable" | "payable",
+        TFunctionName
+    > = ContractFunctionArgs<TAbi, "nonpayable" | "payable", TFunctionName>,
     TChainOverride extends Chain | undefined = undefined
 >(
     client: Client<Transport, TChain, TAccount>,
@@ -102,14 +121,15 @@ export async function writeContract<
         TAccount,
         TAbi,
         TFunctionName,
+        TArgs,
         TChainOverride
     >
 ): Promise<WriteContractReturnType> {
-    const data = encodeFunctionData({
+    const data = encodeFunctionData<TAbi, TFunctionName>({
         abi,
         args,
         functionName
-    } as unknown as EncodeFunctionDataParameters<TAbi, TFunctionName>)
+    } as EncodeFunctionDataParameters<TAbi, TFunctionName>)
     const hash = await getAction(
         client,
         sendTransaction<TChain, TAccount, TChainOverride>

package/clients/createSmartAccountClient.ts

@@ -73,8 +73,8 @@ export type SmartAccountClientConfig<
  */
 export const createSmartAccountClient = <
     TTransport extends Transport,
-    TChain extends Chain | undefined = undefined,
-    TSmartAccount extends SmartAccount | undefined = undefined
+    TChain extends Chain | undefined = Chain | undefined,
+    TSmartAccount extends SmartAccount | undefined = SmartAccount | undefined
 >(
     parameters: SmartAccountClientConfig<TTransport, TChain, TSmartAccount> &
         SponsorUserOperationMiddleware

package/clients/decorators/smartAccount.ts

@@ -2,6 +2,8 @@ import type {
     Abi,
     Chain,
     Client,
+    ContractFunctionArgs,
+    ContractFunctionName,
     DeployContractParameters,
     SendTransactionParameters,
     Transport,
@@ -283,9 +285,7 @@ export type SmartAccountActions<
             TSmartAccount,
             TChainOverride
         >
-    ) => ReturnType<
-        typeof deployContract<TAbi, TChain, TSmartAccount, TChainOverride>
-    >
+    ) => ReturnType<typeof deployContract<TChain, TSmartAccount>>
     /**
      * Executes a write function on a contract.
      * This function also allows you to sponsor this transaction if sender is a smartAccount
@@ -336,12 +336,21 @@ export type SmartAccountActions<
      */
     writeContract: <
         const TAbi extends Abi | readonly unknown[],
-        TFunctionName extends string,
+        TFunctionName extends ContractFunctionName<
+            TAbi,
+            "nonpayable" | "payable"
+        > = ContractFunctionName<TAbi, "nonpayable" | "payable">,
+        TArgs extends ContractFunctionArgs<
+            TAbi,
+            "nonpayable" | "payable",
+            TFunctionName
+        > = ContractFunctionArgs<TAbi, "nonpayable" | "payable", TFunctionName>,
         TChainOverride extends Chain | undefined = undefined
     >(
         args: WriteContractParameters<
             TAbi,
             TFunctionName,
+            TArgs,
             TChain,
             TSmartAccount,
             TChainOverride
@@ -352,6 +361,7 @@ export type SmartAccountActions<
             TSmartAccount,
             TAbi,
             TFunctionName,
+            TArgs,
             TChainOverride
         >
     >
@@ -435,7 +445,10 @@ export const smartAccountActions =
         client: Client<TTransport, TChain, TSmartAccount>
     ): SmartAccountActions<TChain, TSmartAccount> => ({
         prepareUserOperationRequest: (args) =>
-            prepareUserOperationRequest(client, args),
+            prepareUserOperationRequest(client, {
+                ...args,
+                sponsorUserOperation
+            }),
         deployContract: (args) =>
             deployContract(client, {
                 ...args,
@@ -462,5 +475,5 @@ export const smartAccountActions =
             writeContract(client, {
                 ...args,
                 sponsorUserOperation
-            } as WriteContractWithPaymasterParameters)
+            } as WriteContractWithPaymasterParameters<TChain, TSmartAccount>)
     })

package/package.json

@@ -1,7 +1,9 @@
 {
     "name": "permissionless",
-    "version": "0.0.20",
+    "version": "0.0.22",
     "author": "Pimlico",
+    "homepage": "https://docs.pimlico.io/permissionless",
+    "repository": "github:pimlicolabs/permissionless.js",
     "main": "./_cjs/index.js",
     "module": "./_esm/index.js",
     "types": "./_types/index.d.ts",
@@ -70,6 +72,6 @@
         }
     },
     "peerDependencies": {
-        "viem": "^1.19.4"
+        "viem": "^2.0.0"
     }
 }

package/types/index.ts

@@ -1,7 +1,6 @@
 import type { Account, Chain, Client, Transport } from "viem"
 import type { SmartAccount } from "../accounts/types.js"
 import type { UserOperation } from "./userOperation.js"
-
 export type { UserOperation }
 
 type IsUndefined<T> = [undefined] extends [T] ? true : false

package/utils/walletClientToCustomSigner.ts

@@ -10,6 +10,7 @@ import type {
     WalletClient
 } from "viem"
 
+import { signTypedData } from "viem/actions"
 import type { SmartAccountSigner } from "../accounts/types.js"
 
 export function walletClientToCustomSigner<
@@ -27,16 +28,19 @@ export function walletClientToCustomSigner<
         }: { message: SignableMessage }): Promise<Hex> => {
             return walletClient.signMessage({ message })
         },
-        signTypedData: async <
-            const TTypedData extends TypedData | { [key: string]: unknown },
-            TPrimaryType extends string = string
-        >(
-            typedData: TypedDataDefinition<TTypedData, TPrimaryType>
-        ): Promise<Hex> => {
-            return walletClient.signTypedData({
-                account: walletClient.account,
-                ...typedData
-            })
+        async signTypedData<
+            const TTypedData extends TypedData | Record<string, unknown>,
+            TPrimaryType extends
+                | keyof TTypedData
+                | "EIP712Domain" = keyof TTypedData
+        >(typedData: TypedDataDefinition<TTypedData, TPrimaryType>) {
+            return signTypedData<TTypedData, TPrimaryType, TChain, Account>(
+                walletClient,
+                {
+                    account: walletClient.account,
+                    ...typedData
+                }
+            )
         }
     }
 }