feat(aztec-nr): wire handshake secret discovery into contract sync by nchamo · Pull Request #23938 · AztecProtocol/aztec-packages

nchamo · 2026-06-08T16:48:58Z

Summary

Moves DiscoveredHandshake, HandshakePage, and MAX_HANDSHAKES_PER_PAGE from the HandshakeRegistry contract into aztec::messages::delivery::handshake so aztec-nr owns the shared types and the contract imports them.
Implements get_handshake_secrets which paginates through the HandshakeRegistry's get_handshakes utility function, derives app-siloed tagging secrets via get_shared_secrets, and returns them as ProvidedSecret entries for log discovery during do_sync_state.
Auto-authorizes the HandshakeRegistry's get_handshakes call in PXE (gated on both target address and function selector) and preloads its artifact in all PXE entrypoints.
Changes get_shared_secrets to accept and return EphemeralArray directly, removing the BoundedVec conversion layer.

Fixes F-588

…elivery-tagged-log-retrieval-in-default-2

…ets frame

…elivery-tagged-log-retrieval-in-default-2

vezenovm · 2026-06-09T21:36:54Z

-     10: generate_contract_library_method_compute_note_hash
+     11: generate_contract_library_method_compute_note_hash
             at <repo>/noir-projects/aztec-nr/aztec/src/macros/aztec/compute_note_hash_and_nullifier.nr:<line>:<col>
-     11: generate_note_type_impl


not for this PR, but looks like this is extra noise that can be removed with <line>

oh oops I cut it off. With <line>.

EDIT: TIL turns out if you don't put <word here> in a code snippet (e.g., ``) it won't display in the comment.

