Merge pull request #3939 from autonomys/update-depedencies

Update depedencies

Author: vedhavyas

Cargo.lock

@@ -33,7 +33,7 @@ ab-blake3 = "0.2.0"
 ab-chacha8 = "0.1.1"
 ab-proof-of-space = { path = "shared/ab-proof-of-space", default-features = false }
 ab-proof-of-space-gpu = { path = "shared/ab-proof-of-space-gpu", default-features = false }
-actix-web = { version = "4.15.0", default-features = false }
+actix-web = { version = "4.17.0", default-features = false }
 aes = "0.9.3"
 anyhow = "1.0.104"
 array-reshape = { version = "0.1.1", features = ["const-trait"] }
@@ -54,8 +54,8 @@ blake3 = { version = "1.8.7", default-features = false }
 blst = "0.3.17"
 bytes = { version = "1.12.1", default-features = false }
 bytesize = "2.7.0"
-cargo-gpu-install = "0.10.0"
-cc = "1.5.1"
+cargo-gpu-install = "0.11.0"
+cc = "1.9.0"
 chacha20 = { version = "0.10.2", default-features = false }
 clap = "4.6.7"
 console = "0.16.6"
@@ -112,7 +112,7 @@ hex-literal = "1.1.0"
 hwlocality = "1.0.0-alpha.13"
 jsonrpsee = "0.24.11"
 kzg = { git = "https://github.com/grandinetech/rust-kzg", rev = "8f5f1a0f73b3c529c77cb880ff8d265830c7d7ac", default-features = false }
-libc = "0.2.190"
+libc = "0.2.191"
 libp2p = { version = "0.57.0", git = "https://github.com/autonomys/rust-libp2p", rev = "5914c8763c6073b31208ca343a4da779c90e481f", default-features = false }
 libp2p-swarm-test = { version = "0.7.0", git = "https://github.com/autonomys/rust-libp2p", rev = "5914c8763c6073b31208ca343a4da779c90e481f" }
 libsecp256k1 = "0.7.2"
@@ -163,7 +163,7 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/autonom
 pallet-transporter = { version = "0.1.0", path = "domains/pallets/transporter", default-features = false }
 pallet-utility = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11df00351b12feaadfec60457a5f8888", default-features = false }
 parity-scale-codec = { version = "3.7.5", default-features = false }
-parking_lot = "0.12.5"
+parking_lot = "0.13.0"
 pem = "4.0.0"
 pin-project = "1.1.13"
 precompile-utils = { version = "0.1.0", git = "https://github.com/polkadot-evm/frontier", rev = "9d49e36ed5bac38241594f8ba055fdb94991483a", default-features = false }
@@ -174,7 +174,6 @@ rand = { version = "0.10.3", default-features = false }
 rand_chacha = { version = "0.10.0", default-features = false }
 rand_core = "0.10.1"
 rayon = "1.12.0"
-rclite = "0.4.1"
 reqwest = { version = "0.13.5", default-features = false }
 ring = "0.17.14"
 rlp = "0.6.1"
@@ -222,8 +221,8 @@ schnorrkel = { version = "0.11.5", default-features = false }
 seq-macro = "0.3.6"
 serde = { version = "1.0.229", default-features = false }
 serde-big-array = "0.5.1"
-serde_json = "1.0.151"
-sha2 = { version = "0.11.0", default-features = false }
+serde_json = "1.0.154"
+sha2 = { version = "0.11.1", default-features = false }
 sp-api = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11df00351b12feaadfec60457a5f8888", default-features = false }
 sp-application-crypto = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11df00351b12feaadfec60457a5f8888", default-features = false }
 sp-arithmetic = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11df00351b12feaadfec60457a5f8888", default-features = false }
@@ -267,7 +266,7 @@ sp-trie = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11
 sp-version = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11df00351b12feaadfec60457a5f8888", default-features = false }
 sp-weights = { git = "https://github.com/autonomys/polkadot-sdk", rev = "1c50901c11df00351b12feaadfec60457a5f8888", default-features = false }
 spin = "0.12.3"
