chore: Update dependencies (#733)

Co-authored-by: sasa-tomic <[email protected]>
Co-authored-by: nikolamilosa <[email protected]>

Cargo.toml

@@ -52,7 +52,7 @@ axum-otel-metrics = "0.8.1"
 axum = "0.7.5"
 backoff = { version = "0.4.0", features = ["tokio"] }
 backon = "0.4.4"
-candid = "0.10.9"
+candid = "0.10.10"
 chrono = { version = "0.4.38", features = ["serde"] }
 clap-num = "1.1"
 clap = { version = "4.5", features = [
@@ -88,10 +88,10 @@ easy-parallel = "3.3.1"
 edit = "0.1.5"
 either = "1.13.0"
 enum-map = "1.1.1"
-env_logger = "0.11.3"
+env_logger = "0.11.5"
 erased-serde = "0.4.5"
 exitcode = "1.1.2"
-flate2 = "1.0.30"
+flate2 = "1.0.31"
 float-ord = "0.3.2"
 fs-err = "2.11.0"
 fs2 = "0.4.3"
@@ -105,54 +105,55 @@ hyper = { version = "1.4.1" }
 ic-agent = "0.37.1"
 octocrab = "0.39.0"
 self_update = { version = "0.41.0", features = ["archive-tar"] }
-ic-async-utils = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+ic-async-utils = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 ic-canisters = { path = "rs/ic-canisters" }
-ic-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
-ic-config = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+ic-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "deb1e15ae4c60333636f0581e0f30d169d8c9a0a" }
+ic-config = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 ic-identity-hsm = "0.37.0"
-ic-interfaces = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+ic-interfaces = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 ic-management-backend = { path = "rs/ic-management-backend" }
-ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 ic-management-types = { path = "rs/ic-management-types" }
-ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-types = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
-cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-types = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
+cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 ic-transport-types = "0.37.1"
 ic-utils = "0.37.0"
 include_dir = "0.7.4"
 itertools = "0.13.0"
-keyring = "3.0.5"
+keyring = "3.1.0"
 lazy_static = "1.5.0"
 log = "0.4.22"
-lru = "0.12.3"
+lru = "0.12.4"
 opentelemetry = { version = "0.22.0", features = ["metrics"] }
-phantom_newtype = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+phantom_newtype = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 pkcs11 = "0.5.0"
 pretty_assertions = "1.4.0"
 pretty_env_logger = "0.5.0"
@@ -162,8 +163,8 @@ prost = "0.12"
 rand = { version = "0.8.5", features = ["std_rng"] }
 rand_seeder = "0.3.0"
 rayon = "1.10.0"
-regex = "1.10.5"
-registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+regex = "1.10.6"
+registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 reqwest = { version = "0.12", default-features = false, features = [
     "rustls-tls",
     "blocking",
@@ -173,8 +174,8 @@ reverse_geocoder = "4.1.1"
 ring = "0.17.8"
 rstest = { version = "0.22.0", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
-serde_derive = "1.0.203"
-serde_json = "1.0.124"
+serde_derive = "1.0.208"
+serde_json = "1.0.125"
 serde_yaml = "0.9.34"
 shlex = "1.3.0"
 sha2 = "0.10.8"
@@ -193,25 +194,25 @@ strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
 tabled = "0.16.0"
 tabular = "0.2"
-tempfile = "3.10.1"
-thiserror = "1.0.62"
-tokio = { version = "1.38.1", features = ["full"] }
+tempfile = "3.12.0"
+thiserror = "1.0.63"
+tokio = { version = "1.39.2", features = ["full"] }
 tokio-util = "0.7.11"
 url = "2.5.2"
 urlencoding = "2.1.3"
 warp = "0.3"
-wiremock = "0.6.0"
+wiremock = "0.6.1"
 human_bytes = "0.4"
 headless_chrome = { version = "1.0.12", features = [
     "fetch",
 ], default-features = false }
 
 # dre-canisters dependencies
-ic-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
-ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
+ic-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "deb1e15ae4c60333636f0581e0f30d169d8c9a0a" }
+ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "deb1e15ae4c60333636f0581e0f30d169d8c9a0a" }
 ic-stable-structures = "0.6.5"
-ciborium = "0.2.1"
-dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+ciborium = "0.2.2"
+dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46" }
 
 [profile.release]
 # Add debug information to the release build (does NOT reduce the level of optimization!)

WORKSPACE.bazel

@@ -69,7 +69,7 @@ aspect_bazel_lib_dependencies()
 
 aspect_bazel_lib_register_toolchains()
 
-IC_REPO_VERSION = "7dee90107a88b836fc72e78993913988f4f73ca2"
+IC_REPO_VERSION = "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46"
 
 http_archive(
     name = "ic_repo",

docker/Dockerfile

@@ -129,7 +129,7 @@ ENV CARGO_HOME=/cargo
 COPY docker /docker
 
 # Download ic-admin
-ARG ic_git_revision=7dee90107a88b836fc72e78993913988f4f73ca2
+ARG ic_git_revision=b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46
 RUN  curl --fail https://download.dfinity.systems/ic/${ic_git_revision}/release/ic-admin.gz -o - | gunzip -c >| /usr/bin/ic-admin && \
     chmod +x /usr/bin/ic-admin
 

ic-revisions.json

@@ -1,10 +1,10 @@
 {
-  "https://github.com/dfinity/ic.git": {
-    "commit": "7dee90107a88b836fc72e78993913988f4f73ca2",
-    "ref": "refs/heads/master"
-  },
-  "https://github.com/dfinity/cdk-rs.git": {
-    "commit": "59795716487fbb8a9910ac503bcea1e0cb08c932",
-    "ref": "refs/heads/main"
-  }
-}
+    "https://github.com/dfinity/ic.git": {
+        "commit": "b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46",
+        "ref": "refs/heads/master"
+    },
+    "https://github.com/dfinity/cdk-rs.git": {
+        "commit": "deb1e15ae4c60333636f0581e0f30d169d8c9a0a",
+        "ref": "refs/heads/main"
+    }
+}

pylib/ic_admin.py

@@ -152,6 +152,6 @@ def canister_version(agent: Agent, canister_principal: str) -> str:
 
 if __name__ == "__main__":
     # One can run some simple one-off tests here, e.g.:
-    ic_admin = IcAdmin("https://ic0.app", git_revision="7dee90107a88b836fc72e78993913988f4f73ca2")
+    ic_admin = IcAdmin("https://ic0.app", git_revision="b4ccc86f84d6d6ffcd74eab706b0a0fed1607a46")
 
     print(ic_admin.get_subnet_replica_versions())

requirements.txt

@@ -2503,9 +2503,9 @@ shellingham==1.5.4 ; python_full_version >= "3.10.0" and python_version < "4.0"
 six==1.16.0 ; python_version >= "3.10" and python_version < "4" \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
-slack-bolt==1.19.1 ; python_full_version >= "3.10.0" and python_version < "4" \
-    --hash=sha256:a3041d8f49eba22c3be4dd8f57602d6685d367c0e1cc7619260e1ce4a363d07f \
-    --hash=sha256:b916829ece0ff7a2cae1502f1774fd100592cd8a81a39e4f04e3137a3f19522b
+slack-bolt==1.20.0 ; python_full_version >= "3.10.0" and python_version < "4" \
+    --hash=sha256:373d76a2b1a8ed91d5fe011bd3f671a05ec8620210c3a6ad99477e39d6b2b7fa \
+    --hash=sha256:e253dcae69ac7eea189b3270307fba6d733eb0764ae223b494427a9023a57380
 slack-sdk==3.31.0 ; python_full_version >= "3.10.0" and python_version < "4" \
     --hash=sha256:740d2f9c49cbfcbd46fca56b4be9d527934c225312aac18fd2c0fca0ef6bc935 \
     --hash=sha256:a120cc461e8ebb7d9175f171dbe0ded37a6878d9f7b96b28e4bad1227399047b

rs/cli/Cargo.toml

@@ -40,6 +40,7 @@ ic-nns-constants = { workspace = true }
 ic-nervous-system-root = { workspace = true }
 ic-nns-common = { workspace = true }
 ic-nns-governance = { workspace = true }
+ic-nns-governance-api = { workspace = true }
 ic-protobuf = { workspace = true }
 ic-registry-keys = { workspace = true }
 ic-registry-local-registry = { workspace = true }
@@ -66,7 +67,7 @@ tempfile = { workspace = true }
 tokio = { workspace = true }
 url = { workspace = true }
 humantime = { workspace = true }
-clap_complete = "4.5.14"
+clap_complete = "4.5.16"
 cryptoki = { workspace = true }
 keyring = { workspace = true }
 comfy-table = { workspace = true }

rs/cli/src/auth.rs

@@ -194,6 +194,7 @@ impl Auth {
                     neuron_ids: vec![],
                     include_neurons_readable_by_caller: true,
                     include_empty_neurons_readable_by_caller: None,
+                    include_public_neurons_in_full_neurons: None
                 })?,
             )
             .await

rs/cli/src/commands/proposals/filter.rs

@@ -162,6 +162,12 @@ pub enum Topic {
     ApiBoundaryNodeManagement = 15,
     /// Proposals related to the management of API Boundary Nodes
     SubnetRental = 16,
+    /// Proposals to manage protocol canisters. Those are canisters that are considered part of the IC
+    /// protocol, without which the IC will not be able to function properly.
+    ProtocolCanisterManagement = 17,
+    /// Proposals related to Service Nervous System (SNS) - (1) upgrading SNS-W, (2) upgrading SNS
+    /// Aggregator, and (3) adding WASM's or custom upgrade paths to SNS-W.
+    ServiceNervousSystemManagement = 18,
 }
 
 impl From<Topic> for TopicUpstream {
@@ -183,6 +189,8 @@ impl From<Topic> for TopicUpstream {
             Topic::SnsAndCommunityFund => Self::SnsAndCommunityFund,
             Topic::ApiBoundaryNodeManagement => Self::ApiBoundaryNodeManagement,
             Topic::SubnetRental => Self::SubnetRental,
+            Topic::ProtocolCanisterManagement => Self::ProtocolCanisterManagement,
+            Topic::ServiceNervousSystemManagement => Self::ServiceNervousSystemManagement,
         }
     }
 }
