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

Jump to bottom

Resolve parity nodes invalid "eth_getBlockByNumber" JSONRPC call #2847

Merged
merged 11 commits into from
May 31, 2019
Merged

Resolve parity nodes invalid "eth_getBlockByNumber" JSONRPC call #2847

Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
648bce2
Merge pull request #1 from ethereum/1.0
joshstevens19 May 26, 2019
d600767
Merge branch '1.0' of https://github.com/joshstevens19/web3.js into 1.0
joshstevens19 May 26, 2019
1510f52
fix: resolve issue with parity nodes when a transaction is not mined …
joshstevens19 May 26, 2019
2b23d48
fix: resolve formatting
joshstevens19 May 26, 2019
093d33e
Merge branch '1.0' into resolve-parity-get-block-by-block-number-error
joshstevens19 May 28, 2019
12e5c94
Update include_announcement.rst
joshstevens19 May 28, 2019
3f2b18d
Update index.d.ts
joshstevens19 May 28, 2019
8251d74
Merge branch '1.0' into resolve-parity-get-block-by-block-number-error
nivida May 30, 2019
e0849f3
Do not emit the receipt until the transaction has a block number
joshstevens19 May 30, 2019
9c9b60a
Kill deadspace
joshstevens19 May 30, 2019
50d2cca
Merge branch '1.0' into resolve-parity-get-block-by-block-number-error
nivida May 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/web3-core-method/src/observers/TransactionObserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/**
* @file TransactionObserver.js
* @author Samuel Furter <samuel@ethereum.org>
* @author Josh Stevens <joshstevens19@hotmail.co.uk>
* @date 2019
*/

Expand Down Expand Up @@ -158,8 +159,15 @@ export default class TransactionObserver {
this.emitNext(receipt, observer);
}
} else {
this.lastBlock = await this.getBlockByNumber(receipt.blockNumber);
this.confirmations++;
// on parity nodes you can get the receipt without it being mined
// so the receipt may not have a block number at this point.
// we should check that the blockNumber is defined before we do this call
// geth nodes only return the receipt once mined as the spec states.
if (receipt.blockNumber) {
joshstevens19 marked this conversation as resolved.
Show resolved Hide resolved
this.lastBlock = await this.getBlockByNumber(receipt.blockNumber);
this.confirmations++;
}

this.emitNext(receipt, observer);
}

Expand Down