fix: #1922

wevm · Mar 17, 2024 · a4782bb · a4782bb
1 parent bd08183
commit a4782bb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/.changeset/gentle-lamps-rhyme.md b/.changeset/gentle-lamps-rhyme.md
@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Fixed `eth_unsubscribe` not being called for watch action teardown.
diff --git a/src/actions/public/watchBlockNumber.ts b/src/actions/public/watchBlockNumber.ts
@@ -180,7 +180,7 @@ export function watchBlockNumber<
           onError?.(err as Error)
         }
       })()
-      return unsubscribe
+      return () => unsubscribe()
     })
   }
 

diff --git a/src/actions/public/watchBlocks.ts b/src/actions/public/watchBlocks.ts
@@ -218,7 +218,7 @@ export function watchBlocks<
         onError?.(err as Error)
       }
     })()
-    return unsubscribe
+    return () => unsubscribe()
   }
 
   return enablePolling ? pollBlocks() : subscribeBlocks()

diff --git a/src/actions/public/watchContractEvent.ts b/src/actions/public/watchContractEvent.ts
@@ -339,7 +339,7 @@ export function watchContractEvent<
           onError?.(err as Error)
         }
       })()
-      return unsubscribe
+      return () => unsubscribe()
     })
   }
 

diff --git a/src/actions/public/watchEvent.ts b/src/actions/public/watchEvent.ts
@@ -349,7 +349,7 @@ export function watchEvent<
         onError?.(err as Error)
       }
     })()
-    return unsubscribe
+    return () => unsubscribe()
   }
 
   return enablePolling ? pollEvent() : subscribeEvent()

diff --git a/src/actions/public/watchPendingTransactions.ts b/src/actions/public/watchPendingTransactions.ts
@@ -157,7 +157,7 @@ export function watchPendingTransactions<
         onError?.(err as Error)
       }
     })()
-    return unsubscribe
+    return () => unsubscribe()
   }
 
   return enablePolling