diff --git a/Cargo.lock b/Cargo.lock index d8f08a200..4bc80da14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,8 +48,8 @@ dependencies = [ "account-compression", "anchor-lang", "anchor-spl", - "ark-bn254", - "ark-ff", + "ark-bn254 0.5.0", + "ark-ff 0.4.2", "light-batched-merkle-tree", "light-bloom-filter", "light-bounded-vec", @@ -201,6 +201,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "anchor-attribute-access-control" version = "0.29.0" @@ -449,7 +455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" dependencies = [ "include_dir", - "itertools", + "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", @@ -462,9 +468,20 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", + "ark-ec 0.4.2", + "ark-ff 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-bn254" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +dependencies = [ + "ark-ec 0.5.0", + "ark-ff 0.5.0", + "ark-std 0.5.0", ] [[package]] @@ -473,13 +490,34 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", + "ark-ff 0.4.2", + "ark-poly 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", - "itertools", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" +dependencies = [ + "ahash 0.8.11", + "ark-ff 0.5.0", + "ark-poly 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe 0.6.0", + "fnv", + "hashbrown 0.15.2", + "itertools 0.13.0", + "num-bigint 0.4.6", + "num-integer", "num-traits", "zeroize", ] @@ -490,13 +528,13 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "digest 0.10.7", - "itertools", + "itertools 0.10.5", "num-bigint 0.4.6", "num-traits", "paste", @@ -504,6 +542,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ff" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" +dependencies = [ + "ark-ff-asm 0.5.0", + "ark-ff-macros 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "arrayvec", + "digest 0.10.7", + "educe 0.6.0", + "itertools 0.13.0", + "num-bigint 0.4.6", + "num-traits", + "paste", + "zeroize", +] + [[package]] name = "ark-ff-asm" version = "0.4.2" @@ -514,6 +572,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-asm" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" +dependencies = [ + "quote", + "syn 2.0.85", +] + [[package]] name = "ark-ff-macros" version = "0.4.2" @@ -527,27 +595,68 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "ark-poly" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", ] +[[package]] +name = "ark-poly" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" +dependencies = [ + "ahash 0.8.11", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe 0.6.0", + "fnv", + "hashbrown 0.15.2", +] + [[package]] name = "ark-serialize" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ - "ark-serialize-derive", - "ark-std", + "ark-serialize-derive 0.4.2", + "ark-std 0.4.0", + "digest 0.10.7", + "num-bigint 0.4.6", +] + +[[package]] +name = "ark-serialize" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" +dependencies = [ + "ark-serialize-derive 0.5.0", + "ark-std 0.5.0", + "arrayvec", "digest 0.10.7", "num-bigint 0.4.6", ] @@ -563,6 +672,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-serialize-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "ark-std" version = "0.4.0" @@ -574,6 +694,16 @@ dependencies = [ "rayon", ] +[[package]] +name = "ark-std" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "arrayref" version = "0.3.8" @@ -1809,12 +1939,24 @@ version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ - "enum-ordinalize", + "enum-ordinalize 3.1.15", "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "educe" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" +dependencies = [ + "enum-ordinalize 4.3.0", + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "either" version = "1.13.0" @@ -1869,6 +2011,26 @@ dependencies = [ "syn 2.0.85", ] +[[package]] +name = "enum-ordinalize" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + [[package]] name = "env_filter" version = "0.1.2" @@ -2260,10 +2422,10 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acc65a9ef90161a41b67cd4611e113d09f3819a1d488e4effafde92fca70861d" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", "solana-program", "thiserror", ] @@ -2348,6 +2510,15 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +dependencies = [ + "allocator-api2", +] + [[package]] name = "headers" version = "0.3.9" @@ -2776,6 +2947,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.11" @@ -3012,8 +3192,8 @@ dependencies = [ name = "light-concurrent-merkle-tree" version = "1.1.0" dependencies = [ - "ark-bn254", - "ark-ff", + "ark-bn254 0.5.0", + "ark-ff 0.4.2", "borsh 0.10.3", "bytemuck", "light-bounded-vec", @@ -3036,8 +3216,8 @@ dependencies = [ name = "light-hash-set" version = "1.2.0" dependencies = [ - "ark-bn254", - "ark-ff", + "ark-bn254 0.5.0", + "ark-ff 0.4.2", "light-heap", "light-utils", "num-bigint 0.4.6", @@ -3051,7 +3231,7 @@ dependencies = [ name = "light-hasher" version = "1.1.0" dependencies = [ - "ark-bn254", + "ark-bn254 0.5.0", "light-poseidon", "sha2 0.10.8", "sha3 0.10.8", @@ -3129,8 +3309,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" dependencies = [ - "ark-bn254", - "ark-ff", + "ark-bn254 0.4.0", + "ark-ff 0.4.2", "num-bigint 0.4.6", "thiserror", ] @@ -3170,9 +3350,9 @@ dependencies = [ name = "light-prover-client" version = "1.2.0" dependencies = [ - "ark-bn254", - "ark-serialize", - "ark-std", + "ark-bn254 0.5.0", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "env_logger 0.11.5", "groth16-solana", "light-batched-merkle-tree", @@ -3289,7 +3469,7 @@ dependencies = [ "anchor-lang", "anchor-spl", "anyhow", - "ark-ff", + "ark-ff 0.4.2", "async-trait", "create-address-test-program", "forester-utils", @@ -3332,8 +3512,8 @@ name = "light-utils" version = "1.1.0" dependencies = [ "anyhow", - "ark-bn254", - "ark-ff", + "ark-bn254 0.5.0", + "ark-ff 0.4.2", "borsh 0.10.3", "bytemuck", "light-bounded-vec", @@ -4249,7 +4429,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -5419,7 +5599,7 @@ dependencies = [ "fnv", "im", "index_list", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "lz4", @@ -5856,10 +6036,10 @@ name = "solana-program" version = "1.18.22" source = "git+https://github.com/lightprotocol/agave?branch=v1.18.22-enforce-cpi-tracking#79188f6896dfd827db58491c05217c1ec4b3c9b0" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", "base64 0.21.7", "bincode", "bitflags 2.6.0", @@ -5875,7 +6055,7 @@ dependencies = [ "console_log", "curve25519-dalek", "getrandom 0.2.15", - "itertools", + "itertools 0.10.5", "js-sys", "lazy_static", "libc", @@ -5914,7 +6094,7 @@ dependencies = [ "bincode", "eager", "enum-iterator", - "itertools", + "itertools 0.10.5", "libc", "log", "num-derive 0.4.2", @@ -5993,7 +6173,7 @@ dependencies = [ "async-mutex", "async-trait", "futures", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "quinn", @@ -6117,7 +6297,7 @@ dependencies = [ "fnv", "im", "index_list", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "lru", @@ -6192,7 +6372,7 @@ dependencies = [ "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools", + "itertools 0.10.5", "js-sys", "lazy_static", "libsecp256k1", @@ -6284,7 +6464,7 @@ dependencies = [ "futures-util", "histogram", "indexmap 2.5.0", - "itertools", + "itertools 0.10.5", "libc", "log", "nix", @@ -6414,7 +6594,7 @@ version = "1.18.22" source = "git+https://github.com/lightprotocol/agave?branch=v1.18.22-enforce-cpi-tracking#79188f6896dfd827db58491c05217c1ec4b3c9b0" dependencies = [ "crossbeam-channel", - "itertools", + "itertools 0.10.5", "log", "rustc_version", "serde", @@ -6472,7 +6652,7 @@ dependencies = [ "byteorder", "curve25519-dalek", "getrandom 0.1.16", - "itertools", + "itertools 0.10.5", "lazy_static", "merlin", "num-derive 0.4.2", @@ -7535,7 +7715,7 @@ checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" dependencies = [ "bincode", "bytes", - "educe", + "educe 0.4.23", "futures-core", "futures-sink", "pin-project", @@ -8487,8 +8667,8 @@ version = "1.1.0" dependencies = [ "account-compression", "anyhow", - "ark-bn254", - "ark-ff", + "ark-bn254 0.5.0", + "ark-ff 0.4.2", "clap 4.5.23", "groth16-solana", "light-concurrent-merkle-tree", diff --git a/circuit-lib/light-prover-client/Cargo.toml b/circuit-lib/light-prover-client/Cargo.toml index 0e4451f56..5f2ae3810 100644 --- a/circuit-lib/light-prover-client/Cargo.toml +++ b/circuit-lib/light-prover-client/Cargo.toml @@ -22,7 +22,7 @@ light-bounded-vec = { path = "../../merkle-tree/bounded-vec", version = "1.1.0" light-utils = { path = "../../utils", version = "1.1.0" } # ark dependencies ark-serialize = "0.4.2" -ark-bn254 = { version = "0.4" } +ark-bn254 = { version = "0.5" } ark-std = { version = "0.4", default-features = false, features = ["parallel"] } light-batched-merkle-tree = { workspace = true } diff --git a/merkle-tree/concurrent/Cargo.toml b/merkle-tree/concurrent/Cargo.toml index dfba68e5e..e09d0cfc0 100644 --- a/merkle-tree/concurrent/Cargo.toml +++ b/merkle-tree/concurrent/Cargo.toml @@ -25,7 +25,7 @@ solana-program = { workspace = true, optional = true } thiserror = "1.0" [dev-dependencies] -ark-bn254 = "0.4" +ark-bn254 = "0.5" ark-ff = "0.4" light-merkle-tree-reference = { path = "../reference", version = "1.1.0" } light-hash-set = { workspace = true, features = ["solana"] } diff --git a/merkle-tree/hash-set/Cargo.toml b/merkle-tree/hash-set/Cargo.toml index 95875de99..82ed1ffaa 100644 --- a/merkle-tree/hash-set/Cargo.toml +++ b/merkle-tree/hash-set/Cargo.toml @@ -19,6 +19,6 @@ thiserror = "1.0" light-heap = { path = "../../heap", version = "1.1.0" } [dev-dependencies] -ark-bn254 = "0.4" +ark-bn254 = "0.5" ark-ff = "0.4" rand = "0.8" diff --git a/merkle-tree/hasher/Cargo.toml b/merkle-tree/hasher/Cargo.toml index 8d132ca94..9f40d331b 100644 --- a/merkle-tree/hasher/Cargo.toml +++ b/merkle-tree/hasher/Cargo.toml @@ -15,7 +15,7 @@ solana-program = { workspace = true } thiserror = "1.0" [target.'cfg(not(target_os = "solana"))'.dependencies] -ark-bn254 = "0.4.0" +ark-bn254 = "0.5.0" sha2 = "0.10" sha3 = "0.10" diff --git a/test-programs/account-compression-test/Cargo.toml b/test-programs/account-compression-test/Cargo.toml index 4d73c3734..6e5569858 100644 --- a/test-programs/account-compression-test/Cargo.toml +++ b/test-programs/account-compression-test/Cargo.toml @@ -20,7 +20,7 @@ default = ["custom-heap"] [dependencies] [dev-dependencies] -ark-bn254 = "0.4.0" +ark-bn254 = "0.5.0" ark-ff = "0.4.0" solana-program-test = { workspace = true} light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"] } diff --git a/utils/Cargo.toml b/utils/Cargo.toml index e2ad7e3d9..4f66a8920 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -14,7 +14,7 @@ light-hasher = {workspace = true} num-bigint = { version = "0.4", features = ["rand"] } thiserror = "1.0" solana-program = { workspace = true } -ark-bn254 = "0.4.0" +ark-bn254 = "0.5.0" rand = "0.8" [dev-dependencies] diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index ba5472e68..ff3525a7f 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] account-compression = { workspace = true } anyhow = "1.0" -ark-bn254 = "0.4" +ark-bn254 = "0.5" ark-ff = "0.4" clap = { version = "4", features = ["derive"] } groth16-solana = "0.0.3"