Permalink
Browse files

Merge #7761: [Qt] remove trailing output-index from transaction-id

7d5e31a [Qt] remove trailing output-index from transaction-id (Jonas Schnelli)
  • Loading branch information...
laanwj committed Mar 30, 2016
2 parents 352fd57 + 7d5e31a commit 60db51dcb2005506e91d13a37eaaca5cd82a76d7
Showing with 7 additions and 7 deletions.
  1. +2 −1 src/qt/transactiondesc.cpp
  2. +3 −4 src/qt/transactionrecord.cpp
  3. +2 −2 src/qt/transactionrecord.h
@@ -240,7 +240,8 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>";
strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), rec->idx) + "<br>";
strHTML += "<b>" + tr("Transaction ID") + ":</b> " + rec->getTxID() + "<br>";
strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
// Message from normal bitcoin:URI (bitcoin:123...?message=example)
Q_FOREACH (const PAIRTYPE(std::string, std::string)& r, wtx.vOrderForm)
@@ -260,11 +260,10 @@ bool TransactionRecord::statusUpdateNeeded()
QString TransactionRecord::getTxID() const
{
return formatSubTxId(hash, idx);
return QString::fromStdString(hash.ToString());
}
QString TransactionRecord::formatSubTxId(const uint256 &hash, int vout)
int TransactionRecord::getOutputIndex() const
{
return QString::fromStdString(hash.ToString() + strprintf("-%03d", vout));
return idx;
}
@@ -128,8 +128,8 @@ class TransactionRecord
/** Return the unique identifier for this transaction (part) */
QString getTxID() const;
/** Format subtransaction id */
static QString formatSubTxId(const uint256 &hash, int vout);
/** Return the output index of the subtransaction */
int getOutputIndex() const;
/** Update status from core wallet tx.
*/

0 comments on commit 60db51d

Please sign in to comment.