Skip to content

Conversation

@LeilaWang
Copy link
Contributor

@LeilaWang LeilaWang commented Jan 23, 2026

  • Compute the value as poseidon2_hash('az_name_of_separator') as u32
  • Rename DOM_SEP__PUBLIC_LEAF_INDEX to DOM_SEP__PUBLIC_LEAF_SLOT
  • Rename DOM_SEP__BLOCK_HASH to DOM_SEP__BLOCK_HEADER_HASH
  • Rename DOM_SEP__OUTER_NULLIFIER to DOM_SEP__SILOED_NULLIFIER
  • Rename DOM_SEP__FUNCTION_LEAF to DOM_SEP__PRIVATE_FUNCTION_LEAF
  • Rename DOM_SEP__CONSTRUCTOR to DOM_SEP__INITIALIZER
  • Add a separator for the public storage slot in map: DOM_SEP__PUBLIC_STORAGE_MAP_SLOT
  • Add a separator for the first field of the private log: DOM_SEP__PRIVATE_LOG_FIRST_FIELD

@fcarreiro fcarreiro removed their request for review January 24, 2026 12:13
@LeilaWang LeilaWang force-pushed the lw/update_domain_separators branch 2 times, most recently from 24cad60 to 8d3b9ea Compare January 26, 2026 14:20
@LeilaWang LeilaWang force-pushed the lw/update_domain_separators branch 5 times, most recently from 7689d3e to 614aec9 Compare January 27, 2026 11:42
@LeilaWang LeilaWang requested review from iAmMichaelConnor and removed request for LHerskind and just-mitch January 27, 2026 12:25
Copy link
Contributor

@IlyasRidhuan IlyasRidhuan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from the AVM side

Copy link
Contributor

@iAmMichaelConnor iAmMichaelConnor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved! I wrote some pedantic comments that would change the domain separator string, but it looks like it would take forever to make such changes, so it's likely not worth your time.

assert(DOM_SEP__TSK_M == 51, "Unexpected domain separator");
// assert(DOM_SEP__TSK_M == derive_dom_sep("az_tsk_m"), "Unexpected domain separator");
unconstrained fn tsk_m_matches_derived() {
assert_eq(DOM_SEP__TSK_M, derive_dom_sep("az_tsk_m"), "Unexpected domain separator");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might repurpose this to something else, but I guess until we know the name, we can't replace this name.

unconstrained fn contract_address_v1_matches_derived() {
assert_eq(
DOM_SEP__CONTRACT_ADDRESS_V1,
derive_dom_sep("az_contract_address_v1"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Each version of the Aztec rollup, we'll need to change* this domain separator with the new rollup version. Will the rollups be named v1, v2, ...?

* Or more likely add another domain separator and pass it as a param to address derivations, so that people can still compute old addresses for things like migration proofs.

// The following value was generated by `public_keys.test.ts`.
let expected_public_keys_hash =
0x0fecd9a32db731fec1fded1b9ff957a1625c069245a3613a2538bd527068b0ad;
0x029d92319623fe2e5804a64b35d13e1c4881045371c41f36329b44dfc237d232;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Omg this must have taken ages

@LeilaWang LeilaWang force-pushed the lw/update_domain_separators branch 2 times, most recently from 8fd4a5e to 734c4b1 Compare January 28, 2026 15:39
@LeilaWang LeilaWang force-pushed the lw/update_domain_separators branch from 734c4b1 to 396231f Compare January 28, 2026 16:14
@AztecBot
Copy link
Collaborator

AztecBot commented Jan 28, 2026

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/bcc94de36b2b0cd3�bcc94de36b2b0cd38;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_p2p/valid_epoch_pruned_slash.test.ts (404s) (code: 1) group:e2e-p2p-epoch-flakes (\033Leila Wang\033: chore!: update domain separators (#19905))
\033FLAKED\033 (8;;http://ci.aztec-labs.com/f1372086f363f357�f1372086f363f3578;;�): yarn-project/scripts/run_test.sh p2p/src/client/test/tx_proposal_collector/p2p_client.proposal_tx_collector_bench.test.ts (105s) (code: 1) group:e2e-p2p-epoch-flakes (\033Leila Wang\033: chore!: update domain separators (#19905))

@LeilaWang LeilaWang added this pull request to the merge queue Jan 28, 2026
Merged via the queue into next with commit 6146044 Jan 28, 2026
16 checks passed
@LeilaWang LeilaWang deleted the lw/update_domain_separators branch January 28, 2026 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants