Merge bitcoin/bitcoin#31279: policy: ephemeral dust followups

466e4df3fb assert_mempool_contents: assert not duplicates expected (Greg Sanders) ea5db2f269 functional: only generate required blocks for test (Greg Sanders) d033acb608 fuzz: package_eval: let fuzzer run out input in main tx creation loop (Greg Sanders) ba35a570c5 CheckEphemeralSpends: return boolean, and set child state and txid outparams (Greg Sanders) cf0cee1617 func: add note about lack of 1P1C propagation in tree submitpackage (Greg Sanders) 8424290304 unit test: ephemeral_tests is using a dust relay rate, not minrelay (Greg Sanders) d9cfa5fc4e CheckEphemeralSpends: no need to iterate inputs if no parent dust (Greg Sanders) 87b26e3dc0 func: rename test_free_relay to test_no_minrelay_fee (Greg Sanders) e5709a4a41 func: slight elaboration on submitpackage restriction (Greg Sanders) 08e969bd10 RPC: only enforce dust rules on priority when standardness active (Greg Sanders) ca050d12e7 unit test: adapt to changing MAX_DUST_OUTPUTS_PER_TX (Greg Sanders) 7c3490169c fuzz: package_eval: move last_tx inside txn ctor (Greg Sanders) 445eaed182 fuzz: use optional status instead of should_rbf_eph_spend (Greg Sanders) 4dfdf615b9 fuzz: remove unused TransactionsDelta validation interface (Greg Sanders) 09ce926e4a func: cleanup reorg test comment (Greg Sanders) 768a0c1889 func: cleanup test_dustrelay comments (Greg Sanders) bedca1cb66 fuzz: Directly place transactions in vector (Greg Sanders) c041ad6ecc fuzz: explain package eval coin tracking better (Greg Sanders) bc0d98ea61 fuzz: remove dangling reference to GetEntry (Greg Sanders) 15b6cbf07f unit test: make dust index less magical (Greg Sanders) 5fbcfd12b8 unit test: assert txid returned on CheckEphemeralSpends failures (Greg Sanders) ef94d84b4e bench: remove unnecessary CMTxn constructors (Greg Sanders) c5c10fd317 ephemeral policy doxygen cleanup (Greg Sanders) dd9044b8d4 ephemeral policy: IWYU (Greg Sanders) c6859ce2de Move+rename GetDustIndexes -> GetDust (Greg Sanders) 62016b3230 Use std::ranges for ephemeral policy checks (Greg Sanders) 3ed930a1f4 Have HasDust and PreCheckValidEphemeralTx take CTransaction (Greg Sanders) 04a614bf9a Rename CheckValidEphemeralTx to PreCheckEphemeralTx (Greg Sanders) cbf1a47d60 CheckEphemeralSpends: only compute txid of tx when needed (Greg Sanders) Pull request description: Follow-up to https://github.com/bitcoin/bitcoin/pull/30239 Here are the parent PR's comments that should be addressed by this PR: https://github.com/bitcoin/bitcoin/pull/30239/files#r1834529646 https://github.com/bitcoin/bitcoin/pull/30239/files#r1831247308 https://github.com/bitcoin/bitcoin/pull/30239/files#r1832622481 https://github.com/bitcoin/bitcoin/pull/30239/files#r1831195216 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1835805164 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1835805164 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834639096 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834624976 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834619709 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834610434 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834504436 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834500036 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832985488 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1830929809 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832376920 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832755799 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832492686 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832980576 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832784278 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1837989979 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1830996993 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1830997947 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1830012890 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1830037288 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1830977092 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832622481 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1834726168 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1832453654 https://github.com/bitcoin/bitcoin/pull/30239#discussion_r1848488226 ACKs for top commit: naumenkogs: ACK 466e4df3fb hodlinator: ACK 466e4df3fb theStack: lgtm ACK 466e4df3fb glozow: utACK 466e4df3fb Tree-SHA512: 89106f695755c238b84e0996b89446c0733e10a94c867f656d516d26697d2efe38dfc332188b8589a0a26a3d2bd2c88c6ab70c108e187ce5bfcb91bbf3fb0391
2026-01-20 07:09:15 +01:00 · 2024-11-25 13:47:31 -05:00
parent 2638fdb4f9 466e4df3fb
commit f7144b24be
15 changed files with 210 additions and 146 deletions
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -913,8 +913,8 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)

    // Enforces 0-fee for dust transactions, no incentive to be mined alone
    if (m_pool.m_opts.require_standard) {
-        if (!CheckValidEphemeralTx(ptx, m_pool.m_opts.dust_relay_feerate, ws.m_base_fees, ws.m_modified_fees, state)) {
-            return false; // state filled in by CheckValidEphemeralTx
+        if (!PreCheckEphemeralTx(*ptx, m_pool.m_opts.dust_relay_feerate, ws.m_base_fees, ws.m_modified_fees, state)) {
+            return false; // state filled in by PreCheckEphemeralTx
        }
    }

@@ -1436,11 +1436,8 @@ MempoolAcceptResult MemPoolAccept::AcceptSingleTransaction(const CTransactionRef
    }

    if (m_pool.m_opts.require_standard) {
-        if (const auto ephemeral_violation{CheckEphemeralSpends(/*package=*/{ptx}, m_pool.m_opts.dust_relay_feerate, m_pool)}) {
-            const Txid& txid = ephemeral_violation.value();
-            Assume(txid == ptx->GetHash());
-            ws.m_state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY, "missing-ephemeral-spends",
-                          strprintf("tx %s did not spend parent's ephemeral dust", txid.ToString()));
+        Txid dummy_txid;
+        if (!CheckEphemeralSpends(/*package=*/{ptx}, m_pool.m_opts.dust_relay_feerate, m_pool, ws.m_state, dummy_txid)) {
            return MempoolAcceptResult::Failure(ws.m_state);
        }
    }
@@ -1592,11 +1589,9 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::

    // Now that we've bounded the resulting possible ancestry count, check package for dust spends
    if (m_pool.m_opts.require_standard) {
-        if (const auto ephemeral_violation{CheckEphemeralSpends(txns, m_pool.m_opts.dust_relay_feerate, m_pool)}) {
-            const Txid& child_txid = ephemeral_violation.value();
-            TxValidationState child_state;
-            child_state.Invalid(TxValidationResult::TX_MEMPOOL_POLICY, "missing-ephemeral-spends",
-                          strprintf("tx %s did not spend parent's ephemeral dust", child_txid.ToString()));
+        TxValidationState child_state;
+        Txid child_txid;
+        if (!CheckEphemeralSpends(txns, m_pool.m_opts.dust_relay_feerate, m_pool, child_state, child_txid)) {
            package_state.Invalid(PackageValidationResult::PCKG_TX, "unspent-dust");
            results.emplace(child_txid, MempoolAcceptResult::Failure(child_state));
            return PackageMempoolAcceptResult(package_state, std::move(results));