diff --git a/Cargo.lock b/Cargo.lock index 07de6bee..7901e27d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1702,7 +1702,7 @@ dependencies = [ "bitflags", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.11.0", "log", "prettyplease", "proc-macro2", @@ -1910,7 +1910,7 @@ version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "519bd3116aeeb42d5372c29d982d16d0170d3d4a5ed85fc7dd91642ffff3c67c" dependencies = [ - "darling 0.23.0", + "darling 0.20.11", "ident_case", "prettyplease", "proc-macro2", @@ -3776,7 +3776,7 @@ dependencies = [ "ere-verifier-core", "serde", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-verifier", "thiserror 2.0.18", ] @@ -3867,6 +3867,17 @@ dependencies = [ "bytes", ] +[[package]] +name = "fd-lock" +version = "4.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" +dependencies = [ + "cfg-if", + "rustix 1.1.4", + "windows-sys 0.59.0", +] + [[package]] name = "ff" version = "0.12.1" @@ -4676,7 +4687,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.62.2", + "windows-core 0.61.2", ] [[package]] @@ -5187,8 +5198,8 @@ dependencies = [ [[package]] name = "libzkevm" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bls12_381 0.8.0 (git+https://github.com/sp1-patches/bls12_381?tag=patch-0.8.0-sp1-6.2.0)", "k256 0.13.4 (git+https://github.com/sp1-patches/elliptic-curves?tag=patch-k256-13.4-sp1-6.2.0)", @@ -8706,7 +8717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -8726,7 +8737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.11.0", "log", "multimap", "petgraph 0.8.3", @@ -8747,7 +8758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.117", @@ -8760,7 +8771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.117", @@ -10269,8 +10280,8 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "slop-air" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-air 0.4.3-succinct", ] @@ -10288,8 +10299,8 @@ dependencies = [ [[package]] name = "slop-algebra" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "itertools 0.14.0", "p3-field 0.4.3-succinct", @@ -10298,45 +10309,45 @@ dependencies = [ [[package]] name = "slop-alloc" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "thiserror 1.0.69", ] [[package]] name = "slop-baby-bear" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "lazy_static", "p3-baby-bear 0.4.3-succinct", "serde", - "slop-algebra 6.3.1", - "slop-challenger 6.3.1", - "slop-poseidon2 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] name = "slop-basefold" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "itertools 0.14.0", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-baby-bear", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", - "slop-koala-bear 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", + "slop-koala-bear 6.4.0", "slop-merkle-tree", "slop-multilinear", - "slop-primitives 6.3.1", + "slop-primitives 6.4.0", "slop-tensor", "slop-utils", "thiserror 1.0.69", @@ -10344,24 +10355,24 @@ dependencies = [ [[package]] name = "slop-basefold-prover" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "itertools 0.14.0", "rand 0.8.6", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-baby-bear", "slop-basefold", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", "slop-commit", "slop-dft", "slop-fri", "slop-futures", - "slop-koala-bear 6.3.1", + "slop-koala-bear 6.4.0", "slop-merkle-tree", "slop-multilinear", "slop-tensor", @@ -10385,16 +10396,16 @@ dependencies = [ [[package]] name = "slop-bn254" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "ff 0.13.1", "p3-bn254-fr", "serde", - "slop-algebra 6.3.1", - "slop-challenger 6.3.1", - "slop-poseidon2 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] @@ -10412,20 +10423,20 @@ dependencies = [ [[package]] name = "slop-challenger" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "futures", "p3-challenger 0.4.3-succinct", "serde", - "slop-algebra 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] name = "slop-commit" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-commit", "serde", @@ -10434,12 +10445,12 @@ dependencies = [ [[package]] name = "slop-dft" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-dft 0.4.3-succinct", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-matrix", "slop-tensor", @@ -10447,16 +10458,16 @@ dependencies = [ [[package]] name = "slop-fri" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-fri", ] [[package]] name = "slop-futures" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "crossbeam", "futures", @@ -10469,8 +10480,8 @@ dependencies = [ [[package]] name = "slop-jagged" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "futures", @@ -10479,21 +10490,21 @@ dependencies = [ "rand 0.8.6", "rayon", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-baby-bear", "slop-basefold", "slop-basefold-prover", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", "slop-commit", "slop-futures", - "slop-koala-bear 6.3.1", + "slop-koala-bear 6.4.0", "slop-merkle-tree", "slop-multilinear", "slop-stacked", "slop-sumcheck", - "slop-symmetric 6.3.1", + "slop-symmetric 6.4.0", "slop-tensor", "slop-utils", "thiserror 1.0.69", @@ -10502,8 +10513,8 @@ dependencies = [ [[package]] name = "slop-keccak-air" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-keccak-air 0.4.3-succinct", ] @@ -10525,54 +10536,54 @@ dependencies = [ [[package]] name = "slop-koala-bear" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "lazy_static", "p3-koala-bear", "serde", - "slop-algebra 6.3.1", - "slop-challenger 6.3.1", - "slop-poseidon2 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] name = "slop-matrix" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-matrix 0.4.3-succinct", ] [[package]] name = "slop-maybe-rayon" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-maybe-rayon 0.4.3-succinct", ] [[package]] name = "slop-merkle-tree" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "itertools 0.14.0", "p3-merkle-tree", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-baby-bear", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", "slop-commit", "slop-futures", - "slop-koala-bear 6.3.1", + "slop-koala-bear 6.4.0", "slop-matrix", - "slop-poseidon2 6.3.1", - "slop-symmetric 6.3.1", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", "slop-tensor", "slop-utils", "thiserror 1.0.69", @@ -10580,8 +10591,8 @@ dependencies = [ [[package]] name = "slop-multilinear" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "futures", @@ -10589,9 +10600,9 @@ dependencies = [ "rand 0.8.6", "rayon", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", - "slop-challenger 6.3.1", + "slop-challenger 6.4.0", "slop-commit", "slop-futures", "slop-matrix", @@ -10609,8 +10620,8 @@ dependencies = [ [[package]] name = "slop-poseidon2" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-poseidon2 0.4.3-succinct", ] @@ -10626,26 +10637,26 @@ dependencies = [ [[package]] name = "slop-primitives" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", ] [[package]] name = "slop-stacked" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "futures", "itertools 0.14.0", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-basefold", "slop-basefold-prover", - "slop-challenger 6.3.1", + "slop-challenger 6.4.0", "slop-commit", "slop-futures", "slop-merkle-tree", @@ -10656,17 +10667,17 @@ dependencies = [ [[package]] name = "slop-sumcheck" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "futures", "itertools 0.14.0", "rayon", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-baby-bear", - "slop-challenger 6.3.1", + "slop-challenger 6.4.0", "slop-multilinear", "thiserror 1.0.69", ] @@ -10682,16 +10693,16 @@ dependencies = [ [[package]] name = "slop-symmetric" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-symmetric 0.4.3-succinct", ] [[package]] name = "slop-tensor" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "arrayvec", "derive-where", @@ -10699,7 +10710,7 @@ dependencies = [ "rand 0.8.6", "rayon", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-futures", "slop-matrix", @@ -10709,16 +10720,16 @@ dependencies = [ [[package]] name = "slop-uni-stark" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-uni-stark", ] [[package]] name = "slop-utils" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "p3-util 0.4.3-succinct", "tracing-forest", @@ -10727,8 +10738,8 @@ dependencies = [ [[package]] name = "slop-whir" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "derive-where", "futures", @@ -10736,15 +10747,15 @@ dependencies = [ "rand 0.8.6", "rayon", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-baby-bear", "slop-basefold", - "slop-challenger 6.3.1", + "slop-challenger 6.4.0", "slop-commit", "slop-dft", "slop-jagged", - "slop-koala-bear 6.3.1", + "slop-koala-bear 6.4.0", "slop-matrix", "slop-merkle-tree", "slop-multilinear", @@ -10805,21 +10816,21 @@ dependencies = [ [[package]] name = "sp1-build" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "anyhow", "cargo_metadata 0.18.1", "chrono", "clap", "dirs 5.0.1", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", ] [[package]] name = "sp1-core-executor" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "bytemuck", @@ -10840,13 +10851,13 @@ dependencies = [ "serde_arrays 0.2.0", "serde_json", "slop-air", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-maybe-rayon", - "slop-symmetric 6.3.1", + "slop-symmetric 6.4.0", "sp1-curves", "sp1-hypercube", "sp1-jit", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "strum 0.27.2", "subenum", "thiserror 1.0.69", @@ -10858,8 +10869,8 @@ dependencies = [ [[package]] name = "sp1-core-executor-runner" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "base64 0.22.1", "bincode 1.3.3", @@ -10871,7 +10882,7 @@ dependencies = [ "sp1-core-executor", "sp1-core-executor-runner-binary", "sp1-jit", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sysinfo 0.30.13", "tracing", "uuid", @@ -10879,8 +10890,8 @@ dependencies = [ [[package]] name = "sp1-core-executor-runner-binary" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "crash-handler", @@ -10893,8 +10904,8 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "cfg-if", @@ -10911,8 +10922,8 @@ dependencies = [ "serde", "serde_json", "slop-air", - "slop-algebra 6.3.1", - "slop-challenger 6.3.1", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", "slop-futures", "slop-keccak-air", "slop-matrix", @@ -10925,7 +10936,7 @@ dependencies = [ "sp1-derive", "sp1-hypercube", "sp1-jit", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "static_assertions", "struct-reflection", "strum 0.27.2", @@ -10941,8 +10952,8 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "bytes", @@ -10952,7 +10963,7 @@ dependencies = [ "sp1-core-executor", "sp1-core-machine", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-prover", "sp1-prover-types", "thiserror 1.0.69", @@ -10962,8 +10973,8 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "cfg-if", "dashu", @@ -10974,16 +10985,16 @@ dependencies = [ "num", "p256 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "snowbridge-amcl", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "typenum", ] [[package]] name = "sp1-derive" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "proc-macro2", "quote", @@ -10992,8 +11003,8 @@ dependencies = [ [[package]] name = "sp1-hypercube" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "arrayref", "deepsize2", @@ -11008,28 +11019,28 @@ dependencies = [ "rayon-scan", "serde", "slop-air", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-basefold", "slop-basefold-prover", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", "slop-commit", "slop-futures", "slop-jagged", - "slop-koala-bear 6.3.1", + "slop-koala-bear 6.4.0", "slop-matrix", "slop-merkle-tree", "slop-multilinear", - "slop-poseidon2 6.3.1", + "slop-poseidon2 6.4.0", "slop-stacked", "slop-sumcheck", - "slop-symmetric 6.3.1", + "slop-symmetric 6.4.0", "slop-tensor", "slop-uni-stark", "slop-whir", "sp1-derive", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "struct-reflection", "strum 0.27.2", "thiserror 1.0.69", @@ -11040,8 +11051,8 @@ dependencies = [ [[package]] name = "sp1-jit" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "dynasmrt", "hashbrown 0.14.5", @@ -11049,7 +11060,7 @@ dependencies = [ "memfd", "memmap2", "serde", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "tracing", "uuid", ] @@ -11068,12 +11079,12 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "serde", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", ] [[package]] @@ -11102,8 +11113,8 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "blake3", @@ -11114,19 +11125,19 @@ dependencies = [ "num-bigint 0.4.6", "serde", "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", - "slop-algebra 6.3.1", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", - "slop-koala-bear 6.3.1", - "slop-poseidon2 6.3.1", - "slop-primitives 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", + "slop-koala-bear 6.4.0", + "slop-poseidon2 6.4.0", + "slop-primitives 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] name = "sp1-prover" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "anyhow", "bincode 1.3.3", @@ -11135,6 +11146,7 @@ dependencies = [ "either", "enum-map", "eyre", + "fd-lock", "futures", "hashbrown 0.14.5", "hex", @@ -11152,22 +11164,22 @@ dependencies = [ "serial_test", "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", "slop-air", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-basefold", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", "slop-futures", "slop-jagged", "slop-multilinear", "slop-stacked", - "slop-symmetric 6.3.1", + "slop-symmetric 6.4.0", "sp1-core-executor", "sp1-core-executor-runner", "sp1-core-machine", "sp1-derive", "sp1-hypercube", "sp1-jit", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-prover-types", "sp1-recursion-circuit", "sp1-recursion-compiler", @@ -11188,8 +11200,8 @@ dependencies = [ [[package]] name = "sp1-prover-types" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "anyhow", "async-scoped", @@ -11202,7 +11214,7 @@ dependencies = [ "serde", "sp1-core-machine", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "tokio", "tonic 0.12.3", "tonic-build 0.12.3", @@ -11211,8 +11223,8 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "itertools 0.14.0", @@ -11220,28 +11232,28 @@ dependencies = [ "rayon", "serde", "slop-air", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-alloc", "slop-basefold", "slop-basefold-prover", - "slop-bn254 6.3.1", - "slop-challenger 6.3.1", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", "slop-commit", "slop-jagged", - "slop-koala-bear 6.3.1", + "slop-koala-bear 6.4.0", "slop-matrix", "slop-merkle-tree", "slop-multilinear", "slop-stacked", "slop-sumcheck", - "slop-symmetric 6.3.1", + "slop-symmetric 6.4.0", "slop-tensor", "slop-whir", "sp1-core-executor", "sp1-core-machine", "sp1-derive", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-recursion-compiler", "sp1-recursion-executor", "sp1-recursion-machine", @@ -11250,19 +11262,19 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "backtrace", "cfg-if", "itertools 0.14.0", "serde", - "slop-algebra 6.3.1", - "slop-bn254 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-bn254 6.4.0", + "slop-symmetric 6.4.0", "sp1-core-machine", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-recursion-executor", "tracing", "vec_map", @@ -11270,8 +11282,8 @@ dependencies = [ [[package]] name = "sp1-recursion-executor" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "backtrace", "cfg-if", @@ -11279,10 +11291,10 @@ dependencies = [ "itertools 0.14.0", "range-set-blaze", "serde", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-maybe-rayon", - "slop-poseidon2 6.3.1", - "slop-symmetric 6.3.1", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", "smallvec", "sp1-derive", "sp1-hypercube", @@ -11293,8 +11305,8 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "anyhow", "bincode 1.3.3", @@ -11304,10 +11316,10 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", - "slop-algebra 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-symmetric 6.4.0", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-recursion-compiler", "sp1-verifier", "tempfile", @@ -11316,20 +11328,20 @@ dependencies = [ [[package]] name = "sp1-recursion-machine" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "itertools 0.14.0", "rand 0.8.6", "slop-air", - "slop-algebra 6.3.1", + "slop-algebra 6.4.0", "slop-basefold", "slop-matrix", "slop-maybe-rayon", - "slop-symmetric 6.3.1", + "slop-symmetric 6.4.0", "sp1-derive", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-recursion-executor", "strum 0.27.2", "tracing", @@ -11337,8 +11349,8 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "alloy-primitives", "alloy-signer", @@ -11371,7 +11383,7 @@ dependencies = [ "sp1-core-machine", "sp1-cuda", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-prover", "sp1-prover-types", "sp1-recursion-executor", @@ -11388,8 +11400,8 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "bincode 1.3.3", "blake3", @@ -11399,12 +11411,12 @@ dependencies = [ "lazy_static", "serde", "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", - "slop-algebra 6.3.1", - "slop-challenger 6.3.1", - "slop-primitives 6.3.1", - "slop-symmetric 6.3.1", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", + "slop-primitives 6.4.0", + "slop-symmetric 6.4.0", "sp1-hypercube", - "sp1-primitives 6.3.1", + "sp1-primitives 6.4.0", "sp1-recursion-executor", "sp1-recursion-machine", "strum 0.27.2", @@ -11414,8 +11426,8 @@ dependencies = [ [[package]] name = "sp1-zkvm" -version = "6.3.1" -source = "git+https://github.com/succinctlabs/sp1?tag=v6.3.1#8252c2905ce32964df68248117015c61ebb854db" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "blake3", "cfg-if", @@ -11427,9 +11439,9 @@ dependencies = [ "libm", "rand 0.8.6", "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", - "slop-algebra 6.3.1", - "sp1-lib 6.3.1", - "sp1-primitives 6.3.1", + "slop-algebra 6.4.0", + "sp1-lib 6.4.0", + "sp1-primitives 6.4.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7901e51e..d4e3b623 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,15 +140,15 @@ openvm-transpiler = { git = "https://github.com/han0110/openvm.git", branch = "p openvm-verify-stark-host = { git = "https://github.com/han0110/openvm.git", branch = "patch/v2.1.0-preview", default-features = false } # SP1 dependencies -sp1-core-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-cuda = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-hypercube = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-primitives = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-recursion-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-sdk = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-verifier = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1" } -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1", default-features = false } -sp1-libzkevm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.3.1", package = "libzkevm" } +sp1-core-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-cuda = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-hypercube = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-primitives = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-recursion-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-sdk = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-verifier = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" } +sp1-zkvm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0", default-features = false } +sp1-libzkevm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0", package = "libzkevm" } # ZisK dependencies proofman-fields = "1.1.0-alpha" diff --git a/README.md b/README.md index 733497b4..16ed70bb 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ Different zkVMs handles public values in different approaches: | zkVM | Version | ISA | GPU | Multi GPU | Cluster | | ------ | -------------------------------------------------------------------------- | --------- | :---: | :-------: | :-----: | | OpenVM | [`2.1.0-preview`](https://github.com/openvm-org/openvm/tree/v2.1.0-preview) | `RV64IMA` | V | | | -| SP1 | [`6.3.1`](https://github.com/succinctlabs/sp1/tree/v6.3.1) | `RV64IMA` | V | | | +| SP1 | [`6.4.0`](https://github.com/succinctlabs/sp1/tree/v6.4.0) | `RV64IMA` | V | | | | ZisK | [`1.1.0-alpha`](https://github.com/0xPolygonHermez/zisk/tree/v1.1.0-alpha) | `RV64IMA` | V | V | V | ## Examples diff --git a/crates/compiler/sp1/src/rust_rv64ima.rs b/crates/compiler/sp1/src/rust_rv64ima.rs index 614d5a0a..31b7e874 100644 --- a/crates/compiler/sp1/src/rust_rv64ima.rs +++ b/crates/compiler/sp1/src/rust_rv64ima.rs @@ -19,7 +19,7 @@ const TARGET: RustTarget = RustTarget::SpecJson { json: include_str!("./rust_rv64ima/riscv64ima-unknown-none-elf.json"), }; -/// According to https://github.com/succinctlabs/sp1/blob/v6.3.1/crates/build/src/command/utils.rs#L68. +/// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/build/src/command/utils.rs#L68. const RUSTFLAGS: &[&str] = &[ "-C", "passes=lower-atomic", // Only for rustc > 1.81 diff --git a/docker/sp1/Dockerfile.base b/docker/sp1/Dockerfile.base index 25f32d93..4e37b570 100644 --- a/docker/sp1/Dockerfile.base +++ b/docker/sp1/Dockerfile.base @@ -20,7 +20,7 @@ COPY --chmod=755 scripts/sdk_installers/install_sp1_sdk.sh /tmp/install_sp1_sdk. # Define where SP1 SDK will be installed within the image. # The install_sp1_sdk.sh script will respect these ENV variables. ENV SP1_DIR="/root/.sp1" \ - SP1_VERSION="v6.3.1" + SP1_VERSION="v6.4.0" # Run the SP1 SDK installation script with secret mount # It will use the SP1_DIR and SP1_VERSION defined above. diff --git a/docs/vk-generation.md b/docs/vk-generation.md index 0710c66f..a127ebc9 100644 --- a/docs/vk-generation.md +++ b/docs/vk-generation.md @@ -88,7 +88,7 @@ This guide records the encoding for each supported zkVM and gives the commands t ### Format -32-bytes holding the 8 koalabear field elements of the digest packed as base-2^31 digits of a big-endian integer, which is the form [`HashableKey::bytes32`](https://github.com/succinctlabs/sp1/blob/v6.3.1/crates/hypercube/src/verifier/hashable_key.rs) prints and what `cargo prove vkey` reports. +32-bytes holding the 8 koalabear field elements of the digest packed as base-2^31 digits of a big-endian integer, which is the form [`HashableKey::bytes32`](https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/hypercube/src/verifier/hashable_key.rs) prints and what `cargo prove vkey` reports. ### Instructions @@ -100,7 +100,7 @@ This guide records the encoding for each supported zkVM and gives the commands t curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y . "$HOME/.cargo/env" - ZKVM_VERSION="v6.3.1" + ZKVM_VERSION="v6.4.0" curl -L https://sp1up.succinct.xyz | bash export PATH="$HOME/.sp1/bin:$PATH" sp1up -v "$ZKVM_VERSION" diff --git a/scripts/sdk_installers/install_sp1_sdk.sh b/scripts/sdk_installers/install_sp1_sdk.sh index 263feda4..39c1f36b 100755 --- a/scripts/sdk_installers/install_sp1_sdk.sh +++ b/scripts/sdk_installers/install_sp1_sdk.sh @@ -27,7 +27,7 @@ curl -L https://sp1up.succinct.xyz | bash # and for subsequent commands if this script is sourced. export PATH="${SP1_DIR}/bin:$PATH" -export SP1_VERSION="${SP1_VERSION:-v6.3.1}" +export SP1_VERSION="${SP1_VERSION:-v6.4.0}" # Run sp1up to install/update the toolchain if ! command -v sp1up &> /dev/null; then diff --git a/tests/sp1/basic/Cargo.lock b/tests/sp1/basic/Cargo.lock index 22c86d91..1f971914 100644 --- a/tests/sp1/basic/Cargo.lock +++ b/tests/sp1/basic/Cargo.lock @@ -31,6 +31,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base64" version = "0.13.1" @@ -96,6 +102,42 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bls12_381" +version = "0.8.0" +source = "git+https://github.com/sp1-patches/bls12_381?tag=patch-0.8.0-sp1-6.2.0#9e4e2ae4780d3d69cecbec000f5e814df2392468" +dependencies = [ + "cfg-if", + "digest", + "ff", + "group", + "hex", + "pairing", + "rand_core", + "sp1-lib 6.3.0", + "subtle", +] + +[[package]] +name = "bytemuck" +version = "1.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0e56a716f1e132ff6bf4bdac1c944a3fcdc1cae65f70a4a2a1ac3b401d2d1f" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.3", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -150,6 +192,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa" +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -177,6 +225,18 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -187,6 +247,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "digest" version = "0.10.7" @@ -194,7 +264,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", + "subtle", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "signature", +] + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "git+https://github.com/sp1-patches/signatures?tag=sp1-skip-verify-on-recovery#1880299a48fe7ef249edaa616fd411239fb5daf1" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979 0.4.0 (git+https://github.com/sp1-patches/signatures?tag=sp1-skip-verify-on-recovery)", + "signature", ] [[package]] @@ -209,6 +306,25 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b" +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "embedded-alloc" version = "0.6.0" @@ -223,17 +339,18 @@ dependencies = [ [[package]] name = "ere-codec" -version = "0.12.2" +version = "0.15.0" [[package]] name = "ere-platform-core" -version = "0.12.2" +version = "0.15.0" [[package]] name = "ere-platform-sp1" -version = "0.12.2" +version = "0.15.0" dependencies = [ "ere-platform-core", + "libzkevm", "sp1-zkvm", ] @@ -247,7 +364,7 @@ dependencies = [ [[package]] name = "ere-util-test" -version = "0.12.2" +version = "0.15.0" dependencies = [ "bincode 2.0.1", "ciborium", @@ -256,7 +373,7 @@ dependencies = [ "ere-platform-core", "serde", "serde_bytes", - "sha2", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -395,6 +512,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -420,6 +538,17 @@ dependencies = [ "wasi 0.14.2+wasi-0.2.4", ] +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core", + "subtle", +] + [[package]] name = "half" version = "2.7.1" @@ -437,6 +566,24 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "itertools" version = "0.12.1" @@ -455,11 +602,40 @@ dependencies = [ "either", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "git+https://github.com/sp1-patches/elliptic-curves?tag=patch-k256-13.4-sp1-6.2.0#41374de1febd88e67faa695a5641ae46460a8cb6" +dependencies = [ + "cfg-if", + "ecdsa 0.16.9 (git+https://github.com/sp1-patches/signatures?tag=sp1-skip-verify-on-recovery)", + "elliptic-curve", + "hex", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib 6.3.0", +] + +[[package]] +name = "kzg-rs" +version = "0.2.8" +source = "git+https://github.com/succinctlabs/kzg-rs?tag=v0.2.8-sp1-6.2.0#2d48f8b948746d5cfa62ce7421369278a1c2e405" +dependencies = [ + "bls12_381", + "ff", + "hex", + "serde_arrays", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "spin", +] + [[package]] name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "libc" @@ -473,6 +649,23 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +[[package]] +name = "libzkevm" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "bls12_381", + "k256", + "kzg-rs", + "num-bigint-dig", + "p256", + "ripemd", + "sha2 0.10.9 (git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha2-0.10.9-sp1-6.2.0)", + "sp1-zkvm", + "substrate-bn", + "tiny-keccak", +] + [[package]] name = "linked_list_allocator" version = "0.10.5" @@ -506,6 +699,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7f9a86e097b0d187ad0e65667c2f58b9254671e86e7dbb78036b16692eae099" +dependencies = [ + "libm", + "num-integer", + "num-iter", + "num-traits", + "once_cell", + "smallvec", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -515,6 +722,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -530,6 +747,19 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "p256" +version = "0.13.2" +source = "git+https://github.com/sp1-patches/elliptic-curves?tag=patch-p256-13.2-sp1-6.2.0#778543de72a8160a9ce253870da1efae6b18e6d3" +dependencies = [ + "ecdsa 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)", + "elliptic-curve", + "hex", + "primeorder", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib 6.3.0", +] + [[package]] name = "p3-bn254-fr" version = "0.4.3-succinct" @@ -673,6 +903,15 @@ dependencies = [ "serde", ] +[[package]] +name = "pairing" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" +dependencies = [ + "group", +] + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -688,6 +927,14 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "primeorder" +version = "0.13.1" +source = "git+https://github.com/sp1-patches/elliptic-curves?tag=patch-p256-13.2-sp1-6.2.0#778543de72a8160a9ce253870da1efae6b18e6d3" +dependencies = [ + "elliptic-curve", +] + [[package]] name = "proc-macro2" version = "1.0.101" @@ -748,6 +995,34 @@ dependencies = [ "getrandom 0.2.16", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "git+https://github.com/sp1-patches/signatures?tag=sp1-skip-verify-on-recovery#1880299a48fe7ef249edaa616fd411239fb5daf1" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest", +] + [[package]] name = "rlsf" version = "0.2.2" @@ -761,6 +1036,12 @@ dependencies = [ "svgbobdoc", ] +[[package]] +name = "rustc-hex" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + [[package]] name = "rustc_version" version = "0.4.1" @@ -776,6 +1057,19 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "subtle", + "zeroize", +] + [[package]] name = "semver" version = "1.0.27" @@ -792,6 +1086,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde_arrays" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a16b99c5ea4fe3daccd14853ad260ec00ea043b2708d1fd1da3106dcd8d9df" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.19" @@ -833,12 +1136,32 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha2-0.10.9-sp1-6.2.0#e48b656ebc806117554bb33c2f8687e4637e37ff" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + [[package]] name = "slab" version = "0.4.12" @@ -856,6 +1179,16 @@ dependencies = [ "serde", ] +[[package]] +name = "slop-algebra" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "itertools 0.14.0", + "p3-field", + "serde", +] + [[package]] name = "slop-bn254" version = "6.3.0" @@ -865,10 +1198,24 @@ dependencies = [ "ff", "p3-bn254-fr", "serde", - "slop-algebra", - "slop-challenger", - "slop-poseidon2", - "slop-symmetric", + "slop-algebra 6.3.0", + "slop-challenger 6.3.0", + "slop-poseidon2 6.3.0", + "slop-symmetric 6.3.0", +] + +[[package]] +name = "slop-bn254" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "ff", + "p3-bn254-fr", + "serde", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] @@ -880,8 +1227,20 @@ dependencies = [ "futures", "p3-challenger", "serde", - "slop-algebra", - "slop-symmetric", + "slop-algebra 6.3.0", + "slop-symmetric 6.3.0", +] + +[[package]] +name = "slop-challenger" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "futures", + "p3-challenger", + "serde", + "slop-algebra 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] @@ -893,10 +1252,24 @@ dependencies = [ "lazy_static", "p3-koala-bear", "serde", - "slop-algebra", - "slop-challenger", - "slop-poseidon2", - "slop-symmetric", + "slop-algebra 6.3.0", + "slop-challenger 6.3.0", + "slop-poseidon2 6.3.0", + "slop-symmetric 6.3.0", +] + +[[package]] +name = "slop-koala-bear" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "lazy_static", + "p3-koala-bear", + "serde", + "slop-algebra 6.4.0", + "slop-challenger 6.4.0", + "slop-poseidon2 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] @@ -908,13 +1281,29 @@ dependencies = [ "p3-poseidon2", ] +[[package]] +name = "slop-poseidon2" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "p3-poseidon2", +] + [[package]] name = "slop-primitives" version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790bdabbedf054cc63898653db2091778350d6cbe92cc4849b720197bf490b3f" dependencies = [ - "slop-algebra", + "slop-algebra 6.3.0", +] + +[[package]] +name = "slop-primitives" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "slop-algebra 6.4.0", ] [[package]] @@ -926,6 +1315,20 @@ dependencies = [ "p3-symmetric", ] +[[package]] +name = "slop-symmetric" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "p3-symmetric", +] + +[[package]] +name = "smallvec" +version = "1.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" + [[package]] name = "sp1-lib" version = "6.3.0" @@ -933,8 +1336,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5510c8971313bb6602642b0d8f6a4df95c6548be016fe598a670ac629ce558e6" dependencies = [ "bincode 1.3.3", + "elliptic-curve", "serde", - "sp1-primitives", + "sp1-primitives 6.3.0", +] + +[[package]] +name = "sp1-lib" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "bincode 1.3.3", + "serde", + "sp1-primitives 6.4.0", ] [[package]] @@ -951,21 +1365,43 @@ dependencies = [ "lazy_static", "num-bigint 0.4.6", "serde", - "sha2", - "slop-algebra", - "slop-bn254", - "slop-challenger", - "slop-koala-bear", - "slop-poseidon2", - "slop-primitives", - "slop-symmetric", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "slop-algebra 6.3.0", + "slop-bn254 6.3.0", + "slop-challenger 6.3.0", + "slop-koala-bear 6.3.0", + "slop-poseidon2 6.3.0", + "slop-primitives 6.3.0", + "slop-symmetric 6.3.0", +] + +[[package]] +name = "sp1-primitives" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" +dependencies = [ + "bincode 1.3.3", + "blake3", + "elf", + "hex", + "itertools 0.14.0", + "lazy_static", + "num-bigint 0.4.6", + "serde", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "slop-algebra 6.4.0", + "slop-bn254 6.4.0", + "slop-challenger 6.4.0", + "slop-koala-bear 6.4.0", + "slop-poseidon2 6.4.0", + "slop-primitives 6.4.0", + "slop-symmetric 6.4.0", ] [[package]] name = "sp1-zkvm" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6938ee71db40a5ae20eada69b94e0657efd2c4c9eb834b02f72a6708cc7c072c" +version = "6.4.0" +source = "git+https://github.com/succinctlabs/sp1?tag=v6.4.0#f66b4bff51d0ccff51d152e0f7f66b2ffedf3529" dependencies = [ "cfg-if", "critical-section", @@ -975,9 +1411,31 @@ dependencies = [ "lazy_static", "libm", "rand", - "sha2", - "sp1-lib", - "sp1-primitives", + "sha2 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib 6.4.0", + "sp1-primitives 6.4.0", +] + +[[package]] +name = "spin" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" + +[[package]] +name = "substrate-bn" +version = "0.6.0" +source = "git+https://github.com/sp1-patches/bn?tag=patch-0.6.0-sp1-6.2.0-substrate-bn#b9cd95a749de1f20ac786178f9f8754f79a5ad55" +dependencies = [ + "bytemuck", + "byteorder", + "cfg-if", + "crunchy", + "lazy_static", + "num-bigint 0.4.6", + "rand", + "rustc-hex", + "sp1-lib 6.3.0", ] [[package]] @@ -1021,12 +1479,33 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "git+https://github.com/sp1-patches/tiny-keccak?tag=patch-2.0.2-sp1-6.2.0#c3f95bcc35b391101d0cf0abe91ea4c8423868b0" +dependencies = [ + "cfg-if", + "crunchy", + "sp1-lib 6.3.0", +] + [[package]] name = "tracing" version = "0.1.41" @@ -1140,3 +1619,9 @@ dependencies = [ "quote", "syn 2.0.106", ] + +[[package]] +name = "zeroize" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" diff --git a/tests/sp1/stock_nightly_no_std/src/sp1.rs b/tests/sp1/stock_nightly_no_std/src/sp1.rs index de1806cc..28970f88 100644 --- a/tests/sp1/stock_nightly_no_std/src/sp1.rs +++ b/tests/sp1/stock_nightly_no_std/src/sp1.rs @@ -32,13 +32,13 @@ _start: sym STACK_TOP ); -/// According to https://github.com/succinctlabs/sp1/blob/v6.3.1/crates/zkvm/entrypoint/src/syscalls/sys.rs#L56-L59. +/// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/zkvm/entrypoint/src/syscalls/sys.rs#L56-L59. #[panic_handler] fn panic_impl(_panic_info: &core::panic::PanicInfo) -> ! { halt(1); } -/// According to https://github.com/succinctlabs/sp1/blob/v6.3.1/crates/zkvm/entrypoint/src/syscalls/halt.rs#L59-L63. +/// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/zkvm/entrypoint/src/syscalls/halt.rs#L59-L63. fn halt(exit_code: u32) -> ! { unsafe { core::arch::asm!( @@ -66,7 +66,7 @@ unsafe impl GlobalAlloc for SimpleAlloc { #[global_allocator] static HEAP: SimpleAlloc = SimpleAlloc; -// According to https://github.com/succinctlabs/sp1/blob/v6.3.1/crates/primitives/src/consts.rs#L8. +// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/primitives/src/consts.rs#L8. pub const MAXIMUM_MEMORY_SIZE: u64 = (1u64 << 48) - 1; #[allow(clippy::missing_safety_doc)]