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

Keep extra filter topics when using Frgment filters in Contracts.

Browse Source
This commit is contained in:
Richard Moore 2019-07-20 21:03:53 -03:00
parent d88ee45937
commit efaafb203f
No known key found for this signature in database
GPG Key ID: 665176BE8E9DC651
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/contracts/src.ts/index.ts
View File

@ -346,10 +346,17 @@ class FragmentRunningEvent extends RunningEvent {
readonly interface: Interface; readonly interface: Interface;
readonly fragment: EventFragment; readonly fragment: EventFragment;
constructor(address: string, contractInterface: Interface, fragment: EventFragment) { constructor(address: string, contractInterface: Interface, fragment: EventFragment, topics?: Array<string>) {
let filter = { let filter: EventFilter = {
address: address, address: address
topics: [ contractInterface.getEventTopic(fragment) ] }
let topic = contractInterface.getEventTopic(fragment);
if (topics) {
if (topic !== topics[0]) { errors.throwArgumentError("topic mismatch", "topics", topics); }
filter.topics = topics.slice();
} else {
filter.topics = [ topic ];
} }
super(getEventTag(filter), filter); super(getEventTag(filter), filter);
@ -646,7 +653,7 @@ export class Contract {
if (eventName.topics[0]) { if (eventName.topics[0]) {
let fragment = this.interface.getEvent(eventName.topics[0]); let fragment = this.interface.getEvent(eventName.topics[0]);
if (fragment) { if (fragment) {
return this._normalizeRunningEvent(new FragmentRunningEvent(this.address, this.interface, fragment)); return this._normalizeRunningEvent(new FragmentRunningEvent(this.address, this.interface, fragment, eventName.topics));
} }
} }