diff --git a/Cargo.lock b/Cargo.lock index 0f8ccf9..cce6407 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,12 +3,12 @@ [[package]] name = "accumulator" version = "0.2.1" -source = "git+ssh://git@github.com/kobigurk/cpsnarks-set-accumulator.git#22cf0212ab45308f82a9d4c83b68552b2ac04179" +source = "git+ssh://git@github.com/kobigurk/cpsnarks-set-accumulator.git#11b6eedbec77eff9b58c3fdb181c5c81b110fe50" dependencies = [ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "gmp-mpfr-sys 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gmp-mpfr-sys 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rug 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -46,11 +46,6 @@ dependencies = [ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "atty" version = "0.2.14" @@ -71,11 +66,6 @@ name = "az" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bench-utils" version = "0.1.0" @@ -106,16 +96,6 @@ dependencies = [ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "block-buffer" version = "0.7.3" @@ -165,6 +145,11 @@ dependencies = [ "thiserror 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "bumpalo" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "byte-tools" version = "0.3.1" @@ -219,14 +204,6 @@ dependencies = [ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -241,7 +218,7 @@ dependencies = [ "algebra-core 0.1.0 (git+https://github.com/scipr-lab/zexe)", "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "bulletproofs 2.0.0 (git+https://github.com/dalek-cryptography/bulletproofs?branch=develop)", - "criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "crypto-primitives 0.1.0 (git+https://github.com/scipr-lab/zexe)", "curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -256,23 +233,21 @@ dependencies = [ [[package]] name = "criterion" -version = "0.2.11" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "criterion-plot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", @@ -282,10 +257,9 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.3.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -422,26 +396,6 @@ dependencies = [ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "dirs-sys" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "either" version = "1.5.3" @@ -457,11 +411,6 @@ dependencies = [ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "generic-array" version = "0.12.3" @@ -482,11 +431,11 @@ dependencies = [ [[package]] name = "gmp-mpfr-sys" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -510,6 +459,14 @@ name = "itoa" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "js-sys" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "keccak" version = "0.1.0" @@ -539,6 +496,14 @@ name = "libc" version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "maybe-uninit" version = "2.0.0" @@ -590,6 +555,11 @@ dependencies = [ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "oorandom" +version = "11.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "opaque-debug" version = "0.2.3" @@ -603,6 +573,17 @@ dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "plotters" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "web-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ppv-lite86" version = "0.2.6" @@ -714,28 +695,6 @@ dependencies = [ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rand_xoshiro" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rayon" version = "1.3.0" @@ -759,26 +718,11 @@ dependencies = [ ] [[package]] -name = "rdrand" -version = "0.4.0" +name = "regex" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -789,27 +733,21 @@ dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "regex-syntax" +version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "rug" version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "az 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gmp-mpfr-sys 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gmp-mpfr-sys 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rustc_version" version = "0.2.3" @@ -1014,6 +952,64 @@ name = "wasi" version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "wasm-bindgen" +version = "0.2.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bumpalo 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.60" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "web-sys" +version = "0.3.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "winapi" version = "0.3.8" @@ -1066,20 +1062,18 @@ dependencies = [ "checksum algebra-core 0.1.0 (git+https://github.com/scipr-lab/zexe)" = "" "checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" "checksum az 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50c75f843b208181e91db52dfa533306f2936d4fdf9b5e2550718feb36bb9a04" -"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" "checksum bench-utils 0.1.0 (git+https://github.com/scipr-lab/zexe)" = "" "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" "checksum bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48" "checksum bulletproofs 2.0.0 (git+https://github.com/dalek-cryptography/bulletproofs?branch=develop)" = "" +"checksum bumpalo 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" @@ -1088,10 +1082,9 @@ dependencies = [ "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "97276801e127ffb46b66ce23f35cc96bd454fa311294bced4bbace7baa8b1d17" -"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -"checksum criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394" -"checksum criterion-plot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e" +"checksum criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1" +"checksum criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545" "checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" "checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" "checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" @@ -1104,21 +1097,20 @@ dependencies = [ "checksum curve25519-dalek 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26778518a7f6cffa1d25a44b602b62b979bd88adb9e99ffec546998cf3404839" "checksum derivative 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eae4d76b7cefedd1b4f8cc24378b2fbd1ac1b66e3bbebe8e2192d3be81cb355" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum ff-fft 0.1.0 (git+https://github.com/scipr-lab/zexe)" = "" -"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -"checksum gmp-mpfr-sys 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4acb2347f5d15b35d18d8eceb3f3c4f58f428b4e2965a5e35aeabb613654702c" +"checksum gmp-mpfr-sys 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "63d7f805cf9df081683d463f62864bda8b8e3ce7162a8e11cd0c49f27b8ce89b" "checksum hermit-abi 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" "checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +"checksum js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "6a27d435371a2fa5b6d2b028a74bbdb1234f308da363226a2854ca3ff8ba7055" "checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum legogro16 0.1.0 (git+ssh://git@github.com/kobigurk/legogro16.git)" = "" "checksum libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)" = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" @@ -1126,8 +1118,10 @@ dependencies = [ "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" "checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" "checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" +"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405" "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" "checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220" +"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb" "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" @@ -1142,16 +1136,12 @@ dependencies = [ "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -"checksum rand_xoshiro 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929" "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" -"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +"checksum regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" "checksum regex-automata 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" +"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" "checksum rug 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efa0683f120bc91c3e2bace9c46c81f84478cc89b85ae1b74a09ef00f4ccd322" -"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" @@ -1179,6 +1169,12 @@ dependencies = [ "checksum unroll 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "85890b49d9724df33edc575c4bacd5b0081977da22c4c4984d0c62ec44ed6e09" "checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +"checksum wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "2cc57ce05287f8376e998cbddfb4c8cb43b84a7ec55cf4551d7c00eef317a47f" +"checksum wasm-bindgen-backend 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d967d37bf6c16cca2973ca3af071d0a2523392e4a594548155d89a678f4237cd" +"checksum wasm-bindgen-macro 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "8bd151b63e1ea881bb742cd20e1d6127cef28399558f3b5d415289bc41eee3a4" +"checksum wasm-bindgen-macro-support 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d68a5b36eef1be7868f668632863292e37739656a80fc4b9acec7b0bd35a4931" +"checksum wasm-bindgen-shared 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "daf76fe7d25ac79748a37538b7daeed1c7a6867c92d3245c12c6222e4a20d639" +"checksum web-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)" = "2d6f51648d8c56c366144378a33290049eafdd784071077f6fe37dae64c1c4cb" "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" diff --git a/Cargo.toml b/Cargo.toml index 3078230..2534b25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,10 +24,11 @@ blake2 = ">= 0.8.1" [features] dalek = ["curve25519-dalek", "bulletproofs"] zexe = [] +class = [] default = ["zexe"] [dev-dependencies] -criterion = "0.2" +criterion = "0.3" [lib] bench = false @@ -65,7 +66,7 @@ required-features = ["zexe"] [[bench]] name = "membership_class" harness = false -required-features = ["zexe"] +required-features = ["zexe", "class"] [[bench]] name = "membership_bp" diff --git a/benches/membership_bp.rs b/benches/membership_bp.rs index 1f6669a..dd6598e 100644 --- a/benches/membership_bp.rs +++ b/benches/membership_bp.rs @@ -95,7 +95,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("membership_bp protocol", move |b| { + c.bench_function("membership_bp protocol proving", |b| { b.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"membership")); crs.crs_hash_to_prime.hash_to_prime_parameters.transcript = @@ -120,6 +120,16 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + c.bench_function("membership_bp protocol verification", |b| { + b.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"membership")); + crs.crs_hash_to_prime.hash_to_prime_parameters.transcript = + Some(verification_transcript.clone()); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/membership_bp_60.rs b/benches/membership_bp_60.rs index 842ed1a..55c4071 100644 --- a/benches/membership_bp_60.rs +++ b/benches/membership_bp_60.rs @@ -97,7 +97,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("membership_bp_60 protocol", move |b| { + c.bench_function("membership_bp_60 protocol proving", |b| { b.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"membership")); crs.crs_hash_to_prime.hash_to_prime_parameters.transcript = @@ -122,6 +122,16 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + c.bench_function("membership_bp_60 protocol verification", |b| { + b.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"membership")); + crs.crs_hash_to_prime.hash_to_prime_parameters.transcript = + Some(verification_transcript.clone()); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/membership_class.rs b/benches/membership_class.rs index 31d2011..6b82da2 100644 --- a/benches/membership_class.rs +++ b/benches/membership_class.rs @@ -96,7 +96,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("membership_class protocol", move |b| { + c.bench_function("membership_class protocol proving", |b| { b.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"membership")); let mut verifier_channel = TranscriptVerifierChannel::new(&crs, &proof_transcript); @@ -119,6 +119,15 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + + c.bench_function("membership_class protocol verification", |b| { + b.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"membership")); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/membership_hash.rs b/benches/membership_hash.rs index ebf5adc..3b50cda 100644 --- a/benches/membership_hash.rs +++ b/benches/membership_hash.rs @@ -107,7 +107,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("membership_hash protocol", move |b| { + c.bench_function("membership_hash protocol proving", |b| { b.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"membership")); let mut verifier_channel = TranscriptVerifierChannel::new(&crs, &proof_transcript); @@ -130,6 +130,15 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + + c.bench_function("membership_hash protocol verification", |b| { + b.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"membership")); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/membership_prime.rs b/benches/membership_prime.rs index b76f8b6..0bf441f 100644 --- a/benches/membership_prime.rs +++ b/benches/membership_prime.rs @@ -96,7 +96,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("membership_prime protocol", move |b| { + c.bench_function("membership_prime protocol proving", |b| { b.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"membership")); let mut verifier_channel = TranscriptVerifierChannel::new(&crs, &proof_transcript); @@ -119,6 +119,20 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + + c.bench_function("membership_prime protocol verification", |b| { + b.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"membership")); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + + let statement = Statement { + c_e_q: commitment, + c_p: acc.clone(), + }; + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/membership_prime_60.rs b/benches/membership_prime_60.rs index dfa2f08..31777bd 100644 --- a/benches/membership_prime_60.rs +++ b/benches/membership_prime_60.rs @@ -98,7 +98,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("membership_prime_60 protocol", move |b| { + c.bench_function("membership_prime_60 protocol proving", |b| { b.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"membership")); let mut verifier_channel = TranscriptVerifierChannel::new(&crs, &proof_transcript); @@ -121,6 +121,15 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + + c.bench_function("membership_prime_60 protocol verification", |b| { + b.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"membership")); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/nonmembership_bp.rs b/benches/nonmembership_bp.rs index d2c2a31..819af1a 100644 --- a/benches/nonmembership_bp.rs +++ b/benches/nonmembership_bp.rs @@ -102,7 +102,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("nonmembership_bp protocol", move |be| { + c.bench_function("nonmembership_bp protocol proving", |be| { be.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"nonmembership")); crs.crs_hash_to_prime.hash_to_prime_parameters.transcript = @@ -128,6 +128,16 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + c.bench_function("nonmembership_bp protocol verification", |be| { + be.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"nonmembership")); + crs.crs_hash_to_prime.hash_to_prime_parameters.transcript = + Some(verification_transcript.clone()); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/nonmembership_hash.rs b/benches/nonmembership_hash.rs index 868ff7b..25735c1 100644 --- a/benches/nonmembership_hash.rs +++ b/benches/nonmembership_hash.rs @@ -114,7 +114,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("nonmembership_hash protocol", move |be| { + c.bench_function("nonmembership_hash protocol proving", |be| { be.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"nonmembership")); let mut verifier_channel = TranscriptVerifierChannel::new(&crs, &proof_transcript); @@ -138,6 +138,14 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + c.bench_function("nonmembership_hash protocol verification", |be| { + be.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"nonmembership")); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/benches/nonmembership_prime.rs b/benches/nonmembership_prime.rs index a2a4630..f21c8d8 100644 --- a/benches/nonmembership_prime.rs +++ b/benches/nonmembership_prime.rs @@ -103,7 +103,7 @@ pub fn criterion_benchmark(c: &mut Criterion) { let mut prover_channel = TranscriptProverChannel::new(&crs, &verification_transcript, &proof); protocol.verify(&mut prover_channel, &statement).unwrap(); - c.bench_function("nonmembership_prime protocol", move |be| { + c.bench_function("nonmembership_prime protocol proving", |be| { be.iter(|| { let proof_transcript = RefCell::new(Transcript::new(b"nonmembership")); let mut verifier_channel = TranscriptVerifierChannel::new(&crs, &proof_transcript); @@ -127,6 +127,14 @@ pub fn criterion_benchmark(c: &mut Criterion) { .unwrap(); }) }); + c.bench_function("nonmembership_prime protocol verification", |be| { + be.iter(|| { + let verification_transcript = RefCell::new(Transcript::new(b"nonmembership")); + let mut prover_channel = + TranscriptProverChannel::new(&crs, &verification_transcript, &proof); + protocol.verify(&mut prover_channel, &statement).unwrap(); + }) + }); } criterion_group!(benches, criterion_benchmark);