From 9233ea2496abf7d5123b52203977bb3a8dc621ec Mon Sep 17 00:00:00 2001 From: schaeff Date: Mon, 30 Nov 2020 17:41:54 +0000 Subject: [PATCH] bump versions, ignore target, add Darko to authors --- .gitignore | 2 +- Cargo.lock | 8 ++++---- zokrates_abi/Cargo.toml | 2 +- zokrates_cli/Cargo.toml | 2 +- zokrates_cli/src/bin.rs | 5 +---- zokrates_core/Cargo.toml | 2 +- zokrates_core_test/Cargo.toml | 2 +- zokrates_js/Cargo.toml | 2 +- zokrates_js/package.json | 2 +- zokrates_parser/Cargo.toml | 2 +- zokrates_pest_ast/Cargo.toml | 2 +- 11 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 364c0a1b..da4018e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Generated by Cargo # will have compiled files and executables -/target/ +target # ZoKrates default files out diff --git a/Cargo.lock b/Cargo.lock index 01a47f43..50a27d0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2038,7 +2038,7 @@ dependencies = [ [[package]] name = "zokrates_cli" -version = "0.6.2" +version = "0.6.3" dependencies = [ "assert_cli", "bincode", @@ -2061,7 +2061,7 @@ version = "0.1.0" [[package]] name = "zokrates_core" -version = "0.5.2" +version = "0.5.3" dependencies = [ "ark-bls12-377", "ark-bn254", @@ -2139,7 +2139,7 @@ dependencies = [ [[package]] name = "zokrates_parser" -version = "0.1.5" +version = "0.1.6" dependencies = [ "glob 0.2.11", "pest", @@ -2148,7 +2148,7 @@ dependencies = [ [[package]] name = "zokrates_pest_ast" -version = "0.1.4" +version = "0.1.5" dependencies = [ "from-pest", "glob 0.2.11", diff --git a/zokrates_abi/Cargo.toml b/zokrates_abi/Cargo.toml index 08d4e96d..cc831bee 100644 --- a/zokrates_abi/Cargo.toml +++ b/zokrates_abi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_abi" -version = "0.1.2" +version = "0.1.3" authors = ["Thibaut Schaeffer "] edition = "2018" diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml index a4b9e594..2351fd0b 100644 --- a/zokrates_cli/Cargo.toml +++ b/zokrates_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_cli" -version = "0.6.2" +version = "0.6.3" authors = ["Jacob Eberhardt ", "Dennis Kuhnert ", "Thibaut Schaeffer "] repository = "https://github.com/JacobEberhardt/ZoKrates.git" edition = "2018" diff --git a/zokrates_cli/src/bin.rs b/zokrates_cli/src/bin.rs index 519a0b87..7dc4fcea 100644 --- a/zokrates_cli/src/bin.rs +++ b/zokrates_cli/src/bin.rs @@ -448,7 +448,7 @@ fn cli() -> Result<(), String> { let matches = App::new("ZoKrates") .setting(AppSettings::SubcommandRequiredElseHelp) .version(env!("CARGO_PKG_VERSION")) - .author("Jacob Eberhardt, Thibaut Schaeffer, Stefan Deml") + .author("Jacob Eberhardt, Thibaut Schaeffer, Stefan Deml, Darko Masesic") .about("Supports generation of zkSNARKs from high level language code including Smart Contracts for proof verification on the Ethereum Blockchain.\n'I know that I show nothing!'") .subcommand(SubCommand::with_name("compile") .about("Compiles into flattened conditions. Produces two files: human-readable '.ztf' file for debugging and binary file") @@ -602,7 +602,6 @@ fn cli() -> Result<(), String> { .short("s") .long("proving-scheme") .help("Proving scheme to use to export the verifier") - .value_name("FILE") .takes_value(true) .required(false) .possible_values(SCHEMES) @@ -714,7 +713,6 @@ fn cli() -> Result<(), String> { .short("s") .long("proving-scheme") .help("Proving scheme to use to generate the proof") - .value_name("FILE") .takes_value(true) .required(false) .possible_values(SCHEMES) @@ -771,7 +769,6 @@ fn cli() -> Result<(), String> { .short("s") .long("proving-scheme") .help("Proving scheme to use in the setup. Available options are G16 (default), PGHR13 and GM17") - .value_name("FILE") .takes_value(true) .required(false) .default_value(&default_scheme) diff --git a/zokrates_core/Cargo.toml b/zokrates_core/Cargo.toml index cf0d1e64..e2fc1ea7 100644 --- a/zokrates_core/Cargo.toml +++ b/zokrates_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_core" -version = "0.5.2" +version = "0.5.3" authors = ["Jacob Eberhardt ", "Dennis Kuhnert "] repository = "https://github.com/JacobEberhardt/ZoKrates" readme = "README.md" diff --git a/zokrates_core_test/Cargo.toml b/zokrates_core_test/Cargo.toml index 285ddd5b..51f22d40 100644 --- a/zokrates_core_test/Cargo.toml +++ b/zokrates_core_test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_core_test" -version = "0.1.3" +version = "0.1.4" authors = ["schaeff "] edition = "2018" diff --git a/zokrates_js/Cargo.toml b/zokrates_js/Cargo.toml index 7bf67caf..6e520dcd 100644 --- a/zokrates_js/Cargo.toml +++ b/zokrates_js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_js" -version = "1.0.26" +version = "1.0.27" authors = ["Darko Macesic"] edition = "2018" diff --git a/zokrates_js/package.json b/zokrates_js/package.json index a473d4a2..20991963 100644 --- a/zokrates_js/package.json +++ b/zokrates_js/package.json @@ -2,7 +2,7 @@ "name": "zokrates-js", "main": "index.js", "author": "Darko Macesic ", - "version": "1.0.26", + "version": "1.0.27", "keywords": [ "zokrates", "wasm-bindgen", diff --git a/zokrates_parser/Cargo.toml b/zokrates_parser/Cargo.toml index dcafff07..e056c0d8 100644 --- a/zokrates_parser/Cargo.toml +++ b/zokrates_parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_parser" -version = "0.1.5" +version = "0.1.6" authors = ["JacobEberhardt "] edition = "2018" diff --git a/zokrates_pest_ast/Cargo.toml b/zokrates_pest_ast/Cargo.toml index 9918c917..d9f2dddd 100644 --- a/zokrates_pest_ast/Cargo.toml +++ b/zokrates_pest_ast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_pest_ast" -version = "0.1.4" +version = "0.1.5" authors = ["schaeff "] edition = "2018"