@aztec/protocol-contracts 1.2.1 → 2.0.0-nightly.20250813

package/dest/scripts/generate_data.js

@@ -1,10 +1,10 @@
-import { CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, REGISTERER_CONTRACT_ADDRESS, ROUTER_ADDRESS } from '@aztec/constants';
+import { CANONICAL_AUTH_REGISTRY_ADDRESS, CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS, CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE, CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, ROUTER_ADDRESS } from '@aztec/constants';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { createConsoleLogger } from '@aztec/foundation/log';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { buildProtocolContractTree } from '../build_protocol_contract_tree.js';
@@ -16,8 +16,8 @@ const outputFilePath = './src/protocol_contract_data.ts';
 const salt = new Fr(1);
 const contractAddressMapping = {
     AuthRegistry: CANONICAL_AUTH_REGISTRY_ADDRESS,
-    ContractInstanceDeployer: DEPLOYER_CONTRACT_ADDRESS,
-    ContractClassRegisterer: REGISTERER_CONTRACT_ADDRESS,
+    ContractInstanceRegistry: CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
+    ContractClassRegistry: CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS,
     MultiCallEntrypoint: MULTI_CALL_ENTRYPOINT_ADDRESS,
     FeeJuice: FEE_JUICE_ADDRESS,
     Router: ROUTER_ADDRESS
@@ -50,7 +50,7 @@ async function copyArtifact(srcName, destName) {
     return artifact;
 }
 async function computeContractLeaf(artifact) {
-    const instance = await getContractInstanceFromDeployParams(loadContractArtifact(artifact), {
+    const instance = await getContractInstanceFromInstantiationParams(loadContractArtifact(artifact), {
         salt
     });
     return instance.address;
@@ -111,9 +111,9 @@ async function generateRoot(names, leaves) {
 // Generate the siloed log tags for events emitted via private logs.
 async function generateLogTags() {
     return `
-  export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('${await poseidon2Hash([
-        DEPLOYER_CONTRACT_ADDRESS,
-        DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE
+  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('${await poseidon2Hash([
+        CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
+        CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE
     ])}');
   `;
 }

package/dest/tests/fixtures.d.ts

@@ -1,6 +1,6 @@
-export declare function getSampleContractClassRegisteredEventPayload(): Buffer;
+export declare function getSampleContractClassPublishedEventPayload(): Buffer;
 export declare function getSamplePrivateFunctionBroadcastedEventPayload(): Buffer;
 export declare function getSampleUtilityFunctionBroadcastedEventPayload(): Buffer;
-export declare function getSampleContractInstanceDeployedEventPayload(): Buffer;
+export declare function getSampleContractInstancePublishedEventPayload(): Buffer;
 export declare function getPathToFixture(name: string): string;
 //# sourceMappingURL=fixtures.d.ts.map

package/dest/tests/fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/tests/fixtures.ts"],"names":[],"mappings":"AAKA,wBAAgB,4CAA4C,IAAI,MAAM,CAGrE;AAGD,wBAAgB,+CAA+C,IAAI,MAAM,CAGxE;AAGD,wBAAgB,+CAA+C,IAAI,MAAM,CAGxE;AAGD,wBAAgB,6CAA6C,IAAI,MAAM,CAGtE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,UAE5C"}
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/tests/fixtures.ts"],"names":[],"mappings":"AAKA,wBAAgB,2CAA2C,IAAI,MAAM,CAGpE;AAGD,wBAAgB,+CAA+C,IAAI,MAAM,CAGxE;AAGD,wBAAgB,+CAA+C,IAAI,MAAM,CAGxE;AAGD,wBAAgB,8CAA8C,IAAI,MAAM,CAGvE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,UAE5C"}

package/dest/tests/fixtures.js

@@ -2,8 +2,8 @@ import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleContractClassRegisteredEventPayload() {
-    const path = getPathToFixture('ContractClassRegisteredEventData.hex');
+export function getSampleContractClassPublishedEventPayload() {
+    const path = getPathToFixture('ContractClassPublishedEventData.hex');
     return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
@@ -17,8 +17,8 @@ export function getSampleUtilityFunctionBroadcastedEventPayload() {
     return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleContractInstanceDeployedEventPayload() {
-    const path = getPathToFixture('ContractInstanceDeployedEventData.hex');
+export function getSampleContractInstancePublishedEventPayload() {
+    const path = getPathToFixture('ContractInstancePublishedEventData.hex');
     return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 export function getPathToFixture(name) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aztec/protocol-contracts",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/protocol-contracts",
   "description": "Canonical Noir contracts for the Aztec Network",
-  "version": "1.2.1",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -14,8 +14,8 @@
   "typedocOptions": {
     "entryPoints": [
       "./src/index.ts",
-      "./src/class-registerer/index.ts",
-      "./src/instance-deployer/index.ts"
+      "./src/class-registry/index.ts",
+      "./src/instance-registry/index.ts"
     ],
     "name": "Protocol Contracts",
     "tsconfig": "./tsconfig.json"
@@ -73,9 +73,9 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "1.2.1",
-    "@aztec/foundation": "1.2.1",
-    "@aztec/stdlib": "1.2.1",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
     "lodash.chunk": "^4.2.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.4.0"

package/src/class-registry/__snapshots__/README.md

@@ -0,0 +1,9 @@
+# How to update these snapshots
+
+(You probably need to have done a `./bootstrap.sh` at some point)
+
+From the root:
+
+`cd yarn-project/protocol-contracts`
+
+`yarn test -u`

package/src/{class-registerer/contract_class_registered_event.ts → class-registry/contract_class_published_event.ts}

@@ -1,4 +1,4 @@
-import { REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE } from '@aztec/constants';
+import { CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { bufferFromFields } from '@aztec/stdlib/abi';
@@ -11,8 +11,8 @@ import type { ContractClassLog } from '@aztec/stdlib/logs';
 
 import { ProtocolContractAddress } from '../protocol_contract_data.js';
 
-/** Event emitted from the ContractClassRegisterer. */
-export class ContractClassRegisteredEvent {
+/** Event emitted from the ContractClassRegistry. */
+export class ContractClassPublishedEvent {
   constructor(
     public readonly contractClassId: Fr,
     public readonly version: number,
@@ -21,10 +21,10 @@ export class ContractClassRegisteredEvent {
     public readonly packedPublicBytecode: Buffer,
   ) {}
 
-  static isContractClassRegisteredEvent(log: ContractClassLog) {
+  static isContractClassPublishedEvent(log: ContractClassLog) {
     return (
-      log.contractAddress.equals(ProtocolContractAddress.ContractClassRegisterer) &&
-      log.fields.fields[0].toBigInt() === REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE
+      log.contractAddress.equals(ProtocolContractAddress.ContractClassRegistry) &&
+      log.fields.fields[0].toBigInt() === CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE
     );
   }
 
@@ -37,7 +37,7 @@ export class ContractClassRegisteredEvent {
     const privateFunctionsRoot = reader.readField();
     const packedPublicBytecode = bufferFromFields(reader.readFieldArray(fieldsWithoutTag.length - reader.cursor));
 
-    return new ContractClassRegisteredEvent(
+    return new ContractClassPublishedEvent(
       contractClassId,
       version,
       artifactHash,

package/src/{class-registerer → class-registry}/index.ts

@@ -1,25 +1,23 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import ContractClassRegistererJson from '../../artifacts/ContractClassRegisterer.json' with { type: 'json' };
+import ContractClassRegistryJson from '../../artifacts/ContractClassRegistry.json' with { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
-export * from './contract_class_registered_event.js';
+export * from './contract_class_published_event.js';
 export * from './private_function_broadcasted_event.js';
 export * from './utility_function_broadcasted_event.js';
 
-export const ContractClassRegistererArtifact = loadContractArtifact(
-  ContractClassRegistererJson as NoirCompiledContract,
-);
+export const ContractClassRegistryArtifact = loadContractArtifact(ContractClassRegistryJson as NoirCompiledContract);
 
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalClassRegisterer(): Promise<ProtocolContract> {
+export async function getCanonicalClassRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    const artifact = ContractClassRegistererArtifact;
-    protocolContract = await makeProtocolContract('ContractClassRegisterer', artifact);
+    const artifact = ContractClassRegistryArtifact;
+    protocolContract = await makeProtocolContract('ContractClassRegistry', artifact);
   }
   return protocolContract;
 }

package/src/{class-registerer → class-registry}/lazy.ts

@@ -3,31 +3,31 @@ import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
-export * from './contract_class_registered_event.js';
+export * from './contract_class_published_event.js';
 export * from './private_function_broadcasted_event.js';
 export * from './utility_function_broadcasted_event.js';
 
 let protocolContract: ProtocolContract;
 let protocolContractArtifact: ContractArtifact;
 
-export async function getContractClassRegistererArtifact(): Promise<ContractArtifact> {
+export async function getContractClassRegistryArtifact(): Promise<ContractArtifact> {
   if (!protocolContractArtifact) {
     // Cannot assert this import as it's incompatible with browsers
     // https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
     // Use the new "with" syntax once supported by firefox
     // https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
     // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
-    const { default: contractClassRegistererJson } = await import('../../artifacts/ContractClassRegisterer.json');
-    protocolContractArtifact = loadContractArtifact(contractClassRegistererJson);
+    const { default: contractClassRegistryJson } = await import('../../artifacts/ContractClassRegistry.json');
+    protocolContractArtifact = loadContractArtifact(contractClassRegistryJson);
   }
   return protocolContractArtifact;
 }
 
 /** Returns the canonical deployment of the auth registry. */
-export async function getCanonicalClassRegisterer(): Promise<ProtocolContract> {
+export async function getCanonicalClassRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    const contractClassRegistererArtifact = await getContractClassRegistererArtifact();
-    protocolContract = await makeProtocolContract('ContractClassRegisterer', contractClassRegistererArtifact);
+    const contractClassRegistryArtifact = await getContractClassRegistryArtifact();
+    protocolContract = await makeProtocolContract('ContractClassRegistry', contractClassRegistryArtifact);
   }
   return protocolContract;
 }

package/src/{class-registerer → class-registry}/private_function_broadcasted_event.ts

@@ -1,8 +1,8 @@
 import {
   ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
+  CONTRACT_CLASS_REGISTRY_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE,
   FUNCTION_TREE_HEIGHT,
   MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
-  REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE,
 } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import type { Tuple } from '@aztec/foundation/serialize';
@@ -13,7 +13,7 @@ import type { ContractClassLog } from '@aztec/stdlib/logs';
 
 import { ProtocolContractAddress } from '../protocol_contract_data.js';
 
-/** Event emitted from the ContractClassRegisterer. */
+/** Event emitted from the ContractClassRegistry. */
 export class PrivateFunctionBroadcastedEvent {
   constructor(
     public readonly contractClassId: Fr,
@@ -28,8 +28,8 @@ export class PrivateFunctionBroadcastedEvent {
 
   static isPrivateFunctionBroadcastedEvent(log: ContractClassLog) {
     return (
-      log.contractAddress.equals(ProtocolContractAddress.ContractClassRegisterer) &&
-      log.fields.fields[0].toBigInt() === REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE
+      log.contractAddress.equals(ProtocolContractAddress.ContractClassRegistry) &&
+      log.fields.fields[0].toBigInt() === CONTRACT_CLASS_REGISTRY_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE
     );
   }
 

package/src/{class-registerer → class-registry}/utility_function_broadcasted_event.ts

@@ -1,7 +1,7 @@
 import {
   ARTIFACT_FUNCTION_TREE_MAX_HEIGHT,
+  CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE,
   MAX_PACKED_BYTECODE_SIZE_PER_UTILITY_FUNCTION_IN_FIELDS,
-  REGISTERER_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE,
 } from '@aztec/constants';
 import { removeArrayPaddingEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
@@ -13,7 +13,7 @@ import type { ContractClassLog } from '@aztec/stdlib/logs';
 
 import { ProtocolContractAddress } from '../protocol_contract_data.js';
 
-/** Event emitted from the ContractClassRegisterer. */
+/** Event emitted from the ContractClassRegistry. */
 export class UtilityFunctionBroadcastedEvent {
   constructor(
     public readonly contractClassId: Fr,
@@ -26,8 +26,8 @@ export class UtilityFunctionBroadcastedEvent {
 
   static isUtilityFunctionBroadcastedEvent(log: ContractClassLog) {
     return (
-      log.contractAddress.equals(ProtocolContractAddress.ContractClassRegisterer) &&
-      log.fields.fields[0].toBigInt() === REGISTERER_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE
+      log.contractAddress.equals(ProtocolContractAddress.ContractClassRegistry) &&
+      log.fields.fields[0].toBigInt() === CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE
     );
   }
 

package/src/instance-registry/__snapshots__/README.md

@@ -0,0 +1,9 @@
+# How to update these snapshots
+
+(You probably need to have done a `./bootstrap.sh` at some point)
+
+From the root:
+
+`cd yarn-project/protocol-contracts`
+
+`yarn test -u`

package/src/{instance-deployer/contract_instance_deployed_event.ts → instance-registry/contract_instance_published_event.ts}

@@ -5,10 +5,10 @@ import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import type { PrivateLog } from '@aztec/stdlib/logs';
 
-import { DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG } from '../protocol_contract_data.js';
+import { CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG } from '../protocol_contract_data.js';
 
-/** Event emitted from the ContractInstanceDeployer. */
-export class ContractInstanceDeployedEvent {
+/** Event emitted from the ContractInstanceRegistry. */
+export class ContractInstancePublishedEvent {
   constructor(
     public readonly address: AztecAddress,
     public readonly version: number,
@@ -19,8 +19,8 @@ export class ContractInstanceDeployedEvent {
     public readonly deployer: AztecAddress,
   ) {}
 
-  static isContractInstanceDeployedEvent(log: PrivateLog) {
-    return log.fields[0].equals(DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG);
+  static isContractInstancePublishedEvent(log: PrivateLog) {
+    return log.fields[0].equals(CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG);
   }
 
   static fromLog(log: PrivateLog) {
@@ -34,7 +34,7 @@ export class ContractInstanceDeployedEvent {
     const publicKeys = reader.readObject(PublicKeys);
     const deployer = reader.readObject(AztecAddress);
 
-    return new ContractInstanceDeployedEvent(
+    return new ContractInstancePublishedEvent(
       address,
       version,
       salt,

package/src/{instance-deployer → instance-registry}/contract_instance_updated_event.ts

@@ -1,4 +1,4 @@
-import { DEPLOYER_CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE } from '@aztec/constants';
+import { CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -8,7 +8,7 @@ import type { UInt64 } from '@aztec/stdlib/types';
 
 import { ProtocolContractAddress } from '../protocol_contract_data.js';
 
-/** Event emitted from the ContractInstanceDeployer. */
+/** Event emitted from the ContractInstanceRegistry. */
 export class ContractInstanceUpdatedEvent {
   constructor(
     public readonly address: AztecAddress,
@@ -19,8 +19,8 @@ export class ContractInstanceUpdatedEvent {
 
   static isContractInstanceUpdatedEvent(log: PublicLog) {
     return (
-      log.contractAddress.equals(ProtocolContractAddress.ContractInstanceDeployer) &&
-      log.fields[0].toBigInt() === DEPLOYER_CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE
+      log.contractAddress.equals(ProtocolContractAddress.ContractInstanceRegistry) &&
+      log.fields[0].toBigInt() === CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE
     );
   }
 

package/src/{instance-deployer → instance-registry}/index.ts

@@ -1,23 +1,23 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import ContractInstanceDeployerJson from '../../artifacts/ContractInstanceDeployer.json' with { type: 'json' };
+import ContractInstanceRegistryJson from '../../artifacts/ContractInstanceRegistry.json' with { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
-export * from './contract_instance_deployed_event.js';
+export * from './contract_instance_published_event.js';
 export * from './contract_instance_updated_event.js';
 
-export const ContractInstanceDeployerArtifact = loadContractArtifact(
-  ContractInstanceDeployerJson as NoirCompiledContract,
+export const ContractInstanceRegistryArtifact = loadContractArtifact(
+  ContractInstanceRegistryJson as NoirCompiledContract,
 );
 
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalInstanceDeployer(): Promise<ProtocolContract> {
+export async function getCanonicalInstanceRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    protocolContract = await makeProtocolContract('ContractInstanceDeployer', ContractInstanceDeployerArtifact);
+    protocolContract = await makeProtocolContract('ContractInstanceRegistry', ContractInstanceRegistryArtifact);
   }
   return protocolContract;
 }

package/src/{instance-deployer → instance-registry}/lazy.ts

@@ -3,30 +3,30 @@ import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
-export * from './contract_instance_deployed_event.js';
+export * from './contract_instance_published_event.js';
 export * from './contract_instance_updated_event.js';
 
 let protocolContract: ProtocolContract;
 let protocolContractArtifact: ContractArtifact;
 
-export async function getContractInstanceDeployerArtifact(): Promise<ContractArtifact> {
+export async function getContractInstanceRegistryArtifact(): Promise<ContractArtifact> {
   if (!protocolContractArtifact) {
     // Cannot assert this import as it's incompatible with browsers
     // https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
     // Use the new "with" syntax once supported by firefox
     // https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
     // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
-    const { default: contractInstanceDeployerJson } = await import('../../artifacts/ContractInstanceDeployer.json');
-    protocolContractArtifact = loadContractArtifact(contractInstanceDeployerJson);
+    const { default: contractInstanceRegistryJson } = await import('../../artifacts/ContractInstanceRegistry.json');
+    protocolContractArtifact = loadContractArtifact(contractInstanceRegistryJson);
   }
   return protocolContractArtifact;
 }
 
 /** Returns the canonical deployment of the auth registry. */
-export async function getCanonicalInstanceDeployer(): Promise<ProtocolContract> {
+export async function getCanonicalInstanceRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    const contractInstanceDeployerArtifact = await getContractInstanceDeployerArtifact();
-    protocolContract = await makeProtocolContract('ContractInstanceDeployer', contractInstanceDeployerArtifact);
+    const contractInstanceRegistryArtifact = await getContractInstanceRegistryArtifact();
+    protocolContract = await makeProtocolContract('ContractInstanceRegistry', contractInstanceRegistryArtifact);
   }
   return protocolContract;
 }

package/src/make_protocol_contract.ts

@@ -1,5 +1,5 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 
 import type { ProtocolContract } from './protocol_contract.js';
 import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from './protocol_contract_data.js';
@@ -16,7 +16,7 @@ export async function makeProtocolContract(
   const salt = ProtocolContractSalt[name];
   // TODO(@spalladino): This computes the contract class from the artifact twice.
   const contractClass = await getContractClassFromArtifact(artifact);
-  const instance = await getContractInstanceFromDeployParams(artifact, { salt });
+  const instance = await getContractInstanceFromInstantiationParams(artifact, { salt });
   return {
     instance: { ...instance, address },
     contractClass,

package/src/protocol_contract_data.ts

@@ -6,8 +6,8 @@
     
     export const protocolContractNames = [
       'AuthRegistry',
-'ContractInstanceDeployer',
-'ContractClassRegisterer',
+'ContractInstanceRegistry',
+'ContractClassRegistry',
 'MultiCallEntrypoint',
 'FeeJuice',
 'Router'
@@ -19,8 +19,8 @@
     
     export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
       AuthRegistry: new Fr(1),
-ContractInstanceDeployer: new Fr(1),
-ContractClassRegisterer: new Fr(1),
+ContractInstanceRegistry: new Fr(1),
+ContractClassRegistry: new Fr(1),
 MultiCallEntrypoint: new Fr(1),
 FeeJuice: new Fr(1),
 Router: new Fr(1)
@@ -30,8 +30,8 @@ Router: new Fr(1)
     
     export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
       AuthRegistry: AztecAddress.fromBigInt(1n),
-ContractInstanceDeployer: AztecAddress.fromBigInt(2n),
-ContractClassRegisterer: AztecAddress.fromBigInt(3n),
+ContractInstanceRegistry: AztecAddress.fromBigInt(2n),
+ContractClassRegistry: AztecAddress.fromBigInt(3n),
 MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
 FeeJuice: AztecAddress.fromBigInt(5n),
 Router: AztecAddress.fromBigInt(6n)
@@ -40,20 +40,20 @@ Router: AztecAddress.fromBigInt(6n)
 
     
     export const ProtocolContractLeaves = {
-      AuthRegistry: Fr.fromHexString('0x2f6bd1a89bea5be521192b074d53d5b817eb0773fb4796808b7cdbb43e97f4ad'),
-ContractInstanceDeployer: Fr.fromHexString('0x1418af8890574a35028cf969a94453459e1c77c4c93b1061cdf8fb03fc4dcce3'),
-ContractClassRegisterer: Fr.fromHexString('0x201dc45e1087ee8bc9670d05d148d9c000b0a2d53e7d2fe00ffde9f24036c525'),
-MultiCallEntrypoint: Fr.fromHexString('0x245e788b0c40a2eb49e49dd4a6b879051a1858e049c4c42f53aaab2c6bc32047'),
-FeeJuice: Fr.fromHexString('0x2a6db4554b77a284cbfd14c6339cf2396ef59e50a5a52bddf8154400e3c42c1e'),
-Router: Fr.fromHexString('0x038226b32405bcbe548a8dd4c4790401b9193ebf8782e9f60a429ad7ecc58f05')
+      AuthRegistry: Fr.fromHexString('0x0789f6cb8356ce8d99f1173ce12232925aa61eb511e58a9b219b9548221a9147'),
+ContractInstanceRegistry: Fr.fromHexString('0x236bb82e4b4c5ed15d7cf6d7922a865c7a894023b8d6de6c1bd9f3f26ec6a8ec'),
+ContractClassRegistry: Fr.fromHexString('0x015e83a2205aa99d698426c8f788185df5d8a7b44020a43ab1b77f3313cd5fdc'),
+MultiCallEntrypoint: Fr.fromHexString('0x1c6a82b9e3aa1cc8106270090201f47e43273f079271d9122b3b4563d554c40c'),
+FeeJuice: Fr.fromHexString('0x18862ab00fb03f7e566ad42d2d79f4274cf71499a8eca648289320f529fe1293'),
+Router: Fr.fromHexString('0x1a090e8ce78e960012ef09c2bb32d6691540b2cba5b88abfb8bdb19d6d3d894c')
     };
   
 
     
-    export const protocolContractTreeRoot = Fr.fromHexString('0x00d0980697e140a074810b2bee11c5042763b87e95bfdbf2f28269c79e6abad6');
+    export const protocolContractTreeRoot = Fr.fromHexString('0x0ce924440a6c63d9f268ac8686b7c75e9cc73cb2b8a57680c9af544cb47d10d6');
   
 
     
-  export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2');
+  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x28da3fc471387d4e20b646b77abc8cdfc02a339a7507285a73d84f9b97b13486');
   
   

package/src/provider/bundle.ts

@@ -1,9 +1,9 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 
 import { AuthRegistryArtifact } from '../auth-registry/index.js';
-import { ContractClassRegistererArtifact } from '../class-registerer/index.js';
+import { ContractClassRegistryArtifact } from '../class-registry/index.js';
 import { FeeJuiceArtifact } from '../fee-juice/index.js';
-import { ContractInstanceDeployerArtifact } from '../instance-deployer/index.js';
+import { ContractInstanceRegistryArtifact } from '../instance-registry/index.js';
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js';
 import type { ProtocolContract } from '../protocol_contract.js';
@@ -13,8 +13,8 @@ import type { ProtocolContractsProvider } from './protocol_contracts_provider.js
 
 export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
   AuthRegistry: AuthRegistryArtifact,
-  ContractInstanceDeployer: ContractInstanceDeployerArtifact,
-  ContractClassRegisterer: ContractClassRegistererArtifact,
+  ContractInstanceRegistry: ContractInstanceRegistryArtifact,
+  ContractClassRegistry: ContractClassRegistryArtifact,
   MultiCallEntrypoint: MultiCallEntrypointArtifact,
   FeeJuice: FeeJuiceArtifact,
   Router: RouterArtifact,

package/src/provider/lazy.ts

@@ -1,7 +1,7 @@
 import { getCanonicalAuthRegistry } from '../auth-registry/lazy.js';
-import { getCanonicalClassRegisterer } from '../class-registerer/lazy.js';
+import { getCanonicalClassRegistry } from '../class-registry/lazy.js';
 import { getCanonicalFeeJuice } from '../fee-juice/lazy.js';
-import { getCanonicalInstanceDeployer } from '../instance-deployer/lazy.js';
+import { getCanonicalInstanceRegistry } from '../instance-registry/lazy.js';
 import { getCanonicalMultiCallEntrypoint } from '../multi-call-entrypoint/lazy.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
@@ -13,10 +13,10 @@ export class LazyProtocolContractsProvider implements ProtocolContractsProvider
     switch (name) {
       case 'AuthRegistry':
         return getCanonicalAuthRegistry();
-      case 'ContractInstanceDeployer':
-        return getCanonicalInstanceDeployer();
-      case 'ContractClassRegisterer':
-        return getCanonicalClassRegisterer();
+      case 'ContractInstanceRegistry':
+        return getCanonicalInstanceRegistry();
+      case 'ContractClassRegistry':
+        return getCanonicalClassRegistry();
       case 'MultiCallEntrypoint':
         return getCanonicalMultiCallEntrypoint();
       case 'FeeJuice':

package/src/tests/fixtures.ts

@@ -3,8 +3,8 @@ import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleContractClassRegisteredEventPayload(): Buffer {
-  const path = getPathToFixture('ContractClassRegisteredEventData.hex');
+export function getSampleContractClassPublishedEventPayload(): Buffer {
+  const path = getPathToFixture('ContractClassPublishedEventData.hex');
   return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 
@@ -21,8 +21,8 @@ export function getSampleUtilityFunctionBroadcastedEventPayload(): Buffer {
 }
 
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleContractInstanceDeployedEventPayload(): Buffer {
-  const path = getPathToFixture('ContractInstanceDeployedEventData.hex');
+export function getSampleContractInstancePublishedEventPayload(): Buffer {
+  const path = getPathToFixture('ContractInstancePublishedEventData.hex');
   return Buffer.from(readFileSync(path).toString(), 'hex');
 }