Added LoadCanisterSnapshot proposal type.

daniel-wong-dfinity-org · daniel-wong-dfinity-org · commit cbd88f093017 · 2026-01-08T16:17:34.000+01:00
diff --git a/rs/nns/governance/api/src/types.rs b/rs/nns/governance/api/src/types.rs
@@ -4206,6 +4206,8 @@ pub enum NnsFunction {
     /// controlled by the NNS Root canister. This restriction could be relaxed
     /// later. See nns/.../root.did for the payload type.
     TakeCanisterSnapshot = 56,
+    /// Loads a canister snapshot.
+    LoadCanisterSnapshot = 57,
 }
 impl NnsFunction {
     /// String value of the enum field names used in the ProtoBuf definition.
@@ -4290,6 +4292,7 @@ impl NnsFunction {
             NnsFunction::UnpauseCanisterMigrations => "NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS",
             NnsFunction::SetSubnetOperationalLevel => "NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL",
             NnsFunction::TakeCanisterSnapshot => "NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT",
+            NnsFunction::LoadCanisterSnapshot => "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -4371,6 +4374,7 @@ impl NnsFunction {
             "NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS" => Some(Self::UnpauseCanisterMigrations),
             "NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL" => Some(Self::SetSubnetOperationalLevel),
             "NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT" => Some(Self::TakeCanisterSnapshot),
+            "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT" => Some(Self::LoadCanisterSnapshot),
             _ => None,
         }
     }
diff --git a/rs/nns/governance/proto/ic_nns_governance/pb/v1/governance.proto b/rs/nns/governance/proto/ic_nns_governance/pb/v1/governance.proto
@@ -498,6 +498,9 @@ enum NnsFunction {
 
   // Take a canister snapshot.
   NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT = 56;
+
+  // Load a canister snapshot.
+  NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT = 57;
 }
 
 // Payload of a proposal that calls a function on another NNS
diff --git a/rs/nns/governance/src/canister_state.rs b/rs/nns/governance/src/canister_state.rs
@@ -395,7 +395,8 @@ fn get_effective_payload(
         | ValidNnsFunction::PauseCanisterMigrations
         | ValidNnsFunction::UnpauseCanisterMigrations
         | ValidNnsFunction::SetSubnetOperationalLevel
-        | ValidNnsFunction::TakeCanisterSnapshot => Ok(payload.clone()),
+        | ValidNnsFunction::TakeCanisterSnapshot
+        | ValidNnsFunction::LoadCanisterSnapshot => Ok(payload.clone()),
     }
 }
 
diff --git a/rs/nns/governance/src/gen/ic_nns_governance.pb.v1.rs b/rs/nns/governance/src/gen/ic_nns_governance.pb.v1.rs
@@ -4822,6 +4822,8 @@ pub enum NnsFunction {
     SetSubnetOperationalLevel = 55,
     /// Take a canister snapshot.
     TakeCanisterSnapshot = 56,
+    /// Load a canister snapshot.
+    LoadCanisterSnapshot = 57,
 }
 impl NnsFunction {
     /// String value of the enum field names used in the ProtoBuf definition.
@@ -4896,6 +4898,7 @@ impl NnsFunction {
             Self::UnpauseCanisterMigrations => "NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS",
             Self::SetSubnetOperationalLevel => "NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL",
             Self::TakeCanisterSnapshot => "NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT",
+            Self::LoadCanisterSnapshot => "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -4977,6 +4980,7 @@ impl NnsFunction {
             "NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS" => Some(Self::UnpauseCanisterMigrations),
             "NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL" => Some(Self::SetSubnetOperationalLevel),
             "NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT" => Some(Self::TakeCanisterSnapshot),
+            "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT" => Some(Self::LoadCanisterSnapshot),
             _ => None,
         }
     }
diff --git a/rs/nns/governance/src/governance.rs b/rs/nns/governance/src/governance.rs
@@ -4815,6 +4815,13 @@ impl Governance {
                     ));
                 }
             }
