diff --git a/Cargo.lock b/Cargo.lock index 8681603fc0..d5baa3132c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1816,12 +1816,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "downcast-rs" version = "1.2.1" @@ -3610,15 +3604,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -6505,7 +6490,7 @@ dependencies = [ "sp1-stark", "strum", "strum_macros", - "sysinfo 0.30.13", + "sysinfo", "tempfile", "thiserror", "tokio", @@ -6541,7 +6526,7 @@ dependencies = [ "sp1-derive", "sp1-primitives", "sp1-zkvm", - "sysinfo 0.15.9", + "sysinfo", "tracing", ] @@ -6790,23 +6775,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[package]] -name = "sysinfo" -version = "0.15.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de94457a09609f33fec5e7fceaf907488967c6c7c75d64da6a7ce6ffdb8b5abd" -dependencies = [ - "cc", - "cfg-if", - "core-foundation-sys", - "doc-comment", - "libc", - "ntapi 0.3.7", - "once_cell", - "rayon", - "winapi", -] - [[package]] name = "sysinfo" version = "0.30.13" @@ -6816,7 +6784,7 @@ dependencies = [ "cfg-if", "core-foundation-sys", "libc", - "ntapi 0.4.1", + "ntapi", "once_cell", "rayon", "windows", diff --git a/crates/stark/Cargo.toml b/crates/stark/Cargo.toml index dce5698395..0d5e773441 100644 --- a/crates/stark/Cargo.toml +++ b/crates/stark/Cargo.toml @@ -38,7 +38,7 @@ tracing = "0.1.40" rayon-scan = "0.1.1" arrayref = "0.3.8" getrandom = { version = "0.2.15", features = ["custom"] } -sysinfo = "0.15.1" +sysinfo = "0.30.13" [dev-dependencies] diff --git a/crates/stark/src/opts.rs b/crates/stark/src/opts.rs index e4a82158c1..db5ced80fa 100644 --- a/crates/stark/src/opts.rs +++ b/crates/stark/src/opts.rs @@ -1,7 +1,7 @@ use std::env; use serde::{Deserialize, Serialize}; -use sysinfo::{System, SystemExt}; +use sysinfo::System; const MAX_SHARD_SIZE: usize = 1 << 22; const MAX_SHARD_BATCH_SIZE: usize = 8; @@ -79,8 +79,9 @@ impl Default for SP1CoreOpts { let split_threshold = env::var("SPLIT_THRESHOLD") .map(|s| s.parse::().unwrap_or(DEFERRED_SPLIT_THRESHOLD)) .unwrap_or(DEFERRED_SPLIT_THRESHOLD); + let sys = System::new_all(); - let total_available_mem = sys.get_total_memory() / (1024 * 1024); + let total_available_mem = sys.total_memory() / (1024 * 1024 * 1024); let default_shard_size = shard_size(total_available_mem); let default_shard_batch_size = shard_batch_size(total_available_mem); diff --git a/examples/Cargo.lock b/examples/Cargo.lock index 1ea1066ef1..cc23acea9c 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -1347,12 +1347,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "downcast-rs" version = "1.2.1" @@ -2923,15 +2917,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -4964,7 +4949,7 @@ dependencies = [ [[package]] name = "sp1-build" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "anyhow", "cargo_metadata", @@ -4975,7 +4960,7 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "bincode", "bytemuck", @@ -5005,11 +4990,12 @@ dependencies = [ "tiny-keccak", "tracing", "typenum", + "vec_map", ] [[package]] name = "sp1-core-machine" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "anyhow", "arrayref", @@ -5073,7 +5059,7 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "bincode", "ctrlc", @@ -5092,7 +5078,7 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "curve25519-dalek", "dashu", @@ -5111,7 +5097,7 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "proc-macro2", "quote", @@ -5120,7 +5106,7 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "itertools 0.13.0", "lazy_static", @@ -5132,7 +5118,7 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "anyhow", "bincode", @@ -5170,7 +5156,7 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "bincode", "itertools 0.13.0", @@ -5193,7 +5179,7 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "backtrace", "itertools 0.13.0", @@ -5221,7 +5207,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "arrayref", "backtrace", @@ -5257,7 +5243,7 @@ dependencies = [ [[package]] name = "sp1-recursion-core-v2" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "arrayref", "backtrace", @@ -5296,7 +5282,7 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "proc-macro2", "quote", @@ -5305,7 +5291,7 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "anyhow", "bincode", @@ -5330,7 +5316,7 @@ dependencies = [ [[package]] name = "sp1-recursion-program" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "itertools 0.13.0", "p3-air", @@ -5360,7 +5346,7 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "alloy-sol-types", "anyhow", @@ -5394,7 +5380,7 @@ dependencies = [ "sp1-stark", "strum", "strum_macros", - "sysinfo 0.30.13", + "sysinfo", "tempfile", "thiserror", "tokio", @@ -5405,7 +5391,7 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "arrayref", "getrandom", @@ -5429,7 +5415,7 @@ dependencies = [ "serde", "sp1-derive", "sp1-primitives", - "sysinfo 0.15.9", + "sysinfo", "tracing", ] @@ -5590,23 +5576,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "sysinfo" -version = "0.15.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de94457a09609f33fec5e7fceaf907488967c6c7c75d64da6a7ce6ffdb8b5abd" -dependencies = [ - "cc", - "cfg-if", - "core-foundation-sys", - "doc-comment", - "libc", - "ntapi 0.3.7", - "once_cell", - "rayon", - "winapi", -] - [[package]] name = "sysinfo" version = "0.30.13" @@ -5616,7 +5585,7 @@ dependencies = [ "cfg-if", "core-foundation-sys", "libc", - "ntapi 0.4.1", + "ntapi", "once_cell", "rayon", "windows", @@ -6229,6 +6198,9 @@ name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +dependencies = [ + "serde", +] [[package]] name = "vergen" diff --git a/examples/tendermint/program/Cargo.lock b/examples/tendermint/program/Cargo.lock index 3cf1cdcfd2..9099d055b5 100644 --- a/examples/tendermint/program/Cargo.lock +++ b/examples/tendermint/program/Cargo.lock @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "anyhow", "bincode", @@ -703,7 +703,7 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "1.2.0-rc2" +version = "1.2.0" dependencies = [ "bincode", "cfg-if", diff --git a/examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf b/examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf index 31fe83d0f5..c20d62e67c 100755 Binary files a/examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf and b/examples/tendermint/program/elf/riscv32im-succinct-zkvm-elf differ