feat(crypto): CRP-2609 Introduce master key ID variant for vetKD

rs/consensus/src/idkg/payload_builder.rs

@@ -1082,6 +1082,9 @@ mod tests {
                         signature: vec![2; 32],
                     })
                 }
+                MasterPublicKeyId::VetKd(_) => {
+                    todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                }
             },
         );
 
@@ -1924,6 +1927,9 @@ mod tests {
                         &mut rng,
                     ))
                 }
+                MasterPublicKeyId::VetKd(_) => {
+                    todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                }
             };
             payload_0.available_pre_signatures.insert(
                 payload_0.uid_generator.next_pre_signature_id(),

rs/consensus/src/idkg/payload_builder/pre_signatures.rs

@@ -359,6 +359,7 @@ fn make_new_pre_signatures_if_needed_helper(
     let Some(pre_signatures_to_create) = chain_key_config
         .key_configs
         .iter()
+        .filter(|key_config| !matches!(&key_config.key_id, MasterPublicKeyId::VetKd(_)))
         .find(|key_config| &key_config.key_id == key_id)
         .map(|key_config| key_config.pre_signatures_to_create_in_advance as usize)
     else {
@@ -370,7 +371,7 @@ fn make_new_pre_signatures_if_needed_helper(
     }
 
     for _ in 0..(pre_signatures_to_create - unassigned_pre_signatures) {
-        let pre_signature = match key_id {
+        match key_id {
             MasterPublicKeyId::Ecdsa(ecdsa_key_id) => {
                 let kappa_config = new_random_unmasked_config(
                     key_id,
@@ -380,11 +381,12 @@ fn make_new_pre_signatures_if_needed_helper(
                 );
                 let lambda_config =
                     new_random_config(key_id, subnet_nodes, registry_version, uid_generator);
-                PreSignatureInCreation::Ecdsa(QuadrupleInCreation::new(
+                let pre_signature = PreSignatureInCreation::Ecdsa(QuadrupleInCreation::new(
                     ecdsa_key_id.clone(),
                     kappa_config,
                     lambda_config,
-                ))
+                ));
+                new_pre_signatures.insert(uid_generator.next_pre_signature_id(), pre_signature);
             }
             MasterPublicKeyId::Schnorr(schnorr_key_id) => {
                 let blinder_config = new_random_unmasked_config(
@@ -393,13 +395,16 @@ fn make_new_pre_signatures_if_needed_helper(
                     registry_version,
                     uid_generator,
                 );
-                PreSignatureInCreation::Schnorr(TranscriptInCreation::new(
+                let pre_signature = PreSignatureInCreation::Schnorr(TranscriptInCreation::new(
                     schnorr_key_id.clone(),
                     blinder_config,
-                ))
+                ));
+                new_pre_signatures.insert(uid_generator.next_pre_signature_id(), pre_signature);
+            }
+            MasterPublicKeyId::VetKd(_vetkd_key_id) => {
+                // vetKD does not have pre-signatures
             }
         };
-        new_pre_signatures.insert(uid_generator.next_pre_signature_id(), pre_signature);
     }
 
     new_pre_signatures
@@ -495,6 +500,9 @@ pub(super) mod test_utils {
                     blinder_config_ref,
                 ))
             }
+            MasterPublicKeyId::VetKd(_) => {
+                todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+            }
         };
         let configs = pre_signature
             .iter_transcript_configs_in_creation()
@@ -709,6 +717,9 @@ pub(super) mod tests {
         let expected_transcript_ids = match key_id {
             MasterPublicKeyId::Ecdsa(_) => 2 * expected_pre_signatures_in_creation,
             MasterPublicKeyId::Schnorr(_) => expected_pre_signatures_in_creation,
+            MasterPublicKeyId::VetKd(_) => {
+                todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+            }
         };
         assert_eq!(transcript_ids.len(), expected_transcript_ids);
         assert_eq!(

rs/consensus/src/idkg/payload_builder/signatures.rs

@@ -311,6 +311,9 @@ mod tests {
                             signature: vec![i as u8; 32],
                         })
                     }
+                    MasterPublicKeyId::VetKd(_) => {
+                        todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                    }
                 },
             );
         }

rs/consensus/src/idkg/payload_verifier.rs

@@ -1043,6 +1043,9 @@ mod test {
                     MasterPublicKeyId::Schnorr(_) => {
                         SignWithSchnorrReply { signature: vec![] }.encode()
                     }
+                    MasterPublicKeyId::VetKd(_) => {
+                        todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                    }
                 }),
             ));
 
@@ -1076,6 +1079,9 @@ mod test {
                 fake_schnorr_master_public_key_id(SchnorrAlgorithm::Ed25519)
             }
             MasterPublicKeyId::Schnorr(_) => fake_ecdsa_master_public_key_id(),
