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.

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

chore: sync aztec master #653

Merged
merged 11 commits into from
Aug 8, 2023
Merged

chore: sync aztec master #653

merged 11 commits into from
Aug 8, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Aug 8, 2023

Description

There was a divergence.

Rumata888 and others added 11 commits August 8, 2023 13:19
# Description
The part of the code that we need on our side to enable celer zk
benchmark
# Checklist:

- [x] I have reviewed my diff in github, line by line.
- [x] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to the issue(s) that it resolves.
- [x] There are no unexpected formatting changes, superfluous debug
logs, or commented-out code.
- [x] The branch has been merged or rebased against the head of its
merge target.
- [x] I'm happy for the PR to be merged at the reviewer's next
convenience.
Pushes the bb.js artifacts to AztecProtocol/dev-bb.js when
release-please triggers.

Closes noir-lang/noir#2093
# Description

Basic structure for a new stdlib Transcript corresponding to the new
native transcript used by the Honk proving systems. Implements all
functions required with the CAVEAT that no constraints are imposed for
hashing in `get_challenge`. May be useful to do this properly at some
point but avoiding it for now since it was non-trivial and the hash will
change anyway.

# Checklist:

- [ ] I have reviewed my diff in github, line by line.
- [ ] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to the issue(s) that it resolves.
- [ ] There are no unexpected formatting changes, superfluous debug
logs, or commented-out code.
- [ ] The branch has been merged or rebased against the head of its
merge target.
- [ ] I'm happy for the PR to be merged at the reviewer's next
convenience.
Fix the barretenberg mirror action. Looks like commits went in too close
together, see #1382

` ./scripts/git_subrepo.sh pull circuits/cpp/barretenberg`
`git checkout origin/master -- .gitmodules`
`git commit`
This should always work if anyone needs to do this again. In more
complicated cases you may be instructed to do a merge. In this case the
commit just became overwritten.

```
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "96fb60558"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "d4ade2a5f"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
```
Goblin translator tests were failing due to an incorrect assert (with
certain probability). Added a small fuzzer that helped find the bug.
# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [x] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [x] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [x] Every change is related to the PR description.
- [x] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
…age name (#1405)

ACIR tests are failing and needed a refresh on the Noir side. However,
there has been a change where compilation is specified off of the
package name in the `Nargo.toml` rather than a specified file name such
as `main.json`

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [X] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [X] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).

---------

Co-authored-by: Tom French <[email protected]>
# Description

Split `SumcheckRound` into `SumcheckRoundProver` and
`SumcheckRoundVerifier` in support of the recursive verifier work. We do
not want to inadvertently instantiate "prover functionality" with stdlib
types when instantiating `UltraVerifier_<flavor::UltraRecursive>`.
Sumcheck itself was split in a previous PR but SumcheckRound was
overlooked.

# Checklist:

- [ ] I have reviewed my diff in github, line by line.
- [ ] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to the issue(s) that it resolves.
- [ ] There are no unexpected formatting changes, superfluous debug
logs, or commented-out code.
- [ ] The branch has been merged or rebased against the head of its
merge target.
- [ ] I'm happy for the PR to be merged at the reviewer's next
convenience.
Please provide a paragraph or two giving a summary of the change,
including relevant motivation and context.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [ ] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [ ] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [ ] Every change is related to the PR description.
- [ ] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
Please provide a paragraph or two giving a summary of the change,
including relevant motivation and context.

# Checklist:
Remove the checklist to signal you've completed it. Enable auto-merge if
the PR is ready to merge.
- [x] If the pull request requires a cryptography review (e.g.
cryptographic algorithm implementations) I have added the 'crypto' tag.
- [x] I have reviewed my diff in github, line by line and removed
unexpected formatting changes, testing logs, or commented-out code.
- [x] Every change is related to the PR description.
- [x] I have
[linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
this pull request to relevant issues (if any exist).
Apologies for the large and sweeping PR. It's the culmination of going
back-and-forth between doc writing and tweaking noir contracts as I go.

- Improved the preprocessor which embeds code into markdown files.
- Split the old 'concepts' doc into the new filing structure, and added
some content and code snippets.
- Renamed instances of "zk token" to "private token" throughout the
codebase (all cases: camel, pascal etc).
- Moved `zk_token_contract` to a `private_token_airdrop_contract`,
because it showcased some extra 'claim' functionality that might confuse
someone expecting basic functions.
- Created `private_token_contract` as a simpler version of
`zk_token_contract` (by removing anything about claim notes).
- Introduced an example contract demonstrating the basics of public
state.
@ludamad ludamad merged commit d026d01 into master Aug 8, 2023
2 checks passed
@ludamad ludamad deleted the sync-master branch August 8, 2023 17:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants