feat!: shift remaining protocol-contract addresses to 1-3

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -15,9 +15,9 @@ namespace constants;
     pol MAX_L2_TO_L1_MSGS_PER_TX = 8;
     pol MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 3000;
     pol MAX_PROTOCOL_CONTRACTS = 11;
+    pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 1;
     pol CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
-    pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-    pol FEE_JUICE_ADDRESS = 5;
+    pol FEE_JUICE_ADDRESS = 3;
     pol FEE_JUICE_BALANCES_SLOT = 1;
     pol UPDATED_CLASS_IDS_SLOT = 1;
     pol FLAT_PUBLIC_LOGS_HEADER_LENGTH = 1;

barretenberg/cpp/src/barretenberg/aztec/aztec_constants.hpp

@@ -21,9 +21,9 @@
 #define GENESIS_ARCHIVE_ROOT "0x177a4955b31ecaafad999753938a44e526b54c5ba5d536688227f85f15cfbdf5"
 #define MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS 3000
 #define MAX_PROTOCOL_CONTRACTS 11
+#define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 1
 #define CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS 2
-#define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 3
-#define FEE_JUICE_ADDRESS 5
+#define FEE_JUICE_ADDRESS 3
 #define FEE_JUICE_BALANCES_SLOT 1
 #define UPDATED_CLASS_IDS_SLOT 1
 #define FLAT_PUBLIC_LOGS_HEADER_LENGTH 1

barretenberg/cpp/src/barretenberg/vm2/generated/relations/tx_impl.hpp

