chore(CRP-2617): Generalize CUP’s ChainKeyInitialization

rs/consensus/src/idkg/utils.rs

@@ -416,17 +416,22 @@ pub(crate) fn inspect_chain_key_initializations(
                 )
             })?;
 
-        let dealings = chain_key_init
-            .dealings
-            .as_ref()
-            .expect("Error: Failed to find dealings in chain_key_initializations")
-            .try_into()
-            .map_err(|err| {
-                format!(
-                    "Error reading initial IDkg dealings: {:?}. Setting idkg_summary to None.",
-                    err
+        let dealings = match &chain_key_init.initialization {
+            Some(pb::chain_key_initialization::Initialization::Dealings(dealings)) => dealings,
+            Some(pb::chain_key_initialization::Initialization::Transcript(_)) => continue,
+            None => {
+                return Err(
+                    "Error: Failed to find dealings in chain_key_initializations".to_string(),
                 )
-            })?;
+            }
+        };
+
+        let dealings = dealings.try_into().map_err(|err| {
+            format!(
+                "Error reading initial IDkg dealings: {:?}. Setting idkg_summary to None.",
+                err
+            )
+        })?;
 
         initial_dealings_per_key_id.insert(key_id, dealings);
     }
@@ -661,7 +666,9 @@ mod tests {
         let key_id = fake_ecdsa_master_public_key_id();
         let chain_key_init = ChainKeyInitialization {
             key_id: Some((&key_id).into()),
-            dealings: Some((&initial_dealings).into()),
+            initialization: Some(pb::chain_key_initialization::Initialization::Dealings(
+                (&initial_dealings).into(),
+            )),
         };
 
         let init = inspect_chain_key_initializations(&[], &[chain_key_init])
@@ -696,11 +703,15 @@ mod tests {
         };
         let chain_key_init = ChainKeyInitialization {
             key_id: Some((&master_key_id).into()),
-            dealings: Some((&initial_dealings).into()),
+            initialization: Some(pb::chain_key_initialization::Initialization::Dealings(
+                (&initial_dealings).into(),
+            )),
         };
         let chain_key_init_2 = ChainKeyInitialization {
             key_id: Some((&master_key_id_2).into()),
-            dealings: Some((&initial_dealings_2).into()),
+            initialization: Some(pb::chain_key_initialization::Initialization::Dealings(
+                (&initial_dealings_2).into(),
+            )),
         };
 
         let init =

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

@@ -98,7 +98,11 @@ message EcdsaInitialization {
 
 message ChainKeyInitialization {
   registry.crypto.v1.MasterPublicKeyId key_id = 1;
-  InitialIDkgDealings dealings = 2;
+  //InitialIDkgDealings dealings = 2;
+  oneof initialization {
+    InitialIDkgDealings dealings = 2;
+    InitialNiDkgTranscriptRecord transcript = 3;
+  }
 }
 
 // Contains the initial DKG transcripts for the subnet and materials to construct a base CUP (i.e.

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

@@ -89,8 +89,20 @@ pub struct EcdsaInitialization {
 pub struct ChainKeyInitialization {
     #[prost(message, optional, tag = "1")]
     pub key_id: ::core::option::Option<super::super::crypto::v1::MasterPublicKeyId>,
-    #[prost(message, optional, tag = "2")]
-    pub dealings: ::core::option::Option<InitialIDkgDealings>,
+    /// InitialIDkgDealings dealings = 2;
+    #[prost(oneof = "chain_key_initialization::Initialization", tags = "2, 3")]
+    pub initialization: ::core::option::Option<chain_key_initialization::Initialization>,
+}
+/// Nested message and enum types in `ChainKeyInitialization`.
+pub mod chain_key_initialization {
+    /// InitialIDkgDealings dealings = 2;
+    #[derive(serde::Serialize, serde::Deserialize, Clone, PartialEq, ::prost::Oneof)]
+    pub enum Initialization {
+        #[prost(message, tag = "2")]
+        Dealings(super::InitialIDkgDealings),
+        #[prost(message, tag = "3")]
+        Transcript(super::InitialNiDkgTranscriptRecord),
+    }
 }
 /// Contains the initial DKG transcripts for the subnet and materials to construct a base CUP (i.e.
 /// a CUP with no dependencies on previous CUPs or blocks). Such CUP materials can be used to

rs/protobuf/src/gen/state/registry.subnet.v1.rs

@@ -89,8 +89,20 @@ pub struct EcdsaInitialization {
 pub struct ChainKeyInitialization {
     #[prost(message, optional, tag = "1")]
     pub key_id: ::core::option::Option<super::super::crypto::v1::MasterPublicKeyId>,
-    #[prost(message, optional, tag = "2")]
-    pub dealings: ::core::option::Option<InitialIDkgDealings>,
+    /// InitialIDkgDealings dealings = 2;
+    #[prost(oneof = "chain_key_initialization::Initialization", tags = "2, 3")]
+    pub initialization: ::core::option::Option<chain_key_initialization::Initialization>,
+}
+/// Nested message and enum types in `ChainKeyInitialization`.
+pub mod chain_key_initialization {
+    /// InitialIDkgDealings dealings = 2;
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Initialization {
+        #[prost(message, tag = "2")]
+        Dealings(super::InitialIDkgDealings),
+        #[prost(message, tag = "3")]
+        Transcript(super::InitialNiDkgTranscriptRecord),
+    }
 }
 /// Contains the initial DKG transcripts for the subnet and materials to construct a base CUP (i.e.
 /// a CUP with no dependencies on previous CUPs or blocks). Such CUP materials can be used to

rs/protobuf/src/gen/types/registry.subnet.v1.rs

@@ -89,8 +89,20 @@ pub struct EcdsaInitialization {
 pub struct ChainKeyInitialization {
     #[prost(message, optional, tag = "1")]
     pub key_id: ::core::option::Option<super::super::crypto::v1::MasterPublicKeyId>,
-    #[prost(message, optional, tag = "2")]
-    pub dealings: ::core::option::Option<InitialIDkgDealings>,
+    /// InitialIDkgDealings dealings = 2;
+    #[prost(oneof = "chain_key_initialization::Initialization", tags = "2, 3")]
+    pub initialization: ::core::option::Option<chain_key_initialization::Initialization>,
+}
+/// Nested message and enum types in `ChainKeyInitialization`.
+pub mod chain_key_initialization {
+    /// InitialIDkgDealings dealings = 2;
+    #[derive(Clone, PartialEq, ::prost::Oneof)]
+    pub enum Initialization {
+        #[prost(message, tag = "2")]
+        Dealings(super::InitialIDkgDealings),
+        #[prost(message, tag = "3")]
+        Transcript(super::InitialNiDkgTranscriptRecord),
+    }
 }
 /// Contains the initial DKG transcripts for the subnet and materials to construct a base CUP (i.e.
 /// a CUP with no dependencies on previous CUPs or blocks). Such CUP materials can be used to

rs/registry/canister/src/mutations/subnet.rs

@@ -14,7 +14,10 @@ use ic_management_canister_types::{
 };
 use ic_protobuf::registry::{
     crypto::v1::ChainKeySigningSubnetList,
-    subnet::v1::{CatchUpPackageContents, ChainKeyInitialization, SubnetListRecord, SubnetRecord},
+    subnet::v1::{
+        chain_key_initialization, CatchUpPackageContents, ChainKeyInitialization, SubnetListRecord,
+        SubnetRecord,
+    },
 };
 use ic_registry_keys::{
     make_catch_up_package_contents_key, make_chain_key_signing_subnet_list_key,
@@ -253,7 +256,9 @@ impl Registry {
 
         ChainKeyInitialization {
             key_id: Some((&dealing_request.key_id).into()),
-            dealings: Some(response.initial_dkg_dealings),
+            initialization: Some(chain_key_initialization::Initialization::Dealings(
+                response.initial_dkg_dealings,
+            )),
         }
     }