bumpfee: ignore WALLET_INCREMENTAL_RELAY_FEE when user specifies fee rate

This commit update CheckFeeRate's incrementalRelayFee to use relayIncrementalFee
not max of (walletIncrementalRelayfee and relayIncrementalFee).

The restriction is not needed since user provided the fee rate.
This commit is contained in:
ismaelsadeeq
2023-06-25 16:54:35 +01:00
parent 717103bcce
commit 436e88f433
2 changed files with 2 additions and 2 deletions

View File

@@ -92,7 +92,7 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CMutableTrans
}
CAmount new_total_fee = newFeerate.GetFee(maxTxSize) + combined_bump_fee.value();
CFeeRate incrementalRelayFee = std::max(wallet.chain().relayIncrementalFee(), CFeeRate(WALLET_INCREMENTAL_RELAY_FEE));
CFeeRate incrementalRelayFee = wallet.chain().relayIncrementalFee();
// Min total fee is old fee + relay fee
CAmount minTotalFee = old_fee + incrementalRelayFee.GetFee(maxTxSize);