@aztec/protocol-contracts 0.0.0-test.0 → 0.0.1-commit.001888fc

package/dest/provider/bundle.js

@@ -1,20 +1,20 @@
 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';
+import { PublicChecksArtifact } from '../public-checks/index.js';
 export const ProtocolContractArtifact = {
     AuthRegistry: AuthRegistryArtifact,
-    ContractInstanceDeployer: ContractInstanceDeployerArtifact,
-    ContractClassRegisterer: ContractClassRegistererArtifact,
+    ContractInstanceRegistry: ContractInstanceRegistryArtifact,
+    ContractClassRegistry: ContractClassRegistryArtifact,
     MultiCallEntrypoint: MultiCallEntrypointArtifact,
     FeeJuice: FeeJuiceArtifact,
-    Router: RouterArtifact
+    PublicChecks: PublicChecksArtifact
 };
 export class BundledProtocolContractsProvider {
     getProtocolContractArtifact(name) {
-        return makeProtocolContract(name, ProtocolContractArtifact[name]);
+        return Promise.resolve(makeProtocolContract(name, ProtocolContractArtifact[name]));
     }
 }

package/dest/provider/lazy.d.ts

@@ -4,4 +4,4 @@ import type { ProtocolContractsProvider } from './protocol_contracts_provider.js
 export declare class LazyProtocolContractsProvider implements ProtocolContractsProvider {
     getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract>;
 }
-//# sourceMappingURL=lazy.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Byb3ZpZGVyL2xhenkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0EsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRXpFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFFbEYscUJBQWEsNkJBQThCLFlBQVcseUJBQXlCO0lBQzdFLDJCQUEyQixDQUFDLElBQUksRUFBRSxvQkFBb0IsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FpQmpGO0NBQ0YifQ==

package/dest/provider/lazy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/provider/lazy.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAElF,qBAAa,6BAA8B,YAAW,yBAAyB;IAC7E,2BAA2B,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAkBnF"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/provider/lazy.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAElF,qBAAa,6BAA8B,YAAW,yBAAyB;IAC7E,2BAA2B,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiBjF;CACF"}

package/dest/provider/lazy.js

@@ -1,24 +1,24 @@
 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';
