fix(txe): align tagging strategy oracle with PXE by vezenovm · Pull Request #24561 · AztecProtocol/aztec-packages

vezenovm · 2026-07-06T20:50:04Z

Fixes F-700
Fixes F-765

makes TXE tagging secret strategy resolution mode-aware, matching PXE's resolveTaggingSecretStrategy hook request
supports configuring unconstrained and constrained delivery strategies independently in Noir tests
falls back to PXE's default strategy for unset modes, while preserving the no-hook path when no strategy is configured
adds coverage for resolved tagging strategy serialization/deserialization and per-mode TXE defaults
updates execution hook docs for the new Noir test helpers

Review cleanup for the unconstrained delivery coverage: - TestEnvironmentOptions now exposes a keyed with_tag_secret_strategy(mode, strategy) setter plus with_tag_secret_strategy_all_modes; a mode left unset falls back to the PXE default (non-interactive handshake), matching a hook that hardcodes the default for modes it does not customize. - Share DEFAULT_TAGGING_SECRET_STRATEGY between PXE and the TXE hook fallback. - Add compute_directional_app_secret so tests derive expected secrets instead of inlining the poseidon2 derivation. - Merge the per-mode next-index test wrappers into next_index_for_secret(secret, mode). - Drop dead locals, reuse toSingle in the oracle unit test, reword the test contract module doc.

…rained-delivery

Replaces the per-mode aztec_txe_setTaggingSecretStrategy oracle (called twice per TestEnvironment creation) with a single aztec_txe_setTaggingSecretStrategies call carrying an option per delivery mode, halving the setup round-trips every TXE test pays. Also updates the stale execution_hooks doc example to the current TestEnvironmentOptions API, refreshes the onchain delivery test module header to cover the unconstrained tests, and tidies minor conventions in the TXE tagging strategy code (JSDoc, stale comment, compound test assertion).

nchamo

Great work!

This is much more helpful than the original oracle way I had done it. Just left a few comments/questions

nchamo · 2026-07-08T15:55:42Z

+/// and the recipient is folded in for direction. Mirrors `AppTaggingSecret.computeDirectional` on the PXE side; tests
+/// use it to derive the secret they expect an [`arbitrary_secret`](TaggingSecretStrategy::arbitrary_secret) strategy
+/// to produce.
+pub fn compute_directional_app_secret(secret: EmbeddedCurvePoint, app: AztecAddress, recipient: AztecAddress) -> Field {


I like that we have this, but I have two questions:

Should it be here? Maybe it should be next to compute_app_siloed_shared_secret?

Does it need to be pub, or can it be pub(crate)?

I thought about moving it there too, but this is only used by tests so it felt better to leave in the test module.

Yeah it can be pub(crate).

Makes sense

Great

Actually we used this method in the new test in noir-projects/noir-contracts/contracts/test/onchain_delivery_test_contract/src/test.nr. I kept it as pub for now (I think another reason to leave it under the test module).

nchamo · 2026-07-08T16:33:19Z

 }

