feat(multi_call_entrypoint): demote to non-protocol contract

Author: dbanks12

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -17,7 +17,6 @@ namespace constants;
     pol MAX_PROTOCOL_CONTRACTS = 11;
     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_BALANCES_SLOT = 1;
     pol UPDATED_CLASS_IDS_SLOT = 1;

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

@@ -23,7 +23,6 @@
 #define MAX_PROTOCOL_CONTRACTS 11
 #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_BALANCES_SLOT 1
 #define UPDATED_CLASS_IDS_SLOT 1

noir-projects/noir-contracts/Nargo.toml

@@ -28,11 +28,11 @@ members = [
     "contracts/fees/sponsored_fpc_contract",
     "contracts/message_discovery/handshake_registry_contract",
     "contracts/canonical/auth_registry_contract",
+    "contracts/canonical/multi_call_entrypoint_contract",
     "contracts/canonical/public_checks_contract",
     "contracts/protocol/contract_class_registry_contract",
     "contracts/protocol/contract_instance_registry_contract",
     "contracts/protocol/fee_juice_contract",
-    "contracts/protocol/multi_call_entrypoint_contract",
     "contracts/protocol_interface/contract_instance_registry_interface",
     "contracts/protocol_interface/fee_juice_interface",
     "contracts/test/generic_proxy_contract",

…ulti_call_entrypoint_contract/Nargo.toml …ulti_call_entrypoint_contract/Nargo.tomlnoir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/Nargo.toml renamed to noir-projects/noir-contracts/contracts/canonical/multi_call_entrypoint_contract/Nargo.toml noir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/Nargo.toml renamed to noir-projects/noir-contracts/contracts/canonical/multi_call_entrypoint_contract/Nargo.toml

@@ -1,6 +1,5 @@
 [
   "contract_instance_registry_contract-ContractInstanceRegistry",
   "contract_class_registry_contract-ContractClassRegistry",
-  "multi_call_entrypoint_contract-MultiCallEntrypoint",
   "fee_juice_contract-FeeJuice"
 ]

…lti_call_entrypoint_contract/src/main.nr …lti_call_entrypoint_contract/src/main.nrnoir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/src/main.nr renamed to noir-projects/noir-contracts/contracts/canonical/multi_call_entrypoint_contract/src/main.nr noir-projects/noir-contracts/contracts/protocol/multi_call_entrypoint_contract/src/main.nr renamed to noir-projects/noir-contracts/contracts/canonical/multi_call_entrypoint_contract/src/main.nr

@@ -224,13 +224,15 @@ pub global MAX_PROTOCOL_CONTRACTS: u32 = 11;
 // 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 MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(4);
 pub global FEE_JUICE_ADDRESS: AztecAddress = AztecAddress::from_field(5);
 
 // `SIDE_EFFECT_MASKING_ADDRESS` is used by the protocol circuits to silo the padding side effects. It's not a protocol

noir-projects/noir-contracts/protocol_contracts.json

@@ -69,6 +69,7 @@
     "@aztec/bb-prover": "workspace:^",
     "@aztec/blob-client": "workspace:^",
     "@aztec/blob-lib": "workspace:^",
+    "@aztec/canonical-contracts": "workspace:^",
     "@aztec/constants": "workspace:^",
     "@aztec/epoch-cache": "workspace:^",
     "@aztec/ethereum": "workspace:^",

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

@@ -18,6 +18,9 @@
     {
       "path": "../blob-lib"
     },
+    {
+      "path": "../canonical-contracts"
+    },
     {
       "path": "../constants"
     },