@@ -19,7 +19,7 @@ void txImpl<FF_>::accumulate(ContainerOverSubrelations& evals,
     const auto constants_MAX_NOTE_HASHES_PER_TX = FF(64);
     const auto constants_MAX_NULLIFIERS_PER_TX = FF(64);
     const auto constants_MAX_L2_TO_L1_MSGS_PER_TX = FF(8);
-    const auto constants_FEE_JUICE_ADDRESS = FF(5);
+    const auto constants_FEE_JUICE_ADDRESS = FF(3);
     const auto constants_FEE_JUICE_BALANCES_SLOT = FF(1);
     const auto constants_AVM_TX_PHASE_VALUE_START = FF(0);
     const auto constants_AVM_TX_PHASE_VALUE_LAST = FF(11);

docs/docs-developers/docs/resources/migration_notes.md

@@ -55,6 +55,10 @@ When `with_sender` is not called, `MessageDelivery` uses the wallet-supplied def
 
 **Impact**: Code importing or referencing `ExtendedDirectionalAppTaggingSecret` should update to `AppTaggingSecret`.
 
+### [Protocol] Remaining protocol-contract addresses compacted to 1-3
+
+After the `auth_registry`, `public_checks`, and `multi_call_entrypoint` demotions freed up address slots `1`, `4`, and `6`, the three remaining protocol contracts have been compacted into the lowest slots: `ContractClassRegistry` moves from `3` to `1`, `ContractInstanceRegistry` stays at `2`, and `FeeJuice` moves from `5` to `3`. Code that hardcoded the previous values must be updated. `MAX_PROTOCOL_CONTRACTS` is unchanged (still `11`); only the assigned addresses moved.
+
 ### [Aztec.nr] `multi_call_entrypoint` demoted from protocol contract
 
 `multi_call_entrypoint` is no longer a protocol contract. Its address is now derived from its artifact rather than hardcoded at `6`. PXE no longer auto-registers it; `EmbeddedWallet` registers it on creation via `registerMultiCallEntrypoint`. Other PXE consumers using `DefaultMultiCallEntrypoint` (including `DeployAccountMethod`'s `NO_FROM` self-deploy path) must register the contract themselves with `pxe.registerContract({ instance, artifact })` from `getStandardMultiCallEntrypoint()`.

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -23,7 +23,7 @@ library Constants {
     10_619_256_997_260_439_436_842_531_499_967_995_403_253_967_496_480_475_679_746_178_797_053_672_406_517;
   uint256 internal constant EMPTY_EPOCH_OUT_HASH =
     355_785_372_471_781_095_838_790_036_702_437_931_769_306_153_278_986_832_745_847_530_947_941_691_539;
-  uint256 internal constant FEE_JUICE_ADDRESS = 5;
+  uint256 internal constant FEE_JUICE_ADDRESS = 3;
   uint256 internal constant BLS12_POINT_COMPRESSED_BYTES = 48;
   uint256 internal constant ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 111;
   uint256 internal constant NUM_MSGS_PER_BASE_PARITY = 256;

noir-projects/noir-protocol-circuits/crates/private-kernel-init/Prover.toml

@@ -1,18 +1,18 @@
-vk_tree_root = "0x26fc99382f808fb92f28ac0704a6f2694f4a86517781887b03c5ddbc66757c16"
+vk_tree_root = "0x18e358ea5367f6069a4c1c08a2e0628fbb1b25c00b0b98160072d4ad397bae7c"
 is_private_only = false
-first_nullifier_hint = "0x0f56fdd259750cd9195239df304d00a35a1e7a5f193b2c830f5543eb80fd8503"
+first_nullifier_hint = "0x06d4e59de0b2640b30f3a44bbe369fe23a7f8c7f6bde74dd17bf3a3e966696ff"
 revertible_counter_hint = "0x0000000000000000000000000000000000000000000000000000000000000005"
 
 [tx_request]
-args_hash = "0x080c7ea174f49198e0075706670df55a4e0d0370f4d2e84cc239b3bb556e7bce"
-salt = "0x26cae2c6f925b9bbd0965cbeeff5fc0947e17ae3fe26b36bca3cb5ab46c3484f"
+args_hash = "0x107048cdf78a4ad0f647f31351b6189d042040c75b13c6d3ee715ac11ab361bc"
+salt = "0x154ec82a2f948e4f85b9dfd1db09086c4643b2d07745ee9eb91f227d2c1362a3"
 
   [tx_request.origin]
-  inner = "0x2f28d94f6394b5c2f07be232a797952d00157072b5a37d49d3259dd90fbdbe0c"
+  inner = "0x1399d60c62da01073b9c88b8e13e219567fd7613c74f959fe3d84c263f2cce0d"
 
   [tx_request.tx_context]
   chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-  version = "0x00000000000000000000000000000000000000000000000000000000c43dbb7d"
+  version = "0x00000000000000000000000000000000000000000000000000000000b5668f8c"
 
 [tx_request.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"
@@ -37,22 +37,22 @@ fee_per_l2_gas = "0x000000000000000000000000000000000000000000000000000000000000
     inner = "0x000000000000000000000000000000000000000000000000000000009d57a239"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0199ad1d701a729933e8e2b14a118db67849b3c8d1403f2891f0bc6c3e980e87"
+inner = "0x199f1d76b000b3670838f22f914f9ff46d325c96c7fef0b98ae4cf2f6b67ed38"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x042beba925b4ef93aecacdc39cf48796a5788e8416a7db678a137c134c15851d"
+inner = "0x24585d4deebfdc8a2edcee3d755af4ed489d1bb63ae07978afb90acbbd86b94b"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x19961e3dca83f4b1df6c578ceb468bcbf395f7952268d4c11f322df140b46227"
+inner = "0x22e97727f49e38f208df932d44bad54654074e56e45e8f931f83ad19beb28a60"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x04bde23040cc7b426c028ead0af91935f4b27e57dee089270ba49d3bb34b6a5f"
+inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x1083d445b1c94543275b65ed3ca0d8039584285cb282a25fe8cdffe8d5d026ac"
+inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[protocol_contracts.derived_addresses]]
-inner = "0x0d9390f7581ba677b40d8c1a00421c57b520d9145b30b53496efb832968b6c48"
+inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
 [[protocol_contracts.derived_addresses]]
 inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -218,7 +218,7 @@ key = [
 hash = "0x208b7a010d57aa8b45045c8298fd58f46183cb7c810bedbfe7724c639f86e64d"
 
 [private_call.verification_key_hints]
-contract_class_artifact_hash = "0x150411877dedef977039ca4323724b37261dbf2ab4fae0af7437c02d39a5ede5"
+contract_class_artifact_hash = "0x2b3d1ffead87a07de6528459bf843e1a4fc1fa09f225580a546c6bfd2bb1efae"
 contract_class_public_bytecode_commitment = "0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e"
 updated_class_id_delayed_public_mutable_values = [
   "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -230,7 +230,7 @@ updated_class_id_delayed_public_mutable_values = [
   leaf_index = "0"
   sibling_path = [
   "0x204cdb8d95d41aedb2ad46ebb8e2339964033ba3d0a32b3fbfa135420463819e",
-  "0x2156a6382b0190288bef07528ec8b7af43e3f925375184692db2ea1302f8f8fb",
+  "0x087ba0b714569fa8d3daee343e136b77e2134464cb94553c3c585c3291836d32",
   "0x2974d8999d00928aa1378118756d6a4ba1368b1da89b2b1059c17fbb88ad21a8",
   "0x2e6127fb2bcf542677ed9dfc6cd90a61a075142999aebccf345c816aff3a1d92",
   "0x267a9c24e849f51869c93086ded207858dfb130344e1879a9d15d35096464824",
@@ -239,30 +239,30 @@ updated_class_id_delayed_public_mutable_values = [
 ]
 
   [private_call.verification_key_hints.public_keys]
-  npk_m_hash = "0x2e3c82425f80b5c9bff9a8368202a23c63ce4f2f607d6cc5548311f53535b242"
-  ovpk_m_hash = "0x0015a4d54570264c1ad047917624487b8cdc7ecab81a0741a865767d1e2c4312"
-  tpk_m_hash = "0x14e5c88eb22b36eb1e0fa5dcd05bbe66c1d6cc0005169e912963b184494bffd4"
+  npk_m_hash = "0x15835779b5a6f7ad0b087daa12c92371d7edd9c3cc4309fe93839ccc8cf60d7d"
+  ovpk_m_hash = "0x16803484d24c3f49ec79bde4b8756dba75968595841b932844f94a0b179b6b1e"
+  tpk_m_hash = "0x18b41bbd075ff3abf1c5e3abdb44f0a075eb54bf7eb4e4162278636f8cfb5455"
   mspk_m_hash = "0x14a5d4bde495b8c3a9ba4aed0d4870526e46fdff22d341a2f689ac5a50d10356"
   fbpk_m_hash = "0x0f124f07811eebfaaa6d31316a2cc5bf255fa118f720e8ff1f2fc0d4aa46d496"
 
 [private_call.verification_key_hints.public_keys.ivpk_m.inner]
-x = "0x1b1ffb4bcd7fe8bf659c19064993400c5dbc8ae3d42e4444116d202a3a5f9118"
-y = "0x258c0a5c5b08d997dd5ef3d72b477742f60769bb95c829b57d3b510249e4327e"
+x = "0x21dc6550b2c53afac22c7c6d40a57da6d803555abe606e3436ef56dab04bbe1a"
+y = "0x0e0473a9b4455131d96321acaab493c5511c9e362a88d806d58b4a627c792631"
 
   [private_call.verification_key_hints.salted_initialization_hash]
-  inner = "0x0b31a34c0f381d4ca4f92faf70486b5409f97f142202bed5d7d16604bcc1caab"
+  inner = "0x1b633ec491464104381d966f5fa20832bda85b1a016db7d15defcb13ebf75a20"
 
   [private_call.verification_key_hints.updated_class_id_witness]
-  leaf_index = "138"
+  leaf_index = "119"
   sibling_path = [
-  "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "0x22e6ad2ad3d6511a51e02a9abbc41fe2c26d0fdabd88a8498d950d6c3c15540c",
-  "0x03dffce0c5a809664d948bbb4bebbf1d6b0b58a94d7dd1acf426dd2fd6d5cc8c",
-  "0x03137230b6aaa26a4d2e21b5b467e191676c9f89cd11dec09ba2fd553db0cf5c",
-  "0x1d52af9cd9f69c1286e9a96fd498e736789a5bc463fceb1c176a4f9292f7cbe3",
-  "0x1ff1d5db01572c915915a22173c73d8073df9af4e4c57f6af29df5315da44419",
-  "0x070dcbac794fa663bc71b42d80775c0cea8c3ed7580207cfd30fd1285813ce07",
-  "0x0cd73813e241607ef89348175bf80a481d2cd74c31c78ca3d58fca581e163ab8",
+  "0x0ea0624698f23e0f4a22031fb14347e10029e4658c6ebfc19d277b3557e2b705",
+  "0x0cb7ad1eda8bfeacf4124b3bb9d95543b679f445effed4c1a1a647c3bf8d38c0",
+  "0x2523970382de270c1acd87f98b4ed454353257f9c689dc608f7dc1b6ca23741a",
+  "0x24e3204c50e095c3dd779ffc51a01895035b45769a4d9fca14b6eea4b72229b4",
+  "0x2edd4e68944dac758244213037fbe9d622c7c28d6070f16862b3e8986090bee4",
+  "0x1d5ea1a288ff1ff4cabceaaa2f93eda378a5fb0a2a55423f4d4d205969181931",
+  "0x23b80d0ef13d744a52faabf5651164d28f7faf902653e41a35472eea87936e6e",
+  "0x2482c48a5d10de63ab58c3f1808b44e91f00120e3c780c50e95662ae8c71e56e",
   "0x16c8aff52f0422f4bfc502620fe15dd6a4de67637563b7a8175f2d5727d268a4",
   "0x1c76b6744bc3d6b1cd4b53459a08b4959643c0768fde657299fcc82e2732f744",
   "0x12a6fac0fdfbd7897d8fe955f454cdb309ce8597d647ebfd0ba614c4eb215581",
@@ -298,21 +298,21 @@ y = "0x258c0a5c5b08d997dd5ef3d72b477742f60769bb95c829b57d3b510249e4327e"
 ]
 
   [private_call.verification_key_hints.updated_class_id_leaf]
-  slot = "0x275132cce985eac93aca8fdcde56b28a86eb28c9a05316be3fdff9feea10ac42"
-  value = "0x00000000000000000000000000000000000000000000000000000000000003e8"
-  next_slot = "0x282f98a6fa22b968e520c3293ef580c9bd74ea85b00b3be2821d39c8d27180cb"
-  next_index = "0x000000000000000000000000000000000000000000000000000000000000007e"
+  slot = "0x092a9e5e19764e5259eccdde49a62c9aa3324094f6d129d749ce144a6db5adcb"
+  value = "0x00000000000000000000000000000000000000000000021e19e0c9bab2400000"
+  next_slot = "0x10ed097cba0650455f922c7fda899d8bfe0d363b2f5196122828a1f394856371"
+  next_index = "0x0000000000000000000000000000000000000000000000000000000000000078"
 
 [app_public_inputs]
-args_hash = "0x080c7ea174f49198e0075706670df55a4e0d0370f4d2e84cc239b3bb556e7bce"
+args_hash = "0x107048cdf78a4ad0f647f31351b6189d042040c75b13c6d3ee715ac11ab361bc"
 returns_hash = "0x0000000000000000000000000000000000000000000000000000000000000000"
 start_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000002"
 end_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000007"
 expected_non_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
 expected_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
 min_revertible_side_effect_counter = "0x0000000000000000000000000000000000000000000000000000000000000005"
 is_fee_payer = true
-expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000006a17674a"
+expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000006a1b39c0"
 
   [app_public_inputs.call_context]
   is_static_call = false
@@ -321,7 +321,7 @@ expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000
     inner = "0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000"
 
     [app_public_inputs.call_context.contract_address]
-    inner = "0x2f28d94f6394b5c2f07be232a797952d00157072b5a37d49d3259dd90fbdbe0c"
+    inner = "0x1399d60c62da01073b9c88b8e13e219567fd7613c74f959fe3d84c263f2cce0d"
 
     [app_public_inputs.call_context.function_selector]
     inner = "0x000000000000000000000000000000000000000000000000000000009d57a239"
@@ -331,7 +331,7 @@ expiration_timestamp = "0x000000000000000000000000000000000000000000000000000000
 
     [[app_public_inputs.note_hash_read_requests.array]]
 [app_public_inputs.note_hash_read_requests.array.inner]
-inner = "0x10e868e2362e67b15ecac46f1f1c46f15a20a22550b9056837d3250ccef8f2f1"
+inner = "0x1e278f56d06e63680071dd14392e7b66e9924dd83ecf0fa8c5eaa55a7e6f704d"
 counter = "0x0000000000000000000000000000000000000000000000000000000000000003"
 
 [app_public_inputs.note_hash_read_requests.array.contract_address]
@@ -1040,13 +1040,13 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
       [app_public_inputs.public_call_requests.array.inner]
       is_static_call = false
-      calldata_hash = "0x15c72719f27966cdaddc8fa4527bab0da5db9ef98937ab35c463337d32800685"
+      calldata_hash = "0x146b6aa53a9e9ba1074098ad67ebee87e6b686f38292992e0881c1982993f8ae"
 
         [app_public_inputs.public_call_requests.array.inner.msg_sender]
-        inner = "0x2f28d94f6394b5c2f07be232a797952d00157072b5a37d49d3259dd90fbdbe0c"
+        inner = "0x1399d60c62da01073b9c88b8e13e219567fd7613c74f959fe3d84c263f2cce0d"
 
         [app_public_inputs.public_call_requests.array.inner.contract_address]
-        inner = "0x14cd213956c2575a41f283523ecb2b146c9d561e085dc24e16f979105747e575"
+        inner = "0x1b068d72f328d7e2adf0c20e3746a2f2f63820bd077a7f66d2775c15d55c8e1d"
 
     [[app_public_inputs.public_call_requests.array]]
     counter = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -1982,39 +1982,39 @@ inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
       length = "0x0000000000000000000000000000000000000000000000000000000000000000"
 
   [app_public_inputs.anchor_block_header]
-  sponge_blob_hash = "0x1fc4fc93cc12365e3d41bcd0a5651109dfe3aaff26e6993234e4d479bc264d9f"
+  sponge_blob_hash = "0x1405f292aa83a732fdefc9eceb73563852d8a0b3daad71a311a738e336a407e6"
   total_fees = "0x00000000000000000000000000000000000000000000000000008790cd55e980"
   total_mana_used = "0x00000000000000000000000000000000000000000000000000000000000722f4"
 
     [app_public_inputs.anchor_block_header.last_archive]
-    root = "0x163ad5849987af7f4582bd09c3710d96df003587f26c1cf5f0b33f3aaf78d144"
+    root = "0x0343d2259bb31fcfde531994e2f5ef2bb7f4ed7984616b510993c1d0a5713b9f"
     next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000011"
 
 [app_public_inputs.anchor_block_header.state.l1_to_l2_message_tree]
 root = "0x0fef6d80d31109ddb56d6b3f607cbc9c0af0bff3ea0d43e8f278983c64c11f7a"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000004400"
 
 [app_public_inputs.anchor_block_header.state.partial.note_hash_tree]
-root = "0x12901fe6fa2d1dbed7a6117a7ea92720f01253d8e36f1eeb922b43da619d9a31"
+root = "0x06e925a5776d02a378215f3c3991da037a91223f9f993330e4e7a81534daf18f"
 next_available_leaf_index = "0x00000000000000000000000000000000000000000000000000000000000002c0"
 
 [app_public_inputs.anchor_block_header.state.partial.nullifier_tree]
-root = "0x2ae0b4c6426597eff87adb578d59c639dca261c080b94d71116e051daf2b98ac"
+root = "0x1bcf9d5763d8fb6cc3adfb9b10e7d3a825ea687a90176feee2206eeb8c38598b"
 next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000000000000000340"
 
 [app_public_inputs.anchor_block_header.state.partial.public_data_tree]
-root = "0x1c878a2009277c45d4a7e2168e564a3a2290e2086e7457688f02030d61df20f8"
+root = "0x16b98c6e0f1c2ff10ea0a8606cf37a49cdfbd5cbc7be3d23a3aba19d462b7e67"
 next_available_leaf_index = "0x000000000000000000000000000000000000000000000000000000000000008b"
 
     [app_public_inputs.anchor_block_header.global_variables]
     chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-    version = "0x00000000000000000000000000000000000000000000000000000000c43dbb7d"
+    version = "0x00000000000000000000000000000000000000000000000000000000b5668f8c"
     block_number = "0x0000000000000000000000000000000000000000000000000000000000000011"
     slot_number = "0x0000000000000000000000000000000000000000000000000000000000000045"
-    timestamp = "0x000000000000000000000000000000000000000000000000000000006a1615ca"
+    timestamp = "0x000000000000000000000000000000000000000000000000000000006a19e840"
 
       [app_public_inputs.anchor_block_header.global_variables.coinbase]
-      inner = "0x00000000000000000000000022b125f3f0b68cc48051ea3e18ef77745742b605"
+      inner = "0x000000000000000000000000943a8050ae818d6972a35fbc9169ba873fd12eda"
 
       [app_public_inputs.anchor_block_header.global_variables.fee_recipient]
       inner = "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -2025,7 +2025,7 @@ next_available_leaf_index = "0x0000000000000000000000000000000000000000000000000
 
   [app_public_inputs.tx_context]
   chain_id = "0x0000000000000000000000000000000000000000000000000000000000007a69"
-  version = "0x00000000000000000000000000000000000000000000000000000000c43dbb7d"
+  version = "0x00000000000000000000000000000000000000000000000000000000b5668f8c"
 
 [app_public_inputs.tx_context.gas_settings.gas_limits]
 da_gas = "0x0000000000000000000000000000000000000000000000000000000000030000"