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:
@@ -381,7 +381,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);
|
||||
@@ -463,7 +463,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;
|
||||
|
||||
Reference in New Issue
Block a user