From fc18ef1f3f333dd28d8cc7e3571d76a985d90240 Mon Sep 17 00:00:00 2001 From: Suhas Daftuar Date: Thu, 9 Oct 2025 20:28:45 -0400 Subject: [PATCH] Remove ancestor and descendant vsize limits from MemPoolLimits --- src/kernel/mempool_limits.h | 6 +----- src/node/mempool_args.cpp | 4 ---- src/test/fuzz/package_eval.cpp | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/kernel/mempool_limits.h b/src/kernel/mempool_limits.h index cbca17907e9..7ca5d2bc7bb 100644 --- a/src/kernel/mempool_limits.h +++ b/src/kernel/mempool_limits.h @@ -22,12 +22,8 @@ struct MemPoolLimits { int64_t cluster_size_vbytes{DEFAULT_CLUSTER_SIZE_LIMIT_KVB * 1'000}; //! The maximum allowed number of transactions in a package including the entry and its ancestors. int64_t ancestor_count{DEFAULT_ANCESTOR_LIMIT}; - //! The maximum allowed size in virtual bytes of an entry and its ancestors within a package. - int64_t ancestor_size_vbytes{DEFAULT_ANCESTOR_SIZE_LIMIT_KVB * 1'000}; //! The maximum allowed number of transactions in a package including the entry and its descendants. int64_t descendant_count{DEFAULT_DESCENDANT_LIMIT}; - //! The maximum allowed size in virtual bytes of an entry and its descendants within a package. - int64_t descendant_size_vbytes{DEFAULT_DESCENDANT_SIZE_LIMIT_KVB * 1'000}; /** * @return MemPoolLimits with all the limits set to the maximum @@ -35,7 +31,7 @@ struct MemPoolLimits { static constexpr MemPoolLimits NoLimits() { int64_t no_limit{std::numeric_limits::max()}; - return {std::numeric_limits::max(), no_limit, no_limit, no_limit, no_limit, no_limit}; + return {std::numeric_limits::max(), no_limit, no_limit, no_limit}; } }; } // namespace kernel diff --git a/src/node/mempool_args.cpp b/src/node/mempool_args.cpp index 93b897d5875..14ee8405f38 100644 --- a/src/node/mempool_args.cpp +++ b/src/node/mempool_args.cpp @@ -38,11 +38,7 @@ void ApplyArgsManOptions(const ArgsManager& argsman, MemPoolLimits& mempool_limi mempool_limits.ancestor_count = argsman.GetIntArg("-limitancestorcount", mempool_limits.ancestor_count); - if (auto vkb = argsman.GetIntArg("-limitancestorsize")) mempool_limits.ancestor_size_vbytes = *vkb * 1'000; - mempool_limits.descendant_count = argsman.GetIntArg("-limitdescendantcount", mempool_limits.descendant_count); - - if (auto vkb = argsman.GetIntArg("-limitdescendantsize")) mempool_limits.descendant_size_vbytes = *vkb * 1'000; } } diff --git a/src/test/fuzz/package_eval.cpp b/src/test/fuzz/package_eval.cpp index 3f1eeeb3dd7..db4e4933757 100644 --- a/src/test/fuzz/package_eval.cpp +++ b/src/test/fuzz/package_eval.cpp @@ -122,9 +122,7 @@ std::unique_ptr MakeMempool(FuzzedDataProvider& fuzzed_data_provider // ...override specific options for this specific fuzz suite mempool_opts.limits.ancestor_count = fuzzed_data_provider.ConsumeIntegralInRange(0, 50); - mempool_opts.limits.ancestor_size_vbytes = fuzzed_data_provider.ConsumeIntegralInRange(0, 202) * 1'000; mempool_opts.limits.descendant_count = fuzzed_data_provider.ConsumeIntegralInRange(0, 50); - mempool_opts.limits.descendant_size_vbytes = fuzzed_data_provider.ConsumeIntegralInRange(0, 202) * 1'000; mempool_opts.max_size_bytes = fuzzed_data_provider.ConsumeIntegralInRange(0, 200) * 1'000'000; mempool_opts.expiry = std::chrono::hours{fuzzed_data_provider.ConsumeIntegralInRange(0, 999)}; // Only interested in 2 cases: sigop cost 0 or when single legacy sigop cost is >> 1KvB