Skip to content

fix: avoid double signature check #2686

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

Closed
joske wants to merge 1 commit into from
Closed

fix: avoid double signature check #2686

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
26 changes: 15 additions & 11 deletions ledger/narwhal/batch-certificate/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,7 @@ impl<N: Network> BatchCertificate<N> {
impl<N: Network> BatchCertificate<N> {
/// Initializes a new batch certificate.
pub fn from(batch_header: BatchHeader<N>, signatures: IndexSet<Signature<N>>) -> Result<Self> {
// Ensure that the number of signatures is within bounds.
ensure!(signatures.len() <= Self::max_signatures()? as usize, "Invalid number of signatures");

// Ensure that the signature is from a unique signer and not from the author.
let signature_authors = signatures.iter().map(|signature| signature.to_address()).collect::<HashSet<_>>();
ensure!(
!signature_authors.contains(&batch_header.author()),
"The author's signature was included in the signers"
);
ensure!(signature_authors.len() == signatures.len(), "A duplicate author was found in the set of signatures");

Self::check_signature_basic(&batch_header, &signatures)?;
// Verify the signatures are valid.
cfg_iter!(signatures).try_for_each(|signature| {
if !signature.verify(&signature.to_address(), &[batch_header.batch_id()]) {
Expand All @@ -82,6 +72,20 @@ impl<N: Network> BatchCertificate<N> {
// Return the batch certificate.
Ok(Self { batch_header, signatures })
}

pub fn check_signature_basic(batch_header: &BatchHeader<N>, signatures: &IndexSet<Signature<N>>) -> Result<()> {
Copy link
Collaborator

@kaimast kaimast May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you document this function? It should be clear what it does compared to the checks in BatchCertificate::from.

Maybe you could document BatchCertificate::from a little better as well.

// Ensure that the number of signatures is within bounds.
ensure!(signatures.len() <= Self::max_signatures()? as usize, "Invalid number of signatures");

// Ensure that the signature is from a unique signer and not from the author.
let signature_authors = signatures.iter().map(|signature| signature.to_address()).collect::<HashSet<_>>();
ensure!(
!signature_authors.contains(&batch_header.author()),
"The author's signature was included in the signers"
);
ensure!(signature_authors.len() == signatures.len(), "A duplicate author was found in the set of signatures");
Ok(())
}
}

impl<N: Network> PartialEq for BatchCertificate<N> {
Expand Down