diff --git a/Cargo.lock b/Cargo.lock index 2512ee5e..e1444c81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -174,7 +174,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -185,7 +185,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "backend" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "mt-air", "mt-fiat-shamir", @@ -663,8 +663,9 @@ dependencies = [ "mt-symetric", "mt-utils", "mt-whir", - "rayon", + "parallel", "tracing", + "zk-alloc", ] [[package]] @@ -1940,7 +1941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3664,12 +3665,13 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lean-multisig" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "clap", "lean_vm", "leansig_wrapper", + "parallel", "rand 0.10.1", "rec_aggregation", "serde_json", @@ -3682,7 +3684,7 @@ dependencies = [ [[package]] name = "lean_compiler" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "include_dir", @@ -3698,7 +3700,7 @@ dependencies = [ [[package]] name = "lean_prover" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "itertools 0.14.0", @@ -3716,7 +3718,7 @@ dependencies = [ [[package]] name = "lean_vm" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "itertools 0.14.0", @@ -3772,7 +3774,7 @@ dependencies = [ [[package]] name = "leansig_wrapper" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "ethereum_ssz", @@ -4807,7 +4809,7 @@ dependencies = [ [[package]] name = "mt-air" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "mt-field", "mt-poly", @@ -4816,13 +4818,13 @@ dependencies = [ [[package]] name = "mt-fiat-shamir" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "mt-field", "mt-koala-bear", "mt-symetric", "mt-utils", - "rayon", + "parallel", "serde", "tracing", ] @@ -4830,14 +4832,14 @@ dependencies = [ [[package]] name = "mt-field" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "itertools 0.14.0", "mt-utils", "num-bigint 0.3.3", + "parallel", "paste", "rand 0.10.1", - "rayon", "serde", "tracing", ] @@ -4845,7 +4847,7 @@ dependencies = [ [[package]] name = "mt-koala-bear" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "itertools 0.14.0", "mt-field", @@ -4853,7 +4855,6 @@ dependencies = [ "num-bigint 0.3.3", "paste", "rand 0.10.1", - "rayon", "serde", "tracing", ] @@ -4861,44 +4862,47 @@ dependencies = [ [[package]] name = "mt-poly" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "itertools 0.14.0", "mt-field", "mt-utils", + "parallel", "rand 0.10.1", - "rayon", "serde", "system-info", + "zk-alloc", ] [[package]] name = "mt-sumcheck" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "mt-air", "mt-fiat-shamir", "mt-field", "mt-poly", - "rayon", + "parallel", "tracing", + "zk-alloc", ] [[package]] name = "mt-symetric" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "mt-field", "mt-koala-bear", - "rayon", + "parallel", + "zk-alloc", ] [[package]] name = "mt-utils" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "serde", ] @@ -4906,7 +4910,7 @@ dependencies = [ [[package]] name = "mt-whir" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "itertools 0.14.0", "mt-fiat-shamir", @@ -4916,10 +4920,11 @@ dependencies = [ "mt-sumcheck", "mt-symetric", "mt-utils", + "parallel", "rand 0.10.1", - "rayon", "system-info", "tracing", + "zk-alloc", ] [[package]] @@ -5099,7 +5104,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5302,7 +5307,7 @@ dependencies = [ [[package]] name = "p3-baby-bear" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "p3-challenger 0.5.1", "p3-field 0.5.1", @@ -5346,7 +5351,7 @@ dependencies = [ [[package]] name = "p3-challenger" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "p3-field 0.5.1", "p3-maybe-rayon 0.5.1", @@ -5372,14 +5377,14 @@ dependencies = [ [[package]] name = "p3-dft" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "itertools 0.14.0", "p3-field 0.5.1", "p3-matrix 0.5.1", "p3-maybe-rayon 0.5.1", "p3-util 0.5.1", - "spin 0.11.0", + "spin 0.10.0", "tracing", ] @@ -5400,7 +5405,7 @@ dependencies = [ [[package]] name = "p3-field" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -5432,7 +5437,7 @@ dependencies = [ [[package]] name = "p3-koala-bear" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "p3-challenger 0.5.1", "p3-field 0.5.1", @@ -5462,7 +5467,7 @@ dependencies = [ [[package]] name = "p3-matrix" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "itertools 0.14.0", "p3-field 0.5.1", @@ -5482,7 +5487,7 @@ checksum = "55ac1d2f102cf8c71dba1b449575c99697781fcc028831e83d2245787bd7a650" [[package]] name = "p3-maybe-rayon" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" [[package]] name = "p3-mds" @@ -5502,7 +5507,7 @@ dependencies = [ [[package]] name = "p3-mds" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "p3-dft 0.5.1", "p3-field 0.5.1", @@ -5514,7 +5519,7 @@ dependencies = [ [[package]] name = "p3-monty-31" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "itertools 0.14.0", "num-bigint 0.4.6", @@ -5530,17 +5535,16 @@ dependencies = [ "paste", "rand 0.10.1", "serde", - "spin 0.11.0", + "spin 0.10.0", "tracing", ] [[package]] name = "p3-poseidon1" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "p3-field 0.5.1", - "p3-mds 0.5.1", "p3-symmetric 0.5.1", "rand 0.10.1", ] @@ -5562,7 +5566,7 @@ dependencies = [ [[package]] name = "p3-poseidon2" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "p3-field 0.5.1", "p3-mds 0.5.1", @@ -5585,7 +5589,7 @@ dependencies = [ [[package]] name = "p3-symmetric" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "itertools 0.14.0", "p3-field 0.5.1", @@ -5605,7 +5609,7 @@ dependencies = [ [[package]] name = "p3-util" version = "0.5.1" -source = "git+https://github.com/Plonky3/Plonky3.git#82cfad73cd734d37a0d51953094f970c531817ec" +source = "git+https://github.com/Plonky3/Plonky3.git#bde2e86e9a9ad3ed4ec5002bff31f88f23029e40" dependencies = [ "serde", "transpose", @@ -5620,6 +5624,14 @@ dependencies = [ "group", ] +[[package]] +name = "parallel" +version = "0.1.0" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" +dependencies = [ + "system-info", +] + [[package]] name = "parity-scale-codec" version = "3.7.5" @@ -6379,7 +6391,7 @@ dependencies = [ [[package]] name = "rec_aggregation" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "include_dir", @@ -6700,7 +6712,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -7212,7 +7224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -7357,9 +7369,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.11.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783f3f6f6b01e295a669edfc402133a5f2553d1f0e81284b3ba4594e80bdd4a2" +checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" dependencies = [ "lock_api", ] @@ -7428,10 +7440,11 @@ dependencies = [ [[package]] name = "sub_protocols" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "lean_vm", + "parallel", "tracing", "utils", ] @@ -7522,10 +7535,9 @@ dependencies = [ [[package]] name = "system-info" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "libc", - "rayon", ] [[package]] @@ -7550,7 +7562,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -8072,7 +8084,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utils" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "backend", "tracing", @@ -8371,7 +8383,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9038,9 +9050,10 @@ dependencies = [ [[package]] name = "zk-alloc" version = "0.1.0" -source = "git+https://github.com/leanEthereum/leanVM.git?rev=f66d4a9#f66d4a974eced803574eb0ea43d812e523c8d7ad" +source = "git+https://github.com/leanEthereum/leanVM.git?rev=2498896#2498896ca4d32a545a98a1b1cf1ca78f7f13f553" dependencies = [ "libc", + "parallel", "system-info", ] diff --git a/crates/common/crypto/Cargo.toml b/crates/common/crypto/Cargo.toml index 9d4e4735..116d311e 100644 --- a/crates/common/crypto/Cargo.toml +++ b/crates/common/crypto/Cargo.toml @@ -14,9 +14,9 @@ ethlambda-types.workspace = true # lean-multisig is the XMSS signature aggregation crate from leanVM (the repo was # previously named leanMultisig). The crate package keeps the lean-multisig name. -lean-multisig = { git = "https://github.com/leanEthereum/leanVM.git", rev = "f66d4a9" } +lean-multisig = { git = "https://github.com/leanEthereum/leanVM.git", rev = "2498896" } # leansig_wrapper provides XmssPublicKey/XmssSignature types used by lean-multisig's public API -leansig_wrapper = { git = "https://github.com/leanEthereum/leanVM.git", rev = "f66d4a9" } +leansig_wrapper = { git = "https://github.com/leanEthereum/leanVM.git", rev = "2498896" } leansig.workspace = true thiserror.workspace = true