fix: complete legacy oracle mappings for all pinned contracts by benesjan · Pull Request #21404 · AztecProtocol/aztec-packages

benesjan · 2026-03-12T03:45:58Z

Summary

Expands legacy oracle aliases from 5 to 30 entries covering ALL oracles used by ALL pinned protocol contracts (AuthRegistry, ContractClassRegistry, ContractInstanceRegistry, FeeJuice, MultiCallEntrypoint, PublicChecks, SponsoredFPC)
Adds adapter functions for refactor!: cleaning up public call and tx phase related oracles #21209 signature changes (privateNotifyEnqueuedPublicFunctionCall and privateNotifySetPublicTeardownFunctionCall 4-param → validatePublicCalldata 1-param)
Adds legacy mappings for refactor!: cleaning up public call and tx phase related oracles #21209 renames (privateNotifySetMinRevertibleSideEffectCounter → notifyRevertiblePhaseStart, privateIsSideEffectCounterRevertible → inRevertiblePhase)
Replaces isActualProtocolContract (only checked 3 contracts) with isProtocolContract (checks all) for oracle version check skip

Test plan

PXE tests pass (39 suites, 424 tests)
Build compiles cleanly
Lint passes
Verified all old-style oracle names in committed artifacts are covered by legacy mappings

🤖 Generated with Claude Code

benesjan · 2026-03-12T04:04:21Z

fix: complete legacy oracle mappings for all pinned contracts #21404 👈 (View in Graphite)
merge-train/fairies

This stack of pull requests is managed by Graphite. Learn more about stacking.

yarn-project/protocol-contracts/src/protocol_contract.ts

yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts

yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts

nchamo

Great work!

yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts

…tracts

…rams PR #21176 added maxNotePackedLen and maxEventSerializedLen parameters to this oracle. Pinned protocol contracts call with the old 3-param signature, so the legacy mapping needs an adapter that supplies the frozen default values (8 and 10 respectively). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

yarn-project/pxe/src/contract_function_simulator/oracle/oracle.ts

yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts

nventuro · 2026-03-12T15:25:11Z

yarn-project/txe/src/oracle/txe_oracle_top_level_context.ts

  }

