Unverified Commit 8c5ad13c authored by yann300's avatar yann300 Committed by GitHub

Merge pull request #2713 from ethereum/txhash-terminal

Fixed wrong display of block number and index [block: txIndex:] for transactions in terminal.
parents 18e1151a ffaea7e7
......@@ -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`
......
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