From 16b6b6024d0ea5ed0209267a73ca177cb4958bd8 Mon Sep 17 00:00:00 2001 From: gix-bot Date: Tue, 16 Jul 2024 03:36:08 +0000 Subject: [PATCH] Update aggregator --- .../used_by_sns_aggregator/sns_governance/sns_governance.did | 2 +- declarations/used_by_sns_aggregator/sns_ledger/sns_ledger.did | 3 ++- declarations/used_by_sns_aggregator/sns_root/sns_root.did | 2 +- declarations/used_by_sns_aggregator/sns_swap/sns_swap.did | 2 +- declarations/used_by_sns_aggregator/sns_wasm/sns_wasm.did | 2 +- dfx.json | 2 +- rs/sns_aggregator/src/types/ic_sns_governance.rs | 2 +- rs/sns_aggregator/src/types/ic_sns_ledger.rs | 3 ++- rs/sns_aggregator/src/types/ic_sns_root.rs | 2 +- rs/sns_aggregator/src/types/ic_sns_swap.rs | 2 +- rs/sns_aggregator/src/types/ic_sns_wasm.rs | 2 +- 11 files changed, 13 insertions(+), 11 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 8491398a6da..957594ec8da 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 }; type Action = variant { ManageNervousSystemParameters : NervousSystemParameters; 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 7d8b0579988..84882ef528c 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. @@ -428,6 +428,7 @@ type ICRC3DataCertificate = record { type icrc21_consent_message_metadata = record { language: text; + utc_offset_minutes: opt int16; }; type icrc21_consent_message_spec = record { 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 cc6db81b694..cd5e2a300f2 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 }; type CanisterIdRecord = record { canister_id : principal }; type CanisterInstallMode = variant { reinstall; upgrade; install }; 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 cfe0a20203a..278ef33b7e1 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 d9570b2b6e9..c1da7a48958 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 }; type AddWasmResponse = record { result : opt Result }; type AirdropDistribution = record { airdrop_neurons : vec NeuronDistribution }; diff --git a/dfx.json b/dfx.json index 8e1bcb0fdfe..b1983755497 100644 --- a/dfx.json +++ b/dfx.json @@ -388,7 +388,7 @@ "CARGO_SORT_VERSION": "1.0.9", "SNSDEMO_RELEASE": "release-2024-07-10", "IC_COMMIT_FOR_PROPOSALS": "release-2024-07-10_23-01-base", - "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2024-07-03_23-01-storage-layer-disabled" + "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2024-07-10_23-01-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 3bd01bb0dd5..84584166619 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)] diff --git a/rs/sns_aggregator/src/types/ic_sns_ledger.rs b/rs/sns_aggregator/src/types/ic_sns_ledger.rs index 39fa35ab37d..79ccbaa8016 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)] @@ -250,6 +250,7 @@ pub enum TransferResult { } #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] pub struct Icrc21ConsentMessageMetadata { + pub utc_offset_minutes: Option, pub language: String, } #[derive(Serialize, Clone, Debug, CandidType, Deserialize)] diff --git a/rs/sns_aggregator/src/types/ic_sns_root.rs b/rs/sns_aggregator/src/types/ic_sns_root.rs index 67309185542..cf7b7e85066 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)] diff --git a/rs/sns_aggregator/src/types/ic_sns_swap.rs b/rs/sns_aggregator/src/types/ic_sns_swap.rs index 7cede08792a..8b75be0aced 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)] diff --git a/rs/sns_aggregator/src/types/ic_sns_wasm.rs b/rs/sns_aggregator/src/types/ic_sns_wasm.rs index de7211ff7b9..6fb688786a7 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)]