Skip to content

Simplify chaser_validate, don't check for existing prevouts. #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 1 commit into from
Dec 17, 2025
Merged

Simplify chaser_validate, don't check for existing prevouts. #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/bitcoin/node/chasers/chaser_validate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ class BCN_API chaser_validate
const uint64_t initial_subsidy_;
const size_t maximum_backlog_;
const bool node_witness_;
const bool filter_;
const bool defer_;
const bool filter_;
};

} // namespace node
Expand Down
32 changes: 9 additions & 23 deletions src/chasers/chaser_validate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ chaser_validate::chaser_validate(full_node& node) NOEXCEPT
initial_subsidy_(node.config().bitcoin.initial_subsidy()),
maximum_backlog_(node.config().node.maximum_concurrency_()),
node_witness_(node.config().network.witness_node()),
filter_(node.archive().filter_enabled()),
defer_(node.config().node.defer_validation)
defer_(node.config().node.defer_validation),
filter_(!defer_ && node.archive().filter_enabled())
{
}

Expand Down Expand Up @@ -174,34 +174,18 @@ void chaser_validate::do_bumped(height_t height) NOEXCEPT
const auto bypass = defer_ || is_under_checkpoint(height) ||
query.is_milestone(link);

if (bypass)
{
// Filters will be set on subsequent unsupressed run.
if (filter_ && !defer_)
{
post_block(link, bypass);
}
else
{
complete_block(error::success, link, height, true);
}
}
else switch (ec.value())
switch (ec.value())
{
case database::error::unvalidated:
case database::error::unknown_state:
{
post_block(link, bypass);
break;
}
case database::error::block_valid:
{
if (query.is_prevouts_cached(link))
post_block(link, true);
if (!bypass || filter_)
post_block(link, bypass);
else
complete_block(error::success, link, height, true);
break;
}
case database::error::block_valid:
case database::error::block_confirmable:
{
complete_block(error::success, link, height, true);
Expand Down Expand Up @@ -283,6 +267,7 @@ code chaser_validate::populate(bool bypass, const chain::block& block,

if (bypass)
{
// Populating for filters only (no validation metadata required).
block.populate();
if (!query.populate_without_metadata(block))
return system::error::missing_previous_output;
Expand Down Expand Up @@ -316,14 +301,15 @@ code chaser_validate::validate(bool bypass, const chain::block& block,
if ((ec = block.connect(ctx)))
return ec;

// Prevouts optimize confirmation.
if (!query.set_prevouts(link, block))
return error::validate6;
}

if (!query.set_filter_body(link, block))
return error::validate7;

// After set_prevouts and set_filter_body.
// Valid must be set after set_prevouts and set_filter_body.
if (!bypass && !query.set_block_valid(link, block.fees()))
return error::validate8;

Expand Down
Loading