Skip to content

Feat: sign epoch in genesis certificate #1987

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.

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
merged 3 commits into from
Oct 8, 2024
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mithril-aggregator/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mithril-aggregator"
version = "0.5.75"
version = "0.5.76"
description = "A Mithril Aggregator server"
authors = { workspace = true }
edition = { workspace = true }
Expand Down
2 changes: 2 additions & 0 deletions mithril-aggregator/src/tools/genesis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ impl GenesisTools {
let protocol_message = CertificateGenesisProducer::create_genesis_protocol_message(
&self.genesis_protocol_parameters,
&self.genesis_avk,
&self.time_point.epoch,
)?;
target_file.write_all(protocol_message.compute_hash().as_bytes())?;
Ok(())
Expand All @@ -135,6 +136,7 @@ impl GenesisTools {
let genesis_protocol_message = CertificateGenesisProducer::create_genesis_protocol_message(
&self.genesis_protocol_parameters,
&self.genesis_avk,
&self.time_point.epoch,
)?;
let genesis_signature =
genesis_producer.sign_genesis_protocol_message(genesis_protocol_message)?;
Expand Down
2 changes: 1 addition & 1 deletion mithril-common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mithril-common"
version = "0.4.65"
version = "0.4.66"
description = "Common types, interfaces, and utilities for Mithril nodes."
authors = { workspace = true }
edition = { workspace = true }
Expand Down
15 changes: 14 additions & 1 deletion mithril-common/src/certificate_chain/certificate_genesis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ impl CertificateGenesisProducer {
pub fn create_genesis_protocol_message(
genesis_protocol_parameters: &ProtocolParameters,
genesis_avk: &ProtocolAggregateVerificationKey,
genesis_epoch: &Epoch,
) -> StdResult<ProtocolMessage> {
let genesis_avk = genesis_avk.to_json_hex()?;
let mut protocol_message = ProtocolMessage::new();
Expand All @@ -54,6 +55,10 @@ impl CertificateGenesisProducer {
ProtocolMessagePartKey::NextProtocolParameters,
genesis_protocol_parameters.compute_hash(),
);
protocol_message.set_message_part(
ProtocolMessagePartKey::CurrentEpoch,
genesis_epoch.to_string(),
);
Ok(protocol_message)
}

Expand Down Expand Up @@ -94,7 +99,7 @@ impl CertificateGenesisProducer {
);
let previous_hash = "".to_string();
let genesis_protocol_message =
Self::create_genesis_protocol_message(&protocol_parameters, &genesis_avk)?;
Self::create_genesis_protocol_message(&protocol_parameters, &genesis_avk, &epoch)?;
Ok(Certificate::new(
previous_hash,
epoch,
Expand All @@ -117,9 +122,11 @@ mod tests {
let fixture = MithrilFixtureBuilder::default().with_signers(5).build();
let genesis_protocol_parameters = fixture.protocol_parameters();
let genesis_avk = fixture.compute_avk();
let genesis_epoch = Epoch(123);
let protocol_message = CertificateGenesisProducer::create_genesis_protocol_message(
&genesis_protocol_parameters,
&genesis_avk,
&genesis_epoch,
)
.unwrap();

Expand All @@ -135,5 +142,11 @@ mod tests {
protocol_message.get_message_part(&ProtocolMessagePartKey::NextProtocolParameters),
Some(&expected_genesis_protocol_parameters_value)
);

let expected_genesis_epoch = genesis_epoch.to_string();
assert_eq!(
protocol_message.get_message_part(&ProtocolMessagePartKey::CurrentEpoch),
Some(&expected_genesis_epoch)
);
}
}
4 changes: 3 additions & 1 deletion mithril-common/src/crypto_helper/tests_setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ pub fn setup_certificate_chain(
let genesis_verifier = genesis_signer.create_genesis_verifier();
let genesis_producer = CertificateGenesisProducer::new(Some(Arc::new(genesis_signer)));
let protocol_parameters = setup_protocol_parameters();
let mut epochs = (1..total_certificates + 2)
let genesis_epoch = Epoch(1);
let mut epochs = (genesis_epoch.0..total_certificates + 2)
.map(|i| match certificates_per_epoch {
0 => panic!("expected at least 1 certificate per epoch"),
1 => Epoch(i),
Expand Down Expand Up @@ -250,6 +251,7 @@ pub fn setup_certificate_chain(
CertificateGenesisProducer::create_genesis_protocol_message(
next_protocol_parameters,
&next_avk,
&genesis_epoch,
)
.unwrap();
let genesis_signature = genesis_producer
Expand Down
1 change: 1 addition & 0 deletions mithril-common/src/test_utils/mithril_fixture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ impl MithrilFixture {
let genesis_protocol_message = CertificateGenesisProducer::create_genesis_protocol_message(
&self.protocol_parameters,
&genesis_avk,
&epoch,
)
.unwrap();
let genesis_signature = genesis_producer
Expand Down
Loading