Skip to content

Commit

Permalink
Merge pull request #1246 from Zokrates/assembly-tweaks
Browse files Browse the repository at this point in the history
Assembly blocks
  • Loading branch information
Schaeff authored Jan 2, 2023
2 parents fe8abde + f72c210 commit a9d6e97
Show file tree
Hide file tree
Showing 178 changed files with 4,721 additions and 568 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
zokrates_js_build:
docker:
- image: zokrates/env:latest
resource_class: large
resource_class: xlarge
working_directory: ~/project/zokrates_js
steps:
- checkout:
Expand All @@ -111,7 +111,7 @@ jobs:
zokrates_js_test:
docker:
- image: zokrates/env:latest
resource_class: large
resource_class: xlarge
working_directory: ~/project/zokrates_js
steps:
- checkout:
Expand Down
46 changes: 46 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ members = [
"zokrates_cli",
"zokrates_fs_resolver",
"zokrates_stdlib",
"zokrates_codegen",
"zokrates_analysis",
"zokrates_embed",
"zokrates_abi",
"zokrates_test",
Expand Down
1 change: 1 addition & 0 deletions changelogs/unreleased/1246-dark64
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Introduce constraint generation through assembly blocks
31 changes: 31 additions & 0 deletions zokrates_analysis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[package]
name = "zokrates_analysis"
version = "0.1.0"
edition = "2021"

[features]
default = ["ark", "bellman"]
ark = ["zokrates_ast/ark", "zokrates_embed/ark", "zokrates_common/ark"]
bellman = ["zokrates_ast/bellman", "zokrates_embed/bellman", "zokrates_common/bellman"]

[dependencies]
log = "0.4"
cfg-if = "0.1"
num = { version = "0.1.36", default-features = false }
num-bigint = { version = "0.2", default-features = false }
lazy_static = "1.4"
typed-arena = "1.4.1"
reduce = "0.1.1"
# serialization and deserialization
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.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_ast = { version = "0.1", path = "../zokrates_ast", default-features = false }
csv = "1"

[dev-dependencies]
pretty_assertions = "0.6.1"
zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver"}
Loading

0 comments on commit a9d6e97

Please sign in to comment.