aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/interfaces/wallet.h1
-rw-r--r--src/qt/transactionrecord.cpp160
-rw-r--r--src/qt/transactionrecord.h1
-rw-r--r--src/qt/transactiontablemodel.cpp9
-rw-r--r--src/qt/transactionview.cpp1
-rw-r--r--src/wallet/interfaces.cpp1
6 files changed, 81 insertions, 92 deletions
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 209516ebcb..4b896c11a3 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -393,6 +393,7 @@ struct WalletTx
CTransactionRef tx;
std::vector<wallet::isminetype> txin_is_mine;
std::vector<wallet::isminetype> txout_is_mine;
+ std::vector<bool> txout_is_change;
std::vector<CTxDestination> txout_address;
std::vector<wallet::isminetype> txout_address_is_mine;
CAmount credit;
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 1d2f6484fb..8a2ec4cd59 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -13,6 +13,7 @@
#include <QDateTime>
+using wallet::ISMINE_NO;
using wallet::ISMINE_SPENDABLE;
using wallet::ISMINE_WATCH_ONLY;
using wallet::isminetype;
@@ -39,99 +40,52 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
uint256 hash = wtx.tx->GetHash();
std::map<std::string, std::string> mapValue = wtx.value_map;
- if (nNet > 0 || wtx.is_coinbase)
- {
- //
- // Credit
- //
- for(unsigned int i = 0; i < wtx.tx->vout.size(); i++)
- {
- const CTxOut& txout = wtx.tx->vout[i];
- isminetype mine = wtx.txout_is_mine[i];
- if(mine)
- {
- TransactionRecord sub(hash, nTime);
- sub.idx = i; // vout index
- sub.credit = txout.nValue;
- sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
- if (wtx.txout_address_is_mine[i])
- {
- // Received by Bitcoin Address
- sub.type = TransactionRecord::RecvWithAddress;
- sub.address = EncodeDestination(wtx.txout_address[i]);
- }
- else
- {
- // Received by IP connection (deprecated features), or a multisignature or other non-simple transaction
- sub.type = TransactionRecord::RecvFromOther;
- sub.address = mapValue["from"];
- }
- if (wtx.is_coinbase)
- {
- // Generated
- sub.type = TransactionRecord::Generated;
- }
-
- parts.append(sub);
- }
- }
- }
- else
- {
- bool involvesWatchAddress = false;
- isminetype fAllFromMe = ISMINE_SPENDABLE;
+ bool involvesWatchAddress = false;
+ isminetype fAllFromMe = ISMINE_SPENDABLE;
+ bool any_from_me = false;
+ if (wtx.is_coinbase) {
+ fAllFromMe = ISMINE_NO;
+ } else {
for (const isminetype mine : wtx.txin_is_mine)
{
if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
if(fAllFromMe > mine) fAllFromMe = mine;
+ if (mine) any_from_me = true;
}
+ }
- isminetype fAllToMe = ISMINE_SPENDABLE;
+ if (fAllFromMe || !any_from_me) {
for (const isminetype mine : wtx.txout_is_mine)
{
if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
- if(fAllToMe > mine) fAllToMe = mine;
}
- if (fAllFromMe && fAllToMe)
- {
- // Payment to self
- std::string address;
- for (auto it = wtx.txout_address.begin(); it != wtx.txout_address.end(); ++it) {
- if (it != wtx.txout_address.begin()) address += ", ";
- address += EncodeDestination(*it);
- }
+ CAmount nTxFee = nDebit - wtx.tx->GetValueOut();
- CAmount nChange = wtx.change;
- parts.append(TransactionRecord(hash, nTime, TransactionRecord::SendToSelf, address, -(nDebit - nChange), nCredit - nChange));
- parts.last().involvesWatchAddress = involvesWatchAddress; // maybe pass to TransactionRecord as constructor argument
- }
- else if (fAllFromMe)
+ for(unsigned int i = 0; i < wtx.tx->vout.size(); i++)
{
- //
- // Debit
- //
- CAmount nTxFee = nDebit - wtx.tx->GetValueOut();
-
- for (unsigned int nOut = 0; nOut < wtx.tx->vout.size(); nOut++)
- {
- const CTxOut& txout = wtx.tx->vout[nOut];
- TransactionRecord sub(hash, nTime);
- sub.idx = nOut;
- sub.involvesWatchAddress = involvesWatchAddress;
+ const CTxOut& txout = wtx.tx->vout[i];
- if(wtx.txout_is_mine[nOut])
- {
- // Ignore parts sent to self, as this is usually the change
- // from a transaction sent back to our own address.
+ if (fAllFromMe) {
+ // Change is only really possible if we're the sender
+ // Otherwise, someone just sent bitcoins to a change address, which should be shown
+ if (wtx.txout_is_change[i]) {
continue;
}
- if (!std::get_if<CNoDestination>(&wtx.txout_address[nOut]))
+ //
+ // Debit
+ //
+
+ TransactionRecord sub(hash, nTime);
+ sub.idx = i;
+ sub.involvesWatchAddress = involvesWatchAddress;
+
+ if (!std::get_if<CNoDestination>(&wtx.txout_address[i]))
{
// Sent to Bitcoin Address
sub.type = TransactionRecord::SendToAddress;
- sub.address = EncodeDestination(wtx.txout_address[nOut]);
+ sub.address = EncodeDestination(wtx.txout_address[i]);
}
else
{
@@ -151,15 +105,45 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
parts.append(sub);
}
+
+ isminetype mine = wtx.txout_is_mine[i];
+ if(mine)
+ {
+ //
+ // Credit
+ //
+
+ TransactionRecord sub(hash, nTime);
+ sub.idx = i; // vout index
+ sub.credit = txout.nValue;
+ sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
+ if (wtx.txout_address_is_mine[i])
+ {
+ // Received by Bitcoin Address
+ sub.type = TransactionRecord::RecvWithAddress;
+ sub.address = EncodeDestination(wtx.txout_address[i]);
+ }
+ else
+ {
+ // Received by IP connection (deprecated features), or a multisignature or other non-simple transaction
+ sub.type = TransactionRecord::RecvFromOther;
+ sub.address = mapValue["from"];
+ }
+ if (wtx.is_coinbase)
+ {
+ // Generated
+ sub.type = TransactionRecord::Generated;
+ }
+
+ parts.append(sub);
+ }
}
- else
- {
- //
- // Mixed debit transaction, can't break down payees
- //
- parts.append(TransactionRecord(hash, nTime, TransactionRecord::Other, "", nNet, 0));
- parts.last().involvesWatchAddress = involvesWatchAddress;
- }
+ } else {
+ //
+ // Mixed debit transaction, can't break down payees
+ //
+ parts.append(TransactionRecord(hash, nTime, TransactionRecord::Other, "", nNet, 0));
+ parts.last().involvesWatchAddress = involvesWatchAddress;
}
return parts;
@@ -170,11 +154,21 @@ void TransactionRecord::updateStatus(const interfaces::WalletTxStatus& wtx, cons
// Determine transaction status
// Sort order, unrecorded transactions sort to the top
- status.sortKey = strprintf("%010d-%01d-%010u-%03d",
+ int typesort;
+ switch (type) {
+ case SendToAddress: case SendToOther:
+ typesort = 2; break;
+ case RecvWithAddress: case RecvFromOther:
+ typesort = 3; break;
+ default:
+ typesort = 9;
+ }
+ status.sortKey = strprintf("%010d-%01d-%010u-%03d-%d",
wtx.block_height,
wtx.is_coinbase ? 1 : 0,
wtx.time_received,
- idx);
+ idx,
+ typesort);
status.countsForBalance = wtx.is_trusted && !(wtx.blocks_to_maturity > 0);
status.depth = wtx.depth_in_main_chain;
status.m_cur_block_hash = block_hash;
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 36cfb422e8..21b1bc0e01 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -69,7 +69,6 @@ public:
SendToOther,
RecvWithAddress,
RecvFromOther,
- SendToSelf
};
/** Number of confirmation recommended for accepting a transaction */
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 25d54bdce6..486e51c777 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -17,6 +17,7 @@
#include <core_io.h>
#include <interfaces/handler.h>
+#include <tinyformat.h>
#include <uint256.h>
#include <algorithm>
@@ -377,8 +378,6 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
case TransactionRecord::SendToAddress:
case TransactionRecord::SendToOther:
return tr("Sent to");
- case TransactionRecord::SendToSelf:
- return tr("Payment to yourself");
case TransactionRecord::Generated:
return tr("Mined");
default:
@@ -421,8 +420,6 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, b
return lookupAddress(wtx->address, tooltip) + watchAddress;
case TransactionRecord::SendToOther:
return QString::fromStdString(wtx->address) + watchAddress;
- case TransactionRecord::SendToSelf:
- return lookupAddress(wtx->address, tooltip) + watchAddress;
default:
return tr("(n/a)") + watchAddress;
}
@@ -441,8 +438,6 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
if(label.isEmpty())
return COLOR_BAREADDRESS;
} break;
- case TransactionRecord::SendToSelf:
- return COLOR_BAREADDRESS;
default:
break;
}
@@ -560,7 +555,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
case Status:
return QString::fromStdString(rec->status.sortKey);
case Date:
- return rec->time;
+ return QString::fromStdString(strprintf("%020s-%s", rec->time, rec->status.sortKey));
case Type:
return formatTxType(rec);
case Watchonly:
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 351305f3fa..67af62285d 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -91,7 +91,6 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther));
typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |
TransactionFilterProxy::TYPE(TransactionRecord::SendToOther));
- typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 089462c05a..65285187f4 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -67,6 +67,7 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
result.txout_address_is_mine.reserve(wtx.tx->vout.size());
for (const auto& txout : wtx.tx->vout) {
result.txout_is_mine.emplace_back(wallet.IsMine(txout));
+ result.txout_is_change.push_back(OutputIsChange(wallet, txout));
result.txout_address.emplace_back();
result.txout_address_is_mine.emplace_back(ExtractDestination(txout.scriptPubKey, result.txout_address.back()) ?
wallet.IsMine(result.txout_address.back()) :
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-06 05:04:11 +0000