Merge pull request #205 from pimlicolabs/fix/waitForUserOperationReceipt

Fix logs type for receipts
pimlicolabs · May 13, 2024 · 5125325 · 5125325
2 parents 2fc04df + 5fa31f2
commit 5125325
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/.changeset/light-mangos-design.md b/.changeset/light-mangos-design.md
@@ -0,0 +1,5 @@
+---
+"permissionless": patch
+---
+
+Made type of waitForUserOperationReceipt.logs consistent with Log from viem
diff --git a/packages/permissionless/actions/bundler/getUserOperationReceipt.ts b/packages/permissionless/actions/bundler/getUserOperationReceipt.ts
@@ -5,6 +5,7 @@ import type {
     Client,
     Hash,
     Hex,
+    Log,
     Transport
 } from "viem"
 import type { BundlerClient } from "../../clients/createBundlerClient"
@@ -42,16 +43,7 @@ export type GetUserOperationReceiptReturnType = {
         logsBloom: Hex
         effectiveGasPrice: bigint
     }
-    logs: {
-        data: Hex
-        blockNumber: bigint
-        blockHash: Hash
-        transactionHash: Hash
-        logIndex: bigint
-        transactionIndex: bigint
-        address: Address
-        topics: Hex[]
-    }[]
+    logs: Log[]
 }
 
 /**
@@ -123,10 +115,11 @@ export const getUserOperationReceipt = async <
             blockNumber: BigInt(log.blockNumber),
             blockHash: log.blockHash,
             transactionHash: log.transactionHash,
-            logIndex: BigInt(log.logIndex),
-            transactionIndex: BigInt(log.transactionIndex),
+            logIndex: Number(log.logIndex),
+            transactionIndex: Number(log.transactionIndex),
             address: log.address,
-            topics: log.topics
+            topics: log.topics,
+            removed: log.removed
         }))
     }
 

diff --git a/packages/permissionless/types/bundler.ts b/packages/permissionless/types/bundler.ts
@@ -111,7 +111,8 @@ type UserOperationReceiptWithBigIntAsHex = {
         logIndex: Hex
         transactionIndex: Hex
         address: Address
-        topics: Hex[]
+        topics: [Hex, ...Hex[]] | []
+        removed: boolean
     }[]
 }