From dc774e46aa0d70caf44df8eda87db8d4f8a6ab4b Mon Sep 17 00:00:00 2001 From: gix-bot Date: Tue, 14 Jan 2025 03:36:31 +0000 Subject: [PATCH] Update aggregator --- .../sns_governance/sns_governance.did | 2 +- .../used_by_sns_aggregator/sns_ledger/sns_ledger.did | 5 +---- .../used_by_sns_aggregator/sns_root/sns_root.did | 9 ++++++++- .../used_by_sns_aggregator/sns_swap/sns_swap.did | 2 +- .../used_by_sns_aggregator/sns_wasm/sns_wasm.did | 2 +- dfx.json | 2 +- rs/sns_aggregator/src/types/ic_sns_governance.rs | 4 +++- rs/sns_aggregator/src/types/ic_sns_ledger.rs | 5 +---- rs/sns_aggregator/src/types/ic_sns_root.rs | 12 +++++++++++- rs/sns_aggregator/src/types/ic_sns_swap.rs | 3 ++- rs/sns_aggregator/src/types/ic_sns_wasm.rs | 2 +- 11 files changed, 31 insertions(+), 17 deletions(-) diff --git a/declarations/used_by_sns_aggregator/sns_governance/sns_governance.did b/declarations/used_by_sns_aggregator/sns_governance/sns_governance.did index 07be228cfef..1337f5c78fd 100644 --- a/declarations/used_by_sns_aggregator/sns_governance/sns_governance.did +++ b/declarations/used_by_sns_aggregator/sns_governance/sns_governance.did @@ -1,4 +1,4 @@ -//! Candid for canister `sns_governance` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_governance` obtained by `scripts/update_ic_commit` from: type Account = record { owner : opt principal; subaccount : opt Subaccount; diff --git a/declarations/used_by_sns_aggregator/sns_ledger/sns_ledger.did b/declarations/used_by_sns_aggregator/sns_ledger/sns_ledger.did index d909105f1dc..6339e468ca3 100644 --- a/declarations/used_by_sns_aggregator/sns_ledger/sns_ledger.did +++ b/declarations/used_by_sns_aggregator/sns_ledger/sns_ledger.did @@ -1,4 +1,4 @@ -//! Candid for canister `sns_ledger` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_ledger` obtained by `scripts/update_ic_commit` from: type BlockIndex = nat; type Subaccount = blob; // Number of nanoseconds since the UNIX epoch in UTC timezone. @@ -108,8 +108,6 @@ type InitArgs = record { metadata : vec record { text; MetadataValue }; initial_balances : vec record { Account; nat }; feature_flags : opt FeatureFlags; - maximum_number_of_accounts : opt nat64; - accounts_overflow_trim_quantity : opt nat64; archive_options : record { num_blocks_to_archive : nat64; max_transactions_per_response : opt nat64; @@ -145,7 +143,6 @@ type UpgradeArgs = record { change_fee_collector : opt ChangeFeeCollector; max_memo_length : opt nat16; feature_flags : opt FeatureFlags; - accounts_overflow_trim_quantity: opt nat64; change_archive_options : opt ChangeArchiveOptions; }; diff --git a/declarations/used_by_sns_aggregator/sns_root/sns_root.did b/declarations/used_by_sns_aggregator/sns_root/sns_root.did index e418dc6f881..4fab26656ba 100644 --- a/declarations/used_by_sns_aggregator/sns_root/sns_root.did +++ b/declarations/used_by_sns_aggregator/sns_root/sns_root.did @@ -1,4 +1,4 @@ -//! Candid for canister `sns_root` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_root` obtained by `scripts/update_ic_commit` from: type CanisterCallError = record { code : opt int32; description : text; @@ -44,9 +44,16 @@ type CanisterSummary = record { canister_id : opt principal; }; +type ChunkedCanisterWasm = record { + wasm_module_hash : blob; + store_canister_id : principal; + chunk_hashes_list : vec blob; +}; + type ChangeCanisterRequest = record { arg : blob; wasm_module : blob; + chunked_canister_wasm : opt ChunkedCanisterWasm; stop_before_installing : bool; mode : CanisterInstallMode; canister_id : principal; diff --git a/declarations/used_by_sns_aggregator/sns_swap/sns_swap.did b/declarations/used_by_sns_aggregator/sns_swap/sns_swap.did index 09beb38d0cf..74c31ceda89 100644 --- a/declarations/used_by_sns_aggregator/sns_swap/sns_swap.did +++ b/declarations/used_by_sns_aggregator/sns_swap/sns_swap.did @@ -1,4 +1,4 @@ -//! Candid for canister `sns_swap` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_swap` obtained by `scripts/update_ic_commit` from: type BuyerState = record { icp : opt TransferableAmount; has_created_neuron_recipes : opt bool; diff --git a/declarations/used_by_sns_aggregator/sns_wasm/sns_wasm.did b/declarations/used_by_sns_aggregator/sns_wasm/sns_wasm.did index ec2d9156572..c8c02d1510e 100644 --- a/declarations/used_by_sns_aggregator/sns_wasm/sns_wasm.did +++ b/declarations/used_by_sns_aggregator/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/dfx.json b/dfx.json index ab36820e42b..2377bb2bd90 100644 --- a/dfx.json +++ b/dfx.json @@ -444,7 +444,7 @@ "CARGO_SORT_VERSION": "1.0.9", "SNSDEMO_RELEASE": "release-2025-01-08", "IC_COMMIT_FOR_PROPOSALS": "release-2025-01-03_03-07-base", - "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2025-01-03_03-07-base" + "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2025-01-09_03-19-base" }, "packtool": "" } diff --git a/rs/sns_aggregator/src/types/ic_sns_governance.rs b/rs/sns_aggregator/src/types/ic_sns_governance.rs index 69c77583b78..6b915ca1ef7 100644 --- a/rs/sns_aggregator/src/types/ic_sns_governance.rs +++ b/rs/sns_aggregator/src/types/ic_sns_governance.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_governance --out ic_sns_governance.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug` -//! Candid for canister `sns_governance` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_governance` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(unused_imports)] #![allow(missing_docs)] @@ -289,6 +289,7 @@ pub struct Tally { #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct ManageDappCanisterSettings { pub freezing_threshold: Option, + pub wasm_memory_threshold: Option, pub canister_ids: Vec, pub reserved_cycles_limit: Option, pub log_visibility: Option, @@ -693,6 +694,7 @@ pub enum CanisterStatusType { #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct DefiniteCanisterSettingsArgs { pub freezing_threshold: candid::Nat, + pub wasm_memory_threshold: Option, pub controllers: Vec, pub wasm_memory_limit: Option, pub memory_allocation: candid::Nat, diff --git a/rs/sns_aggregator/src/types/ic_sns_ledger.rs b/rs/sns_aggregator/src/types/ic_sns_ledger.rs index 7d2051e385b..798c2374c5d 100644 --- a/rs/sns_aggregator/src/types/ic_sns_ledger.rs +++ b/rs/sns_aggregator/src/types/ic_sns_ledger.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_ledger --out ic_sns_ledger.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug` -//! Candid for canister `sns_ledger` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_ledger` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(unused_imports)] #![allow(missing_docs)] @@ -55,7 +55,6 @@ pub struct UpgradeArgs { pub token_symbol: Option, pub transfer_fee: Option, pub metadata: Option>, - pub accounts_overflow_trim_quantity: Option, pub change_fee_collector: Option, pub max_memo_length: Option, pub token_name: Option, @@ -80,8 +79,6 @@ pub struct InitArgs { pub metadata: Vec<(String, MetadataValue)>, pub minting_account: Account, pub initial_balances: Vec<(Account, candid::Nat)>, - pub maximum_number_of_accounts: Option, - pub accounts_overflow_trim_quantity: Option, pub fee_collector_account: Option, pub archive_options: InitArgsArchiveOptions, pub max_memo_length: Option, diff --git a/rs/sns_aggregator/src/types/ic_sns_root.rs b/rs/sns_aggregator/src/types/ic_sns_root.rs index a17f0f2f746..411b7eb28f5 100644 --- a/rs/sns_aggregator/src/types/ic_sns_root.rs +++ b/rs/sns_aggregator/src/types/ic_sns_root.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_root --out ic_sns_root.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug` -//! Candid for canister `sns_root` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_root` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(unused_imports)] #![allow(missing_docs)] @@ -56,6 +56,7 @@ pub enum LogVisibility { #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct DefiniteCanisterSettings { pub freezing_threshold: Option, + pub wasm_memory_threshold: Option, pub controllers: Vec, pub reserved_cycles_limit: Option, pub log_visibility: Option, @@ -83,12 +84,19 @@ pub enum CanisterInstallMode { Install, } #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] +pub struct ChunkedCanisterWasm { + pub wasm_module_hash: serde_bytes::ByteBuf, + pub chunk_hashes_list: Vec, + pub store_canister_id: Principal, +} +#[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct ChangeCanisterRequest { pub arg: serde_bytes::ByteBuf, pub wasm_module: serde_bytes::ByteBuf, pub stop_before_installing: bool, pub mode: CanisterInstallMode, pub canister_id: Principal, + pub chunked_canister_wasm: Option, pub memory_allocation: Option, pub compute_allocation: Option, } @@ -99,6 +107,7 @@ pub struct GetSnsCanistersSummaryRequest { #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct DefiniteCanisterSettingsArgs { pub freezing_threshold: candid::Nat, + pub wasm_memory_threshold: Option, pub controllers: Vec, pub wasm_memory_limit: Option, pub memory_allocation: candid::Nat, @@ -149,6 +158,7 @@ pub struct ListSnsCanistersResponse { #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct ManageDappCanisterSettingsRequest { pub freezing_threshold: Option, + pub wasm_memory_threshold: Option, pub canister_ids: Vec, pub reserved_cycles_limit: Option, pub log_visibility: Option, diff --git a/rs/sns_aggregator/src/types/ic_sns_swap.rs b/rs/sns_aggregator/src/types/ic_sns_swap.rs index 6f216cb6796..e58f87fed42 100644 --- a/rs/sns_aggregator/src/types/ic_sns_swap.rs +++ b/rs/sns_aggregator/src/types/ic_sns_swap.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_swap --out ic_sns_swap.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug` -//! Candid for canister `sns_swap` obtained by `scripts/update_ic_commit` from: +//! Candid for canister `sns_swap` obtained by `scripts/update_ic_commit` from: #![allow(clippy::all)] #![allow(unused_imports)] #![allow(missing_docs)] @@ -233,6 +233,7 @@ pub enum CanisterStatusType { #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct DefiniteCanisterSettingsArgs { pub freezing_threshold: candid::Nat, + pub wasm_memory_threshold: Option, pub controllers: Vec, pub wasm_memory_limit: Option, pub memory_allocation: candid::Nat, diff --git a/rs/sns_aggregator/src/types/ic_sns_wasm.rs b/rs/sns_aggregator/src/types/ic_sns_wasm.rs index 1e7941a919d..6c7350748f0 100644 --- a/rs/sns_aggregator/src/types/ic_sns_wasm.rs +++ b/rs/sns_aggregator/src/types/ic_sns_wasm.rs @@ -1,5 +1,5 @@ //! Rust code created from candid by: `scripts/did2rs.sh --canister sns_wasm --out ic_sns_wasm.rs --header did2rs.header --traits Serialize\,\ Clone\,\ Debug` -//! 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(unused_imports)] #![allow(missing_docs)]