From 86164bd1904f46cf67fab8b1f9c022daffc8a817 Mon Sep 17 00:00:00 2001 From: dark64 Date: Mon, 23 Jan 2023 19:53:18 +0100 Subject: [PATCH] update features on dependencies --- Cargo.lock | 2 ++ zokrates_ark/Cargo.toml | 13 +++++++++++-- zokrates_bellman/Cargo.toml | 2 +- zokrates_cli/Cargo.toml | 7 ++++--- zokrates_embed/Cargo.toml | 13 +++++++++++-- zokrates_field/Cargo.toml | 1 + zokrates_js/Cargo.toml | 3 ++- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4bffcb3a..bac9691d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3234,6 +3234,7 @@ dependencies = [ "zokrates_circom", "zokrates_common", "zokrates_core", + "zokrates_embed", "zokrates_field", "zokrates_fs_resolver", "zokrates_interpreter", @@ -3380,6 +3381,7 @@ dependencies = [ "zokrates_circom", "zokrates_common", "zokrates_core", + "zokrates_embed", "zokrates_field", "zokrates_interpreter", "zokrates_proof_systems", diff --git a/zokrates_ark/Cargo.toml b/zokrates_ark/Cargo.toml index bc162969..6069009a 100644 --- a/zokrates_ark/Cargo.toml +++ b/zokrates_ark/Cargo.toml @@ -4,8 +4,17 @@ version = "0.1.1" edition = "2021" [features] -default = ["multicore"] -multicore = ["ark-groth16/parallel", "ark-gm17/parallel", "ark-marlin/parallel"] +default = [] +multicore = [ + "ark-ff/parallel", + "ark-ec/parallel", + "ark-groth16/parallel", + "ark-gm17/parallel", + "ark-marlin/parallel", + "ark-poly/parallel", + "ark-poly-commit/parallel", + "ark-crypto-primitives/parallel", +] [dependencies] zokrates_field = { version = "0.5", path = "../zokrates_field", default-features = false } diff --git a/zokrates_bellman/Cargo.toml b/zokrates_bellman/Cargo.toml index 86af751f..ca3dd8ce 100644 --- a/zokrates_bellman/Cargo.toml +++ b/zokrates_bellman/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [features] -default = ["multicore"] +default = [] wasm = ["bellman/nolog", "bellman/wasm"] multicore = ["bellman/multicore", "phase2/multicore"] diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml index 0aa94633..c0073bdd 100644 --- a/zokrates_cli/Cargo.toml +++ b/zokrates_cli/Cargo.toml @@ -17,12 +17,13 @@ cfg-if = "0.1" clap = "2.26.2" serde_cbor = "0.11.2" regex = "0.2" -zokrates_field = { version = "0.5", path = "../zokrates_field", default-features = false } +zokrates_field = { version = "0.5", path = "../zokrates_field", features = ["multicore"] } zokrates_abi = { version = "0.1", path = "../zokrates_abi" } zokrates_core = { version = "0.7", path = "../zokrates_core", default-features = false } zokrates_ast = { version = "0.1", path = "../zokrates_ast", default-features = false } zokrates_interpreter = { version = "0.1", path = "../zokrates_interpreter", default-features = false } zokrates_circom = { version = "0.1", path = "../zokrates_circom", default-features = false } +zokrates_embed = { version = "0.1", path = "../zokrates_embed", features = ["multicore"] } typed-arena = "1.4.1" zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver"} zokrates_common = { version = "0.1", path = "../zokrates_common", default-features = false } @@ -39,8 +40,8 @@ sha2 = "0.10.0" # Backends zokrates_proof_systems = { version = "0.1", path = "../zokrates_proof_systems", default-features = false } -zokrates_ark = { version = "0.1", path = "../zokrates_ark", default-features = false, optional = true } -zokrates_bellman = { version = "0.1", path = "../zokrates_bellman", default-features = false, optional = true } +zokrates_ark = { version = "0.1", path = "../zokrates_ark", features = ["multicore"], optional = true } +zokrates_bellman = { version = "0.1", path = "../zokrates_bellman", features = ["multicore"], optional = true } [dev-dependencies] glob = "0.2.11" diff --git a/zokrates_embed/Cargo.toml b/zokrates_embed/Cargo.toml index 0a97a2de..9b1da6a7 100644 --- a/zokrates_embed/Cargo.toml +++ b/zokrates_embed/Cargo.toml @@ -8,8 +8,17 @@ edition = "2018" default = ["ark", "bellman"] ark = ["ark-bls12-377", "ark-bw6-761", "ark-gm17", "ark-relations", "ark-crypto-primitives", "ark-r1cs-std", "ark-std", "ark-ec", "ark-ff", "sapling-crypto_ce"] bellman = ["bellman_ce"] -wasm = ["bellman_ce/wasm", "sapling-crypto_ce/wasm"] -multicore = ["bellman_ce/multicore", "sapling-crypto_ce/multicore", "ark-gm17/parallel", "ark-r1cs-std/parallel"] +wasm = ["bellman_ce/nolog", "bellman_ce/wasm", "sapling-crypto_ce/wasm"] +multicore = [ + "bellman_ce/multicore", + "sapling-crypto_ce/multicore", + "ark-gm17/parallel", + "ark-crypto-primitives/parallel", + "ark-r1cs-std/parallel", + "ark-std/parallel", + "ark-ec/parallel", + "ark-ff/parallel" +] [dependencies] zokrates_field = { version = "0.5.0", path = "../zokrates_field", default-features = false } diff --git a/zokrates_field/Cargo.toml b/zokrates_field/Cargo.toml index 87c98f36..65825f00 100644 --- a/zokrates_field/Cargo.toml +++ b/zokrates_field/Cargo.toml @@ -7,6 +7,7 @@ edition = "2018" [features] default = ["bellman"] bellman = ["bellman_ce"] +multicore = ["ark-ff/parallel", "ark-ec/parallel"] [dependencies] serde = "1.0" diff --git a/zokrates_js/Cargo.toml b/zokrates_js/Cargo.toml index 778e7b00..34553911 100644 --- a/zokrates_js/Cargo.toml +++ b/zokrates_js/Cargo.toml @@ -14,14 +14,15 @@ serde_json = { version = "1.0", features = ["preserve_order"] } wasm-bindgen = { version = "0.2.46", features = ["serde-serialize"] } typed-arena = "1.4.1" lazy_static = "1.4.0" +zokrates_field = { path = "../zokrates_field" } zokrates_core = { path = "../zokrates_core", default-features = false, features = ["ark", "bellman"] } zokrates_ark = { path = "../zokrates_ark", default-features = false } +zokrates_embed = { path = "../zokrates_embed", default-features = false, features = ["wasm"] } zokrates_bellman = { path = "../zokrates_bellman", default-features = false, features = ["wasm"] } zokrates_common = { path = "../zokrates_common", default-features = false, features = ["ark", "bellman"] } zokrates_proof_systems = { path = "../zokrates_proof_systems", default-features = false } zokrates_ast = { path = "../zokrates_ast", default-features = false, features = ["ark", "bellman"] } zokrates_interpreter = { path = "../zokrates_interpreter", default-features = false, features = ["ark", "bellman"] } -zokrates_field = { path = "../zokrates_field", default-features = false } zokrates_abi = { path = "../zokrates_abi", default-features = false, features = ["ark", "bellman"] } zokrates_circom = { path = "../zokrates_circom" } console_error_panic_hook = "0.1.6"