chore(registry): [CON-1671] remove height, time, state_hash from CatchUpPackageContents records in the registry

rs/prep/src/subnet_configuration.rs

@@ -402,8 +402,8 @@ impl SubnetConfig {
         let der_pk = threshold_sig_public_key_to_der(pk)?;
         let subnet_id = SubnetId::from(PrincipalId::new_self_authenticating(&der_pk[..]));
 
-        let (cup_type, state_hash) = match self.initial_height {
-            0 => (CupType::Genesis(GenesisArgs {}), vec![]),
+        let cup_type = match self.initial_height {
+            0 => CupType::Genesis(GenesisArgs {}),
             height => {
                 let state_hashes: Vec<_> = initialized_nodes
                     .values()
@@ -419,14 +419,11 @@ impl SubnetConfig {
                     "Generated initial states do not have the same state hash"
                 );
 
-                (
-                    CupType::Recovery(RecoveryArgs {
-                        height,
-                        time: 0,
-                        state_hash: state_hashes[0].clone(),
-                    }),
-                    state_hashes[0].clone(),
-                )
+                CupType::Recovery(RecoveryArgs {
+                    height,
+                    time: 0,
+                    state_hash: state_hashes[0].clone(),
+                })
             }
         };
 
@@ -437,9 +434,6 @@ impl SubnetConfig {
             initial_ni_dkg_transcript_high_threshold: Some(InitialNiDkgTranscriptRecord::from(
                 ni_dkg_transcript_high_threshold,
             )),
-            state_hash,
-            height: self.initial_height,
-            time: 0,
             registry_store_uri: None,
             ecdsa_initializations: vec![],
             chain_key_initializations: vec![],

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

@@ -153,24 +153,15 @@ message ChainKeyInitialization {
 // a CUP with no dependencies on previous CUPs or blocks). Such CUP materials can be used to
 // construct the genesis CUP or a recovery CUP in the event of a subnet stall.
 message CatchUpPackageContents {
+  reserved 3, 4, 5;
+  reserved "height", "time", "state_hash";
+
   // Initial non-interactive low-threshold DKG transcript
   InitialNiDkgTranscriptRecord initial_ni_dkg_transcript_low_threshold = 1;
 
   // Initial non-interactive high-threshold DKG transcript
   InitialNiDkgTranscriptRecord initial_ni_dkg_transcript_high_threshold = 2;
 
-  // The blockchain height that the CUP should have
-  // TODO(CON-1671): deprecate this field in favor of `cup_type`
-  uint64 height = 3;
-
-  // Block time for the CUP's block
-  // TODO(CON-1671): deprecate this field in favor of `cup_type`
-  uint64 time = 4;
-
-  // The hash of the state that the subnet should use
-  // TODO(CON-1671): deprecate this field in favor of `cup_type`
-  bytes state_hash = 5;
-
   // A uri from which data to replace the registry local store should be downloaded
   RegistryStoreUri registry_store_uri = 6;
 

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

@@ -159,18 +159,6 @@ pub struct CatchUpPackageContents {
     #[prost(message, optional, tag = "2")]
     pub initial_ni_dkg_transcript_high_threshold:
         ::core::option::Option<InitialNiDkgTranscriptRecord>,
-    /// The blockchain height that the CUP should have
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(uint64, tag = "3")]
-    pub height: u64,
-    /// Block time for the CUP's block
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(uint64, tag = "4")]
-    pub time: u64,
-    /// The hash of the state that the subnet should use
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(bytes = "vec", tag = "5")]
-    pub state_hash: ::prost::alloc::vec::Vec<u8>,
     /// A uri from which data to replace the registry local store should be downloaded
     #[prost(message, optional, tag = "6")]
     pub registry_store_uri: ::core::option::Option<RegistryStoreUri>,

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

@@ -159,18 +159,6 @@ pub struct CatchUpPackageContents {
     #[prost(message, optional, tag = "2")]
     pub initial_ni_dkg_transcript_high_threshold:
         ::core::option::Option<InitialNiDkgTranscriptRecord>,
-    /// The blockchain height that the CUP should have
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(uint64, tag = "3")]
-    pub height: u64,
-    /// Block time for the CUP's block
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(uint64, tag = "4")]
-    pub time: u64,
-    /// The hash of the state that the subnet should use
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(bytes = "vec", tag = "5")]
-    pub state_hash: ::prost::alloc::vec::Vec<u8>,
     /// A uri from which data to replace the registry local store should be downloaded
     #[prost(message, optional, tag = "6")]
     pub registry_store_uri: ::core::option::Option<RegistryStoreUri>,

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

@@ -159,18 +159,6 @@ pub struct CatchUpPackageContents {
     #[prost(message, optional, tag = "2")]
     pub initial_ni_dkg_transcript_high_threshold:
         ::core::option::Option<InitialNiDkgTranscriptRecord>,
-    /// The blockchain height that the CUP should have
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(uint64, tag = "3")]
-    pub height: u64,
-    /// Block time for the CUP's block
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(uint64, tag = "4")]
-    pub time: u64,
-    /// The hash of the state that the subnet should use
-    /// TODO(CON-1671): deprecate this field in favor of `cup_type`
-    #[prost(bytes = "vec", tag = "5")]
-    pub state_hash: ::prost::alloc::vec::Vec<u8>,
     /// A uri from which data to replace the registry local store should be downloaded
     #[prost(message, optional, tag = "6")]
     pub registry_store_uri: ::core::option::Option<RegistryStoreUri>,

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

@@ -113,9 +113,6 @@ impl Registry {
             ),
             chain_key_initializations,
             cup_type: Some(CupType::Genesis(GenesisArgs {})),
-            height: 0,
-            time: 0,
-            state_hash: vec![],
             registry_store_uri: None,
             ecdsa_initializations: vec![],
         };

rs/registry/canister/src/mutations/do_recover_subnet.rs

@@ -203,10 +203,6 @@ impl Registry {
         }
 
         // Set the height, time and state hash of the payload
-        cup_contents.height = payload.height;
-        cup_contents.time = payload.time_ns;
-        cup_contents.state_hash = payload.state_hash.clone();
-
         cup_contents.cup_type = Some(CupType::Recovery(RecoveryArgs {
             height: payload.height,
             time: payload.time_ns,

rs/registry/canister/tests/recover_subnet.rs

@@ -201,9 +201,6 @@ fn test_recover_subnet_with_replacement_nodes() {
                 get_value_or_panic(&registry, &cup_contents_key).await;
 
             // Assert that the CatchUpPackageContents was updated as expected
-            assert_eq!(payload.height, updated_cup_contents.height);
-            assert_eq!(payload.time_ns, updated_cup_contents.time);
-            assert_eq!(payload.state_hash, updated_cup_contents.state_hash);
             assert_eq!(
                 updated_cup_contents.cup_type,
                 Some(CupType::Recovery(RecoveryArgs {

rs/replay/src/lib.rs

@@ -290,9 +290,6 @@ fn cmd_get_recovery_cup(
     let cup_contents = CatchUpPackageContents {
         initial_ni_dkg_transcript_low_threshold,
         initial_ni_dkg_transcript_high_threshold,
-        height: cmd.height,
-        time: time.as_nanos_since_unix_epoch(),
-        state_hash: state_hash.clone(),
         registry_store_uri: None,
         ecdsa_initializations: vec![],
         chain_key_initializations: vec![],