@aztec/protocol-contracts 0.0.0-test.1 → 0.0.1-commit.24de95ac

package/dest/instance-registry/contract_instance_updated_event.js

@@ -0,0 +1,35 @@
+import { CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE } from '@aztec/constants';
+import { FieldReader } from '@aztec/foundation/serialize';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ProtocolContractAddress } from '../protocol_contract_data.js';
+/** Event emitted from the ContractInstanceRegistry. */ export class ContractInstanceUpdatedEvent {
+    address;
+    prevContractClassId;
+    newContractClassId;
+    timestampOfChange;
+    constructor(address, prevContractClassId, newContractClassId, timestampOfChange){
+        this.address = address;
+        this.prevContractClassId = prevContractClassId;
+        this.newContractClassId = newContractClassId;
+        this.timestampOfChange = timestampOfChange;
+    }
+    static isContractInstanceUpdatedEvent(log) {
+        return log.contractAddress.equals(ProtocolContractAddress.ContractInstanceRegistry) && log.fields[0].toBigInt() === CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE;
+    }
+    static fromLog(log) {
+        const reader = new FieldReader(log.fields.slice(1));
+        const address = reader.readObject(AztecAddress);
+        const prevContractClassId = reader.readField();
+        const newContractClassId = reader.readField();
+        const timestampOfChange = reader.readField().toBigInt();
+        return new ContractInstanceUpdatedEvent(address, prevContractClassId, newContractClassId, timestampOfChange);
+    }
+    toContractInstanceUpdate() {
+        return {
+            address: this.address,
+            prevContractClassId: this.prevContractClassId,
+            newContractClassId: this.newContractClassId,
+            timestampOfChange: this.timestampOfChange
+        };
+    }
+}

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

@@ -1,7 +1,7 @@
 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 declare const ContractInstanceDeployerArtifact: import("@aztec/stdlib/abi").ContractArtifact;
+export declare const ContractInstanceRegistryArtifact: import("@aztec/stdlib/abi").ContractArtifact;
 /** Returns the canonical deployment of the contract. */
-export declare function getCanonicalInstanceDeployer(): Promise<ProtocolContract>;
+export declare function getCanonicalInstanceRegistry(): Promise<ProtocolContract>;
 //# sourceMappingURL=index.d.ts.map

package/dest/instance-registry/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instance-registry/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AAErD,eAAO,MAAM,gCAAgC,8CAE5C,CAAC;AAIF,wDAAwD;AACxD,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAK9E"}

package/dest/{instance-deployer → instance-registry}/index.js

