build: upgrade zstd and use workspace version for some p2p deps

Cargo.Bazel.Fuzzing.json.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "36e4570cd154c808323dae7971ee7ef2aac27914a305880ce20a2a911615cbcb",
+  "checksum": "8baf3cbc469f8bf7d84165355a396b98e9f49edce7678d68160c6a957143175d",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -16367,7 +16367,7 @@
               "target": "zeroize"
             },
             {
-              "id": "zstd 0.12.4",
+              "id": "zstd 0.13.0",
               "target": "zstd"
             }
           ],
@@ -65125,6 +65125,15 @@
         "compile_data_glob": [
           "**"
         ],
+        "crate_features": {
+          "common": [
+            "arrays",
+            "default",
+            "legacy",
+            "zdict_builder"
+          ],
+          "selects": {}
+        },
         "deps": {
           "common": [
             {
@@ -65254,7 +65263,10 @@
         ],
         "crate_features": {
           "common": [
-            "std"
+            "arrays",
+            "legacy",
+            "std",
+            "zdict_builder"
           ],
           "selects": {}
         },

Cargo.Bazel.Fuzzing.toml.lock

@@ -3298,7 +3298,7 @@ dependencies = [
  "x509-parser",
  "yansi",
  "zeroize",
- "zstd 0.12.4",
+ "zstd 0.13.0",
 ]
 
 [[package]]

Cargo.Bazel.json.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "1c196e64dd1cc48aa75768ca8251e501529892cc6e2baa2c70be6def52879bf2",
+  "checksum": "f17e96724e8e7c54c711e575e117bd89d5fc29d5b4d284af697ac39716ae638b",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -16243,7 +16243,7 @@
               "target": "zeroize"
             },
             {
-              "id": "zstd 0.12.4",
+              "id": "zstd 0.13.0",
               "target": "zstd"
             }
           ],
@@ -65068,6 +65068,54 @@
       },
       "license": "MIT"
     },
+    "zstd 0.13.0": {
+      "name": "zstd",
+      "version": "0.13.0",
+      "repository": {
+        "Http": {
+          "url": "https://crates.io/api/v1/crates/zstd/0.13.0/download",
+          "sha256": "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "zstd",
+            "crate_root": "src/lib.rs",
+            "srcs": [
+              "**/*.rs"
+            ]
+          }
+        }
+      ],
+      "library_target_name": "zstd",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "crate_features": {
+          "common": [
+            "arrays",
+            "default",
+            "legacy",
+            "zdict_builder"
+          ],
+          "selects": {}
+        },
+        "deps": {
+          "common": [
+            {
+              "id": "zstd-safe 7.0.0",
+              "target": "zstd_safe"
+            }
+          ],
+          "selects": {}
+        },
+        "edition": "2018",
+        "version": "0.13.0"
+      },
+      "license": "MIT"
+    },
     "zstd-safe 6.0.5+zstd.1.5.4": {
       "name": "zstd-safe",
       "version": "6.0.5+zstd.1.5.4",
@@ -65147,6 +65195,81 @@
       },
       "license": "MIT/Apache-2.0"
     },
+    "zstd-safe 7.0.0": {
+      "name": "zstd-safe",
+      "version": "7.0.0",
+      "repository": {
+        "Http": {
+          "url": "https://crates.io/api/v1/crates/zstd-safe/7.0.0/download",
+          "sha256": "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "zstd_safe",
+            "crate_root": "src/lib.rs",
+            "srcs": [
+              "**/*.rs"
+            ]
+          }
+        },
+        {
+          "BuildScript": {
+            "crate_name": "build_script_build",
+            "crate_root": "build.rs",
+            "srcs": [
+              "**/*.rs"
+            ]
+          }
+        }
+      ],
+      "library_target_name": "zstd_safe",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "crate_features": {
+          "common": [
+            "arrays",
+            "legacy",
+            "std",
+            "zdict_builder"
+          ],
+          "selects": {}
+        },
+        "deps": {
+          "common": [
+            {
+              "id": "zstd-safe 7.0.0",
+              "target": "build_script_build"
+            },
+            {
+              "id": "zstd-sys 2.0.8+zstd.1.5.5",
+              "target": "zstd_sys"
+            }
+          ],
+          "selects": {}
+        },
+        "edition": "2018",
+        "version": "7.0.0"
+      },
+      "build_script_attrs": {
+        "data_glob": [
+          "**"
+        ],
+        "link_deps": {
+          "common": [
+            {
+              "id": "zstd-sys 2.0.8+zstd.1.5.5",
+              "target": "zstd_sys"
+            }
+          ],
+          "selects": {}
+        }
+      },
+      "license": "MIT/Apache-2.0"
+    },
     "zstd-sys 2.0.8+zstd.1.5.5": {
       "name": "zstd-sys",
       "version": "2.0.8+zstd.1.5.5",

Cargo.Bazel.toml.lock

@@ -86,7 +86,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
- "zstd",
+ "zstd 0.12.4",
 ]
 
 [[package]]
