Skip to content

Commit

Permalink
bump to rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
capossele committed Jan 26, 2024
1 parent 28000ff commit cbaca0d
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 64 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
version: "1.4"

- name: Cargo binstall cargo-risczero
run: cargo binstall -y --force cargo-risczero@0.20.0-rc.3
run: cargo binstall -y --force cargo-risczero@0.20.0-rc.4

- name: risczero toolchain install
run: cargo risczero install
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
version: "1.4"

- name: Cargo binstall cargo-risczero
run: cargo binstall -y --force cargo-risczero@0.20.0-rc.3
run: cargo binstall -y --force cargo-risczero@0.20.0-rc.4

- name: risczero toolchain install
run: cargo risczero install
Expand Down
55 changes: 24 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ members = ["methods", "relay"]
resolver = "2"

[workspace.dependencies]
bonsai-ethereum-relay = { version = "0.6.0-rc.3" }
bonsai-sdk = { version = "0.6.0-rc.3" }
bonsai-ethereum-relay = { version = "0.6.0-rc.4" }
bonsai-sdk = { version = "0.6.0-rc.4" }
methods = { path = "./methods", package = "bonsai-starter-methods" }
risc0-build = { version = "0.20.0-rc.3" }
risc0-zkvm = { version = "0.20.0-rc.3", default-features = false }
risc0-build = { version = "0.20.0-rc.4" }
risc0-zkvm = { version = "0.20.0-rc.4", default-features = false }

# Always optimize; building and running the guest takes much longer without optimization.
[profile.dev]
Expand Down
2 changes: 1 addition & 1 deletion lib/risc0
Submodule risc0 updated 56 files
+2 −2 .github/workflows/release.yml
+0 −1 .vscode/settings.json
+18 −18 Cargo.toml
+14 −14 benchmarks/Cargo.lock
+7 −14 benchmarks/methods/guest/Cargo.lock
+10 −25 benchmarks/src/lib.rs
+17 −17 bonsai/Cargo.lock
+6 −6 bonsai/Cargo.toml
+1 −1 bonsai/ethereum-relay/Cargo.toml
+1 −1 bonsai/ethereum/Cargo.toml
+16 −16 bonsai/examples/governance/Cargo.lock
+7 −14 bonsai/examples/governance/methods/guest/Cargo.lock
+1 −1 bonsai/rest-api-mock/Cargo.toml
+1 −1 bonsai/sdk/Cargo.toml
+2 −1 bonsai/sdk/src/alpha.rs
+3 −3 compact_proof/seal_to_json/src/tests.rs
+14 −14 examples/Cargo.lock
+7 −14 examples/bevy/methods/guest/Cargo.lock
+7 −14 examples/chess/methods/guest/Cargo.lock
+8 −15 examples/composition/methods/guest/Cargo.lock
+7 −14 examples/digital-signature/methods/guest/Cargo.lock
+7 −14 examples/ecdsa/methods/guest/Cargo.lock
+7 −14 examples/groth16-verifier/methods/guest/Cargo.lock
+7 −14 examples/hello-world/methods/guest/Cargo.lock
+7 −14 examples/json/methods/guest/Cargo.lock
+7 −14 examples/jwt-validator/methods/guest/Cargo.lock
+7 −14 examples/password-checker/methods/guest/Cargo.lock
+7 −14 examples/profiling/methods/guest/Cargo.lock
+7 −14 examples/prorata/methods/guest/Cargo.lock
+7 −14 examples/sha/methods/guest/Cargo.lock
+7 −14 examples/smartcore-ml/methods/guest/Cargo.lock
+7 −14 examples/voting-machine/methods/guest/Cargo.lock
+7 −14 examples/waldo/methods/guest/Cargo.lock
+7 −14 examples/wasm/methods/guest/Cargo.lock
+7 −14 examples/wordle/methods/guest/Cargo.lock
+7 −14 examples/xgboost/methods/guest/Cargo.lock
+7 −14 examples/zkevm-demo/methods/guest/Cargo.lock
+8 −0 risc0/binfmt/src/image.rs
+0 −14 risc0/binfmt/src/sys_state.rs
+3 −3 risc0/build/src/docker.rs
+2 −2 risc0/zkp/src/hal/cuda.rs
+2 −1 risc0/zkvm/Cargo.toml
+3 −17 risc0/zkvm/benches/fib.rs
+15 −7 risc0/zkvm/examples/fib.rs
+13 −5 risc0/zkvm/examples/loop.rs
+9 −16 risc0/zkvm/methods/guest/Cargo.lock
+7 −14 risc0/zkvm/methods/rand/Cargo.lock
+9 −16 risc0/zkvm/methods/std/Cargo.lock
+4 −4 risc0/zkvm/src/host/recursion/tests.rs
+48 −23 risc0/zkvm/src/host/server/exec/executor.rs
+11 −7 risc0/zkvm/src/host/server/exec/tests.rs
+5 −1 risc0/zkvm/src/host/server/prove/tests.rs
+39 −96 risc0/zkvm/src/host/server/session.rs
+1 −0 risc0/zkvm/src/receipt_claim.rs
+1 −1 tools/smoke-test/Cargo.toml
+1 −1 tools/smoke-test/methods/Cargo.toml
35 changes: 14 additions & 21 deletions methods/guest/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion methods/guest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ path = "src/bin/fibonacci.rs"
ethabi = { version = "18.0", default-features = false }
# Directly import radium to silence warning about unused patch. See https://github.com/risc0/risc0/issues/549
radium = "=0.7.1"
risc0-zkvm = { version = "0.20.0-rc.3", default-features = false, features = ["std"] }
risc0-zkvm = { version = "0.20.0-rc.4", default-features = false, features = ["std"] }

[patch.crates-io]
radium = { git = "https://github.com/bitvecto-rs/radium", rev = "723bed5abd75994ee4b7221b8b12c9f4e77ce408" }
Expand Down
8 changes: 4 additions & 4 deletions relay/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use std::time::Duration;
use anyhow::{anyhow, bail, Context, Result};
use bonsai_sdk::alpha::{responses::SnarkReceipt, Client};
use risc0_build::GuestListEntry;
use risc0_zkvm::{compute_image_id, default_prover, ExecutorEnv, Receipt};
use risc0_zkvm::{compute_image_id, default_executor, ExecutorEnv, Receipt};

pub const POLL_INTERVAL_SEC: u64 = 4;

Expand All @@ -34,10 +34,10 @@ pub fn execute_locally(elf: &[u8], input: Vec<u8>) -> Result<Output> {
.write_slice(&input)
.build()
.context("Failed to build ExecutorEnv")?;
let prover = default_prover();
let receipt = prover.prove(env, elf).context("Execution failed")?;
let exec = default_executor();
let session_info = exec.execute(env, elf).context("Execution failed")?;
Ok(Output::Execution {
journal: receipt.journal.bytes,
journal: session_info.journal.bytes,
})
}

Expand Down

0 comments on commit cbaca0d

Please sign in to comment.