diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index deb1b2fa0c..15037dff34 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -19,7 +19,7 @@ var css = csjs` align-items: baseline; } .txTable, .tr, .td { - border: 1px solid ${styles.colors.orange}; + border: 1px solid ${styles.colors.lightOrange}; border-collapse: collapse; font-size: 10px; color: ${styles.colors.grey}; @@ -103,21 +103,18 @@ function log (self, tx, api) { } function renderKnownTransaction (self, data) { - var from = helper.shortenAddress(data.tx.from) + var from = data.tx.from var to = '' if (data.tx.blockHash) { - to = helper.shortenAddress(data.tx.to) + to = data.tx.to } else if (data.tx.hash) { // call (constructor of function call) var name = data.resolvedData.contractName + '.' + data.resolvedData.fn - var logs = ',' + ' 0 logs' + var logs = ',' + data.logs.length + ' logs' if (data.resolvedData.fn === '(constructor)') { to = name + logs - from = from + ' ' + name + logs } else { - var toHash = helper.shortenAddress(data.resolvedData.to) - to = name + ' ' + toHash + logs - from = from + ' ' + name + logs + to = data.resolvedData.to } } @@ -127,7 +124,7 @@ function renderKnownTransaction (self, data) { var tx = yo`
- ${context(self, data.tx)}, ${data.resolvedData.contractName}.${data.resolvedData.fn}, ${data.logs.length} logs + ${context(self, data)}
@@ -152,16 +149,15 @@ function renderKnownTransaction (self, data) { } function renderUnknownTransaction (self, data) { - var from = helper.shortenAddress(data.tx.from) + var from = data.tx.from var to = data.tx.to - if (to) to = helper.shortenAddress(data.tx.to) function debug () { self.event.trigger('debugRequested', [data.tx.hash]) } var tx = yo`
- ${context(self, data.tx)} + ${context(self, data)}
@@ -187,11 +183,22 @@ function renderEmptyBlock (self, data) { return yo`block ${data.block.number} - O transactions` } -function context (self, tx) { +function context (self, data) { + var from = helper.shortenHexData(data.tx.from) + var to = '' if (executionContext.getProvider() === 'vm') { - return yo`(vm)` + if (data.resolvedData.to) { + to = `${data.resolvedData.contractName}.${data.resolvedData.fn}, ${data.resolvedData.to}, ${data.logs.length} logs` + } else { + to = `${data.resolvedData.contractName}.${data.resolvedData.fn}, ${data.logs.length} logs` + } + return yo`[vm] from: ${from}, to:${to}, value:${data.tx.value} wei` } else { - return yo`block:${tx.blockNumber}, txIndex:${tx.transactionIndex}` + var hash = helper.shortenHexData(data.tx.blockHash) + var block = data.tx.blockNumber + var i = data.tx.transactionIndex + var val = data.tx.value + return yo`[block:${block} txIndex:${i}] from:${from}, to:${hash}, value:${value(val)} wei` } }