Skip to content

Commit

Permalink
Merge pull request #3203 from ethereum/issue/3175-hotfix
Browse files Browse the repository at this point in the history
Revert 3123
  • Loading branch information
nivida authored Nov 14, 2019
2 parents 0f64355 + e7fdb98 commit 72d1da0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ Released with 1.0.0-beta.37 code base.

### Fixed

- Fix perfect gas usage causes tx to error (#3175)
- Fix regenerator runtime error in web3.min.js (#3155)
- Fix TS types for eth.subscribe syncing, newBlockHeaders, pendingTransactions (#3159)
- Improve web3-eth-abi decodeParameters error message (#3134)
2 changes: 1 addition & 1 deletion packages/web3-core-method/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ Method.prototype._confirmTransaction = function(defer, result, payload) {
.then(function(receipt) {
if (!isContractDeployment && !promiseResolved) {
if (!receipt.outOfGas &&
(!gasProvided || gasProvided !== utils.numberToHex(receipt.gasUsed)) &&
(!gasProvided || gasProvided !== receipt.gasUsed) &&
(receipt.status === true || receipt.status === '0x1' || typeof receipt.status === 'undefined')) {
defer.eventEmitter.emit('receipt', receipt);
defer.resolve(receipt);
Expand Down

0 comments on commit 72d1da0

Please sign in to comment.