Skip to content

refactor(aztec-nr): use logging wrappers in compute_note_hash_and_nullifier#21897

Merged
nchamo merged 4 commits intomerge-train/fairiesfrom
refactor/use-aztecnr-logging-wrappers
Mar 24, 2026
Merged

refactor(aztec-nr): use logging wrappers in compute_note_hash_and_nullifier#21897
nchamo merged 4 commits intomerge-train/fairiesfrom
refactor/use-aztecnr-logging-wrappers

Conversation

@nchamo
Copy link
Copy Markdown
Contributor

@nchamo nchamo commented Mar 23, 2026

Problem

The crate::logging wrappers (aztecnr_warn_log_format, etc.) return Quoted code containing crate::protocol::logging::... paths. This works when expanded inline within aztec-nr code, but fails when the Quoted is spliced into macro-generated code injected into contracts, where crate:: resolves to the contract's crate instead of aztec-nr.

Fix

  • logging.nr: All 14 logging wrappers now resolve their function paths at comptime via Expr.resolve(), producing a TypedExpr that carries the fully-resolved reference. This works in both contexts: inline within aztec-nr and in macro-generated contract code.
  • compute_note_hash_and_nullifier.nr: Replace 4 direct aztec::protocol::logging::warn_log_format(...) calls with the crate::logging wrappers, matching the codebase convention. Also reorders format placeholders to sequential {0}, {1}, {2} and fixes a pre-existing typo.

Fixes F-437

@nchamo nchamo requested a review from nventuro as a code owner March 23, 2026 13:35
@nchamo nchamo self-assigned this Mar 23, 2026
@nchamo nchamo requested a review from benesjan March 23, 2026 22:04
@nchamo nchamo requested a review from benesjan March 24, 2026 12:26
Copy link
Copy Markdown
Contributor

@benesjan benesjan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nchamo nchamo merged commit 23eaeed into merge-train/fairies Mar 24, 2026
18 checks passed
@nchamo nchamo deleted the refactor/use-aztecnr-logging-wrappers branch March 24, 2026 13:01
@AztecBot
Copy link
Copy Markdown
Collaborator

✅ Successfully backported to backport-to-v4-next-staging #21899.

AztecBot added a commit that referenced this pull request Mar 25, 2026
BEGIN_COMMIT_OVERRIDE
fix(aztec-up): narrow PATH cleanup regex to avoid removing user PATH
entries (#21828)
fix: consolidate blob source test into single summary log with supernode
detection (#21719)
fix: use anchor block on getL1ToL2MsgWitness (#21872)
fix: make sure queries are not made ahead of the anchor block (#21874)
chore(docs): backport docs infrastructure changes to v4 (#21437)
chore: backport PR #21836 (fix: explicitly handle initial block case for
getBlockHashMembershipWitness) to v4-next (#21891)
chore: backport PR #21813 (fix(aztec-up): strip leading v prefix from
version strings) to v4-next (#21912)
docs: document defi-wonderland immutable macro (#21764)
fix: pin typescript and harden lockfile check in docs examples CI (v4
backport) (#21914)
docs: expand circuit profiling guide and document kernel gate cost
overhead (#21770)
feat: cli-wallet (#21757)
chore: sync backport staging with v4-next HEAD (#21931)
fix: bot gas estimations (backport #21945) (#21947)
refactor(aztec-nr): use logging wrappers in
compute_note_hash_and_nullifier (#21897)
fix: backport v4 next staging (#21934)
fix: make PXE#getSyncedBlockHeader a concurrency=1 job to prevent IDB tx
liveness issues (#21944)
feat: add error page mapping for incompatible oracles (#21943)
fix(aztec-up): validate semver in uninstall to prevent path traversal
(#21892)
chore: merge v4-next into backport staging (fix ancestry) (#21954)
fix(aztec-up): add truncation protection to install scripts (#21896)
fix: noir format in compute_note_hash_and_nullifier.nr (#21956)
fix(stdlib): decode `EthAddress`, `FunctionSelector` and wrapped field
structs in `AbiDecoder` (#21926)
chore: update noir to nightly-2026-02-12-patch.1 (#21960)
fix: ensure empty docs examples does not populate yarn lock backport
(#21963)
fix: docs examples does not build on simple bootstrap backport (#21964)
fix: add rc/testnet version detection to API reference pages (#21966)
docs: document EmbeddedWallet automatic gas estimation and private
authwits (#21790)
fix(pxe): robust error handling in message processing (backport #21093)
(#21981)
chore: manually recreate backport (#21969)
chore: (A-779) load all accounts before calling
LogService.#getSecretsForSenders (#21923)
END_COMMIT_OVERRIDE
github-merge-queue Bot pushed a commit that referenced this pull request Mar 25, 2026
BEGIN_COMMIT_OVERRIDE
fix: interactions clean up (#21933)
fix(stdlib): decode `EthAddress`, `FunctionSelector` and wrapped field
structs in `AbiDecoder` (#21926)
fix: bot gas estimations (#21945)
refactor(aztec-nr): use logging wrappers in
compute_note_hash_and_nullifier (#21897)
feat: add error page mapping for incompatible oracles (#21943)
fix(pxe): robust error handling in message processing (#21093)
fix: make PXE#getSyncedBlockHeader a concurrency=1 job to prevent IDB tx
liveness issues (#21944)
fix(aztec-up): validate semver in uninstall to prevent path traversal
(#21892)
fix(aztec-up): add truncation protection to install scripts (#21896)
feat!: scoped capsules (#21533)
END_COMMIT_OVERRIDE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants