feat: merge-train/fairies (#24994)

BEGIN_COMMIT_OVERRIDE
chore: remove constant generation call for languages other than TS from
yarn-project/constants (#24730)
chore: consumer driven constant selection (#24734)
chore: turn constants codegen into a formal dependency (#24958)
chore!: move protocol contracts out of noir-contracts.js (#24998)
END_COMMIT_OVERRIDE

Author: AztecBot

barretenberg/cpp/.gitignore

@@ -28,3 +28,5 @@ android-sysroot/
 # without scripts/flavor-codegen/.gitignore still hides the on-disk artifacts.
 scripts/flavor-codegen/dist/
 scripts/flavor-codegen/node_modules/
+pil/vm2/constants_gen.pil
+src/barretenberg/aztec/aztec_constants.hpp

barretenberg/cpp/.rebuild_patterns

@@ -8,3 +8,5 @@
 ^barretenberg/cpp/CMakePresets.json
 ^ipc-codegen/src/.*\.ts$
 ^ipc-codegen/templates/cpp/
+^protocol/constants-codegen/
+^noir-projects/noir-protocol-circuits/crates/types/src/constants\.nr$

barretenberg/cpp/CLAUDE.md

@@ -122,15 +122,18 @@ When making changes that affect proof sizes (e.g., pairing points encoding, publ
 
 1. **C++ static_asserts** in `dsl/acir_format/mock_verifier_inputs.test.cpp` - These catch size changes at compile time
 2. **Noir constants** in `noir-projects/noir-protocol-circuits/crates/types/src/constants.nr`
-3. **TypeScript constants** - Run `yarn remake-constants` from `yarn-project/constants` to regenerate
+3. **Generated constants** - All projections (`aztec_constants.hpp`, `constants.gen.ts`, `ConstantsGen.sol`,
+   `constants_gen.pil`) regenerate automatically at build time; none need a manual step. If AVM-related constants
+   changed, also run `scripts/avm2_gen.sh` and commit the resulting `vm2/generated` changes.
 
 Key constants to watch:
 - `RECURSIVE_PROOF_LENGTH` - UltraHonk proof + DefaultIO public inputs
 - `CHONK_PROOF_LENGTH` - ChonkProof + HidingKernelIO public inputs
 - `PAIRING_POINTS_SIZE` - Size of pairing points in public inputs
 - `HIDING_KERNEL_PUBLIC_INPUTS_SIZE` - Size of HidingKernelIO
 
-If C++ static_asserts fail after your changes, update both the assert values AND the corresponding Noir constants, then run `yarn remake-constants`.
+If C++ static_asserts fail after your changes, update both the assert values and the corresponding Noir constants, then
+run the generation commands above.
 
 ## Prover.toml Fixtures
 

barretenberg/cpp/CMakeLists.txt

@@ -9,6 +9,21 @@ project(
     LANGUAGES CXX C
 )
 
+# aztec_constants.hpp is generated from the protocol's Noir constant definitions. Generation
+# needs the surrounding monorepo; a checkout without it must provide the header by other means.
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../protocol/constants-codegen/src/cli.ts")
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../noir-projects/noir-protocol-circuits/crates/types/src/constants.nr"
+    )
+    execute_process(
+        COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/remake-constants.sh"
+        RESULT_VARIABLE AZTEC_CONSTANTS_GEN_RESULT
+    )
+    if(NOT AZTEC_CONSTANTS_GEN_RESULT EQUAL 0)
+        message(FATAL_ERROR "aztec_constants.hpp generation failed")
+    endif()
+endif()
+
 # === Platform Guard Reference ===
 # __wasm__  : Compiler-defined for WebAssembly. Guards threading, file I/O, networking.
 # _WIN32    : Compiler-defined for Windows. Guards POSIX APIs (mmap, signals, IPC).

barretenberg/cpp/bootstrap.sh

@@ -246,6 +246,8 @@ export -f cmake_build preset_cache_paths build_preset build_format_check build_n
 function build {
   echo_header "bb cpp build"
 
+  denoise ./scripts/remake-constants.sh
+
   if [ "$CI_FULL" -eq 1 ]; then
     # Deletes all build dirs and build bb and wasms from scratch.
     rm -rf build*

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 current_dir="$(dirname "$(readlink -f "$0")")"
 cd $current_dir/../
+
+repo_root=$(git rev-parse --show-toplevel)
+"$repo_root/protocol/constants-codegen/scripts/generate.sh" --pil pil/vm2/constants_gen.pil \
+    --selection "$repo_root/barretenberg/cpp/scripts/constants-codegen/pil.json"
+
 ../../bb-pilcom/target/release/bb_pil pil/vm2/tx.pil \
     --name Avm2 -y -o src/barretenberg/vm2/generated \
     && ./format.sh changed

barretenberg/cpp/scripts/avm2_gen.sh

@@ -12,8 +12,7 @@
 #   1. Discover the new computed length from the C++ flavor and (if it differs
 #      from constants.nr) print instructions for the user to update constants.nr,
 #      then exit. The user updates constants.nr by hand and re-runs the script.
-#   2. Once constants.nr is in sync: run yarn remake-constants (propagates to
-#      aztec_constants.hpp / constants.gen.ts / ConstantsGen.sol / constants_gen.pil),
+#   2. Once constants.nr is in sync: regenerate each consumer's constants,
 #      renew the pinned public-base-rollup VKs (see renew-pins below), rebuild Noir
 #      (which also regenerates the remaining circuit VKs as a byproduct of bb write_vk
 #      during the bootstrap), and regenerate Prover.toml fixtures via the e2e full.test
@@ -139,7 +138,7 @@ Update $(realpath --relative-to="$ROOT" "$CONSTANTS_NR"):
   pub global AVM_V2_PROOF_LENGTH_IN_FIELDS: u32 = $computed;
 
 Then re-run barretenberg/cpp/scripts/bump_avm_proof_length.sh to finish the cascade
-(yarn remake-constants → noir rebuild → Prover.toml regen).
+(constant regeneration → noir rebuild → Prover.toml regen).
 EOF
     exit 0
 }
@@ -215,13 +214,17 @@ renew_base_public_pins() {
 phase2_cascade() {
     step "Phase 2: propagating to mirrors and rebuilding…"
 
-    step "yarn remake-constants (constants.nr → aztec_constants.hpp, constants.gen.ts, ConstantsGen.sol, constants_gen.pil)"
-    if ! (cd "$ROOT/yarn-project" && yarn workspace @aztec/constants remake-constants); then
+    step "Regenerating constants for TypeScript and Barretenberg"
+    if ! (
+        cd "$ROOT/yarn-project"
+        yarn workspace @aztec/constants generate
+        "$ROOT/barretenberg/cpp/scripts/remake-constants.sh"
+    ); then
         cat >&2 <<EOF
 
-ERROR: yarn remake-constants failed. Make sure yarn-project is bootstrapped:
+ERROR: constants regeneration failed. Make sure the repository is bootstrapped:
 
-  ./bootstrap.sh build yarn-project
+  ./bootstrap.sh build constants-codegen
 
 Then re-run barretenberg/cpp/scripts/bump_avm_proof_length.sh.
 EOF

barretenberg/cpp/scripts/bump_avm_proof_length.sh

@@ -0,0 +1,68 @@
+[
+  "MAX_ETH_ADDRESS_BIT_SIZE",
+  "MAX_ETH_ADDRESS_VALUE",
+  "ARCHIVE_HEIGHT",
+  "NOTE_HASH_TREE_HEIGHT",
+  "PUBLIC_DATA_TREE_HEIGHT",
+  "NULLIFIER_TREE_HEIGHT",
+  "L1_TO_L2_MSG_TREE_HEIGHT",
+  "NOTE_HASH_TREE_LEAF_COUNT",
+  "L1_TO_L2_MSG_TREE_LEAF_COUNT",
+  "NULLIFIER_SUBTREE_HEIGHT",
+  "MAX_NOTE_HASHES_PER_TX",
+  "MAX_NULLIFIERS_PER_TX",
+  "MAX_ENQUEUED_CALLS_PER_TX",
+  "MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX",
+  "MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX",
+  "MAX_L2_TO_L1_MSGS_PER_TX",
+  "GENESIS_BLOCK_HEADER_HASH",
+  "GENESIS_ARCHIVE_ROOT",
+  "MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS",
+  "MAX_PROTOCOL_CONTRACTS",
+  "CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS",
+  "CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS",
+  "FEE_JUICE_ADDRESS",
+  "FEE_JUICE_BALANCES_SLOT",
+  "UPDATED_CLASS_IDS_SLOT",
+  "FLAT_PUBLIC_LOGS_HEADER_LENGTH",
+  "FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH",
+  "PUBLIC_LOGS_LENGTH",
+  "PUBLIC_LOG_HEADER_LENGTH",
+  "MAX_PUBLIC_LOG_SIZE_IN_FIELDS",
+  "AVM_.*",
+  "MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS",
+  "MEM_TAG_FF",
+  "MEM_TAG_U1",
+  "MEM_TAG_U8",
+  "MEM_TAG_U16",
+  "MEM_TAG_U32",
+  "MEM_TAG_U64",
+  "MEM_TAG_U128",
+  "TX_DA_GAS_OVERHEAD",
+  "PUBLIC_TX_L2_GAS_OVERHEAD",
+  "MAX_PROCESSABLE_L2_GAS",
+  "TIMESTAMP_OF_CHANGE_BIT_SIZE",
+  "UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN",
+  "UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE",
+  "DEFAULT_MAX_DEBUG_LOG_MEMORY_READS",
+  "DOM_SEP__SILOED_NOTE_HASH",
+  "DOM_SEP__UNIQUE_NOTE_HASH",
+  "DOM_SEP__NOTE_HASH_NONCE",
+  "DOM_SEP__SILOED_NULLIFIER",
+  "DOM_SEP__PUBLIC_LEAF_SLOT",
+  "DOM_SEP__PUBLIC_STORAGE_MAP_SLOT",
+  "DOM_SEP__MERKLE_HASH",
+  "DOM_SEP__NULLIFIER_MERKLE",
+  "DOM_SEP__PUBLIC_DATA_MERKLE",
+  "DOM_SEP__WRITTEN_SLOTS_MERKLE",
+  "DOM_SEP__RETRIEVED_BYTECODES_MERKLE",
+  "DOM_SEP__PUBLIC_BYTECODE",
+  "DOM_SEP__CONTRACT_CLASS_ID",
+  "DOM_SEP__SALTED_INITIALIZATION_HASH",
+  "DOM_SEP__PUBLIC_KEYS_HASH",
+  "DOM_SEP__SINGLE_PUBLIC_KEY_HASH",
+  "DOM_SEP__PARTIAL_ADDRESS",
+  "DOM_SEP__CONTRACT_ADDRESS_V2",
+  "DOM_SEP__BLOCK_HEADER_HASH",
+  "DOM_SEP__PUBLIC_CALLDATA"
+]