feat: adding standard engine version handling (#2137)

Author: NikolaMilosa

Cargo.Bazel.lock

@@ -87,61 +87,72 @@ futures-util = "0.3.31"
 hex = "0.4.3"
 humantime = "2.2.0"
 humantime-serde = "1.1.1"
-ic-agent = "0.39.3"
-octocrab = "0.41.2"
+ic-agent = "0.49.1"
+# Disable default features to drop `rustls-ring`; use the aws-lc-rs provider
+# instead so the whole workspace standardizes on a single rustls CryptoProvider
+# (matching the ic repo). All other default features are re-enabled explicitly.
+octocrab = { version = "0.41.2", default-features = false, features = [
+    "follow-redirect",
+    "retry",
+    "rustls",
+    "rustls-aws-lc-rs",
+    "timeout",
+    "tracing",
+    "default-client",
+] }
 self_update = { version = "0.41.0", default-features = false, features = [
     "archive-tar",
     "rustls",
 ] }
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 ic-canisters = { path = "rs/ic-canisters" }
-ic-http-types = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-config = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-dummy-getrandom-for-wasm = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+ic-http-types = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-config = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-dummy-getrandom-for-wasm = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 ic-management-backend = { path = "rs/ic-management-backend" }
-ic-management-canister-types-private = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+ic-management-canister-types-private = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 ic-management-types = { path = "rs/ic-management-types" }
-ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nervous-system-canisters = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nervous-system-common = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nervous-system-runtime = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-types = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-nervous-system-proto = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-icp-ledger = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-icrc-ledger-types = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nervous-system-canisters = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nervous-system-common = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nervous-system-runtime = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-types = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-nervous-system-proto = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+icp-ledger = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+icrc-ledger-types = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 ic-metrics-encoder = "1.1.1"
-ic-transport-types = "0.39.3"
-ic-utils = "0.39.3"
+ic-transport-types = "0.49.1"
+ic-utils = { version = "0.49.1", features = ["raw"] }
 itertools = "0.13.0"
 keyring = { version = "3.6.3", features = [
     "apple-native",
@@ -156,19 +167,30 @@ opentelemetry_sdk = "0.29"
 opentelemetry-prometheus = "0.29.1"
 pretty_assertions = "1.4.1"
 pretty_env_logger = "0.5.0"
-prometheus-http-query = { version = "0.8.3", default-features = false, features = [
-    "rustls-tls-webpki-roots",
-] }
+# TLS is provided by the workspace `reqwest` dependency configured with
+# `rustls-tls-webpki-roots-no-provider` (aws-lc-rs provider). Don't enable a
+# rustls feature here, since prometheus-http-query only exposes the `ring`-based
+# variant which would reintroduce the dual-provider ambiguity.
+prometheus-http-query = { version = "0.8.3", default-features = false }
 prometheus = { version = "0.14.0", features = ["process"] }
-prost = "0.13"
+prost = "0.14.3"
 rand = { version = "0.9.2", features = ["std_rng"] }
 rand_seeder = "0.3.0"
 regex = "1.11.2"
-registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 reqwest = { version = "0.12", default-features = false, features = [
-    "rustls-tls-webpki-roots",
+    # Use the "-no-provider" variant so reqwest does not force the `ring`
+    # rustls CryptoProvider. We standardize on `aws-lc-rs` (matching the ic
+    # repo) and install it as the process-level default at startup.
+    "rustls-tls-webpki-roots-no-provider",
     "blocking",
 ] }
+# Match the ic repo: standardize the rustls CryptoProvider on `aws-lc-rs`.
+rustls = { version = "0.23", default-features = false, features = [
+    "aws_lc_rs",
+    "std",
+    "tls12",
+] }
 retry = "2.1.0"
 rstest = { version = "0.23.0", default-features = false }
 rust_decimal = "1.37.2"
@@ -210,15 +232,15 @@ ic-cdk = { version = "^0.18.7" }
 ic-cdk-timers = { version = "^0.12.2" }
 ic-cdk-macros = { version = "^0.18.7" }
 ic-stable-structures = "0.6.9"
-dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-rewards-calculation = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
-ic-node-rewards-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+rewards-calculation = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
+ic-node-rewards-canister-api = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 
 # dre-airflow deps, should be replaced with dre-airflow once
 indexmap = { version = "2.11.1", features = ["serde"] }
 
 [patch.crates-io]
-ic-error-types = { git = "https://github.com/dfinity/ic.git", rev = "abf88f2283940c12b2974b0fd19ceb2bf485ef8f" }
+ic-error-types = { git = "https://github.com/dfinity/ic.git", rev = "98ed17c502df46abd46d2dabe1f4332232855901" }
 
 [profile.release]
 # Add debug information to the release build (does NOT reduce the level of optimization!)

Cargo.lock

@@ -7,6 +7,7 @@ license = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+rustls = { workspace = true }
 clap = { workspace = true }
 reqwest = { workspace = true }
 url = { workspace = true }

Cargo.toml

@@ -18,6 +18,10 @@ mod entry;
 #[allow(clippy::iter_skip_zero)]
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
+    // Standardize the process-level rustls CryptoProvider on aws-lc-rs (matching
+    // the ic repo). Without this, rustls panics when multiple providers are enabled.
+    let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
+
     let args = Cli::parse();
     init_logger(args.name.clone());
 

rs/canister-log-fetcher/Cargo.toml

@@ -74,6 +74,7 @@ regex = { workspace = true }
 registry-canister = { workspace = true }
 reqwest = { workspace = true }
 rosetta-core.workspace = true
+rustls = { workspace = true }
 self_update = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }