fix: bump circuits, USE_TURBO, acirHash, bump circuits.js timeout by dbanks12 · Pull Request #263 · AztecProtocol/aztec-packages

dbanks12 · 2023-04-13T15:40:59Z

Description

add acirHash to PrivateCallData, bump circuits, fix primitives.wasm build/cmake, make sure circuits is built with USE_TURBO

NOTE: reverts circuits.js/package.json's inherit of the common json because circuits needs to bump timeout.

Closes Add acir_hash in circuits.js #235
Closes The latest commit (ffd6b2a) doesn't work in WASM from TS aztec3-circuits#198
- this was an ultraplonk issue
Replaces fix: wasm memory limit, bump test timeout #216
- wasm bump was only necessary when using ultraplonk - we are forcing turbo now
Creates KernelProver.prove() should use a real acirHash instead of 0 when constructing PrivateCallData #262
- acirHash was added to privatecalldata in this PR, but there are still some decisions that need to be made about its type etc

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.

…d-time-fix

…uild/cmake, make sure circuits is built with USE_TURBO

…timeout

… uses USE_TURBO in dockerfiles

dbanks12 · 2023-04-13T16:26:43Z

introduces new issue that needs fixing: #262

dbanks12 · 2023-04-13T18:03:11Z

Note that the contract/function tree root mismatches first discovered in #216 were occurring for two reasons:

After bumping circuits our hashing was using a different pedersen (the ultraplonk version) which broke snapshot comparisons
There was a bug in circuits where much of the contract-related logic in the private kernel was not being run 😩

…ss fix is merged

ludamad

LGTM

* chore: build in yarn test * bump to latest circuits master now that PR with contract root / address fix is merged * add acirHash to PrivateCallData, bump circuits, fix primitives.wasm build/cmake, make sure circuits is built with USE_TURBO * shouldn't need timeout... --------- Co-authored-by: ludamad <domuradical@gmail.com> Co-authored-by: cheethas <urmasurda@gmail.com>

