listen to new transaction using blockchain abstraction instead of txlistener

pull/5370/head
Iuri Matias 5 years ago committed by yann300
parent 8a7b0caafe
commit bfa947c8cc
  1. 2
      src/app/ui/txLogger.js
  2. 5
      src/blockchain/blockchain.js
  3. 8
      src/blockchain/universalDapp.js

@ -164,7 +164,7 @@ class TxLogger {
} }
}) })
this.txListener.event.register('newTransaction', (tx, receipt) => { blockchain.event.register('newTransaction', (tx, receipt) => {
log(this, tx, receipt) log(this, tx, receipt)
}) })

@ -266,7 +266,10 @@ class Blockchain {
} }
startListening (txlistener) { 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, params, lookupOnly, logMsg, logCallback, outputCb, callbacksInContext) { runOrCallContractMethod (contractName, contractABI, funABI, value, address, params, lookupOnly, logMsg, logCallback, outputCb, callbacksInContext) {

@ -33,14 +33,6 @@ class UniversalDApp {
this.executionContext.event.register('contextChanged', this.resetEnvironment.bind(this)) 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 () { resetEnvironment () {
this.accounts = {} this.accounts = {}
if (this.executionContext.isVM()) { if (this.executionContext.isVM()) {

Loading…
Cancel
Save