From e1bf046eb3a6893cba0f130230b4a3bab7c0262d Mon Sep 17 00:00:00 2001 From: schaeff Date: Wed, 6 Jul 2022 16:31:24 +0200 Subject: [PATCH 1/3] bump versions, generate changelog, generate js lock --- CHANGELOG.md | 18 ++++++++++++++++++ Cargo.lock | 20 ++++++++++---------- changelogs/unreleased/1121-dark64 | 1 - changelogs/unreleased/1143-schaeff | 1 - changelogs/unreleased/1151-schaeff | 1 - changelogs/unreleased/1153-schaeff | 1 - changelogs/unreleased/1165-dark64 | 1 - changelogs/unreleased/1168-schaeff | 1 - changelogs/unreleased/1169-dark64 | 1 - changelogs/unreleased/1170-dark64 | 1 - changelogs/unreleased/1171-schaeff | 1 - changelogs/unreleased/1172-dark64 | 1 - changelogs/unreleased/1181-schaeff | 1 - zokrates_ast/Cargo.toml | 2 +- zokrates_circom/Cargo.toml | 2 +- zokrates_cli/Cargo.toml | 4 ++-- zokrates_core/Cargo.toml | 4 ++-- zokrates_core_test/Cargo.toml | 2 +- zokrates_embed/Cargo.toml | 2 +- zokrates_field/Cargo.toml | 2 +- zokrates_js/Cargo.toml | 2 +- zokrates_js/package-lock.json | 4 ++-- zokrates_js/package.json | 2 +- zokrates_parser/Cargo.toml | 2 +- zokrates_pest_ast/Cargo.toml | 4 ++-- zokrates_solidity_test/Cargo.toml | 2 +- zokrates_stdlib/Cargo.toml | 4 ++-- zokrates_test/Cargo.toml | 4 ++-- 28 files changed, 49 insertions(+), 42 deletions(-) delete mode 100644 changelogs/unreleased/1121-dark64 delete mode 100644 changelogs/unreleased/1143-schaeff delete mode 100644 changelogs/unreleased/1151-schaeff delete mode 100644 changelogs/unreleased/1153-schaeff delete mode 100644 changelogs/unreleased/1165-dark64 delete mode 100644 changelogs/unreleased/1168-schaeff delete mode 100644 changelogs/unreleased/1169-dark64 delete mode 100644 changelogs/unreleased/1170-dark64 delete mode 100644 changelogs/unreleased/1171-schaeff delete mode 100644 changelogs/unreleased/1172-dark64 delete mode 100644 changelogs/unreleased/1181-schaeff diff --git a/CHANGELOG.md b/CHANGELOG.md index 900e3e9a..0cff0280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file. ## [Unreleased] https://github.com/Zokrates/ZoKrates/compare/latest...develop +## [0.8.0] - 2022-07-06 + +### Release +- https://github.com/Zokrates/ZoKrates/releases/tag/0.8.0 + +### Changes +- Drop support for PGHR13 proving scheme (#1181, @schaeff) +- Use signature output for constant parameter inference (#1172, @dark64) +- Add log statements to the language (#1171, @schaeff) +- Remove multiple returns (#1170, @dark64) +- Introduce the `mut` keyword and make variables immutable by default (#1168, @schaeff) +- Drop support for libsnark (#1153, @schaeff) +- Split codebase into smaller crates (#1151, @schaeff) +- Introduce curly bracket based syntax, use a semicolon to separate statements, change the syntax of `if-else` expression (#1121, @dark64) +- Optionally export snarkjs artifacts (#1143, @schaeff) +- Fix constant inlining for tuples (#1169, @dark64) +- Change the default backend to `ark` in the CLI (#1165, @dark64) + ## [0.7.14] - 2022-05-31 ### Release diff --git a/Cargo.lock b/Cargo.lock index 78d3b3ee..2dbc33bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3066,7 +3066,7 @@ dependencies = [ [[package]] name = "zokrates_cli" -version = "0.7.14" +version = "0.8.0" dependencies = [ "assert_cli", "blake2 0.8.1", @@ -3111,7 +3111,7 @@ version = "0.1.1" [[package]] name = "zokrates_core" -version = "0.6.13" +version = "0.7.0" dependencies = [ "cfg-if 0.1.10", "csv", @@ -3143,7 +3143,7 @@ dependencies = [ [[package]] name = "zokrates_embed" -version = "0.1.7" +version = "0.1.8" dependencies = [ "ark-bls12-377", "ark-bw6-761", @@ -3161,7 +3161,7 @@ dependencies = [ [[package]] name = "zokrates_field" -version = "0.5.1" +version = "0.5.2" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -3208,7 +3208,7 @@ dependencies = [ [[package]] name = "zokrates_js" -version = "1.0.44" +version = "1.1.0" dependencies = [ "console_error_panic_hook", "indexmap", @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "zokrates_parser" -version = "0.2.6" +version = "0.3.0" dependencies = [ "glob 0.2.11", "pest", @@ -3239,7 +3239,7 @@ dependencies = [ [[package]] name = "zokrates_pest_ast" -version = "0.2.6" +version = "0.3.0" dependencies = [ "from-pest", "glob 0.2.11", @@ -3267,7 +3267,7 @@ dependencies = [ [[package]] name = "zokrates_solidity_test" -version = "0.1.0" +version = "0.1.1" dependencies = [ "bytes", "ethabi", @@ -3281,7 +3281,7 @@ dependencies = [ [[package]] name = "zokrates_stdlib" -version = "0.2.9" +version = "0.3.0" dependencies = [ "fs_extra", "zokrates_test", @@ -3290,7 +3290,7 @@ dependencies = [ [[package]] name = "zokrates_test" -version = "0.1.10" +version = "0.2.0" dependencies = [ "serde", "serde_derive", diff --git a/changelogs/unreleased/1121-dark64 b/changelogs/unreleased/1121-dark64 deleted file mode 100644 index c81224dc..00000000 --- a/changelogs/unreleased/1121-dark64 +++ /dev/null @@ -1 +0,0 @@ -Introduce curly bracket based syntax, use a semicolon to separate statements, change the syntax of `if-else` expression \ No newline at end of file diff --git a/changelogs/unreleased/1143-schaeff b/changelogs/unreleased/1143-schaeff deleted file mode 100644 index fd323cc7..00000000 --- a/changelogs/unreleased/1143-schaeff +++ /dev/null @@ -1 +0,0 @@ -Optionally export snarkjs artifacts \ No newline at end of file diff --git a/changelogs/unreleased/1151-schaeff b/changelogs/unreleased/1151-schaeff deleted file mode 100644 index ceac4401..00000000 --- a/changelogs/unreleased/1151-schaeff +++ /dev/null @@ -1 +0,0 @@ -Split codebase into smaller crates \ No newline at end of file diff --git a/changelogs/unreleased/1153-schaeff b/changelogs/unreleased/1153-schaeff deleted file mode 100644 index 4a96037f..00000000 --- a/changelogs/unreleased/1153-schaeff +++ /dev/null @@ -1 +0,0 @@ -Drop support for libsnark \ No newline at end of file diff --git a/changelogs/unreleased/1165-dark64 b/changelogs/unreleased/1165-dark64 deleted file mode 100644 index 8ec88688..00000000 --- a/changelogs/unreleased/1165-dark64 +++ /dev/null @@ -1 +0,0 @@ -Change the default backend to `ark` in the CLI \ No newline at end of file diff --git a/changelogs/unreleased/1168-schaeff b/changelogs/unreleased/1168-schaeff deleted file mode 100644 index e659f36b..00000000 --- a/changelogs/unreleased/1168-schaeff +++ /dev/null @@ -1 +0,0 @@ -Introduce the `mut` keyword and make variables immutable by default \ No newline at end of file diff --git a/changelogs/unreleased/1169-dark64 b/changelogs/unreleased/1169-dark64 deleted file mode 100644 index 07203fbe..00000000 --- a/changelogs/unreleased/1169-dark64 +++ /dev/null @@ -1 +0,0 @@ -Fix constant inlining for tuples \ No newline at end of file diff --git a/changelogs/unreleased/1170-dark64 b/changelogs/unreleased/1170-dark64 deleted file mode 100644 index 9f39b22d..00000000 --- a/changelogs/unreleased/1170-dark64 +++ /dev/null @@ -1 +0,0 @@ -Remove multiple returns \ No newline at end of file diff --git a/changelogs/unreleased/1171-schaeff b/changelogs/unreleased/1171-schaeff deleted file mode 100644 index 6bf15bc3..00000000 --- a/changelogs/unreleased/1171-schaeff +++ /dev/null @@ -1 +0,0 @@ -Add log statements to the language \ No newline at end of file diff --git a/changelogs/unreleased/1172-dark64 b/changelogs/unreleased/1172-dark64 deleted file mode 100644 index e633a7f3..00000000 --- a/changelogs/unreleased/1172-dark64 +++ /dev/null @@ -1 +0,0 @@ -Use signature output for constant parameter inference \ No newline at end of file diff --git a/changelogs/unreleased/1181-schaeff b/changelogs/unreleased/1181-schaeff deleted file mode 100644 index 225c69f3..00000000 --- a/changelogs/unreleased/1181-schaeff +++ /dev/null @@ -1 +0,0 @@ -Drop support for PGHR13 proving scheme \ No newline at end of file diff --git a/zokrates_ast/Cargo.toml b/zokrates_ast/Cargo.toml index bb22c519..2a2429e7 100644 --- a/zokrates_ast/Cargo.toml +++ b/zokrates_ast/Cargo.toml @@ -9,7 +9,7 @@ bellman = ["zokrates_field/bellman", "pairing_ce", "zokrates_embed/bellman"] ark = ["ark-bls12-377", "zokrates_embed/ark"] [dependencies] -zokrates_pest_ast = { version = "0.2.0", path = "../zokrates_pest_ast" } +zokrates_pest_ast = { version = "0.3.0", path = "../zokrates_pest_ast" } cfg-if = "0.1" zokrates_field = { version = "0.5", path = "../zokrates_field", default-features = false } serde = { version = "1.0", features = ["derive"] } diff --git a/zokrates_circom/Cargo.toml b/zokrates_circom/Cargo.toml index 6e1ea256..845aac44 100644 --- a/zokrates_circom/Cargo.toml +++ b/zokrates_circom/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -zokrates_core = { version = "0.6", path = "../zokrates_core", default-features = false } +zokrates_core = { version = "0.7", path = "../zokrates_core", default-features = false } zokrates_ast = { version = "0.1", path = "../zokrates_ast", default-features = false } zokrates_field = { version = "0.5.0", path = "../zokrates_field", default-features = false } byteorder = "1.4.3" diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml index 2f8c8ef5..cf311561 100644 --- a/zokrates_cli/Cargo.toml +++ b/zokrates_cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_cli" -version = "0.7.14" +version = "0.8.0" authors = ["Jacob Eberhardt ", "Dennis Kuhnert ", "Thibaut Schaeffer "] repository = "https://github.com/Zokrates/ZoKrates.git" edition = "2018" @@ -19,7 +19,7 @@ serde_cbor = "0.11.2" regex = "0.2" zokrates_field = { version = "0.5", path = "../zokrates_field", default-features = false } zokrates_abi = { version = "0.1", path = "../zokrates_abi" } -zokrates_core = { version = "0.6", path = "../zokrates_core", default-features = false } +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 } diff --git a/zokrates_core/Cargo.toml b/zokrates_core/Cargo.toml index 8ffac522..8f43e282 100644 --- a/zokrates_core/Cargo.toml +++ b/zokrates_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_core" -version = "0.6.13" +version = "0.7.0" edition = "2018" authors = ["Jacob Eberhardt ", "Dennis Kuhnert "] repository = "https://github.com/Zokrates/ZoKrates" @@ -23,7 +23,7 @@ reduce = "0.1.1" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["preserve_order"] } 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.3.0", path = "../zokrates_pest_ast" } zokrates_common = { version = "0.1", path = "../zokrates_common", default-features = false } zokrates_embed = { version = "0.1.0", path = "../zokrates_embed", default-features = false } zokrates_interpreter = { version = "0.1", path = "../zokrates_interpreter", default-features = false } diff --git a/zokrates_core_test/Cargo.toml b/zokrates_core_test/Cargo.toml index 7861d7d6..54f57c61 100644 --- a/zokrates_core_test/Cargo.toml +++ b/zokrates_core_test/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dev-dependencies] -zokrates_test = { version = "0.1", path = "../zokrates_test" } +zokrates_test = { version = "0.2", path = "../zokrates_test" } [build-dependencies] zokrates_test_derive = { version = "0.0", path = "../zokrates_test_derive" } diff --git a/zokrates_embed/Cargo.toml b/zokrates_embed/Cargo.toml index 3e91069c..9249b907 100644 --- a/zokrates_embed/Cargo.toml +++ b/zokrates_embed/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_embed" -version = "0.1.7" +version = "0.1.8" authors = ["schaeff "] edition = "2018" diff --git a/zokrates_field/Cargo.toml b/zokrates_field/Cargo.toml index dfafcfd8..87c98f36 100644 --- a/zokrates_field/Cargo.toml +++ b/zokrates_field/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_field" -version = "0.5.1" +version = "0.5.2" authors = ["Thibaut Schaeffer ", "Guillaume Ballet "] edition = "2018" diff --git a/zokrates_js/Cargo.toml b/zokrates_js/Cargo.toml index d7a81fcc..47c13d05 100644 --- a/zokrates_js/Cargo.toml +++ b/zokrates_js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_js" -version = "1.0.44" +version = "1.1.0" authors = ["Darko Macesic"] edition = "2018" diff --git a/zokrates_js/package-lock.json b/zokrates_js/package-lock.json index 519c17f2..ba0053fe 100644 --- a/zokrates_js/package-lock.json +++ b/zokrates_js/package-lock.json @@ -1,12 +1,12 @@ { "name": "zokrates-js", - "version": "1.0.44", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zokrates-js", - "version": "1.0.44", + "version": "1.1.0", "license": "GPLv3", "devDependencies": { "dree": "^2.6.1", diff --git a/zokrates_js/package.json b/zokrates_js/package.json index 160e1e69..5a1f05a8 100644 --- a/zokrates_js/package.json +++ b/zokrates_js/package.json @@ -1,6 +1,6 @@ { "name": "zokrates-js", - "version": "1.0.44", + "version": "1.1.0", "module": "index.js", "main": "node/index.js", "description": "JavaScript bindings for ZoKrates", diff --git a/zokrates_parser/Cargo.toml b/zokrates_parser/Cargo.toml index 50070e6c..bd486d56 100644 --- a/zokrates_parser/Cargo.toml +++ b/zokrates_parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_parser" -version = "0.2.6" +version = "0.3.0" authors = ["JacobEberhardt "] edition = "2018" diff --git a/zokrates_pest_ast/Cargo.toml b/zokrates_pest_ast/Cargo.toml index 417ef7b3..2f609a34 100644 --- a/zokrates_pest_ast/Cargo.toml +++ b/zokrates_pest_ast/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "zokrates_pest_ast" -version = "0.2.6" +version = "0.3.0" authors = ["schaeff "] edition = "2018" [dependencies] -zokrates_parser = { version = "0.2.0", path = "../zokrates_parser" } +zokrates_parser = { version = "0.3.0", path = "../zokrates_parser" } pest = "2.0" pest-ast = "0.3.3" from-pest = "0.3.1" diff --git a/zokrates_solidity_test/Cargo.toml b/zokrates_solidity_test/Cargo.toml index eb2555f6..02fb69ef 100644 --- a/zokrates_solidity_test/Cargo.toml +++ b/zokrates_solidity_test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zokrates_solidity_test" -version = "0.1.0" +version = "0.1.1" authors = ["Nirvan Tyagi "] edition = "2018" diff --git a/zokrates_stdlib/Cargo.toml b/zokrates_stdlib/Cargo.toml index 709c0ca3..b01ca55b 100644 --- a/zokrates_stdlib/Cargo.toml +++ b/zokrates_stdlib/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "zokrates_stdlib" -version = "0.2.9" +version = "0.3.0" authors = ["Stefan Deml ", "schaeff "] edition = "2018" [dev-dependencies] -zokrates_test = { version = "0.1", path = "../zokrates_test" } +zokrates_test = { version = "0.2", path = "../zokrates_test" } [build-dependencies] fs_extra = "1.1.0" diff --git a/zokrates_test/Cargo.toml b/zokrates_test/Cargo.toml index 30fb5e7a..d1fef01b 100644 --- a/zokrates_test/Cargo.toml +++ b/zokrates_test/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "zokrates_test" -version = "0.1.10" +version = "0.2.0" authors = ["schaeff "] edition = "2018" [dependencies] zokrates_field = { version = "0.5.0", path = "../zokrates_field" } -zokrates_core = { version = "0.6", path = "../zokrates_core" } +zokrates_core = { version = "0.7", path = "../zokrates_core" } zokrates_ast = { version = "0.1", path = "../zokrates_ast" } zokrates_interpreter = { version = "0.1", path = "../zokrates_interpreter" } zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver" } From 81a0f191dff82813ed94bddbdb87fd042e605fbc Mon Sep 17 00:00:00 2001 From: dark64 Date: Thu, 7 Jul 2022 14:41:58 +0200 Subject: [PATCH 2/3] update changelog and zokrates_js docs --- CHANGELOG.md | 2 +- zokrates_book/src/toolbox/zokrates_js.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cff0280..b6cf69cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. ## [Unreleased] https://github.com/Zokrates/ZoKrates/compare/latest...develop -## [0.8.0] - 2022-07-06 +## [0.8.0] - 2022-07-07 ### Release - https://github.com/Zokrates/ZoKrates/releases/tag/0.8.0 diff --git a/zokrates_book/src/toolbox/zokrates_js.md b/zokrates_book/src/toolbox/zokrates_js.md index b0ff8757..f8e34cc9 100644 --- a/zokrates_book/src/toolbox/zokrates_js.md +++ b/zokrates_book/src/toolbox/zokrates_js.md @@ -10,7 +10,7 @@ npm install zokrates-js ##### Bundlers **Note:** As this library uses a model where the wasm module itself is natively an ES module, you will need a bundler of some form. -Currently the only known bundler known to be fully compatible with `zokrates-js` is [Webpack](https://webpack.js.org/) (`experiments.asyncWebAssembly` must be enabled). +Currently the only known bundler known to be fully compatible with `zokrates-js` is [Webpack](https://webpack.js.org/) (`experiments.syncWebAssembly` must be enabled). The choice of this default was done to reflect the trends of the JS ecosystem. ```js import { initialize } from 'zokrates-js'; From 3c63e9e727681b64288ebe997b1b1a1f525ab3eb Mon Sep 17 00:00:00 2001 From: dark64 Date: Thu, 7 Jul 2022 16:55:48 +0200 Subject: [PATCH 3/3] update circleci config --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f538c071..a3a37e5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -214,8 +214,8 @@ commands: install_cross: steps: - run: - name: Install rust-embedded/cross - command: cargo install --git https://github.com/rust-embedded/cross + name: Install cross + command: cargo install cross --git https://github.com/cross-rs/cross tar_artifacts: parameters: target: