chore: backport noirfmt.toml + nargo fmt (#22971) to v4-next#22977
Merged
benesjan merged 3 commits intoMay 6, 2026
Conversation
…ick #22971) Cherry-pick of PR #22971 onto v4-next-staging. This commit preserves conflict markers on 4 files where v4-next has drifted from the PR base: - nft_contract/src/types/nft_note.nr - protocol/auth_registry_contract/src/main.nr - protocol/contract_class_registry_contract/src/validate_bytecode.nr - note_hash_and_nullifier/.../test_note.nr Resolution and any necessary fmt re-runs follow in subsequent commits.
The 4 conflicted files have semantically different code on v4-next-staging than the PR base (merge-train/fairies): - nft_note.nr: v4-next does not yet use compute_note_hash directly - auth_registry/main.nr: v4-next has expanded macros (oracle/avm/...) - validate_bytecode.nr: v4-next is missing later test additions - note_hash_and_nullifier test_note.nr: same compute_note_hash difference Drops PR fmt changes for these 4 files; nargo fmt will be re-run in the next commit to produce consistent formatting against v4-next content.
Apply nargo fmt to the 4 files that retained v4-next-staging content during conflict resolution, plus auth_registry_interface/main.nr which benefits from the new max_width=120 setting.
AztecBot
added
ci-draft
benesjan
approved these changes
May 6, 2026
benesjan
added a commit
that referenced
this pull request
May 7, 2026
This PR accumulates backport commits and will be auto-merged overnight. Backports included: - #22977 - chore: backport noirfmt.toml + nargo fmt (#22971) to v4-next - #22958 - chore: backport pxe db schema compatibility test (#22872) to v4-next > Created manually because the auto-cherry-pick step failed for both source PRs (#22971, #22872) due to conflicts; the manual fix-up PRs bypassed the script that normally opens this PR. 🤖 This PR is normally managed automatically by the backport workflow.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #22971 to
backport-to-v4-next-staging.Auto cherry-pick failed on 5 files due to v4-next semantic drift from
merge-train/fairies. Resolved manually using the 3-commit backport pattern.Conflicts resolved
nft_contract/src/types/nft_note.nrcompute_note_hashdirect usage)protocol/auth_registry_contract/src/main.nrprotocol/contract_class_registry_contract/src/validate_bytecode.nrtest/note_hash_and_nullifier/.../test_note.nrposeidon2_hash_with_separatordirectly)test/test_log_contract/src/test/tx_effects.nrThe PR is fmt-only, so wherever v4-next has different content, that content is preserved and
nargo fmtis re-run with the newnoirfmt.tomlso the result is internally consistent.Commits (preserved per backport rules)
chore: add noirfmt.toml to noir-contracts and run nargo fmt (cherry-pick #22971)— cherry-pick AS-IS with conflict markers (does not compile by design)fix: resolve cherry-pick conflicts by keeping v4-next-staging contentchore: re-run nargo fmt with new noirfmt.toml configVerification
nargo fmt --checkclean innoir-projects/noir-contracts/.rej, or.origfiles remainDetailed analysis: https://gist.github.com/AztecBot/dabe6018f40af2369cec56de821510f3
ClaudeBox log: https://claudebox.work/s/a0fd76c8e05d8ddb?run=1