Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 15:32:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: Pass correct virtual size to CheckPackageLimits

Browse Source 
Github-Pull: #28471
Rebased-From: bc013fe8e3
This commit is contained in:
Luke Dashjr 2023-08-26 00:09:16 +00:00
parent 189f0bff22
commit 1d8b2d966c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/txmempool.cpp
View File

@ -195,13 +195,12 @@ util::Result<CTxMemPool::setEntries> CTxMemPool::CalculateAncestorsAndCheckLimit
} }
bool CTxMemPool::CheckPackageLimits(const Package& package, bool CTxMemPool::CheckPackageLimits(const Package& package,
const int64_t total_vsize,
const Limits& limits, const Limits& limits,
std::string &errString) const std::string &errString) const
{ {
CTxMemPoolEntry::Parents staged_ancestors; CTxMemPoolEntry::Parents staged_ancestors;
size_t total_size = 0;
for (const auto& tx : package) { for (const auto& tx : package) {
total_size += GetVirtualTransactionSize(*tx);
for (const auto& input : tx->vin) { for (const auto& input : tx->vin) {
std::optional<txiter> piter = GetIter(input.prevout.hash); std::optional<txiter> piter = GetIter(input.prevout.hash);
if (piter) { if (piter) {
@ -216,7 +215,7 @@ bool CTxMemPool::CheckPackageLimits(const Package& package,
// When multiple transactions are passed in, the ancestors and descendants of all transactions // When multiple transactions are passed in, the ancestors and descendants of all transactions
// considered together must be within limits even if they are not interdependent. This may be // considered together must be within limits even if they are not interdependent. This may be
// stricter than the limits for each individual transaction. // stricter than the limits for each individual transaction.
const auto ancestors{CalculateAncestorsAndCheckLimits(total_size, package.size(), const auto ancestors{CalculateAncestorsAndCheckLimits(total_vsize, package.size(),
staged_ancestors, limits)}; staged_ancestors, limits)};
// It's possible to overestimate the ancestor/descendant totals. // It's possible to overestimate the ancestor/descendant totals.
if (!ancestors.has_value()) errString = "possibly " + util::ErrorString(ancestors).original; if (!ancestors.has_value()) errString = "possibly " + util::ErrorString(ancestors).original;

2
src/txmempool.h
View File

@ -594,10 +594,12 @@ public:
* @param[in] package Transaction package being evaluated for acceptance * @param[in] package Transaction package being evaluated for acceptance
* to mempool. The transactions need not be direct * to mempool. The transactions need not be direct
* ancestors/descendants of each other. * ancestors/descendants of each other.
* @param[in] total_vsize Sum of virtual sizes for all transactions in package.
* @param[in] limits Maximum number and size of ancestors and descendants * @param[in] limits Maximum number and size of ancestors and descendants
* @param[out] errString Populated with error reason if a limit is hit. * @param[out] errString Populated with error reason if a limit is hit.
*/ */
bool CheckPackageLimits(const Package& package, bool CheckPackageLimits(const Package& package,
int64_t total_vsize,
const Limits& limits, const Limits& limits,
std::string &errString) const EXCLUSIVE_LOCKS_REQUIRED(cs); std::string &errString) const EXCLUSIVE_LOCKS_REQUIRED(cs);

6
src/validation.cpp
View File

@ -623,6 +623,7 @@ private:
// Enforce package mempool ancestor/descendant limits (distinct from individual // Enforce package mempool ancestor/descendant limits (distinct from individual
// ancestor/descendant limits done in PreChecks). // ancestor/descendant limits done in PreChecks).
bool PackageMempoolChecks(const std::vector<CTransactionRef>& txns, bool PackageMempoolChecks(const std::vector<CTransactionRef>& txns,
int64_t total_vsize,
PackageValidationState& package_state) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_pool.cs); PackageValidationState& package_state) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_pool.cs);
// Run the script checks using our policy flags. As this can be slow, we should // Run the script checks using our policy flags. As this can be slow, we should
@ -978,6 +979,7 @@ bool MemPoolAccept::ReplacementChecks(Workspace& ws)
} }
bool MemPoolAccept::PackageMempoolChecks(const std::vector<CTransactionRef>& txns, bool MemPoolAccept::PackageMempoolChecks(const std::vector<CTransactionRef>& txns,
const int64_t total_vsize,
PackageValidationState& package_state) PackageValidationState& package_state)
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
@ -988,7 +990,7 @@ bool MemPoolAccept::PackageMempoolChecks(const std::vector<CTransactionRef>& txn
{ return !m_pool.exists(GenTxid::Txid(tx->GetHash()));})); { return !m_pool.exists(GenTxid::Txid(tx->GetHash()));}));
std::string err_string; std::string err_string;
if (!m_pool.CheckPackageLimits(txns, m_limits, err_string)) { if (!m_pool.CheckPackageLimits(txns, total_vsize, m_limits, err_string)) {
// This is a package-wide error, separate from an individual transaction error. // This is a package-wide error, separate from an individual transaction error.
return package_state.Invalid(PackageValidationResult::PCKG_POLICY, "package-mempool-limits", err_string); return package_state.Invalid(PackageValidationResult::PCKG_POLICY, "package-mempool-limits", err_string);
} }
@ -1281,7 +1283,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactions(const std::
// because it's unnecessary. Also, CPFP carve out can increase the limit for individual // because it's unnecessary. Also, CPFP carve out can increase the limit for individual
// transactions, but this exemption is not extended to packages in CheckPackageLimits(). // transactions, but this exemption is not extended to packages in CheckPackageLimits().
std::string err_string; std::string err_string;
if (txns.size() > 1 && !PackageMempoolChecks(txns, package_state)) { if (txns.size() > 1 && !PackageMempoolChecks(txns, m_total_vsize, package_state)) {
return PackageMempoolAcceptResult(package_state, std::move(results)); return PackageMempoolAcceptResult(package_state, std::move(results));
} }