diff --git a/Cargo.lock b/Cargo.lock index a53f375..ce16b7a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,7 +71,7 @@ checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", - "derive_more", + "derive_more 0.99.18", "futures-util", "log", "once_cell", @@ -93,7 +93,7 @@ dependencies = [ "bitflags 2.6.0", "bytes", "bytestring", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "h2", @@ -204,7 +204,7 @@ dependencies = [ "bytes", "bytestring", "cfg-if 1.0.0", - "derive_more", + "derive_more 0.99.18", "encoding_rs", "futures-core", "futures-util", @@ -580,6 +580,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "auto_ops" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59" + [[package]] name = "autocfg" version = "1.4.0" @@ -757,8 +763,8 @@ dependencies = [ [[package]] name = "bonsai-sdk" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "duplicate", "maybe-async", @@ -1246,17 +1252,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-debug" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53ef7e1cf756fd5a8e74b9a0a9504ec446eddde86c3063a76ff26a13b7773b1" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_arbitrary" version = "1.4.1" @@ -1281,6 +1276,27 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "unicode-xid", +] + [[package]] name = "digest" version = "0.8.1" @@ -2602,7 +2618,7 @@ dependencies = [ "rand 0.7.3", "scopeguard", "sha2 0.8.2", - "sha3", + "sha3 0.8.2", ] [[package]] @@ -2808,6 +2824,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -3521,13 +3548,27 @@ dependencies = [ "anyhow", "borsh", "elf", - "risc0-zkp", - "risc0-zkvm-platform", + "risc0-zkp 1.1.3", + "risc0-zkvm-platform 1.1.3", "serde", "syn 2.0.87", "tracing", ] +[[package]] +name = "risc0-binfmt" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" +dependencies = [ + "anyhow", + "borsh", + "elf", + "risc0-zkp 1.2.0", + "risc0-zkvm-platform 1.2.0", + "serde", + "tracing", +] + [[package]] name = "risc0-build" version = "1.1.3" @@ -3538,9 +3579,27 @@ dependencies = [ "dirs", "docker-generate", "hex", - "risc0-binfmt", - "risc0-zkp", - "risc0-zkvm-platform", + "risc0-binfmt 1.1.3", + "risc0-zkp 1.1.3", + "risc0-zkvm-platform 1.1.3", + "serde", + "serde_json", + "tempfile", +] + +[[package]] +name = "risc0-build" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" +dependencies = [ + "anyhow", + "cargo_metadata", + "dirs", + "docker-generate", + "hex", + "risc0-binfmt 1.2.0", + "risc0-zkp 1.2.0", + "risc0-zkvm-platform 1.2.0", "serde", "serde_json", "tempfile", @@ -3548,8 +3607,8 @@ dependencies = [ [[package]] name = "risc0-build-kernel" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "cc", "directories", @@ -3563,8 +3622,8 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "anyhow", "bytemuck", @@ -3577,9 +3636,9 @@ dependencies = [ "rand 0.8.5", "rayon", "risc0-circuit-recursion-sys", - "risc0-core", + "risc0-core 1.2.0", "risc0-sys", - "risc0-zkp", + "risc0-zkp 1.2.0", "serde", "sha2 0.10.8", "tracing", @@ -3588,38 +3647,43 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion-sys" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "glob", "risc0-build-kernel", - "risc0-core", + "risc0-core 1.2.0", "risc0-sys", "sppark", ] [[package]] name = "risc0-circuit-rv32im" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "anyhow", + "auto_ops", "bytemuck", + "byteorder", "cfg-if 1.0.0", "crossbeam", "crypto-bigint", "cust", - "derive-debug", + "derive_more 1.0.0", "lazy-regex", "metal", + "num-bigint 0.4.6", + "num-derive", + "num-traits", "rand 0.8.5", "rayon", - "risc0-binfmt", + "risc0-binfmt 1.2.0", "risc0-circuit-rv32im-sys", - "risc0-core", + "risc0-core 1.2.0", "risc0-sys", - "risc0-zkp", - "risc0-zkvm-platform", + "risc0-zkp 1.2.0", + "risc0-zkvm-platform 1.2.0", "serde", "sha2 0.10.8", "tracing", @@ -3627,12 +3691,12 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im-sys" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "glob", "risc0-build-kernel", - "risc0-core", + "risc0-core 1.2.0", "risc0-sys", "sppark", ] @@ -3641,6 +3705,15 @@ dependencies = [ name = "risc0-core" version = "1.1.3" source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +dependencies = [ + "bytemuck", + "rand_core 0.6.4", +] + +[[package]] +name = "risc0-core" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "bytemuck", "nvtx", @@ -3650,8 +3723,8 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "anyhow", "ark-bn254", @@ -3662,19 +3735,20 @@ dependencies = [ "hex", "num-bigint 0.4.6", "num-traits", - "risc0-binfmt", - "risc0-core", - "risc0-zkp", + "risc0-binfmt 1.2.0", + "risc0-core 1.2.0", + "risc0-zkp 1.2.0", "serde", "serde_json", + "stability", "tempfile", "tracing", ] [[package]] name = "risc0-sys" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "anyhow", "cc", @@ -3687,6 +3761,29 @@ dependencies = [ name = "risc0-zkp" version = "1.1.3" source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +dependencies = [ + "anyhow", + "blake2", + "borsh", + "bytemuck", + "cfg-if 1.0.0", + "digest 0.10.7", + "hex", + "hex-literal", + "metal", + "paste 1.0.15", + "rand_core 0.6.4", + "risc0-core 1.1.3", + "risc0-zkvm-platform 1.1.3", + "serde", + "sha2 0.10.8", + "tracing", +] + +[[package]] +name = "risc0-zkp" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "anyhow", "blake2", @@ -3705,9 +3802,9 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rayon", - "risc0-core", + "risc0-core 1.2.0", "risc0-sys", - "risc0-zkvm-platform", + "risc0-zkvm-platform 1.2.0", "serde", "sha2 0.10.8", "tracing", @@ -3715,8 +3812,8 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.1.3" -source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "addr2line 0.22.0", "anyhow", @@ -3729,22 +3826,25 @@ dependencies = [ "getrandom 0.2.15", "hex", "lazy-regex", + "num-bigint 0.4.6", + "num-traits", "prost", "rand 0.8.5", "rayon", - "risc0-binfmt", - "risc0-build", + "risc0-binfmt 1.2.0", + "risc0-build 1.2.0", "risc0-circuit-recursion", "risc0-circuit-rv32im", - "risc0-core", + "risc0-core 1.2.0", "risc0-groth16", - "risc0-zkp", - "risc0-zkvm-platform", + "risc0-zkp 1.2.0", + "risc0-zkvm-platform 1.2.0", "rrs-lib", "rustc-demangle", "semver", "serde", "sha2 0.10.8", + "sha3 0.10.8", "stability", "tempfile", "tracing", @@ -3755,6 +3855,14 @@ dependencies = [ name = "risc0-zkvm-platform" version = "1.1.3" source = "git+https://github.com/risc0/risc0.git?branch=release-1.1#20df1afbcdd2ca442ece8c3fecd25a20cc0aafb5" +dependencies = [ + "stability", +] + +[[package]] +name = "risc0-zkvm-platform" +version = "1.2.0" +source = "git+https://github.com/risc0/risc0.git?branch=release-1.2#baf81cdbab100e706f5f8241fc47701c662111cd" dependencies = [ "bytemuck", "getrandom 0.2.15", @@ -3898,7 +4006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b" dependencies = [ "byteorder", - "derive_more", + "derive_more 0.99.18", "twox-hash", ] @@ -4173,6 +4281,16 @@ dependencies = [ "opaque-debug 0.2.3", ] +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.7", + "keccak", +] + [[package]] name = "shlex" version = "1.3.0" @@ -4423,7 +4541,7 @@ dependencies = [ name = "test-methods" version = "0.1.0" dependencies = [ - "risc0-build", + "risc0-build 1.1.3", ] [[package]] @@ -4710,6 +4828,12 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" version = "0.5.1" diff --git a/zkvm/Cargo.toml b/zkvm/Cargo.toml index 50cb256..69444e7 100644 --- a/zkvm/Cargo.toml +++ b/zkvm/Cargo.toml @@ -10,7 +10,7 @@ env_logger.workspace = true log.workspace = true serde.workspace = true -risc0-zkvm = { git = "https://github.com/risc0/risc0.git", branch = "release-1.1" } +risc0-zkvm = { git = "https://github.com/risc0/risc0.git", branch = "release-1.2" } test-methods = { path = "test_methods" } [features]