mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-20 15:19:07 +01:00
Merge bitcoin/bitcoin#32238: qt, wallet: Convert uint256 to Txid
0671d66a8ewallet, refactor: Convert uint256 to Txid in wallet (marcofleon)c8ed51e62bwallet, refactor: Convert uint256 to Txid in wallet interfaces (marcofleon)b3214cefe6qt, refactor: Convert uint256 to Txid in the GUI (marcofleon) Pull request description: This is part of https://github.com/bitcoin/bitcoin/pull/32189. Converts all instances of transactions from `uint256` to `Txid` in the wallet, GUI, and related interfaces. ACKs for top commit: stickies-v: re-ACK0671d66a8e, no changes since 65fcfbb2b38bef20a58daa6c828c51890180611d except rebase. achow101: ACK0671d66a8efurszy: Code review ACK0671d66a8eTree-SHA512: 9fd4675db63195c4eed2d14c25015a1821fb597f51404674e4879a44a9cf18f475021a97c5f62f3926b7783ade5a38567386f663acba9f5861f1f59c1309ed60
This commit is contained in:
@@ -193,7 +193,7 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
|
||||
// Double-clicking on a transaction on the transaction history page shows details
|
||||
connect(this, &TransactionView::doubleClicked, this, &TransactionView::showDetails);
|
||||
// Highlight transaction after fee bump
|
||||
connect(this, &TransactionView::bumpedFee, [this](const uint256& txid) {
|
||||
connect(this, &TransactionView::bumpedFee, [this](const Txid& txid) {
|
||||
focusTransaction(txid);
|
||||
});
|
||||
}
|
||||
@@ -431,7 +431,7 @@ void TransactionView::bumpFee([[maybe_unused]] bool checked)
|
||||
Txid hash = Txid::FromHex(hashQStr.toStdString()).value();
|
||||
|
||||
// Bump tx fee over the walletModel
|
||||
uint256 newHash;
|
||||
Txid newHash;
|
||||
if (model->bumpFee(hash, newHash)) {
|
||||
// Update the table
|
||||
transactionView->selectionModel()->clearSelection();
|
||||
@@ -599,7 +599,7 @@ void TransactionView::focusTransaction(const QModelIndex &idx)
|
||||
transactionView->setFocus();
|
||||
}
|
||||
|
||||
void TransactionView::focusTransaction(const uint256& txid)
|
||||
void TransactionView::focusTransaction(const Txid& txid)
|
||||
{
|
||||
if (!transactionProxyModel)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user