Skip to content

Commit cea230e

Browse files
committed
Merge bitcoin/bitcoin#24562: Remove unused feebumper code
fae5d06 Remove unused feebumper code (MarcoFalke) Pull request description: This was accidentally added in commit 0ea47ba. Presumably due to a copy-paste error, as `CreateTransaction` already takes care of the rbf-signal. ACKs for top commit: achow101: ACK fae5d06 promag: Code review ACK fae5d06 Tree-SHA512: 81aaf9c6bd9a4e2ad1789880bd8f2191f0ae9ba0a02794aa5db523236ea7df1c0dca078563219d293c694373c0a63c5bf168a85443e86556453ae5439791a618
2 parents ce05f83 + fae5d06 commit cea230e

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/wallet/feebumper.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,6 @@ Result CreateRateBumpTransaction(CWallet& wallet, const uint256& txid, const CCo
233233

234234
// Write back transaction
235235
mtx = CMutableTransaction(*tx_new);
236-
// Mark new tx not replaceable, if requested.
237-
if (!coin_control.m_signal_bip125_rbf.value_or(wallet.m_signal_rbf)) {
238-
for (auto& input : mtx.vin) {
239-
if (input.nSequence < 0xfffffffe) input.nSequence = 0xfffffffe;
240-
}
241-
}
242236

243237
return Result::OK;
244238
}

0 commit comments

Comments
 (0)