GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353)

Browse source
This commit is contained in:
James Dorfman 2024-10-13 17:46:33 +00:00
commit dbab4c012c
10 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/validation.cpp
View file

@ -768,7 +768,10 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
// Applications relying on first-seen mempool behavior should
// check all unconfirmed ancestors; otherwise an opt-in ancestor
// might be replaced, causing removal of this descendant.
if (!SignalsOptInRBF(*ptxConflicting)) {
//
// If replaceability signaling is ignored due to node setting,
// replacement is always allowed.
if (!m_pool.m_full_rbf && !SignalsOptInRBF(*ptxConflicting)) {
return state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY, "txn-mempool-conflict");
}