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 branch 'develop' of github.com:Zokrates/ZoKrates into shadowing

Browse source
This commit is contained in:
schaeff 2022-07-12 16:35:15 +02:00
commit 8f7b124123
30 changed files with 52 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -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:

18
CHANGELOG.md
View file

@ -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-07
### Release
- https://github.com/Zokrates/ZoKrates/releases/tag/0.8.0 <!-- markdown-link-check-disable-line -->
### 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

20
Cargo.lock generated
View file

@ -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",

1
changelogs/unreleased/1121-dark64
View file

@ -1 +0,0 @@
Introduce curly bracket based syntax, use a semicolon to separate statements, change the syntax of `if-else` expression

1
changelogs/unreleased/1143-schaeff
View file

@ -1 +0,0 @@
Optionally export snarkjs artifacts

1
changelogs/unreleased/1151-schaeff
View file

@ -1 +0,0 @@
Split codebase into smaller crates

1
changelogs/unreleased/1153-schaeff
View file

@ -1 +0,0 @@
Drop support for libsnark

1
changelogs/unreleased/1165-dark64
View file

@ -1 +0,0 @@
Change the default backend to `ark` in the CLI

1
changelogs/unreleased/1168-schaeff
View file

@ -1 +0,0 @@
Introduce the `mut` keyword and make variables immutable by default

1
changelogs/unreleased/1169-dark64
View file

@ -1 +0,0 @@
Fix constant inlining for tuples

1
changelogs/unreleased/1170-dark64
View file

@ -1 +0,0 @@
Remove multiple returns

1
changelogs/unreleased/1171-schaeff
View file

@ -1 +0,0 @@
Add log statements to the language

1
changelogs/unreleased/1172-dark64
View file

@ -1 +0,0 @@
Use signature output for constant parameter inference

1
changelogs/unreleased/1181-schaeff
View file

@ -1 +0,0 @@
Drop support for PGHR13 proving scheme

2
zokrates_ast/Cargo.toml
View file

@ -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"] }

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

@ -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';

2
zokrates_circom/Cargo.toml
View file

@ -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"

4
zokrates_cli/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "zokrates_cli"
version = "0.7.14"
version = "0.8.0"
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"
@ -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 }

4
zokrates_core/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "zokrates_core"
version = "0.6.13"
version = "0.7.0"
edition = "2018"
authors = ["Jacob Eberhardt <jacob.eberhardt@tu-berlin.de>", "Dennis Kuhnert <mail@kyroy.com>"]
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 }

2
zokrates_core_test/Cargo.toml
View file

@ -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" }

2
zokrates_embed/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "zokrates_embed"
version = "0.1.7"
version = "0.1.8"
authors = ["schaeff <thibaut@schaeff.fr>"]
edition = "2018"

2
zokrates_field/Cargo.toml
View file

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

2
zokrates_js/Cargo.toml
View file

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

4
zokrates_js/package-lock.json generated
View file

@ -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",

2
zokrates_js/package.json
View file

@ -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",

2
zokrates_parser/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "zokrates_parser"
version = "0.2.6"
version = "0.3.0"
authors = ["JacobEberhardt <jacob.eberhardt@tu-berlin.de>"]
edition = "2018"

4
zokrates_pest_ast/Cargo.toml
View file

@ -1,11 +1,11 @@
[package]
name = "zokrates_pest_ast"
version = "0.2.6"
version = "0.3.0"
authors = ["schaeff <thibaut@schaeff.fr>"]
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"

2
zokrates_solidity_test/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "zokrates_solidity_test"
version = "0.1.0"
version = "0.1.1"
authors = ["Nirvan Tyagi <nirvan.tyagi@gmail.com>"]
edition = "2018"

4
zokrates_stdlib/Cargo.toml
View file

@ -1,11 +1,11 @@
[package]
name = "zokrates_stdlib"
version = "0.2.9"
version = "0.3.0"
authors = ["Stefan Deml <stefandeml@gmail.com>", "schaeff <thibaut@schaeff.fr>"]
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"

4
zokrates_test/Cargo.toml
View file

@ -1,12 +1,12 @@
[package]
name = "zokrates_test"
version = "0.1.10"
version = "0.2.0"
authors = ["schaeff <thibaut@schaeff.fr>"]
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" }