Skip to content

feat(aztec-nr)!: app-silo getSharedSecret oracle (#22020) [v4-next backport]#22025

Merged
nventuro merged 6 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-22020-v4-next
Mar 25, 2026
Merged

feat(aztec-nr)!: app-silo getSharedSecret oracle (#22020) [v4-next backport]#22025
nventuro merged 6 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-22020-v4-next

Conversation

@AztecBot

Copy link
Copy Markdown
Collaborator

Summary

Backport of #22020 to v4-next.

The getSharedSecret oracle now app-silos the shared secret by hashing it with the calling contract's address, preventing cross-contract decryption attacks. Key derivation uses new domain separators (DOM_SEP__APP_SILOED_ECDH_SHARED_SECRET, DOM_SEP__ECDH_SUBKEY, DOM_SEP__ECDH_FIELD_MASK).

Cherry-pick conflicts

Only one conflict in yarn-project/pxe/src/oracle_version.ts — the oracle interface hash differs between next and v4-next because the Oracle class has diverged. Regenerated the hash for the v4-next Oracle interface.

Commits

  1. Cherry-pick with conflicts — raw cherry-pick of 1c74bf6 with conflict markers
  2. Conflict resolution — resolved hash conflict in oracle_version.ts
  3. Build fix — regenerated oracle interface hash for v4-next (09ca7d52...)

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

nchamo and others added 3 commits March 25, 2026 20:39
Cherry-pick of 1c74bf6 with conflicts in yarn-project/pxe/src/oracle_version.ts
The oracle interface hash differs between next and v4-next due to different
Oracle class signatures. Regenerated the hash for v4-next after cherry-pick.
@AztecBot AztecBot added ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. labels Mar 25, 2026
@nchamo nchamo marked this pull request as ready for review March 25, 2026 20:51
@nchamo nchamo enabled auto-merge March 25, 2026 20:51
The cherry-pick of PR #22020 modified domain separators in constants.nr
but the generated files (constants.gen.ts, aztec_constants.hpp,
constants_gen.pil) were not regenerated. Run remake-constants to sync.
@nchamo nchamo disabled auto-merge March 25, 2026 21:23
@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/12dc3b6f1c535db5�12dc3b6f1c535db58;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts "updates L1 to L2 messages changed due to an L1 reorg" (67s) (code: 0) group:e2e-p2p-epoch-flakes
\033FLAKED\033 (8;;http://ci.aztec-labs.com/9e590ac86476a5a7�9e590ac86476a5a78;;�):  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" (211s) (code: 0) group:e2e-p2p-epoch-flakes

@nventuro nventuro merged commit 13b53c2 into backport-to-v4-next-staging Mar 25, 2026
9 checks passed
@nventuro nventuro deleted the claudebox/backport-22020-v4-next branch March 25, 2026 22:26
AztecBot added a commit that referenced this pull request Mar 25, 2026
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.
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.

3 participants