Slasher

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.3.6"
+version = "0.3.8"
 edition = "2024"
 authors = ["Broxus Team"]
 rust-version = "1.91.0"
@@ -16,15 +16,16 @@ members = [
     "control",
     "core",
     "gen-protos",
-    "light-node",
     "network",
     "rpc",
     "simulator",
-    "storage",
+    "slasher-traits",
+    "slasher",
     "storage-traits",
+    "storage",
     "tycho-build-info",
-    "util",
     "util-proc",
+    "util",
     "wu-tuner",
     "rpc-subscriptions",
 ]
@@ -41,51 +42,51 @@ backon = "1.5.1"
 base64 = "0.22.0"
 bitflags = "2.6"
 blake3 = "1.5.3"
-bumpalo = "3.14.0"
+bumpalo = "3.20.2"
 bumpalo-herd = "0.1.2"
 bytes = "1.9.0"
 bytesize = { version = "1.3.0", features = ["serde"] }
 cassadilia = { version = "0.4.7" }
 castaway = "0.2"
-clap = { version = "4.5.3", features = ["derive"] }
+clap = { version = "4.6.0", features = ["derive"] }
 clap-markdown = "0.1.4"
 crc32c = "0.6"
-criterion = "0.7.0"
+criterion = "0.8.0"
 crossbeam-deque = "0.8.6"
 crossbeam-queue = "0.3.12"
 dashmap = "6.1.0"
 dirs = "6.0.0"
-ed25519 = "2.0"
-ed25519-dalek = "2.1"
+ed25519 = "2.2.3"
+ed25519-dalek = "2.2.0"
 exponential-backoff = "1.2.1"
 fdlimit = "0.3.0"
 futures-executor = "0.3"
 futures-util = "0.3"
 governor = { version = "0.9", default-features = false, features = ["std", "quanta"] }
-getip = "0.2.0"
+getip = "0.2.1"
 hdrhistogram = "7.5.4"
 hex = "0.4"
 http-body-util = "0.1.3"
 humantime = "2"
-indexmap = "2.2"
+indexmap = "2.13"
 itertools = "0.14"
 libc = "0.2"
 metrics = "0.24"
-metrics-exporter-prometheus = "0.17"
+metrics-exporter-prometheus = "0.18"
 moka = { version = "0.12", features = ["sync"] }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
-parking_lot = { version = "0.12.1" }
-parking_lot_core = "0.9.9"
+parking_lot = { version = "0.12.5" }
+parking_lot_core = "0.9.12"
 pin-project-lite = "0.2"
 pkcs8 = "0.10"
 proc-macro2 = "1.0"
-prost = "0.14.1"
-prost-build = "0.14.1"
-quick_cache = "0.6.0"
+prost = "0.14.3"
+prost-build = "0.14.3"
+quick_cache = "0.6.21"
 quinn = { version = "0.11.9", default-features = false, features = ["runtime-tokio", "rustls"] }
 quote = "1.0"
-object_store = "0.12"
+object_store = "0.13"
 rand = "0.9"
 rand_distr = "0.5"
 rand_pcg = { version = "0.9" }
@@ -94,20 +95,20 @@ reqwest = { version = "0.12", default-features = false }
 ring = "0.17.14"
 rlimit = "0.10.1"
 rustc_version = "0.4"
-rustls = "0.23.28"
-rustls-pki-types = "1.12"
-rustls-webpki = "0.103.3"
+rustls = "0.23.37"
+rustls-pki-types = "1.14"
+rustls-webpki = "0.103.10"
 similar-asserts = "1.7.0" # looks better than pretty_assertions(compresses output)
-scc = "2.3.3"
+scc = "2.4.0"
 scopeguard = "1.2"
 serde = "1.0"
 serde_json = "1.0.114"
 serde_path_to_error = "0.1"
-sha2 = "0.10.8"
-smallvec = "1.13.1"
-socket2 = "0.6.0"
+sha2 = "0.10.9"
+smallvec = "1.15.1"
+socket2 = "0.6.3"
 syn = "2.0.104"
