Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid skipping of events #2274

Closed
wants to merge 2 commits into from
Closed

Avoid skipping of events #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21b01e7
revised tracking of lastBlockNumber
claasahl Oct 25, 2021
6ce6947
npm run build
claasahl Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/providers/lib/base-provider.d.ts.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions packages/providers/lib/base-provider.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/providers/lib/base-provider.js.map
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions packages/providers/src.ts/base-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,13 +851,18 @@ export class BaseProvider extends Provider implements EnsProvider {
this._lastBlockNumber = blockNumber - 1;
}

// Make sure we don't poll too much data. Here we are using the same
// threshold as for removing obsolete events.
let latestBlockNumber = Math.max(this._lastBlockNumber, blockNumber - 12);

// Find all transaction hashes we are waiting on
this._events.forEach((event) => {
switch (event.type) {
case "tx": {
const hash = event.hash;
let runner = this.getTransactionReceipt(hash).then((receipt) => {
if (!receipt || receipt.blockNumber == null) { return null; }
latestBlockNumber = Math.max(latestBlockNumber, receipt.blockNumber);
this._emitted["t:" + hash] = receipt.blockNumber;
this.emit(hash, receipt);
return null;
Expand All @@ -876,6 +881,7 @@ export class BaseProvider extends Provider implements EnsProvider {
const runner = this.getLogs(filter).then((logs) => {
if (logs.length === 0) { return; }
logs.forEach((log: Log) => {
latestBlockNumber = Math.max(latestBlockNumber, log.blockNumber);
this._emitted["b:" + log.blockHash] = log.blockNumber;
this._emitted["t:" + log.transactionHash] = log.blockNumber;
this.emit(filter, log);
Expand All @@ -888,10 +894,9 @@ export class BaseProvider extends Provider implements EnsProvider {
}
});

this._lastBlockNumber = blockNumber;

// Once all events for this loop have been processed, emit "didPoll"
Promise.all(runners).then(() => {
this._lastBlockNumber = latestBlockNumber;
this.emit("didPoll", pollId);
}).catch((error) => { this.emit("error", error); });

Expand Down