diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cc228fa1..2fd64fea 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,8 +28,6 @@ jobs: - name: Install Foundry uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f - with: - version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2 - name: lint methods rust code run: cargo fmt --all -- --check diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 452970be..aca6c10a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,8 +34,6 @@ jobs: - name: Install Foundry uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f - with: - version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2 - name: Install cargo-install uses: risc0/cargo-install@v1 @@ -44,7 +42,7 @@ jobs: version: "1.4" - name: Cargo binstall cargo-risczero - run: cargo binstall -y --force cargo-risczero@0.20.0-rc.4 + run: cargo binstall -y --force cargo-risczero@0.20.1 - name: risczero toolchain install run: cargo risczero install @@ -76,8 +74,6 @@ jobs: - name: Install Foundry uses: risc0/foundry-toolchain@2fe7e70b520f62368a0e3c464f997df07ede420f - with: - version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2 - name: Install cargo-install uses: risc0/cargo-install@v1 @@ -86,7 +82,7 @@ jobs: version: "1.4" - name: Cargo binstall cargo-risczero - run: cargo binstall -y --force cargo-risczero@0.20.0-rc.4 + run: cargo binstall -y --force cargo-risczero@0.20.1 - name: risczero toolchain install run: cargo risczero install diff --git a/Cargo.lock b/Cargo.lock index 852c16c3..48dd7923 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -713,9 +713,9 @@ dependencies = [ [[package]] name = "bonsai-ethereum-contracts" -version = "0.6.0-rc.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04aba101b38e0841bb625571c11c8732c04668c0547ca73a9be3b63491470d3c" +checksum = "500fc613726ab11d784a115217f921633c871513e96b0d1cddd863f2bd377f64" dependencies = [ "anyhow", "ethers", @@ -723,9 +723,9 @@ dependencies = [ [[package]] name = "bonsai-ethereum-relay" -version = "0.6.0-rc.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a6f45d7c21adb6b0fad80ee4ac7ff708dd934d5e31bbfc63699932ce6b6e8de" +checksum = "1bbe24ac42f57ec3a9080f01dd675431ea9f66d8aa4480a5e9f2d907092ca91c" dependencies = [ "anyhow", "async-trait", @@ -781,9 +781,9 @@ dependencies = [ [[package]] name = "bonsai-rest-api-mock" -version = "0.6.0-rc.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2957c88e68fe07903758d7986ffea9053812c458fdef897316e68993aa680d88" +checksum = "e326649da91b08b03c4543c40db9603459cd2a206614d4431ff1efde2403e821" dependencies = [ "anyhow", "axum", @@ -801,9 +801,9 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "0.6.0-rc.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729ab449d9b17e5eed737a16ba2e87b0650046e0e13bca433711c54428509474" +checksum = "d5f0a6b186dce8b2f945bd3ecc5d35a36280400200ed57878c7c3f2aeb01632e" dependencies = [ "reqwest", "serde", @@ -3500,9 +3500,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584e52f03de81fc93eaa421dd1565d97d99b5603f5ea072266c52c7c71c46a6" +checksum = "9d263c6370d7714d2a634b6d88deb3871d0fad1f9486a9da6d48139c1ac85b26" dependencies = [ "anyhow", "elf", @@ -3514,9 +3514,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2609fa54936cf8510533c045cf2a98ce852284228326ffc7b9ebdd8a73312006" +checksum = "a636849a58335ebece68161006a53d5590a6698092c3ca8e8a40a7c0aa8a20fb" dependencies = [ "anyhow", "cargo-platform", @@ -3532,9 +3532,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850d1cac31350963894d474f7dbebbd0303b80bf1ffc52b610ff7e7cfbde9236" +checksum = "bc9835069929a0e7b6b4b34e6a83f08aaa9d34b30023b9ccaf96ddbe20404eba" dependencies = [ "anyhow", "bytemuck", @@ -3546,9 +3546,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7377570b36b718e6b89a0d5c454822f3f3867d05293017f37976a2d1bd16a4" +checksum = "cb1caa759ab74d08779e062fcf98f5bd34397dfde572516a52369f0ec46db650" dependencies = [ "anyhow", "risc0-core", @@ -3559,9 +3559,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a694c3024ec62d47d53207b2f30462bfb50852e77a0663368456801568f8a7e5" +checksum = "be79c89bcd18886b376073e3da22f8b7963247a42dce7b49cf3d09853f51641e" dependencies = [ "bytemuck", "rand_core", @@ -3569,9 +3569,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8773239bc644f0d44f5197ff35f438ff392391270ff660f4581981ff9c4282b" +checksum = "e20a57e04840a5afadebb5d232546245f4fd8bd0e774bd69bf4bf25f8ab90c04" dependencies = [ "anyhow", "blake2", @@ -3589,9 +3589,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbfd7bab847ab6d1c59830ba51384c09e37a22426f6e3e313748ca8492ed246" +checksum = "922588cb4b884b3951316a65581ccdfd1174af93c54093190878366812073329" dependencies = [ "anyhow", "ark-bn254", @@ -3625,9 +3625,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f9bf85f03f5f5e24b9eae1100adcc035c5c8aaffea00490d704b426f37f9b3" +checksum = "cc5819c0c3bfd8f20b1226c9d4ca1f342eb3d8385e71211a9383a879643d1dde" dependencies = [ "bytemuck", "getrandom", diff --git a/Cargo.toml b/Cargo.toml index 691c2c38..53dd7077 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,11 +3,11 @@ members = ["methods", "relay"] resolver = "2" [workspace.dependencies] -bonsai-ethereum-relay = { version = "0.6.0-rc.4" } -bonsai-sdk = { version = "0.6.0-rc.4" } +bonsai-ethereum-relay = { version = "0.6.1" } +bonsai-sdk = { version = "0.6.1" } methods = { path = "./methods", package = "bonsai-starter-methods" } -risc0-build = { version = "0.20.0-rc.4" } -risc0-zkvm = { version = "0.20.0-rc.4", default-features = false } +risc0-build = { version = "0.20" } +risc0-zkvm = { version = "0.20", default-features = false } # Always optimize; building and running the guest takes much longer without optimization. [profile.dev] diff --git a/lib/risc0 b/lib/risc0 index 60a40ec3..e37f5be4 160000 --- a/lib/risc0 +++ b/lib/risc0 @@ -1 +1 @@ -Subproject commit 60a40ec3ade46841f49e921a8997df4a559981b4 +Subproject commit e37f5be4e95ca05c85e3c32f5c5a50943ac0abb5 diff --git a/lib/risc0-ethereum b/lib/risc0-ethereum new file mode 160000 index 00000000..3be9ef90 --- /dev/null +++ b/lib/risc0-ethereum @@ -0,0 +1 @@ +Subproject commit 3be9ef901d723e8f3efd4536bcd742f33d6fb16d diff --git a/methods/guest/Cargo.lock b/methods/guest/Cargo.lock index 36b582ef..6c5d925b 100644 --- a/methods/guest/Cargo.lock +++ b/methods/guest/Cargo.lock @@ -562,9 +562,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "risc0-binfmt" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584e52f03de81fc93eaa421dd1565d97d99b5603f5ea072266c52c7c71c46a6" +checksum = "9d263c6370d7714d2a634b6d88deb3871d0fad1f9486a9da6d48139c1ac85b26" dependencies = [ "anyhow", "elf", @@ -576,9 +576,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850d1cac31350963894d474f7dbebbd0303b80bf1ffc52b610ff7e7cfbde9236" +checksum = "bc9835069929a0e7b6b4b34e6a83f08aaa9d34b30023b9ccaf96ddbe20404eba" dependencies = [ "anyhow", "bytemuck", @@ -590,9 +590,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7377570b36b718e6b89a0d5c454822f3f3867d05293017f37976a2d1bd16a4" +checksum = "cb1caa759ab74d08779e062fcf98f5bd34397dfde572516a52369f0ec46db650" dependencies = [ "anyhow", "risc0-core", @@ -603,9 +603,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a694c3024ec62d47d53207b2f30462bfb50852e77a0663368456801568f8a7e5" +checksum = "be79c89bcd18886b376073e3da22f8b7963247a42dce7b49cf3d09853f51641e" dependencies = [ "bytemuck", "rand_core", @@ -613,9 +613,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8773239bc644f0d44f5197ff35f438ff392391270ff660f4581981ff9c4282b" +checksum = "e20a57e04840a5afadebb5d232546245f4fd8bd0e774bd69bf4bf25f8ab90c04" dependencies = [ "anyhow", "blake2", @@ -633,9 +633,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbfd7bab847ab6d1c59830ba51384c09e37a22426f6e3e313748ca8492ed246" +checksum = "922588cb4b884b3951316a65581ccdfd1174af93c54093190878366812073329" dependencies = [ "anyhow", "ark-bn254", @@ -663,9 +663,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "0.20.0-rc.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f9bf85f03f5f5e24b9eae1100adcc035c5c8aaffea00490d704b426f37f9b3" +checksum = "cc5819c0c3bfd8f20b1226c9d4ca1f342eb3d8385e71211a9383a879643d1dde" dependencies = [ "bytemuck", "getrandom", diff --git a/methods/guest/Cargo.toml b/methods/guest/Cargo.toml index 1e8b4e2b..37679f01 100644 --- a/methods/guest/Cargo.toml +++ b/methods/guest/Cargo.toml @@ -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.4", default-features = false, features = ["std"] } +risc0-zkvm = { version = "0.20", default-features = false, features = ["std"] } [patch.crates-io] radium = { git = "https://github.com/bitvecto-rs/radium", rev = "723bed5abd75994ee4b7221b8b12c9f4e77ce408" }