-sysinfo = "0.37"
+sysinfo = "0.38.4"
 tabled = { version = "0.20.0", default-features = false }
 tarpc = { version = "0.37", features = [
     "tokio1",
@@ -116,54 +117,56 @@ tarpc = { version = "0.37", features = [
     "serde-transport-bincode",
     "unix",
 ] }
-tempfile = "3.10"
+tempfile = "3.27"
 thiserror = "2.0"
-tikv-jemallocator = { version = "0.6.0", features = [
+tikv-jemallocator = { version = "0.6.1", features = [
     "unprefixed_malloc_on_supported_platforms",
     "background_threads",
 ] }
-tikv-jemalloc-ctl = { version = "0.6.0", features = ["stats"] }
-tl-proto = "0.5.1"
+tikv-jemalloc-ctl = { version = "0.6.1", features = ["stats"] }
+tl-proto = "0.5.4"
 tokio = { version = "1", default-features = false }
-tokio-stream = "0.1.15"
-tokio-util = { version = "0.7.10", default-features = false, features = ["codec"] }
+tokio-stream = "0.1.18"
+tokio-util = { version = "0.7.18", default-features = false, features = ["codec"] }
 tower = "0.5"
 tower-http = "0.6"
 tracing = "0.1"
-tracing-appender = "0.2.3"
+tracing-appender = "0.2.4"
 tracing-flame = "0.2"
 tracing-stackdriver = "0.10.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-triomphe = "0.1.11"
+triomphe = "0.1.15"
 tycho-crypto = { version = "0.4", features = ["tl-proto", "serde", "rand9"] }
-tycho-executor = "0.3.2"
-tycho-types = { version = "0.3.2", features = ["tycho", "stats"] }
-tycho-vm = "0.3.2"
-uuid = "1.18.1"
+tycho-executor = "0.3.5"
+tycho-types = { version = "0.3.4", features = ["tycho", "stats"] }
+tycho-vm = "0.3.5"
+uuid = "1.22.0"
 walkdir = "2.5.0"
 weedb = "0.6.0"
 zstd-safe = "7.2"
 zstd-sys = "2.0"
 
 # local deps
-tycho-block-util = { path = "./block-util", version = "0.3.6" }
-tycho-build-info = { path = "./tycho-build-info", version = "0.3.6" }
-tycho-collator = { path = "./collator", version = "0.3.6" }
-tycho-consensus = { path = "./consensus", version = "0.3.6" }
-tycho-control = { path = "./control", version = "0.3.6" }
-tycho-core = { path = "./core", version = "0.3.6" }
-tycho-network = { path = "./network", version = "0.3.6" }
-tycho-rpc-subscriptions = { path = "./rpc-subscriptions", version = "0.3.6" }
-tycho-rpc = { path = "./rpc", version = "0.3.6" }
-tycho-storage = { path = "./storage", version = "0.3.6" }
-tycho-storage-traits = { path = "./storage-traits", version = "0.3.6" }
-tycho-util = { path = "./util", version = "0.3.6" }
-tycho-util-proc = { path = "./util-proc", version = "0.3.6" }
-tycho-wu-tuner = { path = "./wu-tuner", version = "0.3.6" }
+tycho-block-util = { path = "./block-util", version = "0.3.8" }
+tycho-build-info = { path = "./tycho-build-info", version = "0.3.8" }
+tycho-collator = { path = "./collator", version = "0.3.8" }
+tycho-consensus = { path = "./consensus", version = "0.3.8" }
+tycho-control = { path = "./control", version = "0.3.8" }
+tycho-core = { path = "./core", version = "0.3.8" }
+tycho-network = { path = "./network", version = "0.3.8" }
+tycho-rpc-subscriptions = { path = "./rpc-subscriptions", version = "0.3.8" }
+tycho-rpc = { path = "./rpc", version = "0.3.8" }
+tycho-slasher = { path = "./slasher", version = "0.3.8" }
+tycho-slasher-traits = { path = "./slasher-traits", version = "0.3.8" }
+tycho-storage = { path = "./storage", version = "0.3.8" }
+tycho-storage-traits = { path = "./storage-traits", version = "0.3.8" }
+tycho-util = { path = "./util", version = "0.3.8" }
+tycho-util-proc = { path = "./util-proc", version = "0.3.8" }
+tycho-wu-tuner = { path = "./wu-tuner", version = "0.3.8" }
 
 [patch.crates-io]
 # patches here
-tycho-types = { git = "https://github.com/broxus/tycho-types.git", rev = "1a7bfbf2b2cbf336e58314b4c22f0e8b9805d1b8" }
+tycho-types = { git = "https://github.com/broxus/tycho-types.git", rev = "aeea4e8d007e8a64439d3d923a3752fc823b2256" }
 
 [workspace.lints.rust]
 future_incompatible = "warn"
@@ -180,7 +183,7 @@ dbg_macro = "warn"
 debug_assert_with_mut_call = "warn"
 disallowed_methods = "warn"
 doc_markdown = "warn"
-empty_enum = "warn"
+empty_enums = "warn"
 enum_glob_use = "warn"
 exit = "warn"
 expl_impl_clone_on_copy = "warn"

block-util/src/block/block_proof_stuff.rs

@@ -284,7 +284,7 @@ impl BlockProofStuff {
 
         let weight = match signatures
             .signatures
-            .check_signatures(&subset.validators, &checked_data)
+            .check_signatures(subset.validators.iter().map(AsRef::as_ref), &checked_data)
         {
             Ok(weight) => weight,
             Err(e) => anyhow::bail!("proof contains invalid signatures: {e:?}"),
@@ -388,15 +388,16 @@ impl BlockProofStuff {
         validator_set: &ValidatorSet,
         shuffle_validators: bool,
     ) -> Result<ValidatorSubsetInfo> {
-        let cc_seqno = self
+        let Some(vset_switch_round) = self
             .inner
             .proof
             .signatures
             .as_ref()
-            .map(|s| s.validator_info.catchain_seqno)
-            .unwrap_or_default();
-
-        ValidatorSubsetInfo::compute_standard(validator_set, cc_seqno, shuffle_validators)
+            .map(|s| s.consensus_info.vset_switch_round)
+        else {
+            anyhow::bail!("no `consensus_info` to compute subset from");
+        };
+        ValidatorSubsetInfo::compute_standard(validator_set, vset_switch_round, shuffle_validators)
     }
 }
 
@@ -520,18 +521,18 @@ fn pre_check_key_block_proof(virt_block: &Block) -> Result<()> {
 
 #[derive(Clone, Debug)]
 pub struct ValidatorSubsetInfo {
-    pub validators: Vec<ValidatorDescription>,
+    pub validators: Vec<IndexedValidatorDescription>,
     pub short_hash: u32,
 }
 
 impl ValidatorSubsetInfo {
     pub fn compute_standard(
         validator_set: &ValidatorSet,
-        cc_seqno: u32,
+        vset_switch_round: u32,
         shuffle_validators: bool,
     ) -> Result<Self> {
         let Some((validators, short_hash)) =
-            validator_set.compute_mc_subset(cc_seqno, shuffle_validators)
+            validator_set.compute_mc_subset_indexed(vset_switch_round, shuffle_validators)
         else {
             anyhow::bail!("failed to compute a validator subset");
         };

block-util/src/state/shard_state_stuff.rs

@@ -1,15 +1,13 @@
 use std::mem::ManuallyDrop;
 use std::sync::Arc;
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use tycho_types::cell::Lazy;
-use tycho_types::merkle::MerkleUpdate;
+use tycho_types::merkle::{FindCell, ParMerkleUpdateApplier};
 use tycho_types::models::*;
 use tycho_types::prelude::*;
-use tycho_util::FastHashSet;
 use tycho_util::mem::Reclaimer;
 
-use crate::dict::split_aug_dict_raw;
 use crate::state::RefMcStateHandle;
 
 /// Parsed shard state.
@@ -136,32 +134,25 @@ impl ShardStateStuff {
     /// the `tracker` from the initial state.
     ///
     /// NOTE: Call from inside `rayon`.
-    pub fn par_make_next_state(
+    pub fn par_make_next_state<F>(
         &self,
         next_block_id: &BlockId,
-        merkle_update: &MerkleUpdate,
-        split_at_depth: Option<u8>,
-    ) -> Result<Self> {
-        let old_split_at = if let Some(depth) = split_at_depth {
-            let shard_accounts = self
-                .root_cell()
-                .reference_cloned(1)
-                .context("invalid shard state")?
-                .parse::<ShardAccounts>()
-                .context("failed to load shard accounts")?;
-
-            split_aug_dict_raw(shard_accounts, depth)
-                .context("failed to split shard accounts")?
-                .into_keys()
-                .collect::<FastHashSet<_>>()
-        } else {
-            Default::default()
+        partial_new_root: Cell,
+        applier: &ParMerkleUpdateApplier<'_, F>,
+    ) -> Result<Self>
+    where
+        F: FindCell + Send + Sync + 'static,
+    {
+        let new_root = 'apply: {
+            if let Some(cell) = applier.find_cell.find_cell(partial_new_root.hash(0)) {
+                break 'apply cell;
+            }
+
+            let new =
+                rayon::scope(|scope| applier.run(partial_new_root.as_ref(), 0, 0, Some(scope)))?;
+            new.resolve(Cell::empty_context())?
         };
 
-        let new_root = merkle_update
-            .par_apply(&self.inner.root, &old_split_at)
-            .context("failed to apply merkle update")?;
-
         let shard_state = new_root.parse::<Box<ShardStateUnsplit>>()?;
         anyhow::ensure!(
             shard_state.shard_ident == next_block_id.shard,

cli/Cargo.toml

@@ -1,7 +1,13 @@
 [package]
 name = "tycho-cli"
 description = "Node CLI."
-include = ["src/**/*.rs", "res/**/*.boc", "./LICENSE-*", "./README.md", "build.rs"]
+include = [
+    "src/**/*.rs",
+    "res/**/*.boc",
+    "./LICENSE-*",
+    "./README.md",
+    "build.rs",
+]
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -30,7 +36,6 @@ hex = { workspace = true }
 humantime = { workspace = true }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
-parking_lot = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true, features = ["http2", "json", "rustls-tls"] }
 scopeguard = { workspace = true }
@@ -56,14 +61,15 @@ weedb = { workspace = true }
 # local deps
 tycho-block-util = { workspace = true }
 tycho-collator = { workspace = true }
+tycho-consensus = { workspace = true }
 tycho-control = { workspace = true, features = ["full"] }
 tycho-core = { workspace = true, features = ["cli"] }
 tycho-network = { workspace = true }
 tycho-rpc = { workspace = true, features = ["http2"] }
+tycho-slasher = { workspace = true }
 tycho-storage = { workspace = true }
 tycho-util = { workspace = true, features = ["cli"] }
 tycho-wu-tuner = { workspace = true }
-tycho-consensus = { workspace = true }
 
 [dev-dependencies]
 tycho-collator = { workspace = true, features = ["test"] }
@@ -76,14 +82,9 @@ tycho-build-info = { workspace = true }
 [features]
 default = ["jemalloc"]
 jemalloc = ["dep:tikv-jemallocator", "dep:tikv-jemalloc-ctl"]
-deadlock-detection = ["parking_lot/deadlock_detection"]
 debug = ["tycho-consensus/test", "tycho-consensus/mock-feedback"]
 lto = ["weedb/lto"]
 s3 = ["tycho-core/s3"]
 
 [lints]
 workspace = true
-
-[package.metadata.cargo-shear]
-# required for `deadlock-detection` feature
-ignored = ["parking_lot"]