diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-09-21 18:36:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 18:36:58 +0800 |
| commit | ba59879e7f8f7f1d4f2a328a2f4c9555e148ffd7 (patch) | |
| tree | 0d15e99c17e2dab246554e9ee71c8535707e3024 | |
| parent | cbd72b6e3d72ba9a6e7c03bdb824949fdb08fcae (diff) | |
| parent | c10807c4e35a76a314f1c2e492a5c1410d30777e (diff) | |
| download | dexon-sol-tools-ba59879e7f8f7f1d4f2a328a2f4c9555e148ffd7.tar.gz dexon-sol-tools-ba59879e7f8f7f1d4f2a328a2f4c9555e148ffd7.tar.zst dexon-sol-tools-ba59879e7f8f7f1d4f2a328a2f4c9555e148ffd7.zip | |
Merge pull request #1079 from 0xProject/fixAwaitTxMined
Fix awaitTransactionMinedAsync for new Parity version
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 10 | ||||
| -rw-r--r-- | packages/web3-wrapper/src/web3_wrapper.ts | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 57e6f7689..2b3c09ebc 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,15 @@ [ { + "version": "2.0.3", + "changes": [ + { + "note": + "Fixes issue #1076 where Parity now returns a placeholder transactionReceipt before the transaction is mined.", + "pr": 1079 + } + ] + }, + { "timestamp": 1536142250, "version": "2.0.2", "changes": [ diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index ea78f8801..af0fe3a72 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -539,7 +539,7 @@ export class Web3Wrapper { } // Immediately check if the transaction has already been mined. let transactionReceipt = await this.getTransactionReceiptAsync(txHash); - if (!_.isNull(transactionReceipt)) { + if (!_.isNull(transactionReceipt) && !_.isNull(transactionReceipt.blockNumber)) { const logsWithDecodedArgs = _.map( transactionReceipt.logs, this.abiDecoder.tryToDecodeLogOrNoop.bind(this.abiDecoder), |