diff --git a/Cargo.lock b/Cargo.lock index 3ad13928..dd30d7b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,6 +49,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "alloy-chains" version = "0.1.69" @@ -126,7 +132,7 @@ checksum = "9b15b13d38b366d01e818fe8e710d4d702ef7499eacd44926a06171dd9585d0c" dependencies = [ "alloy-primitives", "alloy-rlp", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_with", "thiserror 2.0.12", @@ -243,7 +249,7 @@ dependencies = [ "hashbrown 0.15.3", "indexmap 2.9.0", "itoa", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "keccak-asm", "openvm-ecc-guest 1.1.1", "openvm-keccak256-guest 1.1.1", @@ -260,9 +266,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6c1d995bff8d011f7cd6c81820d51825e6e06d6db73914c1630ecf544d83d6" +checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -271,9 +277,9 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943" +checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", @@ -320,7 +326,7 @@ dependencies = [ "alloy-rlp", "alloy-serde 0.11.1", "alloy-sol-types", - "itertools 0.14.0", + "itertools 0.13.0", "serde", "serde_json", "thiserror 2.0.12", @@ -359,7 +365,7 @@ dependencies = [ "auto_impl", "either", "elliptic-curve", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.12", ] @@ -476,9 +482,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", @@ -491,36 +497,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", - "once_cell", + "once_cell_polyfill", "windows-sys", ] @@ -738,9 +744,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.7.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bincode" @@ -792,9 +798,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" dependencies = [ "serde", ] @@ -983,9 +989,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" dependencies = [ "serde", ] @@ -1029,9 +1035,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.21" +version = "1.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0" +checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" dependencies = [ "jobserver", "libc", @@ -1061,9 +1067,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.37" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" dependencies = [ "clap_builder", "clap_derive", @@ -1071,9 +1077,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" dependencies = [ "anstream", "anstyle", @@ -1101,9 +1107,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "colored" @@ -1117,9 +1123,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" +checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff" dependencies = [ "cfg-if", "cpufeatures", @@ -1566,9 +1572,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", "windows-sys", @@ -1775,9 +1781,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", @@ -2063,6 +2069,8 @@ version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ + "allocator-api2", + "equivalent", "foldhash", "rayon", "serde", @@ -2082,9 +2090,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" [[package]] name = "hex" @@ -2122,7 +2130,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.0", + "windows-core", ] [[package]] @@ -2136,21 +2144,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -2159,31 +2168,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -2191,67 +2180,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2271,9 +2247,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -2381,7 +2357,7 @@ version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.3", "libc", ] @@ -2423,6 +2399,25 @@ dependencies = [ "sha2", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" +dependencies = [ + "ecdsa", + "elliptic-curve", + "ff 0.13.1", + "hex-literal", + "num-bigint 0.4.6", + "once_cell", + "openvm 1.2.1-rc.0", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-algebra-moduli-macros 1.2.1-rc.0", + "openvm-ecc-guest 1.2.1-rc.0", + "openvm-ecc-sw-macros 1.2.1-rc.0", + "serde", +] + [[package]] name = "keccak" version = "0.1.5" @@ -2471,9 +2466,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lockfree-object-pool" @@ -2487,6 +2482,15 @@ version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.3", +] + [[package]] name = "lz4_flex" version = "0.11.3" @@ -2762,6 +2766,33 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-modular" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" +dependencies = [ + "num-bigint 0.4.6", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-prime" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3" +dependencies = [ + "bitvec", + "either", + "lru", + "num-bigint 0.4.6", + "num-integer", + "num-modular", + "num-traits", + "rand", +] + [[package]] name = "num-rational" version = "0.4.2" @@ -2784,9 +2815,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ "hermit-abi", "libc", @@ -2856,6 +2887,12 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + [[package]] name = "op-alloy-consensus" version = "0.10.9" @@ -2888,24 +2925,26 @@ dependencies = [ [[package]] name = "openvm" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "bytemuck", + "getrandom 0.3.3", "num-bigint 0.4.6", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", - "openvm-platform 1.2.0", - "openvm-rv32im-guest 1.2.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-platform 1.2.1-rc.0", + "openvm-rv32im-guest 1.2.1-rc.0", "serde", ] [[package]] name = "openvm-algebra-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", + "eyre", "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", @@ -2930,9 +2969,9 @@ dependencies = [ [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-macros-common 1.1.1", + "openvm-macros-common 1.2.1-rc.0", "quote", "syn 2.0.101", ] @@ -2940,9 +2979,9 @@ dependencies = [ [[package]] name = "openvm-algebra-complex-macros" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" dependencies = [ - "openvm-macros-common 1.2.0", + "openvm-macros-common 1.1.1", "quote", "syn 2.0.101", ] @@ -2962,13 +3001,16 @@ dependencies = [ [[package]] name = "openvm-algebra-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "halo2curves-axiom 0.7.0", "num-bigint 0.4.6", - "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", - "openvm-algebra-moduli-macros 1.2.0", + "once_cell", + "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-algebra-moduli-macros 1.2.1-rc.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-rv32im-guest 1.2.1-rc.0", "serde-big-array", "strum_macros 0.26.4", ] @@ -2985,20 +3027,22 @@ dependencies = [ [[package]] name = "openvm-algebra-moduli-macros" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-macros-common 1.2.0", + "num-bigint 0.4.6", + "num-prime", + "openvm-macros-common 1.2.1-rc.0", "quote", "syn 2.0.101", ] [[package]] name = "openvm-algebra-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-algebra-guest 1.2.0", + "openvm-algebra-guest 1.2.1-rc.0", "openvm-instructions", "openvm-instructions-derive", "openvm-stark-backend", @@ -3009,8 +3053,8 @@ dependencies = [ [[package]] name = "openvm-bigint-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3031,38 +3075,19 @@ dependencies = [ [[package]] name = "openvm-bigint-guest" -version = "1.1.1" -source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "openvm 1.1.1", - "openvm-platform 1.1.1", - "serde", - "serde-big-array", - "strum_macros 0.26.4", -] - -[[package]] -name = "openvm-bigint-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "openvm 1.2.0", - "openvm-platform 1.2.0", - "serde", - "serde-big-array", + "openvm-platform 1.2.1-rc.0", "strum_macros 0.26.4", ] [[package]] name = "openvm-bigint-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-bigint-guest 1.2.0", + "openvm-bigint-guest", "openvm-instructions", "openvm-instructions-derive", "openvm-rv32im-transpiler", @@ -3074,20 +3099,20 @@ dependencies = [ [[package]] name = "openvm-build" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "cargo_metadata 0.18.1", "eyre", - "openvm-platform 1.2.0", + "openvm-platform 1.2.1-rc.0", "serde", "serde_json", ] [[package]] name = "openvm-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "backtrace", "cfg-if", @@ -3117,8 +3142,8 @@ dependencies = [ [[package]] name = "openvm-circuit-derive" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "itertools 0.14.0", "quote", @@ -3127,8 +3152,8 @@ dependencies = [ [[package]] name = "openvm-circuit-primitives" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -3142,8 +3167,8 @@ dependencies = [ [[package]] name = "openvm-circuit-primitives-derive" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "itertools 0.14.0", "quote", @@ -3152,8 +3177,8 @@ dependencies = [ [[package]] name = "openvm-continuations" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derivative", "openvm-circuit", @@ -3168,7 +3193,7 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "proc-macro2", "quote", @@ -3178,7 +3203,7 @@ dependencies = [ [[package]] name = "openvm-custom-insn" version = "0.1.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" dependencies = [ "proc-macro2", "quote", @@ -3187,30 +3212,29 @@ dependencies = [ [[package]] name = "openvm-ecc-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", "eyre", + "hex-literal", + "lazy_static", "num-bigint 0.4.6", "num-integer", "num-traits", "once_cell", "openvm-algebra-circuit", - "openvm-algebra-guest 1.2.0", "openvm-circuit", "openvm-circuit-derive", "openvm-circuit-primitives", "openvm-circuit-primitives-derive", - "openvm-ecc-guest 1.2.0", "openvm-ecc-transpiler", "openvm-instructions", "openvm-mod-circuit-builder", "openvm-rv32-adapters", "openvm-rv32im-circuit", "openvm-stark-backend", - "rand", "serde", "serde_with", "strum 0.26.3", @@ -3226,7 +3250,7 @@ dependencies = [ "group 0.13.0", "halo2curves-axiom 0.7.0", "hex-literal", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static", "num-bigint 0.4.6", "once_cell", @@ -3236,32 +3260,26 @@ dependencies = [ "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", "openvm-ecc-sw-macros 1.1.1", "openvm-rv32im-guest 1.1.1", - "p256", + "p256 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "strum_macros 0.26.4", ] [[package]] name = "openvm-ecc-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "ecdsa", "elliptic-curve", "group 0.13.0", "halo2curves-axiom 0.7.0", - "hex-literal", - "k256", - "lazy_static", - "num-bigint 0.4.6", "once_cell", - "openvm 1.2.0", - "openvm-algebra-guest 1.2.0", - "openvm-algebra-moduli-macros 1.2.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", - "openvm-ecc-sw-macros 1.2.0", - "openvm-rv32im-guest 1.2.0", - "p256", + "openvm 1.2.1-rc.0", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-ecc-sw-macros 1.2.1-rc.0", + "openvm-rv32im-guest 1.2.1-rc.0", "serde", "strum_macros 0.26.4", ] @@ -3278,20 +3296,20 @@ dependencies = [ [[package]] name = "openvm-ecc-sw-macros" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-macros-common 1.2.0", + "openvm-macros-common 1.2.1-rc.0", "quote", "syn 2.0.101", ] [[package]] name = "openvm-ecc-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-ecc-guest 1.2.0", + "openvm-ecc-guest 1.2.1-rc.0", "openvm-instructions", "openvm-instructions-derive", "openvm-stark-backend", @@ -3302,8 +3320,8 @@ dependencies = [ [[package]] name = "openvm-instructions" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "backtrace", "derive-new 0.6.0", @@ -3319,8 +3337,8 @@ dependencies = [ [[package]] name = "openvm-instructions-derive" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "quote", "syn 2.0.101", @@ -3328,8 +3346,8 @@ dependencies = [ [[package]] name = "openvm-keccak256-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3363,21 +3381,20 @@ dependencies = [ [[package]] name = "openvm-keccak256-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-platform 1.2.0", - "tiny-keccak", + "openvm-platform 1.2.1-rc.0", ] [[package]] name = "openvm-keccak256-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "openvm-instructions", "openvm-instructions-derive", - "openvm-keccak256-guest 1.2.0", + "openvm-keccak256-guest 1.2.1-rc.0", "openvm-stark-backend", "openvm-transpiler", "rrs-lib", @@ -3394,16 +3411,16 @@ dependencies = [ [[package]] name = "openvm-macros-common" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "syn 2.0.101", ] [[package]] name = "openvm-mod-circuit-builder" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -3421,8 +3438,8 @@ dependencies = [ [[package]] name = "openvm-native-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3448,8 +3465,8 @@ dependencies = [ [[package]] name = "openvm-native-compiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "backtrace", "itertools 0.14.0", @@ -3472,8 +3489,8 @@ dependencies = [ [[package]] name = "openvm-native-compiler-derive" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "quote", "syn 2.0.101", @@ -3481,8 +3498,8 @@ dependencies = [ [[package]] name = "openvm-native-recursion" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "cfg-if", "itertools 0.14.0", @@ -3509,22 +3526,47 @@ dependencies = [ [[package]] name = "openvm-native-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "openvm-instructions", "openvm-transpiler", "p3-field", ] +[[package]] +name = "openvm-pairing" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" +dependencies = [ + "group 0.13.0", + "hex-literal", + "itertools 0.14.0", + "num-bigint 0.4.6", + "num-traits", + "openvm 1.2.1-rc.0", + "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-algebra-moduli-macros 1.2.1-rc.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-ecc-guest 1.2.1-rc.0", + "openvm-ecc-sw-macros 1.2.1-rc.0", + "openvm-pairing-guest 1.2.1-rc.0", + "openvm-platform 1.2.1-rc.0", + "openvm-rv32im-guest 1.2.1-rc.0", + "rand", + "serde", +] + [[package]] name = "openvm-pairing-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", "eyre", + "halo2curves-axiom 0.7.0", "itertools 0.14.0", "num-bigint 0.4.6", "num-traits", @@ -3534,10 +3576,10 @@ dependencies = [ "openvm-circuit-primitives", "openvm-circuit-primitives-derive", "openvm-ecc-circuit", - "openvm-ecc-guest 1.2.0", + "openvm-ecc-guest 1.2.1-rc.0", "openvm-instructions", "openvm-mod-circuit-builder", - "openvm-pairing-guest 1.2.0", + "openvm-pairing-guest 1.2.1-rc.0", "openvm-pairing-transpiler", "openvm-rv32-adapters", "openvm-rv32im-circuit", @@ -3553,7 +3595,6 @@ version = "1.1.1" source = "git+https://github.com/openvm-org/openvm.git?rev=a0ae88f#a0ae88f2c4d98b651c653a1e9b7598d3ad15455e" dependencies = [ "group 0.13.0", - "halo2curves-axiom 0.7.0", "hex-literal", "itertools 0.14.0", "lazy_static", @@ -3575,25 +3616,20 @@ dependencies = [ [[package]] name = "openvm-pairing-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "group 0.13.0", "halo2curves-axiom 0.7.0", "hex-literal", "itertools 0.14.0", "lazy_static", "num-bigint 0.4.6", "num-traits", - "openvm 1.2.0", - "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", - "openvm-algebra-guest 1.2.0", - "openvm-algebra-moduli-macros 1.2.0", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", - "openvm-ecc-guest 1.2.0", - "openvm-ecc-sw-macros 1.2.0", - "openvm-platform 1.2.0", - "openvm-rv32im-guest 1.2.0", + "openvm 1.2.1-rc.0", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-algebra-moduli-macros 1.2.1-rc.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-ecc-guest 1.2.1-rc.0", "rand", "serde", "strum_macros 0.26.4", @@ -3601,12 +3637,12 @@ dependencies = [ [[package]] name = "openvm-pairing-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "openvm-instructions", "openvm-instructions-derive", - "openvm-pairing-guest 1.2.0", + "openvm-pairing-guest 1.2.1-rc.0", "openvm-stark-backend", "openvm-transpiler", "rrs-lib", @@ -3626,19 +3662,18 @@ dependencies = [ [[package]] name = "openvm-platform" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "getrandom 0.2.16", "libm", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", - "openvm-rv32im-guest 1.2.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-rv32im-guest 1.2.1-rc.0", ] [[package]] name = "openvm-poseidon2-air" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derivative", "lazy_static", @@ -3654,8 +3689,8 @@ dependencies = [ [[package]] name = "openvm-rv32-adapters" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "itertools 0.14.0", @@ -3674,8 +3709,8 @@ dependencies = [ [[package]] name = "openvm-rv32im-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3706,21 +3741,22 @@ dependencies = [ [[package]] name = "openvm-rv32im-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=bdb4831)", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "p3-field", "strum_macros 0.26.4", ] [[package]] name = "openvm-rv32im-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "openvm-instructions", "openvm-instructions-derive", - "openvm-rv32im-guest 1.2.0", + "openvm-rv32im-guest 1.2.1-rc.0", "openvm-stark-backend", "openvm-transpiler", "rrs-lib", @@ -3731,8 +3767,8 @@ dependencies = [ [[package]] name = "openvm-sdk" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "async-trait", "bitcode", @@ -3745,7 +3781,8 @@ dependencies = [ "hex", "itertools 0.14.0", "metrics 0.23.1", - "openvm 1.2.0", + "num-bigint 0.4.6", + "openvm 1.2.1-rc.0", "openvm-algebra-circuit", "openvm-algebra-transpiler", "openvm-bigint-circuit", @@ -3760,6 +3797,7 @@ dependencies = [ "openvm-native-circuit", "openvm-native-compiler", "openvm-native-recursion", + "openvm-native-transpiler", "openvm-pairing-circuit", "openvm-pairing-transpiler", "openvm-rv32im-circuit", @@ -3770,6 +3808,7 @@ dependencies = [ "openvm-stark-sdk", "openvm-transpiler", "p3-fri", + "rrs-lib", "serde", "serde_json", "serde_with", @@ -3780,10 +3819,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "openvm-sha2" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" +dependencies = [ + "openvm-sha256-guest 1.2.1-rc.0", + "sha2", +] + [[package]] name = "openvm-sha256-air" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "openvm-circuit-primitives", "openvm-stark-backend", @@ -3793,8 +3841,8 @@ dependencies = [ [[package]] name = "openvm-sha256-circuit" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "derive-new 0.6.0", "derive_more 1.0.0", @@ -3825,21 +3873,20 @@ dependencies = [ [[package]] name = "openvm-sha256-guest" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ - "openvm-platform 1.2.0", - "sha2", + "openvm-platform 1.2.1-rc.0", ] [[package]] name = "openvm-sha256-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "openvm-instructions", "openvm-instructions-derive", - "openvm-sha256-guest 1.2.0", + "openvm-sha256-guest 1.2.1-rc.0", "openvm-stark-backend", "openvm-transpiler", "rrs-lib", @@ -3848,8 +3895,8 @@ dependencies = [ [[package]] name = "openvm-stark-backend" -version = "1.1.0" -source = "git+https://github.com/openvm-org/stark-backend.git?tag=v1.1.0#7f79ce233683ec8ca63a32cc4723ef920b23a6c5" +version = "1.1.1" +source = "git+https://github.com/openvm-org/stark-backend.git?rev=f48090c9febd021f8ee0349bc929a775fb1fa3ad#f48090c9febd021f8ee0349bc929a775fb1fa3ad" dependencies = [ "bitcode", "cfg-if", @@ -3874,8 +3921,8 @@ dependencies = [ [[package]] name = "openvm-stark-sdk" -version = "1.1.0" -source = "git+https://github.com/openvm-org/stark-backend.git?tag=v1.1.0#7f79ce233683ec8ca63a32cc4723ef920b23a6c5" +version = "1.1.1" +source = "git+https://github.com/openvm-org/stark-backend.git?rev=f48090c9febd021f8ee0349bc929a775fb1fa3ad#f48090c9febd021f8ee0349bc929a775fb1fa3ad" dependencies = [ "derivative", "derive_more 0.99.20", @@ -3910,13 +3957,13 @@ dependencies = [ [[package]] name = "openvm-transpiler" -version = "1.2.0" -source = "git+https://github.com/openvm-org/openvm.git?rev=bdb4831#bdb4831fefed13b0741d3a052d434a9c995c6d5d" +version = "1.2.1-rc.0" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" dependencies = [ "elf", "eyre", "openvm-instructions", - "openvm-platform 1.2.0", + "openvm-platform 1.2.1-rc.0", "openvm-stark-backend", "rrs-lib", "thiserror 1.0.69", @@ -3949,6 +3996,24 @@ dependencies = [ "sha2", ] +[[package]] +name = "p256" +version = "0.13.2" +source = "git+https://github.com/openvm-org/openvm.git?rev=2c35253#2c352538a5ee8ac1a4ef8853f1c585c52828a9f8" +dependencies = [ + "ecdsa", + "elliptic-curve", + "ff 0.13.1", + "hex-literal", + "num-bigint 0.4.6", + "openvm 1.2.1-rc.0", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-algebra-moduli-macros 1.2.1-rc.0", + "openvm-ecc-guest 1.2.1-rc.0", + "openvm-ecc-sw-macros 1.2.1-rc.0", + "serde", +] + [[package]] name = "p3-air" version = "0.1.0" @@ -4310,9 +4375,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.7.4" +version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fde3d0718baf5bc92f577d652001da0f8d54cd03a7974e118d04fc888dc23d" +checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa" dependencies = [ "arrayvec", "bitvec", @@ -4327,9 +4392,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.7.4" +version = "3.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3" +checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4439,6 +4504,15 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -4456,9 +4530,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" +checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d" dependencies = [ "proc-macro2", "syn 2.0.101", @@ -4759,7 +4833,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-chains", "alloy-consensus", @@ -4778,7 +4852,7 @@ dependencies = [ [[package]] name = "reth-codecs" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4795,7 +4869,7 @@ dependencies = [ [[package]] name = "reth-codecs-derive" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "convert_case 0.6.0", "proc-macro2", @@ -4806,7 +4880,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4819,7 +4893,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4832,7 +4906,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -4856,7 +4930,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -4881,7 +4955,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-eips", "alloy-primitives", @@ -4895,7 +4969,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4911,7 +4985,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -4926,7 +5000,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4946,7 +5020,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4971,7 +5045,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4992,7 +5066,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5006,7 +5080,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5024,7 +5098,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "serde", "serde_json", @@ -5034,7 +5108,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "metrics 0.24.2", "metrics-derive", @@ -5043,7 +5117,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5056,7 +5130,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "anyhow", "bincode", @@ -5073,7 +5147,7 @@ dependencies = [ [[package]] name = "reth-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "once_cell", @@ -5086,7 +5160,7 @@ dependencies = [ [[package]] name = "reth-primitives-traits" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5098,7 +5172,7 @@ dependencies = [ "byteorder", "bytes", "derive_more 1.0.0", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "modular-bitfield", "once_cell", "op-alloy-consensus", @@ -5115,7 +5189,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -5128,7 +5202,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5143,7 +5217,7 @@ dependencies = [ [[package]] name = "reth-scroll-chainspec" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-chains", "alloy-consensus", @@ -5166,7 +5240,7 @@ dependencies = [ [[package]] name = "reth-scroll-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "revm 19.4.0", ] @@ -5174,7 +5248,7 @@ dependencies = [ [[package]] name = "reth-scroll-evm" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5200,7 +5274,7 @@ dependencies = [ [[package]] name = "reth-scroll-forks" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-chains", "alloy-primitives", @@ -5212,7 +5286,7 @@ dependencies = [ [[package]] name = "reth-scroll-primitives" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5236,7 +5310,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-primitives", "bytes", @@ -5249,7 +5323,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-primitives", "derive_more 1.0.0", @@ -5260,7 +5334,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5285,7 +5359,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-eips", "alloy-primitives", @@ -5300,7 +5374,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "clap", "eyre", @@ -5315,7 +5389,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5337,7 +5411,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -5360,7 +5434,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5378,7 +5452,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -5393,7 +5467,7 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "zstd 1.1.4", ] @@ -5401,7 +5475,7 @@ dependencies = [ [[package]] name = "revm" version = "19.4.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#6c55ae39aae90a622c180ca0256909ee4accdb29" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#aa6d8a72a665f36f8f706e12dbb83139d9dce4f8" dependencies = [ "auto_impl", "cfg-if", @@ -5430,7 +5504,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "15.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#6c55ae39aae90a622c180ca0256909ee4accdb29" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#aa6d8a72a665f36f8f706e12dbb83139d9dce4f8" dependencies = [ "revm-primitives 15.1.0", "serde", @@ -5449,18 +5523,18 @@ dependencies = [ [[package]] name = "revm-precompile" version = "16.0.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#6c55ae39aae90a622c180ca0256909ee4accdb29" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#aa6d8a72a665f36f8f706e12dbb83139d9dce4f8" dependencies = [ "aurora-engine-modexp", "c-kzg", "cfg-if", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "openvm-ecc-guest 1.1.1", "openvm-keccak256-guest 1.1.1", "openvm-pairing-guest 1.1.1", "openvm-sha256-guest 1.1.1", - "p256", + "p256 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", "revm-primitives 15.1.0", "ripemd", "secp256k1", @@ -5478,7 +5552,7 @@ dependencies = [ "blst", "c-kzg", "cfg-if", - "k256", + "k256 0.13.4 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "revm-primitives 15.2.0", "ripemd", @@ -5490,7 +5564,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "15.1.0" -source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#6c55ae39aae90a622c180ca0256909ee4accdb29" +source = "git+https://github.com/scroll-tech/revm?branch=scroll-evm-executor%2Ffeat%2Fv55%2Feuclid-upgrade#aa6d8a72a665f36f8f706e12dbb83139d9dce4f8" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -5700,9 +5774,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "rusty-fork" @@ -5725,7 +5799,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "sbv-core" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6e6e3dbcfe55295903a89da5a5ec74acc24fa32f" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "reth-evm", "reth-evm-ethereum", @@ -5742,7 +5816,7 @@ dependencies = [ [[package]] name = "sbv-helpers" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6e6e3dbcfe55295903a89da5a5ec74acc24fa32f" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "revm 19.4.0", ] @@ -5750,7 +5824,7 @@ dependencies = [ [[package]] name = "sbv-kv" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6e6e3dbcfe55295903a89da5a5ec74acc24fa32f" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "auto_impl", "hashbrown 0.15.3", @@ -5760,7 +5834,7 @@ dependencies = [ [[package]] name = "sbv-primitives" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6e6e3dbcfe55295903a89da5a5ec74acc24fa32f" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5791,7 +5865,7 @@ dependencies = [ [[package]] name = "sbv-trie" version = "2.0.0" -source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#6e6e3dbcfe55295903a89da5a5ec74acc24fa32f" +source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=zkvm%2Feuclid-upgrade#2c46ab68c4d77bf27aa6c27bf7763bede4dab968" dependencies = [ "alloy-rlp", "alloy-trie", @@ -5806,7 +5880,7 @@ dependencies = [ [[package]] name = "scroll-alloy-consensus" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5824,7 +5898,7 @@ dependencies = [ [[package]] name = "scroll-alloy-network" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-network", @@ -5838,7 +5912,7 @@ dependencies = [ [[package]] name = "scroll-alloy-rpc-types" version = "1.1.5" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" dependencies = [ "alloy-consensus", "alloy-eips", @@ -5859,15 +5933,18 @@ dependencies = [ "alloy-primitives", "bitcode", "c-kzg", + "halo2curves-axiom 0.7.0", "itertools 0.14.0", - "openvm 1.1.1", - "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", - "openvm-algebra-guest 1.1.1", - "openvm-ecc-guest 1.1.1", - "openvm-keccak256-guest 1.1.1", - "openvm-pairing-guest 1.1.1", - "openvm-rv32im-guest 1.1.1", - "openvm-sha256-guest 1.1.1", + "openvm 1.2.1-rc.0", + "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-ecc-guest 1.2.1-rc.0", + "openvm-keccak256-guest 1.2.1-rc.0", + "openvm-pairing", + "openvm-pairing-guest 1.2.1-rc.0", + "openvm-rv32im-guest 1.2.1-rc.0", + "openvm-sha2", + "openvm-sha256-guest 1.2.1-rc.0", "rkyv", "scroll-zkvm-circuit-input-types", "serde", @@ -5910,10 +5987,10 @@ name = "scroll-zkvm-bundle-circuit" version = "0.4.0" dependencies = [ "alloy-primitives", - "openvm 1.1.1", - "openvm-algebra-guest 1.1.1", - "openvm-keccak256-guest 1.1.1", - "openvm-rv32im-guest 1.1.1", + "openvm 1.2.1-rc.0", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-keccak256-guest 1.2.1-rc.0", + "openvm-rv32im-guest 1.2.1-rc.0", "rkyv", "scroll-zkvm-circuit-input-types", ] @@ -5922,14 +5999,17 @@ dependencies = [ name = "scroll-zkvm-chunk-circuit" version = "0.4.0" dependencies = [ - "openvm 1.1.1", - "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", - "openvm-algebra-guest 1.1.1", - "openvm-bigint-guest 1.1.1", - "openvm-ecc-guest 1.1.1", - "openvm-keccak256-guest 1.1.1", - "openvm-pairing-guest 1.1.1", - "openvm-rv32im-guest 1.1.1", + "k256 0.13.4 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm 1.2.1-rc.0", + "openvm-algebra-complex-macros 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-algebra-guest 1.2.1-rc.0", + "openvm-bigint-guest", + "openvm-ecc-guest 1.2.1-rc.0", + "openvm-keccak256-guest 1.2.1-rc.0", + "openvm-pairing", + "openvm-pairing-guest 1.2.1-rc.0", + "openvm-rv32im-guest 1.2.1-rc.0", + "p256 0.13.2 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", "rkyv", "scroll-zkvm-circuit-input-types", ] @@ -5940,10 +6020,11 @@ version = "0.4.0" dependencies = [ "alloy-primitives", "alloy-serde 0.8.3", + "getrandom 0.2.16", "itertools 0.14.0", - "openvm 1.1.1", - "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=a0ae88f)", - "openvm-rv32im-guest 1.1.1", + "openvm 1.2.1-rc.0", + "openvm-custom-insn 0.1.0 (git+https://github.com/openvm-org/openvm.git?rev=2c35253)", + "openvm-rv32im-guest 1.2.1-rc.0", "rkyv", "sbv-core", "sbv-kv", @@ -6551,12 +6632,12 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.19.1" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ "fastrand", - "getrandom 0.3.2", + "getrandom 0.3.3", "once_cell", "rustix", "windows-sys", @@ -6717,9 +6798,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -6982,12 +7063,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -7002,9 +7077,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +dependencies = [ + "js-sys", + "wasm-bindgen", +] [[package]] name = "valuable" @@ -7152,7 +7231,7 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core 0.57.0", + "windows-core", "windows-targets", ] @@ -7162,25 +7241,12 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", + "windows-implement", + "windows-interface", + "windows-result", "windows-targets", ] -[[package]] -name = "windows-core" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" -dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", - "windows-link", - "windows-result 0.3.2", - "windows-strings", -] - [[package]] name = "windows-implement" version = "0.57.0" @@ -7192,17 +7258,6 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "windows-implement" -version = "0.60.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "windows-interface" version = "0.57.0" @@ -7214,17 +7269,6 @@ dependencies = [ "syn 2.0.101", ] -[[package]] -name = "windows-interface" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "windows-link" version = "0.1.1" @@ -7240,24 +7284,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "windows-result" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-strings" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-sys" version = "0.59.0" @@ -7349,17 +7375,11 @@ dependencies = [ "bitflags", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "wyz" @@ -7372,9 +7392,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -7384,9 +7404,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", @@ -7455,11 +7475,22 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -7468,9 +7499,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", @@ -7514,7 +7545,7 @@ dependencies = [ [[package]] name = "zstd" version = "1.1.4" -source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#eb41a605a7efd77c2292a110745179d7d1a5b1de" +source = "git+https://github.com/scroll-tech/reth?branch=zkvm%2Feuclid-upgrade#6009111704d286ed6c737fe78dca09d613be0352" [[package]] name = "zstd-safe" diff --git a/Cargo.toml b/Cargo.toml index 1f1277ed..469a1c13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,32 +21,36 @@ version = "0.4.0" [workspace.dependencies] # openvm guest libs -openvm = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-algebra-complex-macros = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-custom-insn = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-sha256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-keccak256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-bigint-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } -openvm-rv32im-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "a0ae88f", default-features = false } +openvm = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253" } +openvm-algebra-complex-macros = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-custom-insn = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-sha2 = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253" } +openvm-sha256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-p256 = { git = "https://github.com/openvm-org/openvm.git", package = "p256", rev = "2c35253", features = ["std"] } +openvm-k256 = { git = "https://github.com/openvm-org/openvm.git", package = "k256", rev = "2c35253", features = ["std"] } +openvm-pairing = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253" } +openvm-keccak256-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-algebra-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-ecc-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-bigint-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-pairing-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-rv32im-guest = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } # openvm guest libs -openvm-build = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-continuations = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-instructions ={ git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-native-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-native-compiler = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-native-recursion = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-native-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-rv32im-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } -openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] } -openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "bdb4831", default-features = false } +openvm-build = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-continuations = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-instructions ={ git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-native-circuit = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-native-compiler = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-native-recursion = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-native-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-rv32im-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } +openvm-sdk = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] } +openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", rev = "2c35253", default-features = false } # more openvm related libs -openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v1.1.0" } +openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", rev = "f48090c9febd021f8ee0349bc929a775fb1fa3ad" } p3-field = { git = "https://github.com/Plonky3/Plonky3.git", rev = "539bbc84085efb609f4f62cb03cf49588388abdb" } sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = ["scroll"] } diff --git a/Cargo.toml.patch b/Cargo.toml.patch new file mode 100644 index 00000000..ac220206 --- /dev/null +++ b/Cargo.toml.patch @@ -0,0 +1,149 @@ +[workspace] +members = [ + "crates/circuits/chunk-circuit", + "crates/circuits/batch-circuit", + "crates/circuits/bundle-circuit", + "crates/circuits/types", + "crates/prover", + "crates/verifier", + "crates/integration", + "crates/build-guest", +] +resolver = "2" + +[workspace.package] +authors = ["Scroll developers"] +edition = "2021" +homepage = "https://github.com/scroll-tech/zkvm-prover" +readme = "README.md" +repository = "https://github.com/scroll-tech/zkvm-prover" +version = "0.4.0" + +[workspace.dependencies] +openvm = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-algebra-complex-macros = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-algebra-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-bigint-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-build = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-circuit = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-custom-insn = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-continuations = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-ecc-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-instructions ={ git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-keccak256-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-circuit = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-compiler = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-recursion = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-transpiler = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-pairing-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-rv32im-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-rv32im-transpiler = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-sdk = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] } +openvm-sha256-guest = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-transpiler = { git = "ssh://git@github.com/axiom-crypto/openvm-private.git", branch = "patch-v1.2.0", default-features = false } + +openvm-stark-sdk = { git = "ssh://git@github.com/axiom-crypto/stark-backend-private.git", branch = "patch-v1.1.0" } + +sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = ["scroll"] } +sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade", features = ["scroll"] } +sbv-kv = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade" } +sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "zkvm/euclid-upgrade" } + +alloy-primitives = { version = "0.8", default-features = false } +alloy-serde = { version = "0.8", default-features = false } +bitcode = { version = "0.6.5", default-features = false, features = ["serde", "derive"] } +bincode_v1 = { version = "1.3", package = "bincode"} +derivative = "2.2.0" +eyre = "0.6" +halo2curves-axiom = { version = "0.5.3" } +itertools = "0.14" +hex-literal = { version = "0.4.1", default-features = false } +metrics = "0.23.0" +metrics-util = "0.17" +metrics-tracing-context = "0.16.0" +p3-field = { git = "ssh://git@github.com/axiom-crypto/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +rayon = "1.10" +rkyv = "0.8" +serde = { version = "1", default-features = false, features = ["derive"] } +serde_json = { version = "1.0" } +serde_with = "3.11.0" +snark-verifier-sdk = { version = "0.2.0", default-features = false, features = [ + "loader_halo2", + "halo2-axiom", + "display", +] } +tiny-keccak = "2.0" +tracing = "0.1" +vm-zstd = { git = "https://github.com/scroll-tech/rust-zstd-decompressor.git", tag = "v0.1.1" } +toml = "0.8.14" +tracing-subscriber = "0.3" + +scroll-zkvm-circuit-input-types = { path = "crates/circuits/types" } +scroll-zkvm-integration = { path = "crates/integration" } +scroll-zkvm-prover = { path = "crates/prover" } +scroll-zkvm-verifier = { path = "crates/verifier" } + +[patch.crates-io] +alloy-primitives = { git = "https://github.com/scroll-tech/alloy-core", branch = "v0.8.18-euclid-upgrade" } +ruint = { git = "https://github.com/scroll-tech/uint.git", branch = "v1.12.3" } +tiny-keccak = { git = "https://github.com/scroll-tech/tiny-keccak", branch = "scroll-patch-v2.0.2-euclid-upgrade" } + +[profile.maxperf] +inherits = "release" +lto = "fat" +codegen-units = 1 + + +[patch."ssh://git@github.com/axiom-crypto/openvm-private.git"] +openvm = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-algebra-complex-macros = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-algebra-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-bigint-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-build = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-circuit = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-custom-insn = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-continuations = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-ecc-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-instructions ={ git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-keccak256-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-circuit = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-compiler = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-recursion = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-native-transpiler = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-pairing-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-rv32im-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-rv32im-transpiler = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-sdk = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false, features = ["parallel", "bench-metrics", "evm-prove"] } +openvm-sha256-guest = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } +openvm-transpiler = { git = "ssh://git@github.com/scroll-tech/openvm-private.git", branch = "patch-v1.2.0", default-features = false } + +[patch."ssh://git@github.com/axiom-crypto/stark-backend-private.git"] +openvm-stark-backend = { git = "ssh://git@github.com/scroll-tech/stark-backend-private.git", branch = "patch-v1.1.0", default-features = false } +openvm-stark-sdk = { git = "ssh://git@github.com/scroll-tech/stark-backend-private.git", branch = "patch-v1.1.0", default-features = false } + +[patch."ssh://git@github.com/axiom-crypto/plonky3-private.git"] +p3-air = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-field = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-commit = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-matrix = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-baby-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-koala-bear = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-util = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-challenger = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-dft = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-fri = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-goldilocks = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-keccak = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-keccak-air = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-blake3 = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-mds = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-merkle-tree = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-monty-31 = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-poseidon = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-poseidon2 = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-poseidon2-air = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-symmetric = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-uni-stark = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } +p3-maybe-rayon = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } # the "parallel" feature is NOT on by default to allow single-threaded benchmarking +p3-bn254-fr = { git = "ssh://git@github.com/scroll-tech/plonky3-private.git", rev = "51704e6036fba6edd58022eb0eceb9f44bc941fb" } + diff --git a/crates/build-guest/src/builder/mod.rs b/crates/build-guest/src/builder/mod.rs index 0c312326..639f9280 100644 --- a/crates/build-guest/src/builder/mod.rs +++ b/crates/build-guest/src/builder/mod.rs @@ -22,11 +22,18 @@ const FD_APP_EXE: &str = "app.vmexe"; pub fn build>( project_root: &str, feature_flags: impl IntoIterator, + vm_config: &SdkVmConfig, ) -> eyre::Result { let guest_opts = GuestOptions::default(); let guest_opts = guest_opts.with_features(feature_flags); let guest_opts = guest_opts.with_profile("maxperf".to_string()); - Sdk::new().build(guest_opts, project_root, &Default::default()) + Sdk::new().build( + guest_opts, + vm_config, + project_root, + &Default::default(), + None, + ) } pub fn load_app_config(project_root: &str) -> eyre::Result> { @@ -54,10 +61,7 @@ pub fn transpile( std::fs::create_dir_all(&path_assets)?; // Transpile ELF to openvm executable. - let transpiler = app_config - .app_vm_config - .transpiler() - .with_extension(openvm_native_transpiler::LongFormTranspilerExtension); + let transpiler = app_config.app_vm_config.transpiler(); let app_exe = Sdk::new().transpile(elf, transpiler)?; // Write exe to disc. diff --git a/crates/build-guest/src/main.rs b/crates/build-guest/src/main.rs index 645500cf..3dad483e 100644 --- a/crates/build-guest/src/main.rs +++ b/crates/build-guest/src/main.rs @@ -74,7 +74,7 @@ fn get_build_configs(project_name: &str) -> Vec { filename_suffix: "_rv32".to_string(), // Suffix for the RV32 variant }, BuildConfig { - features: vec!["openvm".to_string()], + features: vec![], // vec!["openvm".to_string()], filename_suffix: "".to_string(), // No suffix for the default (OpenVM) variant }, ], @@ -199,7 +199,11 @@ fn run_stage3_exe_commits(project_names: &[&str], workspace_dir: &Path) -> Resul let app_config = builder::load_app_config(project_dir)?; // 1. Build ELF - let elf = builder::build(project_dir, &build_config.features)?; + let elf = builder::build( + project_dir, + &build_config.features, + &app_config.app_vm_config, + )?; println!("{LOG_PREFIX} Built ELF"); // 2. Transpile ELF to VM Executable diff --git a/crates/circuits/batch-circuit/Cargo.toml b/crates/circuits/batch-circuit/Cargo.toml index f8622f26..41fc841a 100644 --- a/crates/circuits/batch-circuit/Cargo.toml +++ b/crates/circuits/batch-circuit/Cargo.toml @@ -10,13 +10,17 @@ scroll-zkvm-circuit-input-types.workspace = true openvm = { workspace = true, features = ["std"] } openvm-algebra-guest.workspace = true +openvm-pairing = { workspace = true, features = ["bls12_381"] } openvm-keccak256-guest.workspace = true openvm-sha256-guest.workspace = true +openvm-sha2.workspace = true openvm-ecc-guest = { workspace = true, features = ["halo2curves"] } openvm-algebra-complex-macros = { workspace = true } openvm-pairing-guest = { workspace = true, features = ["halo2curves"] } openvm-rv32im-guest.workspace = true +halo2curves-axiom = "0.7.0" + alloy-primitives = { workspace = true, default-features = false, features = ["std", "map-hashbrown", "map-fxhash", "rkyv"] } bitcode.workspace = true itertools.workspace = true diff --git a/crates/circuits/batch-circuit/batch_exe_commit.rs b/crates/circuits/batch-circuit/batch_exe_commit.rs index b23edaf8..51d26598 100644 --- a/crates/circuits/batch-circuit/batch_exe_commit.rs +++ b/crates/circuits/batch-circuit/batch_exe_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [982522698, 534760781, 1659715896, 49274760, 8044809, 975961932, 1500692001, 1143824500]; +pub const COMMIT: [u32; 8] = [1333330984, 1910833925, 627870431, 916278628, 682459278, 847949672, 421603663, 1570051068]; diff --git a/crates/circuits/batch-circuit/openvm.toml b/crates/circuits/batch-circuit/openvm.toml index 3d5f99ce..3222ad82 100644 --- a/crates/circuits/batch-circuit/openvm.toml +++ b/crates/circuits/batch-circuit/openvm.toml @@ -15,7 +15,7 @@ proof_of_work_bits = 16 [app_vm_config.castf] [app_vm_config.modular] -supported_modulus = [ +supported_moduli = [ "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787", "52435875175126190479447740508185965837690552500527637822603658699938581184513", ] @@ -24,10 +24,11 @@ supported_modulus = [ supported_curves = ["Bls12_381"] [app_vm_config.sha256] [app_vm_config.fp2] -supported_modulus = [ - "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787", +supported_moduli = [ + ["Bls12_381Fp2","4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787"] ] [[app_vm_config.ecc.supported_curves]] +struct_name = "Bls12_381G1Affine" modulus = "4002409555221667393417789825735904156556882819939007885332058136124031650490837864442687629129015664037894272559787" scalar = "52435875175126190479447740508185965837690552500527637822603658699938581184513" a = "0" diff --git a/crates/circuits/batch-circuit/src/blob_consistency/mod.rs b/crates/circuits/batch-circuit/src/blob_consistency/mod.rs index b9556780..6e7ca74e 100644 --- a/crates/circuits/batch-circuit/src/blob_consistency/mod.rs +++ b/crates/circuits/batch-circuit/src/blob_consistency/mod.rs @@ -1,6 +1,6 @@ use alloy_primitives::{B256 as H256, U256}; -use openvm_pairing_guest::bls12_381::Scalar; +use openvm_pairing::bls12_381::Scalar; mod openvm; pub use openvm::point_evaluation; diff --git a/crates/circuits/batch-circuit/src/blob_consistency/openvm.rs b/crates/circuits/batch-circuit/src/blob_consistency/openvm.rs index de1fda29..abe5a5f9 100644 --- a/crates/circuits/batch-circuit/src/blob_consistency/openvm.rs +++ b/crates/circuits/batch-circuit/src/blob_consistency/openvm.rs @@ -2,20 +2,13 @@ use std::sync::LazyLock; use algebra::{Field, IntMod}; use alloy_primitives::U256; -use itertools::Itertools; -use openvm_ecc_guest::{ - AffinePoint, CyclicGroup, - halo2curves::bls12_381::{ - Fq as Bls12_381_Fq, G1Affine as Bls12_381_G1, G2Affine as Bls12_381_G2, - }, - msm, - weierstrass::WeierstrassPoint, -}; -use openvm_pairing_guest::{ - algebra, - bls12_381::{Bls12_381, Fp, Fp2, G1Affine, G2Affine, Scalar}, - pairing::PairingCheck, +use halo2curves_axiom::bls12_381::{ + Fq as Bls12_381_Fq, G1Affine as Bls12_381_G1, G2Affine as Bls12_381_G2, }; +use itertools::Itertools; +use openvm_ecc_guest::{AffinePoint, CyclicGroup, msm, weierstrass::WeierstrassPoint}; +use openvm_pairing::bls12_381::{Bls12_381, Fp, Fp2, G1Affine, G2Affine, Scalar}; +use openvm_pairing_guest::{algebra, pairing::PairingCheck}; use super::{BLOB_WIDTH, LOG_BLOB_WIDTH}; @@ -165,7 +158,7 @@ pub fn point_evaluation( /// /// We use the [`openvm_sha256_guest`] extension to compute the SHA-256 digest. pub fn kzg_to_versioned_hash(kzg_commitment: &[u8]) -> [u8; 32] { - let mut hash = openvm_sha256_guest::sha256(kzg_commitment); + let mut hash = openvm_sha2::sha256(kzg_commitment); hash[0] = VERSIONED_HASH_VERSION_KZG; hash } diff --git a/crates/circuits/batch-circuit/src/builder/v7.rs b/crates/circuits/batch-circuit/src/builder/v7.rs index 803b4d27..55dde046 100644 --- a/crates/circuits/batch-circuit/src/builder/v7.rs +++ b/crates/circuits/batch-circuit/src/builder/v7.rs @@ -1,4 +1,4 @@ -use openvm_ecc_guest::halo2curves::bls12_381::G1Affine as Bls12_381_G1; +use halo2curves_axiom::bls12_381::G1Affine as Bls12_381_G1; use scroll_zkvm_circuit_input_types::{ batch::{BatchHeader, BatchHeaderV7, BatchInfo, Bytes48, EnvelopeV7, PayloadV7}, chunk::ChunkInfo, diff --git a/crates/circuits/batch-circuit/src/circuit.rs b/crates/circuits/batch-circuit/src/circuit.rs index ebbb2f8a..0fb0364a 100644 --- a/crates/circuits/batch-circuit/src/circuit.rs +++ b/crates/circuits/batch-circuit/src/circuit.rs @@ -12,23 +12,11 @@ use { openvm_algebra_guest::{IntMod, field::FieldExtension}, openvm_ecc_guest::AffinePoint, openvm_keccak256_guest, // trigger extern native-keccak256 - openvm_pairing_guest::{ - bls12_381::{Bls12_381, Bls12_381G1Affine, Fp, Fp2}, - pairing::PairingCheck, - }, + openvm_pairing::bls12_381::{Bls12_381, Bls12_381G1Affine, Fp, Fp2}, openvm_sha256_guest, }; -openvm_algebra_guest::moduli_macros::moduli_init! { - "0x1a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab", - "0x73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001" -} -openvm_ecc_guest::sw_macros::sw_init! { - Bls12_381G1Affine -} -openvm_algebra_complex_macros::complex_init! { - Bls12_381Fp2 { mod_idx = 0 }, -} +openvm::init!(); pub struct BatchCircuit; @@ -37,12 +25,7 @@ impl Circuit for BatchCircuit { type PublicInputs = VersionedBatchInfo; - fn setup() { - setup_all_complex_extensions(); - // barycentric require scalar field algebra so we setup all moduli, - // not `setup_0` in openvm's example - setup_all_moduli(); - } + fn setup() {} fn read_witness_bytes() -> Vec { read_witnesses() diff --git a/crates/circuits/bundle-circuit/bundle_exe_commit.rs b/crates/circuits/bundle-circuit/bundle_exe_commit.rs index 04e0d15d..3af86945 100644 --- a/crates/circuits/bundle-circuit/bundle_exe_commit.rs +++ b/crates/circuits/bundle-circuit/bundle_exe_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [1914368557, 851586172, 1253209608, 1662322119, 2012204381, 1106742457, 1802032515, 1558064322]; +pub const COMMIT: [u32; 8] = [1110340116, 1142684773, 620661143, 1492720180, 674091299, 869029577, 1776306320, 1441886955]; diff --git a/crates/circuits/bundle-circuit/bundle_exe_euclidv1_commit.rs b/crates/circuits/bundle-circuit/bundle_exe_euclidv1_commit.rs index 72fd625c..f439390d 100644 --- a/crates/circuits/bundle-circuit/bundle_exe_euclidv1_commit.rs +++ b/crates/circuits/bundle-circuit/bundle_exe_euclidv1_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [733664620, 1172105847, 1966770358, 510557714, 1349487414, 415289043, 488351218, 1895965757]; +pub const COMMIT: [u32; 8] = [1797486083, 1721741433, 951759276, 1835211723, 185425320, 1972260117, 1745008846, 1750586810]; diff --git a/crates/circuits/bundle-circuit/digest_1 b/crates/circuits/bundle-circuit/digest_1 index e6a4fad7..26b89f93 100644 Binary files a/crates/circuits/bundle-circuit/digest_1 and b/crates/circuits/bundle-circuit/digest_1 differ diff --git a/crates/circuits/bundle-circuit/digest_1_euclidv1 b/crates/circuits/bundle-circuit/digest_1_euclidv1 index a488b558..972af22e 100644 Binary files a/crates/circuits/bundle-circuit/digest_1_euclidv1 and b/crates/circuits/bundle-circuit/digest_1_euclidv1 differ diff --git a/crates/circuits/chunk-circuit/Cargo.toml b/crates/circuits/chunk-circuit/Cargo.toml index a47ce55c..88707c0a 100644 --- a/crates/circuits/chunk-circuit/Cargo.toml +++ b/crates/circuits/chunk-circuit/Cargo.toml @@ -10,11 +10,14 @@ scroll-zkvm-circuit-input-types = { workspace = true } rkyv.workspace = true -openvm = { workspace = true, features = ["std"] } +openvm = { workspace = true, features = ["std", "getrandom-unsupported"] } +openvm-k256 = { workspace = true } +openvm-p256 = { workspace = true } +openvm-pairing = { workspace = true, features = ["bn254"] } openvm-algebra-complex-macros = { workspace = true } openvm-algebra-guest = { workspace = true } openvm-bigint-guest = { workspace = true } -openvm-ecc-guest = { workspace = true, features = ["k256", "p256"] } +openvm-ecc-guest = { workspace = true } openvm-keccak256-guest= { workspace = true } openvm-pairing-guest = { workspace = true, features = ["bn254"] } openvm-rv32im-guest= { workspace = true } diff --git a/crates/circuits/chunk-circuit/chunk_exe_commit.rs b/crates/circuits/chunk-circuit/chunk_exe_commit.rs index 58ae961a..cae8cf4b 100644 --- a/crates/circuits/chunk-circuit/chunk_exe_commit.rs +++ b/crates/circuits/chunk-circuit/chunk_exe_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [226012526, 1982142184, 912178093, 1599974879, 113751034, 1155109745, 24934449, 952145607]; +pub const COMMIT: [u32; 8] = [307527465, 1900588370, 1241843434, 1668374062, 1353914100, 111014279, 1399994615, 1386683470]; diff --git a/crates/circuits/chunk-circuit/chunk_exe_rv32_commit.rs b/crates/circuits/chunk-circuit/chunk_exe_rv32_commit.rs index c61a643e..cae8cf4b 100644 --- a/crates/circuits/chunk-circuit/chunk_exe_rv32_commit.rs +++ b/crates/circuits/chunk-circuit/chunk_exe_rv32_commit.rs @@ -1,4 +1,4 @@ #![cfg_attr(rustfmt, rustfmt_skip)] //! Generated by crates/build-guest. DO NOT EDIT! -pub const COMMIT: [u32; 8] = [409697356, 716149176, 978069094, 836659519, 1453773851, 1655648793, 1523498889, 979202098]; +pub const COMMIT: [u32; 8] = [307527465, 1900588370, 1241843434, 1668374062, 1353914100, 111014279, 1399994615, 1386683470]; diff --git a/crates/circuits/chunk-circuit/openvm.toml b/crates/circuits/chunk-circuit/openvm.toml index 30940981..4e99c1cb 100644 --- a/crates/circuits/chunk-circuit/openvm.toml +++ b/crates/circuits/chunk-circuit/openvm.toml @@ -17,7 +17,7 @@ range_tuple_checker_sizes = [256, 8192] range_tuple_checker_sizes = [256, 8192] [app_vm_config.modular] -supported_modulus = [ +supported_moduli = [ "21888242871839275222246405745257275088696311157297823662689037894645226208583", "21888242871839275222246405745257275088548364400416034343698204186575808495617", "115792089237316195423570985008687907853269984665640564039457584007908834671663", @@ -27,7 +27,9 @@ supported_modulus = [ ] [app_vm_config.fp2] -supported_modulus = ["21888242871839275222246405745257275088696311157297823662689037894645226208583"] +supported_moduli = [ + ["Bn254Fp2","21888242871839275222246405745257275088696311157297823662689037894645226208583"] +] [app_vm_config.pairing] supported_curves = ["Bn254"] @@ -35,18 +37,21 @@ supported_curves = ["Bn254"] [app_vm_config.sha256] [[app_vm_config.ecc.supported_curves]] +struct_name = "Secp256k1Point" modulus = "115792089237316195423570985008687907853269984665640564039457584007908834671663" scalar = "115792089237316195423570985008687907852837564279074904382605163141518161494337" a = "0" b = "7" [[app_vm_config.ecc.supported_curves]] +struct_name = "P256Point" modulus = "115792089210356248762697446949407573530086143415290314195533631308867097853951" scalar = "115792089210356248762697446949407573529996955224135760342422259061068512044369" a = "115792089210356248762697446949407573530086143415290314195533631308867097853948" b = "41058363725152142129326129780047268409114441015993725554835256314039467401291" [[app_vm_config.ecc.supported_curves]] +struct_name = "Bn254G1Affine" modulus = "21888242871839275222246405745257275088696311157297823662689037894645226208583" scalar = "21888242871839275222246405745257275088548364400416034343698204186575808495617" a = "0" diff --git a/crates/circuits/chunk-circuit/src/circuit.rs b/crates/circuits/chunk-circuit/src/circuit.rs index a3847aef..1bf8449e 100644 --- a/crates/circuits/chunk-circuit/src/circuit.rs +++ b/crates/circuits/chunk-circuit/src/circuit.rs @@ -1,3 +1,4 @@ +use openvm::init; use scroll_zkvm_circuit_input_types::{ Circuit, chunk::{ArchivedChunkWitness, VersionedChunkInfo, execute}, @@ -9,28 +10,13 @@ use { openvm::platform as openvm_platform, openvm_algebra_guest::IntMod, openvm_bigint_guest, // trigger extern u256 (this may be unneeded) - openvm_ecc_guest::k256::Secp256k1Point, - openvm_ecc_guest::p256::P256Point, + openvm_k256::Secp256k1Point, openvm_keccak256_guest, // trigger extern native-keccak256 - openvm_pairing_guest::bn254::Bn254G1Affine, + openvm_p256::P256Point, + openvm_pairing::bn254::Bn254G1Affine, }; -openvm_algebra_guest::moduli_macros::moduli_init! { - "0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47", // Bn254Fp Coordinate field - "0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001", // Bn254 Scalar - "0xFFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE FFFFFC2F", // secp256k1 Coordinate field - "0xFFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE BAAEDCE6 AF48A03B BFD25E8C D0364141", // secp256k1 Scalar field - "0xffffffff 00000001 00000000 00000000 00000000 ffffffff ffffffff ffffffff", // secp256r1_coord_prime - "0xffffffff 00000000 ffffffff ffffffff bce6faad a7179e84 f3b9cac2 fc632551" // secp256r1_scalar_prime -} -openvm_ecc_guest::sw_macros::sw_init! { - Secp256k1Point, - P256Point, - Bn254G1Affine -} -openvm_algebra_complex_macros::complex_init! { - Bn254Fp2 { mod_idx = 0 }, -} +init!(); pub struct ChunkCircuit; @@ -38,11 +24,7 @@ impl Circuit for ChunkCircuit { type Witness = ArchivedChunkWitness; type PublicInputs = VersionedChunkInfo; - fn setup() { - setup_all_moduli(); - setup_all_curves(); - setup_all_complex_extensions(); - } + fn setup() {} fn read_witness_bytes() -> Vec { read_witnesses() diff --git a/crates/circuits/types/Cargo.toml b/crates/circuits/types/Cargo.toml index c017a02f..10aea4ff 100644 --- a/crates/circuits/types/Cargo.toml +++ b/crates/circuits/types/Cargo.toml @@ -10,6 +10,7 @@ version = "0.4.0" [dependencies] alloy-primitives = { workspace = true, default-features = false, features = ["std", "map-hashbrown", "map-fxhash", "rkyv"] } alloy-serde.workspace = true +getrandom = { version = "0.2", features = ["custom"] } rkyv.workspace = true sbv-trie = { workspace = true } sbv-core = { workspace = true } diff --git a/crates/circuits/types/src/lib.rs b/crates/circuits/types/src/lib.rs index b639476e..93eed67f 100644 --- a/crates/circuits/types/src/lib.rs +++ b/crates/circuits/types/src/lib.rs @@ -12,6 +12,12 @@ pub mod proof; pub mod utils; +use getrandom::{Error, register_custom_getrandom}; +pub fn zkvm_getrandom(dest: &mut [u8]) -> Result<(), Error> { + panic!("getrandom is not enabled in the current build"); +} +register_custom_getrandom!(zkvm_getrandom); + /// Defines behaviour to be implemented by types representing the public-input values of a circuit. pub trait PublicInputs { /// Keccak-256 digest of the public inputs. The public-input hash are revealed as public values diff --git a/crates/prover/src/prover/mod.rs b/crates/prover/src/prover/mod.rs index 4670b64f..ddbbdeb8 100644 --- a/crates/prover/src/prover/mod.rs +++ b/crates/prover/src/prover/mod.rs @@ -26,7 +26,7 @@ use serde::{Serialize, de::DeserializeOwned}; use tracing::{debug, instrument}; // Re-export from openvm_sdk. -pub use openvm_sdk::{self, F, SC}; +pub use openvm_sdk::{self, SC}; use crate::{ Error, WrappedProof, @@ -99,7 +99,7 @@ pub struct Prover { type InitRes = ( Arc>, Arc>, - AppExecutionCommit, + AppExecutionCommit, ); /// Configure the [`Prover`]. @@ -501,23 +501,20 @@ impl Prover { app_committed_exe: &NonRootCommittedExe, app_pk: &AppProvingKey, debug_out: bool, - ) -> (AppExecutionCommit, [[u32; 8]; 2]) { - use openvm_stark_sdk::openvm_stark_backend::p3_field::PrimeField32; + ) -> (AppExecutionCommit, [[u32; 8]; 2]) { let commits = AppExecutionCommit::compute( &app_pk.app_vm_pk.vm_config, app_committed_exe, &app_pk.leaf_committed_exe, ); - let exe_commit = commits.exe_commit.map(|x| x.as_canonical_u32()); - let leaf_commit = commits - .leaf_vm_verifier_commit - .map(|x| x.as_canonical_u32()); + let exe_commit = commits.app_exe_commit.to_u32_digest(); + let vm_commit = commits.app_vm_commit.to_u32_digest(); // print the 2 exe commitments if debug_out { - debug!(name: "exe-commitment", prover_name = Type::NAME, raw = ?exe_commit, as_bn254 = ?commits.exe_commit_to_bn254()); - debug!(name: "leaf-commitment", prover_name = Type::NAME, raw = ?leaf_commit, as_bn254 = ?commits.app_config_commit_to_bn254()); + debug!(name: "exe-commitment", prover_name = Type::NAME, raw = ?exe_commit, as_bn254 = ?commits.app_exe_commit.to_bn254()); + debug!(name: "vm-commitment", prover_name = Type::NAME, raw = ?vm_commit, as_bn254 = ?commits.app_vm_commit.to_bn254()); } assert_eq!( @@ -526,11 +523,11 @@ impl Prover { "read unmatched exe commitment from app" ); assert_eq!( - leaf_commit, + vm_commit, Type::LEAF_COMMIT, "read unmatched app commitment from app" ); - (commits, [exe_commit, leaf_commit]) + (commits, [exe_commit, vm_commit]) } } diff --git a/crates/prover/src/setup.rs b/crates/prover/src/setup.rs index b82c7766..3283af14 100644 --- a/crates/prover/src/setup.rs +++ b/crates/prover/src/setup.rs @@ -1,12 +1,16 @@ use std::{fs::read_to_string, path::Path}; -use openvm_circuit::arch::instructions::exe::VmExe; +use openvm_circuit::arch::instructions::{ + exe::{FnBounds, MemoryImage, VmExe}, + instruction::{DebugInfo, Instruction}, + program::Program, +}; use openvm_native_recursion::halo2::utils::CacheHalo2ParamsReader; use openvm_sdk::{ DefaultStaticVerifierPvHandler, Sdk, commit::AppExecutionCommit, config::{AggConfig, AppConfig, SdkVmConfig}, - fs::{read_app_pk_from_file, read_exe_from_file}, + fs::{read_app_pk_from_file, read_exe_from_file, read_from_file_bitcode}, keygen::{AggProvingKey, AppProvingKey}, }; use openvm_stark_sdk::p3_baby_bear::BabyBear; @@ -18,10 +22,43 @@ pub type F = BabyBear; /// Wrapper around [`openvm_sdk::fs::read_exe_from_file`]. pub fn read_app_exe>(path: P) -> Result, Error> { - read_exe_from_file(&path).map_err(|e| Error::Setup { + if let Ok(exe) = read_exe_from_file(&path) { + return Ok(exe); + } + println!("loading vmexe failed, trying old format.."); + #[derive(Clone, Debug, Default, serde::Serialize, serde::Deserialize)] + pub struct OldProgram { + pub instructions_and_debug_infos: Vec, Option)>>, + pub step: u32, + pub pc_base: u32, + pub max_num_public_values: usize, + } + #[derive(Clone, Debug, Default, serde::Serialize, serde::Deserialize)] + #[serde(bound( + serialize = "F: serde::Serialize", + deserialize = "F: std::cmp::Ord + serde::Deserialize<'de>" + ))] + pub struct OldVmExe { + pub program: OldProgram, + pub pc_start: u32, + pub init_memory: MemoryImage, + pub fn_bounds: FnBounds, + } + let old_exe: OldVmExe = read_from_file_bitcode(&path).map_err(|e| Error::Setup { path: path.as_ref().into(), src: e.to_string(), - }) + })?; + let exe = VmExe:: { + pc_start: old_exe.pc_start, + init_memory: old_exe.init_memory, + fn_bounds: old_exe.fn_bounds, + program: Program:: { + instructions_and_debug_infos: old_exe.program.instructions_and_debug_infos, + step: old_exe.program.step, + pc_base: old_exe.program.pc_base, + }, + }; + Ok(exe) } /// Wrapper around [`openvm_sdk::fs::read_app_pk_from_file`]. @@ -49,7 +86,7 @@ pub fn read_app_config>(path: P) -> Result pub fn compute_commitments( app_exe: VmExe, app_pk: AppProvingKey, -) -> Result, Error> { +) -> Result { let committed_exe = Sdk::new() .commit_app_exe(app_pk.app_fri_params(), app_exe) .map_err(|e| Error::Commit(e.to_string()))?;