diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd7a8f38..deb5b107 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,8 @@ jobs: - uses: actions/checkout@v3 with: submodules: recursive - - uses: risc0/risc0/.github/actions/rustup@release-0.17 - - uses: risc0/risc0/.github/actions/sccache@release-0.17 + - uses: risc0/risc0/.github/actions/rustup@release-0.18 + - uses: risc0/risc0/.github/actions/sccache@release-0.18 - run: cargo install cargo-risczero && cargo risczero install - run: cargo test --workspace --all-targets --all-features @@ -34,8 +34,8 @@ jobs: - uses: actions/checkout@v3 with: submodules: recursive - - uses: risc0/risc0/.github/actions/rustup@release-0.17 - - uses: risc0/risc0/.github/actions/sccache@release-0.17 + - uses: risc0/risc0/.github/actions/rustup@release-0.18 + - uses: risc0/risc0/.github/actions/sccache@release-0.18 - uses: risc0/clippy-action@main with: reporter: 'github-pr-check' @@ -49,5 +49,5 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v3 - - uses: risc0/risc0/.github/actions/rustup@release-0.17 + - uses: risc0/risc0/.github/actions/rustup@release-0.18 - run: cargo fmt --all --check diff --git a/Cargo.lock b/Cargo.lock index 925eeefb..cb19fafc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,9 +467,9 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e9fa77caf50bfb060986f967d1a17a9dc890d9f0deea7daad4f460e76741d2" +checksum = "94478e373742b9d1de02e13399633348e5b230dfe6364f65e80056c7df7438c5" dependencies = [ "reqwest", "serde", @@ -2387,12 +2387,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.25" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 1.0.109", + "syn 2.0.26", ] [[package]] @@ -2474,9 +2474,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" dependencies = [ "bytes", "prost-derive", @@ -2484,44 +2484,44 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" dependencies = [ "bytes", "heck", "itertools", - "lazy_static", "log", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.109", + "syn 2.0.26", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.26", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" dependencies = [ "prost", ] @@ -2844,9 +2844,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47552e56df694790ef3fc91b4e0bb40de97f1ad6916e8545a17b6740f40c31fb" +checksum = "ede27631e6b2a946a43db812063453c9701d5d2544d82f9abec2cc12574ebb8e" dependencies = [ "anyhow", "elf", @@ -2858,9 +2858,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "354cff39064952cea41d6e49286b940766260b412ceae99ec090da40d24325b5" +checksum = "703b79671cd148f6535e1f78b8a74f665c920493eb6546c516c67ab0bc0bbde1" dependencies = [ "cargo_metadata", "risc0-binfmt", @@ -2872,9 +2872,9 @@ dependencies = [ [[package]] name = "risc0-build-kernel" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a3c48d9e9faf3c8e8e03dc63922a825f4a480aa1818980418c3482ce678ec1" +checksum = "80b88d565a721641f355cb889fee75c12c719dec7b910aa42ecabffa30d99f87" dependencies = [ "cc", "directories", @@ -2886,9 +2886,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb3685e42e4bf1e987b8f52de3606eb26792f4fe76d3ae07c5530b8fac14884" +checksum = "68e00222152fdc94cacc9b6682b5c0cbe8138f1ee82e80c24a64d9ad2c6d7415" dependencies = [ "anyhow", "log", @@ -2904,9 +2904,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086877b77644c8e912cd365ae325adf1a45eea63ea89bad46b6c72a95568b45a" +checksum = "2ca6ec6b1a7aad859af0009d19946ffdded8e3bd5d9accf893846b6bf996ac08" dependencies = [ "glob", "risc0-build-kernel", @@ -2916,9 +2916,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ef34344403c55e33095513948ab4f4e034ce5cb940d62470b58d44618603d3" +checksum = "08605aec93ea22ed83f7f81f42e2d7287a5b0c749d8671f94de9d5994020045c" dependencies = [ "bytemuck", "rand_core", @@ -2926,9 +2926,9 @@ dependencies = [ [[package]] name = "risc0-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd8fa36f2010dde7229ad96786ec7e41b093b6e4443bb96db22a6644114297c" +checksum = "d6d308c2ebc79e32c100f57722914b3172d2f0d69321703b684ea0c302e4f3a9" dependencies = [ "cc", "glob", @@ -2938,9 +2938,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd3454c4dfb4573178e7d802c0969e658f0bf38e793948b7d77cb57455a52993" +checksum = "28166926bb177824939f4e91083198f9f3da8137aeac32361bd34548c0526fa5" dependencies = [ "anyhow", "blake2", @@ -2965,15 +2965,16 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3363c73f05de3d3474b1796ebce5c19094820bc155f808f3172864991964758f" +checksum = "ec972152bcaa1a2967e412e22a84f6e2984a95c701bcc7943ca8ca10126ee0a2" dependencies = [ "addr2line", "anyhow", "bincode", "bonsai-sdk", "bytemuck", + "bytes", "cfg-if", "crypto-bigint", "generic-array", @@ -2998,6 +2999,7 @@ dependencies = [ "rrs-lib", "serde", "sha2", + "tempfile", "thiserror", "tracing", "typetag", @@ -3005,9 +3007,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be7dfd4644e051a450f2d4acecb37409fbdfb9a520cd6e96da3b17d415b92771" +checksum = "8524b46783b58b00e9b2a4712e837093c975b23cf25bfaf99e1cf69e9011bf6b" [[package]] name = "rlp" diff --git a/Cargo.toml b/Cargo.toml index 241058b6..5ae268f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,6 @@ lto = true opt-level = 3 [workspace.dependencies] -bonsai-sdk = "0.3" -risc0-build = "0.17" -risc0-zkvm = { version = "0.17", default-features = false } +bonsai-sdk = "0.4" +risc0-build = "0.18" +risc0-zkvm = { version = "0.18", default-features = false } diff --git a/guests/eth-block/Cargo.lock b/guests/eth-block/Cargo.lock index db3c435b..4fc133c2 100644 --- a/guests/eth-block/Cargo.lock +++ b/guests/eth-block/Cargo.lock @@ -2076,9 +2076,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47552e56df694790ef3fc91b4e0bb40de97f1ad6916e8545a17b6740f40c31fb" +checksum = "ede27631e6b2a946a43db812063453c9701d5d2544d82f9abec2cc12574ebb8e" dependencies = [ "anyhow", "elf", @@ -2090,9 +2090,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb3685e42e4bf1e987b8f52de3606eb26792f4fe76d3ae07c5530b8fac14884" +checksum = "68e00222152fdc94cacc9b6682b5c0cbe8138f1ee82e80c24a64d9ad2c6d7415" dependencies = [ "anyhow", "log", @@ -2104,9 +2104,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ef34344403c55e33095513948ab4f4e034ce5cb940d62470b58d44618603d3" +checksum = "08605aec93ea22ed83f7f81f42e2d7287a5b0c749d8671f94de9d5994020045c" dependencies = [ "bytemuck", "rand_core", @@ -2114,9 +2114,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd3454c4dfb4573178e7d802c0969e658f0bf38e793948b7d77cb57455a52993" +checksum = "28166926bb177824939f4e91083198f9f3da8137aeac32361bd34548c0526fa5" dependencies = [ "anyhow", "blake2", @@ -2135,9 +2135,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3363c73f05de3d3474b1796ebce5c19094820bc155f808f3172864991964758f" +checksum = "ec972152bcaa1a2967e412e22a84f6e2984a95c701bcc7943ca8ca10126ee0a2" dependencies = [ "anyhow", "bytemuck", @@ -2154,14 +2154,15 @@ dependencies = [ "risc0-zkp", "risc0-zkvm-platform", "serde", + "tempfile", "tracing", ] [[package]] name = "risc0-zkvm-platform" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be7dfd4644e051a450f2d4acecb37409fbdfb9a520cd6e96da3b17d415b92771" +checksum = "8524b46783b58b00e9b2a4712e837093c975b23cf25bfaf99e1cf69e9011bf6b" [[package]] name = "rlp" diff --git a/guests/eth-block/Cargo.toml b/guests/eth-block/Cargo.toml index 1fca2d06..98611727 100644 --- a/guests/eth-block/Cargo.toml +++ b/guests/eth-block/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] k256 = { version = "=0.13.1", features = ["std", "ecdsa"], default_features = false } -risc0-zkvm = { version = "0.17", default-features = false, features = ['std'] } +risc0-zkvm = { version = "0.18", default-features = false, features = ['std'] } zeth-lib = { path = "../../lib", default-features = false } [patch.crates-io] diff --git a/host/src/main.rs b/host/src/main.rs index aefd54f5..e2de9241 100644 --- a/host/src/main.rs +++ b/host/src/main.rs @@ -307,11 +307,9 @@ async fn main() -> Result<()> { let image_id = hex::encode(image.compute_id()); let image = bincode::serialize(&image).expect("Failed to serialize memory img"); - match client.upload_img(&image_id, image) { - Ok(_) => (), - Err(bonsai_sdk::SdkErr::ImageIdExists) => (), - Err(err) => panic!("Could not upload ELF: {}", err), - }; + client + .upload_img(&image_id, image) + .expect("Could not upload ELF"); image_id };