From e860dd34569856c37c2a877428388bbf10aff73b Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Thu, 26 Mar 2026 09:46:34 +0100 Subject: [PATCH 01/10] feat: replace Fp64 with SmallFp for Goldilocks field Switch the Goldilocks field (p = 2^64 - 2^32 + 1) from Fp64> to SmallFp using #[derive(SmallFpConfig)]. This leverages native u64 Montgomery arithmetic for 15-22% faster sumcheck and 4-12% faster NTT operations. Key changes: - fields.rs: SmallFp field definition with const fn goldilocks_mont() for compile-time Montgomery constant computation in Fp2/Fp3 extension configs - Cargo.toml: patch ark-ff/ark-std/ark-serialize to git master for SmallFp; update spongefish to patched version fixing BigInt<2> encoding/deserialization - cooley_tukey.rs: fix test using BigInt<2> (16 bytes) instead of BigInt<1> (8 bytes) Spongefish patches (in /tmp/spongefish-patched): - Fix impl_encoding! macro: drain leading zeros from BigInt<2>.to_bytes_be() - Fix impl_deserialize! macro: use BigInt::from_bits_be + from_bigint instead of from_be_bytes_mod_order (broken for SmallFp due to from_raw Montgomery bug) --- Cargo.lock | 374 +++++++++++++++++++++++++++++--- Cargo.toml | 7 +- src/algebra/fields.rs | 74 +++++-- src/algebra/ntt/cooley_tukey.rs | 4 +- 4 files changed, 408 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index acc6ca37..0d2baf62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,6 +11,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anstream" version = "0.6.21" @@ -79,28 +88,23 @@ dependencies = [ [[package]] name = "ark-ff" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" +source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" dependencies = [ "ark-ff-asm", "ark-ff-macros", "ark-serialize", "ark-std", - "arrayvec", "digest", "educe", - "itertools 0.13.0", "num-bigint", "num-traits", - "paste", "zeroize", ] [[package]] name = "ark-ff-asm" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" +source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" dependencies = [ "quote", "syn", @@ -109,8 +113,7 @@ dependencies = [ [[package]] name = "ark-ff-macros" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" +source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" dependencies = [ "num-bigint", "num-traits", @@ -122,20 +125,29 @@ dependencies = [ [[package]] name = "ark-serialize" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" +source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" dependencies = [ + "ark-serialize-derive", "ark-std", - "arrayvec", "digest", "num-bigint", + "serde_with", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.5.0" +source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "ark-std" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" +source = "git+https://github.com/arkworks-rs/std#1693bc56d2ca6657b623f33a3f0b009d0ffeb892" dependencies = [ "num-traits", "rand 0.8.5", @@ -159,6 +171,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bit-set" version = "0.8.0" @@ -204,6 +222,12 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bumpalo" +version = "3.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" + [[package]] name = "cc" version = "1.2.52" @@ -226,6 +250,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chrono" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link", +] + [[package]] name = "ciborium" version = "0.2.2" @@ -332,7 +368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15eaee97aa5bceb32cc683fe25cd6373b7fc48baee5c12471996b58b6ddf0d7c" dependencies = [ "divan-macros", - "itertools 0.14.0", + "itertools", "proc-macro-crate", "proc-macro2", "quote", @@ -388,6 +424,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -438,6 +480,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" +dependencies = [ + "powerfmt", + "serde_core", +] + [[package]] name = "derive-where" version = "1.6.0" @@ -472,6 +524,12 @@ dependencies = [ "syn", ] +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "educe" version = "0.6.0" @@ -594,6 +652,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "hashbrown" version = "0.16.1" @@ -618,6 +682,41 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "iana-time-zone" +version = "0.1.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + [[package]] name = "indexmap" version = "2.13.0" @@ -625,7 +724,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.16.1", + "serde", + "serde_core", ] [[package]] @@ -634,15 +735,6 @@ version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -658,6 +750,16 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "js-sys" +version = "0.3.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + [[package]] name = "keccak" version = "0.1.5" @@ -746,6 +848,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" + [[package]] name = "num-integer" version = "0.1.46" @@ -807,7 +915,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e63fa5eb1bd12a240089e72ae3fe10350944d9c166d00a3bfd2a1794db65cf5c" dependencies = [ - "itertools 0.14.0", + "itertools", "p3-field", "p3-matrix", "p3-maybe-rayon", @@ -822,7 +930,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ebfdb6ef992ae64e9e8f449ac46516ffa584f11afbdf9ee244288c2a633cdf4" dependencies = [ - "itertools 0.14.0", + "itertools", "num-bigint", "p3-maybe-rayon", "p3-util", @@ -852,7 +960,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5542f96504dae8100c91398fb1e3f5ec669eb9c73d9e0b018a93b5fe32bad230" dependencies = [ - "itertools 0.14.0", + "itertools", "p3-field", "p3-maybe-rayon", "p3-util", @@ -887,7 +995,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a981d60da3d8cbf8561014e2c186068578405fd69098fa75b43d4afb364a47" dependencies = [ - "itertools 0.14.0", + "itertools", "num-bigint", "p3-dft", "p3-field", @@ -924,7 +1032,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd788f04e86dd5c35dd87cad29eefdb6371d2fd5f7664451382eeacae3c3ed0" dependencies = [ - "itertools 0.14.0", + "itertools", "p3-field", "serde", ] @@ -950,6 +1058,12 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1107,6 +1221,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "regex" version = "1.12.2" @@ -1155,6 +1289,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + [[package]] name = "rusty-fork" version = "0.3.1" @@ -1167,6 +1307,30 @@ dependencies = [ "wait-timeout", ] +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -1216,6 +1380,24 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_with" +version = "3.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" +dependencies = [ + "base64", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.13.0", + "schemars 0.9.0", + "schemars 1.2.1", + "serde_core", + "serde_json", + "time", +] + [[package]] name = "sha2" version = "0.10.9" @@ -1280,7 +1462,6 @@ dependencies = [ [[package]] name = "spongefish" version = "1.0.0-rc1" -source = "git+https://github.com/arkworks-rs/spongefish?rev=fcc277f8a857fdeeadd7cca92ab08de63b1ff1a1#fcc277f8a857fdeeadd7cca92ab08de63b1ff1a1" dependencies = [ "ark-ff", "ark-serialize", @@ -1369,6 +1550,37 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "time" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde_core", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" + +[[package]] +name = "time-macros" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "toml_datetime" version = "0.7.5+spec-1.1.0" @@ -1384,7 +1596,7 @@ version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap", + "indexmap 2.13.0", "toml_datetime", "toml_parser", "winnow", @@ -1530,6 +1742,51 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "wasm-bindgen" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" +dependencies = [ + "unicode-ident", +] + [[package]] name = "whir" version = "0.1.0" @@ -1561,12 +1818,65 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.59.0" diff --git a/Cargo.toml b/Cargo.toml index 0c6494a4..cd4ae1d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ sha3 = { version = "0.10.7", features = ["asm", "oid"] } clap = { version = "4.4", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -spongefish = { git = "https://github.com/arkworks-rs/spongefish", features = ["ark-ff"], rev = "fcc277f8a857fdeeadd7cca92ab08de63b1ff1a1"} +spongefish = { path = "/tmp/spongefish-patched/spongefish", features = ["ark-ff"]} rayon = { version = "1.10", optional = true } tracing = { version = "0.1", features = ["attributes"], optional = true } hex = "0.4" @@ -101,3 +101,8 @@ lto = "thin" # LTO breaks line attribution. # Enable a large amount of optimization in the dev profile for dependencies. [profile.dev.package."*"] opt-level = 3 + +[patch.crates-io] +ark-ff = { git = "https://github.com/arkworks-rs/algebra" } +ark-std = { git = "https://github.com/arkworks-rs/std" } +ark-serialize = { git = "https://github.com/arkworks-rs/algebra" } diff --git a/src/algebra/fields.rs b/src/algebra/fields.rs index 0675d19d..aae370cf 100644 --- a/src/algebra/fields.rs +++ b/src/algebra/fields.rs @@ -1,6 +1,6 @@ use ark_ff::{ - Field, Fp128, Fp192, Fp2, Fp256, Fp2Config, Fp3, Fp3Config, Fp64, MontBackend, MontConfig, - MontFp, PrimeField, + Field, Fp128, Fp192, Fp2, Fp256, Fp2Config, Fp3, Fp3Config, MontBackend, MontConfig, + PrimeField, SmallFp, SmallFpConfig, }; use serde::{Deserialize, Serialize}; use zerocopy::IntoBytes; @@ -80,24 +80,42 @@ pub type Field192 = Fp192>; pub struct FrConfig128; pub type Field128 = Fp128>; -#[derive(MontConfig)] +/// Goldilocks prime: p = 2^64 - 2^32 + 1. +/// +/// Uses [`SmallFp`] with native u64 Montgomery arithmetic instead of the +/// generic [`MontBackend`], giving significant speedups for 64-bit fields. +#[derive(SmallFpConfig)] #[modulus = "18446744069414584321"] #[generator = "7"] pub struct FConfig64; -pub type Field64 = Fp64>; +pub type Field64 = SmallFp; + +/// Compute the Montgomery representation of a Goldilocks field element at +/// compile time. +/// +/// For SmallFp the Montgomery constant R = 2^k where k = ceil(log2(p)). +/// Since p ≈ 2^64, we have k = 64 and R = 2^64. +/// +/// Montgomery form of `v` is `v · R mod p`, computed in u128 to avoid overflow. +const fn goldilocks_mont(v: u64) -> u64 { + const P: u128 = 18_446_744_069_414_584_321; + // R mod p = 2^64 mod p + const R_MOD_P: u128 = (1u128 << 64) - P; // = 2^32 - 1 = 4294967295 + ((v as u128 * R_MOD_P) % P) as u64 +} pub type Field64_2 = Fp2; pub struct F2Config64; impl Fp2Config for F2Config64 { type Fp = Field64; - const NONRESIDUE: Self::Fp = MontFp!("7"); + const NONRESIDUE: Self::Fp = Field64::from_raw(goldilocks_mont(7)); const FROBENIUS_COEFF_FP2_C1: &'static [Self::Fp] = &[ // Fq(7)**(((q^0) - 1) / 2) - MontFp!("1"), + Field64::from_raw(goldilocks_mont(1)), // Fq(7)**(((q^1) - 1) / 2) - MontFp!("18446744069414584320"), + Field64::from_raw(goldilocks_mont(18_446_744_069_414_584_320)), ]; } @@ -107,30 +125,33 @@ pub struct F3Config64; impl Fp3Config for F3Config64 { type Fp = Field64; - const NONRESIDUE: Self::Fp = MontFp!("2"); + const NONRESIDUE: Self::Fp = Field64::from_raw(goldilocks_mont(2)); const FROBENIUS_COEFF_FP3_C1: &'static [Self::Fp] = &[ - MontFp!("1"), + Field64::from_raw(goldilocks_mont(1)), // Fq(2)^(((q^1) - 1) / 3) - MontFp!("4294967295"), + Field64::from_raw(goldilocks_mont(4_294_967_295)), // Fq(2)^(((q^2) - 1) / 3) - MontFp!("18446744065119617025"), + Field64::from_raw(goldilocks_mont(18_446_744_065_119_617_025)), ]; const FROBENIUS_COEFF_FP3_C2: &'static [Self::Fp] = &[ - MontFp!("1"), + Field64::from_raw(goldilocks_mont(1)), // Fq(2)^(((2q^1) - 2) / 3) - MontFp!("18446744065119617025"), + Field64::from_raw(goldilocks_mont(18_446_744_065_119_617_025)), // Fq(2)^(((2q^2) - 2) / 3) - MontFp!("4294967295"), + Field64::from_raw(goldilocks_mont(4_294_967_295)), ]; // (q^3 - 1) = 2^32 * T where T = 1461501636310055817916238417282618014431694553085 const TWO_ADICITY: u32 = 32; // 11^T - const QUADRATIC_NONRESIDUE_TO_T: Fp3 = - Fp3::new(MontFp!("5944137876247729999"), MontFp!("0"), MontFp!("0")); + const QUADRATIC_NONRESIDUE_TO_T: Fp3 = Fp3::new( + Field64::from_raw(goldilocks_mont(5_944_137_876_247_729_999)), + Field64::from_raw(goldilocks_mont(0)), + Field64::from_raw(goldilocks_mont(0)), + ); // T - 1 / 2 #[allow(clippy::unreadable_literal)] @@ -138,6 +159,7 @@ impl Fp3Config for F3Config64 { &[0x80000002fffffffe, 0x80000002fffffffc, 0x7ffffffe]; } + #[cfg(test)] mod tests { use static_assertions::const_assert_eq; @@ -170,4 +192,24 @@ mod tests { "{\"characteristic\":\"ffffffff00000001\",\"extension_degree\":3}" ); } + + #[test] + fn test_fp2_encoding_roundtrip() { + use spongefish::{Encoding, NargDeserialize}; + + // Check Fp2 encoding→NargDeserialize roundtrip + let val = Field64_2::new(Field64::from(42u64), Field64::from(7u64)); + let encoded = val.encode(); + let bytes = encoded.as_ref(); + + let mut slice: &[u8] = bytes; + let decoded = Field64_2::deserialize_from_narg(&mut slice) + .expect("NargDeserialize failed"); + assert!(slice.is_empty(), "Not all bytes consumed"); + assert_eq!( + val, decoded, + "Fp2 roundtrip failed: original={:?}, decoded={:?}", + val, decoded + ); + } } diff --git a/src/algebra/ntt/cooley_tukey.rs b/src/algebra/ntt/cooley_tukey.rs index 4356e8db..9310d52d 100644 --- a/src/algebra/ntt/cooley_tukey.rs +++ b/src/algebra/ntt/cooley_tukey.rs @@ -455,7 +455,7 @@ pub fn apply_twiddles(values: &mut [F], roots: &[F], rows: usize, cols #[cfg(test)] #[allow(clippy::significant_drop_tightening)] mod tests { - use ark_ff::{AdditiveGroup as _, BigInteger, PrimeField}; + use ark_ff::{AdditiveGroup as _, PrimeField}; use super::*; use crate::algebra::fields::Field64; @@ -507,7 +507,7 @@ mod tests { let root = engine.root(16); // The inverse of ω is ω^{-1}, computed as ω^(p-2) in Field64. - let p: u64 = u64::from_be_bytes(Field64::MODULUS.to_bytes_be().try_into().unwrap()); + let p: u64 = Field64::MODULUS.as_ref()[0]; let inverse_root = root.pow([p - 2]); assert_eq!(root * inverse_root, Field64::ONE); } From 83d2897a9615d5d76733ab7ff20d7e0ba2c99661 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:44:46 +0100 Subject: [PATCH 02/10] deps: point spongefish at z-tech fork, update ark-ff to include #1082 fix - spongefish: z-tech/spongefish rev 2613967 (encoding + NargDeserialize fixes for SmallFp extension fields) - ark-ff: algebra a2d4d660 (includes #1082: fix SmallFp from_random_bytes Montgomery confusion) --- Cargo.lock | 102 ++++++++++++++++++++++++++++++++++------------------- Cargo.toml | 2 +- 2 files changed, 67 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d2baf62..c41ed75a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "ark-ff" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" +source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" dependencies = [ "ark-ff-asm", "ark-ff-macros", @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "ark-ff-asm" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" +source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" dependencies = [ "quote", "syn", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "ark-ff-macros" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" +source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" dependencies = [ "num-bigint", "num-traits", @@ -125,7 +125,7 @@ dependencies = [ [[package]] name = "ark-serialize" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" +source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" dependencies = [ "ark-serialize-derive", "ark-std", @@ -137,7 +137,7 @@ dependencies = [ [[package]] name = "ark-serialize-derive" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#c402d0c810232cc4801971faf54bd4dcee77f6f2" +source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" dependencies = [ "proc-macro2", "quote", @@ -897,9 +897,9 @@ dependencies = [ [[package]] name = "p3-challenger" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20e42ba74a49c08c6e99f74cd9b343bfa31aa5721fea55079b18e3fd65f1dcbc" +checksum = "af9bbcb18fe90271668259aacfc43455e328673c2b5c926cff0663edc8653e4d" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -911,9 +911,9 @@ dependencies = [ [[package]] name = "p3-dft" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63fa5eb1bd12a240089e72ae3fe10350944d9c166d00a3bfd2a1794db65cf5c" +checksum = "17e7ba0dc20be075eab3f88f0cb820a0901f86218a1c46134e7c817d41597989" dependencies = [ "itertools", "p3-field", @@ -926,74 +926,75 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebfdb6ef992ae64e9e8f449ac46516ffa584f11afbdf9ee244288c2a633cdf4" +checksum = "9b8533e6c2f4d0cc61fd2ae5299bb83316898e535f47291808d37e4d666ba088" dependencies = [ "itertools", "num-bigint", "p3-maybe-rayon", "p3-util", "paste", - "rand 0.9.2", + "rand 0.10.0", "serde", "tracing", ] [[package]] name = "p3-koala-bear" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5113f50002c56006685b7d7ae12db568150aa1d4bfb092b883d64ece20138042" +checksum = "dbda3f071018b04cafbc1f6894603f5e0593cf84d03a6856de9f85e42ec70b16" dependencies = [ "p3-challenger", "p3-field", + "p3-mds", "p3-monty-31", + "p3-poseidon1", "p3-poseidon2", "p3-symmetric", - "rand 0.9.2", + "rand 0.10.0", ] [[package]] name = "p3-matrix" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5542f96504dae8100c91398fb1e3f5ec669eb9c73d9e0b018a93b5fe32bad230" +checksum = "72bb78444459155c2e4711d71abbfef7b04cc2ba1fa83751ccab241b01957095" dependencies = [ "itertools", "p3-field", "p3-maybe-rayon", "p3-util", - "rand 0.9.2", + "rand 0.10.0", "serde", "tracing", - "transpose", ] [[package]] name = "p3-maybe-rayon" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5669ca75645f99cd001e9d0289a4eeff2bc2cd9dc3c6c3aaf22643966e83df" +checksum = "70a0a54345917f500130a9986fa5ff9ecbc26f0c6313080b35b713e26ddc8053" [[package]] name = "p3-mds" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038763af23df9da653065867fd85b38626079031576c86fd537097e5be6a0da0" +checksum = "3cd514bf3e9bf9f1b7db2db96e5bd2972d9963dd62430de1e193d74522ae96a6" dependencies = [ "p3-dft", "p3-field", "p3-symmetric", "p3-util", - "rand 0.9.2", + "rand 0.10.0", ] [[package]] name = "p3-monty-31" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a981d60da3d8cbf8561014e2c186068578405fd69098fa75b43d4afb364a47" +checksum = "0d9340a650f07a6cd42a4e877017ba7b206df87fe50dfc3cf110f01a3c370bd1" dependencies = [ "itertools", "num-bigint", @@ -1002,48 +1003,61 @@ dependencies = [ "p3-matrix", "p3-maybe-rayon", "p3-mds", + "p3-poseidon1", "p3-poseidon2", "p3-symmetric", "p3-util", "paste", - "rand 0.9.2", + "rand 0.10.0", "serde", "spin", "tracing", - "transpose", +] + +[[package]] +name = "p3-poseidon1" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd56ae3a51ded1b77f7b1b21d0b157ae82b9d5ca8f2cba347c0b821fe771a79" +dependencies = [ + "p3-field", + "p3-symmetric", + "rand 0.10.0", ] [[package]] name = "p3-poseidon2" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903b73e4f9a7781a18561c74dc169cf03333497b57a8dd02aaeb130c0f386599" +checksum = "858aa1c33ec983dfbb8cfc553a213de19d8fde96485e54e6e952b9ac5e70bd4e" dependencies = [ "p3-field", "p3-mds", "p3-symmetric", "p3-util", - "rand 0.9.2", + "rand 0.10.0", ] [[package]] name = "p3-symmetric" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd788f04e86dd5c35dd87cad29eefdb6371d2fd5f7664451382eeacae3c3ed0" +checksum = "1a9a3b20bb8104e52d45219a78d80654c8ac6a4781be0eaa3f3e999f5ae4b9b2" dependencies = [ "itertools", "p3-field", + "p3-util", "serde", ] [[package]] name = "p3-util" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "663b16021930bc600ecada915c6c3965730a3b9d6a6c23434ccf70bfc29d6881" +checksum = "9f24495d9cd64693165a9f1b3da0758395ad6d25d2d44dd740bdb34c2bce0c53" dependencies = [ "serde", + "transpose", ] [[package]] @@ -1153,6 +1167,15 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +dependencies = [ + "rand_core 0.10.0", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -1192,6 +1215,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" + [[package]] name = "rand_xorshift" version = "0.4.0" @@ -1461,7 +1490,8 @@ dependencies = [ [[package]] name = "spongefish" -version = "1.0.0-rc1" +version = "0.4.0" +source = "git+https://github.com/z-tech/spongefish?rev=2613967#2613967409998dc4f81ac6f0c1799456f7878b82" dependencies = [ "ark-ff", "ark-serialize", diff --git a/Cargo.toml b/Cargo.toml index cd4ae1d3..1eef0bd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ sha3 = { version = "0.10.7", features = ["asm", "oid"] } clap = { version = "4.4", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -spongefish = { path = "/tmp/spongefish-patched/spongefish", features = ["ark-ff"]} +spongefish = { git = "https://github.com/z-tech/spongefish", rev = "2613967", features = ["ark-ff"]} rayon = { version = "1.10", optional = true } tracing = { version = "0.1", features = ["attributes"], optional = true } hex = "0.4" From 9e062f391c3ce4cd893be9faa70b2a859dff100f Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:04:21 +0100 Subject: [PATCH 03/10] fmt --- src/algebra/fields.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/algebra/fields.rs b/src/algebra/fields.rs index aae370cf..583776bf 100644 --- a/src/algebra/fields.rs +++ b/src/algebra/fields.rs @@ -84,6 +84,7 @@ pub type Field128 = Fp128>; /// /// Uses [`SmallFp`] with native u64 Montgomery arithmetic instead of the /// generic [`MontBackend`], giving significant speedups for 64-bit fields. +#[allow(clippy::assign_op_pattern)] #[derive(SmallFpConfig)] #[modulus = "18446744069414584321"] #[generator = "7"] @@ -159,7 +160,6 @@ impl Fp3Config for F3Config64 { &[0x80000002fffffffe, 0x80000002fffffffc, 0x7ffffffe]; } - #[cfg(test)] mod tests { use static_assertions::const_assert_eq; @@ -203,8 +203,7 @@ mod tests { let bytes = encoded.as_ref(); let mut slice: &[u8] = bytes; - let decoded = Field64_2::deserialize_from_narg(&mut slice) - .expect("NargDeserialize failed"); + let decoded = Field64_2::deserialize_from_narg(&mut slice).expect("NargDeserialize failed"); assert!(slice.is_empty(), "Not all bytes consumed"); assert_eq!( val, decoded, From 2b5c4596383e564da7e4a8c0de848dad2bf75a16 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:07:44 +0100 Subject: [PATCH 04/10] clippy --- src/algebra/fields.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/algebra/fields.rs b/src/algebra/fields.rs index 583776bf..ea539a58 100644 --- a/src/algebra/fields.rs +++ b/src/algebra/fields.rs @@ -1,3 +1,5 @@ +#![allow(clippy::assign_op_pattern)] // Generated by SmallFpConfig derive macro + use ark_ff::{ Field, Fp128, Fp192, Fp2, Fp256, Fp2Config, Fp3, Fp3Config, MontBackend, MontConfig, PrimeField, SmallFp, SmallFpConfig, @@ -84,7 +86,6 @@ pub type Field128 = Fp128>; /// /// Uses [`SmallFp`] with native u64 Montgomery arithmetic instead of the /// generic [`MontBackend`], giving significant speedups for 64-bit fields. -#[allow(clippy::assign_op_pattern)] #[derive(SmallFpConfig)] #[modulus = "18446744069414584321"] #[generator = "7"] From 939f02a1153a01f43730e5df2d9b9251b429f8e7 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:12:27 +0100 Subject: [PATCH 05/10] fix ci --- src/algebra/fields.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/algebra/fields.rs b/src/algebra/fields.rs index ea539a58..a78145e0 100644 --- a/src/algebra/fields.rs +++ b/src/algebra/fields.rs @@ -208,8 +208,7 @@ mod tests { assert!(slice.is_empty(), "Not all bytes consumed"); assert_eq!( val, decoded, - "Fp2 roundtrip failed: original={:?}, decoded={:?}", - val, decoded + "Fp2 roundtrip failed: original={val:?}, decoded={decoded:?}", ); } } From b33ae532cd54529f4b06ea9c36019d0341c7d9fe Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Sun, 29 Mar 2026 11:46:12 +0200 Subject: [PATCH 06/10] const smallfp --- Cargo.lock | 561 +++++++++++++++++++++++++----------------- Cargo.toml | 4 +- src/algebra/fields.rs | 97 +++----- 3 files changed, 379 insertions(+), 283 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c41ed75a..2c459051 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.21" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -37,15 +37,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.100" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "approx" @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "ark-ff" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" dependencies = [ "ark-ff-asm", "ark-ff-macros", @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "ark-ff-asm" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" dependencies = [ "quote", "syn", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "ark-ff-macros" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" dependencies = [ "num-bigint", "num-traits", @@ -125,7 +125,7 @@ dependencies = [ [[package]] name = "ark-serialize" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" dependencies = [ "ark-serialize-derive", "ark-std", @@ -137,7 +137,7 @@ dependencies = [ [[package]] name = "ark-serialize-derive" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra#a2d4d660983bcf7a721ddea75e425aa8d6f80ab7" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" dependencies = [ "proc-macro2", "quote", @@ -194,9 +194,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "blake3" @@ -230,9 +230,9 @@ checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "cc" -version = "1.2.52" +version = "1.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3" +checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" dependencies = [ "find-msvc-tools", "shlex", @@ -291,9 +291,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.54" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6e6ff9dcd79cff5cd969a17a545d79e84ab086e444102a591e288a8aa3ce394" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" dependencies = [ "clap_builder", "clap_derive", @@ -301,9 +301,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.54" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42cf4d2b7a41bc8f663a7cab4031ebafa1bf3875705bfaf8466dc60ab52c00" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", @@ -314,9 +314,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.49" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" dependencies = [ "heck", "proc-macro2", @@ -326,15 +326,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.7" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "codspeed" -version = "4.2.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0d98d97fd75ca4489a1a0997820a6521531085e7c8a98941bd0e1264d567dd" +checksum = "b684e94583e85a5ca7e1a6454a89d76a5121240f2fb67eb564129d9bafdb9db0" dependencies = [ "anyhow", "cc", @@ -350,9 +350,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat" -version = "4.2.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4179ec5518e79efcd02ed50aa483ff807902e43c85146e87fff58b9cffc06078" +checksum = "89e4bf8c7793c170fd0fcf3be97b9032b2ae39c2b9e8818aba3cc10ca0f0c6c0" dependencies = [ "clap", "codspeed", @@ -363,9 +363,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat-macros" -version = "4.2.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eaee97aa5bceb32cc683fe25cd6373b7fc48baee5c12471996b58b6ddf0d7c" +checksum = "78aae02f2a278588e16e8ca62ea1915b8ab30f8230a09926671bba19ede801a4" dependencies = [ "divan-macros", "itertools", @@ -377,9 +377,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat-walltime" -version = "4.2.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c38671153aa73be075d6019cab5ab1e6b31d36644067c1ac4cef73bf9723ce33" +checksum = "59ffd32c0c59ab8b674b15be65ba7c59aebac047036cfa7fa1e11bc2c178b81f" dependencies = [ "cfg-if", "clap", @@ -392,9 +392,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "colored" @@ -492,9 +492,9 @@ dependencies = [ [[package]] name = "derive-where" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f" +checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" dependencies = [ "proc-macro2", "quote", @@ -592,9 +592,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "find-msvc-tools" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fnv" @@ -602,6 +602,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "generic-array" version = "0.14.7" @@ -631,8 +637,21 @@ checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 5.3.0", + "wasip2", +] + +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", "wasip2", + "wasip3", ] [[package]] @@ -658,6 +677,15 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] + [[package]] name = "hashbrown" version = "0.16.1" @@ -706,6 +734,12 @@ dependencies = [ "cc", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "indexmap" version = "1.9.3" @@ -746,15 +780,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.91" +version = "0.3.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" +checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995" dependencies = [ "once_cell", "wasm-bindgen", @@ -762,9 +796,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ "cpufeatures", ] @@ -775,17 +809,23 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.180" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "linux-raw-sys" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "lock_api" @@ -813,15 +853,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "nix" -version = "0.30.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3" dependencies = [ "bitflags", "cfg-if", @@ -874,9 +914,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" @@ -886,9 +926,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "ordered-float" -version = "5.1.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d" +checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e" dependencies = [ "num-traits", "rand 0.8.5", @@ -897,9 +937,9 @@ dependencies = [ [[package]] name = "p3-challenger" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9bbcb18fe90271668259aacfc43455e328673c2b5c926cff0663edc8653e4d" +checksum = "4a0b490c745a7d2adeeafff06411814c8078c432740162332b3cd71be0158a76" dependencies = [ "p3-field", "p3-maybe-rayon", @@ -911,9 +951,9 @@ dependencies = [ [[package]] name = "p3-dft" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e7ba0dc20be075eab3f88f0cb820a0901f86218a1c46134e7c817d41597989" +checksum = "55301e91544440254977108b85c32c09d7ea05f2f0dd61092a2825339906a4a7" dependencies = [ "itertools", "p3-field", @@ -926,9 +966,9 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b8533e6c2f4d0cc61fd2ae5299bb83316898e535f47291808d37e4d666ba088" +checksum = "85affca7fc983889f260655c4cf74163eebb94605f702e4b6809ead707cba54f" dependencies = [ "itertools", "num-bigint", @@ -942,9 +982,9 @@ dependencies = [ [[package]] name = "p3-koala-bear" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbda3f071018b04cafbc1f6894603f5e0593cf84d03a6856de9f85e42ec70b16" +checksum = "7369a8eb2a27b314338f6b4b77e6a701ad31f1deff25b75bd302fc08c924c9b3" dependencies = [ "p3-challenger", "p3-field", @@ -958,9 +998,9 @@ dependencies = [ [[package]] name = "p3-matrix" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72bb78444459155c2e4711d71abbfef7b04cc2ba1fa83751ccab241b01957095" +checksum = "53428126b009071563d1d07305a9de8be0d21de00b57d2475289ee32ffca6577" dependencies = [ "itertools", "p3-field", @@ -973,15 +1013,15 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a0a54345917f500130a9986fa5ff9ecbc26f0c6313080b35b713e26ddc8053" +checksum = "082bf467011c06c768c579ec6eb9accb5e1e62108891634cc770396e917f978a" [[package]] name = "p3-mds" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd514bf3e9bf9f1b7db2db96e5bd2972d9963dd62430de1e193d74522ae96a6" +checksum = "35209e6214102ea6ec6b8cb1b9c15a9b8e597a39f9173597c957f123bced81b3" dependencies = [ "p3-dft", "p3-field", @@ -992,9 +1032,9 @@ dependencies = [ [[package]] name = "p3-monty-31" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d9340a650f07a6cd42a4e877017ba7b206df87fe50dfc3cf110f01a3c370bd1" +checksum = "ffa8c99ec50c035020bbf5457c6a729ba6a975719c1a8dd3f16421081e4f650c" dependencies = [ "itertools", "num-bigint", @@ -1016,9 +1056,9 @@ dependencies = [ [[package]] name = "p3-poseidon1" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd56ae3a51ded1b77f7b1b21d0b157ae82b9d5ca8f2cba347c0b821fe771a79" +checksum = "6a018b618e3fa0aec8be933b1d8e404edd23f46991f6bf3f5c2f3f95e9413fe9" dependencies = [ "p3-field", "p3-symmetric", @@ -1027,9 +1067,9 @@ dependencies = [ [[package]] name = "p3-poseidon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "858aa1c33ec983dfbb8cfc553a213de19d8fde96485e54e6e952b9ac5e70bd4e" +checksum = "256a668a9ba916f8767552f13d0ba50d18968bc74a623bfdafa41e2970c944d0" dependencies = [ "p3-field", "p3-mds", @@ -1040,9 +1080,9 @@ dependencies = [ [[package]] name = "p3-symmetric" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9a3b20bb8104e52d45219a78d80654c8ac6a4781be0eaa3f3e999f5ae4b9b2" +checksum = "6c60a71a1507c13611b0f2b0b6e83669fd5b76f8e3115bcbced5ccfdf3ca7807" dependencies = [ "itertools", "p3-field", @@ -1052,9 +1092,9 @@ dependencies = [ [[package]] name = "p3-util" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f24495d9cd64693165a9f1b3da0758395ad6d25d2d44dd740bdb34c2bce0c53" +checksum = "f8b766b9e9254bf3fa98d76e42cf8a5b30628c182dfd5272d270076ee12f0fc0" dependencies = [ "serde", "transpose", @@ -1068,9 +1108,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "powerfmt" @@ -1087,29 +1127,39 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-crate" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40" +checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set", "bit-vec", @@ -1132,9 +1182,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.43" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -1145,6 +1195,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.8.5" @@ -1272,9 +1328,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -1284,9 +1340,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -1295,21 +1351,21 @@ dependencies = [ [[package]] name = "regex-lite" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" +checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "rustix" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", @@ -1366,6 +1422,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" + [[package]] name = "serde" version = "1.0.228" @@ -1539,9 +1601,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.114" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -1550,12 +1612,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.24.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix", "windows-sys 0.61.2", @@ -1563,12 +1625,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" +checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874" dependencies = [ "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1613,18 +1675,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.5+spec-1.1.0" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.23.10+spec-1.0.0" +version = "0.25.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c" dependencies = [ "indexmap 2.13.0", "toml_datetime", @@ -1634,9 +1696,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.1.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" dependencies = [ "winnow", ] @@ -1686,9 +1748,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -1726,9 +1788,15 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.22" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "utf8parse" @@ -1765,18 +1833,27 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.114" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" +checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a" dependencies = [ "cfg-if", "once_cell", @@ -1787,9 +1864,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.114" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" +checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1797,9 +1874,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.114" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" +checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf" dependencies = [ "bumpalo", "proc-macro2", @@ -1810,13 +1887,47 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.114" +version = "0.2.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" +checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93" dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.13.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap 2.13.0", + "semver", +] + [[package]] name = "whir" version = "0.1.0" @@ -1913,16 +2024,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -1940,31 +2042,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -1973,36 +2058,18 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" @@ -2010,88 +2077,140 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" +name = "windows_i686_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] -name = "windows_i686_msvc" +name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] -name = "windows_i686_msvc" -version = "0.53.1" +name = "windows_x86_64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] -name = "windows_x86_64_gnu" +name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" +name = "winnow" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +dependencies = [ + "memchr", +] [[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" +name = "wit-bindgen" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] [[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" +name = "wit-bindgen-core" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" +name = "wit-bindgen-rust" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.13.0", + "prettyplease", + "syn", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] [[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" +name = "wit-bindgen-rust-macro" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", +] [[package]] -name = "winnow" -version = "0.7.14" +name = "wit-component" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ - "memchr", + "anyhow", + "bitflags", + "indexmap 2.13.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", ] [[package]] -name = "wit-bindgen" -version = "0.46.0" +name = "wit-parser" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.13.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] name = "zerocopy" -version = "0.8.33" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.33" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" dependencies = [ "proc-macro2", "quote", @@ -2120,6 +2239,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.14" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/Cargo.toml b/Cargo.toml index 1eef0bd4..10624cbb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -103,6 +103,6 @@ lto = "thin" # LTO breaks line attribution. opt-level = 3 [patch.crates-io] -ark-ff = { git = "https://github.com/arkworks-rs/algebra" } +ark-ff = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/smallfp-support-const-vars" } ark-std = { git = "https://github.com/arkworks-rs/std" } -ark-serialize = { git = "https://github.com/arkworks-rs/algebra" } +ark-serialize = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/smallfp-support-const-vars" } diff --git a/src/algebra/fields.rs b/src/algebra/fields.rs index a78145e0..8a32fceb 100644 --- a/src/algebra/fields.rs +++ b/src/algebra/fields.rs @@ -1,9 +1,4 @@ -#![allow(clippy::assign_op_pattern)] // Generated by SmallFpConfig derive macro - -use ark_ff::{ - Field, Fp128, Fp192, Fp2, Fp256, Fp2Config, Fp3, Fp3Config, MontBackend, MontConfig, - PrimeField, SmallFp, SmallFpConfig, -}; +use ark_ff::{define_field, Field, Fp2, Fp2Config, Fp3, Fp3Config, PrimeField}; use serde::{Deserialize, Serialize}; use zerocopy::IntoBytes; @@ -64,60 +59,42 @@ impl TypeInfo for F { } } -#[derive(MontConfig)] -#[modulus = "21888242871839275222246405745257275088548364400416034343698204186575808495617"] -#[generator = "5"] -pub struct BN254Config; -pub type Field256 = Fp256>; - -#[derive(MontConfig)] -#[modulus = "3801539170989320091464968600173246866371124347557388484609"] -#[generator = "3"] -pub struct FConfig192; -pub type Field192 = Fp192>; - -#[derive(MontConfig)] -#[modulus = "340282366920938463463374557953744961537"] -#[generator = "3"] -pub struct FrConfig128; -pub type Field128 = Fp128>; - -/// Goldilocks prime: p = 2^64 - 2^32 + 1. -/// -/// Uses [`SmallFp`] with native u64 Montgomery arithmetic instead of the -/// generic [`MontBackend`], giving significant speedups for 64-bit fields. -#[derive(SmallFpConfig)] -#[modulus = "18446744069414584321"] -#[generator = "7"] -pub struct FConfig64; -pub type Field64 = SmallFp; - -/// Compute the Montgomery representation of a Goldilocks field element at -/// compile time. -/// -/// For SmallFp the Montgomery constant R = 2^k where k = ceil(log2(p)). -/// Since p ≈ 2^64, we have k = 64 and R = 2^64. -/// -/// Montgomery form of `v` is `v · R mod p`, computed in u128 to avoid overflow. -const fn goldilocks_mont(v: u64) -> u64 { - const P: u128 = 18_446_744_069_414_584_321; - // R mod p = 2^64 mod p - const R_MOD_P: u128 = (1u128 << 64) - P; // = 2^32 - 1 = 4294967295 - ((v as u128 * R_MOD_P) % P) as u64 -} +define_field!( + name = Field256, + modulus = "21888242871839275222246405745257275088548364400416034343698204186575808495617", + generator = "5" +); + +define_field!( + name = Field192, + modulus = "3801539170989320091464968600173246866371124347557388484609", + generator = "3" +); + +define_field!( + name = Field128, + modulus = "340282366920938463463374557953744961537", + generator = "3" +); + +define_field!( + name = Field64, + modulus = "18446744069414584321", + generator = "7" +); pub type Field64_2 = Fp2; pub struct F2Config64; impl Fp2Config for F2Config64 { type Fp = Field64; - const NONRESIDUE: Self::Fp = Field64::from_raw(goldilocks_mont(7)); + const NONRESIDUE: Self::Fp = Field64Config::from_u128(7); const FROBENIUS_COEFF_FP2_C1: &'static [Self::Fp] = &[ // Fq(7)**(((q^0) - 1) / 2) - Field64::from_raw(goldilocks_mont(1)), + Field64Config::from_u128(1), // Fq(7)**(((q^1) - 1) / 2) - Field64::from_raw(goldilocks_mont(18_446_744_069_414_584_320)), + Field64Config::from_u128(18_446_744_069_414_584_320), ]; } @@ -127,22 +104,22 @@ pub struct F3Config64; impl Fp3Config for F3Config64 { type Fp = Field64; - const NONRESIDUE: Self::Fp = Field64::from_raw(goldilocks_mont(2)); + const NONRESIDUE: Self::Fp = Field64Config::from_u128(2); const FROBENIUS_COEFF_FP3_C1: &'static [Self::Fp] = &[ - Field64::from_raw(goldilocks_mont(1)), + Field64Config::from_u128(1), // Fq(2)^(((q^1) - 1) / 3) - Field64::from_raw(goldilocks_mont(4_294_967_295)), + Field64Config::from_u128(4_294_967_295), // Fq(2)^(((q^2) - 1) / 3) - Field64::from_raw(goldilocks_mont(18_446_744_065_119_617_025)), + Field64Config::from_u128(18_446_744_065_119_617_025), ]; const FROBENIUS_COEFF_FP3_C2: &'static [Self::Fp] = &[ - Field64::from_raw(goldilocks_mont(1)), + Field64Config::from_u128(1), // Fq(2)^(((2q^1) - 2) / 3) - Field64::from_raw(goldilocks_mont(18_446_744_065_119_617_025)), + Field64Config::from_u128(18_446_744_065_119_617_025), // Fq(2)^(((2q^2) - 2) / 3) - Field64::from_raw(goldilocks_mont(4_294_967_295)), + Field64Config::from_u128(4_294_967_295), ]; // (q^3 - 1) = 2^32 * T where T = 1461501636310055817916238417282618014431694553085 @@ -150,9 +127,9 @@ impl Fp3Config for F3Config64 { // 11^T const QUADRATIC_NONRESIDUE_TO_T: Fp3 = Fp3::new( - Field64::from_raw(goldilocks_mont(5_944_137_876_247_729_999)), - Field64::from_raw(goldilocks_mont(0)), - Field64::from_raw(goldilocks_mont(0)), + Field64Config::from_u128(5_944_137_876_247_729_999), + Field64Config::from_u128(0), + Field64Config::from_u128(0), ); // T - 1 / 2 From 48c7c8e99098f2a0f43d8b9f47d8df6a647ed728 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Sun, 29 Mar 2026 12:38:26 +0200 Subject: [PATCH 07/10] autodetect subgroup patch --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c459051..b1eb8332 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "ark-ff" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" dependencies = [ "ark-ff-asm", "ark-ff-macros", @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "ark-ff-asm" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" dependencies = [ "quote", "syn", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "ark-ff-macros" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" dependencies = [ "num-bigint", "num-traits", @@ -125,7 +125,7 @@ dependencies = [ [[package]] name = "ark-serialize" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" dependencies = [ "ark-serialize-derive", "ark-std", @@ -137,7 +137,7 @@ dependencies = [ [[package]] name = "ark-serialize-derive" version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fsmallfp-support-const-vars#cd6f775281af9b0a354a85f2d96d312329252c1a" +source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index c582c873..926d0cdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,6 +106,6 @@ lto = "thin" # LTO breaks line attribution. opt-level = 3 [patch.crates-io] -ark-ff = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/smallfp-support-const-vars" } +ark-ff = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/macro_auto_detect_subgroup" } ark-std = { git = "https://github.com/arkworks-rs/std" } -ark-serialize = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/smallfp-support-const-vars" } +ark-serialize = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/macro_auto_detect_subgroup" } From 776ad6df5f33e3f5764a518163e1e64b2b389cc4 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Sun, 26 Apr 2026 23:35:36 +0200 Subject: [PATCH 08/10] Arkworks 0.6.0 --- .claude/settings.json | 45 ++++++ Cargo.lock | 326 +++++++++++++++++++++++++++--------------- Cargo.toml | 12 +- 3 files changed, 260 insertions(+), 123 deletions(-) create mode 100644 .claude/settings.json diff --git a/.claude/settings.json b/.claude/settings.json new file mode 100644 index 00000000..66fd2dea --- /dev/null +++ b/.claude/settings.json @@ -0,0 +1,45 @@ +{ + "permissions": { + "allow": [ + "Bash(git rm *)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline -5)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck fetch origin z-tech/rewrite)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite -5)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck diff cdd1bb7 origin/z-tech/rewrite --stat)", + "Bash(git -C /Users/zitek/Documents/GitHub/whir status)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite -10)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck ls-remote --heads origin)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck fetch origin z-tech/rewrite-v2)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite-v2 -15)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show --stat fc731a1)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck ls-tree origin/z-tech/rewrite-v2 src/)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/lib.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/transcript/transcript.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/transcript/spongefish.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/proof.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite-v2 -5)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show 884fcb2 --stat)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck diff 95f5ce9 origin/z-tech/rewrite-v2 -- src/inner_product_sumcheck.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck diff 95f5ce9 origin/z-tech/rewrite-v2 -- src/multilinear_sumcheck.rs src/verifier.rs src/lib.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/verifier.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/inner_product_sumcheck.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/runner.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/sumcheck_prover.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/provers/inner_product.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/provers/mod.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/fold.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/whir log --oneline --all -- src/lib.rs src/bin/main.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/whir log -p --follow src/lib.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/whir log --oneline --all -- src/bin/main.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/whir log -L 60,80:src/bin/main.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck fetch origin main)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/main -5)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/main..origin/z-tech/rewrite-v2)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/main:src/verifier.rs)", + "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/main:src/transcript/transcript.rs)" + ], + "additionalDirectories": [ + "/Users/zitek/.claude" + ] + } +} diff --git a/Cargo.lock b/Cargo.lock index b1eb8332..7441a83a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,14 +87,15 @@ dependencies = [ [[package]] name = "ark-ff" -version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a806ac6c8307b929df4645776290a50ee2aac754ad09d8bdf73391309e43af" dependencies = [ "ark-ff-asm", "ark-ff-macros", "ark-serialize", "ark-std", - "digest", + "digest 0.10.7", "educe", "num-bigint", "num-traits", @@ -103,8 +104,9 @@ dependencies = [ [[package]] name = "ark-ff-asm" -version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1479009684adc073dff49a1025d3a7065b317a9ead25aaaca38cdc70058ba8a2" dependencies = [ "quote", "syn", @@ -112,8 +114,9 @@ dependencies = [ [[package]] name = "ark-ff-macros" -version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0691ed21ef00ef89c1e9bda832eba493dda3ec2f8d892fb25b705f73f06bb8" dependencies = [ "num-bigint", "num-traits", @@ -124,20 +127,22 @@ dependencies = [ [[package]] name = "ark-serialize" -version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74dd304fd536fb95d0a328e72be759209cc496a9da094c5bc56e5fea4f9e86b" dependencies = [ "ark-serialize-derive", "ark-std", - "digest", + "digest 0.10.7", "num-bigint", "serde_with", ] [[package]] name = "ark-serialize-derive" -version = "0.5.0" -source = "git+https://github.com/arkworks-rs/algebra?branch=z-tech%2Fmacro_auto_detect_subgroup#39464f8deadee46e27e1b8de57bcab203297bbea" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f153690697a2b91e5e1251ff98411ee5371500a111a0fd317a70e588eb300f9" dependencies = [ "proc-macro2", "quote", @@ -146,11 +151,12 @@ dependencies = [ [[package]] name = "ark-std" -version = "0.5.0" -source = "git+https://github.com/arkworks-rs/std#1693bc56d2ca6657b623f33a3f0b009d0ffeb892" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "367c9c827ed431bff6868b7aa926e05b16eb46603cc8b6e768e4a5553fa1d155" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.6", ] [[package]] @@ -194,9 +200,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" [[package]] name = "blake3" @@ -209,8 +215,8 @@ dependencies = [ "cc", "cfg-if", "constant_time_eq", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", ] [[package]] @@ -222,6 +228,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + [[package]] name = "bumpalo" version = "3.20.2" @@ -230,9 +245,9 @@ checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "cc" -version = "1.2.58" +version = "1.2.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" +checksum = "d16d90359e986641506914ba71350897565610e87ce0ad9e6f28569db3dd5c6d" dependencies = [ "find-msvc-tools", "shlex", @@ -291,9 +306,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -314,9 +329,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.0" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", @@ -332,9 +347,9 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "codspeed" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b684e94583e85a5ca7e1a6454a89d76a5121240f2fb67eb564129d9bafdb9db0" +checksum = "c83592369519f73d5731f9c91aa562e213a33cc14bb0f27ac2f5730fd1ecbcec" dependencies = [ "anyhow", "cc", @@ -350,9 +365,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e4bf8c7793c170fd0fcf3be97b9032b2ae39c2b9e8818aba3cc10ca0f0c6c0" +checksum = "a717deb83a7472e31b38244f836c92947ac17890970f61a083495b3a6653bf1b" dependencies = [ "clap", "codspeed", @@ -363,9 +378,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat-macros" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78aae02f2a278588e16e8ca62ea1915b8ab30f8230a09926671bba19ede801a4" +checksum = "eed8dc7bd913f259c57e2b94657a4c9fd20b3bded18462b22c647877feb43b53" dependencies = [ "divan-macros", "itertools", @@ -377,9 +392,9 @@ dependencies = [ [[package]] name = "codspeed-divan-compat-walltime" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ffd32c0c59ab8b674b15be65ba7c59aebac047036cfa7fa1e11bc2c178b81f" +checksum = "96500330271308ca89e68e1885951716cf2d3895ef9508192376dd125321a8f2" dependencies = [ "cfg-if", "clap", @@ -418,6 +433,12 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "constant_time_eq" version = "0.4.2" @@ -439,6 +460,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -480,6 +510,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +dependencies = [ + "hybrid-array", +] + [[package]] name = "deranged" version = "0.5.8" @@ -507,12 +546,23 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", + "block-buffer 0.10.4", + "const-oid 0.9.6", + "crypto-common 0.1.7", "subtle", ] +[[package]] +name = "digest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4850db49bf08e663084f7fb5c87d202ef91a3907271aff24a94eb97ff039153c" +dependencies = [ + "block-buffer 0.12.0", + "const-oid 0.10.2", + "crypto-common 0.2.1", +] + [[package]] name = "divan-macros" version = "0.1.17" @@ -586,9 +636,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "find-msvc-tools" @@ -688,9 +738,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" [[package]] name = "heck" @@ -710,6 +760,15 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "hybrid-array" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d46837a0ed51fe95bd3b05de33cd64a1ee88fc797477ca48446872504507c5" +dependencies = [ + "typenum", +] + [[package]] name = "iana-time-zone" version = "0.1.65" @@ -753,12 +812,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -786,9 +845,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "js-sys" -version = "0.3.92" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4c90f45aa2e6eacbe8645f77fdea542ac97a494bcd117a67df9ff4d611f995" +checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" dependencies = [ "once_cell", "wasm-bindgen", @@ -800,7 +859,17 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", +] + +[[package]] +name = "keccak" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e24a010dd405bd7ed803e5253182815b41bf2e6a80cc3bfc066658e03a198aa" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", ] [[package]] @@ -817,9 +886,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libc" -version = "0.2.183" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "linux-raw-sys" @@ -931,7 +1000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.6", "serde", ] @@ -975,7 +1044,7 @@ dependencies = [ "p3-maybe-rayon", "p3-util", "paste", - "rand 0.10.0", + "rand 0.10.1", "serde", "tracing", ] @@ -993,7 +1062,7 @@ dependencies = [ "p3-poseidon1", "p3-poseidon2", "p3-symmetric", - "rand 0.10.0", + "rand 0.10.1", ] [[package]] @@ -1006,7 +1075,7 @@ dependencies = [ "p3-field", "p3-maybe-rayon", "p3-util", - "rand 0.10.0", + "rand 0.10.1", "serde", "tracing", ] @@ -1027,7 +1096,7 @@ dependencies = [ "p3-field", "p3-symmetric", "p3-util", - "rand 0.10.0", + "rand 0.10.1", ] [[package]] @@ -1048,7 +1117,7 @@ dependencies = [ "p3-symmetric", "p3-util", "paste", - "rand 0.10.0", + "rand 0.10.1", "serde", "spin", "tracing", @@ -1062,7 +1131,7 @@ checksum = "6a018b618e3fa0aec8be933b1d8e404edd23f46991f6bf3f5c2f3f95e9413fe9" dependencies = [ "p3-field", "p3-symmetric", - "rand 0.10.0", + "rand 0.10.1", ] [[package]] @@ -1075,7 +1144,7 @@ dependencies = [ "p3-mds", "p3-symmetric", "p3-util", - "rand 0.10.0", + "rand 0.10.1", ] [[package]] @@ -1165,7 +1234,7 @@ dependencies = [ "bit-vec", "bitflags", "num-traits", - "rand 0.9.2", + "rand 0.9.4", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", @@ -1203,9 +1272,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -1215,9 +1284,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", @@ -1225,11 +1294,11 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ - "rand_core 0.10.0", + "rand_core 0.10.1", ] [[package]] @@ -1273,9 +1342,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rand_xorshift" @@ -1288,9 +1357,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -1424,9 +1493,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "serde" @@ -1481,7 +1550,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.13.0", + "indexmap 2.14.0", "schemars 0.9.0", "schemars 1.2.1", "serde_core", @@ -1496,11 +1565,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", "sha2-asm", ] +[[package]] +name = "sha2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.2", +] + [[package]] name = "sha2-asm" version = "0.6.4" @@ -1512,12 +1592,22 @@ dependencies = [ [[package]] name = "sha3" -version = "0.10.8" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874" +dependencies = [ + "digest 0.10.7", + "keccak 0.1.6", +] + +[[package]] +name = "sha3" +version = "0.11.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +checksum = "0b233a7d59d7bfc027208506a33ffc9532b2acb24ddc61fe7e758dc2250db431" dependencies = [ - "digest", - "keccak", + "digest 0.11.2", + "keccak 0.2.0", ] [[package]] @@ -1552,16 +1642,16 @@ dependencies = [ [[package]] name = "spongefish" -version = "0.4.0" -source = "git+https://github.com/z-tech/spongefish?rev=2613967#2613967409998dc4f81ac6f0c1799456f7878b82" +version = "0.6.0" +source = "git+https://github.com/z-tech/spongefish?rev=0b565ac#0b565acbc093560391781def5674a489c93666a7" dependencies = [ "ark-ff", "ark-serialize", - "digest", + "digest 0.11.2", "p3-koala-bear", - "rand 0.8.5", - "sha2", - "sha3", + "rand 0.8.6", + "sha2 0.11.0", + "sha3 0.11.0-rc.9", "zeroize", ] @@ -1675,20 +1765,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.1.0+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.25.8+spec-1.1.0" +version = "0.25.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c" +checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "toml_datetime", "toml_parser", "winnow", @@ -1696,9 +1786,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.1.0+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ "winnow", ] @@ -1776,9 +1866,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "unarray" @@ -1833,11 +1923,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -1846,14 +1936,14 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] name = "wasm-bindgen" -version = "0.2.115" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6523d69017b7633e396a89c5efab138161ed5aafcbc8d3e5c5a42ae38f50495a" +checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" dependencies = [ "cfg-if", "once_cell", @@ -1864,9 +1954,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.115" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3a6c758eb2f701ed3d052ff5737f5bfe6614326ea7f3bbac7156192dc32e67" +checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1874,9 +1964,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.115" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921de2737904886b52bcbb237301552d05969a6f9c40d261eb0533c8b055fedf" +checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" dependencies = [ "bumpalo", "proc-macro2", @@ -1887,9 +1977,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.115" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a93e946af942b58934c604527337bad9ae33ba1d5c6900bbb41c2c07c2364a93" +checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" dependencies = [ "unicode-ident", ] @@ -1911,7 +2001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap 2.14.0", "wasm-encoder", "wasmparser", ] @@ -1924,7 +2014,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags", "hashbrown 0.15.5", - "indexmap 2.13.0", + "indexmap 2.14.0", "semver", ] @@ -1940,9 +2030,9 @@ dependencies = [ "ciborium", "clap", "codspeed-divan-compat", - "const-oid", + "const-oid 0.9.6", "derive-where", - "digest", + "digest 0.10.7", "hex", "hex-literal", "ordered-float", @@ -1950,8 +2040,8 @@ dependencies = [ "rayon", "serde", "serde_json", - "sha2", - "sha3", + "sha2 0.10.9", + "sha3 0.10.9", "spongefish", "static_assertions", "tracing", @@ -2102,9 +2192,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" dependencies = [ "memchr", ] @@ -2118,6 +2208,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" @@ -2137,7 +2233,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck", - "indexmap 2.13.0", + "indexmap 2.14.0", "prettyplease", "syn", "wasm-metadata", @@ -2168,7 +2264,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags", - "indexmap 2.13.0", + "indexmap 2.14.0", "log", "serde", "serde_derive", @@ -2187,7 +2283,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap 2.14.0", "log", "semver", "serde", diff --git a/Cargo.toml b/Cargo.toml index 926d0cdd..f1d40b67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,15 +33,15 @@ similar_names = "allow" redundant_closure_for_method_calls = "allow" [dependencies] -ark-std = { version = "0.5", features = ["std"] } -ark-ff = { version = "0.5", features = ["asm", "std"] } -ark-serialize = "0.5" +ark-std = { version = "0.6", features = ["std"] } +ark-ff = { version = "0.6", features = ["asm", "std"] } +ark-serialize = "0.6" blake3 = { version = "1.5", features = ["digest", "traits-preview"] } sha3 = { version = "0.10.7", features = ["asm", "oid"] } clap = { version = "4.4", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -spongefish = { git = "https://github.com/z-tech/spongefish", rev = "2613967", features = ["ark-ff"]} +spongefish = { git = "https://github.com/z-tech/spongefish", rev = "0b565ac", features = ["ark-ff"]} rayon = { version = "1.10", optional = true } tracing = { version = "0.1", features = ["attributes"], optional = true } hex = "0.4" @@ -105,7 +105,3 @@ lto = "thin" # LTO breaks line attribution. [profile.dev.package."*"] opt-level = 3 -[patch.crates-io] -ark-ff = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/macro_auto_detect_subgroup" } -ark-std = { git = "https://github.com/arkworks-rs/std" } -ark-serialize = { git = "https://github.com/arkworks-rs/algebra", branch = "z-tech/macro_auto_detect_subgroup" } From ba868f9c055339895403d431a80104d0a500f154 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Sun, 26 Apr 2026 23:47:19 +0200 Subject: [PATCH 09/10] Arkworks 0.6.0 --- .claude/settings.json | 45 ------------------------------------------- .gitignore | 2 ++ 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 .claude/settings.json diff --git a/.claude/settings.json b/.claude/settings.json deleted file mode 100644 index 66fd2dea..00000000 --- a/.claude/settings.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "permissions": { - "allow": [ - "Bash(git rm *)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline -5)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck fetch origin z-tech/rewrite)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite -5)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck diff cdd1bb7 origin/z-tech/rewrite --stat)", - "Bash(git -C /Users/zitek/Documents/GitHub/whir status)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite -10)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck ls-remote --heads origin)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck fetch origin z-tech/rewrite-v2)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite-v2 -15)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show --stat fc731a1)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck ls-tree origin/z-tech/rewrite-v2 src/)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/lib.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/transcript/transcript.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/transcript/spongefish.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/proof.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/z-tech/rewrite-v2 -5)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show 884fcb2 --stat)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck diff 95f5ce9 origin/z-tech/rewrite-v2 -- src/inner_product_sumcheck.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck diff 95f5ce9 origin/z-tech/rewrite-v2 -- src/multilinear_sumcheck.rs src/verifier.rs src/lib.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/verifier.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/inner_product_sumcheck.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/runner.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/sumcheck_prover.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/provers/inner_product.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/provers/mod.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/z-tech/rewrite-v2:src/fold.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/whir log --oneline --all -- src/lib.rs src/bin/main.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/whir log -p --follow src/lib.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/whir log --oneline --all -- src/bin/main.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/whir log -L 60,80:src/bin/main.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck fetch origin main)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/main -5)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck log --oneline origin/main..origin/z-tech/rewrite-v2)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/main:src/verifier.rs)", - "Bash(git -C /Users/zitek/Documents/GitHub/space-efficient-sumcheck show origin/main:src/transcript/transcript.rs)" - ], - "additionalDirectories": [ - "/Users/zitek/.claude" - ] - } -} diff --git a/.gitignore b/.gitignore index b9bcfb09..e1d20d77 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ outputs/ .flake rustc-ice-*.txt profile.json.gz +.claude/ +CLAUDE.md From 55068372dd73ae5c9e3853e918caed3402d42548 Mon Sep 17 00:00:00 2001 From: Andrew Z <1497456+z-tech@users.noreply.github.com> Date: Sat, 2 May 2026 13:16:11 +0200 Subject: [PATCH 10/10] bump spongefish --- Cargo.lock | 5 +++-- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7441a83a..c1994db5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1642,8 +1642,9 @@ dependencies = [ [[package]] name = "spongefish" -version = "0.6.0" -source = "git+https://github.com/z-tech/spongefish?rev=0b565ac#0b565acbc093560391781def5674a489c93666a7" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a2b3b9771b4059c025d11039a51294f7ccd9430d594e79aada5fca1e7cb4e3" dependencies = [ "ark-ff", "ark-serialize", diff --git a/Cargo.toml b/Cargo.toml index f1d40b67..ab776f08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ sha3 = { version = "0.10.7", features = ["asm", "oid"] } clap = { version = "4.4", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -spongefish = { git = "https://github.com/z-tech/spongefish", rev = "0b565ac", features = ["ark-ff"]} +spongefish = { version = "0.7", features = ["ark-ff"] } rayon = { version = "1.10", optional = true } tracing = { version = "0.1", features = ["attributes"], optional = true } hex = "0.4"