Unverified Commit e6268175 authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #844 from ethereum/retrieveReceipt

Retrieve receipt
parents d3e98877 8d98d382
...@@ -200,13 +200,16 @@ class TxListener { ...@@ -200,13 +200,16 @@ class TxListener {
_resolve (transactions, callback) { _resolve (transactions, callback) {
async.each(transactions, (tx, cb) => { async.each(transactions, (tx, cb) => {
this._resolveTx(tx, (error, resolvedData) => { executionContext.web3().eth.getTransactionReceipt(tx.hash, (error, receipt) => {
if (error) cb(error) if (error) return cb(error)
if (resolvedData) { this._resolveTx(receipt, (error, resolvedData) => {
this.event.trigger('txResolved', [tx, resolvedData]) if (error) cb(error)
} if (resolvedData) {
this.event.trigger('newTransaction', [tx]) this.event.trigger('txResolved', [receipt, resolvedData])
cb() }
this.event.trigger('newTransaction', [receipt])
cb()
})
}) })
}, () => { }, () => {
callback() callback()
......
...@@ -121,6 +121,7 @@ web3VmProvider.prototype.txProcessed = function (self, data) { ...@@ -121,6 +121,7 @@ web3VmProvider.prototype.txProcessed = function (self, data) {
}) })
} }
self.txsReceipt[self.processingHash].logs = logs self.txsReceipt[self.processingHash].logs = logs
self.txsReceipt[self.processingHash].transactionHash = self.processingHash
if (data.createdAddress) { if (data.createdAddress) {
var address = util.hexConvert(data.createdAddress) var address = util.hexConvert(data.createdAddress)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment