refactor: moving storage slot out of `NoteHeader` #11904

benesjan · 2025-02-11T11:47:07Z

Fixes #11857

benesjan · 2025-02-11T11:47:24Z

refactor: function macros cleanup #12066
fix: #[aztec] macro warnings #12038
refactor!: Notes implementing Packable<N> #12004
refactor!: nuking NoteHeader #11942
refactor: moving storage slot out of NoteHeader #11904 👈 (View in Graphite)
fix: note hash collision #11869
master

This stack of pull requests is managed by Graphite. Learn more about stacking.

noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr

noir-projects/aztec-nr/aztec/src/macros/mod.nr

noir-projects/aztec-nr/aztec/src/note/note_getter/test.nr

noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr

github-actions · 2025-02-12T10:15:00Z

Changes to public function bytecode sizes

Generated at commit: cbe73e35c844e77047729407e2f2469084462cd9, compared to commit: 4908df898f8152a6c95c56d7fce1f935382b60e6

🧾 Summary (100% most significant diffs)

Program	Bytecode size in bytes (+/-)	%
TokenBlacklist::public_dispatch	-42 ✅	-0.18%

Full diff report 👇

Program	Bytecode size in bytes (+/-)	%
TokenBlacklist::public_dispatch	23,789 (-42)	-0.18%

iAmMichaelConnor

A lovely stepping stone towards refactoring note & nullifier logic! Thanks!
I think I only left a couple of pedantic comments as I went.

noir-projects/aztec-nr/address-note/src/address_note.nr

iAmMichaelConnor · 2025-02-13T09:18:54Z

noir-projects/noir-contracts/contracts/claim_contract/src/main.nr

@@ -28,7 +28,7 @@ pub contract Claim {
    }

    #[private]
