feat: CON-1716 Allow specifying initial DKG subnet for subnet splitting and rental (#10027)

Creating, recovering or splitting a subnet requires new key material for
the nodes comprising the subnet. This key material needs to be generated
by a different subnet. Until recently, this key generation was
exclusively done by the NNS. Since
#9782 however, it may be done by any
subnet (and specifically, _not_ the NNS).

The linked PR already updated proposals for creating and recovering
subnets to optionally specify which subnet should be responsible for
generating the initial key material.

This PR similarly updates the remaining two proposal types that also
cause new key material to be generated, namely subnet splitting and
subnet rental (which is a subnet creation).

Author: eichhorl

rs/nns/governance/api/src/types.rs

@@ -2826,6 +2826,9 @@ pub struct FulfillSubnetRentalRequest {
     pub user: Option<PrincipalId>,
     pub node_ids: Option<Vec<PrincipalId>>,
     pub replica_version_id: Option<String>,
+    /// Optional subnet that should handle `setup_initial_dkg` for subnet creation.
+    /// If not set, handling defaults to the NNS subnet.
+    pub initial_dkg_subnet_id: Option<PrincipalId>,
 }
 
 #[derive(

rs/nns/governance/canister/governance.did

@@ -1115,6 +1115,10 @@ type FulfillSubnetRentalRequest = record {
   //
   //     https://github.com/dfinity/ic/releases/latest
   replica_version_id : opt text;
+
+  // Optional subnet that should handle `setup_initial_dkg` for subnet creation.
+  // If not set, handling defaults to the NNS subnet.
+  initial_dkg_subnet_id : opt principal;
 };
 
 // Declares an approved set of alternative replica virtual machine software for

rs/nns/governance/proto/ic_nns_governance/pb/v1/governance.proto

@@ -1992,6 +1992,9 @@ message FulfillSubnetRentalRequest {
   ic_base_types.pb.v1.PrincipalId user = 1;
   repeated ic_base_types.pb.v1.PrincipalId node_ids = 3;
   string replica_version_id = 2;
+  // Optional subnet that should handle `setup_initial_dkg` for subnet creation.
+  // If not set, handling defaults to the NNS subnet.
+  optional ic_base_types.pb.v1.PrincipalId initial_dkg_subnet_id = 4;
 }
 
 message BlessAlternativeGuestOsVersion {

rs/nns/governance/src/gen/ic_nns_governance.pb.v1.rs

@@ -2995,6 +2995,10 @@ pub struct FulfillSubnetRentalRequest {
     pub node_ids: ::prost::alloc::vec::Vec<::ic_base_types::PrincipalId>,
     #[prost(string, tag = "2")]
     pub replica_version_id: ::prost::alloc::string::String,
+    /// Optional subnet that should handle `setup_initial_dkg` for subnet creation.
+    /// If not set, handling defaults to the NNS subnet.
+    #[prost(message, optional, tag = "4")]
+    pub initial_dkg_subnet_id: ::core::option::Option<::ic_base_types::PrincipalId>,
 }
 #[derive(
     candid::CandidType,

rs/nns/governance/src/pb/conversions/mod.rs

@@ -2790,6 +2790,7 @@ impl From<pb::FulfillSubnetRentalRequest> for api::FulfillSubnetRentalRequest {
             user: item.user,
             node_ids: Some(item.node_ids),
             replica_version_id: Some(item.replica_version_id),
+            initial_dkg_subnet_id: item.initial_dkg_subnet_id,
         }
     }
 }
@@ -2800,6 +2801,7 @@ impl From<api::FulfillSubnetRentalRequest> for pb::FulfillSubnetRentalRequest {
             user: item.user,
             node_ids: item.node_ids.unwrap_or_default(),
             replica_version_id: item.replica_version_id.unwrap_or_default(),
+            initial_dkg_subnet_id: item.initial_dkg_subnet_id,
         }
     }
 }

rs/nns/governance/src/proposals/fulfill_subnet_rental_request.rs

@@ -42,6 +42,9 @@ pub(crate) struct ValidFulfillSubnetRentalRequest {
     user: PrincipalId,
     node_ids: Vec<PrincipalId>,
     replica_version_id: String,
+    /// Optional subnet that should handle `setup_initial_dkg` for subnet creation.
+    /// If not set, handling defaults to the NNS subnet.
+    initial_dkg_subnet_id: Option<PrincipalId>,
 }
 
 impl TryFrom<FulfillSubnetRentalRequest> for ValidFulfillSubnetRentalRequest {
@@ -52,6 +55,7 @@ impl TryFrom<FulfillSubnetRentalRequest> for ValidFulfillSubnetRentalRequest {
             user,
             node_ids,
             replica_version_id,
+            initial_dkg_subnet_id,
         } = value;
 
         let mut defects = vec![];
@@ -93,6 +97,7 @@ impl TryFrom<FulfillSubnetRentalRequest> for ValidFulfillSubnetRentalRequest {
             user,
             node_ids,
             replica_version_id,
+            initial_dkg_subnet_id,
         })
     }
 }
@@ -239,7 +244,7 @@ impl ValidFulfillSubnetRentalRequest {
 
             subnet_type: SubnetType::Application,
             subnet_id_override: None,
-            initial_dkg_subnet_id: None,
+            initial_dkg_subnet_id: self.initial_dkg_subnet_id.map(SubnetId::from),
             start_as_nns: false,
             is_halted: false,
             chain_key_config: None,

rs/nns/governance/src/proposals/fulfill_subnet_rental_request/tests.rs

@@ -22,6 +22,7 @@ fn test_validate_fulfill_subnet_rental_request() {
             .map(|_| new_subnet_id())
             .collect(),
         replica_version_id: "60fb469c46e44e6071193a3314cc442044fcf17a".to_string(),
+        initial_dkg_subnet_id: None,
     };
 
     // Sad cases.

rs/registry/admin/bin/main.rs

@@ -1606,6 +1606,11 @@ struct ProposeToFulfillSubnetRentalRequestCmd {
     /// Replica version ID (40 character hexadecimal git commit ID)
     #[clap(long)]
     replica_version_id: String,
+
+    /// Optional subnet that should handle `setup_initial_dkg` for subnet creation.
+    /// If not set, handling defaults to the NNS subnet.
+    #[clap(long)]
+    initial_dkg_subnet_id: Option<PrincipalId>,
 }
 
 impl ProposalTitle for ProposeToFulfillSubnetRentalRequestCmd {
@@ -1628,6 +1633,7 @@ impl ProposalAction for ProposeToFulfillSubnetRentalRequestCmd {
                 user: Some(self.user),
                 node_ids: Some(self.node_ids.clone()),
                 replica_version_id: Some(self.replica_version_id.clone()),
+                initial_dkg_subnet_id: self.initial_dkg_subnet_id,
             },
         )
     }

rs/registry/canister/canister/registry.did

@@ -548,6 +548,7 @@ type SplitSubnetPayload = record {
   source_subnet_id: principal;
   destination_canister_ranges: vec CanisterIdRange;
   destination_node_ids: vec principal;
+  initial_dkg_subnet_id: opt principal;
 };
 
 type OperationType = variant {

rs/registry/canister/canister/registry_test.did

@@ -548,6 +548,7 @@ type SplitSubnetPayload = record {
   source_subnet_id: principal;
   destination_canister_ranges: vec CanisterIdRange;
   destination_node_ids: vec principal;
+  initial_dkg_subnet_id: opt principal;
 };
 
 type OperationType = variant {