+import { getCanonicalPublicChecks } from '../public-checks/lazy.js';
 export class LazyProtocolContractsProvider {
     getProtocolContractArtifact(name) {
         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':
                 return getCanonicalFeeJuice();
-            case 'Router':
-                return getCanonicalRouter();
+            case 'PublicChecks':
+                return getCanonicalPublicChecks();
             default:
                 throw new Error(`Unknown protocol contract name: ${name}`);
         }

package/dest/provider/protocol_contracts_provider.d.ts

@@ -4,4 +4,4 @@ import type { ProtocolContractName } from '../protocol_contract_data.js';
 export interface ProtocolContractsProvider {
     getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract>;
 }
-//# sourceMappingURL=protocol_contracts_provider.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RzX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmlkZXIvcHJvdG9jb2xfY29udHJhY3RzX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUV6RSw0REFBNEQ7QUFDNUQsTUFBTSxXQUFXLHlCQUF5QjtJQUN4QywyQkFBMkIsQ0FBQyxJQUFJLEVBQUUsb0JBQW9CLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7Q0FDcEYifQ==

package/dest/public-checks/index.d.ts

@@ -0,0 +1,5 @@
+import type { ProtocolContract } from '../protocol_contract.js';
+export declare const PublicChecksArtifact: import("@aztec/stdlib/abi").ContractArtifact;
+/** Returns the canonical deployment of the contract. */
+export declare function getCanonicalPublicChecks(): Promise<ProtocolContract>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMtY2hlY2tzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEUsZUFBTyxNQUFNLG9CQUFvQiw4Q0FBaUUsQ0FBQztBQUluRyx3REFBd0Q7QUFDeEQsd0JBQWdCLHdCQUF3QixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQUtwRSJ9

package/dest/public-checks/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public-checks/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,oBAAoB,8CAAiE,CAAC;AAInG,wDAAwD;AACxD,wBAAgB,wBAAwB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKpE"}

package/dest/public-checks/index.js

@@ -0,0 +1,13 @@
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import PublicChecksJson from '../../artifacts/PublicChecks.json' with {
+    type: 'json'
+};
+import { makeProtocolContract } from '../make_protocol_contract.js';
+export const PublicChecksArtifact = loadContractArtifact(PublicChecksJson);
+let protocolContract;
+/** Returns the canonical deployment of the contract. */ export function getCanonicalPublicChecks() {
+    if (!protocolContract) {
+        protocolContract = makeProtocolContract('PublicChecks', PublicChecksArtifact);
+    }
+    return Promise.resolve(protocolContract);
+}

package/dest/public-checks/lazy.d.ts

@@ -0,0 +1,6 @@
+import { type ContractArtifact } from '@aztec/stdlib/abi';
+import type { ProtocolContract } from '../protocol_contract.js';
+export declare function getPublicChecksArtifact(): Promise<ContractArtifact>;
+/** Returns the canonical deployment of the public checks contract. */
+export declare function getCanonicalPublicChecks(): Promise<ProtocolContract>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGF6eS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy1jaGVja3MvbGF6eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBd0IsTUFBTSxtQkFBbUIsQ0FBQztBQUdoRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFLHdCQUFzQix1QkFBdUIsSUFBSSxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FXekU7QUFFRCxzRUFBc0U7QUFDdEUsd0JBQXNCLHdCQUF3QixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQU0xRSJ9

package/dest/public-checks/lazy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/public-checks/lazy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,mBAAmB,CAAC;AAGhF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAWzE;AAED,sEAAsE;AACtE,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAM1E"}

package/dest/public-checks/lazy.js

@@ -0,0 +1,23 @@
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { makeProtocolContract } from '../make_protocol_contract.js';
+let protocolContract;
+let protocolContractArtifact;
+export async function getPublicChecksArtifact() {
+    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: publicChecksJson } = await import('../../artifacts/PublicChecks.json');
+        protocolContractArtifact = loadContractArtifact(publicChecksJson);
+    }
+    return protocolContractArtifact;
+}
+/** Returns the canonical deployment of the public checks contract. */ export async function getCanonicalPublicChecks() {
+    if (!protocolContract) {
+        const publicChecksArtifact = await getPublicChecksArtifact();
+        protocolContract = makeProtocolContract('PublicChecks', publicChecksArtifact);
+    }
+    return protocolContract;
+}

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,19 @@
-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 { poseidon2Hash } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+// Reads compiled Noir artifacts for each protocol contract and derives their addresses, class IDs,
+// bytecode commitments, and other deployment data, emitting everything as precomputed constants into
+// `protocol_contract_data.ts`. This avoids clients repeating the expensive hashing at runtime and
+// ensures a single source of truth for the protocol contracts hash enforced by circuits, P2P, and L1.
+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, PUBLIC_CHECKS_ADDRESS } from '@aztec/constants';
+import { makeTuple } from '@aztec/foundation/array';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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 { computeContractAddressFromInstance, computeInitializationHash, getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { computeSiloedPrivateLogFirstField } from '@aztec/stdlib/hash';
+import { PublicKeys } from '@aztec/stdlib/keys';
+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,11 +22,11 @@ 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
+    PublicChecks: PUBLIC_CHECKS_ADDRESS
 };
 async function clearDestDir() {
     try {
@@ -49,19 +55,32 @@ async function copyArtifact(srcName, destName) {
     await fs.copyFile(src, dest);
     return artifact;
 }
-async function computeContractLeaf(artifact) {
-    const instance = await getContractInstanceFromDeployParams(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);
+// Precompute all the expensive contract data that can be obtained from the artifact, to avoid redundant computations in clients.
+// Protocol contracts come from a trusted source, so no class verifications are needed.
+async function computeContractData(artifact, deployer) {
+    const loaded = loadContractArtifact(artifact);
+    const contractClass = await getContractClassFromArtifact(loaded);
+    const constructorArtifact = loaded.functions.find((f)=>f.name === 'constructor');
+    const initializationHash = await computeInitializationHash(constructorArtifact, []);
+    const instance = {
+        version: 1,
+        currentContractClassId: contractClass.id,
+        originalContractClassId: contractClass.id,
+        initializationHash,
+        publicKeys: PublicKeys.default(),
+        salt,
+        deployer
+    };
+    const address = await computeContractAddressFromInstance(instance);
+    return {
+        address,
+        classId: contractClass.id,
+        artifactHash: contractClass.artifactHash,
+        privateFunctionsRoot: contractClass.privateFunctionsRoot,
+        publicBytecodeCommitment: contractClass.publicBytecodeCommitment,
+        initializationHash,
+        privateFunctions: contractClass.privateFunctions
+    };
 }
 async function generateDeclarationFile(destName) {
     const content = `
@@ -95,46 +114,68 @@ function generateContractAddresses(names) {
     };
   `;
 }
-function generateContractLeaves(names, leaves) {
+function generateDerivedAddresses(names, contractData) {
     return `
-    export const ProtocolContractLeaves = {
-      ${leaves.map((leaf, i)=>`${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
+    export const ProtocolContractDerivedAddress = {
+      ${contractData.map((d, i)=>`${names[i]}: AztecAddress.fromString('${d.address.toString()}')`).join(',\n')}
+    };
+  `;
+}
+function generateClassIdPreimages(names, contractData) {
+    return `
+    export const ProtocolContractClassId: Record<ProtocolContractName, Fr> = {
+      ${contractData.map((d, i)=>`${names[i]}: Fr.fromString('${d.classId.toString()}')`).join(',\n')}
+    };
+
+    export const ProtocolContractClassIdPreimage: Record<ProtocolContractName, { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }> = {
+      ${contractData.map((d, i)=>`${names[i]}: {
+        artifactHash: Fr.fromString('${d.artifactHash.toString()}'),
+        privateFunctionsRoot: Fr.fromString('${d.privateFunctionsRoot.toString()}'),
+        publicBytecodeCommitment: Fr.fromString('${d.publicBytecodeCommitment.toString()}'),
+      }`).join(',\n')}
+    };
+
+    export const ProtocolContractInitializationHash: Record<ProtocolContractName, Fr> = {
+      ${contractData.map((d, i)=>`${names[i]}: Fr.fromString('${d.initializationHash.toString()}')`).join(',\n')}
+    };
+
+    export const ProtocolContractPrivateFunctions: Record<ProtocolContractName, { selector: FunctionSelector; vkHash: Fr }[]> = {
+      ${contractData.map((d, i)=>`${names[i]}: [${d.privateFunctions.map((fn)=>`{ selector: FunctionSelector.fromField(Fr.fromString('${fn.selector.toField().toString()}')), vkHash: Fr.fromString('${fn.vkHash.toString()}') }`).join(', ')}]`).join(',\n')}
     };
   `;
 }
-async function generateRoot(names, leaves) {
-    const root = await computeRoot(names, leaves);
+async function generateProtocolContractsList(names, contractData) {
+    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] = contractData[i].address;
+    }
     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 DEPLOYER_CONTRACT_INSTANCE_UPDATED_TAG = new Fr(${DEPLOYER_CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE}n);
+  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('${await computeSiloedPrivateLogFirstField(new AztecAddress(new Fr(CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS)), new Fr(CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE))}');
   `;
 }
-async function generateOutputFile(names, leaves) {
+async function generateOutputFile(names, contractData) {
     const content = `
     // GENERATED FILE - DO NOT EDIT. RUN \`yarn generate\` or \`yarn generate:data\`
-    import { Fr } from '@aztec/foundation/fields';
+    import { Fr } from '@aztec/foundation/curves/bn254';
+    import { FunctionSelector } from '@aztec/stdlib/abi';
     import { AztecAddress } from '@aztec/stdlib/aztec-address';
+    import { ProtocolContracts } from '@aztec/stdlib/tx';
 
     ${generateNames(names)}
 
@@ -142,9 +183,11 @@ async function generateOutputFile(names, leaves) {
 
     ${generateContractAddresses(names)}
 
-    ${generateContractLeaves(names, leaves)}
+    ${generateDerivedAddresses(names, contractData)}
+
+    ${generateClassIdPreimages(names, contractData)}
 
-    ${await generateRoot(names, leaves)}
+    ${await generateProtocolContractsList(names, contractData)}
 
     ${await generateLogTags()}
   `;
@@ -153,17 +196,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 contractDataList = [];
     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());
+        contractDataList.push(await computeContractData(artifact, AztecAddress.fromBigInt(BigInt(contractAddressMapping[destName]))));
     }
-    await generateOutputFile(destNames, leaves);
+    await generateOutputFile(destNames, contractDataList);
 }
 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0cy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSx3QkFBZ0IsMkNBQTJDLElBQUksTUFBTSxDQUdwRTtBQUdELHdCQUFnQiwrQ0FBK0MsSUFBSSxNQUFNLENBR3hFO0FBR0Qsd0JBQWdCLCtDQUErQyxJQUFJLE1BQU0sQ0FHeEU7QUFHRCx3QkFBZ0IsOENBQThDLElBQUksTUFBTSxDQUd2RTtBQUVELHdCQUFnQixnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsTUFBTSxVQUU1QyJ9

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) {

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": "0.0.0-test.0",
+  "version": "0.0.1-commit.001888fc",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -14,23 +14,21 @@
   "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"
   },
   "scripts": {
-    "build": "yarn clean && yarn generate && yarn generate:cleanup-artifacts && tsc -b",
-    "build:keep-debug-symbols": "yarn clean && yarn generate && tsc -b",
+    "build": "yarn clean && yarn generate && yarn generate:cleanup-artifacts && ../scripts/tsc.sh",
+    "build:keep-debug-symbols": "yarn clean && yarn generate && ../scripts/tsc.sh",
     "generate": "yarn generate:data",
     "generate:cleanup-artifacts": "node --no-warnings --loader @swc-node/register/esm src/scripts/cleanup_artifacts.ts",
     "generate:data": "node --no-warnings --loader @swc-node/register/esm src/scripts/generate_data.ts",
-    "build:dev": "tsc -b --watch",
-    "build:ts": "tsc -b",
+    "build:dev": "../scripts/tsc.sh --watch",
+    "build:ts": "../scripts/tsc.sh",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -68,27 +66,32 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.0-test.0",
-    "@aztec/foundation": "0.0.0-test.0",
-    "@aztec/stdlib": "0.0.0-test.0",
+    "@aztec/constants": "0.0.1-commit.001888fc",
+    "@aztec/foundation": "0.0.1-commit.001888fc",
+    "@aztec/stdlib": "0.0.1-commit.001888fc",
     "lodash.chunk": "^4.2.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
     "@types/lodash.omit": "^4.5.9",
-    "@types/node": "^18.7.23",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.3",
-    "ts-loader": "^9.4.4",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
+    "ts-loader": "^9.5.4",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -98,6 +101,6 @@
     "!src/scripts/*"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/auth-registry/index.ts

@@ -1,18 +1,18 @@
-import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import AuthRegistryJson from '../../artifacts/AuthRegistry.json' assert { type: 'json' };
+import AuthRegistryJson from '../../artifacts/AuthRegistry.json' with { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
 let protocolContract: ProtocolContract;
 
-export const AuthRegistryArtifact = loadContractArtifact(AuthRegistryJson as NoirCompiledContract);
+export const AuthRegistryArtifact: ContractArtifact = loadContractArtifact(AuthRegistryJson as NoirCompiledContract);
 
 /** Returns the canonical deployment of the auth registry. */
-export async function getCanonicalAuthRegistry(): Promise<ProtocolContract> {
+export function getCanonicalAuthRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    protocolContract = await makeProtocolContract('AuthRegistry', AuthRegistryArtifact);
+    protocolContract = makeProtocolContract('AuthRegistry', AuthRegistryArtifact);
   }
-  return protocolContract;
+  return Promise.resolve(protocolContract);
 }

package/src/auth-registry/lazy.ts

@@ -8,10 +8,10 @@ let protocolContractArtifact: ContractArtifact;
 
 export async function getAuthRegistryArtifact(): 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
+    // 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: authRegistryJson } = await import('../../artifacts/AuthRegistry.json');
     protocolContractArtifact = loadContractArtifact(authRegistryJson);
@@ -23,7 +23,7 @@ export async function getAuthRegistryArtifact(): Promise<ContractArtifact> {
 export async function getCanonicalAuthRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
     const authRegistryArtifact = await getAuthRegistryArtifact();
-    protocolContract = await makeProtocolContract('AuthRegistry', authRegistryArtifact);
+    protocolContract = makeProtocolContract('AuthRegistry', authRegistryArtifact);
   }
   return protocolContract;
 }

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`