Merge pull request #2713 from ethereum/txhash-terminal

Fixed wrong display of block number and index [block: txIndex:] for transactions in terminal.
ethereum · Apr 14, 2020 · 8c5ad13 · 8c5ad13
2 parents 18e1151 + ffaea7e
commit 8c5ad13
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/ui/txLogger.js b/src/app/ui/txLogger.js
@@ -299,8 +299,8 @@ function context (self, opts, blockchain) {
  var hash = data.tx.hash ? helper.shortenHexData(data.tx.hash) : ''
  var input = data.tx.input ? helper.shortenHexData(data.tx.input) : ''
  var logs = data.logs && data.logs.decoded && data.logs.decoded.length ? data.logs.decoded.length : 0
- var block = data.tx.blockNumber || ''
- var i = data.tx.transactionIndex
+ var block = data.receipt ? data.receipt.blockNumber : data.tx.blockNumber || ''
+ var i = data.receipt ? data.receipt.transactionIndex : data.tx.transactionIndex
  var value = val ? typeConversion.toInt(val) : 0
  if (blockchain.getProvider() === 'vm') {
  return yo`