@@ -1,15 +1,15 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import ContractInstanceDeployerJson from '../../artifacts/ContractInstanceDeployer.json' assert {
+import ContractInstanceRegistryJson from '../../artifacts/ContractInstanceRegistry.json' with {
     type: 'json'
 };
 import { makeProtocolContract } from '../make_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);
+export const ContractInstanceRegistryArtifact = loadContractArtifact(ContractInstanceRegistryJson);
 let protocolContract;
-/** Returns the canonical deployment of the contract. */ export async function getCanonicalInstanceDeployer() {
+/** Returns the canonical deployment of the contract. */ export async function getCanonicalInstanceRegistry() {
     if (!protocolContract) {
-        protocolContract = await makeProtocolContract('ContractInstanceDeployer', ContractInstanceDeployerArtifact);
+        protocolContract = await makeProtocolContract('ContractInstanceRegistry', ContractInstanceRegistryArtifact);
     }
     return protocolContract;
 }

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

@@ -1,8 +1,8 @@
 import { type ContractArtifact } from '@aztec/stdlib/abi';
 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 declare function getContractInstanceDeployerArtifact(): Promise<ContractArtifact>;
+export declare function getContractInstanceRegistryArtifact(): Promise<ContractArtifact>;
 /** Returns the canonical deployment of the auth registry. */
-export declare function getCanonicalInstanceDeployer(): Promise<ProtocolContract>;
+export declare function getCanonicalInstanceRegistry(): Promise<ProtocolContract>;
 //# sourceMappingURL=lazy.d.ts.map

package/dest/{instance-deployer → instance-registry}/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/instance-deployer/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,mBAAmB,CAAC;AAGhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AAKrD,wBAAsB,mCAAmC,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAWrF;AAED,6DAA6D;AAC7D,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAM9E"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/instance-registry/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,mBAAmB,CAAC;AAGhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AAKrD,wBAAsB,mCAAmC,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAWrF;AAED,6DAA6D;AAC7D,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAM9E"}

package/dest/instance-registry/lazy.js

@@ -0,0 +1,25 @@
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { makeProtocolContract } from '../make_protocol_contract.js';
+export * from './contract_instance_published_event.js';
+export * from './contract_instance_updated_event.js';
+let protocolContract;
+let protocolContractArtifact;
+export async function getContractInstanceRegistryArtifact() {
+    if (!protocolContractArtifact) {
+        // Cannot assert this import as it's incompatible with bundlers like vite
+        // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+        // Even if now supported by al major browsers, the MIME type is replaced with
+        // "text/javascript"
+        // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
+        const { default: contractInstanceRegistryJson } = await import('../../artifacts/ContractInstanceRegistry.json');
+        protocolContractArtifact = loadContractArtifact(contractInstanceRegistryJson);
+    }
+    return protocolContractArtifact;
+}
+/** Returns the canonical deployment of the auth registry. */ export async function getCanonicalInstanceRegistry() {
+    if (!protocolContract) {
+        const contractInstanceRegistryArtifact = await getContractInstanceRegistryArtifact();
+        protocolContract = await makeProtocolContract('ContractInstanceRegistry', contractInstanceRegistryArtifact);
+    }
+    return protocolContract;
+}

package/dest/make_protocol_contract.js

@@ -1,4 +1,4 @@
-import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { ProtocolContractAddress, ProtocolContractSalt } from './protocol_contract_data.js';
 /**
  * Returns the canonical deployment given its name and artifact.
@@ -8,7 +8,7 @@ import { ProtocolContractAddress, ProtocolContractSalt } from './protocol_contra
     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, {
+    const instance = await getContractInstanceFromInstantiationParams(artifact, {
         salt
     });
     return {

package/dest/multi-call-entrypoint/index.js

@@ -1,5 +1,5 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' assert {
+import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' with {
     type: 'json'
 };
 import { makeProtocolContract } from '../make_protocol_contract.js';

package/dest/multi-call-entrypoint/lazy.js

@@ -4,10 +4,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getMultiCallEntrypointArtifact() {
     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
+        // Cannot assert this import as it's incompatible with bundlers like vite
+        // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+        // Even if now supported by al major browsers, the MIME type is replaced with
+        // "text/javascript"
         // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
         const { default: multiCallEntrypointJson } = await import('../../artifacts/MultiCallEntrypoint.json');
         protocolContractArtifact = loadContractArtifact(multiCallEntrypointJson);

package/dest/protocol_contract_data.d.ts

@@ -1,21 +1,19 @@
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-export declare const protocolContractNames: readonly ["AuthRegistry", "ContractInstanceDeployer", "ContractClassRegisterer", "MultiCallEntrypoint", "FeeJuice", "Router"];
+import { ProtocolContracts } from '@aztec/stdlib/tx';
+export declare const protocolContractNames: readonly ["AuthRegistry", "ContractInstanceRegistry", "ContractClassRegistry", "MultiCallEntrypoint", "FeeJuice", "Router"];
 export type ProtocolContractName = typeof protocolContractNames[number];
 export declare const ProtocolContractSalt: Record<ProtocolContractName, Fr>;
 export declare const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>;
-export declare const ProtocolContractLeaves: {
-    AuthRegistry: Fr;
-    ContractInstanceDeployer: Fr;
-    ContractClassRegisterer: Fr;
-    MultiCallEntrypoint: Fr;
-    FeeJuice: Fr;
-    Router: Fr;
+export declare const ProtocolContractDerivedAddress: {
+    AuthRegistry: AztecAddress;
+    ContractInstanceRegistry: AztecAddress;
+    ContractClassRegistry: AztecAddress;
+    MultiCallEntrypoint: AztecAddress;
+    FeeJuice: AztecAddress;
+    Router: AztecAddress;
 };
-export declare const protocolContractTreeRoot: Fr;
-export declare const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG: Fr;
-export declare const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG: Fr;
-export declare const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG: Fr;
-export declare const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG: Fr;
-export declare const DEPLOYER_CONTRACT_INSTANCE_UPDATED_TAG: Fr;
+export declare const ProtocolContractsList: ProtocolContracts;
+export declare const protocolContractsHash: Fr;
+export declare const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG: Fr;
 //# sourceMappingURL=protocol_contract_data.d.ts.map

package/dest/protocol_contract_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_data.d.ts","sourceRoot":"","sources":["../src/protocol_contract_data.ts"],"names":[],"mappings":"AAEI,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,eAAO,MAAM,qBAAqB,+HAOxB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAIxE,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAOjE,CAAC;AAIF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAO9E,CAAC;AAIF,eAAO,MAAM,sBAAsB;;;;;;;CAOlC,CAAC;AAIF,eAAO,MAAM,wBAAwB,IAAyF,CAAC;AAIjI,eAAO,MAAM,wCAAwC,IAAyF,CAAC;AAC/I,eAAO,MAAM,2CAA2C,IAAyF,CAAC;AAClJ,eAAO,MAAM,iDAAiD,IAAyF,CAAC;AACxJ,eAAO,MAAM,uCAAuC,IAAyF,CAAC;AAC7I,eAAO,MAAM,sCAAsC,IAA+E,CAAC"}
+{"version":3,"file":"protocol_contract_data.d.ts","sourceRoot":"","sources":["../src/protocol_contract_data.ts"],"names":[],"mappings":"AAEI,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,eAAO,MAAM,qBAAqB,6HAOxB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAIxE,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAOjE,CAAC;AAIF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAO9E,CAAC;AAIF,eAAO,MAAM,8BAA8B;;;;;;;CAO1C,CAAC;AAIF,eAAO,MAAM,qBAAqB,mBAYhC,CAAC;AAEH,eAAO,MAAM,qBAAqB,IAAsF,CAAC;AAI3H,eAAO,MAAM,qCAAqC,IAAyF,CAAC"}

package/dest/protocol_contract_data.js

@@ -1,41 +1,51 @@
 // GENERATED FILE - DO NOT EDIT. RUN `yarn generate` or `yarn generate:data`
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ProtocolContracts } from '@aztec/stdlib/tx';
 export const protocolContractNames = [
     'AuthRegistry',
-    'ContractInstanceDeployer',
-    'ContractClassRegisterer',
+    'ContractInstanceRegistry',
+    'ContractClassRegistry',
     'MultiCallEntrypoint',
     'FeeJuice',
     'Router'
 ];
 export const ProtocolContractSalt = {
     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)
 };
 export const ProtocolContractAddress = {
     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)
 };
-export const ProtocolContractLeaves = {
-    AuthRegistry: Fr.fromHexString('0x1dc70bdab08ce08aef9f6ddcc8fd54fb91fdb72a6433c2dd6b69b33cf1fb87a2'),
-    ContractInstanceDeployer: Fr.fromHexString('0x005d6d6addbbda03dcad6fc9a3c3b7de457c30990ec2acaaf74f139a3a506e06'),
-    ContractClassRegisterer: Fr.fromHexString('0x110ef3d93e27fd61a5a56e479a9f9cbdb099d2d968cdcc16c01d2bdfd6cb0ddd'),
-    MultiCallEntrypoint: Fr.fromHexString('0x121f834b03a64d38463ae18ddebceeb4dce8192cc289052e175ad754a883a7fe'),
-    FeeJuice: Fr.fromHexString('0x141a566ade0bef915526762c2c2fb19b2a756ad7c82e83fde6dbf86848ecc131'),
-    Router: Fr.fromHexString('0x2c20bd328fbd33c01fbcda9e6299c31da5d5b29ea30e9c7b9d631618b839bca9')
+export const ProtocolContractDerivedAddress = {
+    AuthRegistry: AztecAddress.fromString('0x2e35b6e1a89ac2f901f3513f505249b9a485513ac7dd57f29f1183c0862473f2'),
+    ContractInstanceRegistry: AztecAddress.fromString('0x136eade704b136bae7c5282cf8f4e1ccc51835db840123034cfefbad76215c91'),
+    ContractClassRegistry: AztecAddress.fromString('0x2b9543f587c4d7976627ed8dfe0345f9e2efa846f618dea97372c1be7240994b'),
+    MultiCallEntrypoint: AztecAddress.fromString('0x191a929597d30fafe8d5708533b89bd4022c8d3194c8fcf37d04ac51a2f804eb'),
+    FeeJuice: AztecAddress.fromString('0x2f3ffae9d3b40e8f162fc2dabbd8dba5deaf112191dfa7be263a55073e16d082'),
+    Router: AztecAddress.fromString('0x00943dfa60dc08d7fb79f30220fdab942c0ba3364e45b69777015613983bab58')
 };
-export const protocolContractTreeRoot = Fr.fromHexString('0x093cc9324e5a7b44883f515ac490e7294ef8cb1e6d2d8c503255b1b3a9409262');
-export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = Fr.fromHexString('0x20cd27645f65c15a38720ca984aef936592f3938a705db706d068ad13fc58ae9');
-export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = Fr.fromHexString('0x0abf338154e355442d9916d630da0491036d5a7b23c42b477c1395ba3bf9b42d');
-export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = Fr.fromHexString('0x27774539896271d6dbe0c1de45ddc44709d1e8d9a9fb686ca3c105d87c417bb8');
-export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2');
-export const DEPLOYER_CONTRACT_INSTANCE_UPDATED_TAG = new Fr(1534834688047131268740281708431107902615560100979874281215533519862n);
+export const ProtocolContractsList = new ProtocolContracts([
+    AztecAddress.fromString('0x2e35b6e1a89ac2f901f3513f505249b9a485513ac7dd57f29f1183c0862473f2'),
+    AztecAddress.fromString('0x136eade704b136bae7c5282cf8f4e1ccc51835db840123034cfefbad76215c91'),
+    AztecAddress.fromString('0x2b9543f587c4d7976627ed8dfe0345f9e2efa846f618dea97372c1be7240994b'),
+    AztecAddress.fromString('0x191a929597d30fafe8d5708533b89bd4022c8d3194c8fcf37d04ac51a2f804eb'),
+    AztecAddress.fromString('0x2f3ffae9d3b40e8f162fc2dabbd8dba5deaf112191dfa7be263a55073e16d082'),
+    AztecAddress.fromString('0x00943dfa60dc08d7fb79f30220fdab942c0ba3364e45b69777015613983bab58'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+]);
+export const protocolContractsHash = Fr.fromString('0x1114ed602f51159e3e07a19f1b0ad7acbd7dee60fbf342ea0e46d9013f744679');
+export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x28da3fc471387d4e20b646b77abc8cdfc02a339a7507285a73d84f9b97b13486');

package/dest/provider/bundle.js

@@ -1,14 +1,14 @@
 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 { RouterArtifact } from '../router/index.js';
 export const ProtocolContractArtifact = {
     AuthRegistry: AuthRegistryArtifact,
-    ContractInstanceDeployer: ContractInstanceDeployerArtifact,
-    ContractClassRegisterer: ContractClassRegistererArtifact,
+    ContractInstanceRegistry: ContractInstanceRegistryArtifact,
+    ContractClassRegistry: ContractClassRegistryArtifact,
     MultiCallEntrypoint: MultiCallEntrypointArtifact,
     FeeJuice: FeeJuiceArtifact,
     Router: RouterArtifact

package/dest/provider/lazy.js

@@ -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 { getCanonicalRouter } from '../router/lazy.js';
 export class LazyProtocolContractsProvider {
@@ -9,10 +9,10 @@ export class LazyProtocolContractsProvider {
         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/dest/router/index.js

@@ -1,5 +1,5 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import RouterJson from '../../artifacts/Router.json' assert {
+import RouterJson from '../../artifacts/Router.json' with {
     type: 'json'
 };
 import { makeProtocolContract } from '../make_protocol_contract.js';

package/dest/router/lazy.js

@@ -4,10 +4,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getRouterArtifact() {
     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
+        // Cannot assert this import as it's incompatible with bundlers like vite
+        // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+        // Even if now supported by al major browsers, the MIME type is replaced with
+        // "text/javascript"
         // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
         const { default: routerJson } = await import('../../artifacts/Router.json');
         protocolContractArtifact = loadContractArtifact(routerJson);

package/dest/scripts/cleanup_artifacts.js

@@ -8,9 +8,9 @@ async function cleanupArtifacts(target) {
             continue;
         }
         const fileData = JSON.parse((await readFile(join(target, file), 'utf8')).toString());
-        fileData.file_map = {};
+        /* eslint-disable camelcase */ fileData.file_map = {};
         fileData.debug_symbols = {};
-        await writeFile(join(target, file), JSON.stringify(fileData));
+        /* eslint-enable camelcase */ await writeFile(join(target, file), JSON.stringify(fileData));
     }
 }
 await cleanupArtifacts(fileURLToPath(new URL('../../artifacts', import.meta.url).href));