* Enabled multiple tests against same rollup contract * fix: skip lower check on empty leaves * fix: update nt insertion algo * fix: redo nt algo * temp * Enabled multiple tests against same rollup contract * fix: skip lower check on empty leaves * fix: update nt insertion algo * fix: redo nt algo * clean * clean * chore(circuits): bump to fix pr * chore(circuits(: bump using new dummy composer * chore(circuits): bump to master * chore: build in yarn test * refactor: minor sequencer cleanup (#251) * bump circuits * add acirHash to PrivateCallData, bump circuits, fix primitives.wasm build/cmake, make sure circuits is built with USE_TURBO * remove inherit from circuits.js package.json because it was removing timeout * revert circuits.js/package.json update circuits submodule now that it uses USE_TURBO in dockerfiles * fix: re-add timeout * clean: update test syntax * Bump typescript and jest versions (#267) * Remove ts-ignores when creating memdown instances * Bump ts version * Bump jest and friends versions * Update snapshots * fix: bump circuits, USE_TURBO, acirHash, bump circuits.js timeout (#263) * chore: build in yarn test * bump to latest circuits master now that PR with contract root / address fix is merged * add acirHash to PrivateCallData, bump circuits, fix primitives.wasm build/cmake, make sure circuits is built with USE_TURBO * shouldn't need timeout... --------- Co-authored-by: ludamad <domuradical@gmail.com> Co-authored-by: cheethas <urmasurda@gmail.com> * feat: Noir transfer function for milestone 1.5 (#244) * fix: wip noir 1.5 * rand_idx hack to prevent repreated rand oracle removal * fix: various fixes for noir 1.5 * fix: readded change note * wip trying to fix transfer * refactor(noir): refactored noir-aztec3 * chore: udpate bytecode of constructor and mint * fix: work around bug by passing root as input * refactor: remove debug stuffs * feat: wip support for dummy notes * fix(noir): worked around a weird transfer bug * chore: switch to brillig oracles * refactor(sim): recurse by creating nested classes * refactor(noir): is_dummy and dummy notes creation * chore(noir): update bytecode * log: added a log in execution * Revert "chore: switch to brillig oracles" This reverts commit ea1d944. --------- Co-authored-by: Joss <joss@aztecprotocol.com> * fix: review comments * revert: circuitsjs timeout * fix: uncomment nullifier tree test * Revert "Enabled multiple tests against same rollup contract" This reverts commit 8ff5909. * fix e2e block building test merge * add private key to config * improve e2e running times (#252) * add config from env vars in projects + update e2e config * remove comment * Fix automatic import * remove comments * remove hardcoded addresses + reduce .isMined poll freq * more chagnes to isMined freq * fix zero EthAddress * chore(circuits): bump * chore(circuits): bump * chore(circuits): back to master * fix: up maxtxs per block --------- Co-authored-by: PhilWindle <philip.windle@gmail.com> Co-authored-by: cheethas <urmasurda@gmail.com> Co-authored-by: ludamad <domuradical@gmail.com> Co-authored-by: Jan Beneš <janbenes1234@gmail.com> Co-authored-by: dbanks12 <david@aztecprotocol.com> Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com> Co-authored-by: David Banks <47112877+dbanks12@users.noreply.github.com> Co-authored-by: Álvaro Rodríguez <sirasistant@gmail.com> Co-authored-by: Joss <joss@aztecprotocol.com> Co-authored-by: spypsy <spypsy@outlook.com> Co-authored-by: spypsy <spypsy@users.noreply.github.com>

* 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 7 commits April 8, 2023 17:48

fix: wasm memory limit, bump test timeout

2b17dc1

Merge remote-tracking branch 'origin/master' into feat/wasm-memory-an…

9ca35d4

…d-time-fix

fix: Redo 20 initial pages => 30

98f4724

chore: build in yarn test

566c6ef

merge master in

7bafe4c

bump circuits

d01a615

add acirHash to PrivateCallData, bump circuits, fix primitives.wasm b…

33b99d8

…uild/cmake, make sure circuits is built with USE_TURBO

dbanks12 requested a review from ludamad April 13, 2023 15:40

remove inherit from circuits.js package.json because it was removing …

2f9be2f

…timeout

dbanks12 changed the base branch from feat/wasm-memory-and-time-fix to master April 13, 2023 16:00

dbanks12 changed the base branch from master to feat/wasm-memory-and-time-fix April 13, 2023 16:00

revert circuits.js/package.json update circuits submodule now that it…

b18ab3d

… uses USE_TURBO in dockerfiles

cheethas and others added 3 commits April 13, 2023 16:38

fix: re-add timeout

1c4c91d

revert wasm memory bump

e08e597

bump circuits

d7fd0c3

dbanks12 mentioned this pull request Apr 13, 2023

feat: Kernel fix & test improvements/refactoring AztecProtocol/aztec3-circuits#239

Merged

11 tasks

dbanks12 marked this pull request as draft April 13, 2023 17:52

dbanks12 changed the base branch from feat/wasm-memory-and-time-fix to master April 13, 2023 17:53

dbanks12 mentioned this pull request Apr 13, 2023

fix: wasm memory limit, bump test timeout #216

Closed

6 tasks

dbanks12 changed the title ~~fix: bump circuits, USE_TURBO, acirHash~~ fix: bump circuits, USE_TURBO, acirHash, bump circuits.js timeout Apr 13, 2023

dbanks12 commented Apr 13, 2023

View reviewed changes

Comment thread yarn-project/package.json

dbanks12 commented Apr 13, 2023

View reviewed changes

Comment thread yarn-project/circuits.js/package.json

spalladino approved these changes Apr 13, 2023

View reviewed changes

bump to latest circuits master now that PR with contract root / addre…

04b3940

…ss fix is merged

spalladino mentioned this pull request Apr 13, 2023

Build blocks using merge rollup circuit #269

Merged

shouldn't need timeout...

5098be3

dbanks12 marked this pull request as ready for review April 13, 2023 21:41

ludamad approved these changes Apr 13, 2023

View reviewed changes

dbanks12 merged commit f87f71b into master Apr 13, 2023

dbanks12 deleted the db/wasm-memory-root-issue branch April 13, 2023 21:49

spalladino mentioned this pull request Apr 14, 2023

fix: redo nullifier tree insertion algorithm #240

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: bump circuits, USE_TURBO, acirHash, bump circuits.js timeout#263

fix: bump circuits, USE_TURBO, acirHash, bump circuits.js timeout#263
dbanks12 merged 14 commits into
masterfrom
db/wasm-memory-root-issue

dbanks12 commented Apr 13, 2023 •

edited

Loading

Uh oh!

dbanks12 commented Apr 13, 2023

Uh oh!

Uh oh!

Uh oh!

dbanks12 commented Apr 13, 2023

Uh oh!

ludamad left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

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

Uh oh!

Description

Checklist:

Uh oh!

dbanks12 commented Apr 13, 2023

Uh oh!

Uh oh!

Uh oh!

dbanks12 commented Apr 13, 2023

Uh oh!

ludamad left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dbanks12 commented Apr 13, 2023 •

edited

Loading