chore: bump up a few dependency versions

rs/cli/Cargo.toml

@@ -16,11 +16,11 @@ colored = "2.0.0"
 log = "0.4.14"
 pretty_env_logger = "0.4.0"
 regex = "1.5.4"
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 tokio = { version = "1.14.0", features = ["full"] }
 strum = { version = "0.24.1", features = ["derive"] }
 strum_macros = "0.24.3"
@@ -33,8 +33,8 @@ itertools = "0.10"
 async-trait = "0.1.53"
 keyring = "1.1.2"
 cryptoki = "0.3.0"
-candid = "0.7.18"
-url = "2.2.2"
+candid = "0.8.4"
+url = "2.3.1"
 clap-num = "1.0.0"
 
 [dev-dependencies]

rs/decentralization/Cargo.toml

@@ -6,11 +6,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 serde = { version = "1.0", features = ["rc"] }
 serde_json = { version = "1.0" }
 async-trait = "0.1.52"
-actix-web = { version = "4.0.0-rc.1", default-features = false, features = [
+actix-web = { version = "4.1.0", default-features = false, features = [
   "compress-gzip",
   "macros",
 ] }

rs/ic-management-backend/Cargo.toml

@@ -16,12 +16,12 @@ urlencoding = "2.1.0"
 futures-core = "0.3.16"
 futures-util = "0.3.16"
 derive_more = "0.99.16"
-actix-web = { version = "4.0.0-rc.1", default-features = false, features = [
+actix-web = { version = "4.1.0", default-features = false, features = [
     "compress-gzip",
     "macros",
 ] }
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 anyhow = "1.0.43"
 serde_with = "2.0.1"
 futures = "0.3.16"
@@ -30,28 +30,28 @@ reqwest = { version = "0.11.4", features = ["json"] }
 async-trait = "0.1.52"
 enum-map = "1.1.1"
 either = "1.6.1"
-ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-types = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-types = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 prost = "0.11.0"
 ic-management-types = { path = "../ic-management-types" }
-registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 strum = "0.24.1"
 strum_macros = "0.24.3"
 itertools = "0.10.1"
 log = "0.4.14"
 env_logger = "0.9.0"
 reverse_geocoder = "3.0.1"
 csv = "1.1.6"
-candid = "0.7.18"
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+candid = "0.8.4"
+ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 ic-agent = "0.20.0"
 gitlab = "0.1503.0"
 dotenv = "0.15.0"
@@ -61,12 +61,12 @@ regex = "1.5.4"
 async-timer = "0.7.4"
 counter = "0.5.2"
 rand = "0.8.4"
-phantom_newtype = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+phantom_newtype = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 decentralization = { path = "../decentralization" }
 prometheus-http-query = "0.4.0"
-ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 dirs = "4.0.0"
 
 [dev-dependencies]

rs/ic-management-backend/Dockerfile

@@ -4,6 +4,8 @@
 FROM lukemathwalker/cargo-chef:latest-rust-1.60.0-bullseye AS chef
 WORKDIR app
 
+ARG protobuf_version=3.18.1
+
 FROM chef AS planner
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
@@ -14,7 +16,12 @@ RUN apt-get -y update && \
     apt-get clean autoclean && \
     apt-get autoremove --yes && \
     rm -rf /var/lib/{apt,dpkg,cache,log}/
-
+
+RUN cd `mktemp -d`; curl --fail -LO https://github.com/protocolbuffers/protobuf/releases/download/v${protobuf_version}/protoc-${protobuf_version}-linux-x86_64.zip; unzip * -d /opt/protoc; chmod -R 755 /opt/protoc/bin; chmod -R u+rwX,go+rX,go-w /opt/protoc/include
+
+ENV PROTOC=/opt/protoc/bin/protoc \
+    PROTOC_INCLUDE=/opt/protoc/include
+
 COPY --from=planner /app/recipe.json recipe.json
 # Build dependencies - this is the caching Docker layer!
 RUN cargo chef cook --release --recipe-path recipe.json

rs/ic-management-backend/src/main.rs

@@ -56,15 +56,10 @@ async fn main() -> std::io::Result<()> {
     sync_local_store().await.expect("failed to init local store");
 
     let local_registry_path = local_registry_path();
-    let handle = tokio::runtime::Handle::try_current().expect("failed to get the runtime handle");
-    let local_registry = Arc::new(
-        web::block(|| {
-            LocalRegistry::new_with_runtime_handle(local_registry_path, Duration::from_millis(500), handle)
-                .expect("Failed to create local registry")
-        })
-        .await
-        .expect("Failed to create local registry"),
-    );
+    let local_registry: Arc<LocalRegistry> = Arc::new(LocalRegistry::new(
+        local_registry_path,
+        Duration::from_millis(1000),
+    ).expect("Failed to create local registry"));
 
     tokio::spawn(async move {
         let mut print_counter = 0;

rs/ic-management-types/Cargo.toml

@@ -7,11 +7,11 @@ edition = "2018"
 actix-web = { version = "4.0.0-rc.1", default-features = false, features = [ "compress-gzip", "macros", ] }
 chrono = { version = "0.4.19", features = ["serde"] }
 float-cmp = "0.9.0"
-ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-types = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-types = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 itertools = "0.10.3"
 reqwest = { version = "0.11.9", features = ["json"] }
 serde = "1.0.127"
@@ -21,7 +21,7 @@ strum = "0.24.1"
 strum_macros = "0.24.3"
 url = "2.2.2"
 anyhow = "1.0.43"
-candid = "0.7.18"
+candid = "0.8.4"
 
 [lib]
 crate-type = ["cdylib", "lib"]

rs/slack-notifications/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
-registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "2b1c7606b70a2ec85fea741c2341df43a76a1994" }
+ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
+registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "36f4a1c2903aed012b95b3b073e052c4036aef09" }
 tokio = { version = "1.2.0", features = ["full"] }
 ic-agent = "0.20.0"
 ic-types = "0.4.2"
-candid = "0.7.18"
+candid = "0.8.4"
 anyhow = "1.0.44"
 reqwest = { version = "0.11.4", features = ["json"] }
 serde = "1.0.130"

rs/slack-notifications/Dockerfile

@@ -4,6 +4,8 @@
 FROM lukemathwalker/cargo-chef:latest-rust-1.60.0-bullseye AS chef
 WORKDIR app
 
+ARG protobuf_version=3.18.1
+
 FROM chef AS planner
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
@@ -14,7 +16,12 @@ RUN apt-get -y update && \
     apt-get clean autoclean && \
     apt-get autoremove --yes && \
     rm -rf /var/lib/{apt,dpkg,cache,log}/
-
+
+RUN cd `mktemp -d`; curl --fail -LO https://github.com/protocolbuffers/protobuf/releases/download/v${protobuf_version}/protoc-${protobuf_version}-linux-x86_64.zip; unzip * -d /opt/protoc; chmod -R 755 /opt/protoc/bin; chmod -R u+rwX,go+rX,go-w /opt/protoc/include
+
+ENV PROTOC=/opt/protoc/bin/protoc \
+    PROTOC_INCLUDE=/opt/protoc/include
+
 COPY --from=planner /app/recipe.json recipe.json
 # Build dependencies - this is the caching Docker layer!
 RUN cargo chef cook --release --recipe-path recipe.json