diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 817148b682..688969377e 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -23,6 +23,14 @@ var css = csjs` .txLog { width: 75%; } + .txItem { + color: ${styles.terminal.text_Primary}; + margin-right: 5px; + float: left; + } + .txItemTitle { + font-weight: bold; + } .tx { color: ${styles.terminal.text_Title_TransactionLog}; font-weight: bold; @@ -206,7 +214,14 @@ function renderCall (self, data) { var tx = yo`
- [call] from:${from}, to:${to}, data:${input}, return: + + [call] +
+
from: ${from} +
to: ${to} +
data: ${input} +
return: +
@@ -284,7 +299,10 @@ function renderUnknownTransaction (self, data) { } function renderEmptyBlock (self, data) { - return yo`[block:${data.block.number} - 0 transactions]` + return yo` + +
[block:${data.block.number} - 0 transactions] + ` } function context (self, opts) { @@ -300,13 +318,40 @@ function context (self, opts) { var i = data.tx.transactionIndex var value = val ? typeConversion.toInt(val) : 0 if (executionContext.getProvider() === 'vm') { - return yo`[vm] from:${from}, to:${to}, value:${value} wei, data:${input}, ${logs} logs, hash:${hash}` + return yo` + + [vm] +
+
from: ${from} +
to: ${to} +
value: ${value} wei +
data: ${input} +
logs: ${logs} +
hash: ${hash} + ` } else if (executionContext.getProvider() !== 'vm' && data.resolvedData) { - return yo`[block:${block} txIndex:${i}] from:${from}, to:${to}, value:${value} wei, ${logs} logs, data:${input}, hash:${hash}` + return yo` + + [block:${block} txIndex:${i}] +
+
from: ${from} +
to: ${to} +
value: ${value} wei +
data: ${input} +
logs: ${logs} +
hash: ${hash} + ` } else { to = helper.shortenHexData(to) hash = helper.shortenHexData(data.tx.blockHash) - return yo`[block:${block} txIndex:${i}] from:${from}, to:${to}, value:${value} wei` + return yo` + + [block:${block} txIndex:${i}] +
+
from: ${from} +
to: ${to} +
value: ${value} wei + ` } }