diff --git a/Cargo.lock b/Cargo.lock index 12cab61..e16d301 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" dependencies = [ "lazy_static", - "regex 1.9.4", + "regex", +] + +[[package]] +name = "addchain" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2e69442aa5628ea6951fa33e24efe8313f4321a91bd729fc2f75bdfc858570" +dependencies = [ + "num-bigint 0.3.3", + "num-integer", + "num-traits", ] [[package]] @@ -38,15 +49,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.0.4" @@ -56,17 +58,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alga" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" -dependencies = [ - "approx", - "num-complex 0.2.4", - "num-traits", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -88,15 +79,6 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" -[[package]] -name = "approx" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -dependencies = [ - "num-traits", -] - [[package]] name = "ark-ff" version = "0.4.2" @@ -515,17 +497,20 @@ dependencies = [ [[package]] name = "bellman_ce" version = "0.3.2" -source = "git+https://github.com/zkLinkProtocol/bellman.git?branch=beta#a1539e1c27b82dc8ed616254242c76d8df3de5b9" +source = "git+https://github.com/zkLinkProtocol/bellman.git?branch=beta#f4f3ee896d87f129a1c6c4da34f03c4b20be09fe" dependencies = [ "bit-vec", + "blake2s_const", "blake2s_simd", "byteorder", "cfg-if", "futures", "hex", + "lazy_static", "num_cpus", "pairing_ce", "rand 0.4.6", + "tiny-keccak 1.5.0", ] [[package]] @@ -607,13 +592,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.9.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest 0.10.7", ] [[package]] @@ -627,6 +610,16 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake2s_const" +version = "0.6.0" +source = "git+https://github.com/zkLinkProtocol/bellman.git?branch=beta#f4f3ee896d87f129a1c6c4da34f03c4b20be09fe" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq", +] + [[package]] name = "blake2s_simd" version = "0.5.11" @@ -1115,16 +1108,6 @@ dependencies = [ "subtle 1.0.0", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.5.0", -] - [[package]] name = "ctr" version = "0.9.2" @@ -1482,7 +1465,7 @@ dependencies = [ "ethereum-types", "hex", "once_cell", - "regex 1.9.4", + "regex", "serde", "serde_json", "sha3", @@ -1583,7 +1566,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "regex 1.9.4", + "regex", "reqwest", "serde", "serde_json", @@ -1755,7 +1738,7 @@ dependencies = [ "once_cell", "path-slash", "rayon", - "regex 1.9.4", + "regex", "semver", "serde", "serde_json", @@ -1938,8 +1921,10 @@ dependencies = [ [[package]] name = "franklin-crypto" version = "0.0.5" -source = "git+https://github.com/zkLinkProtocol/franklin-crypto.git?branch=beta#ec581c0327f2a86126c1256b8d9bdc290f033c45" +source = "git+https://github.com/zkLinkProtocol/franklin-crypto.git?branch=poseidon#3bafa7f3fb7ef26dad5175d997f19f3a98a59164" dependencies = [ + "addchain", + "arrayvec 0.7.4", "bellman_ce", "bit-vec", "blake2", @@ -1953,12 +1938,12 @@ dependencies = [ "num-bigint 0.3.3", "num-integer", "num-traits", - "poseidon_hash", "rand 0.4.6", - "regex 0.2.11", + "regex", "serde", "serde_derive", "sha2 0.8.2", + "smallvec 1.11.0", "splitmut", "tiny-keccak 1.5.0", ] @@ -2166,17 +2151,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -2186,7 +2160,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2354,7 +2328,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" dependencies = [ - "crypto-mac 0.7.0", + "crypto-mac", "digest 0.8.1", ] @@ -2904,8 +2878,8 @@ dependencies = [ "itertools 0.10.5", "lalrpop-util", "petgraph", - "regex 1.9.4", - "regex-syntax 0.7.5", + "regex", + "regex-syntax", "string_cache", "term", "tiny-keccak 2.0.2", @@ -2930,12 +2904,6 @@ version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" -[[package]] -name = "libm" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -2967,16 +2935,6 @@ dependencies = [ "value-bag", ] -[[package]] -name = "mathru" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7584d97fddf282cc3e5cc6fae54e596cfcd708a3b375633294d9db8e8b6d776" -dependencies = [ - "rand 0.7.3", - "serde", -] - [[package]] name = "maybe-uninit" version = "2.0.0" @@ -3045,7 +3003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3078,24 +3036,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint 0.4.4", - "num-complex 0.4.4", + "num-complex", "num-integer", "num-iter", "num-rational", "num-traits", ] -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.3.3" @@ -3119,16 +3066,6 @@ dependencies = [ "serde", ] -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-complex" version = "0.4.4" @@ -3180,7 +3117,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3587,25 +3523,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "poseidon_hash" -version = "0.0.1" -source = "git+https://github.com/shamatar/poseidon_hash.git#495ae87ff066d066b140c7d0dff8d929b87d31ee" -dependencies = [ - "alga", - "approx", - "blake2-rfc_bellman_edition", - "byteorder", - "mathru", - "num-bigint 0.2.6", - "num-integer", - "num-traits", - "pairing_ce", - "rand 0.4.6", - "sha2 0.8.2", - "tiny-keccak 1.5.0", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3723,19 +3640,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -3743,20 +3647,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", + "rand_chacha", "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -3782,31 +3676,13 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - [[package]] name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -3864,34 +3740,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.11", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] -[[package]] -name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" -dependencies = [ - "aho-corasick 0.6.10", - "memchr", - "regex-syntax 0.5.6", - "thread_local", - "utf8-ranges", -] - [[package]] name = "regex" version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "aho-corasick 1.0.4", + "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] @@ -3900,18 +3763,9 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ - "aho-corasick 1.0.4", + "aho-corasick", "memchr", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -dependencies = [ - "ucd-util", + "regex-syntax", ] [[package]] @@ -4003,7 +3857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -4449,7 +4303,7 @@ dependencies = [ "bytes", "ethers_primitives", "log", - "regex 1.9.4", + "regex", "serde", "serde_json", "sha3", @@ -4465,7 +4319,7 @@ dependencies = [ "anyhow", "bytes", "log", - "regex 1.9.4", + "regex", "serde", "thiserror", ] @@ -4479,7 +4333,7 @@ dependencies = [ "anyhow", "bytes", "log", - "regex 1.9.4", + "regex", "serde", "thiserror", ] @@ -4822,7 +4676,7 @@ dependencies = [ "ark-ff", "bigdecimal", "crypto-bigint 0.5.2", - "getrandom 0.2.11", + "getrandom", "hex", "serde", ] @@ -5029,15 +4883,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "thread_local" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -dependencies = [ - "lazy_static", -] - [[package]] name = "time" version = "0.3.28" @@ -5378,12 +5223,6 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" -[[package]] -name = "ucd-util" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003" - [[package]] name = "uint" version = "0.9.5" @@ -5581,19 +5420,13 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8-ranges" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" - [[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.11", + "getrandom", "serde", ] @@ -5605,7 +5438,7 @@ checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ "idna", "lazy_static", - "regex 1.9.4", + "regex", "serde", "serde_derive", "serde_json", @@ -5624,7 +5457,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "regex 1.9.4", + "regex", "syn 1.0.109", "validator_types", ] @@ -5676,12 +5509,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6117,7 +5944,7 @@ dependencies = [ "anyhow", "bigdecimal", "chrono", - "getrandom 0.2.11", + "getrandom", "jsonrpsee", "reqwest", "serde", @@ -6207,7 +6034,7 @@ dependencies = [ name = "zklink_sdk_wasm" version = "1.0.0" dependencies = [ - "getrandom 0.2.11", + "getrandom", "hex", "jsonrpsee", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index 7fe6d8a..1db19bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ cfg-if = "1.0" chrono = { version = "0.4", features = ["serde"] } ethers = "2.0.11" ethers_primitives = "0.2.2" -franklin-crypto = { version = "0.0.5", git = "https://github.com/zkLinkProtocol/franklin-crypto.git", branch = "beta" } +franklin-crypto = { version = "0.0.5", git = "https://github.com/zkLinkProtocol/franklin-crypto.git", branch = "poseidon" } futures = "0.3" getrandom = { version = "0.2.11", features = ["js"] } web-sys = "0.3"