feat: allow setting additional scopes in nr tests by nventuro · Pull Request #22968 · AztecProtocol/aztec-packages

nventuro · 2026-05-05T18:29:59Z

Note that this is a TXE oracle interface breaking change - in order to use this feature users will need to upgrade both the aztec cli (to use the new aztec test) and aztec-nr (to use the new functions). We're not really tracking TXE oracle versioning anywhere, I'll work on a small feature so that users get a better error when they run into this.

…t-additional-scopes-in

nchamo

I like the change, and it's one we need. But I would be more comfortable if we had a way to tell users "hey, this contract expects a different TXE version, please re-compile". Or we should at least be working on that right after this change, and wait to backport this PR

nchamo · 2026-05-05T18:34:08Z


-pub use contract_self_private::PrivateUtilityCalls;
 pub use contract_self_private::ContractSelfPrivate;
+pub use contract_self_private::PrivateUtilityCalls;


Was this the formatter? If so, then I'm curious about why it didn't do the same for me

Not me, yea

nchamo · 2026-05-05T18:37:12Z

+    pub unconstrained fn view_private_opts<let M: u32, let N: u32, let S: u32, T>(
        _self: Self,
        from: AztecAddress,
+        opts: ViewPrivateOptions<S>,


Why here and not as the last param? "Options" params usually go last, right?

That's the case in JS because that naturally leads into the options being undefined if dropped entirely, but it doesn't need to be that way here. I was mirroring private_context_opts, where the options are second to last, with the last param being the 'meaty' action. In that case that's better done that way because the lambda is long and you want for it to be clearly separated, but here I don't really have any strong thoughts. It makes sense to me for the options to live alongisde the rest of the config (from etc), before the actual call.

It's completely personal, but I prefer opts to be last. So the first thing I read is the actual call, the options are less important to me

nchamo · 2026-05-05T18:37:53Z


-    // We create a LogRetrievalRequest for each PendingPartialNote in the EphemeralArray. Because we need the indices in
+    // We create a LogRetrievalRequest for each PendingPartialNote in the EphemeralArray. Because we need the indices
+    // in


Oh, I see you have quite a bit of formatting changes (here and other files). Can you fix them so that we don't have lines with only one word?

nchamo · 2026-05-05T18:44:05Z

-        from: AztecAddress,
-        call: PublicCall<M, N, T>,
-    ) -> T
+    pub unconstrained fn call_public_incognito<let M: u32, let N: u32, T>(_self: Self, call: PublicCall<M, N, T>) -> T


This is a breaking change. Should we add migration notes for it?

nchamo · 2026-05-05T18:56:50Z

+    pub unconstrained fn call_private_opts<let M: u32, let N: u32, let S: u32, T>(
        _self: Self,
        from: AztecAddress,
+        opts: CallPrivateOptions<S>,


Why here and not as the last param? "Options" params usually go last, right?

nchamo · 2026-05-05T19:06:39Z

    const blockNumber = await this.getNextBlockNumber();

-    const callContext = new CallContext(from, targetContractAddress, functionSelector, isStaticCall);
+    const msgSender = from ?? AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS);


We are doing AztecAddress.fromBigInt(NULL_MSG_SENDER_CONTRACT_ADDRESS) in quite a few places and files. Would it make sense to have it in only one place and simply use it as an address?

Not a bad idea.

- Fix orphaned single-word comment continuation lines in processing/mod.nr, map.nr, state_vars/mod.nr, state_variable.nr - Add migration notes for call_public_incognito and view_public_incognito breaking changes - Extract AztecAddress.NULL_MSG_SENDER static constant to @aztec/stdlib/aztec-address

…-616-feature-txe-support-additional-scopes-in # Conflicts: # docs/docs-developers/docs/resources/migration_notes.md # noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr # noir-projects/noir-contracts/contracts/protocol/public_checks_contract/src/test.nr # noir-projects/noir-contracts/contracts/test/scope_test_contract/src/main.nr

…uced line wrapping

…cles.nr

AztecBot · 2026-05-07T18:07:38Z

❌ Failed to cherry-pick to v4-next due to conflicts. (🤖) View backport run.

…r tests' (with conflicts) Conflicted files (preserved as-is for review): - docs/docs-developers/docs/resources/migration_notes.md - noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr - yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts - yarn-project/stdlib/src/aztec-address/index.ts

After rebasing onto backport-to-v4-next-staging (which now includes the backport of #22889 'feat(txe): add tx private logs to tx side effects oracle'), only three files still need cross-PR-drift handling: - docs/docs-developers/docs/resources/migration_notes.md: keep just the two new TBD entries from #22968 (TXE `call_public_incognito` no longer takes `from`; `view_public_incognito` deprecated). The DeployMethod and aztec-up bundled-binary entries that the cherry-pick brought along belong to other PRs not yet backported (e.g. #22985). - yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts: keep the v4-next-staging-specific tree-height imports (L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT) which are still in use here — #21577 removed them on next but hasn't been backported. Drop only NULL_MSG_SENDER_CONTRACT_ADDRESS (replaced by AztecAddress.NULL_MSG_SENDER). - yarn-project/stdlib/src/aztec-address/index.ts: keep both the existing eslint-disable comment and the new NULL_MSG_SENDER_CONTRACT_ADDRESS import. - noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr: with #22889 backported, the imports now match next exactly — just drop NULL_MSG_SENDER_CONTRACT_ADDRESS.

…2968) to v4-next (#23057) Backport of #22968 ("feat: allow setting additional scopes in nr tests") to `backport-to-v4-next-staging`. Rebased on top of latest staging (which now includes the backport of #22889 — `feat(txe): add tx private logs to tx side effects oracle`). All conflicts handled in a single resolution commit. ## What The PR adds `call_private_opts` / `view_private_opts` (with `CallPrivateOptions` / `ViewPrivateOptions`) to `TestEnvironment`, letting tests grant access to additional account scopes when calling private functions. It also reshapes the TXE oracle ABI for `private_call_new_flow` / `public_call_new_flow` to take an `Option<AztecAddress>` for `from`, removes `call_public_incognito`'s ignored `from` parameter, deprecates `view_public_incognito`, and introduces `AztecAddress.NULL_MSG_SENDER` on the TS side. ## Conflicts handled (single commit) After rebasing, four files still drifted vs `next`: - **`noir-projects/aztec-nr/aztec/src/test/helpers/txe_oracles.nr`** — with #22889 now on staging, the imports here match `next` exactly aside from `NULL_MSG_SENDER_CONTRACT_ADDRESS`. Just drop that one symbol (the PR removes its only use). - **`docs/docs-developers/docs/resources/migration_notes.md`** — keep only the two new TBD entries from #22968. The DeployMethod and `aztec-up` bundled-binary entries that the cherry-pick brought along belong to other PRs not yet backported (e.g. #22985); leave them out so those backports add them in their own PRs. - **`yarn-project/pxe/src/contract_function_simulator/oracle/private_execution.test.ts`** — drop `NULL_MSG_SENDER_CONTRACT_ADDRESS` (replaced by `AztecAddress.NULL_MSG_SENDER`). Keep `L1_TO_L2_MSG_TREE_HEIGHT`, `NOTE_HASH_TREE_HEIGHT`, `PUBLIC_DATA_TREE_HEIGHT` — they're still in use on this branch since #21577 hasn't been backported. - **`yarn-project/stdlib/src/aztec-address/index.ts`** — keep both the existing `eslint-disable @typescript-eslint/no-unsafe-declaration-merging` comment and the new `NULL_MSG_SENDER_CONTRACT_ADDRESS` import. ## Verification - `nargo check` passes for both Noir contracts the PR touches (`scope_test_contract`, `public_checks_contract`). - No conflict markers remain. Original PR: #22968

feat: allow setting additional scopes in nr tests

02b3697

nventuro requested a review from nchamo May 5, 2026 18:29

Merge branch 'merge-train/fairies' into nico/f-616-feature-txe-suppor…

e02590b

…t-additional-scopes-in

nchamo reviewed May 5, 2026

View reviewed changes

Nico Chamo added 4 commits May 7, 2026 17:24

fix: remove duplicate migration note entry

7b0ee1f

fix: restore state_vars/mod.nr to base version, removing merge-introd…

92f92f2

…uced line wrapping

nchamo self-requested a review May 7, 2026 17:34

fix: remove unused NULL_MSG_SENDER_CONTRACT_ADDRESS import in txe_ora…

87e3f67

…cles.nr

nchamo approved these changes May 7, 2026

View reviewed changes

nchamo merged commit 45f7a03 into merge-train/fairies May 7, 2026
14 checks passed

nchamo deleted the nico/f-616-feature-txe-support-additional-scopes-in branch May 7, 2026 18:05

nchamo added the backport-to-v4-next label May 7, 2026

This was referenced May 7, 2026

chore: backport feat: allow setting additional scopes in nr tests (#22968) to v4-next #23057

Merged

feat: merge-train/fairies #23055

Merged

Conversation

nventuro commented May 5, 2026

Uh oh!

nchamo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AztecBot commented May 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants