Skip to content

refactor!: more consistent oracle names (#22018) [v4-next backport]#22022

Merged
mverzilli merged 6 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-22018-oracle-names
Mar 25, 2026
Merged

refactor!: more consistent oracle names (#22018) [v4-next backport]#22022
mverzilli merged 6 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-22018-oracle-names

Conversation

@AztecBot

Copy link
Copy Markdown
Collaborator

Summary

Backport of #22018 to v4-next.

Cherry-pick of b0090ff with conflict resolution.

Conflicts resolved

  • noir-projects/aztec-nr/aztec/src/oracle/message_processing.nr — oracle name aztec_utl_resolveMessageContextsaztec_utl_getMessageContextsByTxHash (v4-next had a different intermediate name)
  • yarn-project/pxe/src/contract_function_simulator/oracle/oracle.ts — same oracle method rename
  • yarn-project/txe/src/rpc_translator.ts — same oracle method rename
  • yarn-project/pxe/src/oracle_version.ts — hash conflict due to different oracle interfaces; recomputed hash and bumped ORACLE_VERSION to 21

Commit structure

  1. Cherry-pick with conflict markers preserved
  2. Conflict resolution (oracle name renames only)
  3. Build fix (ORACLE_INTERFACE_HASH + ORACLE_VERSION bump)

ClaudeBox log: https://claudebox.work/s/790257534b032144?run=1

mverzilli and others added 3 commits March 25, 2026 19:39
Cherry-pick of b0090ff with conflict markers preserved for review.
Resolved conflicts in oracle names:
- aztec_utl_resolveMessageContexts → aztec_utl_getMessageContextsByTxHash
- Bumped ORACLE_VERSION to 21 (both Noir and TS)
- ORACLE_INTERFACE_HASH placeholder to be computed
Updated hash to match new oracle interface after rename.
Bumped ORACLE_VERSION in both Noir and TypeScript.
@AztecBot AztecBot added ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. labels Mar 25, 2026
@mverzilli mverzilli marked this pull request as ready for review March 25, 2026 21:56
@mverzilli mverzilli requested a review from nventuro as a code owner March 25, 2026 21:56
The reorg simulation test is intermittently failing. Added to
flake patterns with Martin as owner.
@mverzilli mverzilli enabled auto-merge March 25, 2026 22:41
Merged latest target branch which includes PR #22025 (app-silo getSharedSecret).
Combined oracle interface now includes both renames and new oracle.
Recomputed ORACLE_INTERFACE_HASH and bumped ORACLE_VERSION to 22.
@AztecBot

Copy link
Copy Markdown
Collaborator Author

Flakey Tests

🤖 says: This CI run detected 2 tests that failed, but were tolerated due to a .test_patterns.yml entry.

\033FLAKED\033 (8;;http://ci.aztec-labs.com/5c88d0c499c5cdaf�5c88d0c499c5cdaf8;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_offchain_payment.test.ts (91s) (code: 0)
\033FLAKED\033 (8;;http://ci.aztec-labs.com/c16e605709333d10�c16e605709333d108;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_epochs/epochs_proof_fails.parallel.test.ts "does not allow submitting proof after epoch end" (229s) (code: 0) group:e2e-p2p-epoch-flakes

@mverzilli mverzilli merged commit df868e6 into backport-to-v4-next-staging Mar 25, 2026
9 checks passed
@mverzilli mverzilli deleted the claudebox/backport-22018-oracle-names branch March 25, 2026 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants