Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore!: Update to ACVM 0.12.0 #1339

Merged
merged 18 commits into from
May 24, 2023
Merged

chore!: Update to ACVM 0.12.0 #1339

merged 18 commits into from
May 24, 2023

Conversation

phated
Copy link
Contributor

@phated phated commented May 11, 2023 •
edited
Loading

Related issue(s)

Resolves #1302

Description

Summary of changes

This builds upon #1332 and switches the dependency overrides to using the patch syntax. I'm creating this draft because it is needed as the basis of my CRS work and we can keep it updated for other ACVM 0.12 updates.

Dependency additions / changes

Test additions / changes

Checklist

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt with default settings.
  • I have linked this PR to the issue(s) that it resolves.
  • I have reviewed the changes on GitHub, line by line.
  • I have ensured all changes are covered in the description.

Documentation needs

  • This PR requires documentation updates when merged.

Additional context

@kevaundray
Copy link
Collaborator

Seems the MacOS error was spurious so I restarted CI

Base automatically changed from phated/acvm-0.11 to master May 12, 2023 06:09
@sirasistant sirasistant mentioned this pull request May 15, 2023
Closed
5 tasks
@phated phated mentioned this pull request May 15, 2023
Closed
6 tasks
@sirasistant sirasistant mentioned this pull request May 16, 2023
Closed
6 tasks
TomAFrench and others added 5 commits May 18, 2023 02:34
@TomAFrench
Merge branch 'master' into phated/acvm-0.12.0
fc9df35 
* master:
  fix: Fix modulo operator for comptime values (#1361)
  chore: clarify that `verify_signature` takes a hashed message (#1365)
  feat: pass in closure to `Driver` to signal backend opcode support (#1349)
  feat(nargo)!: retire print-acir in favour of flag (#1328)
  chore(ssa): enable cse for assert (#1350)
  chore(ssa refactor): Add basic instruction simplification (#1329)
  chore(noir): Release 0.6.0 (#1279)
@phated
feat(nargo): Consume CommonReferenceString functions & manage caching (…
140587b 
…#1348)
@TomAFrench
Merge branch 'master' into phated/acvm-0.12.0
3316fb9
@phated
switch to published acvm and backend
56a237d
@phated
fix compilation issue
6a2330c
@phated phated requested a review from TomAFrench May 22, 2023 17:33
@phated phated marked this pull request as ready for review May 22, 2023 17:33
@phated phated linked an issue May 22, 2023 that may be closed by this pull request
Nargo should cache CRS instead of leaving to backends #1302
Closed
1 task
@vezenovm @phated @TomAFrench
chore: Remove usage of acvm::default_is_opcode_supported (#1366)
8ca4ec6 
Co-authored-by: Blaine Bublitz <blaine.bublitz@gmail.com>
Co-authored-by: Tom French <tom@tomfren.ch>
TomAFrench
TomAFrench previously approved these changes May 23, 2023
View reviewed changes
@joss-aztec joss-aztec mentioned this pull request May 23, 2023
Closed
@jeanmon jeanmon mentioned this pull request May 23, 2023
Closed
kevaundray
kevaundray reviewed May 23, 2023
View reviewed changes
flake.nix Show resolved Hide resolved
kevaundray
kevaundray reviewed May 23, 2023
View reviewed changes
Copy link
Collaborator

@kevaundray kevaundray left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly looks fine, for TODOs we should make issues so that we don't need to parse the codebase to figure these out and relevant discussions can be had in the issue

vezenovm
vezenovm reviewed May 23, 2023
View reviewed changes
Copy link
Contributor

@vezenovm vezenovm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor comment, though it is not blocking. Good with merging once issues are made for the TODOs

crates/nargo_cli/src/cli/prove_cmd.rs Show resolved Hide resolved
TomAFrench
TomAFrench previously approved these changes May 24, 2023
View reviewed changes
@TomAFrench
chore: clippy
e93de26
@TomAFrench
Merge branch 'master' into phated/acvm-0.12.0
09db55c 
* master:
  chore(ssa refactor): Add loop unrolling pass (#1364)
  chore: Add terms added in ssa refactor to `cspell` (#1385)
  chore(ssa refactor): Optimize constant `jmpif`s into `jmp`s (#1374)
  feat: Allow warnings by default (#1383)
  chore(github): Update GitHub Pull Request Template (#1370)
  chore(github): Update GitHub Bug Report Template (#1368)
  chore(ssa refactor): Update mem2reg pass to work with multiple functions and blocks (#1375)
  chore(ssa refactor): Add pass to simplify the control flow graph (#1373)
  chore(github): Update GitHub Feature Request Template (#1369)
@TomAFrench TomAFrench enabled auto-merge May 24, 2023 11:11
@TomAFrench TomAFrench added this pull request to the merge queue May 24, 2023
Merged via the queue into master with commit b938c7e May 24, 2023
9 checks passed
@TomAFrench TomAFrench deleted the phated/acvm-0.12.0 branch May 24, 2023 12:10
@kevaundray kevaundray mentioned this pull request May 24, 2023
Closed
@kevaundray kevaundray mentioned this pull request Jun 16, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kevaundray kevaundray kevaundray left review comments

@vezenovm vezenovm vezenovm left review comments

@TomAFrench TomAFrench TomAFrench approved these changes

@kobyhallx kobyhallx Awaiting requested review from kobyhallx

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Nargo should cache CRS instead of leaving to backends
5 participants
@phated @kevaundray @TomAFrench @vezenovm @sirasistant