diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-09-24 22:48:47 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-09-24 22:48:47 +0800 |
| commit | 748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94 (patch) | |
| tree | 23b639eda8384ca5117271b8b40d9c6d0d1e1851 /packages/web3-wrapper | |
| parent | f6e1bf78c8c73221e06b3356c37a269265221275 (diff) | |
| parent | 8bce407aec414fbaf80a7132bdf43c5b9f66247b (diff) | |
| download | dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.tar dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.tar.gz dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.tar.bz2 dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.tar.lz dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.tar.xz dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.tar.zst dexon-sol-tools-748a8a8ae30dd09cec4a8a5f5cf3e3c0381d4f94.zip | |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into fix/website/signing-order-validation-bug
Diffstat (limited to 'packages/web3-wrapper')
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 11 | ||||
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | packages/web3-wrapper/package.json | 12 | ||||
| -rw-r--r-- | packages/web3-wrapper/src/web3_wrapper.ts | 2 |
4 files changed, 22 insertions, 7 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 57e6f7689..1653f388c 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,16 @@ [ { + "version": "2.0.3", + "changes": [ + { + "note": + "Fixes issue #1076 where Parity now returns a placeholder transactionReceipt before the transaction is mined.", + "pr": 1079 + } + ], + "timestamp": 1537541580 + }, + { "timestamp": 1536142250, "version": "2.0.2", "changes": [ diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 17f2b9f48..72aff4a95 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.0.3 - _September 21, 2018_ + + * Fixes issue #1076 where Parity now returns a placeholder transactionReceipt before the transaction is mined. (#1079) + ## v2.0.2 - _September 5, 2018_ * Dependencies updated diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 05ea4da17..bcd640839 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "2.0.2", + "version": "2.0.3", "engines": { "node": ">=6.12" }, @@ -53,11 +53,11 @@ "typescript": "3.0.1" }, "dependencies": { - "@0xproject/assert": "^1.0.8", - "@0xproject/json-schemas": "^1.0.1", - "@0xproject/typescript-typings": "^2.0.0", - "@0xproject/utils": "^1.0.8", - "ethereum-types": "^1.0.6", + "@0xproject/assert": "^1.0.9", + "@0xproject/json-schemas": "^1.0.2", + "@0xproject/typescript-typings": "^2.0.1", + "@0xproject/utils": "^1.0.9", + "ethereum-types": "^1.0.7", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "lodash": "^4.17.5" 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), |