Skip to content

fix(aztec-nr): backport warn on unknown note type id to v4-next#21525

Merged
nchamo merged 3 commits intobackport-to-v4-next-stagingfrom
claudebox/backport-21491-note-hash-nullifier-v4
Mar 14, 2026
Merged

fix(aztec-nr): backport warn on unknown note type id to v4-next#21525
nchamo merged 3 commits intobackport-to-v4-next-stagingfrom
claudebox/backport-21491-note-hash-nullifier-v4

Conversation

@AztecBot
Copy link
Collaborator

Summary

Backport of #21491 to v4-next.

Adds a warn_log_format call in the macro-generated _compute_note_hash_and_nullifier function when an unknown note_type_id is encountered, instead of silently returning None.

Conflict Resolution

The automatic cherry-pick failed because the note_hash_and_nullifier test contract (added in #21491) does not exist on v4-next. The test file was dropped since the parent contract is not present on this branch. The core fix in aztec.nr applied cleanly.

Commits

  1. Cherry-pick with conflicts — original cherry-pick of 6d46778 showing the modify/delete conflict on the test file
  2. Conflict resolution — dropped the test file (contract doesn't exist on v4-next)
  3. Build fixes — none needed, warn_log_format is available via aztec::protocol::logging

ClaudeBox log: https://claudebox.work/s/adb5fe7dd704eb26?run=1

@AztecBot AztecBot added the claudebox Owned by claudebox. it can push to this PR. label Mar 13, 2026
@AztecBot AztecBot force-pushed the claudebox/backport-21491-note-hash-nullifier-v4 branch 2 times, most recently from 83d080f to dd85253 Compare March 14, 2026 16:29
nchamo and others added 3 commits March 14, 2026 16:49
The note_hash_and_nullifier test contract does not exist on this branch, so the test
file addition is dropped. The core fix (warn_log_format in aztec.nr) applied cleanly.
warn_log_format is available via aztec::protocol::logging. No adaptations required.
@AztecBot AztecBot force-pushed the claudebox/backport-21491-note-hash-nullifier-v4 branch from dd85253 to dc8f29b Compare March 14, 2026 16:49
@nchamo nchamo marked this pull request as ready for review March 14, 2026 16:50
@nchamo nchamo requested a review from nventuro as a code owner March 14, 2026 16:50
@nchamo nchamo enabled auto-merge (squash) March 14, 2026 16:51
@nchamo nchamo merged commit b7d0bbb into backport-to-v4-next-staging Mar 14, 2026
13 checks passed
@nchamo nchamo deleted the claudebox/backport-21491-note-hash-nullifier-v4 branch March 14, 2026 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants