Merge 216f4ca9e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22674)

This commit is contained in:
Byron Hambly 2023-06-13 13:02:47 +00:00
commit 39e670c88c
9 changed files with 567 additions and 21 deletions

View file

@ -1095,6 +1095,8 @@ static RPCHelpMan testmempoolaccept()
continue;
}
const auto& tx_result = it->second;
// Package testmempoolaccept doesn't allow transactions to already be in the mempool.
CHECK_NONFATAL(tx_result.m_result_type != MempoolAcceptResult::ResultType::MEMPOOL_ENTRY);
if (tx_result.m_result_type == MempoolAcceptResult::ResultType::VALID) {
const CAmount fee = tx_result.m_base_fees.value();
// Check that fee does not exceed maximum fee