+            MasterPublicKeyId::VetKd(_) => {
+                todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+            }
         };
         // Add a pre-signature for the "wrong_key_id"
         insert_test_sig_inputs(

rs/consensus/src/idkg/signer.rs

@@ -1101,6 +1101,9 @@ mod tests {
                 fake_schnorr_master_public_key_id(SchnorrAlgorithm::Ed25519)
             }
             MasterPublicKeyId::Schnorr(_) => fake_ecdsa_master_public_key_id(),
+            MasterPublicKeyId::VetKd(_) => {
+                todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+            }
         };
 
         // Set up the signature requests
@@ -1288,6 +1291,9 @@ mod tests {
                 let expected_complaints_count = match key_id {
                     MasterPublicKeyId::Ecdsa(_) => requested_signatures_count * 5,
                     MasterPublicKeyId::Schnorr(_) => requested_signatures_count * 2,
+                    MasterPublicKeyId::VetKd(_) => {
+                        todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                    }
                 };
                 let complaints = transcript_loader.returned_complaints();
                 assert_eq!(change_set.len(), complaints.len());
@@ -1368,6 +1374,9 @@ mod tests {
                             ThresholdSigInputs::Schnorr(inputs),
                         )
                     }
+                    MasterPublicKeyId::VetKd(_) => {
+                        todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                    }
                 };
                 let crypto = env
                     .nodes
@@ -1548,6 +1557,7 @@ mod tests {
                 fake_schnorr_master_public_key_id(SchnorrAlgorithm::Ed25519)
             }
             MasterPublicKeyId::Schnorr(_) => fake_ecdsa_master_public_key_id(),
+            MasterPublicKeyId::VetKd(_) => fake_vetkd_master_public_key_id(),
         };
         let message = create_signature_share(&key_id_wrong_scheme, NODE_2, id_2.clone());
         let msg_id_2 = message.message_id();

rs/consensus/src/idkg/test_utils.rs

@@ -17,7 +17,9 @@ use ic_crypto_tree_hash::{LabeledTree, MixedHashTree};
 use ic_interfaces::idkg::{IDkgChangeAction, IDkgPool};
 use ic_interfaces_state_manager::{CertifiedStateSnapshot, Labeled};
 use ic_logger::ReplicaLogger;
-use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId};
+use ic_management_canister_types::{
+    EcdsaKeyId, MasterPublicKeyId, SchnorrAlgorithm, SchnorrKeyId, VetKdKeyId,
+};
 use ic_metrics::MetricsRegistry;
 use ic_replicated_state::metadata_state::subnet_call_context_manager::{
     EcdsaArguments, IDkgDealingsContext, SchnorrArguments, SignWithThresholdContext,
@@ -97,6 +99,9 @@ fn fake_signature_request_args(key_id: MasterPublicKeyId) -> ThresholdArguments
             key_id,
             message: Arc::new(vec![1; 48]),
         }),
+        MasterPublicKeyId::VetKd(_) => {
+            todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+        }
     }
 }
 
@@ -1152,6 +1157,9 @@ pub(crate) fn create_sig_inputs_with_args(
         MasterPublicKeyId::Schnorr(key_id) => {
             create_schnorr_sig_inputs_with_args(caller, receivers, key_unmasked, height, key_id)
         }
+        MasterPublicKeyId::VetKd(_) => {
+            todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+        }
     }
 }
 
@@ -1356,6 +1364,9 @@ pub(crate) fn create_signature_share_with_nonce(
                 sig_share_raw: vec![nonce],
             },
         }),
+        MasterPublicKeyId::VetKd(_) => {
+            todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+        }
     }
 }
 
@@ -1617,6 +1628,7 @@ pub(crate) fn key_id_with_name(key_id: &MasterPublicKeyId, name: &str) -> Master
     match key_id {
         MasterPublicKeyId::Ecdsa(ref mut key_id) => key_id.name = name.into(),
         MasterPublicKeyId::Schnorr(ref mut key_id) => key_id.name = name.into(),
+        MasterPublicKeyId::VetKd(ref mut key_id) => key_id.name = name.into(),
     }
     key_id
 }
@@ -1648,6 +1660,14 @@ pub(crate) fn schnorr_algorithm(algorithm: AlgorithmId) -> SchnorrAlgorithm {
     }
 }
 
