diff --git a/Cargo.lock b/Cargo.lock index b2cc32df8..91874e6a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -937,18 +937,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "circuits-lib" -version = "0.1.0" -dependencies = [ - "borsh", - "lazy_static", - "risc0-zkvm", - "serde", - "sha2", - "tracing", -] - [[package]] name = "clap" version = "4.5.28" @@ -1207,6 +1195,27 @@ dependencies = [ "syn 1.0.109", ] +[[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.98", + "unicode-xid", +] + [[package]] name = "digest" version = "0.10.7" @@ -2901,12 +2910,13 @@ dependencies = [ [[package]] name = "risc0-binfmt" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fac7b3a4d7f6e86b2be2daf0ec53b9b8740895ff8279011cee24e4bae72cd77e" +checksum = "f9421cbee9903368a2bee6d1d5565c1f33ab64ba53f65959b45e2f9109759208" dependencies = [ "anyhow", "borsh", + "derive_more", "elf", "risc0-zkp", "risc0-zkvm-platform", @@ -2916,9 +2926,9 @@ dependencies = [ [[package]] name = "risc0-build" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4481ff9a05c3d96c0df2278a4681172fb40291253049a3ab57ffa2c46c24a0ba" +checksum = "c68b9039b5cafa149085d978a51673d0bd00908a27ce679bbc9c6ac182546025" dependencies = [ "anyhow", "cargo_metadata", @@ -2982,9 +2992,9 @@ dependencies = [ [[package]] name = "risc0-core" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da950fcd306644dc5c2c0a09ad288901450eb5f41c42f4f2120be2949f63cd2e" +checksum = "fddb27ec235b07d4e2e46771d671e4d70bd6b78829fd8e80ab337352dae3d67b" dependencies = [ "bytemuck", "rand_core", @@ -3013,9 +3023,9 @@ dependencies = [ [[package]] name = "risc0-zkp" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf3776370f26ea04e50f7e6f9d2468807aa1049063ca1b9000e1974d092ddc5" +checksum = "837473d5de4c736c20ea2b1a32c1953751b4c10c869bc582cab375b04fe22cc6" dependencies = [ "anyhow", "blake2", @@ -3032,6 +3042,7 @@ dependencies = [ "risc0-zkvm-platform", "serde", "sha2", + "stability", "tracing", ] @@ -3071,9 +3082,9 @@ dependencies = [ [[package]] name = "risc0-zkvm-platform" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6b5ac61f6d36b02655a415a8a2afd021aa260402d45deff5524c80dbc521f29" +checksum = "58cd5c2e3b9e9c81e6bbce82bf69fb710963836ff7ee9e1611bb39cd9f7607f9" dependencies = [ "bytemuck", "cfg-if", @@ -4169,6 +4180,12 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "unicode_categories" version = "0.1.1" @@ -4593,6 +4610,13 @@ dependencies = [ "bitflags 2.8.0", ] +[[package]] +name = "work-only" +version = "0.1.0" +dependencies = [ + "risc0-build", +] + [[package]] name = "write16" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 84ffdb51a..54cac7d10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ resolver = "2" members = [ "core", - "circuits-lib", + "risc0-circuits/work-only", ] # Add "risc0-circuits/operator", "risc0-circuits/watchtower" later [workspace.dependencies] diff --git a/bridge-circuit-host/Cargo.lock b/bridge-circuit-host/Cargo.lock index 23ab0e1d8..676f6c08c 100644 --- a/bridge-circuit-host/Cargo.lock +++ b/bridge-circuit-host/Cargo.lock @@ -760,74 +760,30 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" dependencies = [ - "ark-ec 0.4.2", + "ark-ec", "ark-ff 0.4.2", "ark-std 0.4.0", ] -[[package]] -name = "ark-bn254" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" -dependencies = [ - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-std 0.5.0", -] - [[package]] name = "ark-crypto-primitives" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56" dependencies = [ - "ark-ec 0.4.2", + "ark-ec", "ark-ff 0.4.2", - "ark-relations 0.4.0", + "ark-relations", "ark-serialize 0.4.2", - "ark-snark 0.4.0", + "ark-snark", "ark-std 0.4.0", "blake2", "derivative", "digest 0.10.7", - "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ark-crypto-primitives" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0c292754729c8a190e50414fd1a37093c786c709899f29c9f7daccecfa855e" -dependencies = [ - "ahash", - "ark-crypto-primitives-macros", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-snark 0.5.1", - "ark-std 0.5.0", - "blake2", - "derivative", - "digest 0.10.7", - "fnv", - "merlin", "rayon", "sha2 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ark-crypto-primitives-macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e89fe77d1f0f4fe5b96dfc940923d88d17b6a773808124f21e764dfb063c6a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-ec" version = "0.4.2" @@ -835,34 +791,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ "ark-ff 0.4.2", - "ark-poly 0.4.2", + "ark-poly", "ark-serialize 0.4.2", "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", "itertools 0.10.5", "num-traits", - "zeroize", -] - -[[package]] -name = "ark-ec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" -dependencies = [ - "ahash", - "ark-ff 0.5.0", - "ark-poly 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "educe", - "fnv", - "hashbrown 0.15.2", - "itertools 0.13.0", - "num-bigint 0.4.6", - "num-integer", - "num-traits", "rayon", "zeroize", ] @@ -901,28 +836,8 @@ dependencies = [ "num-bigint 0.4.6", "num-traits", "paste", - "rustc_version 0.4.1", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" -dependencies = [ - "ark-ff-asm 0.5.0", - "ark-ff-macros 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "arrayvec", - "digest 0.10.7", - "educe", - "itertools 0.13.0", - "num-bigint 0.4.6", - "num-traits", - "paste", "rayon", + "rustc_version 0.4.1", "zeroize", ] @@ -946,16 +861,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-asm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" -dependencies = [ - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-ff-macros" version = "0.3.0" @@ -981,47 +886,19 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-groth16" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc" dependencies = [ - "ark-crypto-primitives 0.4.0", - "ark-ec 0.4.2", + "ark-crypto-primitives", + "ark-ec", "ark-ff 0.4.2", - "ark-poly 0.4.2", - "ark-relations 0.4.0", + "ark-poly", + "ark-relations", "ark-serialize 0.4.2", "ark-std 0.4.0", -] - -[[package]] -name = "ark-groth16" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88f1d0f3a534bb54188b8dcc104307db6c56cdae574ddc3212aec0625740fc7e" -dependencies = [ - "ark-crypto-primitives 0.5.0", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-poly 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-std 0.5.0", "rayon", ] @@ -1036,21 +913,6 @@ dependencies = [ "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", -] - -[[package]] -name = "ark-poly" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" -dependencies = [ - "ahash", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "educe", - "fnv", - "hashbrown 0.15.2", "rayon", ] @@ -1063,19 +925,7 @@ dependencies = [ "ark-ff 0.4.2", "ark-std 0.4.0", "tracing", - "tracing-subscriber", -] - -[[package]] -name = "ark-relations" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384" -dependencies = [ - "ark-ff 0.5.0", - "ark-std 0.5.0", - "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1094,26 +944,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ - "ark-serialize-derive 0.4.2", + "ark-serialize-derive", "ark-std 0.4.0", "digest 0.10.7", "num-bigint 0.4.6", ] -[[package]] -name = "ark-serialize" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" -dependencies = [ - "ark-serialize-derive 0.5.0", - "ark-std 0.5.0", - "arrayvec", - "digest 0.10.7", - "num-bigint 0.4.6", - "rayon", -] - [[package]] name = "ark-serialize-derive" version = "0.4.2" @@ -1125,17 +961,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-serialize-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-snark" version = "0.4.0" @@ -1143,23 +968,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63" dependencies = [ "ark-ff 0.4.2", - "ark-relations 0.4.0", + "ark-relations", "ark-serialize 0.4.2", "ark-std 0.4.0", ] -[[package]] -name = "ark-snark" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d368e2848c2d4c129ce7679a7d0d2d612b6a274d3ea6a13bad4445d61b381b88" -dependencies = [ - "ark-ff 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-std 0.5.0", -] - [[package]] name = "ark-std" version = "0.3.0" @@ -1175,16 +988,6 @@ name = "ark-std" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" -dependencies = [ - "num-traits", - "rand", -] - -[[package]] -name = "ark-std" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" dependencies = [ "num-traits", "rand", @@ -1502,14 +1305,14 @@ dependencies = [ name = "bridge-circuit-core" version = "1.0.0" dependencies = [ - "ark-bn254 0.5.0", - "ark-crypto-primitives 0.5.0", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-groth16 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-bn254", + "ark-crypto-primitives", + "ark-ec", + "ark-ff 0.4.2", + "ark-groth16", + "ark-relations", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "bitcoin", "borsh", "final-spv", @@ -2054,18 +1857,6 @@ dependencies = [ "spki", ] -[[package]] -name = "educe" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "either" version = "1.14.0" @@ -2117,26 +1908,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -2602,14 +2373,14 @@ dependencies = [ "alloy-rpc-types", "alloy-rpc-types-eth 0.11.1", "anyhow", - "ark-bn254 0.5.0", - "ark-crypto-primitives 0.5.0", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-groth16 0.5.0", - "ark-relations 0.4.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-bn254", + "ark-crypto-primitives", + "ark-ec", + "ark-ff 0.4.2", + "ark-groth16", + "ark-relations", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "bincode", "bitcoin", "borsh", @@ -2626,6 +2397,8 @@ dependencies = [ "serde", "serde_json", "tokio", + "tracing", + "tracing-subscriber 0.3.19", ] [[package]] @@ -3139,6 +2912,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matrixmultiply" version = "0.3.9" @@ -3175,18 +2957,6 @@ dependencies = [ "libc", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core", - "zeroize", -] - [[package]] name = "metal" version = "0.29.0" @@ -3261,6 +3031,16 @@ dependencies = [ "rayon", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.3.3" @@ -3462,6 +3242,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parity-scale-codec" version = "3.7.4" @@ -3713,7 +3499,7 @@ dependencies = [ "rand", "rand_chacha", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -3923,8 +3709,17 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -3935,9 +3730,15 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.5", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.5" @@ -4212,9 +4013,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0c5595a48efc6e94d303a0d4a87aedec1a0162fa696e2e1b944aba997c8f808" dependencies = [ "anyhow", - "ark-bn254 0.4.0", - "ark-ec 0.4.2", - "ark-groth16 0.4.0", + "ark-bn254", + "ark-ec", + "ark-groth16", "ark-serialize 0.4.2", "bytemuck", "hex", @@ -4272,9 +4073,9 @@ dependencies = [ [[package]] name = "risc0-zkvm" -version = "1.2.4" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d041321ecfe340e112dcbbf1d45fe2f4655e6c53851ede39e2b38c173eac41e3" +checksum = "e7ecc97ec255ad47e1de41b9691a8d92fa48efb779b611d28c3a1c4b7c79abd0" dependencies = [ "addr2line 0.22.0", "anyhow", @@ -4691,6 +4492,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.3.0" @@ -4961,6 +4771,16 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "threadpool" version = "1.8.1" @@ -5199,6 +5019,27 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -5208,6 +5049,27 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -5489,6 +5351,28 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-registry" version = "0.2.0" diff --git a/bridge-circuit-host/Cargo.toml b/bridge-circuit-host/Cargo.toml index 342b32268..aab9f3bbd 100644 --- a/bridge-circuit-host/Cargo.toml +++ b/bridge-circuit-host/Cargo.toml @@ -4,7 +4,8 @@ members = ["host"] [workspace.dependencies] tracing = { version = "0.1.40", default-features = false } -tracing-subscriber = { version = "0.3.18", features = ["json"] } +tracing-subscriber = { version = "0.3.18", features = ["json", "std", "env-filter"] } + # Always optimize; building and running the guest takes much longer without optimization. [profile.dev] diff --git a/bridge-circuit-host/host/Cargo.toml b/bridge-circuit-host/host/Cargo.toml index 850d5b18a..3ce177842 100644 --- a/bridge-circuit-host/host/Cargo.toml +++ b/bridge-circuit-host/host/Cargo.toml @@ -5,12 +5,14 @@ edition = "2021" [dependencies] risc0-zkvm = { version = "1.2.3", features = ["metal"]} -ark-bn254 = "0.5.0" -ark-ff = "0.5.0" -ark-ec = "0.5.0" -ark-std = "0.5.0" -ark-crypto-primitives = "0.5.0" -ark-serialize = "0.5.0" +ark-bn254 = "=0.4.0" +ark-ff = "=0.4.2" +ark-ec = "=0.4.2" +ark-std = "=0.4.0" +ark-crypto-primitives = "=0.4.0" +ark-serialize = "=0.4.2" +ark-relations = "=0.4.0" +ark-groth16 = "=0.4.0" serde = "1.0" rand = { version = "0.8", features = ["small_rng"] } bridge-circuit-core = { path = "../../risc0-circuits/core" } @@ -31,8 +33,8 @@ bincode = "1.3.3" hex = "0.4.3" alloy-rpc-types-eth = { version = "0.11.1", features = ["serde"] } hex-literal = "0.4.1" -ark-relations = "=0.4.0" -ark-groth16 = "0.5.0" +tracing = { version = "0.1.40", default-features = false } +tracing-subscriber = { version = "0.3.18", features = ["json", "std", "env-filter"] } [features] metal = ["risc0-zkvm/metal"] diff --git a/bridge-circuit-host/host/src/bin-files/first_9.bin b/bridge-circuit-host/host/src/bin-files/first_9.bin new file mode 100644 index 000000000..d5ec0d371 Binary files /dev/null and b/bridge-circuit-host/host/src/bin-files/first_9.bin differ diff --git a/bridge-circuit-host/host/src/main.rs b/bridge-circuit-host/host/src/main.rs index d95ca29fe..8558aa97c 100644 --- a/bridge-circuit-host/host/src/main.rs +++ b/bridge-circuit-host/host/src/main.rs @@ -17,10 +17,11 @@ use bridge_circuit_core::winternitz::{ generate_public_key, sign_digits, Parameters, WinternitzCircuitInput, WinternitzHandler, }; use bridge_circuit_core::WorkOnlyCircuitInput; - +use tracing_subscriber::util::SubscriberInitExt; +use tracing_subscriber::{layer::SubscriberExt, filter::EnvFilter}; const HEADERS: &[u8] = include_bytes!("bin-files/testnet4-headers.bin"); const TESTNET_BLOCK_47029: &[u8] = include_bytes!("bin-files/testnet4_block_47029.bin"); -const HEADER_CHAIN_INNER_PROOF: &[u8] = include_bytes!("bin-files/first_70000_proof.bin"); +const HEADER_CHAIN_INNER_PROOF: &[u8] = include_bytes!("bin-files/first_9.bin"); const BRIDGE_CIRCUIT_ELF: &[u8] = include_bytes!("../../../risc0-circuits/elfs/testnet4-bridge-circuit-guest"); const WORK_ONLY_ELF: &[u8] = include_bytes!("../../../risc0-circuits/elfs/testnet4-work-only-guest"); @@ -28,6 +29,12 @@ const PAYOUT_TX: [u8; 301] = hex_literal::hex!("02000000000102d43afcd7236286bee4 #[tokio::main] async fn main() { + + tracing_subscriber::registry() + .with(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("debug"))) + .with(tracing_subscriber::fmt::layer()) + .init(); + let winternitz_id: [u32; 8] = compute_image_id(BRIDGE_CIRCUIT_ELF).unwrap().into(); let work_only_id: [u32; 8] = compute_image_id(WORK_ONLY_ELF).unwrap().into(); @@ -138,6 +145,7 @@ fn call_work_only(receipt: Receipt, input: &WorkOnlyCircuitInput) -> Receipt { let env = binding.write_slice(&borsh::to_vec(&input).unwrap()); let env = env.build().unwrap(); let prover = default_prover(); + println!("input: {:?}", input); prover .prove_with_opts(env, WORK_ONLY_ELF, &ProverOpts::groth16()) .unwrap() diff --git a/circuits-lib/src/lib.rs b/circuits-lib/src/lib.rs index edaf937f1..a1bcdb3b0 100644 --- a/circuits-lib/src/lib.rs +++ b/circuits-lib/src/lib.rs @@ -1,6 +1,4 @@ pub mod common; -pub mod operator; -pub mod watchtower; use common::zkvm::ZkvmGuest; // use operator::{OperatorCircuitInput, OperatorCircuitOutput}; diff --git a/core/src/utils.rs b/core/src/utils.rs index e33d8e055..32ee4643b 100644 --- a/core/src/utils.rs +++ b/core/src/utils.rs @@ -444,7 +444,7 @@ pub fn initialize_logger(level: Option) -> Result<(), BridgeError> ) } else { tracing_subscriber::util::SubscriberInitExt::try_init( - tracing_subscriber::registry() + tracing_subscriber::registry() .with(standard_layer) .with(filter), ) diff --git a/risc0-circuits/core/Cargo.toml b/risc0-circuits/core/Cargo.toml index 6384a2e4f..4c49d14ca 100644 --- a/risc0-circuits/core/Cargo.toml +++ b/risc0-circuits/core/Cargo.toml @@ -15,14 +15,14 @@ bitcoin = { version = "0.32.5", features = ["rand-std", "serde"] } rand = { version = "0.8", features = ["small_rng"] } sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" } ripemd = "0.1.3" -ark-bn254 = "0.5.0" -ark-ff = "0.5.0" -ark-ec = "0.5.0" -ark-groth16 = { version="0.5.0", default-features = false } -ark-std = "0.5.0" -ark-serialize = "0.5.0" -ark-crypto-primitives = "0.5.0" -ark-relations = "0.5.0" +ark-bn254 = "=0.4.0" +ark-ff = "=0.4.2" +ark-ec = "=0.4.2" +ark-std = "=0.4.0" +ark-crypto-primitives = "=0.4.0" +ark-serialize = "=0.4.2" +ark-relations = "=0.4.0" +ark-groth16 = "=0.4.0" borsh = {version = "1.5.3", features = ["derive"] } num-bigint = "0.4.6" num-traits = "0.2.19" diff --git a/risc0-circuits/core/src/groth16.rs b/risc0-circuits/core/src/groth16.rs index 5d08a6a7b..d7bd5e2f7 100644 --- a/risc0-circuits/core/src/groth16.rs +++ b/risc0-circuits/core/src/groth16.rs @@ -24,12 +24,12 @@ impl CircuitGroth16Proof { ); let b = G2::new( - ark_bn254::Fq2::from_base_prime_field_elems([ + ark_bn254::Fq2::from_base_prime_field_elems(&[ ark_bn254::Fq::from_be_bytes_mod_order(&seal[96..128]), ark_bn254::Fq::from_be_bytes_mod_order(&seal[64..96]), ]) .unwrap(), - ark_bn254::Fq2::from_base_prime_field_elems([ + ark_bn254::Fq2::from_base_prime_field_elems(&[ ark_bn254::Fq::from_be_bytes_mod_order(&seal[160..192]), ark_bn254::Fq::from_be_bytes_mod_order(&seal[128..160]), ]) diff --git a/risc0-circuits/elfs/testnet4-work-only-guest b/risc0-circuits/elfs/testnet4-work-only-guest index b5bd67fa8..1c495a03b 100755 Binary files a/risc0-circuits/elfs/testnet4-work-only-guest and b/risc0-circuits/elfs/testnet4-work-only-guest differ diff --git a/risc0-circuits/work-only/guest/Cargo.lock b/risc0-circuits/work-only/guest/Cargo.lock index e2f330748..d98f194a4 100644 --- a/risc0-circuits/work-only/guest/Cargo.lock +++ b/risc0-circuits/work-only/guest/Cargo.lock @@ -14,12 +14,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "allocator-api2" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" - [[package]] name = "anyhow" version = "1.0.95" @@ -32,20 +26,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" dependencies = [ - "ark-ec 0.4.2", - "ark-ff 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-bn254" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" -dependencies = [ - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-std 0.5.0", + "ark-ec", + "ark-ff", + "ark-std", ] [[package]] @@ -54,86 +37,34 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56" dependencies = [ - "ark-ec 0.4.2", - "ark-ff 0.4.2", - "ark-relations 0.4.0", - "ark-serialize 0.4.2", - "ark-snark 0.4.0", - "ark-std 0.4.0", - "blake2", - "derivative", - "digest", - "sha2", -] - -[[package]] -name = "ark-crypto-primitives" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0c292754729c8a190e50414fd1a37093c786c709899f29c9f7daccecfa855e" -dependencies = [ - "ahash", - "ark-crypto-primitives-macros", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-snark 0.5.1", - "ark-std 0.5.0", + "ark-ec", + "ark-ff", + "ark-relations", + "ark-serialize", + "ark-snark", + "ark-std", "blake2", "derivative", "digest", - "fnv", - "merlin", + "rayon", "sha2", ] -[[package]] -name = "ark-crypto-primitives-macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e89fe77d1f0f4fe5b96dfc940923d88d17b6a773808124f21e764dfb063c6a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-ec" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ - "ark-ff 0.4.2", - "ark-poly 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", - "num-traits", - "zeroize", -] - -[[package]] -name = "ark-ec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" -dependencies = [ - "ahash", - "ark-ff 0.5.0", - "ark-poly 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "educe", - "fnv", - "hashbrown 0.15.2", - "itertools 0.13.0", - "num-bigint", - "num-integer", + "itertools", "num-traits", + "rayon", "zeroize", ] @@ -143,40 +74,21 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "ark-ff-asm 0.4.2", - "ark-ff-macros 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", "derivative", "digest", - "itertools 0.10.5", + "itertools", "num-bigint", "num-traits", "paste", + "rayon", "rustc_version", "zeroize", ] -[[package]] -name = "ark-ff" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" -dependencies = [ - "ark-ff-asm 0.5.0", - "ark-ff-macros 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "arrayvec", - "digest", - "educe", - "itertools 0.13.0", - "num-bigint", - "num-traits", - "paste", - "zeroize", -] - [[package]] name = "ark-ff-asm" version = "0.4.2" @@ -187,16 +99,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-asm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" -dependencies = [ - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-ff-macros" version = "0.4.2" @@ -210,47 +112,20 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-groth16" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20ceafa83848c3e390f1cbf124bc3193b3e639b3f02009e0e290809a501b95fc" dependencies = [ - "ark-crypto-primitives 0.4.0", - "ark-ec 0.4.2", - "ark-ff 0.4.2", - "ark-poly 0.4.2", - "ark-relations 0.4.0", - "ark-serialize 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-groth16" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88f1d0f3a534bb54188b8dcc104307db6c56cdae574ddc3212aec0625740fc7e" -dependencies = [ - "ark-crypto-primitives 0.5.0", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-poly 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-crypto-primitives", + "ark-ec", + "ark-ff", + "ark-poly", + "ark-relations", + "ark-serialize", + "ark-std", + "rayon", ] [[package]] @@ -259,26 +134,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-serialize", + "ark-std", "derivative", "hashbrown 0.13.2", -] - -[[package]] -name = "ark-poly" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" -dependencies = [ - "ahash", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "educe", - "fnv", - "hashbrown 0.15.2", + "rayon", ] [[package]] @@ -287,20 +148,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0" dependencies = [ - "ark-ff 0.4.2", - "ark-std 0.4.0", - "tracing", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "ark-relations" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384" -dependencies = [ - "ark-ff 0.5.0", - "ark-std 0.5.0", + "ark-ff", + "ark-std", "tracing", "tracing-subscriber 0.2.25", ] @@ -311,21 +160,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ - "ark-serialize-derive 0.4.2", - "ark-std 0.4.0", - "digest", - "num-bigint", -] - -[[package]] -name = "ark-serialize" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" -dependencies = [ - "ark-serialize-derive 0.5.0", - "ark-std 0.5.0", - "arrayvec", + "ark-serialize-derive", + "ark-std", "digest", "num-bigint", ] @@ -341,39 +177,16 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-serialize-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "ark-snark" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84d3cc6833a335bb8a600241889ead68ee89a3cf8448081fb7694c0fe503da63" dependencies = [ - "ark-ff 0.4.2", - "ark-relations 0.4.0", - "ark-serialize 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-snark" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d368e2848c2d4c129ce7679a7d0d2d612b6a274d3ea6a13bad4445d61b381b88" -dependencies = [ - "ark-ff 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-ff", + "ark-relations", + "ark-serialize", + "ark-std", ] [[package]] @@ -384,16 +197,7 @@ checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", "rand", -] - -[[package]] -name = "ark-std" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" -dependencies = [ - "num-traits", - "rand", + "rayon", ] [[package]] @@ -560,14 +364,14 @@ dependencies = [ name = "bridge-circuit-core" version = "1.0.0" dependencies = [ - "ark-bn254 0.5.0", - "ark-crypto-primitives 0.5.0", - "ark-ec 0.5.0", - "ark-ff 0.5.0", - "ark-groth16 0.5.0", - "ark-relations 0.5.1", - "ark-serialize 0.5.0", - "ark-std 0.5.0", + "ark-bn254", + "ark-crypto-primitives", + "ark-ec", + "ark-ff", + "ark-groth16", + "ark-relations", + "ark-serialize", + "ark-std", "bitcoin", "borsh", "final-spv", @@ -680,6 +484,31 @@ dependencies = [ "libc", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crypto-bigint" version = "0.5.5" @@ -729,18 +558,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "educe" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "either" version = "1.13.0" @@ -753,26 +570,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b" -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -794,12 +591,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "foreign-types" version = "0.5.0" @@ -862,9 +653,6 @@ name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" -dependencies = [ - "allocator-api2", -] [[package]] name = "header-chain" @@ -925,30 +713,12 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -[[package]] -name = "keccak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" -dependencies = [ - "cpufeatures", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -988,18 +758,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core", - "zeroize", -] - [[package]] name = "metal" version = "0.29.0" @@ -1152,6 +910,26 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -1240,10 +1018,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa2df58accff2fde7e8bad9d144ae91cdfb5d0101addd3365f013fe3e33dccd8" dependencies = [ "anyhow", - "ark-bn254 0.4.0", - "ark-ec 0.4.2", - "ark-groth16 0.4.0", - "ark-serialize 0.4.2", + "ark-bn254", + "ark-ec", + "ark-groth16", + "ark-serialize", "bytemuck", "hex", "num-bigint",