From c2e7ff5b7f5e484355abb475937b2c8de96671b9 Mon Sep 17 00:00:00 2001 From: Eric Voskuil Date: Wed, 28 Oct 2026 02:03:52 -0400 Subject: [PATCH] Use size_t for subsidy interval. --- .../bitcoin/database/impl/query/consensus/consensus_block.ipp | 4 ++-- include/bitcoin/database/query.hpp | 4 ++-- test/query/consensus/consensus_block.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/bitcoin/database/impl/query/consensus/consensus_block.ipp b/include/bitcoin/database/impl/query/consensus/consensus_block.ipp index 9ea68512f..920c10f12 100644 --- a/include/bitcoin/database/impl/query/consensus/consensus_block.ipp +++ b/include/bitcoin/database/impl/query/consensus/consensus_block.ipp @@ -112,7 +112,7 @@ code CLASS::block_confirmable(const header_link& link) const NOEXCEPT TEMPLATE code CLASS::validate_pooled(const header_link& link, const chain_context& ctx, - uint64_t subsidy_interval, uint64_t initial_subsidy) NOEXCEPT + size_t subsidy_interval, uint64_t initial_subsidy) NOEXCEPT { using prevout = table::prevout; if (!store_.pool.enabled()) @@ -231,7 +231,7 @@ code CLASS::check_pooled_block(pooled_block& block) const NOEXCEPT // Block check (context) and accept: weight, coinbase, hash limit, claim, sigops. TEMPLATE code CLASS::accept_pooled_block(const pooled_block& block, - const chain_context& ctx, uint64_t subsidy_interval, + const chain_context& ctx, size_t subsidy_interval, uint64_t initial_subsidy) const NOEXCEPT { using namespace system; diff --git a/include/bitcoin/database/query.hpp b/include/bitcoin/database/query.hpp index 73f8ab9e8..049763edb 100644 --- a/include/bitcoin/database/query.hpp +++ b/include/bitcoin/database/query.hpp @@ -689,7 +689,7 @@ class query /// the block, writing its prevouts. Unvalidated implies a tx is not /// sufficiently pooled (block requires full validation). code validate_pooled(const header_link& link, const chain_context& ctx, - uint64_t subsidy_interval, uint64_t initial_subsidy) NOEXCEPT; + size_t subsidy_interval, uint64_t initial_subsidy) NOEXCEPT; /// Pooled tx links by compact block short id (masked siphash of wtxid), /// terminal where not pooled or ambiguous. @@ -1167,7 +1167,7 @@ class query const context& ctx) const NOEXCEPT; code check_pooled_block(pooled_block& block) const NOEXCEPT; code accept_pooled_block(const pooled_block& block, - const chain_context& ctx, uint64_t subsidy_interval, + const chain_context& ctx, size_t subsidy_interval, uint64_t initial_subsidy) const NOEXCEPT; /// Called by get_compact_links. diff --git a/test/query/consensus/consensus_block.cpp b/test/query/consensus/consensus_block.cpp index 448d26c2b..d0152f679 100644 --- a/test/query/consensus/consensus_block.cpp +++ b/test/query/consensus/consensus_block.cpp @@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(query_consensus__block_confirmable__unconfirmed_double_spen using namespace system::chain; constexpr auto pooled_flags = flags::bip113_rule; -constexpr uint64_t pooled_interval = 210'000; +constexpr size_t pooled_interval = 210'000; constexpr uint64_t pooled_subsidy = 5'000'000'000; const database::context pooled_context{ pooled_flags, 8, 9 }; const system::chain::context block_context{ pooled_flags, 0, 9, 8, 0, 0, 0 };