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
6 changes: 3 additions & 3 deletions include/bitcoin/node/chasers/chaser_validate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ class BCN_API chaser_validate
const header_link& link, const atomic_counter_ptr& sequence) NOEXCEPT;
bool do_schnorr(const system::hash_digest& digest,
const system::ec_xonly& point, const system::ec_signature& sign,
const header_link& link, const atomic_counter_ptr& sequence) NOEXCEPT;
const header_link& link) NOEXCEPT;
bool do_multisig(const system::hash_digest& digest,
const system::ec_compresseds& points,
const system::ec_signatures& signs, const header_link& link,
const atomic_counter_ptr& sequence) NOEXCEPT;
bool do_threshold(const threshold& batch, const header_link& link,
const atomic_counter_ptr& sequence) NOEXCEPT;
bool do_threshold(const threshold& batch,
const header_link& link) NOEXCEPT;

// Capture helpers.
signatures get_capture(const header_link& link) NOEXCEPT;
Expand Down
20 changes: 6 additions & 14 deletions src/chasers/chaser_validate_capture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,10 @@ bool chaser_validate::do_ecdsa(const hash_digest& digest,

bool chaser_validate::do_schnorr(const hash_digest& digest,
const ec_xonly& point, const ec_signature& sign,
const header_link& link, const atomic_counter_ptr& sequence) NOEXCEPT
const header_link& link) NOEXCEPT
{
++schnorr_;
const auto id = (*sequence)++;
if (is_limited<uint16_t>(id)) return false;
const auto group = narrow_cast<uint16_t>(id);
const auto set = archive().set_signature(digest, point, sign, group, link);
const auto set = archive().set_signature(digest, point, sign, link);
if (!set) fault(error::batch6);
return set;
}
Expand All @@ -94,8 +91,6 @@ bool chaser_validate::do_multisig(const hash_digest& digest,
const ec_compresseds& points, const ec_signatures& signs,
const header_link& link, const atomic_counter_ptr& sequence) NOEXCEPT
{
BC_ASSERT(points.size() == signs.size());

multisig_ += points.size();
const auto id = (*sequence)++;
if (is_limited<uint16_t>(id)) return false;
Expand All @@ -106,13 +101,10 @@ bool chaser_validate::do_multisig(const hash_digest& digest,
}

bool chaser_validate::do_threshold(const threshold& batch,
const header_link& link, const atomic_counter_ptr& sequence) NOEXCEPT
const header_link& link) NOEXCEPT
{
threshold_ += batch.tuples.size();
const auto id = (*sequence)++;
if (is_limited<uint16_t>(id)) return false;
const auto group = narrow_cast<uint16_t>(id);
const auto set = archive().set_signatures(batch, group, link);
const auto set = archive().set_signatures(batch, link);
if (!set) fault(error::batch8);
return set;
}
Expand All @@ -133,9 +125,9 @@ signatures chaser_validate::get_capture(const header_link& link) NOEXCEPT
.log = BIND_THIS(do_log, _1),
.fire = BIND_THIS(do_fire, _1, _2),
.ecdsa = BIND_THIS(do_ecdsa, _1, _2, _3, link, sequence),
.schnorr = BIND_THIS(do_schnorr, _1, _2, _3, link, sequence),
.schnorr = BIND_THIS(do_schnorr, _1, _2, _3, link),
.multisig = BIND_THIS(do_multisig, _1, _2, _3, link, sequence),
.threshold = BIND_THIS(do_threshold, _1, link, sequence)
.threshold = BIND_THIS(do_threshold, _1, link)
};
}

Expand Down
Loading