refactor(authwit): split into utils/private/public

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -15,10 +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 MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
-    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,10 +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 MULTI_CALL_ENTRYPOINT_ADDRESS 4
-#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/aztec-nr/framework-description/authentication_witnesses.md

@@ -21,7 +21,7 @@ The `aztec` library includes authwit functionality. Import the necessary compone
 
 ```rust
 use aztec::{
-    authwit::auth::{compute_authwit_message_hash_from_call, set_authorized},
+    authwit::{utils::compute_authwit_message_hash_from_call, public::set_authorized},
     macros::functions::authorize_once,
 };
 ```

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

@@ -40,6 +40,14 @@ Aztec is in active development. Each version may introduce breaking changes that
 
 **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()`.
+
 ### [Aztec.nr] `public_checks` demoted from protocol contract
 
 `public_checks` is no longer a protocol contract. Its address is now derived from its artifact rather than hardcoded at `6`. The aztec-nr constant has moved and been renamed:

docs/examples/contracts/example_uniswap/src/main.nr

@@ -9,9 +9,9 @@ use aztec::macros::aztec;
 #[aztec]
 pub contract ExampleUniswap {
     use aztec::{
-        authwit::auth::{
-            assert_current_call_valid_authwit_public, compute_authwit_message_hash_from_call,
-            set_authorized,
+        authwit::{
+            common::compute_authwit_message_hash_from_call,
+            public::{assert_current_call_valid_authwit_public, set_authorized},
         },
         macros::{functions::{external, initializer, only_self}, storage::storage},
         protocol::{

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/aztec-nr/aztec/src/authwit/account.nr

@@ -2,8 +2,8 @@ use crate::context::PrivateContext;
 
 use crate::protocol::{constants::DOM_SEP__TX_NULLIFIER, hash::poseidon2_hash_with_separator, traits::Hash};
 
-use crate::authwit::auth::{compute_authwit_message_hash, IS_VALID_SELECTOR};
 use crate::authwit::entrypoint::app::AppPayload;
+use crate::authwit::utils::{compute_authwit_message_hash, IS_VALID_SELECTOR};
 
 pub struct AccountActions<Context> {
     context: Context,