diff options
| author | fanquake <fanquake@gmail.com> | 2022-03-23 20:07:48 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-03-23 20:12:04 +0000 |
| commit | cea230eec40054a82fcd31fa97cf46f1585c4a35 (patch) | |
| tree | 566b2cc37e9bfcf738411ac4ae1461fb6b31f8cf | |
| parent | ce05f838f1457088770a2fb5471e99195c8333b0 (diff) | |
| parent | fae5d06eed7f766926b1dc6d2320a68c8e4375bc (diff) | |
| download | bitcoin-cea230eec40054a82fcd31fa97cf46f1585c4a35.tar.xz | |
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
| -rw-r--r-- | src/wallet/feebumper.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp index 3552c14160..bc53180c0e 100644 --- a/src/wallet/feebumper.cpp +++ b/src/wallet/feebumper.cpp @@ -233,12 +233,6 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo // Write back transaction 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; } |