Merge branch 'main' into docs-1

Author: cameron1024

Cargo.lock

@@ -53,7 +53,7 @@ thiserror = "1.0"
 tokio = { version = "1.8", features = ["rt", "macros"] }
 url = "2.2"
 hex = "0.4"
-image = "0.23.12"
+image = "0.23"
 qrcode = "0.12"
 quircs = "0.10.0"
 symmetric-cipher = { path = "../../chain-wallet-libs/symmetric-cipher" }

src/catalyst-toolbox/catalyst-toolbox/Cargo.toml

@@ -15,7 +15,7 @@ chain-path-derivation = { path = "../chain-path-derivation" }
 hdkeygen = { path = "../hdkeygen" }
 hex = "0.4.2"
 itertools = "0.10"
-hashlink = "0.7.0"
+hashlink = "0.8"
 zeroize = "1.5.3"
 
 chain-time = { path = "../../chain-libs/chain-time" }

src/chain-wallet-libs/wallet/Cargo.toml

@@ -8,7 +8,7 @@ description = "Data structures and formats used by Jormungandr node API and conf
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-serde_with = { version = "1.12", features = ["macros"] }
+serde_with = { version = "2", features = ["macros"] }
 chain-impl-mockchain = { path = "../../chain-libs/chain-impl-mockchain" }
 chain-addr      = { path = "../../chain-libs/chain-addr" }
 chain-core      = { path = "../../chain-libs/chain-core" }

src/jormungandr/jormungandr-lib/Cargo.toml

@@ -63,7 +63,7 @@ tonic = "0.6"
 url = { version = "2", features = ["serde"] }
 lru = "0.7"
 warp = { version = "0.3.2", features = ["tls"] }
-serde_with = { version = "1.12", features = ["macros"] }
+serde_with = { version = "2", features = ["macros"] }
 http-zipkin = "0.3.0"
 prometheus = { version = "0.13", optional = true }
 jsonrpsee-http-server = { version = "0.11.0" }

src/jormungandr/jormungandr/Cargo.toml

@@ -38,7 +38,7 @@ humantime = "2.0"
 custom_debug = "0.5"
 thiserror = "1.0"
 poldercast = "1.2"
-sysinfo = { version = "0.23.1" }
+sysinfo = "0.26"
 os_info = { version = "3.3.0", default-features = false }
 zip = "0.6.0"
 flate2 = "1.0.21"

src/jormungandr/testing/jormungandr-automation/Cargo.toml

@@ -19,7 +19,7 @@ time = { version = "0.3", features = ["formatting", "parsing"] }
 humantime = "2.0"
 custom_debug = "0.5"
 thiserror = "1.0"
-sysinfo = { version = "0.14.10" }
+sysinfo = { version = "0.26" }
 os_info = { version = "3.1", default-features = false }
 zip = { version = "0.6.0", default-features = false }
 flate2 = "1.0.16"
@@ -33,7 +33,7 @@ predicates = "2.1"
 indicatif = "0.15.0"
 fs_extra = "1.1.0"
 console = "0.15"
-dialoguer = "0.9"
+dialoguer = "0.10"
 semver = "1.0"
 csv = "1.1.3"
 warp = "0.3"
@@ -45,4 +45,4 @@ sha-1 = "0.9"
 [dependencies.reqwest]
 version = "0.11"
 default-features = false
-features = ["blocking", "rustls-tls"]
+features = ["blocking", "rustls-tls"]

src/jortestkit/Cargo.toml

@@ -6,8 +6,7 @@ use crate::measurement::{
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use std::thread::JoinHandle;
-use sysinfo::AsU32;
-use sysinfo::{ProcessExt, SystemExt};
+use sysinfo::{PidExt, ProcessExt, SystemExt};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -126,7 +125,7 @@ impl ConsumptionBenchmarkRun {
 
         for (named_process, resources) in self.markers.iter_mut() {
             let (_, process) = system
-                .get_processes()
+                .processes()
                 .iter()
                 .find(|(pid, _)| (named_process.id() as u32) == pid.as_u32())
                 .ok_or_else(|| ConsumptionBenchmarkError::NoProcessWitId(named_process.clone()))?;

src/jortestkit/src/measurement/benchmark/consumption_benchmark.rs

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-base64 = "0.12.1"
+base64 = "0.13"
 time = "0.3"
 csv = "1.1"
 diesel = "1.4"

src/vit-servicing-station/vit-servicing-station-cli/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 async-trait = "0.1.33"
-base64 = "0.12.1"
+base64 = "0.13"
 time = { version = "0.3", features = ["parsing", "formatting"] }
 diesel = { version = "1.4.5", features = ["postgres", "sqlite", "r2d2", "64-column-tables"] }
 diesel_migrations = "1.4.0"