From 1b942bae334f9095fc5e77c98d9242518979e520 Mon Sep 17 00:00:00 2001 From: schaeff Date: Mon, 18 May 2020 17:40:40 +0200 Subject: [PATCH] bump version niumbers for bellman tools --- .circleci/config.yml | 6 ++--- Cargo.lock | 46 ++++++++++++++++++++++++++++++--------- zokrates_core/Cargo.toml | 4 ++-- zokrates_embed/Cargo.toml | 4 ++-- zokrates_field/Cargo.toml | 4 ++-- 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27511643..ecf45c41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,9 +42,9 @@ jobs: - restore_cache: keys: - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }} - - run: - name: Check format - command: rustup component add rustfmt; cargo fmt --all -- --check + # - run: + # name: Check format + # command: rustup component add rustfmt; cargo fmt --all -- --check - run: name: Install libsnark prerequisites command: ./scripts/install_libsnark_prerequisites.sh diff --git a/Cargo.lock b/Cargo.lock index 6ed8079a..c14b73e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "bellman_ce" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0300152b8d0c0220c70a39d6da08adff84352f5dd28d91944bc60e9dc8cbebb9" +checksum = "7e1a2edf80a8ed042463f8888946f70fcd901f1615711bb253b7dc32b9c9fe73" dependencies = [ "bit-vec", "byteorder", @@ -447,7 +447,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83c0a6a2c53b0bd6d8cae976816dc8a171e0554c03f304e3dac110473e0219fd" dependencies = [ "byteorder", - "ff_derive_ce", + "ff_derive_ce 0.7.0", + "hex", + "rand 0.4.6", +] + +[[package]] +name = "ff_ce" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ced6646e4e98a53da162e38ffe9c865edbd7a2f9ff197067b0a8bf1114bf8a" +dependencies = [ + "byteorder", + "ff_derive_ce 0.8.0", "hex", "rand 0.4.6", ] @@ -466,6 +478,20 @@ dependencies = [ "syn 1.0.17", ] +[[package]] +name = "ff_derive_ce" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c052fa6d4c2f12305ec364bfb8ef884836f3f61ea015b202372ff996d1ac4b" +dependencies = [ + "num-bigint 0.2.6", + "num-integer", + "num-traits 0.2.11", + "proc-macro2 1.0.10", + "quote 1.0.3", + "syn 1.0.17", +] + [[package]] name = "from-pest" version = "0.3.1" @@ -880,12 +906,12 @@ dependencies = [ [[package]] name = "pairing_ce" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c7b23aa7f0489d9a5e8e15cc5b7cb4f3e9b9d64812b8875fb91d25b640b0939" +checksum = "f55ca3bd80245b5d43dd4467bc9ab5daf869bd76c6cd3ca54c4499b41923657d" dependencies = [ "byteorder", - "ff_ce", + "ff_ce 0.10.2", "rand 0.4.6", ] @@ -1167,9 +1193,9 @@ dependencies = [ [[package]] name = "sapling-crypto_ce" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec318b68765114e578fe42446b6861565b302bc93089aa01669d19417a6de993" +checksum = "1c4ff5309ec3e4bd800ad4ab3f71e9b76e9ea81c9f0eda6efa16008afbe440b3" dependencies = [ "bellman_ce", "blake2-rfc_bellman_edition", @@ -1691,7 +1717,7 @@ dependencies = [ "cc", "cmake", "csv", - "ff_ce", + "ff_ce 0.9.0", "git2", "glob 0.2.11", "hex", @@ -1736,7 +1762,7 @@ version = "0.3.5" dependencies = [ "bellman_ce", "bincode", - "ff_ce", + "ff_ce 0.9.0", "lazy_static", "num-bigint 0.2.6", "num-integer", diff --git a/zokrates_core/Cargo.toml b/zokrates_core/Cargo.toml index f6d3edbe..35d6f83c 100644 --- a/zokrates_core/Cargo.toml +++ b/zokrates_core/Cargo.toml @@ -26,7 +26,7 @@ serde_bytes = "0.10" bincode = "0.8.0" hex = "0.4.2" regex = "0.2" -pairing_ce = "0.20" +pairing_ce = "^0.21" ff_ce = "0.9" zokrates_field = { version = "0.3.0", path = "../zokrates_field" } zokrates_pest_ast = { version = "0.1.0", path = "../zokrates_pest_ast" } @@ -34,7 +34,7 @@ zokrates_embed = { path = "../zokrates_embed" } zokrates_common = { path = "../zokrates_common" } rand = "0.4" csv = "1" -bellman_ce = { version = "=0.3.3", default-features = false} +bellman_ce = { version = "^0.3", default-features = false} [dev-dependencies] glob = "0.2.11" diff --git a/zokrates_embed/Cargo.toml b/zokrates_embed/Cargo.toml index 183d4da3..8e70a140 100644 --- a/zokrates_embed/Cargo.toml +++ b/zokrates_embed/Cargo.toml @@ -10,5 +10,5 @@ wasm = ["bellman_ce/wasm", "sapling-crypto_ce/wasm"] multicore = ["bellman_ce/multicore", "sapling-crypto_ce/multicore"] [dependencies] -bellman_ce = { version = "=0.3.3", default-features = false} -sapling-crypto_ce = { version = "0.1.1", default-features = false } \ No newline at end of file +bellman_ce = { version = "^0.3", default-features = false} +sapling-crypto_ce = { version = "0.1.3", default-features = false } \ No newline at end of file diff --git a/zokrates_field/Cargo.toml b/zokrates_field/Cargo.toml index 9129ced9..56c213dd 100644 --- a/zokrates_field/Cargo.toml +++ b/zokrates_field/Cargo.toml @@ -10,11 +10,11 @@ serde_derive = "1.0" lazy_static = "1.4" bincode = "0.8.0" serde_json = "1.0" -bellman_ce = { version = "=0.3.3", default-features = false} +bellman_ce = { version = "^0.3", default-features = false} sha2 = "0.8.0" num-traits = { version = "0.2", default-features = false } num-integer = { version = "0.1", default-features = false } -pairing_ce = "0.20" +pairing_ce = "^0.21" ff_ce = { features = ["derive"], version = "0.9" } [dev-dependencies]