diff --git a/.github/workflows/bonsai.yml b/.github/workflows/bonsai.yml new file mode 100644 index 00000000..ec2e8382 --- /dev/null +++ b/.github/workflows/bonsai.yml @@ -0,0 +1,55 @@ +name: Bonsai integration + +on: + pull_request: + branches: ["release-*"] + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +# this is needed to gain access via OIDC to the S3 bucket for caching +permissions: + id-token: write + contents: read + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RISC0_TOOLCHAIN_VERSION: v2024-04-22.0 + RISC0_MONOREPO_REF: "v1.0.0-rc.7" + +jobs: + e2e-test: + # TODO: Using the nvidia_rtx_a5000 as a workaround because it has jq installed. + # Need to refactor the test-local-deployment.sh script or ensure jq is installed in this job instead. + runs-on: [self-hosted, prod, Linux, nvidia_rtx_a5000] + steps: + # This is a workaround from: https://github.com/actions/checkout/issues/590#issuecomment-970586842 + - run: "git checkout -f $(git -c user.name=x -c user.email=x@x commit-tree $(git hash-object -t tree /dev/null) < /dev/null) || :" + - uses: actions/checkout@v4 + with: + submodules: recursive + - uses: risc0/risc0/.github/actions/rustup@v1.0.0-rc.7 + - uses: risc0/risc0/.github/actions/sccache@v1.0.0-rc.7 + with: + key: Linux-default + - uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f + - uses: actions/setup-node@v4 + with: + node-version: 18 + - uses: ./.github/actions/cargo-risczero-install + with: + ref: ${{ env.RISC0_MONOREPO_REF }} + toolchain-version: ${{ env.RISC0_TOOLCHAIN_VERSION }} + features: default + - name: build erc20-Counter + run: cargo build + working-directory: examples/erc20-counter + - name: test erc20-Counter + run: ./test-local-deployment.sh + env: + BONSAI_API_URL: ${{ secrets.BONSAI_API_URL }} + BONSAI_API_KEY: ${{ secrets.BONSAI_API_KEY }} + working-directory: examples/erc20-counter + - run: sccache --show-stats diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a33c741..31a4e78c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ permissions: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RISC0_TOOLCHAIN_VERSION: v2024-04-22.0 - RISC0_MONOREPO_REF: "main" + RISC0_MONOREPO_REF: "v1.0.0-rc.7" jobs: # see: https://github.com/orgs/community/discussions/26822 @@ -45,7 +45,7 @@ jobs: # Full history is required by license-check.py fetch-depth: 0 submodules: recursive - - uses: risc0/risc0/.github/actions/rustup@main + - uses: risc0/risc0/.github/actions/rustup@v1.0.0-rc.7 - name: Install cargo-sort uses: risc0/cargo-install@b9307573043522ab0d3e3be64a51763b765b52a4 with: @@ -93,9 +93,9 @@ jobs: with: submodules: recursive - if: matrix.feature == 'cuda' - uses: risc0/risc0/.github/actions/cuda@main - - uses: risc0/risc0/.github/actions/rustup@main - - uses: risc0/risc0/.github/actions/sccache@main + uses: risc0/risc0/.github/actions/cuda@v1.0.0-rc.7 + - uses: risc0/risc0/.github/actions/rustup@v1.0.0-rc.7 + - uses: risc0/risc0/.github/actions/sccache@v1.0.0-rc.7 with: key: ${{ matrix.os }}-${{ matrix.feature }} - uses: ./.github/actions/cargo-risczero-install @@ -134,9 +134,9 @@ jobs: with: submodules: recursive - if: matrix.feature == 'cuda' - uses: risc0/risc0/.github/actions/cuda@main - - uses: risc0/risc0/.github/actions/rustup@main - - uses: risc0/risc0/.github/actions/sccache@main + uses: risc0/risc0/.github/actions/cuda@v1.0.0-rc.7 + - uses: risc0/risc0/.github/actions/rustup@v1.0.0-rc.7 + - uses: risc0/risc0/.github/actions/sccache@v1.0.0-rc.7 with: key: ${{ matrix.os }}-${{ matrix.feature }} - uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f @@ -167,8 +167,8 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive - - uses: risc0/risc0/.github/actions/rustup@main - - uses: risc0/risc0/.github/actions/sccache@main + - uses: risc0/risc0/.github/actions/rustup@v1.0.0-rc.7 + - uses: risc0/risc0/.github/actions/sccache@v1.0.0-rc.7 with: key: macOS-default - uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f diff --git a/Cargo.lock b/Cargo.lock index efac7e74..4cb0d6d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3425,9 +3425,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddaa9f3ab478e9f0809f144424294bdd6b6a008b610fda561b52b3e0091ddc" +checksum = "8675cbcc76c912d5e766ee6fe377c2204d8a6c8dd47a540c0bd9a673590d7279" dependencies = [ "anyhow", "elf", @@ -3439,9 +3439,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7c3ddc5a85f44436a23542e887f4f8f4b5c9c5e118937227eda5b3f2f4dd4" +checksum = "ea96470ab985621e5398bf51b537288b651502b14f6ae412e73c638935dc3ea1" dependencies = [ "anyhow", "cargo_metadata", @@ -3457,7 +3457,7 @@ dependencies = [ [[package]] name = "risc0-build-ethereum" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "hex", @@ -3468,9 +3468,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecdd242b189aeff30d7c643269b5a1222a2a79be7290ad63b96fcda5d8d2da31" +checksum = "459f0690e4e6da6579108b6a42ae0d32082c51b2c96c8b6889d319be742fe295" dependencies = [ "anyhow", "bytemuck", @@ -3482,9 +3482,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b508b3f0ef3ac4b5e2061f5d014c858532b82966f98267a2cd8359965744c7a" +checksum = "35e1868cbd856dfcd30a8dcf41bd981e2d40867302ead41c93f3ef76bfcc20fa" dependencies = [ "anyhow", "risc0-binfmt", @@ -3497,9 +3497,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c920fcc8ac6afec4a85310f9da74e681af885433fc19ae92e2737fd98b5cebac" +checksum = "97fa2b29c4232accff05dfb2025ba6596e7be11a8da5e8d73e657fdabfffee46" dependencies = [ "bytemuck", "rand_core", @@ -3507,18 +3507,19 @@ dependencies = [ [[package]] name = "risc0-ethereum-contracts" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" dependencies = [ "alloy-sol-types", "anyhow", "ethers", + "regex", "risc0-zkvm", "tokio", ] [[package]] name = "risc0-forge-ffi" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "clap", @@ -3530,9 +3531,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0f89500a5a319fb40d3eadee0f11c64c1abd1ddddb9851ee91d2689d15418a" +checksum = "270a9a9560168788c0cac60ff51ad201f7240416ffc0cad1a1cb9f851376f7d1" dependencies = [ "anyhow", "ark-bn254", @@ -3575,9 +3576,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05738c0fe5ff26e20aaf908f56ebde130f7f0065444589b5e39eb861307d7441" +checksum = "8b98e4ff1642e3b7b91edc8f2dd074207864320711b6ef0b290e05dcbae40513" dependencies = [ "anyhow", "blake2", @@ -3597,9 +3598,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c2302a8f57ad7be0b380ef8052fce8c60af95d9885510538039e1cee36b31b" +checksum = "41c3c905a3fb48c8c600cd3d9e40c41e1f7db2562c3b41535ad966f4ff5d0ab2" dependencies = [ "anyhow", "bincode", @@ -3627,9 +3628,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133887fea735374502c53d3c8e873d2ee0aead8c096da1ab9bc50ec4e0080dc" +checksum = "9a1585bd97cf03bedfd60534923542f26a60ff7c7aa2be15710b7e57ceb5705a" dependencies = [ "bytemuck", "getrandom", diff --git a/Cargo.toml b/Cargo.toml index eb3af030..9a965e8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ resolver = "2" members = ["build", "contracts", "ffi", "steel"] [workspace.package] -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" edition = "2021" license = "Apache-2.0" homepage = "https://risczero.com/" @@ -11,15 +11,15 @@ repository = "https://github.com/risc0/risc0-ethereum/" [workspace.dependencies] # Intra-workspace dependencies -risc0-build-ethereum = { version = "1.0.0-rc.6", default-features = false, path = "build" } -risc0-ethereum-contracts = { version = "1.0.0-rc.6", default-features = false, path = "contracts" } +risc0-build-ethereum = { version = "1.0.0-rc.7", default-features = false, path = "build" } +risc0-ethereum-contracts = { version = "1.0.0-rc.7", default-features = false, path = "contracts" } risc0-steel = { version = "0.11.0", default-features = false, path = "steel" } -risc0-forge-ffi = { version = "1.0.0-rc.6", default-features = false, path = "ffi" } +risc0-forge-ffi = { version = "1.0.0-rc.7", default-features = false, path = "ffi" } # risc0 monorepo dependencies. -risc0-build = { version = "1.0.0-rc.6", default-features = false } -risc0-zkp = { version = "1.0.0-rc.6", default-features = false } -risc0-zkvm = { version = "1.0.0-rc.6", default-features = false } +risc0-build = { version = "1.0.0-rc.7", default-features = false } +risc0-zkp = { version = "1.0.0-rc.7", default-features = false } +risc0-zkvm = { version = "1.0.0-rc.7", default-features = false } alloy-primitives = { version = "0.7", features = ["serde", "rlp", "std"] } alloy-rlp = { version = "0.3.4", default-features = false } diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml index 8c8a0232..e2555e46 100644 --- a/contracts/Cargo.toml +++ b/contracts/Cargo.toml @@ -17,6 +17,7 @@ ethers = { version = "2.0", features = ["rustls", "ws"] } risc0-zkvm = { workspace = true } [dev-dependencies] +regex = "1.10" tokio = { version = "1", features = ["macros", "rt"] } [lib] diff --git a/contracts/src/groth16.rs b/contracts/src/groth16.rs index ebb65a0a..832f9423 100644 --- a/contracts/src/groth16.rs +++ b/contracts/src/groth16.rs @@ -32,3 +32,44 @@ pub fn encode(seal: Vec) -> Result> { Ok(selector_seal) } + +#[cfg(test)] +mod tests { + use anyhow::anyhow; + use ethers::utils::hex; + use regex::Regex; + + use super::*; + use std::fs; + + const CONTROL_ID_PATH: &str = "./src/groth16/ControlID.sol"; + const CONTROL_ROOT: &str = "CONTROL_ROOT"; + const BN254_CONTROL_ID: &str = "BN254_CONTROL_ID"; + + fn parse_digest(file_path: &str, name: &str) -> Result { + let content = fs::read_to_string(file_path)?; + let re_digest = Regex::new(&format!(r#"{}\s*=\s*hex"([0-9a-fA-F]+)""#, name))?; + re_digest + .captures(&content) + .and_then(|caps| caps.get(1).map(|m| m.as_str().to_string())) + .ok_or(anyhow!("{name} not found")) + } + #[test] + fn control_root_is_consistent() { + let params = Groth16ReceiptVerifierParameters::default(); + let expected_control_root = params.control_root.to_string(); + let control_root = parse_digest(CONTROL_ID_PATH, CONTROL_ROOT).unwrap(); + assert_eq!(control_root, expected_control_root); + } + + #[test] + fn bn254_control_id_is_consistent() { + let params = Groth16ReceiptVerifierParameters::default(); + let mut expected_bn254_control_id = params.bn254_control_id; + expected_bn254_control_id.as_mut_bytes().reverse(); + let expected_bn254_control_id = hex::encode(expected_bn254_control_id); + let bn254_control_id = parse_digest(CONTROL_ID_PATH, BN254_CONTROL_ID).unwrap(); + + assert_eq!(bn254_control_id, expected_bn254_control_id); + } +} diff --git a/contracts/src/groth16/ControlID.sol b/contracts/src/groth16/ControlID.sol index c298baa5..30e14a77 100644 --- a/contracts/src/groth16/ControlID.sol +++ b/contracts/src/groth16/ControlID.sol @@ -20,7 +20,7 @@ pragma solidity ^0.8.9; library ControlID { - bytes32 public constant CONTROL_ROOT = hex"2c4aec26b74fdb27cd637d6106cfd64f6222aa55de73cd2b73189315b901ca09"; + bytes32 public constant CONTROL_ROOT = hex"a516a057c9fbf5629106300934d48e0e775d4230e41e503347cad96fcbde7e2e"; // NOTE: This has opposite byte order to the value in the risc0 repository. - bytes32 public constant BN254_CONTROL_ID = hex"10ff834dbef62ccbba201ecd26a772e3036a075aacbaf47200679a11dcdcf10d"; + bytes32 public constant BN254_CONTROL_ID = hex"0eb6febcf06c5df079111be116f79bd8c7e85dc9448776ef9a59aaf2624ab551"; } diff --git a/contracts/test/RiscZeroGroth16Verifier.t.sol b/contracts/test/RiscZeroGroth16Verifier.t.sol index 075ac44b..2a66d361 100644 --- a/contracts/test/RiscZeroGroth16Verifier.t.sol +++ b/contracts/test/RiscZeroGroth16Verifier.t.sol @@ -121,6 +121,6 @@ contract RiscZeroGroth16VerifierTest is Test { } function testSelectorIsStable() external view { - require(verifier.SELECTOR() == hex"f7ca3f2c"); + require(verifier.SELECTOR() == hex"310fe598"); } } diff --git a/contracts/test/TestReceipt.sol b/contracts/test/TestReceipt.sol index 04264338..9fa5b65d 100644 --- a/contracts/test/TestReceipt.sol +++ b/contracts/test/TestReceipt.sol @@ -21,7 +21,7 @@ pragma solidity ^0.8.13; library TestReceipt { bytes public constant SEAL = - hex"f7ca3f2c22c5b4ed763b535cc393c82b9331cd989a4b14070c0faf3c57fa865bd21754472f7cfd5c6a1dbd5fb869ec0835f0793dd6b7e9bccbb13d441a0850b3bf2def4221e20e3da20273e1fba741201759604f9c9acebf94cf37c4486f777ea1d1cd641193b851303c6cc7576145a77cc2db43ee905b6e62b87d82a6599fd345c641fa11634451dff4fe89f8891ddc02c3a8f4d1afe9db973b045571dd6fa327af731b12d02316a9624beef3c42f582d43502b48ac7502b73ddcd96d9bff6bfb92c9ae1af70ed70e95631746b4f0e48c338ce97f27d2ec9a4e3125e0e2f0c24212ba2f20eef84631cafea2f0b7fa6a04c454057f9b24b2829df14fb859c49a6efaa7e7"; + hex"310fe598039b6a4c59c576a9afc538bef01bd396cdbc979fe912c4d9c8f4f665c39b8a8f103328a969252a25e1aa69352f7d74b0093476c09e1cc4785201459259341fa220774a7b3e64067d37fa72251fd4766292dbebdea69b55e0790df3fedac65a601cca6fa7ec7d89b5711d8cf0533c1e44dc954de20dd1a7449544a11bd3dd6a453003d2b7dcfae42c88d3b38aa8ce84fc4e022ed91fa1f3ee06ae4b1eacf3033b2d4927494fc2a4dc44b18fac3084fd91d7e161e0e526a033e161f8d69de3babb163578f5916b554bd4a45531913d8c472f03744175bc1000de45110b7cef06d31257b005c5ca02af4704976f6fad82bf6e9e52ea208c7a4c535dc029db456589"; bytes public constant JOURNAL = hex"6a75737420612073696d706c652072656365697074"; - bytes32 public constant IMAGE_ID = hex"e3a35e555b8c69a10a97aee621d67321c1d43f018fcf1bfc041faa53e7b869a9"; + bytes32 public constant IMAGE_ID = hex"0e3b8f40fe72d3e43d0c29df23fd4b02607c9ae59bc166fb306fa2aa2ac7d640"; } diff --git a/examples/erc20-counter/Cargo.lock b/examples/erc20-counter/Cargo.lock index f75ad100..2a97fc5e 100644 --- a/examples/erc20-counter/Cargo.lock +++ b/examples/erc20-counter/Cargo.lock @@ -3402,9 +3402,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddaa9f3ab478e9f0809f144424294bdd6b6a008b610fda561b52b3e0091ddc" +checksum = "8675cbcc76c912d5e766ee6fe377c2204d8a6c8dd47a540c0bd9a673590d7279" dependencies = [ "anyhow", "elf", @@ -3416,9 +3416,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7c3ddc5a85f44436a23542e887f4f8f4b5c9c5e118937227eda5b3f2f4dd4" +checksum = "ea96470ab985621e5398bf51b537288b651502b14f6ae412e73c638935dc3ea1" dependencies = [ "anyhow", "cargo_metadata", @@ -3434,7 +3434,7 @@ dependencies = [ [[package]] name = "risc0-build-ethereum" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" dependencies = [ "anyhow", "hex", @@ -3444,9 +3444,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecdd242b189aeff30d7c643269b5a1222a2a79be7290ad63b96fcda5d8d2da31" +checksum = "459f0690e4e6da6579108b6a42ae0d32082c51b2c96c8b6889d319be742fe295" dependencies = [ "anyhow", "bytemuck", @@ -3458,9 +3458,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b508b3f0ef3ac4b5e2061f5d014c858532b82966f98267a2cd8359965744c7a" +checksum = "35e1868cbd856dfcd30a8dcf41bd981e2d40867302ead41c93f3ef76bfcc20fa" dependencies = [ "anyhow", "risc0-binfmt", @@ -3473,9 +3473,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c920fcc8ac6afec4a85310f9da74e681af885433fc19ae92e2737fd98b5cebac" +checksum = "97fa2b29c4232accff05dfb2025ba6596e7be11a8da5e8d73e657fdabfffee46" dependencies = [ "bytemuck", "rand_core", @@ -3483,7 +3483,7 @@ dependencies = [ [[package]] name = "risc0-ethereum-contracts" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" dependencies = [ "alloy-sol-types", "anyhow", @@ -3493,9 +3493,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0f89500a5a319fb40d3eadee0f11c64c1abd1ddddb9851ee91d2689d15418a" +checksum = "270a9a9560168788c0cac60ff51ad201f7240416ffc0cad1a1cb9f851376f7d1" dependencies = [ "anyhow", "ark-bn254", @@ -3535,9 +3535,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05738c0fe5ff26e20aaf908f56ebde130f7f0065444589b5e39eb861307d7441" +checksum = "8b98e4ff1642e3b7b91edc8f2dd074207864320711b6ef0b290e05dcbae40513" dependencies = [ "anyhow", "blake2", @@ -3557,9 +3557,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c2302a8f57ad7be0b380ef8052fce8c60af95d9885510538039e1cee36b31b" +checksum = "41c3c905a3fb48c8c600cd3d9e40c41e1f7db2562c3b41535ad966f4ff5d0ab2" dependencies = [ "anyhow", "bincode", @@ -3587,9 +3587,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133887fea735374502c53d3c8e873d2ee0aead8c096da1ab9bc50ec4e0080dc" +checksum = "9a1585bd97cf03bedfd60534923542f26a60ff7c7aa2be15710b7e57ceb5705a" dependencies = [ "bytemuck", "getrandom", diff --git a/examples/erc20-counter/Cargo.toml b/examples/erc20-counter/Cargo.toml index bcd00eda..8b82368e 100644 --- a/examples/erc20-counter/Cargo.toml +++ b/examples/erc20-counter/Cargo.toml @@ -14,9 +14,9 @@ risc0-ethereum-contracts = { path = "../../contracts" } risc0-steel = { path = "../../steel" } # risc0 monorepo dependencies. -risc0-build = { version = "1.0.0-rc.6", features = ["docker"] } -risc0-zkvm = { version = "1.0.0-rc.6", default-features = false } -risc0-zkp = { version = "1.0.0-rc.6", default-features = false } +risc0-build = { version = "1.0.0-rc.7", features = ["docker"] } +risc0-zkvm = { version = "1.0.0-rc.7", default-features = false } +risc0-zkp = { version = "1.0.0-rc.7", default-features = false } alloy-primitives = { version = "0.7", default-features = false, features = ["rlp", "serde", "std"] } alloy-sol-types = { version = "0.7" } diff --git a/examples/erc20-counter/methods/guest/Cargo.lock b/examples/erc20-counter/methods/guest/Cargo.lock index 41e9c756..939a1673 100644 --- a/examples/erc20-counter/methods/guest/Cargo.lock +++ b/examples/erc20-counter/methods/guest/Cargo.lock @@ -1427,9 +1427,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddaa9f3ab478e9f0809f144424294bdd6b6a008b610fda561b52b3e0091ddc" +checksum = "8675cbcc76c912d5e766ee6fe377c2204d8a6c8dd47a540c0bd9a673590d7279" dependencies = [ "anyhow", "elf", @@ -1441,9 +1441,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecdd242b189aeff30d7c643269b5a1222a2a79be7290ad63b96fcda5d8d2da31" +checksum = "459f0690e4e6da6579108b6a42ae0d32082c51b2c96c8b6889d319be742fe295" dependencies = [ "anyhow", "bytemuck", @@ -1455,9 +1455,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b508b3f0ef3ac4b5e2061f5d014c858532b82966f98267a2cd8359965744c7a" +checksum = "35e1868cbd856dfcd30a8dcf41bd981e2d40867302ead41c93f3ef76bfcc20fa" dependencies = [ "anyhow", "risc0-binfmt", @@ -1470,9 +1470,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c920fcc8ac6afec4a85310f9da74e681af885433fc19ae92e2737fd98b5cebac" +checksum = "97fa2b29c4232accff05dfb2025ba6596e7be11a8da5e8d73e657fdabfffee46" dependencies = [ "bytemuck", "rand_core", @@ -1480,9 +1480,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0f89500a5a319fb40d3eadee0f11c64c1abd1ddddb9851ee91d2689d15418a" +checksum = "270a9a9560168788c0cac60ff51ad201f7240416ffc0cad1a1cb9f851376f7d1" dependencies = [ "anyhow", "ark-bn254", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05738c0fe5ff26e20aaf908f56ebde130f7f0065444589b5e39eb861307d7441" +checksum = "8b98e4ff1642e3b7b91edc8f2dd074207864320711b6ef0b290e05dcbae40513" dependencies = [ "anyhow", "blake2", @@ -1539,9 +1539,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c2302a8f57ad7be0b380ef8052fce8c60af95d9885510538039e1cee36b31b" +checksum = "41c3c905a3fb48c8c600cd3d9e40c41e1f7db2562c3b41535ad966f4ff5d0ab2" dependencies = [ "anyhow", "bytemuck", @@ -1564,9 +1564,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133887fea735374502c53d3c8e873d2ee0aead8c096da1ab9bc50ec4e0080dc" +checksum = "9a1585bd97cf03bedfd60534923542f26a60ff7c7aa2be15710b7e57ceb5705a" dependencies = [ "bytemuck", "getrandom", diff --git a/examples/erc20-counter/methods/guest/Cargo.toml b/examples/erc20-counter/methods/guest/Cargo.toml index f6ed58cc..ca9142a7 100644 --- a/examples/erc20-counter/methods/guest/Cargo.toml +++ b/examples/erc20-counter/methods/guest/Cargo.toml @@ -16,7 +16,7 @@ ahash = { version = "0.8", default-features = false, features = ["compile-time-r alloy-primitives = { version = "0.7" } alloy-sol-types = { version = "0.7" } risc0-steel = { path = "../../../../steel" } -risc0-zkvm = { version = "1.0.0-rc.6", default-features = false, features = ["std"] } +risc0-zkvm = { version = "1.0.0-rc.7", default-features = false, features = ["std"] } [patch.crates-io] # use optimized risc0 circuit diff --git a/examples/erc20/Cargo.lock b/examples/erc20/Cargo.lock index c0289e24..6c86d3e2 100644 --- a/examples/erc20/Cargo.lock +++ b/examples/erc20/Cargo.lock @@ -2655,9 +2655,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddaa9f3ab478e9f0809f144424294bdd6b6a008b610fda561b52b3e0091ddc" +checksum = "8675cbcc76c912d5e766ee6fe377c2204d8a6c8dd47a540c0bd9a673590d7279" dependencies = [ "anyhow", "elf", @@ -2669,9 +2669,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e7c3ddc5a85f44436a23542e887f4f8f4b5c9c5e118937227eda5b3f2f4dd4" +checksum = "ea96470ab985621e5398bf51b537288b651502b14f6ae412e73c638935dc3ea1" dependencies = [ "anyhow", "cargo_metadata", @@ -2687,9 +2687,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecdd242b189aeff30d7c643269b5a1222a2a79be7290ad63b96fcda5d8d2da31" +checksum = "459f0690e4e6da6579108b6a42ae0d32082c51b2c96c8b6889d319be742fe295" dependencies = [ "anyhow", "bytemuck", @@ -2701,9 +2701,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b508b3f0ef3ac4b5e2061f5d014c858532b82966f98267a2cd8359965744c7a" +checksum = "35e1868cbd856dfcd30a8dcf41bd981e2d40867302ead41c93f3ef76bfcc20fa" dependencies = [ "anyhow", "risc0-binfmt", @@ -2716,9 +2716,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c920fcc8ac6afec4a85310f9da74e681af885433fc19ae92e2737fd98b5cebac" +checksum = "97fa2b29c4232accff05dfb2025ba6596e7be11a8da5e8d73e657fdabfffee46" dependencies = [ "bytemuck", "rand_core", @@ -2726,9 +2726,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0f89500a5a319fb40d3eadee0f11c64c1abd1ddddb9851ee91d2689d15418a" +checksum = "270a9a9560168788c0cac60ff51ad201f7240416ffc0cad1a1cb9f851376f7d1" dependencies = [ "anyhow", "ark-bn254", @@ -2768,9 +2768,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05738c0fe5ff26e20aaf908f56ebde130f7f0065444589b5e39eb861307d7441" +checksum = "8b98e4ff1642e3b7b91edc8f2dd074207864320711b6ef0b290e05dcbae40513" dependencies = [ "anyhow", "blake2", @@ -2790,9 +2790,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c2302a8f57ad7be0b380ef8052fce8c60af95d9885510538039e1cee36b31b" +checksum = "41c3c905a3fb48c8c600cd3d9e40c41e1f7db2562c3b41535ad966f4ff5d0ab2" dependencies = [ "anyhow", "bincode", @@ -2820,9 +2820,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133887fea735374502c53d3c8e873d2ee0aead8c096da1ab9bc50ec4e0080dc" +checksum = "9a1585bd97cf03bedfd60534923542f26a60ff7c7aa2be15710b7e57ceb5705a" dependencies = [ "bytemuck", "getrandom", diff --git a/examples/erc20/Cargo.toml b/examples/erc20/Cargo.toml index bf788838..c275d776 100644 --- a/examples/erc20/Cargo.toml +++ b/examples/erc20/Cargo.toml @@ -17,7 +17,7 @@ nybbles = { version = "0.2.1", features = ["serde"] } once_cell = "1.19" revm = { version = "9.0", default-features = false, features = ["std"] } risc0-steel = { path = "../../steel" } -risc0-zkvm = { version = "1.0.0-rc.6", default-features = false } +risc0-zkvm = { version = "1.0.0-rc.7", default-features = false } rlp = "0.5.2" serde = "1.0" thiserror = "1.0" diff --git a/examples/erc20/methods/Cargo.toml b/examples/erc20/methods/Cargo.toml index 608d6d92..76b64b80 100644 --- a/examples/erc20/methods/Cargo.toml +++ b/examples/erc20/methods/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [build-dependencies] -risc0-build = { version = "1.0.0-rc.6" } +risc0-build = { version = "1.0.0-rc.7" } [package.metadata.risc0] methods = ["guest"] diff --git a/examples/erc20/methods/guest/Cargo.lock b/examples/erc20/methods/guest/Cargo.lock index 8517d09c..4e5db1e9 100644 --- a/examples/erc20/methods/guest/Cargo.lock +++ b/examples/erc20/methods/guest/Cargo.lock @@ -1427,9 +1427,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddaa9f3ab478e9f0809f144424294bdd6b6a008b610fda561b52b3e0091ddc" +checksum = "8675cbcc76c912d5e766ee6fe377c2204d8a6c8dd47a540c0bd9a673590d7279" dependencies = [ "anyhow", "elf", @@ -1441,9 +1441,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecdd242b189aeff30d7c643269b5a1222a2a79be7290ad63b96fcda5d8d2da31" +checksum = "459f0690e4e6da6579108b6a42ae0d32082c51b2c96c8b6889d319be742fe295" dependencies = [ "anyhow", "bytemuck", @@ -1455,9 +1455,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b508b3f0ef3ac4b5e2061f5d014c858532b82966f98267a2cd8359965744c7a" +checksum = "35e1868cbd856dfcd30a8dcf41bd981e2d40867302ead41c93f3ef76bfcc20fa" dependencies = [ "anyhow", "risc0-binfmt", @@ -1470,9 +1470,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c920fcc8ac6afec4a85310f9da74e681af885433fc19ae92e2737fd98b5cebac" +checksum = "97fa2b29c4232accff05dfb2025ba6596e7be11a8da5e8d73e657fdabfffee46" dependencies = [ "bytemuck", "rand_core", @@ -1480,9 +1480,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0f89500a5a319fb40d3eadee0f11c64c1abd1ddddb9851ee91d2689d15418a" +checksum = "270a9a9560168788c0cac60ff51ad201f7240416ffc0cad1a1cb9f851376f7d1" dependencies = [ "anyhow", "ark-bn254", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05738c0fe5ff26e20aaf908f56ebde130f7f0065444589b5e39eb861307d7441" +checksum = "8b98e4ff1642e3b7b91edc8f2dd074207864320711b6ef0b290e05dcbae40513" dependencies = [ "anyhow", "blake2", @@ -1539,9 +1539,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c2302a8f57ad7be0b380ef8052fce8c60af95d9885510538039e1cee36b31b" +checksum = "41c3c905a3fb48c8c600cd3d9e40c41e1f7db2562c3b41535ad966f4ff5d0ab2" dependencies = [ "anyhow", "bytemuck", @@ -1564,9 +1564,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.0.0-rc.6" +version = "1.0.0-rc.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1133887fea735374502c53d3c8e873d2ee0aead8c096da1ab9bc50ec4e0080dc" +checksum = "9a1585bd97cf03bedfd60534923542f26a60ff7c7aa2be15710b7e57ceb5705a" dependencies = [ "bytemuck", "getrandom", diff --git a/examples/erc20/methods/guest/Cargo.toml b/examples/erc20/methods/guest/Cargo.toml index b5d057b9..dd4e29f4 100644 --- a/examples/erc20/methods/guest/Cargo.toml +++ b/examples/erc20/methods/guest/Cargo.toml @@ -12,7 +12,7 @@ ahash = { version = "0.8", default-features = false, features = ["compile-time-r alloy-primitives = { version = "0.7" } alloy-sol-types = { version = "0.7" } risc0-steel = { path = "../../../../steel" } -risc0-zkvm = { version = "1.0.0-rc.6", default-features = false, features = ["std"] } +risc0-zkvm = { version = "1.0.0-rc.7", default-features = false, features = ["std"] } [patch.crates-io] # use optimized risc0 circuit