chore: Bring in aztec3-circuits repo by ludamad · Pull Request #281 · AztecProtocol/aztec-packages

ludamad · 2023-04-17T19:09:23Z

Description

Take 3

Bringing in the aztec3-circuits repo into a few-repo setup (more like monorepo). Solves #276.

Checklist:

I have reviewed my diff in github, line by line.
Every change is related to the PR description.
I have linked 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.

…des as friend class

* feat: partial logic to check existence of vk in contract tree (missing merkle tree membership calls) * fix private call data * perform sibling-path traversal/hashing to get from VKhash/function-leaf all the way to function root and then to contract root --------- Co-authored-by: dbanks12 <david@aztecprotocol.com>

* chore(specs): remove * chore(specs): remove * revert bb change --------- Co-authored-by: cheethas <urmasurda@gmail.com>

* add rollup subtree height * just use one type of public inputs for base/merge (#168) * fix: re-usable rollup components * fix: hash_multiple -> hash_pair_native --------- Co-authored-by: Rahul Kothari <rahul.kothari.201@gmail.com>

* fix: small nullifier tree issue * clean * fix: add negative test * revert hash_pair -> hash_multiple change * add new cmake instruction (issue #236) - point to suyashes pedersen branch --------- Co-authored-by: cheethas <urmasurda@gmail.com>

Co-authored-by: cheethas <urmasurda@gmail.com>

* zero-initialize all abi and kernel structs. helper function to zero-init arrays of frs * revert uint32 assignments to 0 * better struct initialization in app circuits files * revert bad zero init of string * dont need to do as much in base utils since structs are sanely zero-initialized * format comment fix * use fill to initialize array of fields to zero

* fix bug in native kernel - contract logic was being skipped * zero-initialize all abi and kernel structs. helper function to zero-init arrays of frs * better struct initialization in app circuits files * dont need to do as much in base utils since structs are sanely zero-initialized * use fill to initialize array of fields to zero * fix native private kernel, refactor private kernel tests, add real logic in test setup for computing function/contract tree roots/siblings * new hash functions

* fixes * fix: more possible regression tests * fix: remove logs * fix: remove more logs * clean: reuse test code * clean * rm done todo --------- Co-authored-by: cheethas <urmasurda@gmail.com>

ludamad · 2023-04-17T19:49:45Z

@dbanks12 @Cheethas can I get an early re-review on this?

dbanks12

LGTM. Just double check that .gitmodules is right and then you're good to merge. Probably don't want to squash?

ludamad · 2023-04-17T20:08:37Z

Thanks David, rebase merging

* Split Pedersen Hash & Commitment Gadgets (#95) * [SQUASHED] Pedersen refactor into hash and commitment. Use lookup pedersen for merkle tree, fixed-base pedersen for commitments. --------- Co-authored-by: Suyash Bagad <suyashnbagad1997@gmail.com> Port `copy_as_new_witness`. Port `must_imply`. `operator++`. Port changes from `common`. Port `ecc/groups`. * [CPM] add missing dependencies to libbarretenberg.a (#154) --------- * Increase Pedersen Generator indices and subindices. (#169) * Remove a3 specific types. (#252) * Address Luke's Comments on `aztec3 -> master` (#263) * Add must_imply tests. * Added a test for `field_t::copy_as_new_witness` * add test for `conditional_assign` * Added `infinity` test. * Add `add_affine_test`. * Tests for Array Object in `stdlib` (#262) * basic array tests. * Add `composer_type` while hashing/compressing a vkey. * Add `contains_recursive_proof` to Recursive VK (#268) * feat: debug utility for serialization (#290) * feat: enable asan config * `array_push` for Generic Type (#291) * Add Indexed Merkle Tree (#281) * remove ts (consulted with Adam and we're good to go). (#292) * Add cout for verification_key struct (#295) * compute tree (#298) * [SQUASHED] fixing `push_array_to_array` method. (#304) * feat(memory_tree|a3): add sibling path calculations (#301) * feat(memory_tree): frontier paths * fix array and resolve merge conflicts (#305) * Mc/hash vk (#306) * Increase number of sub-generators to 128. * Build a3crypto.wasm (#311) * More Tests on A3 `stdlib` methods (#316) * test: more vk tests to compare circuit/native/vk_data (#310) * Mc/hash vk (#306) * inc num_generators_per_hash_index to 128. (#309) * fix. (#318) * Added test for `compute_tree_native`. (#319) * Install instructions for apt on ubuntu (#312) * Fix address compilation. (#329) --------- Co-authored-by: David Banks <47112877+dbanks12@users.noreply.github.com> Co-authored-by: Michael Connor <mike@aztecprotocol.com> Co-authored-by: dbanks12 <david@aztecprotocol.com> Co-authored-by: Santiago Palladino <spalladino@gmail.com> Co-authored-by: ludamad <adam.domurad@gmail.com> Co-authored-by: Maddiaa <47148561+cheethas@users.noreply.github.com> Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com> Co-authored-by: ludamad <domuradical@gmail.com> Co-authored-by: cheethas <urmasurda@gmail.com>

ludamad and others added 30 commits April 17, 2023 14:24

chore: remove circuits before inline aztec3-circuits

5b12662

feat: aztec 3 book

607a236

tools for writing az3 test_apps with private states

4d6335e

private kernel circuit abi, recursion, basic test

9766e83

private kernel circuit recursive verification

3a4707c

more private kernel circuit logic

d1e9379

move more bools to call_context

4ccd33c

tweak ABIs and return preimages

c8de4e8

refactor: add function excution context

01b1ab6

feat: tx_origin percolate through nested calls

5e2815f

chore: renaming

d3493bd

fix: tests

22563eb

tying up loose ends, before pausing

8f6e693

Huge ABI changes, given Q4 2022 speccing talks

b3eee49

update private abi & kernel docs

c854807

label files as outdated, relative to latest spec

3f55e73

wip: significant state var updates

125da0c

wip: contract syntax

a102149

wip: add more opcodes

f536a80

utxo finalise, and restricting permission to exec_ctx members to opco…

3e52605

…des as friend class

finalise utxos

c467600

deposit & transfer examples working with newer utxo syntax

c3799e9

tidying

401576d

commenting & tidying

a49fe51

utxo singleton initialisation

9600f67

small refactor

793ef10

updating abi structs

6d62427

support for external private function calls

153ef60

extracting call stack item preimages

9e63931

fix: test fixture functions caused dangling references

a8cefd2

iAmMichaelConnor and others added 12 commits April 17, 2023 14:29

native kernel to use dummy composer

4e7be4f

chore(specs): remove (#229)

77136e4

* chore(specs): remove * chore(specs): remove * revert bb change --------- Co-authored-by: cheethas <urmasurda@gmail.com>

feat: reusable rollup components (#183)

53dff4f

* add rollup subtree height * just use one type of public inputs for base/merge (#168) * fix: re-usable rollup components * fix: hash_multiple -> hash_pair_native --------- Co-authored-by: Rahul Kothari <rahul.kothari.201@gmail.com>

fix: Nullifier tree bug (#231)

9079a03

* fix: small nullifier tree issue * clean * fix: add negative test * revert hash_pair -> hash_multiple change * add new cmake instruction (issue #236) - point to suyashes pedersen branch --------- Co-authored-by: cheethas <urmasurda@gmail.com>

fix: update bootstrap to specify turbo (#237)

9719e83

Co-authored-by: cheethas <urmasurda@gmail.com>

add cbinds for merge (#227)

f5cd775

fix use turbo (#240)

6142089

ci: use turbo in dockerfiles (#243)

a0c1aed

fix: nullifier tests (#249)

f7c09de

* fixes * fix: more possible regression tests * fix: remove logs * fix: remove more logs * clean: reuse test code * clean * rm done todo --------- Co-authored-by: cheethas <urmasurda@gmail.com>

ludamad force-pushed the adam/git-subtree/desubmodule-circuits branch 3 times, most recently from a0f37d4 to 9b859e6 Compare April 17, 2023 19:17

chore: post merge fixup

ec1b504

ludamad force-pushed the adam/git-subtree/desubmodule-circuits branch from 9b859e6 to ec1b504 Compare April 17, 2023 19:23

chore: force build

aaa702f

ludamad force-pushed the adam/git-subtree/desubmodule-circuits branch from b443d2b to aaa702f Compare April 17, 2023 19:45

ludamad requested review from Maddiaa0, charlielye and dbanks12 April 17, 2023 20:02

dbanks12 approved these changes Apr 17, 2023

View reviewed changes

Comment thread .gitmodules

ludamad merged commit 8e8daff into master Apr 17, 2023

ludamad deleted the adam/git-subtree/desubmodule-circuits branch April 17, 2023 20:08

ludamad mentioned this pull request Apr 17, 2023

Bring in aztec3-circuits, preserving history #276

Closed

Navigation Menu

Uh oh!

chore: Bring in aztec3-circuits repo - #281

chore: Bring in aztec3-circuits repo#281
ludamad merged 166 commits into
masterfrom
adam/git-subtree/desubmodule-circuits

ludamad commented Apr 17, 2023 •

edited

Loading

Uh oh!

ludamad commented Apr 17, 2023

Uh oh!

dbanks12 left a comment

Uh oh!

Uh oh!

ludamad commented Apr 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Conversation

ludamad commented Apr 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist:

Uh oh!

ludamad commented Apr 17, 2023

Uh oh!

dbanks12 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ludamad commented Apr 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

ludamad commented Apr 17, 2023 •

edited

Loading