+            ValidNnsFunction::LoadCanisterSnapshot => {
+                if !are_canister_snapshot_proposals_enabled() {
+                    return Err(invalid_proposal_error(
+                        "LoadCanisterSnapshot proposals are not yet enabled.".to_string(),
+                    ));
+                }
+            }
             _ => {}
         };
 
diff --git a/rs/nns/governance/src/pb/conversions/mod.rs b/rs/nns/governance/src/pb/conversions/mod.rs
@@ -3988,6 +3988,7 @@ impl From<pb::NnsFunction> for pb_api::NnsFunction {
                 pb_api::NnsFunction::SetSubnetOperationalLevel
             }
             pb::NnsFunction::TakeCanisterSnapshot => pb_api::NnsFunction::TakeCanisterSnapshot,
+            pb::NnsFunction::LoadCanisterSnapshot => pb_api::NnsFunction::LoadCanisterSnapshot,
         }
     }
 }
@@ -4098,6 +4099,7 @@ impl From<pb_api::NnsFunction> for pb::NnsFunction {
                 pb::NnsFunction::SetSubnetOperationalLevel
             }
             pb_api::NnsFunction::TakeCanisterSnapshot => pb::NnsFunction::TakeCanisterSnapshot,
+            pb_api::NnsFunction::LoadCanisterSnapshot => pb::NnsFunction::LoadCanisterSnapshot,
         }
     }
 }
diff --git a/rs/nns/governance/src/proposals/execute_nns_function.rs b/rs/nns/governance/src/proposals/execute_nns_function.rs
@@ -154,6 +154,7 @@ pub enum ValidNnsFunction {
     UnpauseCanisterMigrations,
     SetSubnetOperationalLevel,
     TakeCanisterSnapshot,
+    LoadCanisterSnapshot,
 }
 
 impl ValidNnsFunction {
@@ -283,6 +284,7 @@ impl ValidNnsFunction {
                 (REGISTRY_CANISTER_ID, "set_subnet_operational_level")
             }
             ValidNnsFunction::TakeCanisterSnapshot => (ROOT_CANISTER_ID, "take_canister_snapshot"),
+            ValidNnsFunction::LoadCanisterSnapshot => (ROOT_CANISTER_ID, "load_canister_snapshot"),
         }
     }
 
@@ -338,13 +340,13 @@ impl ValidNnsFunction {
             | ValidNnsFunction::HardResetNnsRootToVersion
             | ValidNnsFunction::BitcoinSetConfig
             | ValidNnsFunction::PauseCanisterMigrations
-            | ValidNnsFunction::UnpauseCanisterMigrations => Topic::ProtocolCanisterManagement,
+            | ValidNnsFunction::UnpauseCanisterMigrations
+            | ValidNnsFunction::TakeCanisterSnapshot
+            | ValidNnsFunction::LoadCanisterSnapshot => Topic::ProtocolCanisterManagement,
 
             ValidNnsFunction::AddSnsWasm | ValidNnsFunction::InsertSnsWasmUpgradePathEntries => {
                 Topic::ServiceNervousSystemManagement
             }
-
-            ValidNnsFunction::TakeCanisterSnapshot => Topic::ProtocolCanisterManagement,
         }
     }
 
@@ -402,6 +404,7 @@ impl ValidNnsFunction {
             ValidNnsFunction::UnpauseCanisterMigrations => "Unpause Canister Migrations",
             ValidNnsFunction::SetSubnetOperationalLevel => "Set Subnet Operational Level",
             ValidNnsFunction::TakeCanisterSnapshot => "Take Canister Snapshot",
+            ValidNnsFunction::LoadCanisterSnapshot => "Load Canister Snapshot",
         }
     }
 
@@ -633,6 +636,13 @@ impl ValidNnsFunction {
                  For an introduction to canister snapshots in general, see \
                  https://docs.internetcomputer.org/building-apps/canister-management/snapshots ."
             }
+            ValidNnsFunction::LoadCanisterSnapshot => {
+                "A proposal to load a canister snapshot into a canister controlled the NNS. \
+                 In other words, to restore the canister to an earlier recorded state, \
+                 which including the code and memory (including stable memory). \
+                 For an introduction to canister snapshots in general, see \
+                 https://docs.internetcomputer.org/building-apps/canister-management/snapshots ."
+            }
         }
     }
 }
