From df1b2074f720421c9074ec3219cfc3fcec6438f3 Mon Sep 17 00:00:00 2001 From: abishek Date: Wed, 8 Jan 2025 12:58:29 +0545 Subject: [PATCH] build eval fix --- provers/sp1/build.rs | 34 +++++++++++-- provers/sp1/guest-btc-blockspace/Cargo.lock | 46 ++++++++++++----- provers/sp1/guest-checkpoint/Cargo.lock | 56 +++++++++++++++------ provers/sp1/guest-cl-agg/Cargo.lock | 54 ++++++++++++++------ provers/sp1/guest-cl-stf/Cargo.lock | 54 ++++++++++++++------ provers/sp1/guest-evm-ee-stf/Cargo.lock | 50 +++++++++++++----- provers/sp1/guest-l1-batch/Cargo.lock | 46 ++++++++++++----- 7 files changed, 254 insertions(+), 86 deletions(-) diff --git a/provers/sp1/build.rs b/provers/sp1/build.rs index 778d51c26b..982e6baae0 100644 --- a/provers/sp1/build.rs +++ b/provers/sp1/build.rs @@ -265,6 +265,8 @@ fn generate_elf_contents_and_vk_hash(_program: &str) -> ([u32; 8], String) { /// Copies the compiled ELF file of the specified program to its cache directory. #[cfg(not(debug_assertions))] fn migrate_elf(program: &str) { + let sp1_build_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR is not set"); + let metadata = MetadataCommand::new() .manifest_path(format!("{}/Cargo.toml", program)) .exec() @@ -278,15 +280,41 @@ fn migrate_elf(program: &str) { .clone(); // Copy the elf file - let desination_elf_path = Path::new(program) + let desination_elf_path = Path::new(&sp1_build_dir) + .join(program) .join("cache") .join(format!("{}.elf", program)); let built_elf_path = format!( - "{}/target/elf-compilation/riscv32im-succinct-zkvm-elf/release/{}", - program, built_elf_name + "{}/{}/target/elf-compilation/riscv32im-succinct-zkvm-elf/release/{}", + sp1_build_dir, program, built_elf_name ); + eprintln!( + "Current dir is {:?}", + list_dir(Path::new(&format!("{}/{}", sp1_build_dir, program))) + ); + eprintln!("Got the source {:?}", built_elf_path); + eprintln!("Got the des {:?}", desination_elf_path); + assert!(1 == 2); fs::copy(&built_elf_path, &desination_elf_path) .expect("Failed to copy the built ELF file to the cache directory"); } + +fn list_dir(path: &Path) { + eprintln!("got the dir {:?}", path); + match fs::read_dir(path) { + Ok(entries) => { + for entry in entries { + match entry { + Ok(entry) => { + let file_name = entry.file_name(); + println!("Abishek {}", file_name.to_string_lossy()); + } + Err(e) => eprintln!("Error reading entry: {}", e), + } + } + } + Err(e) => eprintln!("Error reading directory: {}", e), + } +} diff --git a/provers/sp1/guest-btc-blockspace/Cargo.lock b/provers/sp1/guest-btc-blockspace/Cargo.lock index b921b8e95e..a12c2283b8 100644 --- a/provers/sp1/guest-btc-blockspace/Cargo.lock +++ b/provers/sp1/guest-btc-blockspace/Cargo.lock @@ -1410,7 +1410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -2077,14 +2077,15 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1?rev=2c7868364cb832531e8cafd258aa06fbab079459#2c7868364cb832531e8cafd258aa06fbab079459" +version = "4.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4e33b7cb6da3a9a19a91c2615e7a08d8806fd0cc1ca01fb9e05ed8dcae09c" dependencies = [ "hex", "lazy_static", "sha2", - "substrate-bn", - "thiserror-no-std", + "substrate-bn-succinct", + "thiserror 2.0.9", ] [[package]] @@ -2135,7 +2136,7 @@ dependencies = [ "musig2", "serde", "strata-primitives", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2165,7 +2166,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.68", "tracing", "zeroize", ] @@ -2235,7 +2236,7 @@ dependencies = [ "strata-bridge-tx-builder", "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2247,7 +2248,7 @@ dependencies = [ "bincode", "borsh", "serde", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2274,9 +2275,10 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c855c26ad0594c830129cb868552fb41415603a6133276c2ecdd9e5ef4255" dependencies = [ "bytemuck", "byteorder", @@ -2354,7 +2356,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2368,6 +2379,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2" diff --git a/provers/sp1/guest-checkpoint/Cargo.lock b/provers/sp1/guest-checkpoint/Cargo.lock index e89de609a6..dac7eee2c1 100644 --- a/provers/sp1/guest-checkpoint/Cargo.lock +++ b/provers/sp1/guest-checkpoint/Cargo.lock @@ -1757,7 +1757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -2129,7 +2129,7 @@ dependencies = [ "ripemd", "secp256k1", "sha2", - "substrate-bn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-bn", ] [[package]] @@ -2535,14 +2535,15 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1?rev=2c7868364cb832531e8cafd258aa06fbab079459#2c7868364cb832531e8cafd258aa06fbab079459" +version = "4.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4e33b7cb6da3a9a19a91c2615e7a08d8806fd0cc1ca01fb9e05ed8dcae09c" dependencies = [ "hex", "lazy_static", "sha2", - "substrate-bn 0.6.0 (git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2)", - "thiserror-no-std", + "substrate-bn-succinct", + "thiserror 2.0.9", ] [[package]] @@ -2593,7 +2594,7 @@ dependencies = [ "musig2", "serde", "strata-primitives", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2607,7 +2608,7 @@ dependencies = [ "strata-eectl", "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2626,7 +2627,7 @@ version = "0.1.0" dependencies = [ "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2647,7 +2648,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.68", "tracing", "zeroize", ] @@ -2721,7 +2722,7 @@ dependencies = [ "strata-reth-primitives", "strata-state", "strata-zkvm", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2746,6 +2747,8 @@ dependencies = [ "reth-primitives", "revm", "revm-primitives", + "strata-crypto", + "strata-primitives", "strata-reth-primitives", ] @@ -2808,7 +2811,7 @@ dependencies = [ "strata-bridge-tx-builder", "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2820,7 +2823,7 @@ dependencies = [ "bincode", "borsh", "serde", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2866,9 +2869,10 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c855c26ad0594c830129cb868552fb41415603a6133276c2ecdd9e5ef4255" dependencies = [ "bytemuck", "byteorder", @@ -2958,7 +2962,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2972,6 +2985,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2" diff --git a/provers/sp1/guest-cl-agg/Cargo.lock b/provers/sp1/guest-cl-agg/Cargo.lock index 19aaf098b2..b6a9e51374 100644 --- a/provers/sp1/guest-cl-agg/Cargo.lock +++ b/provers/sp1/guest-cl-agg/Cargo.lock @@ -1757,7 +1757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -2129,7 +2129,7 @@ dependencies = [ "ripemd", "secp256k1", "sha2", - "substrate-bn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-bn", ] [[package]] @@ -2535,14 +2535,15 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1?rev=2c7868364cb832531e8cafd258aa06fbab079459#2c7868364cb832531e8cafd258aa06fbab079459" +version = "4.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4e33b7cb6da3a9a19a91c2615e7a08d8806fd0cc1ca01fb9e05ed8dcae09c" dependencies = [ "hex", "lazy_static", "sha2", - "substrate-bn 0.6.0 (git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2)", - "thiserror-no-std", + "substrate-bn-succinct", + "thiserror 2.0.9", ] [[package]] @@ -2593,7 +2594,7 @@ dependencies = [ "musig2", "serde", "strata-primitives", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2607,7 +2608,7 @@ dependencies = [ "strata-eectl", "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2626,7 +2627,7 @@ version = "0.1.0" dependencies = [ "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2647,7 +2648,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.68", "tracing", "zeroize", ] @@ -2698,7 +2699,7 @@ dependencies = [ "strata-reth-primitives", "strata-state", "strata-zkvm", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2709,6 +2710,8 @@ dependencies = [ "reth-primitives", "revm", "revm-primitives", + "strata-crypto", + "strata-primitives", "strata-reth-primitives", ] @@ -2766,7 +2769,7 @@ dependencies = [ "bincode", "borsh", "serde", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2812,9 +2815,10 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c855c26ad0594c830129cb868552fb41415603a6133276c2ecdd9e5ef4255" dependencies = [ "bytemuck", "byteorder", @@ -2904,7 +2908,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2918,6 +2931,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2" diff --git a/provers/sp1/guest-cl-stf/Cargo.lock b/provers/sp1/guest-cl-stf/Cargo.lock index 915f48bbae..acd8dacc8b 100644 --- a/provers/sp1/guest-cl-stf/Cargo.lock +++ b/provers/sp1/guest-cl-stf/Cargo.lock @@ -1757,7 +1757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -2129,7 +2129,7 @@ dependencies = [ "ripemd", "secp256k1", "sha2", - "substrate-bn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-bn", ] [[package]] @@ -2535,14 +2535,15 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1?rev=2c7868364cb832531e8cafd258aa06fbab079459#2c7868364cb832531e8cafd258aa06fbab079459" +version = "4.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4e33b7cb6da3a9a19a91c2615e7a08d8806fd0cc1ca01fb9e05ed8dcae09c" dependencies = [ "hex", "lazy_static", "sha2", - "substrate-bn 0.6.0 (git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2)", - "thiserror-no-std", + "substrate-bn-succinct", + "thiserror 2.0.9", ] [[package]] @@ -2593,7 +2594,7 @@ dependencies = [ "musig2", "serde", "strata-primitives", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2607,7 +2608,7 @@ dependencies = [ "strata-eectl", "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2626,7 +2627,7 @@ version = "0.1.0" dependencies = [ "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2647,7 +2648,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.68", "tracing", "zeroize", ] @@ -2689,7 +2690,7 @@ dependencies = [ "strata-reth-primitives", "strata-state", "strata-zkvm", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2700,6 +2701,8 @@ dependencies = [ "reth-primitives", "revm", "revm-primitives", + "strata-crypto", + "strata-primitives", "strata-reth-primitives", ] @@ -2757,7 +2760,7 @@ dependencies = [ "bincode", "borsh", "serde", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2803,9 +2806,10 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c855c26ad0594c830129cb868552fb41415603a6133276c2ecdd9e5ef4255" dependencies = [ "bytemuck", "byteorder", @@ -2895,7 +2899,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2909,6 +2922,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2" diff --git a/provers/sp1/guest-evm-ee-stf/Cargo.lock b/provers/sp1/guest-evm-ee-stf/Cargo.lock index 7badbda6c0..121221568e 100644 --- a/provers/sp1/guest-evm-ee-stf/Cargo.lock +++ b/provers/sp1/guest-evm-ee-stf/Cargo.lock @@ -1757,7 +1757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -2129,7 +2129,7 @@ dependencies = [ "ripemd", "secp256k1", "sha2", - "substrate-bn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-bn", ] [[package]] @@ -2535,14 +2535,15 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1?rev=2c7868364cb832531e8cafd258aa06fbab079459#2c7868364cb832531e8cafd258aa06fbab079459" +version = "4.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4e33b7cb6da3a9a19a91c2615e7a08d8806fd0cc1ca01fb9e05ed8dcae09c" dependencies = [ "hex", "lazy_static", "sha2", - "substrate-bn 0.6.0 (git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2)", - "thiserror-no-std", + "substrate-bn-succinct", + "thiserror 2.0.9", ] [[package]] @@ -2593,7 +2594,7 @@ dependencies = [ "musig2", "serde", "strata-primitives", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2623,7 +2624,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.68", "tracing", "zeroize", ] @@ -2652,7 +2653,7 @@ dependencies = [ "strata-reth-primitives", "strata-state", "strata-zkvm", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2663,6 +2664,8 @@ dependencies = [ "reth-primitives", "revm", "revm-primitives", + "strata-crypto", + "strata-primitives", "strata-reth-primitives", ] @@ -2720,7 +2723,7 @@ dependencies = [ "bincode", "borsh", "serde", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2766,9 +2769,10 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c855c26ad0594c830129cb868552fb41415603a6133276c2ecdd9e5ef4255" dependencies = [ "bytemuck", "byteorder", @@ -2858,7 +2862,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2872,6 +2885,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2" diff --git a/provers/sp1/guest-l1-batch/Cargo.lock b/provers/sp1/guest-l1-batch/Cargo.lock index f719cc99fd..a5c4752cd5 100644 --- a/provers/sp1/guest-l1-batch/Cargo.lock +++ b/provers/sp1/guest-l1-batch/Cargo.lock @@ -1410,7 +1410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.68", "ucd-trie", ] @@ -2077,14 +2077,15 @@ dependencies = [ [[package]] name = "sp1-verifier" -version = "3.0.0" -source = "git+https://github.com/succinctlabs/sp1?rev=2c7868364cb832531e8cafd258aa06fbab079459#2c7868364cb832531e8cafd258aa06fbab079459" +version = "4.0.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b4e33b7cb6da3a9a19a91c2615e7a08d8806fd0cc1ca01fb9e05ed8dcae09c" dependencies = [ "hex", "lazy_static", "sha2", - "substrate-bn", - "thiserror-no-std", + "substrate-bn-succinct", + "thiserror 2.0.9", ] [[package]] @@ -2135,7 +2136,7 @@ dependencies = [ "musig2", "serde", "strata-primitives", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2165,7 +2166,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.68", "tracing", "zeroize", ] @@ -2249,7 +2250,7 @@ dependencies = [ "strata-bridge-tx-builder", "strata-primitives", "strata-state", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2261,7 +2262,7 @@ dependencies = [ "bincode", "borsh", "serde", - "thiserror", + "thiserror 1.0.68", "tracing", ] @@ -2288,9 +2289,10 @@ dependencies = [ ] [[package]] -name = "substrate-bn" +name = "substrate-bn-succinct" version = "0.6.0" -source = "git+https://github.com/sp1-patches/bn?tag=substrate_bn-v0.6.0-patch-v2#8ef05d3969312eca34fa9f1f566a469022badda6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "114c855c26ad0594c830129cb868552fb41415603a6133276c2ecdd9e5ef4255" dependencies = [ "bytemuck", "byteorder", @@ -2368,7 +2370,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2382,6 +2393,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thiserror-impl-no-std" version = "2.0.2"