package/dest/scripts/generate_data.js

@@ -1,13 +1,14 @@
-import { CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE, DEPLOYER_CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, REGISTERER_CONTRACT_ADDRESS, REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE, REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE, REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE, 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, MAX_PROTOCOL_CONTRACTS, MULTI_CALL_ENTRYPOINT_ADDRESS, ROUTER_ADDRESS } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
 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 { ProtocolContracts } from '@aztec/stdlib/tx';
 import { promises as fs } from 'fs';
 import path from 'path';
-import { buildProtocolContractTree } from '../build_protocol_contract_tree.js';
 const log = createConsoleLogger('autogenerate');
 const noirContractsRoot = '../../noir-projects/noir-contracts';
 const srcPath = path.join(noirContractsRoot, './target');
@@ -16,8 +17,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
@@ -49,20 +50,12 @@ async function copyArtifact(srcName, destName) {
     await fs.copyFile(src, dest);
     return artifact;
 }
-async function computeContractLeaf(artifact) {
-    const instance = await getContractInstanceFromDeployParams(loadContractArtifact(artifact), {
+async function computeAddress(artifact) {
+    const instance = await getContractInstanceFromInstantiationParams(loadContractArtifact(artifact), {
         salt
     });
     return instance.address;
 }
-async function computeRoot(names, leaves) {
-    const data = names.map((name, i)=>({
-            address: new AztecAddress(new Fr(contractAddressMapping[name])),
-            leaf: leaves[i]
-        }));
-    const tree = await buildProtocolContractTree(data);
-    return Fr.fromBuffer(tree.root);
-}
 async function generateDeclarationFile(destName) {
     const content = `
     import type { NoirCompiledContract } from '@aztec/stdlib/noir';
@@ -95,46 +88,47 @@ function generateContractAddresses(names) {
     };
   `;
 }
-function generateContractLeaves(names, leaves) {
+function generateDerivedAddresses(names, derivedAddresses) {
     return `
-    export const ProtocolContractLeaves = {
-      ${leaves.map((leaf, i)=>`${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
+    export const ProtocolContractDerivedAddress = {
+      ${derivedAddresses.map((address, i)=>`${names[i]}: AztecAddress.fromString('${address.toString()}')`).join(',\n')}
     };
   `;
 }
-async function generateRoot(names, leaves) {
-    const root = await computeRoot(names, leaves);
+async function generateProtocolContractsList(names, derivedAddresses) {
+    const list = makeTuple(MAX_PROTOCOL_CONTRACTS, ()=>AztecAddress.zero());
+    for(let i = 0; i < names.length; i++){
+        const name = names[i];
+        const address = contractAddressMapping[name];
+        const derivedAddressIndex = address - 1;
+        if (!list[derivedAddressIndex].equals(AztecAddress.zero())) {
+            throw new Error(`Duplicate protocol contract address: ${address.toString()}`);
+        }
+        list[derivedAddressIndex] = derivedAddresses[i];
+    }
     return `
-    export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
+    export const ProtocolContractsList = new ProtocolContracts([
+      ${list.map((address)=>`AztecAddress.fromString('${address.toString()}')`).join(',\n')}
+    ]);
+
+    export const protocolContractsHash = Fr.fromString('${(await new ProtocolContracts(list).hash()).toString()}');
   `;
 }
+// Generate the siloed log tags for events emitted via private logs.
 async function generateLogTags() {
-    // See silo_contract_class_log for all registerer tags
     return `
-  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = Fr.fromHexString('${await poseidon2Hash([
-        REGISTERER_CONTRACT_ADDRESS,
-        REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE
-    ])}');
-  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = Fr.fromHexString('${await poseidon2Hash([
-        REGISTERER_CONTRACT_ADDRESS,
-        REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE
-    ])}');
-  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = Fr.fromHexString('${await poseidon2Hash([
-        REGISTERER_CONTRACT_ADDRESS,
-        REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE
-    ])}');
-  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
     ])}');
