[policy] remove BIP125 Rule #2

glozow · Sep 28, 2021 · 3fcdc19 · 3fcdc19
1 parent d8e45bb
commit 3fcdc19
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 27 deletions.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -793,11 +793,6 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
             return state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY,
                                  "too many potential replacements", *err_string);
         }
-
-        if (const auto err_string{HasNoNewUnconfirmed(tx, m_pool, setIterConflicting)}) {
-            return state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY,
-                                 "replacement-adds-unconfirmed", *err_string);
-        }
         if (const auto err_string{CheckAncestorScores(ws.m_modified_fees, nSize,
                                                       ws.m_ancestors, ws.m_all_conflicting)}) {
             // Bypass BIP125 Rule #2 under the condition that the replacement transaction has a higher

diff --git a/test/functional/feature_rbf.py b/test/functional/feature_rbf.py
@@ -70,9 +70,6 @@ def run_test(self):
         self.log.info("Running test spends of conflicting outputs...")
         self.test_spends_of_conflicting_outputs()
 
-        self.log.info("Running test new unconfirmed inputs...")
-        self.test_new_unconfirmed_inputs()
-
         self.log.info("Running test too many replacements...")
         self.test_too_many_replacements()
 
@@ -341,25 +338,6 @@ def test_spends_of_conflicting_outputs(self):
         # This will raise an exception
         assert_raises_rpc_error(-26, "bad-txns-spends-conflicting-tx", self.nodes[0].sendrawtransaction, tx2_hex, 0)
 
-    def test_new_unconfirmed_inputs(self):
-        """Replacements that add new unconfirmed inputs are rejected"""
-        confirmed_utxo = self.make_utxo(self.nodes[0], int(1.1 * COIN))
-        unconfirmed_utxo = self.make_utxo(self.nodes[0], int(0.1 * COIN), False)
-
-        tx1 = CTransaction()
-        tx1.vin = [CTxIn(confirmed_utxo)]
-        tx1.vout = [CTxOut(1 * COIN, DUMMY_P2WPKH_SCRIPT)]
-        tx1_hex = tx1.serialize().hex()
-        self.nodes[0].sendrawtransaction(tx1_hex, 0)
-
-        tx2 = CTransaction()
-        tx2.vin = [CTxIn(confirmed_utxo), CTxIn(unconfirmed_utxo)]
-        tx2.vout = tx1.vout
-        tx2_hex = tx2.serialize().hex()
-
-        # This will raise an exception
-        assert_raises_rpc_error(-26, "replacement-adds-unconfirmed", self.nodes[0].sendrawtransaction, tx2_hex, 0)
-
     def test_too_many_replacements(self):
         """Replacements that evict too many transactions are rejected"""
         # Try directly replacing more than MAX_REPLACEMENT_LIMIT