Merge pull request #1126 from Zokrates/merge-back-0712

Merge back 0.7.12
2025-09-24 04:40:05 +00:00 · 2022-04-12 12:30:17 +02:00 · 2022-04-12 12:30:17 +02:00 · 643144dead
commit 643144dead
parent 0e5f801929 00f614525f
22 changed files with 36 additions and 32 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -143,8 +143,6 @@ jobs:
    executor: << parameters.os >>
    steps:
      - checkout
-      - setup-sccache
-      - restore-sccache-cache
      - when:
         condition: << parameters.add-target >>
         steps:
@ -152,8 +150,7 @@ jobs:
      - run:
          name: Build
          no_output_timeout: "1h"
-          command: RUSTFLAGS="--remap-path-prefix=$PWD=" << parameters.build-with >> build --target << parameters.target >> --release
-      - save-sccache-cache
+          command: RUSTFLAGS="--remap-path-prefix=$PWD=" << parameters.build-with >> build --package zokrates_cli --target << parameters.target >> --release
      - tar_artifacts:
          target: << parameters.target >>
  publish_artifacts:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 https://github.com/Zokrates/ZoKrates/compare/latest...develop

+## [0.7.12] - 2022-04-11
+
+### Release
+- https://github.com/Zokrates/ZoKrates/releases/tag/0.7.12 <!-- markdown-link-check-disable-line -->
+
+### Changes
+- Handle unconstrained variables gracefully (#1120, @schaeff)
+- Show the constraint count after successful compilation (again!) (#1119, @schaeff)
+- Add support for EVM verification of the Marlin proof system (#1103, @nirvantyagi)
+- Output structured data for Marlin artifacts (#1035, @schaeff)
+- Add sha256 with padding for arbitrary input size to stdlib (#1114, @dark64)
+- Add support for tuples (#1081, @schaeff)
+- Fix encoding issue causing invalid values on u64 inputs in js environment (#1098, @dark64)
+- Use optimized range check in assertions (#1080, @dark64)
+
 ## [0.7.11] - 2022-01-21

 ### Release
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2823,7 +2823,7 @@ dependencies = [

 [[package]]
 name = "zokrates_abi"
-version = "0.1.5"
+version = "0.1.6"
 dependencies = [
 "serde",
 "serde_derive",
@ -2834,7 +2834,7 @@ dependencies = [

 [[package]]
 name = "zokrates_cli"
-version = "0.7.11"
+version = "0.7.12"
 dependencies = [
 "assert_cli",
 "blake2 0.8.1",
@ -2872,7 +2872,7 @@ version = "0.1.0"

 [[package]]
 name = "zokrates_core"
-version = "0.6.10"
+version = "0.6.11"
 dependencies = [
 "ark-bls12-377",
 "ark-bn254",
@ -2924,7 +2924,7 @@ dependencies = [

 [[package]]
 name = "zokrates_core_test"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = [
 "zokrates_test",
 "zokrates_test_derive",
@ -2932,7 +2932,7 @@ dependencies = [

 [[package]]
 name = "zokrates_embed"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
 "ark-bls12-377",
 "ark-bw6-761",
@ -2950,7 +2950,7 @@ dependencies = [

 [[package]]
 name = "zokrates_field"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
 "ark-bls12-377",
 "ark-bls12-381",
@ -2982,7 +2982,7 @@ dependencies = [

 [[package]]
 name = "zokrates_parser"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = [
 "glob 0.2.11",
 "pest",
@ -2991,7 +2991,7 @@ dependencies = [

 [[package]]
 name = "zokrates_pest_ast"
-version = "0.2.5"
+version = "0.2.6"
 dependencies = [
 "from-pest",
 "glob 0.2.11",
@ -3017,7 +3017,7 @@ dependencies = [

 [[package]]
 name = "zokrates_stdlib"
-version = "0.2.6"
+version = "0.2.7"
 dependencies = [
 "fs_extra",
 "zokrates_test",
--- a/changelogs/unreleased/1035-schaeff
+++ b/changelogs/unreleased/1035-schaeff
@ -1 +0,0 @@
-Output structured data for Marlin artifacts
--- a/changelogs/unreleased/1080-dark64
+++ b/changelogs/unreleased/1080-dark64
@ -1 +0,0 @@
-Use optimized range check in assertions
--- a/changelogs/unreleased/1081-schaeff
+++ b/changelogs/unreleased/1081-schaeff
@ -1 +0,0 @@
-Add support for tuples
--- a/changelogs/unreleased/1098-dark64
+++ b/changelogs/unreleased/1098-dark64
@ -1 +0,0 @@
-Fix encoding issue causing invalid values on u64 inputs in js environment
--- a/changelogs/unreleased/1103-nirvantyagi
+++ b/changelogs/unreleased/1103-nirvantyagi
@ -1 +0,0 @@
-Add support for EVM verification of the Marlin proof system
--- a/changelogs/unreleased/1114-dark64
+++ b/changelogs/unreleased/1114-dark64
@ -1 +0,0 @@
-Add sha256 with padding for arbitrary input size to stdlib
--- a/changelogs/unreleased/1119-schaeff
+++ b/changelogs/unreleased/1119-schaeff
@ -1 +0,0 @@
-Show the constraint count after successful compilation (again!)
--- a/changelogs/unreleased/1120-schaeff
+++ b/changelogs/unreleased/1120-schaeff
@ -1 +0,0 @@
-Handle unconstrained variables gracefully
--- a/zokrates_abi/Cargo.toml
+++ b/zokrates_abi/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_abi"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Thibaut Schaeffer <thibaut@schaeff.fr>"]
 edition = "2018"

--- a/zokrates_cli/Cargo.toml
+++ b/zokrates_cli/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_cli"
-version = "0.7.11"
+version = "0.7.12"
 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"
 edition = "2018"
--- a/zokrates_core/Cargo.toml
+++ b/zokrates_core/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_core"
-version = "0.6.10"
+version = "0.6.11"
 edition = "2018"
 authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>"]
 repository = "https://github.com/Zokrates/ZoKrates"
--- a/zokrates_core_test/Cargo.toml
+++ b/zokrates_core_test/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_core_test"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["schaeff <thibaut@schaeff.fr>"]
 edition = "2018"

--- a/zokrates_embed/Cargo.toml
+++ b/zokrates_embed/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_embed"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["schaeff <thibaut@schaeff.fr>"]
 edition = "2018"

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

--- a/zokrates_js/Cargo.toml
+++ b/zokrates_js/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_js"
-version = "1.0.39"
+version = "1.0.40"
 authors = ["Darko Macesic"]
 edition = "2018"

--- a/zokrates_js/package.json
+++ b/zokrates_js/package.json
@ -2,7 +2,7 @@
  "name": "zokrates-js",
  "main": "index.js",
  "author": "Darko Macesic <darem966@gmail.com>",
-  "version": "1.0.39",
+  "version": "1.0.40",
  "keywords": [
    "zokrates",
    "wasm-bindgen",
--- a/zokrates_parser/Cargo.toml
+++ b/zokrates_parser/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_parser"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["JacobEberhardt <jacob.eberhardt@tu-berlin.de>"]
 edition = "2018"

--- a/zokrates_pest_ast/Cargo.toml
+++ b/zokrates_pest_ast/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_pest_ast"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["schaeff <thibaut@schaeff.fr>"]
 edition = "2018"

--- a/zokrates_stdlib/Cargo.toml
+++ b/zokrates_stdlib/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "zokrates_stdlib"
-version = "0.2.6"
+version = "0.2.7"
 authors = ["Stefan Deml <stefandeml@gmail.com>", "schaeff <thibaut@schaeff.fr>"]
 edition = "2018"
				`@ -1 +0,0 @@`
				`Fix encoding issue causing invalid values on u64 inputs in js environment`
				`@ -1 +0,0 @@`
				`Add support for EVM verification of the Marlin proof system`
				`@ -1 +0,0 @@`
				`Add sha256 with padding for arbitrary input size to stdlib`
				`@ -1 +0,0 @@`
				`Show the constraint count after successful compilation (again!)`