+pub(crate) fn fake_vetkd_key_id() -> VetKdKeyId {
+    VetKdKeyId::from_str("Bls12_381:some_key").unwrap()
+}
+
+pub(crate) fn fake_vetkd_master_public_key_id() -> MasterPublicKeyId {
+    MasterPublicKeyId::VetKd(fake_vetkd_key_id())
+}
+
 pub(crate) fn fake_master_public_key_ids_for_all_algorithms() -> Vec<MasterPublicKeyId> {
     AlgorithmId::iter()
         .flat_map(|alg| match alg {
@@ -1658,6 +1678,13 @@ pub(crate) fn fake_master_public_key_ids_for_all_algorithms() -> Vec<MasterPubli
             AlgorithmId::ThresholdEd25519 => {
                 Some(fake_schnorr_master_public_key_id(SchnorrAlgorithm::Ed25519))
             }
+            ///////////////////////////////////
+            // TODO: Likely an algorihm for vetKD shall be added here, but
+            // first CRP-XXXX (Properly handle vetKD master key id in
+            // consensus tests) must be addressed.
+            //
+            // AlgorithmId::ThresBls12_381 => Some(fake_vetkd_master_public_key_id()),
+            ///////////////////////////////////
             _ => None,
         })
         .collect()

rs/consensus/src/idkg/utils.rs

@@ -443,6 +443,18 @@ pub(crate) fn algorithm_for_key_id(key_id: &MasterPublicKeyId) -> AlgorithmId {
             SchnorrAlgorithm::Bip340Secp256k1 => AlgorithmId::ThresholdSchnorrBip340,
             SchnorrAlgorithm::Ed25519 => AlgorithmId::ThresholdEd25519,
         },
+        MasterPublicKeyId::VetKd(_vetkd_key_id) => {
+            todo!(
+                "how to behave here: it seems `algorithm_for_key_id` is only
+                called once in production by fn update_next_key_transcript in
+                the iDKG payload builder. Seemingly all other of the many
+                usages usages are in test code.
+                "
+            )
+            // match vetkd_key_id.curve {
+            //     VetKdCurve::Bls12_381 => AlgorithmId::ThresBls12_381,
+            // },
+        }
     }
 }
 

rs/consensus/utils/src/lib.rs

@@ -860,6 +860,9 @@ mod tests {
             MasterPublicKeyId::Schnorr(key_id) => {
                 PreSignatureRef::Schnorr(fake_schnorr_transcript(id, key_id.clone()))
             }
+            MasterPublicKeyId::VetKd(_) => {
+                todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+            }
         }
     }
 
@@ -880,6 +883,9 @@ mod tests {
                         key_id: key_id.clone(),
                     })
                 }
+                MasterPublicKeyId::VetKd(_) => {
+                    todo!("CRP-XXXX Properly handle vetKD master key id in consensus tests")
+                }
             },
             derivation_path: vec![],
             pseudo_random_id: [0; 32],

rs/execution_environment/src/scheduler/threshold_signatures.rs

@@ -140,6 +140,7 @@ mod tests {
                 key_id: key_id.clone(),
                 message: Arc::new(vec![1; 64]),
             }),
+            MasterPublicKeyId::VetKd(_) => panic!("vetKD does not have pre-signatures"),
         };
         let context = SignWithThresholdContext {
             request: RequestBuilder::new().build(),

rs/protobuf/def/registry/crypto/v1/crypto.proto

@@ -80,9 +80,20 @@ message SchnorrKeyId {
   string name = 2;
 }
 
+enum VetKdCurve {
+  VETKD_CURVE_UNSPECIFIED = 0;
+  VETKD_CURVE_BLS12381 = 1;
+}
+
+message VetKdKeyId {
+  VetKdCurve curve = 1;
+  string name = 2;
+}
+
 message MasterPublicKeyId {
   oneof key_id {
     EcdsaKeyId ecdsa = 1;
     SchnorrKeyId schnorr = 2;
+    VetKdKeyId vetkd = 3;
   }
 }

rs/protobuf/src/gen/crypto/registry.crypto.v1.rs

@@ -49,8 +49,15 @@ pub struct SchnorrKeyId {
     pub name: ::prost::alloc::string::String,
 }
 #[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
+pub struct VetKdKeyId {
+    #[prost(enumeration = "VetKdCurve", tag = "1")]
+    pub curve: i32,
+    #[prost(string, tag = "2")]
+    pub name: ::prost::alloc::string::String,
+}
+#[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Message)]
 pub struct MasterPublicKeyId {
-    #[prost(oneof = "master_public_key_id::KeyId", tags = "1, 2")]
+    #[prost(oneof = "master_public_key_id::KeyId", tags = "1, 2, 3")]
     pub key_id: ::core::option::Option<master_public_key_id::KeyId>,
 }
 /// Nested message and enum types in `MasterPublicKeyId`.
@@ -61,6 +68,8 @@ pub mod master_public_key_id {
         Ecdsa(super::EcdsaKeyId),
         #[prost(message, tag = "2")]
         Schnorr(super::SchnorrKeyId),
+        #[prost(message, tag = "3")]
+        Vetkd(super::VetKdKeyId),
     }
 }
 /// An algorithm ID. This is used to specify the signature algorithm associated with a public key.
@@ -237,3 +246,41 @@ impl SchnorrAlgorithm {
         }
     }
 }
+#[derive(
+    serde::Serialize,
+    serde::Deserialize,
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Eq,
+    Hash,
+    PartialOrd,
+    Ord,
+    ::prost::Enumeration,
+)]
+#[repr(i32)]
+pub enum VetKdCurve {
+    VetkdCurveUnspecified = 0,
+    VetkdCurveBls12381 = 1,
+}
+impl VetKdCurve {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Self::VetkdCurveUnspecified => "VETKD_CURVE_UNSPECIFIED",
+            Self::VetkdCurveBls12381 => "VETKD_CURVE_BLS12381",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "VETKD_CURVE_UNSPECIFIED" => Some(Self::VetkdCurveUnspecified),
+            "VETKD_CURVE_BLS12381" => Some(Self::VetkdCurveBls12381),
+            _ => None,
+        }
+    }
+}