phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rename CheckValidEphemeralTx to PreCheckEphemeralTx

Browse source
This commit is contained in:
Greg Sanders 2024-11-12 11:56:32 -05:00
parent cbf1a47d60
commit 04a614bf9a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/policy/ephemeral_policy.cpp
View file

@ -10,7 +10,7 @@ bool HasDust(const CTransactionRef& tx, CFeeRate dust_relay_rate)
return std::any_of(tx->vout.cbegin(), tx->vout.cend(), [&](const auto& output) { return IsDust(output, dust_relay_rate); }); return std::any_of(tx->vout.cbegin(), tx->vout.cend(), [&](const auto& output) { return IsDust(output, dust_relay_rate); });
} }
bool CheckValidEphemeralTx(const CTransactionRef& tx, CFeeRate dust_relay_rate, CAmount base_fee, CAmount mod_fee, TxValidationState& state) bool PreCheckEphemeralTx(const CTransactionRef& tx, CFeeRate dust_relay_rate, CAmount base_fee, CAmount mod_fee, TxValidationState& state)
{ {
// We never want to give incentives to mine this transaction alone // We never want to give incentives to mine this transaction alone
if ((base_fee != 0 || mod_fee != 0) && HasDust(tx, dust_relay_rate)) { if ((base_fee != 0 || mod_fee != 0) && HasDust(tx, dust_relay_rate)) {

4
src/policy/ephemeral_policy.h
View file

@ -15,7 +15,7 @@
* set. * set.
* This is ensured by requiring: * This is ensured by requiring:
* - CheckValidEphemeralTx checks are respected * - PreCheckEphemeralTx checks are respected
* - The parent has no child (and 0-fee as implied above to disincentivize mining) * - The parent has no child (and 0-fee as implied above to disincentivize mining)
* - OR the parent transaction has exactly one child, and the dust is spent by that child * - OR the parent transaction has exactly one child, and the dust is spent by that child
* *
@ -43,7 +43,7 @@ bool HasDust(const CTransactionRef& tx, CFeeRate dust_relay_rate);
* Does context-less checks about a single transaction. * Does context-less checks about a single transaction.
* Returns false if the fee is non-zero and dust exists, populating state. True otherwise. * Returns false if the fee is non-zero and dust exists, populating state. True otherwise.
*/ */
bool CheckValidEphemeralTx(const CTransactionRef& tx, CFeeRate dust_relay_rate, CAmount base_fee, CAmount mod_fee, TxValidationState& state); bool PreCheckEphemeralTx(const CTransactionRef& tx, CFeeRate dust_relay_rate, CAmount base_fee, CAmount mod_fee, TxValidationState& state);
/** Must be called for each transaction(package) if any dust is in the package. /** Must be called for each transaction(package) if any dust is in the package.
* Checks that each transaction's parents have their dust spent by the child, * Checks that each transaction's parents have their dust spent by the child,

4
src/validation.cpp
View file

@ -915,8 +915,8 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
// Enforces 0-fee for dust transactions, no incentive to be mined alone // Enforces 0-fee for dust transactions, no incentive to be mined alone
if (m_pool.m_opts.require_standard) { 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)) { 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 CheckValidEphemeralTx return false; // state filled in by PreCheckEphemeralTx
} }
} }