+#[test]
+unconstrained fn constrained_mode_arbitrary_secret_resolves_without_rejecting() {


I'm not sure what we are trying to test here. I mean, I know that we don't validate it in resolve_tagging_strategy because we do that later, in constrained world. But do we need to test it? What do we win from it?

I just wanted something to pin the boundary. TXE resolves the strategy, while constrained delivery rejects
unsound secrets later. I could rename to something like defers_constrained_arbitrary_secret_validation_to_delivery. Or do you think it is still unnecessary?

I personally think it's unnecessary. But if you want to keep it, that name helps

I decided to merge this into app_silos_an_arbitrary_secret_point where we just test both delivery modes and I left a comment about the deferred validation. There were no other tests for the constrained * arbitrary secret combo.

nchamo

Great work!

…rained-delivery

Fixes F-700 Fixes F-765 - makes TXE tagging secret strategy resolution mode-aware, matching PXE's resolveTaggingSecretStrategy hook request - supports configuring unconstrained and constrained delivery strategies independently in Noir tests - falls back to PXE's default strategy for unset modes, while preserving the no-hook path when no strategy is configured - adds coverage for resolved tagging strategy serialization/deserialization and per-mode TXE defaults - updates execution hook docs for the new Noir test helpers (cherry picked from commit 6dd1271)

…ecProtocol#24932) Forward-ports the **pxe / client / txe** slice of the v5-next → next backlog (work merged to `v5-next` after the ~2026-07-08 cut that reshaped `next`). ## Applied (clean cherry-picks, chronological) - fix: tweak depositToAztec gas config (AztecProtocol#24607) - refactor: cache Aztec node reads per execution (AztecProtocol#24630) - fix: prevent access to secrets not in scope (AztecProtocol#24616) - docs: fee readme improvements (AztecProtocol#24666) - fix(pxe): widen tracked sender tagging ranges with onchain discovery evidence (AztecProtocol#24655) - fix: tagging secrets not being scoped by sender (AztecProtocol#24772) ## Conflict resolutions (cherry-picked with `-x`, resolved against reshaped `next`) - fix(txe): align tagging strategy oracle with PXE (AztecProtocol#24561) — TXE oracle version bumped to 4.0 (breaking rename `setTaggingSecretStrategy` -> `setTaggingSecretStrategies`; `next` was at 3.0 with its own hash), interface hash recomputed on the merged registry. Migration note dropped: already on `next` under 5.0.0. - feat(pxe)!: Add AppTaggingSecret kinds to keys in tagging stores (AztecProtocol#24604) — `PXE_DATA_SCHEMA_VERSION` 12 -> 13 applies cleanly on `next`. Migration note dropped: already on `next` under 5.0.0. - feat: add batch is block in archive oracle (AztecProtocol#24634) — applied cleanly on top of AztecProtocol#24561; contract oracle version 30.6 -> 30.7, v5 interface hash matched the merged registry. - feat: getTxEffects oracle (AztecProtocol#24636) — applied cleanly. - ~~feat: preserve stores on schema version or rollup address change (AztecProtocol#24631)~~ — ported separately via AztecProtocol#24947 together with the rest of the sqlite/OPFS line - feat(txe): add option to authorize all utility call targets (AztecProtocol#24662) — additive on our 4.0 -> TXE oracle version 4.1 (was 3.0 -> 3.1 on v5), hash recomputed. - refactor(pxe): compute oracle interface hash from wire-structural mapping labels (AztecProtocol#24752) — TXE hash recomputed under the new wire-structural scheme; PXE hash from the pick matched. Verified locally: full `yarn build`, `check_oracle_version` + `check_txe_oracle_version`, TXE unit suite (21), pxe tagging/type-mapping/utility-oracle suites, and 29 targeted aztec-nr + onchain_delivery_test_contract TXE tests — all green. Part of the manual v5-next → next backlog sweep. ## Added after review - AztecProtocol#24627 fix(aztec.js): give waitForNode a bounded default timeout — missed by the initial sweep (merge-commit wrapper + non-`(#N)` leaf); genuinely absent from `next`.

test(txe): cover unconstrained delivery

6f5498f

vezenovm requested a review from nventuro as a code owner July 6, 2026 20:50

vezenovm added 16 commits July 6, 2026 17:15

test(txe): align tagging strategy oracle with PXE

0792034

fix(e2e): pass delivery mode to next_index_for_secret

1ed50ec

test(txe): tighten tagging strategy coverage

3bc9732

merge conflicts

026ac0f

Merge branch 'merge-train/fairies-v5' into mv/f-700-f-765-txe-unconst…

07ec09c

…rained-delivery

rename

2aa0cdb

additioanl default test

1daee1c

non-interactive in txe resolve tagging secret strat

3495051

merge w/ parent

f1fe236

remove deserde test

62c76d3

.'

7d64a26

reduce diff

da2d484

improve deserialization/serialization coverage

ad28bcf

cleanup

51d3d4a

vezenovm changed the title ~~test(txe): cover unconstrained delivery~~ fix(txe): align tagging strategy oracle with PXE Jul 7, 2026

vezenovm added 4 commits July 7, 2026 15:53

test fix

deb3c2f

test fix and docs

91933f0

chore(txe): update oracle interface hash

32bad6b

more test cleanup

0801ac4

vezenovm requested a review from nchamo July 7, 2026 20:20

nchamo reviewed Jul 8, 2026

View reviewed changes

vezenovm added 2 commits July 8, 2026 16:12

fix: clarify resolved tagging strategy helpers

6a1a6fd

merge tests

4595810

vezenovm requested a review from nchamo July 8, 2026 20:50

nchamo approved these changes Jul 8, 2026

View reviewed changes

Comment thread yarn-project/pxe/src/contract_function_simulator/noir-structs/resolved_tagging_strategy.ts Outdated

Comment thread noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr Outdated

Comment thread docs/docs-developers/docs/resources/migration_notes.md Outdated

pr review cleanup

a250dc7

Merge branch 'merge-train/fairies-v5' into mv/f-700-f-765-txe-unconst…

014b001

…rained-delivery

vezenovm enabled auto-merge (squash) July 8, 2026 22:11

vezenovm disabled auto-merge July 8, 2026 22:11

Merge branch 'merge-train/fairies-v5' into mv/f-700-f-765-txe-unconst…

be81765

…rained-delivery

vezenovm enabled auto-merge (squash) July 8, 2026 22:12

AztecBot added ci-wakeup-pr-after-merge and removed ci-wakeup-pr-after-merge labels Jul 8, 2026

vezenovm merged commit 6dd1271 into merge-train/fairies-v5 Jul 8, 2026
25 checks passed

vezenovm deleted the mv/f-700-f-765-txe-unconstrained-delivery branch July 8, 2026 22:39

AztecBot mentioned this pull request Jul 21, 2026

chore: port v5-next to next #24825

Open

PhilWindle added port-to-next Forward-port this merged PR into next and removed port-to-next Forward-port this merged PR into next labels Jul 21, 2026

PhilWindle pushed a commit that referenced this pull request Jul 21, 2026

fix(txe): align tagging strategy oracle with PXE (fwd-port #24561)

d7d947a

This was referenced Jul 21, 2026

chore(fwd-port): #24561 fix(txe): align tagging strategy oracle with PXE #24856

Closed

resolve conflicts: #24561 fix(txe): align tagging strategy oracle with PXE #24877

Closed

chore(port): forward-port v5-next pxe/client/txe backlog to next #24932

Merged

Uh oh!

Conversation

vezenovm commented Jul 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nchamo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nchamo Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

vezenovm Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

nchamo Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

vezenovm Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nchamo Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

vezenovm Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

nchamo Jul 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vezenovm Jul 8, 2026

Choose a reason for hiding this comment

Uh oh!

nchamo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

vezenovm commented Jul 6, 2026 •

edited

Loading

nchamo Jul 8, 2026 •

edited

Loading