@@ -722,6 +732,7 @@ impl TryFrom<NnsFunction> for ValidNnsFunction {
                 Ok(ValidNnsFunction::SetSubnetOperationalLevel)
             }
             NnsFunction::TakeCanisterSnapshot => Ok(ValidNnsFunction::TakeCanisterSnapshot),
+            NnsFunction::LoadCanisterSnapshot => Ok(ValidNnsFunction::LoadCanisterSnapshot),
 
             // Obsolete functions - based on check_obsolete
             NnsFunction::BlessReplicaVersion | NnsFunction::RetireReplicaVersion => {

Original file line number	Diff line number	Diff line change
`@@ -4206,6 +4206,8 @@ pub enum NnsFunction {`
`4206`	`4206`	`/// controlled by the NNS Root canister. This restriction could be relaxed`
`4207`	`4207`	`/// later. See nns/.../root.did for the payload type.`
`4208`	`4208`	`TakeCanisterSnapshot = 56,`
	`4209`	`+ /// Loads a canister snapshot.`
	`4210`	`+ LoadCanisterSnapshot = 57,`
`4209`	`4211`	`}`
`4210`	`4212`	`impl NnsFunction {`
`4211`	`4213`	`/// String value of the enum field names used in the ProtoBuf definition.`
`@@ -4290,6 +4292,7 @@ impl NnsFunction {`
`4290`	`4292`	`NnsFunction::UnpauseCanisterMigrations => "NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS",`
`4291`	`4293`	`NnsFunction::SetSubnetOperationalLevel => "NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL",`
`4292`	`4294`	`NnsFunction::TakeCanisterSnapshot => "NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT",`
	`4295`	`+ NnsFunction::LoadCanisterSnapshot => "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT",`
`4293`	`4296`	`}`
`4294`	`4297`	`}`
`4295`	`4298`	`/// Creates an enum from field names used in the ProtoBuf definition.`
`@@ -4371,6 +4374,7 @@ impl NnsFunction {`
`4371`	`4374`	`"NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS" => Some(Self::UnpauseCanisterMigrations),`
`4372`	`4375`	`"NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL" => Some(Self::SetSubnetOperationalLevel),`
`4373`	`4376`	`"NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT" => Some(Self::TakeCanisterSnapshot),`
	`4377`	`+ "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT" => Some(Self::LoadCanisterSnapshot),`
`4374`	`4378`	`_ => None,`
`4375`	`4379`	`}`
`4376`	`4380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -498,6 +498,9 @@ enum NnsFunction {`
`498`	`498`
`499`	`499`	`// Take a canister snapshot.`
`500`	`500`	`NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT = 56;`
	`501`	`+`
	`502`	`+ // Load a canister snapshot.`
	`503`	`+ NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT = 57;`
`501`	`504`	`}`
`502`	`505`
`503`	`506`	`// Payload of a proposal that calls a function on another NNS`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,8 @@ fn get_effective_payload(`
`395`	`395`	`\| ValidNnsFunction::PauseCanisterMigrations`
`396`	`396`	`\| ValidNnsFunction::UnpauseCanisterMigrations`
`397`	`397`	`\| ValidNnsFunction::SetSubnetOperationalLevel`
`398`		`- \| ValidNnsFunction::TakeCanisterSnapshot => Ok(payload.clone()),`
	`398`	`+ \| ValidNnsFunction::TakeCanisterSnapshot`
	`399`	`+ \| ValidNnsFunction::LoadCanisterSnapshot => Ok(payload.clone()),`
`399`	`400`	`}`
`400`	`401`	`}`
`401`	`402`
Original file line number	Diff line number	Diff line change
`@@ -4822,6 +4822,8 @@ pub enum NnsFunction {`
`4822`	`4822`	`SetSubnetOperationalLevel = 55,`
`4823`	`4823`	`/// Take a canister snapshot.`
`4824`	`4824`	`TakeCanisterSnapshot = 56,`
	`4825`	`+ /// Load a canister snapshot.`
	`4826`	`+ LoadCanisterSnapshot = 57,`
`4825`	`4827`	`}`
`4826`	`4828`	`impl NnsFunction {`
`4827`	`4829`	`/// String value of the enum field names used in the ProtoBuf definition.`
`@@ -4896,6 +4898,7 @@ impl NnsFunction {`
`4896`	`4898`	`Self::UnpauseCanisterMigrations => "NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS",`
`4897`	`4899`	`Self::SetSubnetOperationalLevel => "NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL",`
`4898`	`4900`	`Self::TakeCanisterSnapshot => "NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT",`
	`4901`	`+ Self::LoadCanisterSnapshot => "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT",`
`4899`	`4902`	`}`
`4900`	`4903`	`}`
`4901`	`4904`	`/// Creates an enum from field names used in the ProtoBuf definition.`
`@@ -4977,6 +4980,7 @@ impl NnsFunction {`
`4977`	`4980`	`"NNS_FUNCTION_UNPAUSE_CANISTER_MIGRATIONS" => Some(Self::UnpauseCanisterMigrations),`
`4978`	`4981`	`"NNS_FUNCTION_SET_SUBNET_OPERATIONAL_LEVEL" => Some(Self::SetSubnetOperationalLevel),`
`4979`	`4982`	`"NNS_FUNCTION_TAKE_CANISTER_SNAPSHOT" => Some(Self::TakeCanisterSnapshot),`
	`4983`	`+ "NNS_FUNCTION_LOAD_CANISTER_SNAPSHOT" => Some(Self::LoadCanisterSnapshot),`
`4980`	`4984`	`_ => None,`
`4981`	`4985`	`}`
`4982`	`4986`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4815,6 +4815,13 @@ impl Governance {`
`4815`	`4815`	`));`
`4816`	`4816`	`}`
`4817`	`4817`	`}`
	`4818`	`+ ValidNnsFunction::LoadCanisterSnapshot => {`
	`4819`	`+ if !are_canister_snapshot_proposals_enabled() {`
	`4820`	`+ return Err(invalid_proposal_error(`
	`4821`	`+ "LoadCanisterSnapshot proposals are not yet enabled.".to_string(),`
	`4822`	`+ ));`
	`4823`	`+ }`
	`4824`	`+ }`
`4818`	`4825`	`_ => {}`
`4819`	`4826`	`};`
`4820`	`4827`
Original file line number	Diff line number	Diff line change
`@@ -3988,6 +3988,7 @@ impl From<pb::NnsFunction> for pb_api::NnsFunction {`
`3988`	`3988`	`pb_api::NnsFunction::SetSubnetOperationalLevel`
`3989`	`3989`	`}`
`3990`	`3990`	`pb::NnsFunction::TakeCanisterSnapshot => pb_api::NnsFunction::TakeCanisterSnapshot,`
	`3991`	`+ pb::NnsFunction::LoadCanisterSnapshot => pb_api::NnsFunction::LoadCanisterSnapshot,`
`3991`	`3992`	`}`
`3992`	`3993`	`}`
`3993`	`3994`	`}`
`@@ -4098,6 +4099,7 @@ impl From<pb_api::NnsFunction> for pb::NnsFunction {`
`4098`	`4099`	`pb::NnsFunction::SetSubnetOperationalLevel`
`4099`	`4100`	`}`
`4100`	`4101`	`pb_api::NnsFunction::TakeCanisterSnapshot => pb::NnsFunction::TakeCanisterSnapshot,`
	`4102`	`+ pb_api::NnsFunction::LoadCanisterSnapshot => pb::NnsFunction::LoadCanisterSnapshot,`
`4101`	`4103`	`}`
`4102`	`4104`	`}`
`4103`	`4105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ pub enum ValidNnsFunction {`
`154`	`154`	`UnpauseCanisterMigrations,`
`155`	`155`	`SetSubnetOperationalLevel,`
`156`	`156`	`TakeCanisterSnapshot,`
	`157`	`+ LoadCanisterSnapshot,`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`impl ValidNnsFunction {`
`@@ -283,6 +284,7 @@ impl ValidNnsFunction {`
`283`	`284`	`(REGISTRY_CANISTER_ID, "set_subnet_operational_level")`
`284`	`285`	`}`
`285`	`286`	`ValidNnsFunction::TakeCanisterSnapshot => (ROOT_CANISTER_ID, "take_canister_snapshot"),`
	`287`	`+ ValidNnsFunction::LoadCanisterSnapshot => (ROOT_CANISTER_ID, "load_canister_snapshot"),`
`286`	`288`	`}`
`287`	`289`	`}`
`288`	`290`
`@@ -338,13 +340,13 @@ impl ValidNnsFunction {`
`338`	`340`	`\| ValidNnsFunction::HardResetNnsRootToVersion`
`339`	`341`	`\| ValidNnsFunction::BitcoinSetConfig`
`340`	`342`	`\| ValidNnsFunction::PauseCanisterMigrations`
`341`		`- \| ValidNnsFunction::UnpauseCanisterMigrations => Topic::ProtocolCanisterManagement,`
	`343`	`+ \| ValidNnsFunction::UnpauseCanisterMigrations`
	`344`	`+ \| ValidNnsFunction::TakeCanisterSnapshot`
	`345`	`+ \| ValidNnsFunction::LoadCanisterSnapshot => Topic::ProtocolCanisterManagement,`
`342`	`346`
`343`	`347`	`ValidNnsFunction::AddSnsWasm \| ValidNnsFunction::InsertSnsWasmUpgradePathEntries => {`
`344`	`348`	`Topic::ServiceNervousSystemManagement`
`345`	`349`	`}`
`346`		`-`
`347`		`- ValidNnsFunction::TakeCanisterSnapshot => Topic::ProtocolCanisterManagement,`
`348`	`350`	`}`
`349`	`351`	`}`
`350`	`352`
`@@ -402,6 +404,7 @@ impl ValidNnsFunction {`
`402`	`404`	`ValidNnsFunction::UnpauseCanisterMigrations => "Unpause Canister Migrations",`
`403`	`405`	`ValidNnsFunction::SetSubnetOperationalLevel => "Set Subnet Operational Level",`
`404`	`406`	`ValidNnsFunction::TakeCanisterSnapshot => "Take Canister Snapshot",`
	`407`	`+ ValidNnsFunction::LoadCanisterSnapshot => "Load Canister Snapshot",`
`405`	`408`	`}`
`406`	`409`	`}`
`407`	`410`
`@@ -633,6 +636,13 @@ impl ValidNnsFunction {`
`633`	`636`	`For an introduction to canister snapshots in general, see \`
`634`	`637`	`https://docs.internetcomputer.org/building-apps/canister-management/snapshots ."`
`635`	`638`	`}`
	`639`	`+ ValidNnsFunction::LoadCanisterSnapshot => {`
	`640`	`+ "A proposal to load a canister snapshot into a canister controlled the NNS. \`
	`641`	`+ In other words, to restore the canister to an earlier recorded state, \`
	`642`	`+ which including the code and memory (including stable memory). \`
	`643`	`+ For an introduction to canister snapshots in general, see \`
	`644`	`+ https://docs.internetcomputer.org/building-apps/canister-management/snapshots ."`
	`645`	`+ }`
`636`	`646`	`}`
`637`	`647`	`}`
`638`	`648`	`}`
`@@ -722,6 +732,7 @@ impl TryFrom<NnsFunction> for ValidNnsFunction {`
`722`	`732`	`Ok(ValidNnsFunction::SetSubnetOperationalLevel)`
`723`	`733`	`}`
`724`	`734`	`NnsFunction::TakeCanisterSnapshot => Ok(ValidNnsFunction::TakeCanisterSnapshot),`
	`735`	`+ NnsFunction::LoadCanisterSnapshot => Ok(ValidNnsFunction::LoadCanisterSnapshot),`
`725`	`736`
`726`	`737`	`// Obsolete functions - based on check_obsolete`
`727`	`738`	`NnsFunction::BlessReplicaVersion \| NnsFunction::RetireReplicaVersion => {`