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

feat: Sync from noir #9425

Merged
merged 10 commits into from
Oct 28, 2024
Merged

feat: Sync from noir #9425

merged 10 commits into from
Oct 28, 2024

Conversation

AztecBot
Copy link
Collaborator

@AztecBot AztecBot commented Oct 25, 2024 •
edited
Loading

Automated pull of development from the noir programming language, a dependency of Aztec.
BEGIN_COMMIT_OVERRIDE
fix: Fix panic in comptime code (noir-lang/noir#6361)
feat: let the LSP import code action insert into existing use statements (noir-lang/noir#6358)
chore: minor tweaks to comptime doc (noir-lang/noir#6357)
feat: LSP auto-import will try to add to existing use statements (noir-lang/noir#6354)
fix: allow type aliases in let patterns (noir-lang/noir#6356)
feat(test): Run test matrix on stdlib tests (noir-lang/noir#6352)
fix(ssa): Do not mark an array from a parameter mutable (noir-lang/noir#6355)
fix: always inline derive_generators (noir-lang/noir#6350)
chore: add test to check that duplicate definitions generated from macros throws error (noir-lang/noir#6351)
chore: switch to btreeset for deterministic ordering (noir-lang/noir#6348)
feat(perf): Use [u32;16] for message block in sha256 (noir-lang/noir#6324)
chore: add some tests for type aliases
feat: remove 'single use' intermediate variables (noir-lang/noir#6268)
feat: Sync from aztec-packages (noir-lang/noir#6345)
feat(profiler)!: New flamegraph command that profiles the opcodes executed (noir-lang/noir#6327)
feat: check trait where clause (noir-lang/noir#6325)
fix: better formatting of leading/trailing line/block comments in expression lists (noir-lang/noir#6338)
feat: let the formatter remove lambda block braces for single-statement blocks (noir-lang/noir#6335)
chore: run tests in metaprogramming.rs (noir-lang/noir#6339)
END_COMMIT_OVERRIDE

AztecBot and others added 4 commits October 25, 2024 11:24
@AztecBot
[1 changes] chore: switch to btreeset for deterministic ordering (noi…
d791da3 
…r-lang/noir#6348)

feat(perf): Use [u32;16] for message block in sha256 (noir-lang/noir#6324)
chore: add some tests for type aliases
feat: remove 'single use' intermediate variables (noir-lang/noir#6268)
feat: Sync from aztec-packages (noir-lang/noir#6345)
feat(profiler)!: New flamegraph command that profiles the opcodes executed (noir-lang/noir#6327)
feat: check trait where clause (noir-lang/noir#6325)
fix: better formatting of leading/trailing line/block comments in expression lists (noir-lang/noir#6338)
feat: let the formatter remove lambda block braces for single-statement blocks (noir-lang/noir#6335)
chore: run tests in metaprogramming.rs (noir-lang/noir#6339)
@AztecBot
chore: apply sync fixes
9829968
@TomAFrench
Merge branch 'master' into sync-noir
626530e 
* master:
  chore: fix sync scripts (#9423)
  feat: ownable sysstia (#9398)
  feat: `bytes_to_fields` requiring only 1 generic param (#9417)
  feat: implement encryption to an address point and decryption from an address secret (#9272)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  test: node follow prune and extend chain (#9328)
  feat: initial block reward + external libraries (#9297)
  feat: Print finalized size and log dyadic size during Ultra proof construction (#9411)
  feat: fee pricing to 0 for old instances (#9296)
  fix: allow more resources for 4epochs tests (#9418)
@TomAFrench
.
05d0ea1
@TomAFrench
Copy link
Member

cc @nventuro on the last commit. This is necessary due to us checking trait constraints after noir-lang/noir#6325

@TomAFrench TomAFrench enabled auto-merge (squash) October 25, 2024 17:23
@TomAFrench
Copy link
Member

@asterite can you take a look at this on Monday? I'm getting very strange behaviour here which seems related to your PR on trait bounds.

@asterite
Copy link
Contributor

I'm taking a look.

I tried commenting the code that was added for trait where clauses and it still errors. Then I checked out one commit before that PR and the error is still there 🤔

I noticed this line is gone:

https://github.com/AztecProtocol/aztec-packages/pull/9425/files#diff-410ecd1d5af7127fc3628a20932525ff9271f39eed1e9237700a2355c6fbc442L30

but adding it again doesn't solve it...

@TomAFrench TomAFrench disabled auto-merge October 28, 2024 09:52
@asterite asterite mentioned this pull request Oct 28, 2024
Merged
5 tasks
@TomAFrench
.
413830c
@TomAFrench
Merge branch 'master' into sync-noir
6b5640f 
* master: (37 commits)
  chore(avm:): Fix execution tests in proving mode (#9466)
  chore: remove unnecessary trait (#9437)
  fix: yarn build:fast (#9464)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  fix: cleanup of janky encryption apis (#9390)
  feat!: getcontractinstance instruction returns only a specified member (#9300)
  refactor: replace token note with uint note (#8143)
  fix(avm): address bytecode hashing comments (#9436)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  chore: noir bug workaround (#9443)
  feat: derive address and class id in avm (#8897)
  fix: bb-only-change fix e2e build instability (#9441)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  ...
@TomAFrench
.
a48f45f
@TomAFrench
chore: fmt
3ffe6a1
@github-actions GitHub Actions
Copy link
Contributor

Changes to public function bytecode sizes

Generated at commit: 58c05aaa0edd049f7679f72e814a7cbd5176156d, compared to commit: 8e07de8233929d40a433a80064ceec30a69c1360

🧾 Summary (100% most significant diffs)

Program Bytecode size in bytes (+/-) %
AvmTest::sha256_hash +938 ❌ +33.05%
Test::consume_mint_public_message +1,401 ❌ +15.98%
TokenBridge::claim_public +1,396 ❌ +13.82%
Test::consume_message_from_arbitrary_sender_public +920 ❌ +13.71%
TokenBridge::exit_to_l1_public +922 ❌ +13.60%
TokenBridge::public_dispatch +1,757 ❌ +9.13%
Test::public_dispatch +1,401 ❌ +7.98%
Uniswap::swap_public +907 ❌ +7.09%
AvmTest::bulk_testing +928 ❌ +4.16%
Uniswap::public_dispatch +907 ❌ +4.16%
AvmTest::public_dispatch +938 ❌ +1.73%
Full diff report 👇
Program Bytecode size in bytes (+/-) %
AvmTest::sha256_hash 3,776 (+938) +33.05%
Test::consume_mint_public_message 10,166 (+1,401) +15.98%
TokenBridge::claim_public 11,498 (+1,396) +13.82%
Test::consume_message_from_arbitrary_sender_public 7,628 (+920) +13.71%
TokenBridge::exit_to_l1_public 7,703 (+922) +13.60%
TokenBridge::public_dispatch 21,003 (+1,757) +9.13%
Test::public_dispatch 18,953 (+1,401) +7.98%
Uniswap::swap_public 13,700 (+907) +7.09%
AvmTest::bulk_testing 23,248 (+928) +4.16%
Uniswap::public_dispatch 22,729 (+907) +4.16%
AvmTest::public_dispatch 55,100 (+938) +1.73%

@github-actions GitHub Actions
Copy link
Contributor

Changes to circuit sizes

Generated at commit: 58c05aaa0edd049f7679f72e814a7cbd5176156d, compared to commit: 8e07de8233929d40a433a80064ceec30a69c1360

🧾 Summary (100% most significant diffs)

Program ACIR opcodes (+/-) % Circuit size (+/-) %
rollup_block_root -482 ✅ -10.71% -456 ✅ -0.02%
parity_root -686 ✅ -12.00% -677 ✅ -0.02%
rollup_merge -462 ✅ -11.92% -448 ✅ -0.02%
rollup_block_merge -2,442 ✅ -32.56% -1,324 ✅ -0.07%
rollup_root -2,442 ✅ -32.63% -1,324 ✅ -0.07%
public_kernel_merge -6,587 ✅ -12.45% -3,299 ✅ -0.30%
private_kernel_tail -231 ✅ -4.75% -117 ✅ -0.87%
public_kernel_tail -59,335 ✅ -22.95% -29,724 ✅ -1.31%
private_kernel_reset -18,581 ✅ -20.21% -9,100 ✅ -1.93%
private_kernel_reset_4_4_4_4_4_4_4_4_1 -3,087 ✅ -8.84% -1,533 ✅ -1.95%
rollup_base -133,536 ✅ -27.88% -81,747 ✅ -2.44%
private_kernel_init -2,580 ✅ -10.69% -1,302 ✅ -4.02%
private_kernel_tail_to_public -3,095 ✅ -10.84% -1,745 ✅ -4.15%
parity_base -686 ✅ -13.76% -1,364 ✅ -4.25%
private_kernel_inner -4,923 ✅ -11.49% -2,472 ✅ -4.39%
public_kernel_inner -84,782 ✅ -24.73% -42,392 ✅ -6.33%
Full diff report 👇
Program ACIR opcodes (+/-) % Circuit size (+/-) %
rollup_block_root 4,020 (-482) -10.71% 2,848,501 (-456) -0.02%
parity_root 5,031 (-686) -12.00% 3,789,841 (-677) -0.02%
rollup_merge 3,414 (-462) -11.92% 1,903,591 (-448) -0.02%
rollup_block_merge 5,057 (-2,442) -32.56% 1,905,949 (-1,324) -0.07%
rollup_root 5,041 (-2,442) -32.63% 1,905,935 (-1,324) -0.07%
public_kernel_merge 46,314 (-6,587) -12.45% 1,098,998 (-3,299) -0.30%
private_kernel_tail 4,628 (-231) -4.75% 13,300 (-117) -0.87%
public_kernel_tail 199,203 (-59,335) -22.95% 2,240,321 (-29,724) -1.31%
private_kernel_reset 73,358 (-18,581) -20.21% 462,820 (-9,100) -1.93%
private_kernel_reset_4_4_4_4_4_4_4_4_1 31,816 (-3,087) -8.84% 77,053 (-1,533) -1.95%
rollup_base 345,350 (-133,536) -27.88% 3,275,223 (-81,747) -2.44%
private_kernel_init 21,558 (-2,580) -10.69% 31,096 (-1,302) -4.02%
private_kernel_tail_to_public 25,449 (-3,095) -10.84% 40,353 (-1,745) -4.15%
parity_base 4,298 (-686) -13.76% 30,731 (-1,364) -4.25%
private_kernel_inner 37,941 (-4,923) -11.49% 53,829 (-2,472) -4.39%
public_kernel_inner 258,110 (-84,782) -24.73% 627,203 (-42,392) -6.33%

@TomAFrench TomAFrench merged commit d67381b into master Oct 28, 2024
57 checks passed
@TomAFrench TomAFrench deleted the sync-noir branch October 28, 2024 11:25
TomAFrench added a commit that referenced this pull request Oct 28, 2024
@TomAFrench
Merge branch 'master' into sync-noir
70e05e1 
* master: (62 commits)
  chore: dont show aws creds in docker fast  (#9465)
  fix: make sure kind tests run every master commit (#9478)
  feat: simulate latency with network chaos (#9469)
  feat: fixed number of pub inputs for databus commitment propagation (#9336)
  chore(CI): remove end-to-end/Earthfile (#9364)
  chore!: use Brillig opcode when possible for less-than operations on fields (#9416)
  fix: remove unnecessary ivpk's from aztec-nr (#9460)
  feat: Sync from noir (#9425)
  chore!: split base rollup and remove public kernel proving (#9434)
  refactor: clean up note processor after changes due to address (#9401)
  feat(avm): merkle tree gadget (#9205)
  fix: docker fast (#9467)
  chore(avm:): Fix execution tests in proving mode (#9466)
  chore: remove unnecessary trait (#9437)
  fix: yarn build:fast (#9464)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  fix: cleanup of janky encryption apis (#9390)
  ...
@AztecBot AztecBot mentioned this pull request Oct 30, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomAFrench TomAFrench TomAFrench approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@AztecBot @TomAFrench @asterite