Merge pull request #2428 from subspace/upgrade-dependencies

Upgrade dependencies

Cargo.toml

@@ -90,6 +90,8 @@ inherits = "release"
 lto = "fat"
 
 [patch.crates-io]
+# TODO: Switch to release once v1.0.0-alpha.2 or newer is out
+hwlocality = { git = "https://github.com/HadrienG2/hwlocality", rev = "0f248573bcad584960fe20293c826203a265b833" }
 # TODO: Switch to stable release once https://github.com/paritytech/substrate-bip39/pull/20 is published
 substrate-bip39 = { git = "https://github.com/paritytech/substrate-bip39", rev = "03f02a7225d9bc5add92b7657790ee1ac8ab90a4" }
 

crates/pallet-subspace/Cargo.toml

@@ -31,7 +31,7 @@ subspace-runtime-primitives = { version = "0.1.0", default-features = false, pat
 subspace-verification = { version = "0.1.0", path = "../subspace-verification", default-features = false }
 
 [dev-dependencies]
-env_logger = "0.10.0"
+env_logger = "0.10.2"
 futures = "0.3.29"
 pallet-balances = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 pallet-offences-subspace = { version = "0.1.0", path = "../pallet-offences-subspace" }

crates/sc-consensus-subspace-rpc/Cargo.toml

@@ -13,12 +13,12 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-oneshot = "0.5.0"
+async-oneshot = "0.5.9"
 futures = "0.3.29"
 futures-timer = "3.0.2"
 jsonrpsee = { version = "0.16.3", features = ["server", "macros"] }
-lru = "0.11.0"
-parity-scale-codec = "3.6.5"
+lru = "0.12.1"
+parity-scale-codec = "3.6.9"
 parking_lot = "0.12.1"
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-consensus-subspace = { version = "0.1.0", path = "../sc-consensus-subspace" }
@@ -36,4 +36,4 @@ subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primiti
 subspace-farmer-components = { version = "0.1.0", path = "../subspace-farmer-components" }
 subspace-networking = { version = "0.1.0", path = "../subspace-networking" }
 subspace-rpc-primitives = { version = "0.1.0", path = "../subspace-rpc-primitives" }
-tracing = "0.1.37"
+tracing = "0.1.40"

crates/sc-consensus-subspace/Cargo.toml

@@ -13,14 +13,14 @@ documentation = "https://docs.rs/sc-consensus-subspace"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1.73"
+async-trait = "0.1.77"
 codec = { package = "parity-scale-codec", version = "3.6.5", features = ["derive"] }
 futures = "0.3.29"
-lru = "0.11.0"
+lru = "0.12.1"
 parking_lot = "0.12.1"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
-rayon = "1.8.0"
+rayon = "1.8.1"
 schnorrkel = "0.11.4"
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
@@ -43,9 +43,9 @@ subspace-archiving = { version = "0.1.0", path = "../subspace-archiving" }
 subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" }
 subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space" }
 subspace-verification = { version = "0.1.0", path = "../subspace-verification" }
-thiserror = "1.0.48"
-tokio = { version = "1.34.0", features = ["sync"] }
-tracing = "0.1.37"
+thiserror = "1.0.56"
+tokio = { version = "1.35.1", features = ["sync"] }
+tracing = "0.1.40"
 
 [dev-dependencies]
 # TODO: Restore in the future, currently tests are mostly broken and useless

crates/sc-proof-of-time/Cargo.toml

@@ -15,8 +15,8 @@ atomic = "0.5.3"
 core_affinity = "0.8.1"
 derive_more = "0.99.17"
 futures = "0.3.29"
-lru = "0.11.0"
-parity-scale-codec = { version = "3.6.1", features = ["derive"] }
+lru = "0.12.1"
+parity-scale-codec = { version = "3.6.9", features = ["derive"] }
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
@@ -31,5 +31,5 @@ sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-s
 subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" }
 subspace-proof-of-time = { version = "0.1.0", path = "../subspace-proof-of-time" }
 parking_lot = "0.12.1"
-rayon = "1.8.0"
-tracing = "0.1.37"
+rayon = "1.8.1"
+tracing = "0.1.40"

crates/sc-subspace-block-relay/Cargo.toml

@@ -12,7 +12,7 @@ include = [
 
 [dependencies]
 async-channel = "1.9.0"
-async-trait = "0.1.73"
+async-trait = "0.1.77"
 codec = { package = "parity-scale-codec", version = "3.6.5", default-features = false, features = ["derive"] }
 derive_more = "0.99.17"
 futures = "0.3.29"
@@ -25,8 +25,8 @@ sp-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sd
 sp-consensus-subspace = { version = "0.1.0", path = "../sp-consensus-subspace" }
 sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
-strum_macros = "0.25.2"
+strum_macros = "0.25.3"
 substrate-prometheus-endpoint = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
-thiserror = "1.0.48"
-tracing = "0.1.37"
+thiserror = "1.0.56"
+tracing = "0.1.40"
 

crates/sp-consensus-subspace/Cargo.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = { version = "0.1.73", optional = true }
+async-trait = { version = "0.1.77", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.5", default-features = false }
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
@@ -32,7 +32,7 @@ sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/polka
 subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false }
 subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space", default-features = false }
 subspace-verification = { version = "0.1.0", path = "../subspace-verification", default-features = false }
-thiserror = { version = "1.0.48", optional = true }
+thiserror = { version = "1.0.56", optional = true }
 
 [features]
 default = ["std"]

crates/sp-domains-fraud-proof/Cargo.toml

@@ -35,7 +35,7 @@ sp-trie = { version = "22.0.0", default-features = false, git = "https://github.
 subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" }
 subspace-runtime-primitives = { version = "0.1.0", default-features = false, path = "../subspace-runtime-primitives" }
 trie-db = { version = "0.28.0", default-features = false }
-thiserror = { version = "1.0.48", optional = true }
+thiserror = { version = "1.0.56", optional = true }
 
 [dev-dependencies]
 domain-block-builder = { version = "0.1.0", path = "../../domains/client/block-builder" }
@@ -60,8 +60,8 @@ subspace-test-client = { version = "0.1.0", path = "../../test/subspace-test-cli
 subspace-test-service = { version = "0.1.0", path = "../../test/subspace-test-service" }
 subspace-runtime-primitives = { version = "0.1.0", path = "../../crates/subspace-runtime-primitives" }
 substrate-test-runtime-client = { version = "2.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
-tempfile = "3.8.0"
-tokio = "1.34.0"
+tempfile = "3.9.0"
+tokio = "1.35.1"
 
 [features]
 default = ["std"]

crates/sp-domains/Cargo.toml

@@ -18,10 +18,10 @@ frame-support = { version = "4.0.0-dev", default-features = false, git = "https:
 hash-db = { version = "0.16.0", default-features = false }
 memory-db = { version = "0.32.0", default-features = false }
 hexlit = "0.5.5"
-parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] }
+parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive"] }
 rand = { version = "0.8.5", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
-rs_merkle = { version = "1.4.1", default-features = false }
+rs_merkle = { version = "1.4.2", default-features = false }
 scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.195", default-features = false, features = ["alloc", "derive"] }
 sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }

crates/subspace-archiving/Cargo.toml

@@ -17,12 +17,12 @@ include = [
 bench = false
 
 [dependencies]
-parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] }
-rayon = { version = "1.8.0", optional = true }
+parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive"] }
+rayon = { version = "1.8.1", optional = true }
 serde = { version = "1.0.195", optional = true, features = ["derive"] }
 subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false }
 subspace-erasure-coding = { version = "0.1.0", path = "../subspace-erasure-coding", default-features = false }
-thiserror = { version = "1.0.48", optional = true }
+thiserror = { version = "1.0.56", optional = true }
 
 [dev-dependencies]
 criterion = "0.5.1"

crates/subspace-core-primitives/Cargo.toml

@@ -16,22 +16,22 @@ include = [
 bench = false
 
 [dependencies]
-blake3 = { version = "1.4.1", default-features = false }
+blake3 = { version = "1.5.0", default-features = false }
 derive_more = "0.99.17"
 hex = { version  = "0.4.3", default-features = false, features = ["alloc"] }
 kzg = { git = "https://github.com/sifraitech/rust-kzg", rev = "c34b73916af9b8a699a74bd0186f82f25e72861c", default-features = false }
 num-traits = { version = "0.2.17", default-features = false }
-parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive", "max-encoded-len"] }
+parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive", "max-encoded-len"] }
 parking_lot = { version = "0.12.1", optional = true }
-rayon = { version = "1.8.0", optional = true }
+rayon = { version = "1.8.1", optional = true }
 rust-kzg-blst = { git = "https://github.com/sifraitech/rust-kzg", rev = "c34b73916af9b8a699a74bd0186f82f25e72861c", default-features = false }
 scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.195", optional = true, features = ["alloc", "derive"] }
 serde_arrays = { version = "0.1.0", optional = true }
 # Replacement for `parking_lot` in `no_std` environment
 spin = "0.9.7"
 static_assertions = "1.1.0"
-tracing = { version = "0.1.37", default-features = false }
+tracing = { version = "0.1.40", default-features = false }
 uint = { version = "0.9.5", default-features = false }
 
 [dev-dependencies]

crates/subspace-farmer-components/Cargo.toml

@@ -16,17 +16,17 @@ include = [
 bench = false
 
 [dependencies]
-async-lock = "2.8.0"
-async-trait = "0.1.73"
+async-lock = "3.3.0"
+async-trait = "0.1.77"
 backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 bitvec = "1.0.1"
 fs2 = "0.4.3"
 futures = "0.3.29"
 hex = "0.4.3"
-libc = "0.2.146"
-parity-scale-codec = "3.6.5"
+libc = "0.2.152"
+parity-scale-codec = "3.6.9"
 rand = "0.8.5"
-rayon = "1.8.0"
+rayon = "1.8.1"
 schnorrkel = "0.11.4"
 serde = { version = "1.0.195", features = ["derive"] }
 static_assertions = "1.1.0"
@@ -35,9 +35,9 @@ subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primiti
 subspace-erasure-coding = { version = "0.1.0", path = "../subspace-erasure-coding" }
 subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space", features = ["parallel"] }
 subspace-verification = { version = "0.1.0", path = "../subspace-verification" }
-thiserror = "1.0.48"
-tokio = { version = "1.34.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "sync"] }
-tracing = "0.1.37"
+thiserror = "1.0.56"
+tokio = { version = "1.35.1", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "sync"] }
+tracing = "0.1.40"
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.9"

crates/subspace-farmer/Cargo.toml

@@ -12,15 +12,15 @@ include = [
 ]
 
 [dependencies]
-anyhow = "1.0.75"
-async-lock = "2.8.0"
-async-trait = "0.1.73"
+anyhow = "1.0.79"
+async-lock = "3.3.0"
+async-trait = "0.1.77"
 atomic = "0.5.3"
 base58 = "0.2.0"
 blake2 = "0.10.6"
-blake3 = { version = "1.4.1", default-features = false }
+blake3 = { version = "1.5.0", default-features = false }
 bytesize = "1.3.0"
-clap = { version = "4.4.3", features = ["color", "derive"] }
+clap = { version = "4.4.18", features = ["color", "derive"] }
 criterion = { version = "0.5.1", default-features = false, features = ["rayon", "async"] }
 derive_more = "0.99.17"
 event-listener-primitives = "2.0.1"
@@ -30,20 +30,20 @@ futures = "0.3.29"
 hex = { version = "0.4.3", features = ["serde"] }
 hwlocality = { version = "1.0.0-alpha.1", features = ["vendored"], optional = true }
 jsonrpsee = { version = "0.16.3", features = ["client"] }
-lru = "0.11.0"
+lru = "0.12.1"
 mimalloc = "0.1.39"
 libmimalloc-sys = { version = "0.1.35", features = ["extended"] }
 num_cpus = "1.16.0"
-parity-scale-codec = "3.6.5"
+parity-scale-codec = "3.6.9"
 parking_lot = "0.12.1"
 prometheus-client = "0.22.0"
 rand = "0.8.5"
-rayon = "1.8.0"
+rayon = "1.8.1"
 schnorrkel = "0.11.4"
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 static_assertions = "1.1.0"
-ss58-registry = "1.43.0"
+ss58-registry = "1.45.0"
 subspace-archiving = { version = "0.1.0", path = "../subspace-archiving" }
 subspace-erasure-coding = { version = "0.1.0", path = "../subspace-erasure-coding" }
 subspace-farmer-components = { version = "0.1.0", path = "../subspace-farmer-components" }
@@ -53,20 +53,14 @@ subspace-networking = { version = "0.1.0", path = "../subspace-networking" }
 subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space" }
 subspace-rpc-primitives = { version = "0.1.0", path = "../subspace-rpc-primitives" }
 substrate-bip39 = "0.4.5"
-supports-color = "2.0.0"
-tempfile = "3.8.0"
-thiserror = "1.0.48"
-tokio = { version = "1.34.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal"] }
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+supports-color = "2.1.0"
+tempfile = "3.9.0"
+thiserror = "1.0.56"
+tokio = { version = "1.35.1", features = ["macros", "parking_lot", "rt-multi-thread", "signal"] }
+tracing = "0.1.40"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 ulid = { version = "1.0.0", features = ["serde"] }
-zeroize = "1.6.0"
-
-[target.'cfg(not(windows))'.dependencies]
-libc = "0.2.146"
-
-[target.'cfg(windows)'.dependencies]
-windows-sys = "0.52.0"
+zeroize = "1.7.0"
 
 [features]
 default = ["numa"]

crates/subspace-farmer/src/utils.rs

@@ -167,13 +167,9 @@ impl CpuCoreSet {
         if let Some(topology) = &self.topology {
             use hwlocality::cpu::binding::CpuBindingFlags;
             use hwlocality::cpu::cpuset::CpuSet;
+            use hwlocality::current_thread_id;
             use hwlocality::ffi::PositiveInt;
 
-            #[cfg(not(windows))]
-            let thread_id = unsafe { libc::pthread_self() };
-            #[cfg(windows)]
-            let thread_id = unsafe { windows_sys::Win32::System::Threading::GetCurrentThread() };
-
             // load the cpuset for the given core index.
             let cpu_cores = CpuSet::from_iter(
                 self.cores
@@ -182,7 +178,7 @@ impl CpuCoreSet {
             );
 
             if let Err(error) =
-                topology.bind_thread_cpu(thread_id, &cpu_cores, CpuBindingFlags::empty())
+                topology.bind_thread_cpu(current_thread_id(), &cpu_cores, CpuBindingFlags::empty())
             {
                 warn!(%error, ?cpu_cores, "Failed to pin thread to CPU cores")
             }

crates/subspace-malicious-operator/Cargo.toml

@@ -19,7 +19,7 @@ include = [
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-clap = { version = "4.4.3", features = ["derive"] }
+clap = { version = "4.4.18", features = ["derive"] }
 cross-domain-message-gossip = { version = "0.1.0", path = "../../domains/client/cross-domain-message-gossip" }
 domain-client-message-relayer = { version = "0.1.0", path = "../../domains/client/relayer" }
 domain-client-operator = { version = "0.1.0", path = "../../domains/client/domain-operator" }
@@ -36,7 +36,7 @@ log = "0.4.20"
 mimalloc = "0.1.39"
 pallet-domains = { version = "0.1.0", default-features = false, path = "../pallet-domains" }
 pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
-parity-scale-codec = "3.6.5"
+parity-scale-codec = "3.6.9"
 pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
 sc-cli = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false }
@@ -71,10 +71,10 @@ subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-spac
 subspace-runtime = { version = "0.1.0", path = "../subspace-runtime" }
 subspace-runtime-primitives = { version = "0.1.0", path = "../subspace-runtime-primitives" }
 subspace-service = { version = "0.1.0", path = "../subspace-service" }
-thiserror = "1.0.48"
-tokio = "1.34.0"
+thiserror = "1.0.56"
+tokio = "1.35.1"
 rand = "0.8.5"
-tracing = "0.1.37"
+tracing = "0.1.40"
 
 [build-dependencies]
 substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }