Skip to content

Commit

Permalink
Merge branch 'master' into tf/double-verify-test
Browse files Browse the repository at this point in the history
* master: (23 commits)
  feat: add `min` and `max` functions to the stdlib (#4839)
  feat: Allow numeric generics to non inlined ACIR functions (#4834)
  chore!: Add `as_array` and remove `_slice` variants of hash functions (#4675)
  feat!: reserve keyword `super` (#4836)
  feat: simplify `BoundedVec::eq` (#4838)
  feat: Add comptime Interpreter (#4821)
  feat: Sync from aztec-packages (#4833)
  feat: implement `Eq` trait on `BoundedVec` (#4830)
  chore: add benchmarks for serializing a dummy program (#4813)
  chore: remove unnecessary casts in `BoundedVec` (#4831)
  fix: issue 4682 and add solver for unconstrained bigintegers (#4729)
  chore(docs): fix wrong Nargo.toml workspace examples (#4822)
  chore: delete unnecessary Prover.toml file (#4829)
  chore: fix alerts on rust msrv (#4817)
  chore(ci): fix alerts on msrv issues (#4816)
  chore: run clippy (#4810)
  chore: optimize poseidon2 implementation (#4807)
  fix: catch panics from EC point creation (e.g. the point is at infinity) (#4790)
  feat: Sync from aztec-packages (#4792)
  feat: lalrpop lexer prototype (#4656)
  ...
  • Loading branch information
TomAFrench committed Apr 19, 2024
2 parents a93b085 + 6cfb328 commit 70f6809
Show file tree
Hide file tree
Showing 184 changed files with 6,273 additions and 2,413 deletions.
2 changes: 1 addition & 1 deletion .aztec-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10d9ad99200a5897417ff5669763ead4e38d87fa
beab8c93857536e07fa37994213fc664a5864013
6 changes: 5 additions & 1 deletion .github/workflows/test-rust-workspace-msrv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ jobs:
# We treat any cancelled, skipped or failing jobs as a failure for the workflow as a whole.
FAIL: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') }}

- name: Checkout
if: ${{ failure() }}
uses: actions/checkout@v4

# Raise an issue if the tests failed
- name: Alert on failed publish
uses: JasonEtco/create-an-issue@v2
Expand All @@ -122,4 +126,4 @@ jobs:
WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
with:
update_existing: true
filename: .github/JS_PUBLISH_FAILED.md
filename: .github/ACVM_NOT_PUBLISHABLE.md
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ examples/**/target/
examples/9
node_modules
pkg/
.idea

# Yarn
.pnp.*
Expand Down
165 changes: 155 additions & 10 deletions Cargo.lock

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

9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312", default
"ahash",
"std",
] }

# Benchmarking
criterion = "0.5.0"
# Note that using the "frame-pointer" feature breaks framegraphs on linux
# https://github.com/tikv/pprof-rs/pull/172
pprof = { version = "0.13", features = ["flamegraph","criterion"] }


dirs = "4"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0"
Expand All @@ -124,6 +132,7 @@ tempfile = "3.6.0"
jsonrpc = { version = "0.16.0", features = ["minreq_http"] }
flate2 = "1.0.24"

im = { version = "15.1", features = ["serde"] }
tracing = "0.1.40"
tracing-web = "0.1.3"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
Expand Down
Loading

0 comments on commit 70f6809

Please sign in to comment.