Fixed WebSocketProvider filter events (#784).

ethers-io · Apr 15, 2020 · 69f7077 · 69f7077
1 parent 7498c18
commit 69f7077
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/packages/providers/src.ts/base-provider.ts b/packages/providers/src.ts/base-provider.ts
@@ -123,6 +123,16 @@ export class Event {
         defineReadOnly(this, "once", once);
     }
 
+    get event(): EventType {
+        switch (this.type) {
+            case "tx":
+               return this.hash;
+            case "filter":
+               return this.filter;
+        }
+        return this.tag;
+    }
+
     get type(): string {
         return this.tag.split(":")[0]
     }

diff --git a/packages/providers/src.ts/websocket-provider.ts b/packages/providers/src.ts/websocket-provider.ts
@@ -13,7 +13,6 @@ import { Logger } from "@ethersproject/logger";
 import { version } from "./_version";
 const logger = new Logger(version);
 
-
 /**
  *  Notes:
  *
@@ -40,11 +39,11 @@ export type Subscription = {
     tag: string;
     processFunc: (payload: any) => void;
 };
-/*
-function subscribable(tag: string): boolean {
-    return (tag === "block" || tag === "pending");
-}
-*/
+
+
+// For more info about the Real-time Event API see:
+//   https://geth.ethereum.org/docs/rpc/pubsub
+
 export class WebSocketProvider extends JsonRpcProvider {
     readonly _websocket: any;
     readonly _requests: { [ name: string ]: InflightRequest };
@@ -237,7 +236,7 @@ export class WebSocketProvider extends JsonRpcProvider {
                 return;
             }
             tag = "tx";
-        } else if (this.listenerCount(event.tag)) {
+        } else if (this.listenerCount(event.event)) {
             // There are remaining event listeners
             return;
         }
@@ -252,5 +251,4 @@ export class WebSocketProvider extends JsonRpcProvider {
             this.send("eth_unsubscribe", [ subId ]);
         });
     }
-
 }