From 7668c515eb49e6b6add08600fc98c97aa67e787c Mon Sep 17 00:00:00 2001 From: Yusef Habib Fernandez Date: Tue, 8 Jul 2025 23:30:37 +0200 Subject: [PATCH 1/2] proposals to latest --- .github/workflows/update-proposals.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-proposals.yml b/.github/workflows/update-proposals.yml index 53e7bcd3779..41f2402e9ea 100644 --- a/.github/workflows/update-proposals.yml +++ b/.github/workflows/update-proposals.yml @@ -23,20 +23,20 @@ jobs: - uses: actions/checkout@v6 - name: Install didc run: scripts/install-didc - - name: Find newer IC release, if any + - name: Find newer IC commit, if any id: update run: | - current_release="$(jq -r .defaults.build.config.IC_COMMIT_FOR_PROPOSALS config.json)" - echo "Current IC release: $current_release" - latest_release=$(curl -sSL https://api.github.com/repos/dfinity/ic/releases/latest | jq .tag_name -r) - echo "Latest IC release: $latest_release" + current_commit="$(jq -r .defaults.build.config.IC_COMMIT_FOR_PROPOSALS config.json)" + echo "Current IC commit: $current_commit" + latest_commit=$(curl -sSL https://api.github.com/repos/dfinity/ic/commits/master | jq .sha -r) + echo "Latest IC commit: $latest_commit" { - if [ "$current_release" == "$latest_release" ] + if [ "$current_commit" == "$latest_commit" ] then echo "updated=0" else echo "updated=1" - echo "release=$latest_release" + echo "commit=$latest_commit" fi } >> "$GITHUB_OUTPUT" - name: Install sponge @@ -46,7 +46,7 @@ jobs: if: ${{ steps.update.outputs.updated == '1' }} run: | # Update candid files - scripts/update_ic_commit --crate proposals --ic_commit "${{ steps.update.outputs.release }}" + scripts/update_ic_commit --crate proposals --ic_commit "${{ steps.update.outputs.commit }}" # Show changes echo "Git status:" git status From afa6f35468fcc488373c9831afb4ba5522f3aef0 Mon Sep 17 00:00:00 2001 From: gix-bot Date: Thu, 15 Jan 2026 16:14:39 +0000 Subject: [PATCH 2/2] Update proposals --- config.json | 2 +- .../nns_governance/nns_governance.did | 15 ++++++++++++++- .../nns_registry/nns_registry.did | 2 +- .../used_by_proposals/sns_wasm/sns_wasm.did | 2 +- rs/proposals/src/canisters/nns_governance/api.rs | 16 +++++++++++++++- rs/proposals/src/canisters/nns_registry/api.rs | 2 +- rs/proposals/src/canisters/sns_wasm/api.rs | 2 +- 7 files changed, 34 insertions(+), 7 deletions(-) diff --git a/config.json b/config.json index cc7493f2e56..749acb9e3bc 100644 --- a/config.json +++ b/config.json @@ -117,7 +117,7 @@ "POCKETIC_VERSION": "3.0.1", "CARGO_SORT_VERSION": "1.0.9", "SNSDEMO_RELEASE": "release-2026-01-08", - "IC_COMMIT_FOR_PROPOSALS": "release-2026-01-08_03-31-base", + "IC_COMMIT_FOR_PROPOSALS": "4ddc6ed164eb03cbc46af0d194e8ad5d90b1b6b9", "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2026-01-08_03-31-base" }, "packtool": "" diff --git a/declarations/used_by_proposals/nns_governance/nns_governance.did b/declarations/used_by_proposals/nns_governance/nns_governance.did index 612f60c6712..44b92344a59 100644 --- a/declarations/used_by_proposals/nns_governance/nns_governance.did +++ b/declarations/used_by_proposals/nns_governance/nns_governance.did @@ -1,4 +1,4 @@ -//! Candid for canister `nns_governance` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `nns_governance` obtained by `scripts/update_ic_commit` from: type AccountIdentifier = record { hash : blob; }; @@ -23,6 +23,8 @@ type Action = variant { Motion : Motion; FulfillSubnetRentalRequest : FulfillSubnetRentalRequest; BlessAlternativeGuestOsVersion : BlessAlternativeGuestOsVersion; + TakeCanisterSnapshot : TakeCanisterSnapshot; + LoadCanisterSnapshot : LoadCanisterSnapshot; }; type AddHotKey = record { @@ -470,6 +472,11 @@ type ListKnownNeuronsResponse = record { known_neurons : vec KnownNeuron; }; +type LoadCanisterSnapshot = record { + canister_id : opt principal; + snapshot_id : opt blob; +}; + // Parameters of the list_neurons method. type ListNeurons = record { // These fields select neurons to be in the result set. @@ -1032,6 +1039,8 @@ type ProposalActionRequest = variant { Motion : Motion; FulfillSubnetRentalRequest : FulfillSubnetRentalRequest; BlessAlternativeGuestOsVersion : BlessAlternativeGuestOsVersion; + TakeCanisterSnapshot : TakeCanisterSnapshot; + LoadCanisterSnapshot : LoadCanisterSnapshot; }; // Creates a rented subnet from a rental request (in the Subnet Rental @@ -1100,6 +1109,10 @@ type GuestLaunchMeasurementMetadata = record { kernel_cmdline : opt text; }; +type TakeCanisterSnapshot = record { + canister_id : opt principal; + replace_snapshot : opt blob; +}; type ProposalData = record { id : opt ProposalId; diff --git a/declarations/used_by_proposals/nns_registry/nns_registry.did b/declarations/used_by_proposals/nns_registry/nns_registry.did index 75883de8468..0f171c55c1b 100644 --- a/declarations/used_by_proposals/nns_registry/nns_registry.did +++ b/declarations/used_by_proposals/nns_registry/nns_registry.did @@ -1,4 +1,4 @@ -//! Candid for canister `nns_registry` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `nns_registry` obtained by `scripts/update_ic_commit` from: // A brief note about the history of this file: This file used to be // automatically generated, but now, it is hand-crafted, because the // auto-generator has some some pretty degenerate behaviors. The worst of those diff --git a/declarations/used_by_proposals/sns_wasm/sns_wasm.did b/declarations/used_by_proposals/sns_wasm/sns_wasm.did index eda4aff1a76..c35a5d13842 100644 --- a/declarations/used_by_proposals/sns_wasm/sns_wasm.did +++ b/declarations/used_by_proposals/sns_wasm/sns_wasm.did @@ -1,4 +1,4 @@ -//! Candid for canister `sns_wasm` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_wasm` obtained by `scripts/update_ic_commit` from: type AddWasmRequest = record { hash : blob; wasm : opt SnsWasm; diff --git a/rs/proposals/src/canisters/nns_governance/api.rs b/rs/proposals/src/canisters/nns_governance/api.rs index ed10a1102ac..aa9b7785659 100644 --- a/rs/proposals/src/canisters/nns_governance/api.rs +++ b/rs/proposals/src/canisters/nns_governance/api.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister nns_governance --out api.rs --header did2rs.header --traits Serialize` -//! Candid for canister `nns_governance` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `nns_governance` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(missing_docs)] #![allow(clippy::missing_docs_in_private_items)] @@ -500,6 +500,11 @@ pub struct ManageNeuronProposal { pub neuron_id_or_subaccount: Option, } #[derive(Serialize, CandidType, Deserialize)] +pub struct LoadCanisterSnapshot { + pub canister_id: Option, + pub snapshot_id: Option, +} +#[derive(Serialize, CandidType, Deserialize)] pub struct GuestLaunchMeasurementMetadata { pub kernel_cmdline: Option, } @@ -550,6 +555,11 @@ pub struct DeregisterKnownNeuron { pub id: Option, } #[derive(Serialize, CandidType, Deserialize)] +pub struct TakeCanisterSnapshot { + pub replace_snapshot: Option, + pub canister_id: Option, +} +#[derive(Serialize, CandidType, Deserialize)] pub struct StopOrStartCanister { pub action: Option, pub canister_id: Option, @@ -736,10 +746,12 @@ pub enum Action { RegisterKnownNeuron(KnownNeuron), FulfillSubnetRentalRequest(FulfillSubnetRentalRequest), ManageNeuron(ManageNeuronProposal), + LoadCanisterSnapshot(LoadCanisterSnapshot), BlessAlternativeGuestOsVersion(BlessAlternativeGuestOsVersion), UpdateCanisterSettings(UpdateCanisterSettings), InstallCode(InstallCode), DeregisterKnownNeuron(DeregisterKnownNeuron), + TakeCanisterSnapshot(TakeCanisterSnapshot), StopOrStartCanister(StopOrStartCanister), CreateServiceNervousSystem(CreateServiceNervousSystem), ExecuteNnsFunction(ExecuteNnsFunction), @@ -1103,10 +1115,12 @@ pub enum ProposalActionRequest { RegisterKnownNeuron(KnownNeuron), FulfillSubnetRentalRequest(FulfillSubnetRentalRequest), ManageNeuron(Box), + LoadCanisterSnapshot(LoadCanisterSnapshot), BlessAlternativeGuestOsVersion(BlessAlternativeGuestOsVersion), UpdateCanisterSettings(UpdateCanisterSettings), InstallCode(InstallCodeRequest), DeregisterKnownNeuron(DeregisterKnownNeuron), + TakeCanisterSnapshot(TakeCanisterSnapshot), StopOrStartCanister(StopOrStartCanister), CreateServiceNervousSystem(CreateServiceNervousSystem), ExecuteNnsFunction(ExecuteNnsFunction), diff --git a/rs/proposals/src/canisters/nns_registry/api.rs b/rs/proposals/src/canisters/nns_registry/api.rs index 6dfa79f1803..ed98111bbf3 100644 --- a/rs/proposals/src/canisters/nns_registry/api.rs +++ b/rs/proposals/src/canisters/nns_registry/api.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister nns_registry --out api.rs --header did2rs.header --traits Serialize` -//! Candid for canister `nns_registry` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `nns_registry` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(missing_docs)] #![allow(clippy::missing_docs_in_private_items)] diff --git a/rs/proposals/src/canisters/sns_wasm/api.rs b/rs/proposals/src/canisters/sns_wasm/api.rs index ebdf886401c..3d19e7a22b4 100644 --- a/rs/proposals/src/canisters/sns_wasm/api.rs +++ b/rs/proposals/src/canisters/sns_wasm/api.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_wasm --out api.rs --header did2rs.header --traits Serialize` -//! Candid for canister `sns_wasm` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_wasm` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(missing_docs)] #![allow(clippy::missing_docs_in_private_items)]