diff --git a/src/app/ui/txLogger.js b/src/app/ui/txLogger.js index 56eafb989a..0fe4b6246e 100644 --- a/src/app/ui/txLogger.js +++ b/src/app/ui/txLogger.js @@ -164,7 +164,7 @@ class TxLogger { } }) - this.txListener.event.register('newTransaction', (tx, receipt) => { + blockchain.event.register('newTransaction', (tx, receipt) => { log(this, tx, receipt) }) diff --git a/src/blockchain/blockchain.js b/src/blockchain/blockchain.js index 537dc30541..4d68ae9c75 100644 --- a/src/blockchain/blockchain.js +++ b/src/blockchain/blockchain.js @@ -266,7 +266,10 @@ class Blockchain { } startListening (txlistener) { - this.udapp.startListening(txlistener) + txlistener.event.register('newTransaction', (tx, receipt) => { + this.event.emit('newTransaction', tx, receipt) + this.udapp.events.emit('newTransaction', tx, receipt) // for plugin backwards compatibility + }) } runOrCallContractMethod (contractName, contractAbi, funABI, value, address, callType, lookupOnly, logMsg, logCallback, outputCb, confirmationCb, continueCb, promptCb) { diff --git a/src/blockchain/universalDapp.js b/src/blockchain/universalDapp.js index 370dedbb54..ea28834529 100644 --- a/src/blockchain/universalDapp.js +++ b/src/blockchain/universalDapp.js @@ -33,14 +33,6 @@ class UniversalDApp { this.executionContext.event.register('contextChanged', this.resetEnvironment.bind(this)) } - // TODO : event should be triggered by Udapp instead of TxListener - /** Listen on New Transaction. (Cannot be done inside constructor because txlistener doesn't exist yet) */ - startListening (txlistener) { - txlistener.event.register('newTransaction', (tx) => { - this.events.emit('newTransaction', tx) - }) - } - resetEnvironment () { this.accounts = {} if (this.executionContext.isVM()) {