vezenovm · 2026-06-09T21:59:07Z

  }
  const protocolContractsProvider = new BundledProtocolContractsProvider();
  const preloadedContractsProvider = options.preloadedContractsProvider ?? {
-    getPreloadedContracts: async () => [await getStandardMultiCallEntrypoint()],


~~For mutli call entry point I think this was fine but~~ for the handshake registry which is called on every contract we would override the previous preloadedContractsProvider right? Do we allow custom preloaded contracts in PXE? Should we add a unit test for custom preloaded contract with the handshake discovery?

You are right!

Talked with Grego, decided to do this: c1c5040

Ok, just discussed it again. Will change it up a bit and request your re-review when finished

Ok, the idea will be:

If the user specifies a provider, then we will honor it. We won't force-add any contracts, because they might not need it and we want to keep the loading to be as quick as possible

If the user doesn't specify a provider, our entry points will add all 3 standard contracts (multicall, auth registry, handshake registry)

On PXE, if no provider is set, we will add the ones that aztec-nr needs: auth registry + handshake registry

I'll mark you as reviewer when the CI passes, since I'm fighting against limits

…r Node.js 24

…elivery-tagged-log-retrieval-in-default-2

nchamo · 2026-06-10T17:10:59Z


 export async function getAuthRegistryArtifact(): Promise<ContractArtifact> {
  if (!standardContractArtifact) {
-    // Cannot assert this import as it's incompatible with bundlers like vite


This was the case when this was introduced (2025). Not anymore

…lues

vezenovm · 2026-06-10T20:34:42Z

-        );
+      // The HandshakeRegistry is called during every contract's sync to discover handshake secrets.
+      // It is a standard contract that only reads its own state, so it is always authorized.
+      const isHandshakeRegistryRead =


On second thought, do we think this bypass is too broad? The state is owned by the registry but it is scoped to the recipient. Thus a malicious utility can read registry state for the scoped user. Any regular utility call can call HandshakeRegistry.get_handshakes and learn handshake metadata. Do we want to try and add some info as to whether we are executing a contract sync here? Only then bypass the wallet hook.

Otherwise, I think this escapes where we intend for handshake info to live. Handshakes are supposed to be used as discovery input for the contract/PXE and to help find logs for that contract. With this bypass, a contract can call get_handshakes and return the info to the dapp without the wallet explicitly authorizing it.

Discussed offline, we are ok with this being exposed to apps. Just added some extra documentation here #24018

The registry source changes from #23938 shift the standard registry's artifact hash, class id, and address. Regenerates the standard-contract data and address pins and repacks the registry entry in pinned-standard-contracts.tar.gz from the merged build.

feat(aztec-nr): wire handshake secret discovery into contract sync

5fef66a

nchamo requested a review from nventuro as a code owner June 8, 2026 16:48

nchamo self-assigned this Jun 8, 2026

nchamo commented Jun 8, 2026

View reviewed changes

Comment thread noir-projects/aztec-nr/aztec/src/messages/delivery/handshake.nr

nchamo added 13 commits June 8, 2026 13:52

chore(aztec-nr): remove dead_code allow on ProvidedSecret

bcca6af

fix(aztec-nr): resolve broken doc links in handshake.nr

1bab207

chore(txe): bump split chunk size limit for HandshakeRegistry

d972444

refactor(aztec-nr): split do_sync_state to break address cycle

26a34f2

fix(end-to-end): publish HandshakeRegistry in common e2e setup

5e302ba

fix(aztec-nr): use struct notation for AztecAddress in selector

4326d74

Merge branch 'merge-train/fairies-v5' into nchamo/f-588-constrained-d…

9346f38

…elivery-tagged-log-retrieval-in-default-2

fix(docs): remove broken standard-contracts link in debugging.md

d60f406

fix(noir-projects): update contract snapshot for sync_state_with_secr…

dad3a20

…ets frame

fix(pxe): register HandshakeRegistry in private execution tests

4582042

chore(pxe): format private execution test

c57a73e

fix(pxe): skip instance lookup for HandshakeRegistry utility calls

679f46a

fix(txe): preload HandshakeRegistry in shared contract store

6418f4f

nchamo added the ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure label Jun 8, 2026

nchamo mentioned this pull request Jun 9, 2026

fix(pxe): prevent contract sync deadlock on nested syncs #23951

Merged

Merge branch 'merge-train/fairies-v5' into nchamo/f-588-constrained-d…

efafea2

…elivery-tagged-log-retrieval-in-default-2

nchamo requested a review from vezenovm June 9, 2026 11:19

vezenovm reviewed Jun 9, 2026

View reviewed changes

nchamo added 6 commits June 10, 2026 11:19

refactor(pxe): register handshake registry in PXE.create

c1c5040

fix(pxe): use lazy import for handshake registry to avoid bundle bloat

120b230

refactor(txe): lazy-load handshake registry to reduce chunk size

b602d4d

refactor(pxe): set preloaded contract defaults at each layer

e078993

fix(standard-contracts): add import attribute to lazy JSON imports fo…

8eca57f

…r Node.js 24

Merge branch 'merge-train/fairies-v5' into nchamo/f-588-constrained-d…

6099d59

…elivery-tagged-log-retrieval-in-default-2

nchamo commented Jun 10, 2026

View reviewed changes

refactor(aztec-nr): use OnchainDeliveryMode throughout handshake types

1a0e300

nchamo added 2 commits June 10, 2026 14:59

chore(aztec-nr): regenerate standard contract addresses

d6858d6

chore(aztec-nr): revert standard contract addresses to base branch va…

0bfce77

…lues

nchamo requested a review from vezenovm June 10, 2026 18:42

chore: retrigger CI

78068e0

vezenovm approved these changes Jun 10, 2026

View reviewed changes

Comment thread noir-projects/aztec-nr/aztec/src/messages/delivery/builder.nr

vezenovm reviewed Jun 10, 2026

View reviewed changes

Comment thread yarn-project/pxe/src/pxe.ts

nchamo merged commit 539b1d9 into merge-train/fairies-v5 Jun 10, 2026
11 checks passed

nchamo deleted the nchamo/f-588-constrained-delivery-tagged-log-retrieval-in-default-2 branch June 10, 2026 19:26

AztecBot mentioned this pull request Jun 10, 2026

feat: merge-train/fairies-v5 #23992

Merged

vezenovm reviewed Jun 10, 2026

View reviewed changes

vezenovm mentioned this pull request Jun 11, 2026

chore: Improved handshake registry privacy docs #24018

Open

Conversation

nchamo commented Jun 8, 2026

Summary

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vezenovm Jun 9, 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!

Choose a reason for hiding this comment

Uh oh!

vezenovm Jun 10, 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 Jun 9, 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!

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!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

vezenovm Jun 9, 2026 •

edited

Loading

vezenovm Jun 10, 2026 •

edited

Loading

vezenovm Jun 9, 2026 •

edited

Loading