Make waitForUserOperationReceipt return non nullable

pimlicolabs · Oct 19, 2023 · c344b77 · c344b77
1 parent b59d48e
commit c344b77
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/actions/bundler/getUserOperationReceipt.ts b/src/actions/bundler/getUserOperationReceipt.ts
@@ -38,7 +38,7 @@ export type GetUserOperationReceiptReturnType = {
         address: Address
         topics: Hex[]
     }[]
-} | null
+}
 
 /**
  * Returns the user operation receipt from userOpHash
@@ -62,7 +62,10 @@ export type GetUserOperationReceiptReturnType = {
  * getUserOperationReceipt(bundlerClient, {hash: userOpHash})
  *
  */
-export const getUserOperationReceipt = async (client: BundlerClient, { hash }: GetUserOperationReceiptParameters) => {
+export const getUserOperationReceipt = async (
+    client: BundlerClient,
+    { hash }: GetUserOperationReceiptParameters
+): Promise<GetUserOperationReceiptReturnType | null> => {
     const params: [Hash] = [hash]
 
     const response = await client.request({

diff --git a/src/actions/bundler/waitForUserOperationReceipt.ts b/src/actions/bundler/waitForUserOperationReceipt.ts
@@ -64,14 +64,16 @@ export const waitForUserOperationReceipt = <TChain extends Chain | undefined>(
                     _unobserve()
                 }
 
+                const _userOperationReceipt = await getUserOperationReceipt(bundlerClient, { hash })
+
+                if (_userOperationReceipt !== null) {
+                    userOperationReceipt = _userOperationReceipt
+                }
+
                 if (userOperationReceipt) {
                     done(() => emit.resolve(userOperationReceipt))
                     return
                 }
-
-                userOperationReceipt = await getUserOperationReceipt(bundlerClient, { hash })
-
-                if (!userOperationReceipt) return
             }, pollingInterval)
         })
     })

diff --git a/src/clients/decorators/bundler.ts b/src/clients/decorators/bundler.ts
@@ -163,7 +163,9 @@ export type BundlerActions = {
      * await bundlerClient.getUserOperationReceipt({hash: userOpHash})
      *
      */
-    getUserOperationReceipt: (args: GetUserOperationReceiptParameters) => Promise<GetUserOperationReceiptReturnType>
+    getUserOperationReceipt: (
+        args: GetUserOperationReceiptParameters
+    ) => Promise<GetUserOperationReceiptReturnType | null>
 
     /**
      * Waits for the User Operation to be included on a [Block](https://viem.sh/docs/glossary/terms.html#block) (one confirmation), and then returns the [User Operation Receipt](https://docs.pimlico.io/permissionless/reference/bundler-actions/getUserOperationReceipt).

diff --git a/test/bundlerActions.test.ts b/test/bundlerActions.test.ts
@@ -2,7 +2,6 @@ import dotenv from "dotenv"
 import {
     BundlerClient,
     GetUserOperationReceiptReturnType,
-    UserOperation,
     WaitForUserOperationReceiptTimeoutError,
     createBundlerClient
 } from "permissionless"