highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 05:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Make CWalletTx "comment" and "to" member variables

Browse Source 
Instead of storing "comment" and "to" inside of mapValue, store these
expliclty as members of CWalletTx.
This commit is contained in:
Ava Chow
2025-06-16 13:11:26 -07:00
parent 2155e913d3
commit 7ef8a6efc2
8 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/wallet.h
View File

@@ -393,6 +393,8 @@ struct WalletTx
int64_t time;
std::optional<std::string> from; // Deprecated
std::optional<std::string> message; // Deprecated
std::optional<std::string> comment;
std::optional<std::string> comment_to;
std::map<std::string, std::string> value_map;
bool is_coinbase;

13
src/qt/transactiondesc.cpp
View File

@@ -155,10 +155,9 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
//
// To
//
if (wtx.value_map.contains("to") && !wtx.value_map["to"].empty())
{
if (wtx.comment_to) {
// Online transaction
std::string strAddress = wtx.value_map["to"];
std::string strAddress = *wtx.comment_to;
strHTML += "<b>" + tr("To") + ":</b> ";
CTxDestination dest = DecodeDestination(strAddress);
std::string name;
@@ -210,8 +209,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
if (toSelf && all_from_me)
continue;
if (!wtx.value_map.contains("to") || wtx.value_map["to"].empty())
{
if (!wtx.comment_to) {
// Offline transaction
CTxDestination address;
if (ExtractDestination(txout.scriptPubKey, address))
@@ -274,8 +272,9 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
if (wtx.message) {
strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(*wtx.message, true) + "<br>";
}
if (wtx.value_map.count("comment") && !wtx.value_map["comment"].empty())
strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(wtx.value_map["comment"], true) + "<br>";
if (wtx.comment) {
strHTML += "<br><b>" + tr("Comment") + ":</b><br>" + GUIUtil::HtmlEscape(*wtx.comment, true) + "<br>";
}
strHTML += "<b>" + tr("Transaction ID") + ":</b> " + rec->getTxHash() + "<br>";
strHTML += "<b>" + tr("Transaction total size") + ":</b> " + QString::number(wtx.tx->ComputeTotalSize()) + " bytes<br>";

2
src/qt/transactionrecord.cpp
View File

@@ -77,7 +77,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
{
// Sent to IP, or other non-address transaction like OP_EVAL
sub.type = TransactionRecord::SendToOther;
sub.address = mapValue["to"];
sub.address = wtx.comment_to.value_or("");
}
CAmount nValue = txout.nValue;

4
src/wallet/feebumper.cpp
View File

@@ -370,9 +370,7 @@ Result CommitTransaction(CWallet& wallet, const Txid& txid, CMutableTransaction&
// commit/broadcast the tx
CTransactionRef tx = MakeTransactionRef(std::move(mtx));
std::optional<std::string> comment = oldWtx.mapValue.contains("comment") ? std::optional(oldWtx.mapValue.at("comment")) : std::nullopt;
std::optional<std::string> comment_to = oldWtx.mapValue.contains("to") ? std::optional(oldWtx.mapValue.at("to")) : std::nullopt;
wallet.CommitTransaction(tx, oldWtx.vOrderForm, oldWtx.GetHash(), comment, comment_to);
wallet.CommitTransaction(tx, oldWtx.vOrderForm, oldWtx.GetHash(), oldWtx.m_comment, oldWtx.m_comment_to);
// mark the original tx as bumped
bumped_txid = tx->GetHash();

2
src/wallet/interfaces.cpp
View File

@@ -81,6 +81,8 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
result.time = wtx.GetTxTime();
result.from = wtx.m_from;
result.message = wtx.m_message;
result.comment = wtx.m_comment;
result.comment_to = wtx.m_comment_to;
result.value_map = wtx.mapValue;
result.is_coinbase = wtx.IsCoinBase();
return result;

3
src/wallet/rpc/transactions.cpp
View File

@@ -62,6 +62,9 @@ static void WalletTxToJSON(const CWallet& wallet, const CWalletTx& wtx, UniValue
entry.pushKV("bip125-replaceable", rbfStatus);
}
if (wtx.m_comment) entry.pushKV("comment", *wtx.m_comment);
if (wtx.m_comment_to) entry.pushKV("to", *wtx.m_comment_to);
for (const std::pair<const std::string, std::string>& item : wtx.mapValue)
entry.pushKV(item.first, item.second);
}

13
src/wallet/transaction.h
View File

@@ -199,14 +199,15 @@ public:
// These fields are kept to avoid losing metadata.
std::optional<std::string> m_from;
std::optional<std::string> m_message;
// Comment strings provided by the user
std::optional<std::string> m_comment;
std::optional<std::string> m_comment_to;
/**
* Key/value map with information about the transaction.
*
* The following keys can be read and written through the map and are
* serialized in the wallet database:
*
* "comment", "to" - comment strings provided to sendtoaddress,
* and sendmany wallet RPCs
* "replaces_txid" - txid (as HexStr) of transaction replaced by
* bumpfee on transaction created by bumpfee
* "replaced_by_txid" - txid (as HexStr) of transaction created by
@@ -223,6 +224,8 @@ public:
* 2014 (removed in commit 93a18a3)
* "from", "message" - obsolete fields that could be set in UI prior to
* 2011 (removed in commit 4d9b223)
* "comment", "to" - comment strings provided to sendtoaddress,
* and sendmany wallet RPCs
*/
mapValue_t mapValue;
std::vector<std::pair<std::string, std::string> > vOrderForm;
@@ -292,6 +295,8 @@ public:
mapValue_t mapValueCopy = mapValue;
if (m_from) mapValueCopy["from"] = *m_from;
if (m_message) mapValueCopy["message"] = *m_message;
if (m_comment) mapValueCopy["comment"] = *m_comment;
if (m_comment_to) mapValueCopy["to"] = *m_comment_to;
mapValueCopy["fromaccount"] = "";
if (nOrderPos != -1) {
@@ -330,6 +335,8 @@ public:
else if (key == "timesmart") nTimeSmart = LocaleIndependentAtoi<int64_t>(value);
else if (key == "from") m_from = value;
else if (key == "message") m_message = value;
else if (key == "comment") m_comment = value;
else if (key == "to") m_comment_to = value;
}
mapValue.erase("fromaccount");
@@ -338,6 +345,8 @@ public:
mapValue.erase("timesmart");
mapValue.erase("from");
mapValue.erase("message");
mapValue.erase("comment");
mapValue.erase("to");
}
void SetTx(CTransactionRef arg)

6
src/wallet/wallet.cpp
View File

@@ -744,6 +744,8 @@ void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> ran
if (!copyFrom->IsEquivalentTo(*copyTo)) continue;
copyTo->m_from = copyFrom->m_from;
copyTo->m_message = copyFrom->m_message;
copyTo->m_comment = copyFrom->m_comment;
copyTo->m_comment_to = copyFrom->m_comment_to;
copyTo->mapValue = copyFrom->mapValue;
copyTo->vOrderForm = copyFrom->vOrderForm;
// nTimeReceived not copied on purpose
@@ -2343,8 +2345,8 @@ void CWallet::CommitTransaction(
CHECK_NONFATAL(wtx.mapValue.empty());
CHECK_NONFATAL(wtx.vOrderForm.empty());
if (replaces_txid) wtx.mapValue["replaces_txid"] = replaces_txid->ToString();
if (comment) wtx.mapValue["comment"] = *comment;
if (comment_to) wtx.mapValue["to"] = *comment_to;
if (comment) wtx.m_comment = comment;
if (comment_to) wtx.m_comment_to = comment_to;
wtx.vOrderForm = std::move(orderForm);
return true;
});