Merge branch 'kpop/CON-979/proto2' into 'master'

feat(Consensus): [CON-979] Add "halt_at_cup_height" to the registry proto.

This is needed for the Subnet Splitting MVP.

The actual subnet halting will be implemented in a [subsequent MR](https://gitlab.com/dfinity-lab/public/ic/-/merge_requests/12475).

[1-pager](https://docs.google.com/document/d/14DmM-lPrVlJymK8VJFeDec-yNU_bhNFbBe6wSx-5W0k/edit#heading=h.g6x0685fi43z) 

See merge request dfinity-lab/public/ic!12298

Author: kpop-dfinity

rs/crypto/temp_crypto/src/lib.rs

@@ -414,6 +414,7 @@ impl EcdsaSubnetConfig {
                 start_as_nns: false,
                 subnet_type: SubnetType::Application.into(),
                 is_halted: false,
+                halt_at_cup_height: false,
                 max_instructions_per_message: 5_000_000_000,
                 max_instructions_per_round: 7_000_000_000,
                 max_instructions_per_install_code: 200_000_000_000,

rs/nns/integration_tests/src/subnet_handler.rs

@@ -59,6 +59,7 @@ fn test_submit_and_accept_update_subnet_proposal() {
                 start_as_nns: false,
                 subnet_type: SubnetType::Application.into(),
                 is_halted: false,
+                halt_at_cup_height: false,
                 max_instructions_per_message: 5_000_000_000,
                 max_instructions_per_round: 7_000_000_000,
                 max_instructions_per_install_code: 200_000_000_000,
@@ -109,6 +110,7 @@ fn test_submit_and_accept_update_subnet_proposal() {
                 start_as_nns: None,
                 subnet_type: None,
                 is_halted: Some(true),
+                halt_at_cup_height: Some(true),
                 max_instructions_per_message: None,
                 max_instructions_per_round: Some(8_000_000_000),
                 max_instructions_per_install_code: None,
@@ -180,6 +182,7 @@ fn test_submit_and_accept_update_subnet_proposal() {
                     start_as_nns: false,
                     subnet_type: SubnetType::Application.into(),
                     is_halted: true,
+                    halt_at_cup_height: true,
                     max_instructions_per_message: 5_000_000_000,
                     max_instructions_per_round: 8_000_000_000,
                     max_instructions_per_install_code: 200_000_000_000,

rs/prep/src/subnet_configuration.rs

@@ -297,6 +297,7 @@ impl SubnetConfig {
             start_as_nns: false,
             subnet_type: self.subnet_type.into(),
             is_halted: false,
+            halt_at_cup_height: false,
             max_instructions_per_message: self.max_instructions_per_message,
             max_instructions_per_round: self.max_instructions_per_round,
             max_instructions_per_install_code: self.max_instructions_per_install_code,

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

@@ -90,6 +90,10 @@ message SubnetRecord {
   // to `Some`. To remove a key, the list of `key_ids` can be set to not include a particular key.
   // If a removed key is not held by another subnet, it will be lost.
   EcdsaConfig ecdsa_config = 27;
+
+  // If `true`, the subnet will be halted after reaching the next cup height: it will no longer
+  // create or execute blocks.
+  bool halt_at_cup_height = 28;
 }
 
 message EcdsaInitialization {

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

@@ -77,6 +77,10 @@ pub struct SubnetRecord {
     /// If a removed key is not held by another subnet, it will be lost.
     #[prost(message, optional, tag = "27")]
     pub ecdsa_config: ::core::option::Option<EcdsaConfig>,
+    /// If `true`, the subnet will be halted after reaching the next cup height: it will no longer
+    /// create or execute blocks.
+    #[prost(bool, tag = "28")]
+    pub halt_at_cup_height: bool,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]

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

@@ -76,6 +76,10 @@ pub struct SubnetRecord {
     /// If a removed key is not held by another subnet, it will be lost.
     #[prost(message, optional, tag = "27")]
     pub ecdsa_config: ::core::option::Option<EcdsaConfig>,
+    /// If `true`, the subnet will be halted after reaching the next cup height: it will no longer
+    /// create or execute blocks.
+    #[prost(bool, tag = "28")]
+    pub halt_at_cup_height: bool,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

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

@@ -77,6 +77,10 @@ pub struct SubnetRecord {
     /// If a removed key is not held by another subnet, it will be lost.
     #[prost(message, optional, tag = "27")]
     pub ecdsa_config: ::core::option::Option<EcdsaConfig>,
+    /// If `true`, the subnet will be halted after reaching the next cup height: it will no longer
+    /// create or execute blocks.
+    #[prost(bool, tag = "28")]
+    pub halt_at_cup_height: bool,
 }
 #[derive(serde::Serialize, serde::Deserialize)]
 #[allow(clippy::derive_partial_eq_without_eq)]

rs/registry/admin/src/main.rs

@@ -78,21 +78,19 @@ use ic_protobuf::registry::node_rewards::v2::{
 };
 use ic_protobuf::registry::{
     crypto::v1::{PublicKey, X509PublicKeyCert},
+    dc::v1::{AddOrRemoveDataCentersProposalPayload, DataCenterRecord},
     node::v1::NodeRecord,
-    node_operator::v1::NodeOperatorRecord,
+    node_operator::v1::{NodeOperatorRecord, RemoveNodeOperatorsPayload},
     provisional_whitelist::v1::ProvisionalWhitelist as ProvisionalWhitelistProto,
     replica_version::v1::{BlessedReplicaVersions, ReplicaVersionRecord},
     routing_table::v1::{CanisterMigrations, RoutingTable},
     subnet::v1::{SubnetListRecord, SubnetRecord as SubnetRecordProto},
     unassigned_nodes_config::v1::UnassignedNodesConfigRecord,
 };
-use ic_protobuf::registry::{
-    dc::v1::{AddOrRemoveDataCentersProposalPayload, DataCenterRecord},
-    node_operator::v1::RemoveNodeOperatorsPayload,
-};
 use ic_registry_client::client::RegistryClientImpl;
-use ic_registry_client_helpers::ecdsa_keys::EcdsaKeysRegistry;
-use ic_registry_client_helpers::{crypto::CryptoRegistry, subnet::SubnetRegistry};
+use ic_registry_client_helpers::{
+    crypto::CryptoRegistry, ecdsa_keys::EcdsaKeysRegistry, subnet::SubnetRegistry,
+};
 use ic_registry_keys::{
     get_node_record_node_id, is_node_record_key, make_blessed_replica_versions_key,
     make_canister_migrations_record_key, make_crypto_node_key,
@@ -1833,11 +1831,17 @@ struct ProposeToUpdateSubnetCmd {
     /// field to the value set. See `ProposeToCreateSubnetCmd` for the semantic
     /// of this field.
     pub start_as_nns: Option<bool>,
+
     /// If set, the subnet will be halted: it will no longer create or execute
     /// blocks
     #[clap(long)]
     pub is_halted: Option<bool>,
 
+    /// If set, the subnet will be halted at the next CUP height: it will no longer create or execute
+    /// blocks
+    #[clap(long)]
+    pub halt_at_cup_height: Option<bool>,
+
     #[clap(long)]
     /// If set, this updates the instruction limit per message.
     /// See the comments in `subnet_config.rs` for more details
@@ -2069,6 +2073,7 @@ impl ProposalPayload<UpdateSubnetPayload> for ProposeToUpdateSubnetCmd {
             subnet_type: None,
 
             is_halted: self.is_halted,
+            halt_at_cup_height: self.halt_at_cup_height,
             max_instructions_per_message: self.max_instructions_per_message,
             max_instructions_per_round: self.max_instructions_per_round,
             max_instructions_per_install_code: self.max_instructions_per_install_code,

rs/registry/canister/canister/registry.did

@@ -241,6 +241,7 @@ type UpdateSubnetPayload = record {
   features : opt SubnetFeatures;
   set_gossip_config_to_default : bool;
   max_instructions_per_message : opt nat64;
+  halt_at_cup_height : opt bool;
   pfn_evaluation_period_ms : opt nat32;
   subnet_id : principal;
   max_ingress_bytes_per_message : opt nat64;

rs/registry/canister/src/mutations/do_create_subnet.rs

@@ -14,15 +14,13 @@ use serde::Serialize;
 
 use ic_base_types::{NodeId, PrincipalId, RegistryVersion, SubnetId};
 use ic_ic00_types::{EcdsaKeyId, SetupInitialDKGArgs, SetupInitialDKGResponse};
-use ic_protobuf::registry::subnet::v1::EcdsaConfig;
 use ic_protobuf::registry::{
     node::v1::NodeRecord,
-    subnet::v1::{CatchUpPackageContents, GossipConfig, SubnetRecord},
+    subnet::v1::{CatchUpPackageContents, EcdsaConfig, GossipConfig, SubnetRecord},
 };
-use ic_registry_keys::make_node_record_key;
 use ic_registry_keys::{
     make_catch_up_package_contents_key, make_crypto_threshold_signing_pubkey_key,
-    make_subnet_list_record_key, make_subnet_record_key,
+    make_node_record_key, make_subnet_list_record_key, make_subnet_record_key,
 };
 use ic_registry_subnet_features::{SubnetFeatures, DEFAULT_ECDSA_MAX_QUEUE_SIZE};
 use ic_registry_subnet_type::SubnetType;
@@ -331,6 +329,7 @@ impl From<CreateSubnetPayload> for SubnetRecord {
             subnet_type: val.subnet_type.into(),
 
             is_halted: val.is_halted,
+            halt_at_cup_height: false,
 
             max_instructions_per_message: val.max_instructions_per_message,
             max_instructions_per_round: val.max_instructions_per_round,