chore(schnorr): CON-1282 Add optional MasterPublicKeyId to EcdsaReshareRequest

Author: eichhorl

rs/consensus/src/ecdsa/payload_builder/resharing.rs

@@ -66,6 +66,7 @@ pub(super) fn make_reshare_dealings_response(
                 if request
                     == &(ecdsa::EcdsaReshareRequest {
                         key_id: context.key_id.clone(),
+                        master_key_id: None,
                         receiving_node_ids: context.nodes.iter().copied().collect(),
                         registry_version: context.registry_version,
                     })
@@ -170,6 +171,7 @@ pub(super) fn get_reshare_requests(
         .values()
         .map(|context| ecdsa::EcdsaReshareRequest {
             key_id: context.key_id.clone(),
+            master_key_id: None,
             receiving_node_ids: context.nodes.iter().copied().collect(),
             registry_version: context.registry_version,
         })
@@ -191,6 +193,7 @@ pub mod test_utils {
     ) -> ecdsa::EcdsaReshareRequest {
         ecdsa::EcdsaReshareRequest {
             key_id,
+            master_key_id: None,
             receiving_node_ids: (0..num_nodes).map(node_test_id).collect::<Vec<_>>(),
             registry_version: RegistryVersion::from(registry_version),
         }
@@ -249,6 +252,7 @@ mod tests {
             |i: u64| EcdsaKeyId::from_str(&format!("Secp256k1:some_key_{i}")).unwrap();
         let make_reshare_request = |i| EcdsaReshareRequest {
             key_id: make_key_id(i),
+            master_key_id: None,
             receiving_node_ids: vec![node_test_id(i)],
             registry_version: RegistryVersion::from(i),
         };

rs/consensus/src/ecdsa/test_utils.rs

@@ -1492,6 +1492,7 @@ pub(crate) fn fake_ecdsa_key_id() -> EcdsaKeyId {
 pub(crate) fn create_reshare_request(num_nodes: u64, registry_version: u64) -> EcdsaReshareRequest {
     EcdsaReshareRequest {
         key_id: fake_ecdsa_key_id(),
+        master_key_id: None,
         receiving_node_ids: (0..num_nodes).map(node_test_id).collect::<Vec<_>>(),
         registry_version: RegistryVersion::from(registry_version),
     }

rs/protobuf/def/types/v1/ecdsa.proto

@@ -190,6 +190,7 @@ message EcdsaReshareRequest {
   repeated types.v1.NodeId receiving_node_ids = 2;
   uint64 registry_version = 3;
   registry.crypto.v1.EcdsaKeyId key_id = 4;
+  registry.crypto.v1.MasterPublicKeyId master_key_id = 5;
 }
 
 enum KeyTranscriptCreationState {

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

@@ -679,6 +679,9 @@ pub struct EcdsaReshareRequest {
     pub registry_version: u64,
     #[prost(message, optional, tag = "4")]
     pub key_id: ::core::option::Option<super::super::registry::crypto::v1::EcdsaKeyId>,
+    #[prost(message, optional, tag = "5")]
+    pub master_key_id:
+        ::core::option::Option<super::super::registry::crypto::v1::MasterPublicKeyId>,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]

rs/types/types/src/consensus/ecdsa.rs

@@ -28,7 +28,7 @@ use crate::{
 use ic_crypto_sha2::Sha256;
 #[cfg(test)]
 use ic_exhaustive_derive::ExhaustiveSet;
-use ic_management_canister_types::EcdsaKeyId;
+use ic_management_canister_types::{EcdsaKeyId, MasterPublicKeyId};
 use ic_protobuf::{
     proxy::{try_from_option_field, ProxyDecodeError},
     registry::{crypto::v1 as crypto_pb, subnet::v1 as subnet_pb},
@@ -40,7 +40,7 @@ use std::{
     collections::{BTreeMap, BTreeSet},
     convert::{TryFrom, TryInto},
     fmt::{self, Display, Formatter},
-    hash::Hash,
+    hash::{Hash, Hasher},
     time::Duration,
 };
 use strum_macros::EnumIter;
@@ -623,14 +623,31 @@ impl TryFrom<&pb::KeyTranscriptCreation> for KeyTranscriptCreation {
 }
 
 /// Internal format of the resharing request from execution.
-#[derive(Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Serialize, Deserialize, Hash)]
-#[cfg_attr(test, derive(ExhaustiveSet))]
+#[derive(Clone, Debug, PartialOrd, Ord, PartialEq, Eq, Serialize, Deserialize)]
 pub struct EcdsaReshareRequest {
     pub key_id: EcdsaKeyId,
+    pub master_key_id: Option<MasterPublicKeyId>,
     pub receiving_node_ids: Vec<NodeId>,
     pub registry_version: RegistryVersion,
 }
 
+impl Hash for EcdsaReshareRequest {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        let EcdsaReshareRequest {
+            key_id,
+            master_key_id,
+            receiving_node_ids,
+            registry_version,
+        } = self;
+        key_id.hash(state);
+        if let Some(master_key_id) = master_key_id {
+            master_key_id.hash(state);
+        }
+        receiving_node_ids.hash(state);
+        registry_version.hash(state);
+    }
+}
+
 impl From<&EcdsaReshareRequest> for pb::EcdsaReshareRequest {
     fn from(request: &EcdsaReshareRequest) -> Self {
         let mut receiving_node_ids = Vec::new();
@@ -639,6 +656,7 @@ impl From<&EcdsaReshareRequest> for pb::EcdsaReshareRequest {
         }
         Self {
             key_id: Some((&request.key_id).into()),
+            master_key_id: request.master_key_id.clone().map(|key_id| key_id.into()),
             receiving_node_ids,
             registry_version: request.registry_version.get(),
         }
@@ -655,8 +673,14 @@ impl TryFrom<&pb::EcdsaReshareRequest> for EcdsaReshareRequest {
             .collect::<Result<Vec<_>, ProxyDecodeError>>()?;
 
         let key_id = try_from_option_field(request.key_id.clone(), "EcdsaReshareRequest::key_id")?;
+        let master_key_id = request
+            .master_key_id
+            .clone()
+            .map(|key_id| key_id.try_into())
+            .transpose()?;
         Ok(Self {
             key_id,
+            master_key_id,
             receiving_node_ids,
             registry_version: RegistryVersion::new(request.registry_version),
         })

rs/types/types/src/exhaustive.rs

@@ -721,6 +721,28 @@ impl ExhaustiveSet for PreSignatureQuadrupleRef {
     }
 }
 
+#[derive(Clone)]
+#[cfg_attr(test, derive(ExhaustiveSet))]
+pub struct DerivedEcdsaReshareRequest {
+    pub key_id: EcdsaKeyId,
+    pub receiving_node_ids: Vec<NodeId>,
+    pub registry_version: RegistryVersion,
+}
+
+impl ExhaustiveSet for EcdsaReshareRequest {
+    fn exhaustive_set<R: RngCore + CryptoRng>(rng: &mut R) -> Vec<Self> {
+        DerivedEcdsaReshareRequest::exhaustive_set(rng)
+            .into_iter()
+            .map(|r| EcdsaReshareRequest {
+                key_id: r.key_id,
+                master_key_id: None,
+                receiving_node_ids: r.receiving_node_ids,
+                registry_version: r.registry_version,
+            })
+            .collect()
+    }
+}
+
 impl ExhaustiveSet for ConsensusResponse {
     fn exhaustive_set<R: RngCore + CryptoRng>(rng: &mut R) -> Vec<Self> {
         Response::exhaustive_set(rng)