diff --git a/Cargo.lock b/Cargo.lock index eb1b1d5..39ae29d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -319,7 +319,7 @@ checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" dependencies = [ "alloy-sol-macro-input", "const-hex", - "heck", + "heck 0.5.0", "indexmap 2.3.0", "proc-macro-error", "proc-macro2", @@ -337,7 +337,7 @@ checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" dependencies = [ "const-hex", "dunce", - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.74", @@ -971,6 +971,12 @@ dependencies = [ "rayon-core", ] +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + [[package]] name = "block-buffer" version = "0.10.4" @@ -1007,16 +1013,41 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "0.8.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7781292e9bcc1f54de6839dbab88b4032d2a20ab1d4fb3d8f045e9cecf5486e" +checksum = "4db32b2f09c464c802dfdce859031ef5db920795614f74123d5d4e687412e8a9" dependencies = [ + "duplicate", + "maybe-async", "reqwest 0.12.5", - "risc0-groth16", "serde", "thiserror", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive", + "cfg_aliases 0.2.1", +] + +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.74", + "syn_derive", +] + [[package]] name = "bumpalo" version = "3.16.0" @@ -1078,6 +1109,38 @@ dependencies = [ "serde", ] +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.23", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cc" version = "1.1.10" @@ -1109,6 +1172,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -1163,7 +1232,7 @@ version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.74", @@ -1243,6 +1312,17 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + [[package]] name = "cpp_demangle" version = "0.4.3" @@ -1713,6 +1793,12 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "docker-generate" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf673e0848ef09fa4aeeba78e681cf651c0c7d35f76ee38cec8e55bc32fa111" + [[package]] name = "downcast-rs" version = "1.2.1" @@ -1739,6 +1825,16 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "duplicate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", +] + [[package]] name = "dyn-clone" version = "1.0.17" @@ -1980,6 +2076,33 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2251,6 +2374,12 @@ dependencies = [ "serde", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "heck" version = "0.5.0" @@ -2798,6 +2927,15 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + [[package]] name = "matchers" version = "0.1.0" @@ -2823,6 +2961,17 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "maybe-async" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "memchr" version = "2.7.4" @@ -2844,6 +2993,21 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2145869435ace5ea6ea3d35f59be559317ec9a0d04e1812d5f185a87b6d36f1a" +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -2906,14 +3070,16 @@ dependencies = [ [[package]] name = "ndarray" -version = "0.15.6" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" dependencies = [ "matrixmultiply", "num-complex", "num-integer", "num-traits", + "portable-atomic", + "portable-atomic-util", "rawpointer", "rayon", ] @@ -2926,7 +3092,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] @@ -3153,6 +3319,15 @@ dependencies = [ "smallvec", ] +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + [[package]] name = "object" version = "0.35.0" @@ -3627,6 +3802,21 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[package]] +name = "portable-atomic" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" + +[[package]] +name = "portable-atomic-util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d" +dependencies = [ + "portable-atomic", +] + [[package]] name = "postcard" version = "1.0.8" @@ -3753,7 +3943,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", + "prost-derive 0.13.3", ] [[package]] @@ -3769,13 +3969,26 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "prost-derive" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" +dependencies = [ + "anyhow", + "itertools 0.13.0", + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost", + "prost 0.12.6", ] [[package]] @@ -3787,6 +4000,20 @@ dependencies = [ "cc", ] +[[package]] +name = "puffin" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9dae7b05c02ec1a6bc9bcf20d8bc64a7dcbf57934107902a872014899b741f" +dependencies = [ + "anyhow", + "byteorder", + "cfg-if", + "itertools 0.10.5", + "once_cell", + "parking_lot", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -4069,10 +4296,12 @@ dependencies = [ "sync_wrapper 1.0.1", "tokio", "tokio-rustls 0.26.0", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots 0.26.3", "winreg 0.52.0", @@ -4293,11 +4522,12 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4003dd96f2e323dfef431b21a2aaddee1c6791fc32dea8eb2bff1b438bf5caf6" +checksum = "c3b6d127eccb95114a829312b554bf85d02315da251f268996a872d7dc71d455" dependencies = [ "anyhow", + "borsh", "elf", "risc0-zkp", "risc0-zkvm-platform", @@ -4305,11 +4535,30 @@ dependencies = [ "tracing", ] +[[package]] +name = "risc0-build" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a0ab874b745a3352ed677a519fb0d788754100862b9d974ffe3ecfe15fdea5f" +dependencies = [ + "anyhow", + "cargo_metadata", + "dirs", + "docker-generate", + "hex", + "risc0-binfmt", + "risc0-zkp", + "risc0-zkvm-platform", + "serde", + "serde_json", + "tempfile", +] + [[package]] name = "risc0-build-kernel" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b372eeb78564f262aaa72270a87b94646821e09aa198606ff1e5487943a62b" +checksum = "b0cfd7f41b2270cecbce3e1217c0fef5402db4b7f5abeeb8eefbb801ebb953aa" dependencies = [ "cc", "directories", @@ -4323,22 +4572,25 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c4154d2fbbde5af02a1c35c90340c2749044f5d5cd7834251b616ffa28d467" +checksum = "fc5faca1aeb1e635714074e22f16f53912e34c190bde831e8aa01f2d824f7702" dependencies = [ "anyhow", "bytemuck", + "cfg-if", "cust", "downloader", "hex", - "nvtx", + "lazy-regex", + "metal", "rand", "rayon", "risc0-circuit-recursion-sys", "risc0-core", "risc0-sys", "risc0-zkp", + "serde", "sha2", "tracing", "zip", @@ -4346,9 +4598,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion-sys" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23995e726c28db57626a05f34f80bf223e23e8c4b53a5aa4afb4eaabc4bba923" +checksum = "15a30b613c6bc939501035abcc0724d18f919fd199476ec7835effbded711fa5" dependencies = [ "glob", "risc0-build-kernel", @@ -4359,9 +4611,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce836e7c553e63cbd807d15925ba5dd641a80cdee7d123619eaa60bb555ab014" +checksum = "5559011c6a1e4f8671202cdc0adb3702907c240f847d4b646182a1ce9a95d335" dependencies = [ "anyhow", "bytemuck", @@ -4371,7 +4623,7 @@ dependencies = [ "cust", "derive-debug", "lazy-regex", - "nvtx", + "metal", "rand", "rayon", "risc0-binfmt", @@ -4387,9 +4639,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07a69a3cb11175f7eeb2f07a7189f0baddb43233a6e7ed552724b1c7c7566152" +checksum = "b6123b87c70350761d83ac6bc1b8f0bd7eed2428cd0b4f0ea7fad1e640309559" dependencies = [ "glob", "risc0-build-kernel", @@ -4400,19 +4652,21 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047cc26c68c092d664ded7488dcac0462d9e31190e1598a7820fe4246d313583" +checksum = "5dda94253849f0e31ce944211f5081a8d33133e79343e0b1defc0faa7a7ab987" dependencies = [ "bytemuck", + "nvtx", + "puffin", "rand_core", ] [[package]] name = "risc0-groth16" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3309c7acaf46ed3d21df3841185afd8ea4aab9fb63dbd1974694dfdae276970" +checksum = "3ef58e37beb097da5d313c220fd291c56308faeb7c8a6ddceee82f56f52b5841" dependencies = [ "anyhow", "ark-bn254", @@ -4434,9 +4688,9 @@ dependencies = [ [[package]] name = "risc0-sys" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d1b6905a01d72dc9e90a668879b847f4132af4778525480288c8fe90401325" +checksum = "3b22bc6073278e45ffa325d808fd7813b9c511a7ed9f8c484a88b9a17b8a1d5f" dependencies = [ "cc", "cust", @@ -4446,12 +4700,13 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae55272541351a2391e5051519b33bfdf41f5648216827cc2cb94a49b6937380" +checksum = "f9e85591582355ecf9459c9bf2454e6c9095189ab47f17ed94b3ed47b138ec6d" dependencies = [ "anyhow", "blake2", + "borsh", "bytemuck", "cfg-if", "cust", @@ -4459,8 +4714,8 @@ dependencies = [ "ff 0.13.0", "hex", "hex-literal", + "metal", "ndarray", - "nvtx", "parking_lot", "paste", "rand", @@ -4476,26 +4731,26 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf582a2b8f7ef826ffc0dc2104965b36d47c94bac8847baeaf9ba8d691744026" +checksum = "b3f032d37abdcf6532d2a25aac32df976921f4a09d7acc72f70ce7d7c0bb4695" dependencies = [ "addr2line", "anyhow", "bincode", "bonsai-sdk", + "borsh", "bytemuck", "bytes", - "cfg-if", "elf", "getrandom", "hex", "lazy-regex", - "nvtx", - "prost", + "prost 0.13.3", "rand", "rayon", "risc0-binfmt", + "risc0-build", "risc0-circuit-recursion", "risc0-circuit-rv32im", "risc0-core", @@ -4507,6 +4762,7 @@ dependencies = [ "semver 1.0.23", "serde", "sha2", + "stability", "tempfile", "tracing", "typetag", @@ -4514,13 +4770,14 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16735dab52ae8bf0dc30df78fce901b674f469dfd7b5f5dfddd54caea22f14d5" +checksum = "f2284fecbc54d1274ea689387166c811e1d5dd8f51a407df322659eddec9c2fa" dependencies = [ "bytemuck", "getrandom", "libm", + "stability", ] [[package]] @@ -4858,6 +5115,9 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +dependencies = [ + "serde", +] [[package]] name = "semver-parser" @@ -5222,7 +5482,7 @@ source = "git+https://github.com/succinctlabs/sp1.git?branch=dev#7457d8be7a25e04 dependencies = [ "bincode", "ctrlc", - "prost", + "prost 0.12.6", "prost-types", "serde", "serde_json", @@ -5603,6 +5863,16 @@ dependencies = [ "which 4.4.2", ] +[[package]] +name = "stability" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" +dependencies = [ + "quote", + "syn 2.0.74", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -5649,7 +5919,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -5718,6 +5988,18 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6103,7 +6385,7 @@ dependencies = [ "http 1.1.0", "http-body-util", "hyper 1.4.1", - "prost", + "prost 0.12.6", "reqwest 0.12.5", "serde", "serde_json", @@ -6375,6 +6657,19 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.69" diff --git a/README.md b/README.md index 7faf502..2235b9a 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ This workflow is triggered by `adhoc-matrix.yml` and runs the actual benchmarks ```sh curl -L https://risczero.com/install | bash source ~/.bashrc - rzup + rzup install cargo risczero --version ``` diff --git a/eval.sh b/eval.sh index 2b7c51a..eda410c 100755 --- a/eval.sh +++ b/eval.sh @@ -63,6 +63,14 @@ else FEATURES="default" fi +if [ "$2" == "risc0" ]; then + if [ "$GPU_EXISTS" = true ]; then + FEATURES="risc0, cuda" + else + FEATURES="risc0" + fi +fi + # Run the benchmark. cargo run \ -p sp1-benchmarks-eval \ diff --git a/eval/Cargo.toml b/eval/Cargo.toml index f120cd1..908d654 100644 --- a/eval/Cargo.toml +++ b/eval/Cargo.toml @@ -26,7 +26,9 @@ sp1-cuda = { git = "https://github.com/succinctlabs/sp1.git", branch = "dev", op sp1-stark = { git = "https://github.com/succinctlabs/sp1.git", branch = "dev" } # risc0 -risc0-zkvm = { version = "=1.0.0", default-features = false, features = ["prove"], optional = true } +risc0-zkvm = { version = "=1.1.1", default-features = false, features = [ + "prove", +], optional = true } # sp1-reth sp1-reth-primitives = { git = "https://github.com/succinctlabs/sp1-reth.git", branch = "john/update-for-v1" } @@ -34,4 +36,4 @@ sp1-reth-primitives = { git = "https://github.com/succinctlabs/sp1-reth.git", br [features] default = [] cuda = ["dep:sp1-cuda", "risc0-zkvm?/cuda"] -risc0 = ["dep:risc0-zkvm"] \ No newline at end of file +risc0 = ["dep:risc0-zkvm"] diff --git a/install.sh b/install.sh index a926400..99e6adc 100644 --- a/install.sh +++ b/install.sh @@ -30,8 +30,9 @@ cargo prove --version || error_exit "Checking cargo prove version" # jolt install-toolchain || error_exit "Installing jolt runtime" # Install the Risc0 toolchain -cargo install cargo-binstall --force || error_exit "Installing cargo-binstall" -cargo binstall cargo-risczero -y || error_exit "Installing cargo-risczero" -cargo risczero install || error_exit "Installing Risc0 toolchain" +curl -L https://risczero.com/install | bash || error_exit "Installing Risc Zero toolchain" +source ~/.bashrc +rzup install || error_exit "Updating Risc Zero toolchain" +cargo risczero --version || error_exit "Checking cargo risczero version" echo "All installations completed successfully." \ No newline at end of file