Skip to content

feat(aztec-nr)!: domain-separated tags on log emission (#21910) [v4-next backport]#22031

Merged
nchamo merged 2 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-21910-log-tags
Mar 26, 2026
Merged

feat(aztec-nr)!: domain-separated tags on log emission (#21910) [v4-next backport]#22031
nchamo merged 2 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-21910-log-tags

Conversation

@AztecBot

Copy link
Copy Markdown
Collaborator

Summary

Backport of #21910 to v4-next.

Cherry-pick of 8c88e11 had 3 conflicts:

  1. benchmarking_contract/main.nr — HEAD had minimal imports, incoming added new benchmark functions (noop, emit_nullifiers, emit_note_hashes, emit_l2_to_l1_msgs, emit_private_logs, emit_contract_class_log, noop_pub) and their required imports. Took incoming.

  2. test_contract/main.nr — HEAD imported PRIVATE_LOG_SIZE_IN_FIELDS, incoming imported PRIVATE_LOG_CIPHERTEXT_LEN and MAX_PUBLIC_LOG_SIZE_IN_FIELDS plus new emit_full_size_public_log function. Took incoming (the old constant was renamed in this PR).

  3. constants.gen.ts — HEAD had SILOED_NULLIFIER in DomainSeparator enum, incoming had new log tag constants. Kept both since SILOED_NULLIFIER exists on v4-next but was already present upstream when the PR was authored.

All constants verified against constants.nr source — values match.

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

nchamo and others added 2 commits March 26, 2026 00:19
Resolved conflicts in 3 files:
- benchmarking_contract: took incoming imports and new benchmark functions
- test_contract: took incoming constants (PRIVATE_LOG_CIPHERTEXT_LEN, MAX_PUBLIC_LOG_SIZE_IN_FIELDS) and new emit_full_size_public_log function
- constants.gen.ts: kept both SILOED_NULLIFIER (HEAD) and new log tag domain separators (incoming)
@AztecBot AztecBot added ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. labels Mar 26, 2026
@nchamo nchamo self-assigned this Mar 26, 2026
@nchamo nchamo marked this pull request as ready for review March 26, 2026 00:29
@nchamo nchamo enabled auto-merge March 26, 2026 00:29
@AztecBot

Copy link
Copy Markdown
Collaborator Author

Flakey Tests

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

\033FLAKED\033 (8;;http://ci.aztec-labs.com/b37efc3a42f197cc�b37efc3a42f197cc8;;�):  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" (219s) (code: 0) group:e2e-p2p-epoch-flakes

@nchamo nchamo merged commit 3785717 into backport-to-v4-next-staging Mar 26, 2026
20 of 26 checks passed
@nchamo nchamo deleted the claudebox/backport-21910-log-tags branch March 26, 2026 00:55
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