sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
7d5e31a [Qt] remove trailing output-index from transaction-id (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2016-03-30 15:44:40 +02:00 committed by Alexander Block
parent 1c84417780
commit 18da34e295
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/transactiondesc.cpp
View File

@ -264,7 +264,8 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty()) if (wtx.mapValue.count("comment") && !wtx.mapValue["comment"].empty())
strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.mapValue["comment"], true) + "<br>"; 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>";
strHTML += "<b>" + tr("Transaction total size") + ":</b> " + QString::number(wtx.GetTotalSize()) + " bytes<br>"; strHTML += "<b>" + tr("Transaction total size") + ":</b> " + QString::number(wtx.GetTotalSize()) + " bytes<br>";
// Message from normal dash:URI (dash:XyZ...?message=example) // Message from normal dash:URI (dash:XyZ...?message=example)

7
src/qt/transactionrecord.cpp
View File

@ -324,11 +324,10 @@ bool TransactionRecord::statusUpdateNeeded()
QString TransactionRecord::getTxID() const 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;
} }

4
src/qt/transactionrecord.h
View File

@ -138,8 +138,8 @@ public:
/** Return the unique identifier for this transaction (part) */ /** Return the unique identifier for this transaction (part) */
QString getTxID() const; QString getTxID() const;
/** Format subtransaction id */ /** Return the output index of the subtransaction */
static QString formatSubTxId(const uint256 &hash, int vout); int getOutputIndex() const;
/** Update status from core wallet tx. /** Update status from core wallet tx.
*/ */