@@ -617,8 +617,8 @@ dependencies = [
  "memchr",
  "pin-project-lite",
  "tokio",
- "zstd",
- "zstd-safe",
+ "zstd 0.12.4",
+ "zstd-safe 6.0.5+zstd.1.5.4",
 ]
 
 [[package]]
@@ -3288,7 +3288,7 @@ dependencies = [
  "x509-parser",
  "yansi",
  "zeroize",
- "zstd",
+ "zstd 0.13.0",
 ]
 
 [[package]]
@@ -12551,7 +12551,16 @@ version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
 dependencies = [
- "zstd-safe",
+ "zstd-safe 6.0.5+zstd.1.5.4",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
+dependencies = [
+ "zstd-safe 7.0.0",
 ]
 
 [[package]]
@@ -12564,6 +12573,15 @@ dependencies = [
  "zstd-sys",
 ]
 
+[[package]]
+name = "zstd-safe"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
+dependencies = [
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
 version = "2.0.8+zstd.1.5.5"

Cargo.toml

@@ -420,7 +420,7 @@ arrayvec = "0.7.4"
 askama = { version = "0.12.1", features = ["serde-json"] }
 async-recursion = "1.0.5"
 async-scoped = { version = "0.8", features = ["use-tokio"] }
-axum = "0.6.20"
+axum = "0.7.4"
 backoff = "0.4"
 base64 = { version = "0.13.1" }
 # build-info and build-info-build MUST be kept in sync!
@@ -487,6 +487,7 @@ pretty_assertions = "1.4.0"
 prometheus = { version = "0.13.3", features = ["process"] }
 prost = "0.12.3"
 prost-build = "0.12.3"
+rand = "0.8.5"
 rcgen = { version = "0.11.1", features = ["zeroize"] }
 reqwest = { version = "0.11.22", default-features = false, features = [
   "blocking",
@@ -516,6 +517,7 @@ strum_macros = "0.25.3"
 syn = { version = "1.0.109", features = ["fold", "full"] }
 time = { version = "0.3.20", features = ["formatting"] }
 tokio = { version = "1.36.0", features = ["full"] }
+tokio-metrics = "0.3.0"
 tokio-rustls = { version = "0.24.1", features = ["dangerous_configuration"] }
 tokio-util = { version = "0.7.10", features = ["full"] }
 tonic = "0.11.0"

bazel/external_crates.bzl

@@ -1427,7 +1427,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
                 ],
             ),
             "zstd": crate.spec(
-                version = "^0.12.4",
+                version = "^0.13.0",
             ),
         },
         splicing_config = splicing_config(

rs/monitoring/metrics/Cargo.toml

@@ -12,7 +12,7 @@ ic-adapter-metrics = { path = "../adapter_metrics" }
 libc = "0.2.91"
 prometheus = { workspace = true }
 tokio = { workspace = true }
-tokio-metrics = "0.3.0"
+tokio-metrics = { workspace = true }
 
 [dev-dependencies]
 ic-logger = { path = "../logger" }

rs/p2p/consensus_manager/BUILD.bazel

@@ -17,7 +17,6 @@ DEPENDENCIES = [
     "@crate_index//:axum_0_7_0",
     "@crate_index//:backoff",
     "@crate_index//:bytes",
-    "@crate_index//:futures",
     "@crate_index//:prometheus",
     "@crate_index//:rand",
     "@crate_index//:slog",
@@ -29,6 +28,7 @@ DEV_DEPENDENCIES = [
     "//rs/p2p/test_utils",
     "//rs/test_utilities/logger",
     "//rs/types/types_test_utils",
+    "@crate_index//:futures",
     "@crate_index//:mockall",
     "@crate_index//:turmoil",
 ]