github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:JacobEberhardt/ZoKrates into develop

Browse source
This commit is contained in:
schaeff 2019-02-04 15:56:04 +01:00
commit 90024508c8
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -796,7 +796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "zokrates_cli" name = "zokrates_cli"
version = "0.3.3" version = "0.4.0"
dependencies = [ dependencies = [
"assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -804,14 +804,14 @@ dependencies = [
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_core 0.3.3", "zokrates_core 0.3.4",
"zokrates_field 0.3.1", "zokrates_field 0.3.2",
"zokrates_fs_resolver 0.3.2", "zokrates_fs_resolver 0.4.0",
] ]
[[package]] [[package]]
name = "zokrates_core" name = "zokrates_core"
version = "0.3.3" version = "0.3.4"
dependencies = [ dependencies = [
"assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bimap 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "bimap 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -832,12 +832,12 @@ dependencies = [
"serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmi 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_field 0.3.1", "zokrates_field 0.3.2",
] ]
[[package]] [[package]]
name = "zokrates_field" name = "zokrates_field"
version = "0.3.1" version = "0.3.2"
dependencies = [ dependencies = [
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -851,7 +851,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_fs_resolver" name = "zokrates_fs_resolver"
version = "0.3.2" version = "0.4.0"
dependencies = [ dependencies = [
"tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

0
shadow.code
View file

4
zokrates_cli/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_cli" name = "zokrates_cli"
version = "0.3.3" version = "0.4.0"
authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>", "Thibaut Schaeffer <thibaut@schaeff.fr>"] authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>", "Thibaut Schaeffer <thibaut@schaeff.fr>"]
repository = "https://github.com/JacobEberhardt/ZoKrates.git" repository = "https://github.com/JacobEberhardt/ZoKrates.git"
edition = "2018" edition = "2018"
@ -15,7 +15,7 @@ bincode = "0.8.0"
regex = "0.2" regex = "0.2"
zokrates_field = { version = "0.3", path = "../zokrates_field" } zokrates_field = { version = "0.3", path = "../zokrates_field" }
zokrates_core = { version = "0.3", path = "../zokrates_core" } zokrates_core = { version = "0.3", path = "../zokrates_core" }
zokrates_fs_resolver = { version = "0.3", path = "../zokrates_fs_resolver"} zokrates_fs_resolver = { version = "0.4", path = "../zokrates_fs_resolver"}
[dev-dependencies] [dev-dependencies]
glob = "0.2.11" glob = "0.2.11"

2
zokrates_cli/src/bin.rs
View file

@ -42,7 +42,7 @@ fn cli() -> Result<(), String> {
// cli specification using clap library // cli specification using clap library
let matches = App::new("ZoKrates") let matches = App::new("ZoKrates")
.setting(AppSettings::SubcommandRequiredElseHelp) .setting(AppSettings::SubcommandRequiredElseHelp)
.version("0.3.3") .version("0.4.0")
.author("Jacob Eberhardt, Thibaut Schaeffer, Dennis Kuhnert") .author("Jacob Eberhardt, Thibaut Schaeffer, Dennis Kuhnert")
.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!'") .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") .subcommand(SubCommand::with_name("compile")

2
zokrates_core/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_core" name = "zokrates_core"
version = "0.3.3" version = "0.3.4"
authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>"] authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>"]
repository = "https://github.com/JacobEberhardt/ZoKrates" repository = "https://github.com/JacobEberhardt/ZoKrates"
readme = "README.md" readme = "README.md"

2
zokrates_field/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_field" name = "zokrates_field"
version = "0.3.1" version = "0.3.2"
authors = ["Guillaume Ballet <gballet@gmail.com>"] authors = ["Guillaume Ballet <gballet@gmail.com>"]
edition = "2018" edition = "2018"

2
zokrates_fs_resolver/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_fs_resolver" name = "zokrates_fs_resolver"
version = "0.3.2" version = "0.4.0"
authors = ["Thibaut Schaeffer <thibaut@schaeff.fr>"] authors = ["Thibaut Schaeffer <thibaut@schaeff.fr>"]
repository = "https://github.com/JacobEberhardt/ZoKrates.git" repository = "https://github.com/JacobEberhardt/ZoKrates.git"