diff --git a/Cargo.lock b/Cargo.lock index 8ae2d64c..30928a94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,28 +111,9 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8010fc7e9e8643ef4e758cdccf3eef26734594aedf88a9d5ed35e51837d42ef" dependencies = [ - "alloy-consensus 2.0.4", - "alloy-contract", "alloy-core", - "alloy-eips 2.0.4", - "alloy-network 2.0.4", - "alloy-provider", - "alloy-rpc-client", "alloy-signer 2.0.4", "alloy-signer-local 2.0.4", - "alloy-transport", - "alloy-transport-http", -] - -[[package]] -name = "alloy-chains" -version = "0.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9d22005bf31b018f31ef9ecadb5d2c39cf4f6acc8db0456f72c815f3d7f757" -dependencies = [ - "alloy-primitives 1.5.7", - "num_enum", - "strum 0.27.2", ] [[package]] @@ -154,7 +135,7 @@ dependencies = [ "either", "k256", "once_cell", - "rand 0.8.5", + "rand 0.8.8", "secp256k1", "serde", "serde_json", @@ -181,7 +162,7 @@ dependencies = [ "either", "k256", "once_cell", - "rand 0.8.5", + "rand 0.8.8", "secp256k1", "serde", "serde_json", @@ -217,58 +198,16 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-contract" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3df0aadc569a8b277808a7d0ad0e421180654ea36a3c59e9ed2bb968c9a1cd" -dependencies = [ - "alloy-consensus 2.0.4", - "alloy-dyn-abi", - "alloy-json-abi 1.5.7", - "alloy-network 2.0.4", - "alloy-network-primitives 2.0.4", - "alloy-primitives 1.5.7", - "alloy-provider", - "alloy-rpc-types-eth 2.0.4", - "alloy-sol-types 1.5.7", - "alloy-transport", - "futures", - "futures-util", - "serde_json", - "thiserror 2.0.18", - "tracing", -] - [[package]] name = "alloy-core" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23e8604b0c092fabc80d075ede181c9b9e596249c70b99253082d7e689836529" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi 1.5.7", "alloy-primitives 1.5.7", - "alloy-rlp", "alloy-sol-types 1.5.7", ] -[[package]] -name = "alloy-dyn-abi" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2db5c583aaef0255aa63a4fe827f826090142528bba48d1bf4119b62780cad" -dependencies = [ - "alloy-json-abi 1.5.7", - "alloy-primitives 1.5.7", - "alloy-sol-type-parser 1.5.7", - "alloy-sol-types 1.5.7", - "itoa", - "serde", - "serde_json", - "winnow 0.7.15", -] - [[package]] name = "alloy-eip2124" version = "0.2.0" @@ -517,7 +456,7 @@ dependencies = [ "keccak-asm", "paste", "proptest", - "rand 0.8.5", + "rand 0.8.8", "ruint", "rustc-hash", "serde", @@ -552,42 +491,6 @@ dependencies = [ "sha3", ] -[[package]] -name = "alloy-provider" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a7c17472b55482d4734154c2f5ed13f72e03f6752cebb927f6a2d8b52e646c" -dependencies = [ - "alloy-chains", - "alloy-consensus 2.0.4", - "alloy-eips 2.0.4", - "alloy-json-rpc 2.0.4", - "alloy-network 2.0.4", - "alloy-network-primitives 2.0.4", - "alloy-primitives 1.5.7", - "alloy-rpc-client", - "alloy-rpc-types-eth 2.0.4", - "alloy-signer 2.0.4", - "alloy-sol-types 1.5.7", - "alloy-transport", - "async-stream", - "async-trait", - "auto_impl", - "dashmap", - "either", - "futures", - "futures-utils-wasm", - "lru", - "parking_lot", - "pin-project", - "serde", - "serde_json", - "thiserror 2.0.18", - "tokio", - "tracing", - "wasmtimer", -] - [[package]] name = "alloy-rlp" version = "0.3.13" @@ -610,26 +513,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "alloy-rpc-client" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5beb5c2fe6b960c8e8b038e69fd502a90a2e930afa4770efb748b163b0767729" -dependencies = [ - "alloy-json-rpc 2.0.4", - "alloy-primitives 1.5.7", - "alloy-transport", - "futures", - "pin-project", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower", - "tracing", - "wasmtimer", -] - [[package]] name = "alloy-rpc-types-any" version = "1.7.3" @@ -762,7 +645,7 @@ dependencies = [ "alloy-signer 1.7.3", "async-trait", "k256", - "rand 0.8.5", + "rand 0.8.8", "thiserror 2.0.18", ] @@ -778,7 +661,7 @@ dependencies = [ "alloy-signer 2.0.4", "async-trait", "k256", - "rand 0.8.5", + "rand 0.8.8", "thiserror 2.0.18", ] @@ -834,7 +717,6 @@ version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "489f1620bb7e2483fb5819ed01ab6edc1d2f93939dce35a5695085a1afd1d699" dependencies = [ - "alloy-json-abi 1.5.7", "alloy-sol-macro-input 1.5.7", "const-hex", "heck 0.5.0", @@ -869,14 +751,12 @@ version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56cef806ad22d4392c5fc83cf8f2089f988eb99c7067b4e0c6f1971fc1cca318" dependencies = [ - "alloy-json-abi 1.5.7", "const-hex", "dunce", "heck 0.5.0", "macro-string", "proc-macro2", "quote", - "serde_json", "syn 2.0.117", "syn-solidity 1.5.7", ] @@ -926,40 +806,6 @@ dependencies = [ "serde", ] -[[package]] -name = "alloy-transport" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac7a80c0bac3e44559d53d002e34c461dc2f23262b42cafec019bc70551abbe" -dependencies = [ - "alloy-json-rpc 2.0.4", - "auto_impl", - "base64 0.22.1", - "derive_more", - "futures", - "futures-utils-wasm", - "parking_lot", - "serde", - "serde_json", - "thiserror 2.0.18", - "tokio", - "tower", - "tracing", - "url", - "wasmtimer", -] - -[[package]] -name = "alloy-transport-http" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed3ed3300a998f88639ed619fdbbd88bd82865e00c6a8ecb796c99eb12358f6" -dependencies = [ - "alloy-transport", - "itertools 0.14.0", - "url", -] - [[package]] name = "alloy-trie" version = "0.9.5" @@ -1197,6 +1043,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ff" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a806ac6c8307b929df4645776290a50ee2aac754ad09d8bdf73391309e43af" +dependencies = [ + "ark-ff-asm 0.6.0", + "ark-ff-macros 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "digest 0.10.7", + "educe", + "num-bigint", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ff-asm" version = "0.3.0" @@ -1227,6 +1090,16 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "ark-ff-asm" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1479009684adc073dff49a1025d3a7065b317a9ead25aaaca38cdc70058ba8a2" +dependencies = [ + "quote", + "syn 2.0.117", +] + [[package]] name = "ark-ff-macros" version = "0.3.0" @@ -1265,6 +1138,19 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "ark-ff-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0691ed21ef00ef89c1e9bda832eba493dda3ec2f8d892fb25b705f73f06bb8" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "ark-groth16" version = "0.5.0" @@ -1333,13 +1219,26 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" dependencies = [ - "ark-serialize-derive", + "ark-serialize-derive 0.5.0", "ark-std 0.5.0", "arrayvec", "digest 0.10.7", "num-bigint", ] +[[package]] +name = "ark-serialize" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74dd304fd536fb95d0a328e72be759209cc496a9da094c5bc56e5fea4f9e86b" +dependencies = [ + "ark-serialize-derive 0.6.0", + "ark-std 0.6.0", + "digest 0.10.7", + "num-bigint", + "serde_with", +] + [[package]] name = "ark-serialize-derive" version = "0.5.0" @@ -1351,6 +1250,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "ark-serialize-derive" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f153690697a2b91e5e1251ff98411ee5371500a111a0fd317a70e588eb300f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "ark-snark" version = "0.5.1" @@ -1370,7 +1280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.8", ] [[package]] @@ -1380,7 +1290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.8", ] [[package]] @@ -1390,7 +1300,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.8", +] + +[[package]] +name = "ark-std" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "367c9c827ed431bff6868b7aa926e05b16eb46603cc8b6e768e4a5553fa1d155" +dependencies = [ + "num-traits", + "rand 0.8.8", ] [[package]] @@ -1451,28 +1371,6 @@ dependencies = [ "winnow 0.7.15", ] -[[package]] -name = "async-stream" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "async-trait" version = "0.1.89" @@ -2216,20 +2114,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "dashmap" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "der" version = "0.7.10" @@ -2528,7 +2412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand 0.8.8", "rustc-hex", "static_assertions", ] @@ -2591,21 +2475,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "futures" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.32" @@ -2613,7 +2482,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -2622,40 +2490,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" -[[package]] -name = "futures-executor" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" - -[[package]] -name = "futures-macro" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "futures-sink" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" - [[package]] name = "futures-task" version = "0.3.32" @@ -2668,13 +2502,8 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ - "futures-channel", "futures-core", - "futures-io", - "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "slab", ] @@ -2815,12 +2644,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - [[package]] name = "hashbrown" version = "0.15.5" @@ -2838,8 +2661,6 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "allocator-api2", - "equivalent", "foldhash 0.2.0", "serde", "serde_core", @@ -3306,6 +3127,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.17" @@ -3423,15 +3253,6 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" -[[package]] -name = "lru" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" -dependencies = [ - "hashbrown 0.16.1", -] - [[package]] name = "lru-slab" version = "0.1.2" @@ -3636,7 +3457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7d950ca161dc355eaf28f82b11345ed76c6e1f6eb1f4f4479e0323b9e2fbd0e" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.8.8", "serde", ] @@ -3900,26 +3721,6 @@ dependencies = [ "indexmap 2.13.0", ] -[[package]] -name = "pin-project" -version = "1.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "pin-project-lite" version = "0.2.17" @@ -4255,7 +4056,7 @@ dependencies = [ "digest 0.10.7", "keccak", "p3-koala-bear", - "rand 0.8.5", + "rand 0.8.8", "sha2 0.10.9", "sha3", "zeroize", @@ -4271,7 +4072,7 @@ dependencies = [ "bytemuck", "keccak", "provekit-spongefish", - "rand 0.8.5", + "rand 0.8.8", "rayon", ] @@ -4484,7 +4285,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -4516,9 +4317,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -4766,14 +4567,15 @@ dependencies = [ [[package]] name = "ruint" -version = "1.17.2" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a" +checksum = "f5e99bff0393163bb25029a6af25d3d8d202ba5b5438a74d1bd8789f5c822970" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", "ark-ff 0.4.2", "ark-ff 0.5.0", + "ark-ff 0.6.0", "bytes", "fastrlp 0.3.1", "fastrlp 0.4.0", @@ -4783,7 +4585,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand 0.8.8", "rand 0.9.2", "rlp", "ruint-macro", @@ -4978,7 +4780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", - "rand 0.8.5", + "rand 0.8.8", "secp256k1-sys", "serde", ] @@ -5481,7 +5283,6 @@ dependencies = [ "ark-serialize 0.5.0", "num-bigint", "serde", - "taceo-ark-babyjubjub", ] [[package]] @@ -5532,7 +5333,7 @@ dependencies = [ "blake3", "eyre", "num-bigint", - "rand 0.8.5", + "rand 0.8.8", "serde", "taceo-ark-babyjubjub", "taceo-ark-serde-compat 0.5.0", @@ -5540,47 +5341,32 @@ dependencies = [ "zeroize", ] -[[package]] -name = "taceo-groth16-sol" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d590d9ef92eee2cf8930ba4732bfbbd56d98b42545b0611b7c4ec7f112adc908" -dependencies = [ - "alloy-primitives 1.5.7", - "ark-bn254", - "ark-ec", - "ark-ff 0.5.0", - "ark-groth16", - "eyre", - "ruint", -] - [[package]] name = "taceo-oprf" -version = "0.14.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72389c80580ec74d8ab188c723f6b0253885867ffac41213a31e4554b4fd0658" +checksum = "50935dca161ff8ec1a0405b023639f2e6c181e2271ef41443abca1fe4be55444" dependencies = [ "taceo-oprf-types", ] [[package]] name = "taceo-oprf-core" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55cbbe8357f837939f9cec171f44a217db4d897bea679521d555a24296ee39b" +checksum = "e5627044f0bba8551bda54b0496010a3f1267297333ca70eb39491e767ff2ad9" dependencies = [ "ark-ec", "ark-ff 0.5.0", "ark-serialize 0.5.0", "blake3", - "itertools 0.14.0", + "itertools 0.15.0", "num-bigint", - "rand 0.8.5", + "rand 0.8.8", "serde", "subtle", "taceo-ark-babyjubjub", - "taceo-ark-serde-compat 0.4.2", + "taceo-ark-serde-compat 0.5.0", "taceo-poseidon2", "uuid", "zeroize", @@ -5588,11 +5374,10 @@ dependencies = [ [[package]] name = "taceo-oprf-types" -version = "0.13.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13304cda45c09c625f278b2f8e49de5f583e447a276804d41877bfcf5e89f68e" +checksum = "08a58191080b4456f5659722dd0abb14fa1edc739d52108858bda861c35dcb95" dependencies = [ - "alloy 2.0.4", "ark-ff 0.5.0", "ark-serialize 0.5.0", "async-trait", @@ -5602,8 +5387,6 @@ dependencies = [ "serde", "taceo-ark-babyjubjub", "taceo-ark-serde-compat 0.5.0", - "taceo-circom-types", - "taceo-groth16-sol", "taceo-oprf-core", "uuid", ] @@ -5810,31 +5593,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-stream" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - [[package]] name = "toml" version = "0.7.8" @@ -6437,20 +6195,6 @@ dependencies = [ "semver 1.0.27", ] -[[package]] -name = "wasmtimer" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" -dependencies = [ - "futures", - "js-sys", - "parking_lot", - "pin-utils", - "slab", - "wasm-bindgen", -] - [[package]] name = "web-sys" version = "0.3.91" @@ -6554,16 +6298,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 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]] @@ -6581,31 +6316,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]] @@ -6614,96 +6332,48 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" version = "0.5.40" @@ -6812,9 +6482,9 @@ dependencies = [ [[package]] name = "world-id-primitives" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19522e167d925e0c920671b41bb96edc82e7508f2d2730177c38c6cce2aa2c6" +checksum = "d76ac44fcbb959d6460462b29ee8798ef28baa13cea47ac8e2e9ea4edb22be3b" dependencies = [ "alloy 2.0.4", "alloy-primitives 1.5.7", @@ -6826,7 +6496,7 @@ dependencies = [ "getrandom 0.3.4", "hex", "provekit-common", - "rand 0.8.5", + "rand 0.8.8", "ruint", "secrecy", "serde", diff --git a/Cargo.toml b/Cargo.toml index 65881995..64f12eb9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ authors = ["World Contributors"] [workspace.dependencies] # World ID protocol types -world-id-primitives = { version = "0.11.0", default-features = false } +world-id-primitives = { version = "0.14.0", default-features = false } # Serialization serde = { version = "1.0", features = ["derive"] } diff --git a/rust/core/src/bridge.rs b/rust/core/src/bridge.rs index d5773e30..1ee9918c 100644 --- a/rust/core/src/bridge.rs +++ b/rust/core/src/bridge.rs @@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize}; use world_id_primitives::{ ConstraintExpr as ProtocolConstraintExpr, ConstraintNode as ProtocolConstraintNode, FieldElement, OprfKeyId, ProofRequest, ProofResponse, ProofType, RequestItem, RequestVersion, - ResponseItem as ProtocolResponseItem, SessionId, + ResponseItem as ProtocolResponseItem, SessionId, SessionRef, }; #[cfg(feature = "native-crypto")] @@ -616,16 +616,31 @@ fn build_request_payload( let (proof_type, action_fe, session_id_fe, action_str) = match ¶ms.kind { RequestKind::Uniqueness { action } => { let fe = FieldElement::from_arbitrary_raw_bytes(action.as_bytes()); - (ProofType::Uniqueness, Some(fe), None, Some(action.clone())) + ( + ProofType::Uniqueness, + Some(fe), + SessionRef::None, + Some(action.clone()), + ) } - RequestKind::CreateSession => (ProofType::CreateSession, None, None, Some(String::new())), + RequestKind::CreateSession => ( + ProofType::Session, + None, + SessionRef::Create, + Some(String::new()), + ), RequestKind::ProveSession { session_id } => { let parsed = serde_json::from_value::(serde_json::Value::String(session_id.clone())) .map_err(|_| { Error::InvalidConfiguration("Invalid session_id format".to_string()) })?; - (ProofType::Session, None, Some(parsed), Some(String::new())) + ( + ProofType::Session, + None, + SessionRef::Existing(parsed), + Some(String::new()), + ) } }; @@ -1470,7 +1485,6 @@ impl ConstraintNodeWrapper { fn proof_type_wire_name(proof_type: ProofType) -> &'static str { match proof_type { ProofType::Uniqueness => "uniqueness", - ProofType::CreateSession => "create_session", ProofType::Session => "session", } } @@ -2437,7 +2451,7 @@ mod tests { rp_id: rp_context.rp_id, oprf_key_id: OprfKeyId::new(ruint::aliases::U160::from(rp_context.rp_id.into_inner())), action: Some(action), - session_id: None, + session_id: SessionRef::None, signature, nonce, requests: request_items, @@ -2620,10 +2634,8 @@ mod tests { let payload = payload_json(¶ms, false); let proof_request = payload.get("proof_request").unwrap(); assert_eq!(payload["action"], serde_json::json!("")); - assert_eq!( - proof_request["proof_type"], - serde_json::json!("create_session") - ); + assert_eq!(proof_request["proof_type"], serde_json::json!("session")); + assert_eq!(proof_request["session_id"], serde_json::json!("create")); let session_id = serde_json::to_value(SessionId::default()) .unwrap() diff --git a/rust/core/src/constraints.rs b/rust/core/src/constraints.rs index 65f1d056..3b7f9527 100644 --- a/rust/core/src/constraints.rs +++ b/rust/core/src/constraints.rs @@ -620,10 +620,10 @@ mod tests { let (items, expr) = node.to_protocol().unwrap(); assert_eq!(items.len(), 2); - let json = serde_json::to_string(&expr).unwrap(); - assert!(json.contains("any")); - assert!(json.contains("proof_of_human")); - assert!(json.contains("selfie")); + assert_eq!( + serde_json::to_value(expr).unwrap(), + serde_json::json!({"any": ["proof_of_human", "selfie"]}) + ); } #[test] @@ -661,7 +661,10 @@ mod tests { let (items, expr) = node.to_protocol_top_level().unwrap(); assert_eq!(items.len(), 2); - assert!(expr.is_some()); + assert_eq!( + serde_json::to_value(expr.unwrap()).unwrap(), + serde_json::json!({"any": ["proof_of_human", "selfie"]}) + ); } #[test]