-spirv-std = "0.10.0"
+spirv-std-nightly = "0.11.1"
 ss58-registry = "1.51.0"
 static_assertions = "1.1.0"
 strum_macros = "0.28.0"
@@ -303,20 +302,21 @@ supports-color = "3.0.2"
 tempfile = "3.27.0"
 thiserror = { version = "2.0.21", default-features = false }
 thread-priority = "3.1.1"
-tokio = "1.53.1"
+tokio = "1.54.1"
 tokio-stream = "0.1.19"
 tracing = { version = "0.1.44", default-features = false }
 tracing-subscriber = "0.3.23"
 transparent-wrapper = { version = "0.1.0", features = ["const-trait"] }
 transporter-precompile = { version = "0.1.0", path = "domains/evm-precompiles/transporter", default-features = false }
 trie-db = { version = "0.31.0", default-features = false }
+triomphe = { version = "0.1.17", default-features = false }
 uint = { version = "0.10.2", default-features = false }
 ulid = "3.0.0"
 unsigned-varint = "0.8.0"
 void = "1.0.2"
 wgpu = { version = "30.0.1", default-features = false, features = ["metal", "parking_lot", "spirv", "std", "vulkan"] }
 x509-parser = "0.18.1"
-zeroize = "1.9.0"
+zeroize = "1.9.1"
 ziggy = { version = "1.7.3", default-features = false }
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates

Cargo.toml

@@ -17,6 +17,8 @@ use ab_chacha8::{ChaCha8Block, ChaCha8State};
 #[cfg(feature = "alloc")]
 use alloc::boxed::Box;
 #[cfg(feature = "alloc")]
+use alloc::sync::Arc;
+#[cfg(feature = "alloc")]
 use alloc::vec;
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
@@ -39,9 +41,6 @@ use core::sync::atomic::{AtomicUsize, Ordering};
 use derive_more::Deref;
 #[cfg(any(feature = "alloc", test))]
 use seq_macro::seq;
-// TODO: Switch to `rclite` once https://github.com/fereidani/rclite/issues/11 is resolved
-#[cfg(feature = "alloc")]
-use alloc::sync::Arc;
 use subspace_core_primitives::hashes::blake3_hash;
 
 #[cfg(any(feature = "alloc", test))]

crates/subspace-proof-of-space/src/chiapos/table.rs

@@ -20,14 +20,14 @@ all-features = true
 ab-blake3 = { workspace = true }
 ab-chacha8 = { workspace = true }
 derive_more = { workspace = true, features = ["from", "into"] }
-spirv-std = { workspace = true }
+spirv-std-nightly = { workspace = true }
 
 [target.'cfg(not(target_arch = "spirv"))'.dependencies]
 subspace-core-primitives = { workspace = true }
 futures = { workspace = true, features = ["std"] }
 parking_lot = { workspace = true }
-rclite = { workspace = true }
 thiserror = { workspace = true }
+triomphe = { workspace = true, features = ["std"] }
 wgpu = { workspace = true }
 
 [dev-dependencies]

shared/ab-proof-of-space-gpu/Cargo.toml

@@ -69,6 +69,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .forward_rustc_warnings
         .replace(true);
 
