mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-20 13:53:15 +02:00
Merge bitcoin/bitcoin#24562: Remove unused feebumper code
fae5d06eed7f766926b1dc6d2320a68c8e4375bc Remove unused feebumper code (MarcoFalke) Pull request description: This was accidentally added in commit 0ea47ba7b38cc4b2b9175347cb5cd48fcd08da48. Presumably due to a copy-paste error, as `CreateTransaction` already takes care of the rbf-signal. ACKs for top commit: achow101: ACK fae5d06eed7f766926b1dc6d2320a68c8e4375bc promag: Code review ACK fae5d06eed7f766926b1dc6d2320a68c8e4375bc Tree-SHA512: 81aaf9c6bd9a4e2ad1789880bd8f2191f0ae9ba0a02794aa5db523236ea7df1c0dca078563219d293c694373c0a63c5bf168a85443e86556453ae5439791a618
This commit is contained in:
commit
cea230eec4
@ -233,12 +233,6 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo
|
|||||||
|
|
||||||
// Write back transaction
|
// Write back transaction
|
||||||
mtx = CMutableTransaction(*tx_new);
|
mtx = CMutableTransaction(*tx_new);
|
||||||
// Mark new tx not replaceable, if requested.
|
|
||||||
if (!coin_control.m_signal_bip125_rbf.value_or(wallet.m_signal_rbf)) {
|
|
||||||
for (auto& input : mtx.vin) {
|
|
||||||
if (input.nSequence < 0xfffffffe) input.nSequence = 0xfffffffe;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result::OK;
|
return Result::OK;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user