Skip to content

Commit

Permalink
chore(deps): bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
RolandSherwin authored and jacderida committed Apr 4, 2024
1 parent 84bd567 commit 06fc983
Show file tree
Hide file tree
Showing 18 changed files with 426 additions and 237 deletions.
586 changes: 387 additions & 199 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sn_auditor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ bls = { package = "blsttc", version = "8.0.1" }
clap = { version = "4.2.1", features = ["derive"] }
color-eyre = "~0.6"
dirs-next = "~2.0.0"
graphviz-rust = "0.7.1"
graphviz-rust = "0.9.0"
serde = { version = "1.0.133", features = [ "derive", "rc" ]}
serde_json = "1.0.108"
sn_client = { path = "../sn_client", version = "0.105.2" }
Expand Down
8 changes: 4 additions & 4 deletions sn_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ open-metrics = ["sn_client/open-metrics"]

[dependencies]
aes="0.7.5"
base64 = { version = "0.21.7", optional = true }
base64 = { version = "0.22.0", optional = true }
bitcoin = { version = "0.31.0", optional = true}
block-modes="0.8.1"
bls = { package = "blsttc", version = "8.0.1" }
bytes = { version = "1.0.1", features = ["serde"] }
custom_debug = "~0.5.0"
custom_debug = "~0.6.1"
chrono = "~0.4.19"
clap = { version = "4.2.1", features = ["derive"]}
color-eyre = "~0.6"
Expand All @@ -49,7 +49,7 @@ indicatif = { version = "0.17.5", features = ["tokio"] }
libp2p = { version="0.53", features = ["identify", "kad"] }
rand = "0.8.5"
rayon = "1.8.0"
reqwest = { version="0.11.18", default-features=false, features = ["rustls"] }
reqwest = { version="0.12.2", default-features=false, features = ["rustls-tls-manual-roots"] }
rmp-serde = "1.1.1"
serde = { version = "1.0.133", features = [ "derive"]}
sn_build_info = { path="../sn_build_info", version = "0.1.5" }
Expand All @@ -62,7 +62,7 @@ tiny-keccak = "~2.0.2"
tokio = { version = "1.32.0", features = ["io-util", "macros", "parking_lot", "rt", "sync", "time", "fs"] }
tracing = { version = "~0.1.26" }
url = "2.4.0"
walkdir = "~2.4.0"
walkdir = "~2.5.0"
xor_name = "5.0.0"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions sn_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ backoff = { version = "0.4.0", features = ["tokio"] }
bls = { package = "blsttc", version = "8.0.1" }
bytes = { version = "1.0.1", features = ["serde"] }
crdts = "7.3.2"
custom_debug = "~0.5.0"
custom_debug = "~0.6.1"
futures = "~0.3.13"
hex = "~0.4.3"
itertools = "~0.11.0"
itertools = "~0.12.1"
libp2p = { version="0.53", features = ["identify"] }
petgraph = { version = "0.6.4", features = ["serde-1"] }
prometheus-client = { version = "0.22", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion sn_faucet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ name = "faucet"
[dependencies]
warp = "0.3"
assert_fs = "1.0.0"
base64 = { version = "0.21.7", optional = true }
base64 = { version = "0.22.0", optional = true }
bitcoin = { version = "0.31.0", features = [
"rand-std",
"base64",
Expand Down
2 changes: 1 addition & 1 deletion sn_logging/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ opentelemetry-semantic-conventions = { version = "0.12.0", optional = true }
rand = { version = "~0.8.5", features = ["small_rng"], optional = true }
serde = { version = "1.0.133", features = [ "derive", "rc" ], optional = true }
serde_json = {version = "1.0", optional = true }
sysinfo = { version = "0.29.0", default-features = false, optional = true }
sysinfo = { version = "0.30.8", default-features = false, optional = true }
thiserror = "1.0.23"
tokio = { version = "1.32.0", optional = true }
tracing = { version = "~0.1.26" }
Expand Down
9 changes: 5 additions & 4 deletions sn_logging/src/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

use serde::Serialize;
use std::time::Duration;
use sysinfo::{self, CpuExt, Pid, PidExt, ProcessExt, System, SystemExt};
use sysinfo::{self, Networks, Pid, System};
use tracing::{debug, error};

const UPDATE_INTERVAL: Duration = Duration::from_secs(15);
Expand Down Expand Up @@ -47,10 +47,11 @@ struct ProcessMetrics {
// The function should be spawned as a task and should be re-run if our main process is restarted.
pub async fn init_metrics(pid: u32) {
let mut sys = System::new_all();
let mut networks = Networks::new_with_refreshed_list();
let pid = Pid::from_u32(pid);

loop {
refresh_metrics(&mut sys, pid);
refresh_metrics(&mut sys, &mut networks, pid);

let process = match sys.process(pid) {
Some(safenode) => {
Expand Down Expand Up @@ -87,9 +88,9 @@ pub async fn init_metrics(pid: u32) {
}

// Refreshes only the metrics that we interested in.
fn refresh_metrics(sys: &mut System, pid: Pid) {
fn refresh_metrics(sys: &mut System, networks: &mut Networks, pid: Pid) {
sys.refresh_process(pid);
sys.refresh_memory();
sys.refresh_networks();
sys.refresh_cpu();
networks.refresh();
}
2 changes: 1 addition & 1 deletion sn_metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ regex = "1.10"
serde = { version = "1.0.133", features = ["derive"] }
serde_yaml = "0.9.25"
url = "2.4.1"
walkdir = "~2.4.0"
walkdir = "~2.5"
8 changes: 4 additions & 4 deletions sn_networking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ hyper = { version = "0.14", features = [
"tcp",
"http1",
], optional = true }
itertools = "~0.11.0"
custom_debug = "~0.5.0"
itertools = "~0.12.1"
custom_debug = "~0.6.1"
libp2p = { version = "0.53", features = [
"tokio",
"dns",
Expand All @@ -52,7 +52,7 @@ serde = { version = "1.0.133", features = ["derive", "rc"] }
sn_protocol = { path = "../sn_protocol", version = "0.16.1" }
sn_transfers = { path = "../sn_transfers", version = "0.17.1" }
sn_registers = { path = "../sn_registers", version = "0.3.12" }
sysinfo = { version = "0.29.0", default-features = false, optional = true }
sysinfo = { version = "0.30.8", default-features = false, optional = true }
thiserror = "1.0.23"
tiny-keccak = { version = "~2.0.2", features = ["sha3"] }
tokio = { version = "1.32.0", features = [
Expand All @@ -66,7 +66,7 @@ tracing = { version = "~0.1.26" }
xor_name = "5.0.0"
backoff = { version = "0.4.0", features = ["tokio"] }
aes-gcm-siv = "0.11.1"
walkdir = "~2.4.0"
walkdir = "~2.5.0"
strum = { version = "0.26.2", features = ["derive"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion sn_networking/src/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use crate::target_arch::sleep;
use libp2p::metrics::{Metrics as Libp2pMetrics, Recorder};
use prometheus_client::{metrics::gauge::Gauge, registry::Registry};
use sysinfo::{Pid, PidExt, ProcessExt, ProcessRefreshKind, System, SystemExt};
use sysinfo::{Pid, ProcessRefreshKind, System};
use tokio::time::Duration;

const UPDATE_INTERVAL: Duration = Duration::from_secs(15);
Expand Down
12 changes: 6 additions & 6 deletions sn_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ bytes = { version = "1.0.1", features = ["serde"] }
clap = { version = "4.2.1", features = ["derive"] }
crdts = { version = "7.3", default-features = false, features = ["merkle"] }
chrono = "~0.4.19"
custom_debug = "~0.5.0"
custom_debug = "~0.6.1"
dirs-next = "~2.0.0"
eyre = "0.6.8"
file-rotate = "0.7.3"
futures = "~0.3.13"
hex = "~0.4.3"
itertools = "~0.11.0"
itertools = "~0.12.1"
lazy_static = "~1.4.0"
libp2p = { version = "0.53", features = ["tokio", "dns", "kad", "macros"] }
prometheus-client = { version = "0.22", optional = true }
Expand Down Expand Up @@ -73,15 +73,15 @@ tracing = { version = "~0.1.26" }
tracing-appender = "~0.2.0"
tracing-opentelemetry = { version = "0.21", optional = true }
tracing-subscriber = { version = "0.3.16" }
walkdir = "~2.4.0"
walkdir = "~2.5.0"
xor_name = "5.0.0"
strum = { version = "0.25.0", features = ["derive"] }
strum = { version = "0.26.2", features = ["derive"] }
color-eyre = "0.6.2"

[dev-dependencies]
assert_matches = "1.5.0"
reqwest = { version = "0.11.18", default-features = false, features = [
"rustls",
reqwest = { version = "0.12.2", default-features = false, features = [
"rustls-tls-manual-roots",
] }
serde_json = "1.0"
sn_protocol = { path = "../sn_protocol", version = "0.16.1", features = [
Expand Down
8 changes: 4 additions & 4 deletions sn_node_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ sn_protocol = { path = "../sn_protocol", version = "0.16.1" }
sn_service_management = { path = "../sn_service_management", version = "0.2.1" }
sn-releases = "0.2.0"
sn_transfers = { path = "../sn_transfers", version = "0.17.1" }
sysinfo = "0.29.10"
sysinfo = "0.30.8"
tokio = { version = "1.26", features = ["full"] }
tracing = { version = "~0.1.26" }
# watch out updating this, protoc compiler needs to be installed on all build systems
Expand All @@ -64,9 +64,9 @@ assert_cmd = "2.0.12"
assert_fs = "1.0.13"
assert_matches = "1.5.0"
async-trait = "0.1"
mockall = "0.11.3"
reqwest = { version = "0.11", default-features = false, features = [
mockall = "0.12.1"
reqwest = { version = "0.12", default-features = false, features = [
"json",
"rustls-tls",
] }
predicates = "2.0"
predicates = "3.1.0"
2 changes: 1 addition & 1 deletion sn_node_manager/src/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use std::{
process::{Command, Stdio},
str::FromStr,
};
use sysinfo::{Pid, ProcessExt, System, SystemExt};
use sysinfo::{Pid, System};

#[cfg_attr(test, automock)]
pub trait Launcher {
Expand Down
2 changes: 1 addition & 1 deletion sn_peers_acquisition/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ clap = { version = "4.2.1", features = ["derive", "env"] }
lazy_static = "~1.4.0"
libp2p = { version="0.53", features = [] }
rand = "0.8.5"
reqwest = { version="0.11.18", default-features=false, features = ["rustls-tls"], optional = true }
reqwest = { version="0.12.2", default-features=false, features = ["rustls-tls"], optional = true }
sn_protocol = { path = "../sn_protocol", version = "0.16.1" }
thiserror = "1.0.23"
tokio = { version = "1.32.0", optional = true, default-features = false}
Expand Down
2 changes: 1 addition & 1 deletion sn_protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bls = { package = "blsttc", version = "8.0.1" }
bytes = { version = "1.0.1", features = ["serde"] }
color-eyre = "0.6.2"
crdts = { version = "7.3", default-features = false, features = ["merkle"] }
custom_debug = "~0.5.0"
custom_debug = "~0.6.1"
dirs-next = "~2.0.0"
hex = "~0.4.3"
lazy_static = "~1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion sn_service_management/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde_json = "1.0"
semver = "1.0.20"
service-manager = "0.6.0"
sn_protocol = { path = "../sn_protocol", version = "0.16.1", features = ["rpc"] }
sysinfo = "0.29.10"
sysinfo = "0.30.8"
thiserror = "1.0.23"
tokio = { version = "1.32.0", features = ["time"] }
tonic = { version = "0.6.2" }
Expand Down
2 changes: 1 addition & 1 deletion sn_service_management/src/control.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use service_manager::{
ServiceUninstallCtx,
};
use std::net::{SocketAddr, TcpListener};
use sysinfo::{Pid, ProcessExt, System, SystemExt};
use sysinfo::{Pid, System};

/// A thin wrapper around the `service_manager::ServiceManager`, which makes our own testing
/// easier.
Expand Down
8 changes: 4 additions & 4 deletions sn_transfers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version = "0.17.1"

[dependencies]
bls = { package = "blsttc", version = "8.0.1" }
custom_debug = "~0.5.0"
custom_debug = "~0.6.1"
dirs-next = "~2.0.0"
hex = "~0.4.3"
lazy_static = "~1.4.0"
Expand All @@ -24,13 +24,13 @@ serde_json = "1.0.108"
thiserror = "1.0.24"
tiny-keccak = { version = "~2.0.2", features = [ "sha3" ] }
tracing = { version = "~0.1.26" }
walkdir = "~2.4.0"
walkdir = "~2.5.0"
xor_name = "5.0.0"
rayon = "1.8.0"

[dev-dependencies]
tokio = { version = "1.32.0", features = ["macros", "rt"] }
criterion = "0.4.0"
criterion = "0.5.1"
assert_fs = "1.0.0"
eyre = "0.6.8"

Expand All @@ -39,7 +39,7 @@ eyre = "0.6.8"
fs2 = "0.4.3"

[target."cfg(unix)".dev-dependencies.pprof]
version = "0.11.0"
version = "0.13.0"
features = [ "flamegraph" ]

[[bench]]
Expand Down

0 comments on commit 06fc983

Please sign in to comment.