diff --git a/remix-lib/src/execution/txListener.js b/remix-lib/src/execution/txListener.js index ede2cd7b0e..a36bbab59d 100644 --- a/remix-lib/src/execution/txListener.js +++ b/remix-lib/src/execution/txListener.js @@ -200,13 +200,16 @@ class TxListener { _resolve (transactions, callback) { async.each(transactions, (tx, cb) => { - this._resolveTx(tx, (error, resolvedData) => { - if (error) cb(error) - if (resolvedData) { - this.event.trigger('txResolved', [tx, resolvedData]) - } - this.event.trigger('newTransaction', [tx]) - cb() + executionContext.web3().eth.getTransactionReceipt(tx.hash, (error, receipt) => { + if (error) return cb(error) + this._resolveTx(receipt, (error, resolvedData) => { + if (error) cb(error) + if (resolvedData) { + this.event.trigger('txResolved', [receipt, resolvedData]) + } + this.event.trigger('newTransaction', [receipt]) + cb() + }) }) }, () => { callback() diff --git a/remix-lib/src/web3Provider/web3VmProvider.js b/remix-lib/src/web3Provider/web3VmProvider.js index 5294e925f3..189a44617e 100644 --- a/remix-lib/src/web3Provider/web3VmProvider.js +++ b/remix-lib/src/web3Provider/web3VmProvider.js @@ -121,6 +121,7 @@ web3VmProvider.prototype.txProcessed = function (self, data) { }) } self.txsReceipt[self.processingHash].logs = logs + self.txsReceipt[self.processingHash].transactionHash = self.processingHash if (data.createdAddress) { var address = util.hexConvert(data.createdAddress)