zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Qt] remove trailing output-index from transaction-id 

The trailing output-index leads to cases where the user can't look-up the transaction ID in various systems.
This commit is contained in:
Jonas Schnelli 2016-03-29 11:17:47 +02:00
parent 26794d4645
commit 7d5e31a82b
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
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

@ -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)

7
src/qt/transactionrecord.cpp
View File

@ -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;
}

4
src/qt/transactionrecord.h
View File

@ -128,8 +128,8 @@ public:
/** 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.
*/