highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-03 12:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt, refactor: Convert uint256 to Txid in the GUI

Browse Source 
Switch all instances of a transaction from a uint256 to the Txid type.
This commit is contained in:
marcofleon
2025-03-28 16:13:36 +00:00
parent efac285a0d
commit b3214cefe6
11 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/walletmodel.cpp
View File

@@ -388,7 +388,7 @@ static void NotifyAddressBookChanged(WalletModel *walletmodel,
assert(invoked);
}
static void NotifyTransactionChanged(WalletModel *walletmodel, const uint256 &hash, ChangeType status)
static void NotifyTransactionChanged(WalletModel *walletmodel, const Txid& hash, ChangeType status)
{
Q_UNUSED(hash);
Q_UNUSED(status);
@@ -479,7 +479,7 @@ WalletModel::UnlockContext::~UnlockContext()
}
}
bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
bool WalletModel::bumpFee(Txid hash, Txid& new_hash)
{
CCoinControl coin_control;
coin_control.m_signal_bip125_rbf = true;
@@ -561,11 +561,15 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
return false;
}
// commit the bumped transaction
if(!m_wallet->commitBumpTransaction(hash, std::move(mtx), errors, new_hash)) {
// Temporary uint256 variable needed for commitBumpTransaction out parameter.
uint256 bumped_txid_result;
if(!m_wallet->commitBumpTransaction(hash, std::move(mtx), errors, bumped_txid_result)) {
QMessageBox::critical(nullptr, tr("Fee bump error"), tr("Could not commit transaction") + "<br />(" +
QString::fromStdString(errors[0].translated)+")");
return false;
}
// Assign the received txid back to the new_hash.
new_hash = Txid::FromUint256(bumped_txid_result);
return true;
}