diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -294,7 +294,7 @@
}
strHTML +=
- "" + tr("Transaction ID") + ": " + rec->getTxID() + "
";
+ "" + tr("Transaction ID") + ": " + rec->getTxHash() + "
";
strHTML += "" + tr("Transaction total size") + ": " +
QString::number(wtx.tx->GetTotalSize()) + " bytes
";
strHTML += "" + tr("Transaction virtual size") + ": " +
diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
--- a/src/qt/transactiondescdialog.cpp
+++ b/src/qt/transactiondescdialog.cpp
@@ -15,7 +15,7 @@
ui->setupUi(this);
setWindowTitle(
tr("Details for %1")
- .arg(idx.data(TransactionTableModel::TxIDRole).toString()));
+ .arg(idx.data(TransactionTableModel::TxHashRole).toString()));
QString desc =
idx.data(TransactionTableModel::LongDescriptionRole).toString();
ui->detailText->setHtml(desc);
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -33,6 +33,7 @@
index.data(TransactionTableModel::WatchonlyRole).toBool();
QString address = index.data(TransactionTableModel::AddressRole).toString();
QString label = index.data(TransactionTableModel::LabelRole).toString();
+ QString txid = index.data(TransactionTableModel::TxHashRole).toString();
Amount amount(
int64_t(
llabs(index.data(TransactionTableModel::AmountRole).toLongLong())) *
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -137,7 +137,7 @@
bool involvesWatchAddress;
/** Return the unique identifier for this transaction (part) */
- QString getTxID() const;
+ QString getTxHash() const;
/** Return the output index of the subtransaction */
int getOutputIndex() const;
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -211,7 +211,7 @@
return status.cur_num_blocks != numBlocks;
}
-QString TransactionRecord::getTxID() const {
+QString TransactionRecord::getTxHash() const {
return QString::fromStdString(txid.ToString());
}
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -62,8 +62,6 @@
LabelRole,
/** Net amount of transaction */
AmountRole,
- /** Unique identifier */
- TxIDRole,
/** Transaction hash */
TxHashRole,
/** Transaction data, hex-encoded */
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -584,10 +584,8 @@
QString::fromStdString(rec->address));
case AmountRole:
return qint64((rec->credit + rec->debit) / SATOSHI);
- case TxIDRole:
- return rec->getTxID();
case TxHashRole:
- return QString::fromStdString(rec->txid.ToString());
+ return rec->getTxHash();
case TxHexRole:
return priv->getTxHex(walletModel->wallet(), rec);
case TxPlainTextRole: {
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -383,7 +383,7 @@
writer.addColumn(BitcoinUnits::getAmountColumnTitle(
model->getOptionsModel()->getDisplayUnit()),
0, TransactionTableModel::FormattedAmountRole);
- writer.addColumn(tr("ID"), 0, TransactionTableModel::TxIDRole);
+ writer.addColumn(tr("ID"), 0, TransactionTableModel::TxHashRole);
if (!writer.write()) {
Q_EMIT message(tr("Exporting Failed"),
@@ -461,7 +461,8 @@
}
void TransactionView::copyTxID() {
- GUIUtil::copyEntryData(transactionView, 0, TransactionTableModel::TxIDRole);
+ GUIUtil::copyEntryData(transactionView, 0,
+ TransactionTableModel::TxHashRole);
}
void TransactionView::copyTxHex() {