From 4f90eeb7762893be131344a1172942d4dc4392fb Mon Sep 17 00:00:00 2001 From: Arthur Paulino Date: Sun, 6 Sep 2026 17:53:24 +0000 Subject: [PATCH] Update multi-stark, Rust 1.98.1, and Blake3.lean Pin multi-stark to c683c69 for hybrid CPU/CUDA scheduling and update the Rust toolchain to 1.98.1. Use the merged Blake3.lean revision 78f5bc4 in both Lake and Nix so the Rust static libraries share the same toolchain. Refresh Cargo.lock, the Lake manifest, the Nix Rust manifest checksum, and the Blake3.lean flake lock entry. Validated on x86_64-linux with nix flake check (Clippy, 1,304 Rust tests, and the Lean suite) and a release workspace/all-targets CUDA cargo check through the Nix CUDA shell. --- Cargo.lock | 3 ++- Cargo.toml | 2 +- flake.lock | 8 ++++---- flake.nix | 4 ++-- lake-manifest.json | 4 ++-- lakefile.lean | 2 +- rust-toolchain.toml | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d7e02086..bee30920a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2104,7 +2104,7 @@ dependencies = [ [[package]] name = "multi-stark" version = "0.1.0" -source = "git+https://github.com/argumentcomputer/multi-stark.git?rev=a8aab731af8d2a5e15f390cd2ef14af4fc42d7d3#a8aab731af8d2a5e15f390cd2ef14af4fc42d7d3" +source = "git+https://github.com/argumentcomputer/multi-stark.git?rev=c683c69ccb0499fc4528ece39f292f53b8c71609#c683c69ccb0499fc4528ece39f292f53b8c71609" dependencies = [ "bincode", "itertools 0.14.0", @@ -2122,6 +2122,7 @@ dependencies = [ "p3-merkle-tree", "p3-symmetric", "p3-util", + "rayon", "serde", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 6b683b958..f659a98c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ libc = "0.2" log = "0.4" memmap2 = "0.9" mimalloc = { version = "0.1", default-features = false } -multi-stark = { git = "https://github.com/argumentcomputer/multi-stark.git", rev = "a8aab731af8d2a5e15f390cd2ef14af4fc42d7d3" } +multi-stark = { git = "https://github.com/argumentcomputer/multi-stark.git", rev = "c683c69ccb0499fc4528ece39f292f53b8c71609" } nom = "7.1.3" num-bigint = "0.4.6" quickcheck = "1.0.3" diff --git a/flake.lock b/flake.lock index 6a0edb596..1fac8891b 100644 --- a/flake.lock +++ b/flake.lock @@ -33,17 +33,17 @@ ] }, "locked": { - "lastModified": 1788353452, - "narHash": "sha256-R08Yd5y8PMyrwxTMUFDDzdbf9057+f52bz9Y/e/poiY=", + "lastModified": 1788716740, + "narHash": "sha256-S1nQ6SBqwAQk0U838a3GyqVOudJcgnQfhxLiPuEIjCk=", "owner": "argumentcomputer", "repo": "Blake3.lean", - "rev": "2db8f692ed94f7c4a993527008b8c5231b169709", + "rev": "78f5bc4b22de1172af8a5d91e7039128084fad3a", "type": "github" }, "original": { "owner": "argumentcomputer", "repo": "Blake3.lean", - "rev": "2db8f692ed94f7c4a993527008b8c5231b169709", + "rev": "78f5bc4b22de1172af8a5d91e7039128084fad3a", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 4e725b2c8..84079f7f7 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,7 @@ # Blake3 Rust bindings for Lean blake3-lean = { - url = "github:argumentcomputer/Blake3.lean/2db8f692ed94f7c4a993527008b8c5231b169709"; + url = "github:argumentcomputer/Blake3.lean/78f5bc4b22de1172af8a5d91e7039128084fad3a"; # System packages, follows lean4-nix so we stay in sync inputs.lean4-nix.follows = "lean4-nix"; }; @@ -104,7 +104,7 @@ # Pins the Rust toolchain rustToolchain = fenix.packages.${system}.fromToolchainFile { file = ./rust-toolchain.toml; - sha256 = "sha256-P30Tm3O7vQAE725YtDCDHGjNrSsfZO4us11UwJGZSJo="; + sha256 = "sha256-p8h3Sl/YRByZfZTAKXdsvF6xEenXKrXSVvpphmZENH4="; }; # Rust package diff --git a/lake-manifest.json b/lake-manifest.json index 59e49660a..1f571e9bb 100644 --- a/lake-manifest.json +++ b/lake-manifest.json @@ -35,10 +35,10 @@ "type": "git", "subDir": null, "scope": "", - "rev": "2db8f692ed94f7c4a993527008b8c5231b169709", + "rev": "78f5bc4b22de1172af8a5d91e7039128084fad3a", "name": "Blake3", "manifestFile": "lake-manifest.json", - "inputRev": "2db8f692ed94f7c4a993527008b8c5231b169709", + "inputRev": "78f5bc4b22de1172af8a5d91e7039128084fad3a", "inherited": false, "configFile": "lakefile.lean"}, {"url": "https://github.com/argumentcomputer/LSpec", diff --git a/lakefile.lean b/lakefile.lean index 758b208dc..98fe391ce 100644 --- a/lakefile.lean +++ b/lakefile.lean @@ -15,7 +15,7 @@ the revision that turned precompilation on. Before it, Blake3 exposed a `blake3_rs_shared` cdylib that `ix_native_decide_dynlib` had to fetch and link; that target no longer exists. -/ require Blake3 from git - "https://github.com/argumentcomputer/Blake3.lean" @ "2db8f692ed94f7c4a993527008b8c5231b169709" + "https://github.com/argumentcomputer/Blake3.lean" @ "78f5bc4b22de1172af8a5d91e7039128084fad3a" require Cli from git "https://github.com/leanprover/lean4-cli" @ "v4.33.0" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 23de05434..06581a95e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] # The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. profile = "default" -channel = "1.98" +channel = "1.98.1"