chore: Bump a few deps (#696)

Co-authored-by: sa-github-api <138766536+sa-github-api@users.noreply.github.com>

Cargo.toml

@@ -67,7 +67,7 @@ clap = { version = "4.5", features = [
     "cargo",
 ] }
 colored = "2.1.0"
-counter = "0.5.7"
+counter = "0.6.0"
 comfy-table = "7.1.1"
 crossbeam = "0.8.4"
 crossbeam-channel = "0.5.13"
@@ -77,7 +77,7 @@ custom_error = "1.9.2"
 decentralization = { path = "rs/decentralization" }
 trustworthy-node-metrics = { path = "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics" }
 derive_builder = "0.20.0"
-derive_more = "0.99.18"
+derive_more = "1"
 dialoguer = "0.11.0"
 dirs = "5.0.1"
 dotenv = "0.15.0"
@@ -91,82 +91,85 @@ erased-serde = "0.4.5"
 exitcode = "1.1.2"
 flate2 = "1.0.30"
 float-ord = "0.3.2"
-fs2 = "0.4.3"
 fs-err = "2.11.0"
+fs2 = "0.4.3"
 futures = "0.3.30"
 futures-core = "0.3.30"
 futures-util = "0.3.30"
-octocrab = "0.38.0"
 hex = "0.4.3"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
 hyper = { version = "1.4.1" }
-self_update = { version = "0.40.0", features = ["archive-tar"] }
 hyper-tls = "0.6.0"
-ic-agent = "0.36.0"
-ic-async-utils = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
+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-canisters = { path = "rs/ic-canisters" }
-ic-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
+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 = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-identity-hsm = "0.36.0"
-ic-interfaces = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
+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-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-management-backend = { path = "rs/ic-management-backend" }
-ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
+ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
 ic-management-types = { path = "rs/ic-management-types" }
-ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-types = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-utils = "0.36.0"
+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-utils = "0.37.0"
 include_dir = "0.7.4"
 itertools = "0.13.0"
-keyring = "2.3.3"
+keyring = "3.0.5"
 lazy_static = "1.5.0"
 log = "0.4.22"
 lru = "0.12.3"
 opentelemetry = { version = "0.22.0", features = ["metrics"] }
-phantom_newtype = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
+phantom_newtype = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
 pkcs11 = "0.5.0"
 pretty_assertions = "1.4.0"
 pretty_env_logger = "0.5.0"
 prometheus-http-query = "0.8.3"
 prometheus = { version = "0.13.4", features = ["process"] }
-prost = "0.12.6"
+prost = "0.12"
 rand = { version = "0.8.5", features = ["std_rng"] }
-rand_seeder = "0.2.3"
+rand_seeder = "0.3.0"
 rayon = "1.10.0"
 regex = "1.10.5"
-registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-reqwest = { version = "0.12.5", features = ["json"] }
+registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
+reqwest = { version = "0.12", default-features = false, features = [
+    "rustls-tls",
+    "blocking",
+] }
 retry = "2.0.0"
 reverse_geocoder = "4.1.1"
 ring = "0.17.8"
-rstest = { version = "0.21.0", default-features = false }
+rstest = { version = "0.22.0", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0.203"
 serde_json = "1.0.120"
@@ -186,7 +189,7 @@ socket2 = "0.5.7"
 spinners = "4.1.1"
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
-tabled = "0.15.0"
+tabled = "0.16.0"
 tabular = "0.2"
 tempfile = "3.10.1"
 thiserror = "1.0.62"
@@ -202,7 +205,7 @@ ic-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716
 ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
 ic-stable-structures = "0.6.5"
 ciborium = "0.2.1"
-dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
+dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "7dee90107a88b836fc72e78993913988f4f73ca2" }
 
 [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 = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d"
+IC_REPO_VERSION = "7dee90107a88b836fc72e78993913988f4f73ca2"
 
 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=5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d
+ARG ic_git_revision=7dee90107a88b836fc72e78993913988f4f73ca2
 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
 

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="5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d")
+    ic_admin = IcAdmin("https://ic0.app", git_revision="7dee90107a88b836fc72e78993913988f4f73ca2")
 
     print(ic_admin.get_subnet_replica_versions())

rs/cli/src/auth.rs

@@ -191,8 +191,9 @@ impl Auth {
                 &GOVERNANCE_CANISTER_ID,
                 "list_neurons",
                 Encode!(&ListNeurons {
-                    include_neurons_readable_by_caller: true,
                     neuron_ids: vec![],
+                    include_neurons_readable_by_caller: true,
+                    include_empty_neurons_readable_by_caller: None,
                 })?,
             )
             .await

rs/cli/src/commands/qualify/execute.rs

@@ -1,6 +1,5 @@
 use clap::Args;
 use ic_management_types::Network;
-use registry_canister::mutations::do_delete_subnet::NNS_SUBNET_ID;
 use serde_json::Value;
 
 use crate::{
@@ -51,8 +50,11 @@ impl ExecutableCommand for Execute {
             None => {
                 let anonymous_admin_wrapper_for_mainnet = ctx.readonly_ic_admin_for_other_network(Network::mainnet_unchecked().unwrap());
 
+                let subnets = ctx.registry().await.subnets().await?;
+                let nns_subnet_id = subnets.keys().next().unwrap();
+
                 let output = anonymous_admin_wrapper_for_mainnet
-                    .run_passthrough_get(&["subnet".to_string(), NNS_SUBNET_ID.to_string()], true)
+                    .run_passthrough_get(&["subnet".to_string(), nns_subnet_id.to_string()], true)
                     .await?;
 
                 let output = serde_json::from_str::<Value>(&output)?;

rs/cli/src/commands/registry.rs

@@ -20,7 +20,7 @@ use ic_protobuf::registry::{
     node_operator::v1::NodeOperatorRecord,
     node_rewards::v2::NodeRewardsTable,
     replica_version::v1::ReplicaVersionRecord,
-    subnet::v1::{EcdsaConfig, GossipConfig as GossipConfigProto, SubnetFeatures, SubnetRecord as SubnetRecordProto},
+    subnet::v1::{EcdsaConfig, SubnetFeatures, SubnetRecord as SubnetRecordProto},
     unassigned_nodes_config::v1::UnassignedNodesConfigRecord,
 };
 use ic_registry_subnet_type::SubnetType;
@@ -237,7 +237,6 @@ fn get_subnets(local_registry: &Rc<LazyRegistry>) -> anyhow::Result<Vec<SubnetRe
             initial_notary_delay_millis: record.initial_notary_delay_millis,
             replica_version_id: record.replica_version_id,
             dkg_interval_length: record.dkg_interval_length,
-            gossip_config: record.gossip_config,
             start_as_nns: record.start_as_nns,
             subnet_type: SubnetType::try_from(record.subnet_type).unwrap(),
             max_instructions_per_message: record.max_instructions_per_message,
@@ -424,7 +423,6 @@ struct SubnetRecord {
     initial_notary_delay_millis: u64,
     replica_version_id: String,
     dkg_interval_length: u64,
-    gossip_config: Option<GossipConfigProto>,
     start_as_nns: bool,
     subnet_type: SubnetType,
     max_instructions_per_message: u64,

rs/ic-observability/multiservice-discovery/Cargo.toml

@@ -34,7 +34,7 @@ retry = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }
-reqwest = { version = "0.12", features = ["blocking"] }
+reqwest = { workspace = true }
 assert_cmd = "2.0.14"
 anyhow = "1.0.86"
 flate2 = "1.0.30"

rs/ic-observability/obs-canister-clients/src/node_status_canister_client.rs

@@ -2,6 +2,7 @@ use std::time::Duration;
 
 use candid::{CandidType, Decode, Encode};
 use ic_agent::agent::http_transport::ReqwestTransport;
+use ic_agent::agent::CallResponse;
 use ic_agent::{export::Principal, identity::AnonymousIdentity, Agent};
 use rand::seq::SliceRandom;
 use serde::Deserialize;
@@ -102,7 +103,7 @@ impl NodeStatusCanister {
     }
 
     pub async fn update_node_statuses(&self, statuses: Vec<NodeStatus>) -> Result<bool, NodeStatusCanisterError> {
-        let request_id = match self
+        let response = match self
             .choose_random_agent()
             .await
             .update(&self.canister_id, "update_node_status")
@@ -114,21 +115,21 @@ impl NodeStatusCanister {
             .call()
             .await
         {
-            Ok(result) => result,
+            Ok(CallResponse::Response(response)) => response,
+            Ok(CallResponse::Poll(request_id)) => self
+                .choose_random_agent()
+                .await
+                .wait(&request_id, self.canister_id)
+                .await
+                .map_err(|err| NodeStatusCanisterError::Unknown(format!("Error on getting response for update_node_status: {}", err)))?,
             Err(err) => return Err(NodeStatusCanisterError::Unknown(format!("Error on update_node_status request: {}", err))),
         };
 
-        match self.choose_random_agent().await.wait(request_id, self.canister_id).await {
-            Ok(response) => match Decode!(response.as_slice(), bool) {
-                Ok(response) => Ok(response),
-                Err(e) => Err(NodeStatusCanisterError::Decoding(format!(
-                    "Error decoding response for update_node_status: {}",
-                    e
-                ))),
-            },
-            Err(err) => Err(NodeStatusCanisterError::Unknown(format!(
-                "Error on getting response for update_node_status: {}",
-                err
+        match Decode!(response.as_slice(), bool) {
+            Ok(response) => Ok(response),
+            Err(e) => Err(NodeStatusCanisterError::Decoding(format!(
+                "Error decoding response for update_node_status: {}",
+                e
             ))),
         }
     }

rs/slack-notifications/src/main.rs

@@ -205,7 +205,7 @@ async fn notify_for_new_proposals(target_network: Network) {
                             println!(
                                 "Got a response: {}",
                                 response
-                                    .text_with_charset("utf8")
+                                    .text()
                                     .await
                                     .unwrap_or_else(|_| { "ERROR: failed to decode the response from the slack servers".to_string() })
                             );
@@ -265,7 +265,7 @@ async fn notify_for_failed_proposals(target_network: Network) {
                             println!(
                                 "Got a response: {}",
                                 response
-                                    .text_with_charset("utf8")
+                                    .text()
                                     .await
                                     .unwrap_or_else(|_| { "ERROR: failed to decode the response from the slack servers".to_string() })
                             );