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

Author: dbanks12

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_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
-    pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-    pol FEE_JUICE_ADDRESS = 5;
+    pol CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 1;
+    pol CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 2;
+    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_INSTANCE_REGISTRY_CONTRACT_ADDRESS 2
-#define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 3
-#define FEE_JUICE_ADDRESS 5
+#define CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS 1
+#define CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS 2
+#define FEE_JUICE_ADDRESS 3
 #define FEE_JUICE_BALANCES_SLOT 1
 #define UPDATED_CLASS_IDS_SLOT 1
 #define FLAT_PUBLIC_LOGS_HEADER_LENGTH 1

noir-projects/noir-protocol-circuits/crates/types/src/constants.nr

@@ -221,19 +221,9 @@ pub global CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE: Field =
 // Chosen to be a multiple of 3 (-1 to account for the separator), to optimize the poseidon2 hash.
 pub global MAX_PROTOCOL_CONTRACTS: u32 = 11;
 // Address 0 is not a protocol contract.
-// Address 1 is reserved (auth_registry was previously published here as a protocol contract; it is
-// now deployed as a regular contract at an artifact-derived address, see
-// `noir-projects/aztec-nr/canonical_addresses`).
-// Address 4 is reserved (multi_call_entrypoint was previously published here as a protocol contract;
-// it is now deployed as a regular contract at an artifact-derived address; see
-// `yarn-project/canonical-contracts/src/multi-call-entrypoint`).
-// Address 6 is reserved (public_checks was previously published here as a protocol contract; it is
-// now deployed as a regular contract at an artifact-derived address; see
-// `noir-projects/aztec-nr/canonical_addresses` for the Noir stamp and
-// `yarn-project/canonical-contracts/src/public-checks` for the TS twin).
-pub global CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS: AztecAddress = AztecAddress::from_field(2);
-pub global CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS: AztecAddress = AztecAddress::from_field(3);
-pub global FEE_JUICE_ADDRESS: AztecAddress = AztecAddress::from_field(5);
+pub global CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS: AztecAddress = AztecAddress::from_field(1);
+pub global CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS: AztecAddress = AztecAddress::from_field(2);
+pub global FEE_JUICE_ADDRESS: AztecAddress = AztecAddress::from_field(3);
 
 // `SIDE_EFFECT_MASKING_ADDRESS` is used by the protocol circuits to silo the padding side effects. It's not a protocol
 // contract (hence its address is greater than `MAX_PROTOCOL_CONTRACTS`).

yarn-project/constants/src/constants.gen.ts

@@ -112,9 +112,9 @@ export const CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE =
 export const CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE = 10538216027419913765597387738085647348651103543680388181336823392401502757423n;
 export const CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE = 20721543224513346060908370400407150739273836456436647488068002302723900469047n;
 export const MAX_PROTOCOL_CONTRACTS = 11;
-export const CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
-export const CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-export const FEE_JUICE_ADDRESS = 5;
+export const CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 1;
+export const CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 2;
+export const FEE_JUICE_ADDRESS = 3;
 export const SIDE_EFFECT_MASKING_ADDRESS = 19523154334483583633304358390644137470227519736821975910774528428729027989987n;
 export const NULL_MSG_SENDER_CONTRACT_ADDRESS = 21888242871839275222246405745257275088548364400416034343698204186575808495616n;
 export const CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT = 14193106819744442689484501689686180698286338820089744102289275815863062044599n;