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: merge master into simulate feature branch #1848

Merged
merged 164 commits into from
Sep 14, 2023
Merged

chore: merge master into simulate feature branch #1848

merged 164 commits into from
Sep 14, 2023

Conversation

ludamad
Copy link
Collaborator

@ludamad ludamad commented Aug 28, 2023

No description provided.

@ludamad ludamad changed the base branch from master to cg/simulate-spike-bb-subrepo August 28, 2023 20:51
@Maddiaa0
Copy link
Member

Maddiaa0 commented Sep 5, 2023

@ludamad is this still needed?

@ludamad
Copy link
Collaborator Author

ludamad commented Sep 6, 2023

Yes! just been slow going

@ludamad ludamad force-pushed the ad/cg/simulate-spike-bb-subrepo branch from 5971bf0 to 7114110 Compare September 6, 2023 17:30
ludamad0 and others added 17 commits September 6, 2023 20:37
@ludamad0
fix: remaining refs to clang15
8a41439
@ludamad0
fix: remaining refs to clang15
3d8ced5
@ludamad0
fix: remaining refs to clang15
4c77c02
@ludamad0
Merge commit '4c77c02' into ad/cg/simulate-spike-bb-subrepo
3660ae3
@ludamad0
Merge remote-tracking branch 'origin/master' into ad/cg/simulate-spik…
abc132c 
…e-bb-subrepo
@ludamad0
Merge remote-tracking branch 'origin/master' into ad/cg/simulate-spik…
9ab9c24 
…e-bb-subrepo
@ludamad
Merge branch 'cg/simulate-spike-bb-subrepo' into ad/cg/simulate-spike…
a9827dc 
…-bb-subrepo
@spalladino
chore(contracts): Use autogenerated Noir interfaces where possible (#…
bd6368b 
…2073)