@@ -206,6 +214,8 @@ impl From<TopicUpstream> for Topic {
             TopicUpstream::SnsAndCommunityFund => Self::SnsAndCommunityFund,
             TopicUpstream::ApiBoundaryNodeManagement => Self::ApiBoundaryNodeManagement,
             TopicUpstream::SubnetRental => Self::SubnetRental,
+            TopicUpstream::ProtocolCanisterManagement => Self::ProtocolCanisterManagement,
+            TopicUpstream::ServiceNervousSystemManagement => Self::ServiceNervousSystemManagement,
         }
     }
 }

rs/cli/src/commands/proposals/mod.rs

@@ -8,10 +8,8 @@ use ic_nervous_system_root::change_canister::{AddCanisterRequest, ChangeCanister
 use ic_nns_common::types::UpdateIcpXdrConversionRatePayload;
 
 use cycles_minting_canister::SetAuthorizedSubnetworkListArgs;
-use ic_nns_governance::{
-    governance::{BitcoinSetConfigProposal, SubnetRentalRequest},
-    pb::v1::{proposal::Action, ProposalInfo, ProposalStatus, Topic},
-};
+use ic_nns_governance::pb::v1::{proposal::Action, ProposalInfo, ProposalStatus, Topic};
+use ic_nns_governance_api::{bitcoin::BitcoinSetConfigProposal, subnet_rental::SubnetRentalRequest};
 use ic_protobuf::registry::{
     dc::v1::AddOrRemoveDataCentersProposalPayload, node_operator::v1::RemoveNodeOperatorsPayload,
     node_rewards::v2::UpdateNodeRewardsTableProposalPayload,
@@ -274,6 +272,9 @@ impl TryFrom<ProposalInfo> for Proposal {
                 Action::SetSnsTokenSwapOpenTimeWindow(a) => serde_json::to_value(a)?,
                 Action::OpenSnsTokenSwap(a) => serde_json::to_value(a)?,
                 Action::CreateServiceNervousSystem(a) => serde_json::to_value(a)?,
+                Action::InstallCode(a) => serde_json::to_value(a)?,
+                Action::StopOrStartCanister(a) => serde_json::to_value(a)?,
+                Action::UpdateCanisterSettings(a) => serde_json::to_value(a)?,
             },
         })
     }