-   export const DEPLOYER_CONTRACT_INSTANCE_UPDATED_TAG = new Fr(${DEPLOYER_CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE}n);
   `;
 }
-async function generateOutputFile(names, leaves) {
+async function generateOutputFile(names, derivedAddresses) {
     const content = `
     // GENERATED FILE - DO NOT EDIT. RUN \`yarn generate\` or \`yarn generate:data\`
     import { Fr } from '@aztec/foundation/fields';
     import { AztecAddress } from '@aztec/stdlib/aztec-address';
+    import { ProtocolContracts } from '@aztec/stdlib/tx';
 
     ${generateNames(names)}
 
@@ -142,9 +136,9 @@ async function generateOutputFile(names, leaves) {
 
     ${generateContractAddresses(names)}
 
-    ${generateContractLeaves(names, leaves)}
+    ${generateDerivedAddresses(names, derivedAddresses)}
 
-    ${await generateRoot(names, leaves)}
+    ${await generateProtocolContractsList(names, derivedAddresses)}
 
     ${await generateLogTags()}
   `;
@@ -153,17 +147,16 @@ async function generateOutputFile(names, leaves) {
 async function main() {
     await clearDestDir();
     const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
-    const leaves = [];
+    const derivedAddresses = [];
     const destNames = srcNames.map((n)=>n.split('-')[1]);
     for(let i = 0; i < srcNames.length; i++){
         const srcName = srcNames[i];
         const destName = destNames[i];
         const artifact = await copyArtifact(srcName, destName);
         await generateDeclarationFile(destName);
-        const contractLeaf = await computeContractLeaf(artifact);
-        leaves.push(contractLeaf.toField());
+        derivedAddresses.push(await computeAddress(artifact));
     }
-    await generateOutputFile(destNames, leaves);
+    await generateOutputFile(destNames, derivedAddresses);
 }
 try {
     await main();

package/dest/tests/fixtures.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-export declare function getSampleContractClassRegisteredEventPayload(): Buffer;
+export declare function getSampleContractClassPublishedEventPayload(): Buffer;
 export declare function getSamplePrivateFunctionBroadcastedEventPayload(): Buffer;
-export declare function getSampleUnconstrainedFunctionBroadcastedEventPayload(): Buffer;
-export declare function getSampleContractInstanceDeployedEventPayload(): Buffer;
+export declare function getSampleUtilityFunctionBroadcastedEventPayload(): 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,qDAAqD,IAAI,MAAM,CAG9E;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
@@ -12,13 +12,13 @@ export function getSamplePrivateFunctionBroadcastedEventPayload() {
     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 getSampleUnconstrainedFunctionBroadcastedEventPayload() {
-    const path = getPathToFixture('UnconstrainedFunctionBroadcastedEventData.hex');
+export function getSampleUtilityFunctionBroadcastedEventPayload() {
+    const path = getPathToFixture('UtilityFunctionBroadcastedEventData.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
-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) {