diff --git a/src/app/tabs/runTab/model/recorder.js b/src/app/tabs/runTab/model/recorder.js index 0de3163fb8..387cbc32a9 100644 --- a/src/app/tabs/runTab/model/recorder.js +++ b/src/app/tabs/runTab/model/recorder.js @@ -67,11 +67,10 @@ class Recorder { } }) - this.blockchain.event.register('transactionExecuted', (error, from, to, data, call, txResult, timestamp) => { + this.blockchain.event.register('transactionExecuted', (error, from, to, data, call, txResult, timestamp, _payload, rawAddress) => { if (error) return console.log(error) if (call) return - const rawAddress = this.blockchain.getAddressFromTransactionResult(txResult) if (!rawAddress) return // not a contract creation const stringAddress = this.addressToString(rawAddress) const address = ethutil.toChecksumAddress(stringAddress) diff --git a/src/blockchain/blockchain.js b/src/blockchain/blockchain.js index 033c136da6..109877c58e 100644 --- a/src/blockchain/blockchain.js +++ b/src/blockchain/blockchain.js @@ -426,8 +426,10 @@ class Blockchain { self.event.trigger('initiatingTransaction', [timestamp, tx, payLoad]) self.txRunner.rawRun(tx, confirmationCb, continueCb, promptCb, function (error, result) { + const rawAddress = self.getAddressFromTransactionResult(result) + let eventName = (tx.useCall ? 'callExecuted' : 'transactionExecuted') - self.event.trigger(eventName, [error, tx.from, tx.to, tx.data, tx.useCall, result, timestamp, payLoad]) + self.event.trigger(eventName, [error, tx.from, tx.to, tx.data, tx.useCall, result, timestamp, payLoad, rawAddress]) if (error && (typeof (error) !== 'string')) { if (error.message) error = error.message