From 144e71d1415c994dd9b041e93788ee576a5fff3c Mon Sep 17 00:00:00 2001 From: Tom Date: Mon, 1 Dec 2025 10:10:01 +1100 Subject: [PATCH] fix macro --- Cargo.lock | 36 ++++++++++++++--------------- Cargo.toml | 2 +- crates/merkle/Cargo.toml | 2 +- crates/proof/src/guest/recursive.rs | 3 +-- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e3d8fc..42ccdfe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3747,9 +3747,9 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8f97f81bcdead4101bca06469ecef481a2695cd04e7e877b49dea56a7f6f2a" +checksum = "9dca096030bb4c52f99b12abcfe3531ea93b17b95a12a5aeb06fbf8ee588a275" dependencies = [ "anyhow", "borsh", @@ -3769,9 +3769,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbb512d728e011d03ce0958ca7954624ee13a215bcafd859623b3c63b2a3f60" +checksum = "e744682b661f2a022fddffddfe242608f8b194e839d9e83ddbb3378974942241" dependencies = [ "anyhow", "cargo_metadata", @@ -3793,9 +3793,9 @@ dependencies = [ [[package]] name = "risc0-circuit-keccak" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f195f865ac1afdc21a172d7756fdcc21be18e13eb01d78d3d7f2b128fa881ba" +checksum = "4e1d23ef3648bb85b0bd37bc9f9f7d13f1a4388e5e779e18f7eea82b969e5dbc" dependencies = [ "anyhow", "bytemuck", @@ -3809,9 +3809,9 @@ dependencies = [ [[package]] name = "risc0-circuit-recursion" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca8f15c8abc0fd8c097aa7459879110334d191c63dd51d4c28881c4a497279e" +checksum = "028cd26e1b1f7bdd964d2f1eac8f812d1872b6b8fd24f10804f07d916b90000e" dependencies = [ "anyhow", "bytemuck", @@ -3824,9 +3824,9 @@ dependencies = [ [[package]] name = "risc0-circuit-rv32im" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1b0689f4a270a2f247b04397ebb431b8f64fe5170e98ee4f9d71bd04825205" +checksum = "e7ecd73a71ddce62eab8a28552ee182dc2ea08cdce2a3474a616a80bf2d6e9be" dependencies = [ "anyhow", "bit-vec", @@ -3852,9 +3852,9 @@ dependencies = [ [[package]] name = "risc0-groth16" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724285dc79604abfb2d40feaefe3e335420a6b293511661f77d6af62f1f5fae9" +checksum = "73ff13f9b427254c5264e01aaa32e33f355525299b6829449295905778f3b1e8" dependencies = [ "anyhow", "ark-bn254", @@ -3873,9 +3873,9 @@ dependencies = [ [[package]] name = "risc0-zkos-v1compat" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840c2228803557a8b7dc035a8f196516b6fd68c9dc6ac092f0c86241b5b1bafb" +checksum = "faf1f35f2ef61d8d86fdd06288c11d2f3bbf08f1af66b24ca0a1976ecbf324a1" dependencies = [ "include_bytes_aligned", "no_std_strings", @@ -3884,9 +3884,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb6bf356f469bb8744f72a07a37134c5812c1d55d6271bba80e87bdb7a58c8e" +checksum = "beb493b3f007f04a11106a001c66bca77338d0fc375766189fd7ca3a1e8c3700" dependencies = [ "anyhow", "blake2", @@ -3909,9 +3909,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcce11648a9ff60b8e7af2f0ce7fbf8d25275ab6d414cc91b9da69ee75bc978" +checksum = "c39d9943fe71decea1e8b6a99480cefa33799ab08b5abfccd7e2a18fb07121c1" dependencies = [ "anyhow", "bincode", diff --git a/Cargo.toml b/Cargo.toml index f7e21e6..3c92cfd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ serde_json = "1.0.140" serde_yaml_ng = "0.10.0" sha2 = "0.10.9" reqwest = "0.12.22" -risc0-zkvm = "3.0.1" +risc0-zkvm = "3.0.4" thiserror = "2.0.16" tokio = { version = "1", features = ["full"] } tower = "0.5.2" diff --git a/crates/merkle/Cargo.toml b/crates/merkle/Cargo.toml index 641d00b..e13571c 100644 --- a/crates/merkle/Cargo.toml +++ b/crates/merkle/Cargo.toml @@ -9,7 +9,7 @@ repository.workspace = true [dependencies] alloy.workspace = true -serde.workspace = true +serde = { workspace = true, features = ["derive"] } sha2.workspace = true tracing.workspace = true diff --git a/crates/proof/src/guest/recursive.rs b/crates/proof/src/guest/recursive.rs index 85f5810..82781fc 100644 --- a/crates/proof/src/guest/recursive.rs +++ b/crates/proof/src/guest/recursive.rs @@ -126,8 +126,7 @@ where for (input, output) in commit .this_image_id .iter() - .map(|e| e.to_be_bytes()) - .flatten() + .flat_map(|e| e.to_be_bytes()) .zip(image_id.iter_mut()) { *output = input;