Commit ff6aa80d authored by yann300's avatar yann300

use tx logger

parent ad90b48c
...@@ -32,6 +32,7 @@ var RighthandPanel = require('./app/panels/righthand-panel') ...@@ -32,6 +32,7 @@ var RighthandPanel = require('./app/panels/righthand-panel')
var examples = require('./app/editor/example-contracts') var examples = require('./app/editor/example-contracts')
var modalDialogCustom = require('./app/ui/modal-dialog-custom') var modalDialogCustom = require('./app/ui/modal-dialog-custom')
var Txlistener = require('./app/execution/txListener') var Txlistener = require('./app/execution/txListener')
var txLogger = require('./app/execution/txLogger')
var EventsDecoder = require('./app/execution/eventsDecoder') var EventsDecoder = require('./app/execution/eventsDecoder')
var Web3VMProvider = remix.web3.web3VMProvider var Web3VMProvider = remix.web3.web3VMProvider
...@@ -812,33 +813,28 @@ function run () { ...@@ -812,33 +813,28 @@ function run () {
txlistener.startListening() txlistener.startListening()
txlistener.event.register('newTransaction', (tx) => { txLogger({
var resolvedTransaction = txlistener.resolvedTransaction(tx.hash) api: {
var address = null /**
if (resolvedTransaction) { * log the given transaction.
var resolvedContract *
address = resolvedTransaction.contractAddress ? resolvedTransaction.contractAddress : tx.to * @param {Object} tx - DOM element representing the transaction
resolvedContract = txlistener.resolvedContract(address) */
if (resolvedContract) { log: function (tx) {
eventsDecoder.parseLogs(tx, resolvedContract, compiledContracts(), (error, log) => { // terminal.log(tx)
console.log({ },
tx: tx, resolvedTransaction: function (hash) {
resolvedTransaction: resolvedTransaction, return txlistener.resolvedTransaction(hash)
resolvedContract: resolvedContract, },
resolvedEvents: (!error ? log : error) parseLogs: function (tx, contractName, contracts, cb) {
}) eventsDecoder.parseLogs(tx, contractName, contracts, cb)
}) },
} else { compiledContracts: function () {
console.log({ return compiledContracts()
tx: tx,
resolvedTransaction: resolvedTransaction
})
} }
} else { },
// contract unknown - just displaying raw tx. events: {
console.log({ txListener: txlistener.event
tx: tx
})
} }
}) })
......
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