Fixes #1604
@benesjan @spypsy @PhilWindle
feat: GrumpkinScalar type (#1919)
3a9238a 
Fixes #1912 

**Note 1**: I removed the Signer interface as the difference in private
key types between `Grumpkin` and `secp256k1` made it impractical. Now we
have a special type only for the "`Grumpkin` key" and the `secp256k1`
key is represented as either as a `Buffer` or as `0x${string}` (in case
of publisher private key).

**Note 2**: I changed some of the hardcoded private keys because they
didn't fit to `GrumpkinScalar` and auto-reduction is no longer allowed.

**Note 3**: The way we get Grumpkin private key from mnemonic is
insecure so I've created [this
issue](#2052) for
it.

# 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).

---------

Co-authored-by: spypsy <spypsy@outlook.com>
Co-authored-by: PhilWindle <philip.windle@gmail.com>
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
99ee337 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "ca423221d"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "ca423221d"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@benesjan
fix: end-to-end aztec cli dependency issue (#2092)
16ee3e5 
`yarn prepare` didn't include CLI as dependency of `end-to-end` package
in `build_manifest.json` because the command expects the directory to
have the same name as the string following `@aztec/`. And since there
was a naming inconsistency (the package is called `@aztec/cli` but the
package directory was `yarn-project/aztec-cli`) it got omitted.
@jeanmon
chore(circuits): - remove dead code from cbind of private kernel circ…
43dc9d7 
…uit (#2088)

Resolves #2087 

# 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).
@jeanmon
chore(circuits): remove dead code in cbind.cpp for public kernel (#2094)
861f960 
Resolves #2093 

# 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).
@benesjan
fix: broken bootstrap.sh after renaming aztec-cli dir as cli (#2097)
2386781
@benesjan
fix: updated CLI readme (#2098)
2226091 
Fixes #1784
@LeilaWang
refactor: move storage into main.nr. (#2068)
2c2d72b 
Closes #1877 

# 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).
@AztecBot
git subrepo push --branch=main docs
d6fe5fd 
subrepo:
  subdir:   "docs"
  merged:   "d070b543b"
upstream:
  origin:   "https://github.com/AztecProtocol/docs"
  branch:   "main"
  commit:   "d070b543b"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
PhilWindle and others added 28 commits September 12, 2023 14:32
@PhilWindle
feat(build): Use LTS version of ubuntu (#2239)
ce6671e 
This PR switches the version of ubuntu used in docker builds to the LTS
version

# 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).
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
428ac5e 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "9f8e0d412"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "9f8e0d412"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@spalladino
feat(cli): Add commands for generating ts and nr interfaces (#2241)
c11b70d 
Adds `generate-typescript` and `generate-noir-interface` commands to the
CLI to generate typescript types and noir external interfaces from
already built artifacts. Both commands take a path to the noir project,
an optional `artifacts` relative path to the artifacts folder (defaults
to `target`), and an optional outdir relative to the noir project as
well.

Fixes #2183
@AztecBot
git subrepo push --branch=main docs
c743cf8 
subrepo:
  subdir:   "docs"
  merged:   "eb85223fb"
upstream:
  origin:   "https://github.com/AztecProtocol/docs"
  branch:   "main"
  commit:   "eb85223fb"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@kevaundray
fix: Refactor constraints in scalar mul to use the high limb (#2161)
1d0e25d 
See noir-lang/noir#2588 for more details

# 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).
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
676a0be 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "760438bf4"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "760438bf4"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@PhilWindle
feat: Optimise sandbox startup time by only initialising the BB solve…
e9cac9c 
…r once. (#2240)

This PR ensures that we only perform BB solver initialisation once
within the acir simulator.

# 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).
@spalladino
feat(cli): Inspect contract command (#2248)
381706e 
Adds an `inspect-contract` command that lists the functions available to
call. Omits internal functions and stev.

```
$ yarn aztec-cli inspect-contract PrivateTokenContractAbi
secret constructor(initial_supply: Field, owner: Field)
unconstrained getBalance(owner: Field)
secret mint(amount: Field, owner: Field)
secret transfer(amount: Field, recipient: Field)
```

Fixes #2180
@spypsy
feat: Define specific Sandbox version when running docker-compose up (#…
71da236 
…2238)

Fixes #2234 
Sandbox Website change:
AztecProtocol/sandbox-website#22

# 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).
@spalladino
feat: Validate nargo version against expected one (#2254)
011c0b7 
Adds a `noir-version.json` file in the `noir-compiler` project, which
pins what is the expected nargo tag and commit hash to be used for
Aztec.

- When installing nargo in the CI, the `tag` is used as the argument for
`noirup`.
- When using the noir compiler from the CLI or programmatically, a
warning is emitted if the current nargo version does not match the
expected one in the json file.
- When building contracts using `yarn noir:build`, an error is thrown if
the version does not match.

The `noir-version.json` file is reached by the `noir-complier` rebuild
patterns, which is a build-system dependency of `noir-contracts`, which
means that all contracts in the repo should get recompiled when we bump
to a new version of Noir. Fixes #2185.

---

This also allows us to **start versioning the aztec noir releases**
rather than having a moving tag that potentially breaks master (and any
open branches) when we update to a breaking release. To make the most of
out this, I believe we should publish each aztec release as both `aztec`
(so it's easy for end users to just install that version when they are
starting) and a specific tag like `aztec-0.7.0` that we refer to in the
`noir-version`.

Alternatively, we can drop the `aztec` tag altogether, and either 1)
automatically update our docs to reflect the tag listed in
`noir-verison.json` in the install instructions (requires a smarter
`include_code` macro) or 2) have the aztec-cli run `noirup` on its own
to install the version required.
@ludamad
Revert "feat(build): Use LTS version of ubuntu (#2239)" (#2262)
c808912 
This reverts commit ce6671e.

The cmake on this ubuntu doesn't actually work with our setup.
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
3005328 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "ee778d492"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "ee778d492"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@ludamad
Revert "fix: More accurate c++ build pattern (#1962)" (#2261)
dca21c3 
This reverts commit 21c2f8e.

This missed dockerfiles. The idea of not matching .gitrepo files was not
worth it.
@Maddiaa0
fix(docs): use code snippet macros in bridge docs (#2205)
0c3a627 
fixes: #2193


Updates the bridge docs code such that it uses code snippets (which can
change) rather than having static code
@AztecBot
git subrepo push --branch=main docs
e89b364 
subrepo:
  subdir:   "docs"
  merged:   "6905fb906"
upstream:
  origin:   "https://github.com/AztecProtocol/docs"
  branch:   "main"
  commit:   "6905fb906"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@TomAFrench
chore: add a Nargo workspace in noir-contracts (#2083)
728a79c 
This PR creates a Nargo workspace for the `noir-contracts` package. This
is useful for a mystery project.

# 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).
@Maddiaa0
chore: use workspace build with nargo compile --workspace (#2266)
9ab66a0 
fixes: 
- #2258
@AztecBot
chore(master): Release 0.7.0 (#2200)
90e5922 
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-packages: 0.7.0</summary>

##
[0.7.0](aztec-packages-v0.6.7...aztec-packages-v0.7.0)
(2023-09-13)


### ⚠ BREAKING CHANGES

* **aztec-noir:** rename noir-aztec to aztec-noir
([#2071](#2071))

### Features

* **build:** Use LTS version of ubuntu
([#2239](#2239))
([ce6671e](ce6671e))
* **ci:** Run nargo test in ci on all packages
([#2197](#2197))
([cca55f2](cca55f2))
* **cli:** Add commands for generating ts and nr interfaces
([#2241](#2241))
([c11b70d](c11b70d)),
closes
[#2183](#2183)
* **cli:** Inspect contract command
([#2248](#2248))
([381706e](381706e)),
closes
[#2180](#2180)
* Define specific Sandbox version when running docker-compose up
([#2238](#2238))
([71da236](71da236))
* **docs:** Updated docs explaining Sandbox accounts
([#2235](#2235))
([f560066](f560066))
* Optimise sandbox startup time by only initialising the BB solver once.
([#2240](#2240))
([e9cac9c](e9cac9c))
* Remove entrypoint collection
([#2148](#2148))
([e97c94d](e97c94d))
* Validate nargo version against expected one
([#2254](#2254))
([011c0b7](011c0b7))


### Bug Fixes

* Add cjs-entry to bbjs package files
([#2237](#2237))
([ae16193](ae16193))
* Add link to example contracts in the monorepo
([#2219](#2219))
([8aede54](8aede54))
* **build:** Update ubuntu version used in Docker builds
([#2236](#2236))
([dbe80b7](dbe80b7))
* **docs:** Use code snippet macros in bridge docs
([#2205](#2205))
([0c3a627](0c3a627))
* Format barretenberg
([#2209](#2209))
([0801372](0801372))
* Msgpack blowup with bigger objects
([#2207](#2207))
([b909937](b909937))
* Refactor constraints in scalar mul to use the high limb
([#2161](#2161))
([1d0e25d](1d0e25d))
* Reinstate v stripping in build
([#2220](#2220))
([13d34f5](13d34f5))
* Return partial witnesses based on the content of read requests.
([#2164](#2164))
([a2125f7](a2125f7))
* Try e2e cli timeout bump
([#2210](#2210))
([a039fdd](a039fdd))
* Try workaround sample dapp ci timeout
([#2208](#2208))
([e39f6bf](e39f6bf))


### Miscellaneous

* Add a Nargo workspace in `noir-contracts`
([#2083](#2083))
([728a79c](728a79c))
* Add debugging to run_tests
([#2212](#2212))
([1c5e78a](1c5e78a))
* **aztec-noir:** Rename noir-aztec to aztec-noir
([#2071](#2071))
([e1e14d2](e1e14d2))
* **circuits:** Merge and root rollup cbind msgpack
([#2192](#2192))
([4f3ecee](4f3ecee))
* **noir-contracts:** 1655 - rename functions to make hack clearer for
publicly created notes
([#2230](#2230))
([707bc09](707bc09))
* Run the test for zero division with mul div up
([#2206](#2206))
([747de6a](747de6a))
* Update url for acir artifacts
([#2231](#2231))
([5e0abd3](5e0abd3))
* Use workspace build with `nargo compile --workspace`
([#2266](#2266))
([9ab66a0](9ab66a0))


### Documentation

* Dapp tutorial
([#2109](#2109))
([573dbc2](573dbc2)),
closes
[#2051](#2051)
* Minor fixes to dapp tutorial
([#2203](#2203))
([dcc927c](dcc927c))
</details>

<details><summary>barretenberg.js: 0.7.0</summary>

##
[0.7.0](barretenberg.js-v0.6.7...barretenberg.js-v0.7.0)
(2023-09-13)


### Bug Fixes

* Add cjs-entry to bbjs package files
([#2237](#2237))
([ae16193](ae16193))


### Miscellaneous

* Add debugging to run_tests
([#2212](#2212))
([1c5e78a](1c5e78a))
</details>

<details><summary>barretenberg: 0.7.0</summary>

##
[0.7.0](barretenberg-v0.6.7...barretenberg-v0.7.0)
(2023-09-13)


### ⚠ BREAKING CHANGES

* **aztec-noir:** rename noir-aztec to aztec-noir
([#2071](#2071))

### Features

* **build:** Use LTS version of ubuntu
([#2239](#2239))
([ce6671e](ce6671e))


### Bug Fixes

* **build:** Update ubuntu version used in Docker builds
([#2236](#2236))
([dbe80b7](dbe80b7))
* Format barretenberg
([#2209](#2209))
([0801372](0801372))
* Msgpack blowup with bigger objects
([#2207](#2207))
([b909937](b909937))
* Refactor constraints in scalar mul to use the high limb
([#2161](#2161))
([1d0e25d](1d0e25d))


### Miscellaneous

* Add debugging to run_tests
([#2212](#2212))
([1c5e78a](1c5e78a))
* **aztec-noir:** Rename noir-aztec to aztec-noir
([#2071](#2071))
([e1e14d2](e1e14d2))
* Update url for acir artifacts
([#2231](#2231))
([5e0abd3](5e0abd3))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
e434a22 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "18975d878"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "18975d878"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@Sarkoxed @Rumata888
feat: creating an SMT verification module (#1932)
4642b61 
This PR adds a module to symbolically verify circuits in our codebase

# 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).

---------

Co-authored-by: Innokentii Sennovskii <isennovskiy@gmail.com>
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
7db21b0 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "efe36c963"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "efe36c963"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@LHerskind
feat: Token standard (#2069)
5e8fbf2 
Fixes #1743.

See #2199 for extensions that is required with generators etc to not
collide with payloads.
@ludamad
fix: workaround sequencer timeout (#2269)
9fc3f3d
@ludamad
fix: msgpack stack blowups on schema gen (#2259)
1afc566
@AztecBot
git subrepo push --branch=master circuits/cpp/barretenberg
366680a 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "97ba36b86"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "97ba36b86"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@ludamad0
workaround simulator issue
8d5d993
@ludamad0
fix: use lunar instead of kinetic
b7927ef
@ludamad0
Merge
d089918
@ludamad ludamad merged commit 586241e into cg/simulate-spike-bb-subrepo Sep 14, 2023
88 checks passed
@ludamad ludamad deleted the ad/cg/simulate-spike-bb-subrepo branch September 14, 2023 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
A3
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.