chore: backport handshake registry contract (#22854) to v4-next#23063
Merged
vezenovm merged 4 commits intoMay 8, 2026
Conversation
AztecBot
added
ci-draft
Drop incoming entries that don't exist on v4-next (DOM_SEP__MERKLE_HASH, DOM_SEP__NULLIFIER_MERKLE, DOM_SEP__PARTIAL_NOTE_COMMITMENT, DOM_SEP__PUBLIC_DATA_MERKLE) while keeping the two new ones added by #22854 (DOM_SEP__HANDSHAKE_SECRET_HASH, DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG). HashedValueTester sized <58, 51> = v4-next baseline <56, 49> + 2 new dom seps.
AztecBot
force-pushed
the
claudebox/backport-22854-v4-next
branch
from
09bee5c to
ffa6184
Compare
vezenovm
approved these changes
May 8, 2026
AztecBot
added a commit
that referenced
this pull request
May 9, 2026
BEGIN_COMMIT_OVERRIDE fix(aztec-up): Aztec installer does not shadow user installed binaries on PATH (#22902) fix: include sqlite binary in its npm package (#23039) chore: backport #23041 (add sendMessagesAs to wallet api schemas) to v4-next (#23081) chore: backport DeployMethod refactor (#22985) to v4-next (#23029) refactor(pxe): deduplicate tx hash lookups in MessageContextService (#23075) refactor(pxe): batch tagged private log queries across all secrets (#23048) refactor(pxe): batch log RPC calls in LogService.fetchLogsByTag (#23088) feat(aztec-nr): Initial handshake registry contract with non interactive handshake function (#22854) fix: add Tag.random() helper required by backported #23088 tests (#23094) chore: backport: fix(aztec-up): installer does not shadow user binaries on PATH (#22902) (#23060) chore: backport handshake registry contract (#22854) to v4-next (#23063) feat: deploy method refactor 2 (#23033) refactor(pxe): skip redundant getBlock RPC when querying at anchor block (#23100) port(v4-next): feat(docs): autogenerate node JSON-RPC API reference (#22543) (#23046) chore: backport feat: deploy method refactor 2 (#23033) to v4-next (#23103) port(v4-next): feat(ci): Snapshots for aztec-nr contract compilation failures and nargo expand (#23061) (#23104) feat(txe): allow authorizing cross-contract utility calls in nr tests (#23064) END_COMMIT_OVERRIDE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picks #22854 (
feat(aztec-nr): Initial handshake registry contract with non interactive handshake function) tobackport-to-v4-next-staging.Conflict resolution
The only conflict was in
noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr.nexthas accumulated a number of new merkle/partial-note dom seps (DOM_SEP__MERKLE_HASH,DOM_SEP__NULLIFIER_MERKLE,DOM_SEP__PARTIAL_NOTE_COMMITMENT,DOM_SEP__PUBLIC_DATA_MERKLE) that don't exist onv4-next, so the upstream version of this file imports symbols that aren't defined here.Resolution: drop the imports/assertions for those non-existent constants, but keep the two new ones added by this PR (
DOM_SEP__HANDSHAKE_SECRET_HASH,DOM_SEP__NON_INTERACTIVE_HANDSHAKE_LOG_TAG).HashedValueTestersized<58, 51>= v4-next baseline<56, 49>plus the two new dom seps.Validated:
hashed_values_match_derived(no orphan imports / no missing imports).48assert_dom_sep_matches_derived+3assert_blob_prefixes_match_derived= 51 u32 values; plus1protocol-circuit value +6aztec-nr values = 58 total field values.derive_ecdh_shared_secret,generate_positive_ephemeral_key_pair,set_sender_for_tags,compute_log_tag,MessageDelivery.ONCHAIN_UNCONSTRAINED,Owned,emit_private_log_vec_unsafe,to_address_point,compute_siloed_private_log_first_field,poseidon2_hash_with_separator) exist onv4-next— the contract uses theaztec::protocolre-export ofprotocol_types.Commit structure
Per the backport convention, history is preserved as:
No separate build-fixes commit was needed — the conflict was metadata-only.
Build verification
The container does not ship a prebuilt
nargo, and Docker is unavailable, sonoir-contracts/bootstrap.shcannot run locally. Relying on CI for end-to-end build validation.Original PR: #22854
ClaudeBox log: https://claudebox.work/s/096af9ddd4f770c8?run=4