+    // Emitting any `rerun-if-*` disables Cargo's default of rerunning on any package file change,
+    // and in Clippy mode `spirv-builder` doesn't emit dependency info for sources
+    println!("cargo::rerun-if-changed=src");
+    println!("cargo::rerun-if-changed=Cargo.toml");
     println!("cargo::rerun-if-env-changed=CLIPPY_ARGS");
     let path_to_spv = if env::var("CLIPPY_ARGS").is_ok() {
         match spirv_builder.clippy() {

shared/ab-proof-of-space-gpu/build.rs

@@ -10,10 +10,10 @@ use ab_chacha8::{ChaCha8Block, ChaCha8State, block_to_bytes};
 use futures::stream::FuturesOrdered;
 use futures::{StreamExt, TryStreamExt};
 use parking_lot::Mutex;
-use rclite::Arc;
 use std::num::NonZeroU8;
 use std::{fmt, iter};
 use subspace_core_primitives::pos::PosSeed;
+use triomphe::Arc;
 use wgpu::{
     AdapterInfo, Backend, BackendOptions, Backends, BindGroup, BindGroupDescriptor, BindGroupEntry,
     BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingType, Buffer, BufferAddress,

shared/ab-proof-of-space-gpu/src/host.rs

@@ -10,6 +10,7 @@
     generic_const_args,
     generic_const_items,
     min_generic_const_args,
+    mut_restriction,
     step_trait
 )]
 #![expect(incomplete_features, reason = "generic_const_*")]

shared/ab-proof-of-space-gpu/src/lib.rs

@@ -9,10 +9,10 @@ use crate::shader::polyfills::ArrayIndexingPolyfill;
 use crate::shader::types::{Position, PositionExt, PositionR, X, Y};
 use ab_chacha8::{ChaCha8Block, ChaCha8State};
 use core::mem::MaybeUninit;
-use spirv_std::arch::atomic_i_increment;
-use spirv_std::glam::{UVec3, UVec4};
-use spirv_std::memory::{Scope, Semantics};
-use spirv_std::spirv;
+use spirv_std_nightly::arch::atomic_i_increment;
+use spirv_std_nightly::glam::{UVec3, UVec4};
+use spirv_std_nightly::memory::{Scope, Semantics};
+use spirv_std_nightly::spirv;
 
 const fn gcd(mut a: u32, mut b: u32) -> u32 {
     while b != 0 {
@@ -185,11 +185,7 @@ pub unsafe fn compute_f1(
         // SAFETY: TODO: Probably should not be unsafe to begin with:
         //  https://github.com/Rust-GPU/rust-gpu/pull/394#issuecomment-3316594485
         let bucket_offset = unsafe {
-            atomic_i_increment::<
-                _,
-                const { Scope::QueueFamily as u32 },
-                const { Semantics::NONE.bits() },
-            >(bucket_size)
+            atomic_i_increment::<_, { Scope::QueueFamily }, const { Semantics::NONE }>(bucket_size)
         };
 
         // SAFETY: Bucket is obtained using division by `PARAM_BC` and fits by definition. Bucket

shared/ab-proof-of-space-gpu/src/shader/compute_f1.rs

@@ -14,10 +14,10 @@ use crate::shader::polyfills::ArrayIndexingPolyfill;
 use crate::shader::types::{Match, Metadata, Position, PositionExt, PositionR, Y};
 use core::fmt;
 use core::mem::MaybeUninit;
-use spirv_std::arch::{atomic_i_increment, workgroup_memory_barrier_with_group_sync};
-use spirv_std::glam::UVec3;
-use spirv_std::memory::{Scope, Semantics};
-use spirv_std::spirv;
+use spirv_std_nightly::arch::{atomic_i_increment, workgroup_memory_barrier_with_group_sync};
+use spirv_std_nightly::glam::UVec3;
+use spirv_std_nightly::memory::{Scope, Semantics};
+use spirv_std_nightly::spirv;
 
 // TODO: Same number as hardcoded in `#[spirv(compute(threads(..)))]` below, can be removed once
 //  https://github.com/Rust-GPU/rust-gpu/discussions/287 is resolved
@@ -113,9 +113,7 @@ unsafe fn compute_f2_into_buckets_inner(
     // SAFETY: TODO: Probably should not be unsafe to begin with:
     //  https://github.com/Rust-GPU/rust-gpu/pull/394#issuecomment-3316594485
     let bucket_offset = unsafe {
-        atomic_i_increment::<_, const { Scope::QueueFamily as u32 }, const { Semantics::NONE.bits() }>(
-            bucket_size,
-        )
+        atomic_i_increment::<_, { Scope::QueueFamily }, const { Semantics::NONE }>(bucket_size)
     };
 
     // SAFETY: Bucket is obtained using division by `PARAM_BC` and fits by definition. Bucket

shared/ab-proof-of-space-gpu/src/shader/find_matches_and_compute_f2.rs

@@ -14,10 +14,10 @@ use crate::shader::polyfills::ArrayIndexingPolyfill;
 use crate::shader::types::{Match, Metadata, Position, PositionR, Y};
 use core::fmt;
 use core::mem::MaybeUninit;
-use spirv_std::arch::{atomic_i_increment, workgroup_memory_barrier_with_group_sync};
-use spirv_std::glam::UVec3;
-use spirv_std::memory::{Scope, Semantics};
-use spirv_std::spirv;
+use spirv_std_nightly::arch::{atomic_i_increment, workgroup_memory_barrier_with_group_sync};
+use spirv_std_nightly::glam::UVec3;
+use spirv_std_nightly::memory::{Scope, Semantics};
+use spirv_std_nightly::spirv;
 
 // TODO: Same number as hardcoded in `#[spirv(compute(threads(..)))]` below, can be removed once
 //  https://github.com/Rust-GPU/rust-gpu/discussions/287 is resolved
@@ -144,7 +144,7 @@ unsafe fn compute_f7_into_buckets_inner(
     // TODO: This should have been `&[[Metadata; REDUCED_MATCHES_COUNT]; NUM_MATCH_BUCKETS]`, but
     //  it currently doesn't compile if flattened:
     //  https://github.com/Rust-GPU/rust-gpu/issues/241#issuecomment-3005693043
-    parent_metadatas: &[Metadata; const { REDUCED_MATCHES_COUNT * NUM_MATCH_BUCKETS }],
+    parent_metadatas: &[Metadata; REDUCED_MATCHES_COUNT * NUM_MATCH_BUCKETS],
     table_6_proof_targets_sizes: &mut [u32; NUM_S_BUCKETS],
     table_6_proof_targets: &mut [[MaybeUninit<ProofTargets>; NUM_ELEMENTS_PER_S_BUCKET];
              NUM_S_BUCKETS],
@@ -208,9 +208,7 @@ unsafe fn compute_f7_into_buckets_inner(
     // SAFETY: TODO: Probably should not be unsafe to begin with:
     //  https://github.com/Rust-GPU/rust-gpu/pull/394#issuecomment-3316594485
     let bucket_offset = unsafe {
-        atomic_i_increment::<_, const { Scope::QueueFamily as u32 }, const { Semantics::NONE.bits() }>(
-            bucket_size,
-        )
+        atomic_i_increment::<_, { Scope::QueueFamily }, const { Semantics::NONE }>(bucket_size)
     };
 
     // TODO: Maybe store `absolute_position` separately from more densely populated positions,
@@ -251,7 +249,7 @@ unsafe fn compute_f7_into_buckets(
     // TODO: This should have been `&[[Metadata; REDUCED_MATCHES_COUNT]; NUM_MATCH_BUCKETS]`, but
     //  it currently doesn't compile if flattened:
     //  https://github.com/Rust-GPU/rust-gpu/issues/241#issuecomment-3005693043
-    parent_metadatas: &[Metadata; const { REDUCED_MATCHES_COUNT * NUM_MATCH_BUCKETS }],
+    parent_metadatas: &[Metadata; REDUCED_MATCHES_COUNT * NUM_MATCH_BUCKETS],
     table_6_proof_targets_sizes: &mut [u32; NUM_S_BUCKETS],
     table_6_proof_targets: &mut [[MaybeUninit<ProofTargets>; NUM_ELEMENTS_PER_S_BUCKET];
              NUM_S_BUCKETS],
@@ -324,10 +322,8 @@ pub unsafe fn find_matches_and_compute_f7(
     #[spirv(workgroup_id)] workgroup_id: UVec3,
     #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] parent_buckets: &[[PositionR; MAX_BUCKET_SIZE];
          NUM_BUCKETS],
-    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] parent_metadatas: &[Metadata;
-         const {
-             REDUCED_MATCHES_COUNT * NUM_MATCH_BUCKETS
-         }],
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)]
+    parent_metadatas: &[Metadata; REDUCED_MATCHES_COUNT * NUM_MATCH_BUCKETS],
     #[spirv(storage_buffer, descriptor_set = 0, binding = 2)]
     table_6_proof_targets_sizes: &mut [u32; NUM_S_BUCKETS],
     #[spirv(storage_buffer, descriptor_set = 0, binding = 3)]