-  assertCompatibleOracleVersion(version: number): void {
+  assertCompatibleOracleVersion(version: number): Promise<void> {


Do we not need to adjust here as well? Is this because oracle wraps this?

The Oracle wrapping this should not affect this as the wrapping is one abstraction level up: from utilityAssertCompatibleOracleVersion to aztec_utl_assertCompatibleOracleVersion and aztec_utl_assertCompatibleOracleVersion then either calls this function here or the one in UtilityExecutionOracle.

I just thought that we would never use the stale pinned contracts in txe. Do you know if I am wrong here? If not sure I will dig into it.

Turns out we would actually used the committed artifacts:

but when I tried to port the change here I realized it's impossible because this is TXEOracleTopLevelContext and there, by definition, is not a contract address associated with the oracle execution.

So the special-cased version automatically gets used by contracts executed via txe as well.

nventuro

Great work

…pings

AztecBot · 2026-03-12T21:40:26Z

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

…racts (#21404) Cherry-pick of 1019f2a from next. Contains conflict markers.

…racts (#21404) Cherry-pick of 1019f2a with conflicts preserved for review.

BEGIN_COMMIT_OVERRIDE fix: skip oracle version check for pinned protocol contracts (#21349) fix: not reusing tags of partially reverted txs (#20817) feat: move storage_slot from partial commitment to completion hash (#21351) feat: offchain reception (#20893) fix: handle workspace members in needsRecompile crate collection (#21284) fix(aztec-nr): return Option from decode functions and fix event commitment capacity (#21264) fix: handle bad note lengths on compute_note_hash_and_nullifier (#21271) fix: address review feedback from PRs #21284 and #21237 (#21369) fix: claim contract & improve nullif docs (#21234) feat!: auto-enqueue public init nullifier for contracts with public functions (#20775) fix: search for all note nonces instead of just the one for the note index (#21438) fix: set anvilSlotsInAnEpoch in e2e_offchain_payment to prevent finalization race (#21452) fix: complete legacy oracle mappings for all pinned contracts (#21404) fix: correct inverted constrained encryption check in message delivery (#21399) feat!: improve L2ToL1MessageWitness API (#21231) END_COMMIT_OVERRIDE

…racts (#21404) Cherry-pick of 1019f2a with conflicts preserved for review.

benesjan marked this pull request as draft March 12, 2026 03:46

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from 9f6ae8f to c2e7e68 Compare March 12, 2026 04:04

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from c2e7e68 to 3d4d2c1 Compare March 12, 2026 04:08

benesjan marked this pull request as ready for review March 12, 2026 04:08

benesjan commented Mar 12, 2026

View reviewed changes

yarn-project/protocol-contracts/src/protocol_contract.ts Show resolved Hide resolved

benesjan commented Mar 12, 2026

View reviewed changes

yarn-project/pxe/src/contract_function_simulator/oracle/utility_execution_oracle.ts Outdated Show resolved Hide resolved

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from 8e2b928 to 4e2937a Compare March 12, 2026 05:56

benesjan changed the title ~~fix: complete legacy oracle name mappings for all pinned protocol contracts~~ fix: complete legacy oracle mappings for all pinned contracts Mar 12, 2026

benesjan requested a review from mverzilli March 12, 2026 08:25

mverzilli reviewed Mar 12, 2026

View reviewed changes

yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts Outdated Show resolved Hide resolved

mverzilli approved these changes Mar 12, 2026

View reviewed changes

nchamo approved these changes Mar 12, 2026

View reviewed changes

yarn-project/pxe/src/contract_function_simulator/oracle/interfaces.ts Outdated Show resolved Hide resolved

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from c9605a5 to a83fdaf Compare March 12, 2026 14:50

benesjan and others added 2 commits March 12, 2026 14:51

fix: complete legacy oracle name mappings for all pinned protocol con…

88b0560

…tracts

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from a83fdaf to d1f691a Compare March 12, 2026 14:51

benesjan requested a review from nventuro March 12, 2026 14:53

simplifying return type

3a72716

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from d1f691a to 3a72716 Compare March 12, 2026 14:55

nventuro reviewed Mar 12, 2026

View reviewed changes

benesjan marked this pull request as draft March 12, 2026 15:33

benesjan added 2 commits March 12, 2026 16:07

nico feedback commit 1

bea97d9

dropping special casing of SponsoredFPC

7193e0a

benesjan marked this pull request as ready for review March 12, 2026 16:58

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from 5767537 to a40cc0f Compare March 12, 2026 17:35

benesjan requested a review from nventuro March 12, 2026 17:35

relaxing version check

2d6f4ec

benesjan force-pushed the be/complete-legacy-oracle-mappings branch from a40cc0f to 2d6f4ec Compare March 12, 2026 17:37

nventuro approved these changes Mar 12, 2026

View reviewed changes

nventuro enabled auto-merge (squash) March 12, 2026 17:38

nventuro added the backport-to-v4-next label Mar 12, 2026

Merge branch 'merge-train/fairies' into be/complete-legacy-oracle-map…

d174a17

…pings

nventuro merged commit 1019f2a into merge-train/fairies Mar 12, 2026
11 checks passed

nventuro deleted the be/complete-legacy-oracle-mappings branch March 12, 2026 21:38

AztecBot mentioned this pull request Mar 12, 2026

feat: merge-train/fairies #21353

Merged

AztecBot pushed a commit that referenced this pull request Mar 12, 2026

cherry-pick: fix: complete legacy oracle mappings for all pinned cont…

61f7564

…racts (#21404) Cherry-pick of 1019f2a from next. Contains conflict markers.

AztecBot mentioned this pull request Mar 12, 2026

fix: complete legacy oracle mappings for all pinned contracts (backport #21404) #21455

Closed

AztecBot pushed a commit that referenced this pull request Mar 12, 2026

cherry-pick: fix: complete legacy oracle mappings for all pinned cont…

d12fc31

…racts (#21404) Cherry-pick of 1019f2a with conflicts preserved for review.

AztecBot mentioned this pull request Mar 12, 2026

fix: complete legacy oracle mappings for all pinned contracts (backport #21404) #21461

Closed

1 task

AztecBot pushed a commit that referenced this pull request Mar 13, 2026

cherry-pick: fix: complete legacy oracle mappings for all pinned cont…

f62def9

…racts (#21404) Cherry-pick of 1019f2a with conflicts preserved for review.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: complete legacy oracle mappings for all pinned contracts#21404

fix: complete legacy oracle mappings for all pinned contracts#21404
nventuro merged 7 commits intomerge-train/fairiesfrom
be/complete-legacy-oracle-mappings

benesjan commented Mar 12, 2026

Uh oh!

benesjan commented Mar 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nchamo left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nventuro Mar 12, 2026

Uh oh!

benesjan Mar 12, 2026

Uh oh!

benesjan Mar 12, 2026

Uh oh!

nventuro left a comment

Uh oh!

Uh oh!

AztecBot commented Mar 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

benesjan commented Mar 12, 2026

Summary

Test plan

Uh oh!

benesjan commented Mar 12, 2026

Uh oh!

Uh oh!

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!

Uh oh!

Uh oh!

Uh oh!

nventuro Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

benesjan Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

benesjan Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

nventuro left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AztecBot commented Mar 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants