tornado-packages/ethers.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed WebSocketProvider filter events (#784).

Browse Source
This commit is contained in:
Richard Moore 2020-04-15 16:46:15 -04:00
parent 7498c18235
commit 69f707762e
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/providers/src.ts/base-provider.ts
View File

@ -123,6 +123,16 @@ export class Event {
defineReadOnly(this, "once", once); 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 { get type(): string {
return this.tag.split(":")[0] return this.tag.split(":")[0]
} }

14
packages/providers/src.ts/websocket-provider.ts
View File

@ -13,7 +13,6 @@ import { Logger } from "@ethersproject/logger";
import { version } from "./_version"; import { version } from "./_version";
const logger = new Logger(version); const logger = new Logger(version);
/** /**
* Notes: * Notes:
* *
@ -40,11 +39,11 @@ export type Subscription = {
tag: string; tag: string;
processFunc: (payload: any) => void; 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 { export class WebSocketProvider extends JsonRpcProvider {
readonly _websocket: any; readonly _websocket: any;
readonly _requests: { [ name: string ]: InflightRequest }; readonly _requests: { [ name: string ]: InflightRequest };
@ -237,7 +236,7 @@ export class WebSocketProvider extends JsonRpcProvider {
return; return;
} }
tag = "tx"; tag = "tx";
} else if (this.listenerCount(event.tag)) { } else if (this.listenerCount(event.event)) {
// There are remaining event listeners // There are remaining event listeners
return; return;
} }
@ -252,5 +251,4 @@ export class WebSocketProvider extends JsonRpcProvider {
this.send("eth_unsubscribe", [ subId ]); this.send("eth_unsubscribe", [ subId ]);
}); });
} }
} }