diff options
| author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-11-27 07:11:16 +0800 |
|---|---|---|
| committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-11-27 07:11:16 +0800 |
| commit | b055055253c53a9db4ec730d7285dce9c38e7a59 (patch) | |
| tree | 057e6f24529b03f6d4565361bb2cef61836ab482 /packages/web3-wrapper | |
| parent | ae570dba05cfc0d696c616d05804152791d29677 (diff) | |
| parent | 6e3d70af566b9d1fcfce83a055793a08f19ee160 (diff) | |
| download | dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.tar dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.tar.gz dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.tar.bz2 dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.tar.lz dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.tar.xz dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.tar.zst dexon-sol-tools-b055055253c53a9db4ec730d7285dce9c38e7a59.zip | |
Merge branch 'development' into feature/instant/token-picker-events
Diffstat (limited to 'packages/web3-wrapper')
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 9 | ||||
| -rw-r--r-- | packages/web3-wrapper/src/web3_wrapper.ts | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 9725640ac..ad6902e33 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "version": "3.1.6", + "changes": [ + { + "note": "Unmarshall mined transaction receipts", + "pr": 1308 + } + ] + }, + { "version": "3.1.5", "changes": [ { diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index f1247e48a..76cae4b01 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -223,7 +223,10 @@ export class Web3Wrapper { method: 'eth_getTransactionReceipt', params: [txHash], }); - if (!_.isNull(transactionReceiptRpc)) { + // HACK Parity can return a pending transaction receipt. We check for a non null + // block number before continuing with returning a fully realised receipt. + // ref: https://github.com/paritytech/parity-ethereum/issues/1180 + if (!_.isNull(transactionReceiptRpc) && !_.isNull(transactionReceiptRpc.blockNumber)) { transactionReceiptRpc.status = Web3Wrapper._normalizeTxReceiptStatus(transactionReceiptRpc.status); const transactionReceipt = marshaller.unmarshalTransactionReceipt(transactionReceiptRpc); return transactionReceipt; @@ -577,7 +580,7 @@ export class Web3Wrapper { } // Immediately check if the transaction has already been mined. let transactionReceipt = await this.getTransactionReceiptIfExistsAsync(txHash); - if (!_.isUndefined(transactionReceipt) && !_.isNull(transactionReceipt.blockNumber)) { + if (!_.isUndefined(transactionReceipt)) { const logsWithDecodedArgs = _.map( transactionReceipt.logs, this.abiDecoder.tryToDecodeLogOrNoop.bind(this.abiDecoder), |