Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions include/bitcoin/node/chasers/chaser_validate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class BCN_API chaser_validate
std::atomic<size_t> unbatched_schnorr_{};
std::atomic<size_t> batched_multisig_{};
std::atomic<size_t> unbatched_multisig_{};
std::atomic<size_t> batched_threshold_{};
std::atomic<size_t> unbatched_threshold_{};
std::atomic<size_t> backlog_{};
network::asio::strand validation_strand_;
const uint32_t subsidy_interval_;
Expand Down
55 changes: 37 additions & 18 deletions src/chasers/chaser_validate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,22 +300,29 @@ code chaser_validate::validate(bool bypass, const chain::block& block,
{
const chain::signatures capture
{
// Enable/disable capture.
.enabled = batch_signatures_,
.ecdsa = [&](const hash_digest& digest,
const ec_compressed& point, const ec_signature& sign) NOEXCEPT

.ecdsa = [&](const hash_digest& ,
const ec_compressed& , const ec_signature& ) NOEXCEPT
{
////query.set_signature(digest, point, sign, link);
},
.schnorr = [&](const hash_digest& ,
const ec_xonly& , const ec_signature& ) NOEXCEPT
{
query.set_signature(digest, point, sign, link);
////query.set_signature(digest, point, sign, link);
},
.schnorr = [&](const hash_digest& digest,
const ec_xonly& point, const ec_signature& sign) NOEXCEPT
.multisig = [&](const hash_digest& ,
const ec_compresseds& , const ec_signatures& ,
uint16_t ) NOEXCEPT
{
query.set_signature(digest, point, sign, link);
////query.set_signatures(digest, points, signs, group, link);
},
.multisig = [&](const hash_digest& digest,
const ec_compresseds& points, const ec_signatures& signs,
uint16_t group) NOEXCEPT
.threshold = [&](const chain::signatures::threshold_group& ,
uint16_t ) NOEXCEPT
{
query.set_signatures(digest, points, signs, group, link);
////query.set_signatures(digest, points, signs, group, link);
}
};

Expand All @@ -328,28 +335,40 @@ code chaser_validate::validate(bool bypass, const chain::block& block,
<< capture.group << ").");
}

// Diagnostics.
// Diagnostics (ecdsa).
batched_ecdsa_ += capture.batched_ecdsa;
unbatched_ecdsa_ += capture.unbatched_ecdsa;
batched_schnorr_ += capture.batched_schnorr;
unbatched_schnorr_ += capture.unbatched_schnorr;
batched_multisig_ += capture.batched_multisig;
unbatched_multisig_ += capture.unbatched_multisig;

if (to_bool(batched_ecdsa_.load()) || to_bool(unbatched_ecdsa_.load()))
{
LOGV("Efficiency ecdsa " << batched_ecdsa_ << " / ("
LOGV("Efficiency ecdsa " << batched_ecdsa_ << " / ("
<< batched_ecdsa_ << " + " << unbatched_ecdsa_ << ")");
}

if (to_bool(batched_multisig_.load()) || to_bool(unbatched_multisig_.load()))
{
LOGV("Efficiency multisig " << batched_multisig_ << " / ("
<< batched_multisig_ << " + " << unbatched_multisig_ << ")");
}

// Diagnostics (schnorr).
batched_schnorr_ += capture.batched_schnorr;
unbatched_schnorr_ += capture.unbatched_schnorr;
batched_threshold_ += capture.batched_threshold;
unbatched_threshold_ += capture.unbatched_threshold;

if (to_bool(batched_schnorr_.load()) || to_bool(unbatched_schnorr_.load()))
{
LOGV("Efficiency schnorr " << batched_schnorr_ << " / ("
LOGV("Efficiency schnorr " << batched_schnorr_ << " / ("
<< batched_schnorr_ << " + " << unbatched_schnorr_ << ")");
}

if (to_bool(batched_multisig_.load()) || to_bool(unbatched_multisig_.load()))
if (to_bool(batched_threshold_.load()) || to_bool(unbatched_threshold_.load()))
{
LOGV("Efficiency multisig " << batched_multisig_ << " / ("
<< batched_multisig_ << " + " << unbatched_multisig_ << ")");
LOGV("Efficiency threshold " << batched_threshold_ << " / ("
<< batched_threshold_ << " + " << unbatched_threshold_ << ")");
}
}
else
Expand Down
Loading