-    fn claim(proof_note: UintNote, recipient: AztecAddress) {
+    fn claim(proof_note: UintNote, note_storage_slot: Field, recipient: AztecAddress) {


It's strange to see a storage_slot being passed to a top-level function. I don't understand what this contract does, but can this storage slot not be derived from other information within the body of the function? What's a proof_note?

You are right. And it actually turned out to be quite straightforward to address: 6f807b8

It seems like this hasn't been addressed? The commit is not even on the repo

noir-projects/noir-contracts/contracts/counter_contract/src/main.nr

noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr

yarn-project/end-to-end/src/e2e_crowdfunding_and_claim.test.ts

noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr

benesjan · 2025-02-13T10:00:22Z

@iAmMichaelConnor will address your feedback in a PR up the stack as I am touching there the same code and it will allow me to skip 1 CI run.

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-package: 0.76.4</summary> ## [0.76.4](aztec-package-v0.76.3...aztec-package-v0.76.4) (2025-02-13) ### Miscellaneous * **aztec-package:** Synchronize aztec-packages versions </details> <details><summary>barretenberg.js: 0.76.4</summary> ## [0.76.4](barretenberg.js-v0.76.3...barretenberg.js-v0.76.4) (2025-02-13) ### Miscellaneous * Unify webpack dev server versions ([#11965](#11965)) ([921d2cd](921d2cd)) </details> <details><summary>aztec-packages: 0.76.4</summary> ## [0.76.4](aztec-packages-v0.76.3...aztec-packages-v0.76.4) (2025-02-13) ### Features * `FunctionDefinition::as_typed_expr` (noir-lang/noir#7358) ([5efdd57](5efdd57)) * Aes decryption oracle ([#11907](#11907)) ([c4ce913](c4ce913)) * **avm:** Constrained ec_add ([#11525](#11525)) ([f8fe602](f8fe602)) * **avm:** Interaction testing ([#11947](#11947)) ([fc647eb](fc647eb)) * **avm:** Relation microbenchmarks ([#11974](#11974)) ([95b581d](95b581d)) * **cli:** Add `--target-dir` option (noir-lang/noir#7350) ([5efdd57](5efdd57)) * Indexed protocol contracts tree ([#11897](#11897)) ([96e84d4](96e84d4)) * **performance:** Check sub operations against induction variables (noir-lang/noir#7356) ([5efdd57](5efdd57)) * **performance:** Use unchecked ops based upon known induction variables (noir-lang/noir#7344) ([5efdd57](5efdd57)) * Small blob fixes/improvements ([#11686](#11686)) ([4eab9fc](4eab9fc)) * Update fee model ([#11953](#11953)) ([2798d58](2798d58)) * Use brillig optimized sha256 ([#11696](#11696)) ([438c905](438c905)) ### Bug Fixes * Ci fixes ([#11973](#11973)) ([6386f4e](6386f4e)) * **cli:** Only lock the packages selected in the workspace (noir-lang/noir#7345) ([5efdd57](5efdd57)) * Deterministic generation of vkeys in ts ([#11951](#11951)) ([7901cac](7901cac)) * Incorrect secondary file in LSP errors (noir-lang/noir#7347) ([5efdd57](5efdd57)) * Lock git dependencies folder when resolving workspace (noir-lang/noir#7327) ([5efdd57](5efdd57)) * Perform SSA constraints check on final SSA (noir-lang/noir#7334) ([5efdd57](5efdd57)) * Remove deprecated artifacts ([#11979](#11979)) ([4f0dce7](4f0dce7)) * Remove serial queue in broker facade ([#11956](#11956)) ([3485b52](3485b52)) * **ssa:** Make the lookback feature opt-in (noir-lang/noir#7190) ([5efdd57](5efdd57)) ### Miscellaneous * **avm:** Tracegen interactions assertion ([#11972](#11972)) ([b865ccc](b865ccc)) * Avoid doing all brillig integer arithmetic on u128s (noir-lang/noir#7357) ([5efdd57](5efdd57)) * Basic test for MSM in Noir to catch performance improvements and regressions (noir-lang/noir#7341) ([5efdd57](5efdd57)) * Bump devnet boot node resources ([#11958](#11958)) ([bbcdefc](bbcdefc)) * **ci:** Add Vecs and vecs to cspell (noir-lang/noir#7342) ([5efdd57](5efdd57)) * Deprecate keccak256 (noir-lang/noir#7361) ([5efdd57](5efdd57)) * Fix warnings (noir-lang/noir#7330) ([5efdd57](5efdd57)) * Mark sha256 as deprecated from the stdlib (noir-lang/noir#7351) ([5efdd57](5efdd57)) * Moving storage slot out of `NoteHeader` ([#11904](#11904)) ([8c4bb1c](8c4bb1c)) * Normalize path displayed by `nargo new` (noir-lang/noir#7328) ([5efdd57](5efdd57)) * Redo typo PR by osrm (noir-lang/noir#7238) ([5efdd57](5efdd57)) * Release Noir(1.0.0-beta.2) (noir-lang/noir#6914) ([5efdd57](5efdd57)) * Remove foreign calls array from Brillig VM constructor (noir-lang/noir#7337) ([5efdd57](5efdd57)) * Remove misleading output from `nargo check` (noir-lang/noir#7329) ([5efdd57](5efdd57)) * Remove some unused types and functions in the AST (noir-lang/noir#7339) ([5efdd57](5efdd57)) * Remove unnecessary constants (noir-lang/noir#7326) ([5efdd57](5efdd57)) * Revive browser test before killing it ([#11964](#11964)) ([cb47cc0](cb47cc0)) * Split acirgen into multiple modules (noir-lang/noir#7310) ([5efdd57](5efdd57)) * Unify webpack dev server versions ([#11965](#11965)) ([921d2cd](921d2cd)) </details> <details><summary>barretenberg: 0.76.4</summary> ## [0.76.4](barretenberg-v0.76.3...barretenberg-v0.76.4) (2025-02-13) ### Features * Aes decryption oracle ([#11907](#11907)) ([c4ce913](c4ce913)) * **avm:** Constrained ec_add ([#11525](#11525)) ([f8fe602](f8fe602)) * **avm:** Interaction testing ([#11947](#11947)) ([fc647eb](fc647eb)) * **avm:** Relation microbenchmarks ([#11974](#11974)) ([95b581d](95b581d)) ### Miscellaneous * **avm:** Tracegen interactions assertion ([#11972](#11972)) ([b865ccc](b865ccc)) * Unify webpack dev server versions ([#11965](#11965)) ([921d2cd](921d2cd)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-package: 0.76.4</summary> ## [0.76.4](AztecProtocol/aztec-packages@aztec-package-v0.76.3...aztec-package-v0.76.4) (2025-02-13) ### Miscellaneous * **aztec-package:** Synchronize aztec-packages versions </details> <details><summary>barretenberg.js: 0.76.4</summary> ## [0.76.4](AztecProtocol/aztec-packages@barretenberg.js-v0.76.3...barretenberg.js-v0.76.4) (2025-02-13) ### Miscellaneous * Unify webpack dev server versions ([#11965](AztecProtocol/aztec-packages#11965)) ([921d2cd](AztecProtocol/aztec-packages@921d2cd)) </details> <details><summary>aztec-packages: 0.76.4</summary> ## [0.76.4](AztecProtocol/aztec-packages@aztec-packages-v0.76.3...aztec-packages-v0.76.4) (2025-02-13) ### Features * `FunctionDefinition::as_typed_expr` (noir-lang/noir#7358) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Aes decryption oracle ([#11907](AztecProtocol/aztec-packages#11907)) ([c4ce913](AztecProtocol/aztec-packages@c4ce913)) * **avm:** Constrained ec_add ([#11525](AztecProtocol/aztec-packages#11525)) ([f8fe602](AztecProtocol/aztec-packages@f8fe602)) * **avm:** Interaction testing ([#11947](AztecProtocol/aztec-packages#11947)) ([fc647eb](AztecProtocol/aztec-packages@fc647eb)) * **avm:** Relation microbenchmarks ([#11974](AztecProtocol/aztec-packages#11974)) ([95b581d](AztecProtocol/aztec-packages@95b581d)) * **cli:** Add `--target-dir` option (noir-lang/noir#7350) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Indexed protocol contracts tree ([#11897](AztecProtocol/aztec-packages#11897)) ([96e84d4](AztecProtocol/aztec-packages@96e84d4)) * **performance:** Check sub operations against induction variables (noir-lang/noir#7356) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * **performance:** Use unchecked ops based upon known induction variables (noir-lang/noir#7344) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Small blob fixes/improvements ([#11686](AztecProtocol/aztec-packages#11686)) ([4eab9fc](AztecProtocol/aztec-packages@4eab9fc)) * Update fee model ([#11953](AztecProtocol/aztec-packages#11953)) ([2798d58](AztecProtocol/aztec-packages@2798d58)) * Use brillig optimized sha256 ([#11696](AztecProtocol/aztec-packages#11696)) ([438c905](AztecProtocol/aztec-packages@438c905)) ### Bug Fixes * Ci fixes ([#11973](AztecProtocol/aztec-packages#11973)) ([6386f4e](AztecProtocol/aztec-packages@6386f4e)) * **cli:** Only lock the packages selected in the workspace (noir-lang/noir#7345) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Deterministic generation of vkeys in ts ([#11951](AztecProtocol/aztec-packages#11951)) ([7901cac](AztecProtocol/aztec-packages@7901cac)) * Incorrect secondary file in LSP errors (noir-lang/noir#7347) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Lock git dependencies folder when resolving workspace (noir-lang/noir#7327) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Perform SSA constraints check on final SSA (noir-lang/noir#7334) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Remove deprecated artifacts ([#11979](AztecProtocol/aztec-packages#11979)) ([4f0dce7](AztecProtocol/aztec-packages@4f0dce7)) * Remove serial queue in broker facade ([#11956](AztecProtocol/aztec-packages#11956)) ([3485b52](AztecProtocol/aztec-packages@3485b52)) * **ssa:** Make the lookback feature opt-in (noir-lang/noir#7190) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) ### Miscellaneous * **avm:** Tracegen interactions assertion ([#11972](AztecProtocol/aztec-packages#11972)) ([b865ccc](AztecProtocol/aztec-packages@b865ccc)) * Avoid doing all brillig integer arithmetic on u128s (noir-lang/noir#7357) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Basic test for MSM in Noir to catch performance improvements and regressions (noir-lang/noir#7341) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Bump devnet boot node resources ([#11958](AztecProtocol/aztec-packages#11958)) ([bbcdefc](AztecProtocol/aztec-packages@bbcdefc)) * **ci:** Add Vecs and vecs to cspell (noir-lang/noir#7342) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Deprecate keccak256 (noir-lang/noir#7361) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Fix warnings (noir-lang/noir#7330) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Mark sha256 as deprecated from the stdlib (noir-lang/noir#7351) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Moving storage slot out of `NoteHeader` ([#11904](AztecProtocol/aztec-packages#11904)) ([8c4bb1c](AztecProtocol/aztec-packages@8c4bb1c)) * Normalize path displayed by `nargo new` (noir-lang/noir#7328) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Redo typo PR by osrm (noir-lang/noir#7238) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Release Noir(1.0.0-beta.2) (noir-lang/noir#6914) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Remove foreign calls array from Brillig VM constructor (noir-lang/noir#7337) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Remove misleading output from `nargo check` (noir-lang/noir#7329) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Remove some unused types and functions in the AST (noir-lang/noir#7339) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Remove unnecessary constants (noir-lang/noir#7326) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Revive browser test before killing it ([#11964](AztecProtocol/aztec-packages#11964)) ([cb47cc0](AztecProtocol/aztec-packages@cb47cc0)) * Split acirgen into multiple modules (noir-lang/noir#7310) ([5efdd57](AztecProtocol/aztec-packages@5efdd57)) * Unify webpack dev server versions ([#11965](AztecProtocol/aztec-packages#11965)) ([921d2cd](AztecProtocol/aztec-packages@921d2cd)) </details> <details><summary>barretenberg: 0.76.4</summary> ## [0.76.4](AztecProtocol/aztec-packages@barretenberg-v0.76.3...barretenberg-v0.76.4) (2025-02-13) ### Features * Aes decryption oracle ([#11907](AztecProtocol/aztec-packages#11907)) ([c4ce913](AztecProtocol/aztec-packages@c4ce913)) * **avm:** Constrained ec_add ([#11525](AztecProtocol/aztec-packages#11525)) ([f8fe602](AztecProtocol/aztec-packages@f8fe602)) * **avm:** Interaction testing ([#11947](AztecProtocol/aztec-packages#11947)) ([fc647eb](AztecProtocol/aztec-packages@fc647eb)) * **avm:** Relation microbenchmarks ([#11974](AztecProtocol/aztec-packages#11974)) ([95b581d](AztecProtocol/aztec-packages@95b581d)) ### Miscellaneous * **avm:** Tracegen interactions assertion ([#11972](AztecProtocol/aztec-packages#11972)) ([b865ccc](AztecProtocol/aztec-packages@b865ccc)) * Unify webpack dev server versions ([#11965](AztecProtocol/aztec-packages#11965)) ([921d2cd](AztecProtocol/aztec-packages@921d2cd)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

noir-projects/aztec-nr/aztec/src/encrypted_logs/log_assembly_strategies/default_aes128/note.nr

nventuro · 2025-02-17T17:51:47Z

noir-projects/noir-contracts/contracts/claim_contract/src/main.nr

@@ -28,7 +28,7 @@ pub contract Claim {
    }

    #[private]
-    fn claim(proof_note: UintNote, recipient: AztecAddress) {
+    fn claim(proof_note: UintNote, note_storage_slot: Field, recipient: AztecAddress) {


It seems like this hasn't been addressed? The commit is not even on the repo

noir-projects/noir-contracts/contracts/counter_contract/src/main.nr

benesjan mentioned this pull request Feb 11, 2025

fix: note hash collision #11869

Merged

benesjan added the e2e-all CI: Deprecated, use ci-full. Enable all master checks. label Feb 11, 2025

benesjan marked this pull request as ready for review February 11, 2025 14:48

benesjan changed the title ~~refactor: moving storage slot out of NoteHeader~~ refactor: moving storage slot out of NoteHeader Feb 11, 2025

benesjan commented Feb 11, 2025

View reviewed changes

noir-projects/aztec-nr/aztec/src/note/note_getter/mod.nr Show resolved Hide resolved

Base automatically changed from 02-10-fix_note_hash_collision to master February 11, 2025 17:08

benesjan added 4 commits February 12, 2025 07:52

refactor: moving storage slot out of NoteHeader

117f4c8

test fix

736035c

[NO CI] nuking obsolete test

4dc24a8

fix

67f94be

benesjan force-pushed the 02-11-refactor_moving_storage_slot_out_of_noteheader branch from 0507165 to 67f94be Compare February 12, 2025 09:15

benesjan commented Feb 12, 2025

View reviewed changes

noir-projects/aztec-nr/aztec/src/macros/mod.nr Show resolved Hide resolved

benesjan added 4 commits February 12, 2025 09:24

cleanup

e68977d

disclaimer

42e68cd

fix

6b7d22d

fix

f2926f0

benesjan commented Feb 12, 2025

View reviewed changes

noir-projects/aztec-nr/aztec/src/note/note_getter/test.nr Show resolved Hide resolved

benesjan commented Feb 12, 2025

View reviewed changes

noir-projects/noir-contracts/contracts/token_blacklist_contract/src/main.nr Show resolved Hide resolved

benesjan requested a review from iAmMichaelConnor February 12, 2025 10:25

benesjan removed the e2e-all CI: Deprecated, use ci-full. Enable all master checks. label Feb 12, 2025

migration notes

a3ca2df

benesjan mentioned this pull request Feb 12, 2025

refactor!: nuking NoteHeader #11942

Merged

iAmMichaelConnor approved these changes Feb 13, 2025

View reviewed changes

benesjan merged commit 8c4bb1c into master Feb 13, 2025
53 checks passed

benesjan deleted the 02-11-refactor_moving_storage_slot_out_of_noteheader branch February 13, 2025 10:00

AztecBot mentioned this pull request Feb 13, 2025

chore(master): Release 0.76.4 #11971

Merged

This was referenced Feb 14, 2025

refactor!: Notes implementing Packable<N> #12004

Merged

fix: #[aztec] macro warnings #12038

Merged

nventuro reviewed Feb 17, 2025

View reviewed changes

benesjan mentioned this pull request Feb 18, 2025

refactor: function macros cleanup #12066

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: moving storage slot out of `NoteHeader` #11904

refactor: moving storage slot out of `NoteHeader` #11904

benesjan commented Feb 11, 2025

benesjan commented Feb 11, 2025 •

edited

Loading

github-actions bot commented Feb 12, 2025 •

edited

Loading

iAmMichaelConnor left a comment

iAmMichaelConnor Feb 13, 2025

benesjan Feb 13, 2025

nventuro Feb 17, 2025

benesjan commented Feb 13, 2025

nventuro Feb 17, 2025

refactor: moving storage slot out of NoteHeader #11904

refactor: moving storage slot out of NoteHeader #11904

Conversation

benesjan commented Feb 11, 2025

benesjan commented Feb 11, 2025 • edited Loading

github-actions bot commented Feb 12, 2025 • edited Loading

Changes to public function bytecode sizes

🧾 Summary (100% most significant diffs)

iAmMichaelConnor left a comment

Choose a reason for hiding this comment

iAmMichaelConnor Feb 13, 2025

Choose a reason for hiding this comment

benesjan Feb 13, 2025

Choose a reason for hiding this comment

nventuro Feb 17, 2025

Choose a reason for hiding this comment

benesjan commented Feb 13, 2025

nventuro Feb 17, 2025

Choose a reason for hiding this comment

refactor: moving storage slot out of `NoteHeader` #11904

refactor: moving storage slot out of `NoteHeader` #11904

benesjan commented Feb 11, 2025 •

edited

Loading

github-actions bot commented Feb 12, 2025 •

edited

Loading