github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1073 from Zokrates/deploy

Browse source 
Merde back 0.7.9
This commit is contained in:
Thibaut Schaeffer 2021-12-16 15:41:17 +01:00 committed by GitHub
commit 144288e47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.circleci/config.yml
View file

@ -274,25 +274,25 @@ workflows:
- macos - macos
target: target:
- x86_64-apple-darwin - x86_64-apple-darwin
- cross_build: # - cross_build:
<<: *tag-only # <<: *tag-only
pre-steps: # pre-steps:
- install_rust # - install_rust
build-with: SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo # build-with: SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo
add-target: true # add-target: true
matrix: # matrix:
alias: cross-build-apple-silicon # alias: cross-build-apple-silicon
parameters: # parameters:
os: # os:
- macos # - macos
target: # target:
- aarch64-apple-darwin # - aarch64-apple-darwin
- publish_artifacts: - publish_artifacts:
<<: *tag-only <<: *tag-only
requires: requires:
- cross-build-linux - cross-build-linux
- cross-build-macos - cross-build-macos
- cross-build-apple-silicon # - cross-build-apple-silicon
- deploy: - deploy:
filters: filters:
branches: branches:

11
CHANGELOG.md
View file

@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
## [Unreleased] ## [Unreleased]
https://github.com/Zokrates/ZoKrates/compare/latest...develop https://github.com/Zokrates/ZoKrates/compare/latest...develop
## [0.7.9] - 2021-12-14
### Release
- https://github.com/Zokrates/ZoKrates/releases/tag/0.7.9 <!-- markdown-link-check-disable-line -->
### Changes
- Add support for trusted setup ceremony using multi-party contribution (MPC) protocol (#1044, @dark64)
- Use ark-ff under the hood for optimized field operations (#1061, @schaeff)
- Reduce compiler memory usage using iterators, change the serialization format to CBOR (#1041, @schaeff)
- Improve the performance of the bit decomposition solver (#1062, @schaeff)
## [0.7.8] - 2021-11-23 ## [0.7.8] - 2021-11-23
### Release ### Release

14
Cargo.lock generated
View file

@ -2512,7 +2512,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_cli" name = "zokrates_cli"
version = "0.7.8" version = "0.7.9"
dependencies = [ dependencies = [
"assert_cli", "assert_cli",
"blake2 0.8.1", "blake2 0.8.1",
@ -2546,7 +2546,7 @@ version = "0.1.0"
[[package]] [[package]]
name = "zokrates_core" name = "zokrates_core"
version = "0.6.8" version = "0.6.9"
dependencies = [ dependencies = [
"ark-bls12-377", "ark-bls12-377",
"ark-bn254", "ark-bn254",
@ -2602,7 +2602,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_embed" name = "zokrates_embed"
version = "0.1.5" version = "0.1.6"
dependencies = [ dependencies = [
"ark-bls12-377", "ark-bls12-377",
"ark-bw6-761", "ark-bw6-761",
@ -2620,7 +2620,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_field" name = "zokrates_field"
version = "0.4.0" version = "0.5.0"
dependencies = [ dependencies = [
"ark-bls12-377", "ark-bls12-377",
"ark-bls12-381", "ark-bls12-381",
@ -2661,7 +2661,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_pest_ast" name = "zokrates_pest_ast"
version = "0.2.4" version = "0.2.5"
dependencies = [ dependencies = [
"from-pest", "from-pest",
"glob 0.2.11", "glob 0.2.11",
@ -2673,7 +2673,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_stdlib" name = "zokrates_stdlib"
version = "0.2.5" version = "0.2.6"
dependencies = [ dependencies = [
"fs_extra", "fs_extra",
"zokrates_test", "zokrates_test",
@ -2682,7 +2682,7 @@ dependencies = [
[[package]] [[package]]
name = "zokrates_test" name = "zokrates_test"
version = "0.1.8" version = "0.1.9"
dependencies = [ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",

1
changelogs/unreleased/1041-schaeff
View file

@ -1 +0,0 @@
Reduce compiler memory usage using iterators, change the serialization format to CBOR

1
changelogs/unreleased/1044-dark64
View file

@ -1 +0,0 @@
Add support for trusted setup ceremony using multi-party contribution (MPC) protocol

1
changelogs/unreleased/1061-schaeff
View file

@ -1 +0,0 @@
Use ark-ff under the hood for optimized field operations

1
changelogs/unreleased/1062-schaeff
View file

@ -1 +0,0 @@
Improve the performance of the bit decomposition solver

2
zokrates_abi/Cargo.toml
View file

@ -5,7 +5,7 @@ authors = ["Thibaut Schaeffer <thibaut@schaeff.fr>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
zokrates_field = { version = "0.4", path = "../zokrates_field", default-features = false } zokrates_field = { version = "0.5", path = "../zokrates_field", default-features = false }
zokrates_core = { version = "0.6", path = "../zokrates_core", default-features = false } zokrates_core = { version = "0.6", path = "../zokrates_core", default-features = false }
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"

2
zokrates_book/src/toolbox/trusted_setup.md
View file

@ -14,7 +14,7 @@ We will start this tutorial by using ZoKrates to compile a basic program.
First, we create a new file named `program.zok` with the following content: First, we create a new file named `program.zok` with the following content:
```zokrates ```zokrates
{{#include ../../../zokrates_cli/examples/book/mpc_tutorial/program.zok}} {{#include ../../../zokrates_cli/examples/book/mpc_tutorial/circuit.zok}}
``` ```
We compile the program using the `compile` command. We compile the program using the `compile` command.

4
zokrates_cli/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_cli" name = "zokrates_cli"
version = "0.7.8" version = "0.7.9"
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/Zokrates/ZoKrates.git" repository = "https://github.com/Zokrates/ZoKrates.git"
edition = "2018" edition = "2018"
@ -18,7 +18,7 @@ cfg-if = "0.1"
clap = "2.26.2" clap = "2.26.2"
serde_cbor = "0.11.2" serde_cbor = "0.11.2"
regex = "0.2" regex = "0.2"
zokrates_field = { version = "0.4", path = "../zokrates_field", default-features = false } zokrates_field = { version = "0.5", path = "../zokrates_field", default-features = false }
zokrates_abi = { version = "0.1", path = "../zokrates_abi" } zokrates_abi = { version = "0.1", path = "../zokrates_abi" }
zokrates_core = { version = "0.6", path = "../zokrates_core", default-features = false } zokrates_core = { version = "0.6", path = "../zokrates_core", default-features = false }
typed-arena = "1.4.1" typed-arena = "1.4.1"

4
zokrates_core/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_core" name = "zokrates_core"
version = "0.6.8" version = "0.6.9"
edition = "2018" edition = "2018"
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/Zokrates/ZoKrates" repository = "https://github.com/Zokrates/ZoKrates"
@ -29,7 +29,7 @@ serde_json = "1.0"
serde_cbor = "0.11.2" serde_cbor = "0.11.2"
hex = "0.4.2" hex = "0.4.2"
regex = "0.2" regex = "0.2"
zokrates_field = { version = "0.4.0", path = "../zokrates_field", default-features = false } zokrates_field = { version = "0.5.0", path = "../zokrates_field", default-features = false }
zokrates_pest_ast = { version = "0.2.0", path = "../zokrates_pest_ast" } zokrates_pest_ast = { version = "0.2.0", path = "../zokrates_pest_ast" }
zokrates_common = { path = "../zokrates_common" } zokrates_common = { path = "../zokrates_common" }
zokrates_embed = { version = "0.1.0", path = "../zokrates_embed" } zokrates_embed = { version = "0.1.0", path = "../zokrates_embed" }

4
zokrates_embed/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_embed" name = "zokrates_embed"
version = "0.1.5" version = "0.1.6"
authors = ["schaeff <thibaut@schaeff.fr>"] authors = ["schaeff <thibaut@schaeff.fr>"]
edition = "2018" edition = "2018"
@ -10,7 +10,7 @@ wasm = ["bellman_ce/wasm", "sapling-crypto_ce/wasm"]
multicore = ["bellman_ce/multicore", "sapling-crypto_ce/multicore"] multicore = ["bellman_ce/multicore", "sapling-crypto_ce/multicore"]
[dependencies] [dependencies]
zokrates_field = { version = "0.4.0", path = "../zokrates_field", default-features = false } zokrates_field = { version = "0.5.0", path = "../zokrates_field", default-features = false }
bellman_ce = { version = "^0.3", default-features = false } bellman_ce = { version = "^0.3", default-features = false }
sapling-crypto_ce = { version = "^0.1", default-features = false } sapling-crypto_ce = { version = "^0.1", default-features = false }
ark-bls12-377 = { version = "^0.2.0", features = ["curve", "r1cs"], default-features = false } ark-bls12-377 = { version = "^0.2.0", features = ["curve", "r1cs"], default-features = false }

2
zokrates_field/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_field" name = "zokrates_field"
version = "0.4.0" version = "0.5.0"
authors = ["Thibaut Schaeffer <thibaut@schaeff.fr>", "Guillaume Ballet <gballet@gmail.com>"] authors = ["Thibaut Schaeffer <thibaut@schaeff.fr>", "Guillaume Ballet <gballet@gmail.com>"]
edition = "2018" edition = "2018"

2
zokrates_js/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_js" name = "zokrates_js"
version = "1.0.37" version = "1.0.38"
authors = ["Darko Macesic"] authors = ["Darko Macesic"]
edition = "2018" edition = "2018"

2
zokrates_js/package.json
View file

@ -2,7 +2,7 @@
"name": "zokrates-js", "name": "zokrates-js",
"main": "index.js", "main": "index.js",
"author": "Darko Macesic <darem966@gmail.com>", "author": "Darko Macesic <darem966@gmail.com>",
"version": "1.0.37", "version": "1.0.38",
"keywords": [ "keywords": [
"zokrates", "zokrates",
"wasm-bindgen", "wasm-bindgen",

2
zokrates_pest_ast/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_pest_ast" name = "zokrates_pest_ast"
version = "0.2.4" version = "0.2.5"
authors = ["schaeff <thibaut@schaeff.fr>"] authors = ["schaeff <thibaut@schaeff.fr>"]
edition = "2018" edition = "2018"

2
zokrates_stdlib/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "zokrates_stdlib" name = "zokrates_stdlib"
version = "0.2.5" version = "0.2.6"
authors = ["Stefan Deml <stefandeml@gmail.com>", "schaeff <thibaut@schaeff.fr>"] authors = ["Stefan Deml <stefandeml@gmail.com>", "schaeff <thibaut@schaeff.fr>"]
edition = "2018" edition = "2018"

4
zokrates_test/Cargo.toml
View file

@ -1,11 +1,11 @@
[package] [package]
name = "zokrates_test" name = "zokrates_test"
version = "0.1.8" version = "0.1.9"
authors = ["schaeff <thibaut@schaeff.fr>"] authors = ["schaeff <thibaut@schaeff.fr>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
zokrates_field = { version = "0.4", path = "../zokrates_field" } zokrates_field = { version = "0.5.0", path = "../zokrates_field" }
zokrates_core = { version = "0.6", path = "../zokrates_core" } zokrates_core = { version = "0.6", path = "../zokrates_core" }
zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver" } zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver" }
zokrates_abi = { version = "0.1", path = "../zokrates_abi" } zokrates_abi = { version = "0.1", path = "../zokrates_abi" }