@aztec/protocol-contracts 0.0.1-commit.6d3c34e → 0.0.1-commit.7ac86ea28

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/{router → public-checks}/lazy.js

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

package/dest/scripts/generate_data.js

@@ -1,11 +1,12 @@
-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 { 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 { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
 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 { getContractInstanceFromInstantiationParams } 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';
@@ -21,7 +22,7 @@ const contractAddressMapping = {
     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 {
@@ -50,11 +51,32 @@ async function copyArtifact(srcName, destName) {
     await fs.copyFile(src, dest);
     return artifact;
 }
-async function computeAddress(artifact) {
-    const instance = await getContractInstanceFromInstantiationParams(loadContractArtifact(artifact), {
-        salt
-    });
-    return instance.address;
+// 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 = `
@@ -88,14 +110,37 @@ function generateContractAddresses(names) {
     };
   `;
 }
-function generateDerivedAddresses(names, derivedAddresses) {
+function generateDerivedAddresses(names, contractData) {
     return `
     export const ProtocolContractDerivedAddress = {
-      ${derivedAddresses.map((address, i)=>`${names[i]}: AztecAddress.fromString('${address.toString()}')`).join(',\n')}
+      ${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 generateProtocolContractsList(names, derivedAddresses) {
+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];
@@ -104,7 +149,7 @@ async function generateProtocolContractsList(names, derivedAddresses) {
         if (!list[derivedAddressIndex].equals(AztecAddress.zero())) {
             throw new Error(`Duplicate protocol contract address: ${address.toString()}`);
         }
-        list[derivedAddressIndex] = derivedAddresses[i];
+        list[derivedAddressIndex] = contractData[i].address;
     }
     return `
     export const ProtocolContractsList = new ProtocolContracts([
@@ -117,16 +162,14 @@ async function generateProtocolContractsList(names, derivedAddresses) {
 // Generate the siloed log tags for events emitted via private logs.
 async function generateLogTags() {
     return `
-  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('${await poseidon2Hash([
-        CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS,
-        CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE
-    ])}');
+  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, derivedAddresses) {
+async function generateOutputFile(names, contractData) {
     const content = `
     // GENERATED FILE - DO NOT EDIT. RUN \`yarn generate\` or \`yarn generate:data\`
     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';
 
@@ -136,9 +179,11 @@ async function generateOutputFile(names, derivedAddresses) {
 
     ${generateContractAddresses(names)}
 
-    ${generateDerivedAddresses(names, derivedAddresses)}
+    ${generateDerivedAddresses(names, contractData)}
+
+    ${generateClassIdPreimages(names, contractData)}
 
-    ${await generateProtocolContractsList(names, derivedAddresses)}
+    ${await generateProtocolContractsList(names, contractData)}
 
     ${await generateLogTags()}
   `;
@@ -147,16 +192,16 @@ async function generateOutputFile(names, derivedAddresses) {
 async function main() {
     await clearDestDir();
     const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
-    const derivedAddresses = [];
+    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);
-        derivedAddresses.push(await computeAddress(artifact));
+        contractDataList.push(await computeContractData(artifact, AztecAddress.fromBigInt(BigInt(contractAddressMapping[destName]))));
     }
-    await generateOutputFile(destNames, derivedAddresses);
+    await generateOutputFile(destNames, contractDataList);
 }
 try {
     await main();

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.1-commit.6d3c34e",
+  "version": "0.0.1-commit.7ac86ea28",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -22,12 +22,12 @@
   },
   "scripts": {
     "build": "yarn clean && yarn generate && yarn generate:cleanup-artifacts && ../scripts/tsc.sh",
-    "build:keep-debug-symbols": "yarn clean && yarn generate && tsgo -b",
+    "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": "../scripts/tsc.sh --watch",
-    "build:ts": "tsgo -b",
+    "build:ts": "../scripts/tsc.sh",
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -73,9 +73,9 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.6d3c34e",
-    "@aztec/foundation": "0.0.1-commit.6d3c34e",
-    "@aztec/stdlib": "0.0.1-commit.6d3c34e",
+    "@aztec/constants": "0.0.1-commit.7ac86ea28",
+    "@aztec/foundation": "0.0.1-commit.7ac86ea28",
+    "@aztec/stdlib": "0.0.1-commit.7ac86ea28",
     "lodash.chunk": "^4.2.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.4.0"
@@ -86,7 +86,7 @@
     "@types/lodash.chunk": "^4.2.9",
     "@types/lodash.omit": "^4.5.9",
     "@types/node": "^22.15.17",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-loader": "^9.5.4",

package/src/auth-registry/index.ts

@@ -10,9 +10,9 @@ let protocolContract: ProtocolContract;
 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

@@ -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/contract_class_published_event.ts

@@ -29,7 +29,7 @@ export class ContractClassPublishedEvent {
   }
 
   static fromLog(log: ContractClassLog) {
-    // See how the log is serialized in `noir-projects/noir-contracts/contracts/protocol/contract_class_registry/src/events/class_published.nr`.
+    // See how the log is serialized in `noir-projects/noir-contracts/contracts/protocol/contract_class_registry_contract/src/events/class_published.nr`.
     const fieldsWithoutTag = log.fields.fields.slice(1);
     const reader = new FieldReader(fieldsWithoutTag);
     const contractClassId = reader.readField();

package/src/class-registry/index.ts

@@ -14,10 +14,10 @@ export const ContractClassRegistryArtifact = loadContractArtifact(ContractClassR
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalClassRegistry(): Promise<ProtocolContract> {
+export function getCanonicalClassRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
     const artifact = ContractClassRegistryArtifact;
-    protocolContract = await makeProtocolContract('ContractClassRegistry', artifact);
+    protocolContract = makeProtocolContract('ContractClassRegistry', artifact);
   }
-  return protocolContract;
+  return Promise.resolve(protocolContract);
 }

package/src/class-registry/lazy.ts

@@ -27,7 +27,7 @@ export async function getContractClassRegistryArtifact(): Promise<ContractArtifa
 export async function getCanonicalClassRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
     const contractClassRegistryArtifact = await getContractClassRegistryArtifact();
-    protocolContract = await makeProtocolContract('ContractClassRegistry', contractClassRegistryArtifact);
+    protocolContract = makeProtocolContract('ContractClassRegistry', contractClassRegistryArtifact);
   }
   return protocolContract;
 }

package/src/fee-juice/index.ts

@@ -14,11 +14,11 @@ export const FeeJuiceArtifact = loadContractArtifact(FeeJuiceJson as NoirCompile
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalFeeJuice(): Promise<ProtocolContract> {
+export function getCanonicalFeeJuice(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    protocolContract = await makeProtocolContract('FeeJuice', FeeJuiceArtifact);
+    protocolContract = makeProtocolContract('FeeJuice', FeeJuiceArtifact);
   }
-  return protocolContract;
+  return Promise.resolve(protocolContract);
 }
 
 /**

package/src/fee-juice/lazy.ts

@@ -23,7 +23,7 @@ export async function getFeeJuiceArtifact(): Promise<ContractArtifact> {
 export async function getCanonicalFeeJuice(): Promise<ProtocolContract> {
   if (!protocolContract) {
     const feeJuiceArtifact = await getFeeJuiceArtifact();
-    protocolContract = await makeProtocolContract('FeeJuice', feeJuiceArtifact);
+    protocolContract = makeProtocolContract('FeeJuice', feeJuiceArtifact);
   }
   return protocolContract;
 }

package/src/instance-registry/index.ts

@@ -15,9 +15,9 @@ export const ContractInstanceRegistryArtifact = loadContractArtifact(
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalInstanceRegistry(): Promise<ProtocolContract> {
+export function getCanonicalInstanceRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    protocolContract = await makeProtocolContract('ContractInstanceRegistry', ContractInstanceRegistryArtifact);
+    protocolContract = makeProtocolContract('ContractInstanceRegistry', ContractInstanceRegistryArtifact);
   }
-  return protocolContract;
+  return Promise.resolve(protocolContract);
 }

package/src/instance-registry/lazy.ts

@@ -26,7 +26,7 @@ export async function getContractInstanceRegistryArtifact(): Promise<ContractArt
 export async function getCanonicalInstanceRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
     const contractInstanceRegistryArtifact = await getContractInstanceRegistryArtifact();
-    protocolContract = await makeProtocolContract('ContractInstanceRegistry', contractInstanceRegistryArtifact);
+    protocolContract = makeProtocolContract('ContractInstanceRegistry', contractInstanceRegistryArtifact);
   }
   return protocolContract;
 }

package/src/make_protocol_contract.ts

@@ -1,26 +1,48 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { PublicKeys } from '@aztec/stdlib/keys';
 
 import type { ProtocolContract } from './protocol_contract.js';
-import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from './protocol_contract_data.js';
+import {
+  ProtocolContractAddress,
+  ProtocolContractClassId,
+  ProtocolContractClassIdPreimage,
+  ProtocolContractInitializationHash,
+  type ProtocolContractName,
+  ProtocolContractPrivateFunctions,
+  ProtocolContractSalt,
+} from './protocol_contract_data.js';
 
 /**
- * Returns the canonical deployment given its name and artifact.
- * To be used internally within the protocol-contracts package.
+ * Reconstructs a ProtocolContract from precomputed data without performing any hash computations.
+ * Internal to the protocol-contracts package — not part of the public API.
  */
-export async function makeProtocolContract(
-  name: ProtocolContractName,
-  artifact: ContractArtifact,
-): Promise<ProtocolContract> {
+export function makeProtocolContract(name: ProtocolContractName, artifact: ContractArtifact): ProtocolContract {
   const address = ProtocolContractAddress[name];
   const salt = ProtocolContractSalt[name];
-  // TODO(@spalladino): This computes the contract class from the artifact twice.
-  const contractClass = await getContractClassFromArtifact(artifact);
-  const instance = await getContractInstanceFromInstantiationParams(artifact, { salt });
-  return {
-    instance: { ...instance, address },
-    contractClass,
-    artifact,
+  const classId = ProtocolContractClassId[name];
+  const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment } = ProtocolContractClassIdPreimage[name];
+  const initializationHash = ProtocolContractInitializationHash[name];
+
+  const contractClass = {
+    id: classId,
+    version: 1 as const,
+    artifactHash,
+    privateFunctionsRoot,
+    publicBytecodeCommitment,
+    packedBytecode: artifact.functions.find(f => f.name === 'public_dispatch')?.bytecode ?? Buffer.alloc(0),
+    privateFunctions: ProtocolContractPrivateFunctions[name],
+  };
+
+  const instance = {
+    version: 1 as const,
+    currentContractClassId: classId,
+    originalContractClassId: classId,
+    initializationHash,
+    publicKeys: PublicKeys.default(),
+    salt,
+    deployer: address,
     address,
   };
+
+  return { instance, contractClass, artifact, address };
 }

package/src/multi-call-entrypoint/index.ts

@@ -10,9 +10,9 @@ export const MultiCallEntrypointArtifact = loadContractArtifact(MultiCallEntrypo
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalMultiCallEntrypoint(): Promise<ProtocolContract> {
+export function getCanonicalMultiCallEntrypoint(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    protocolContract = await makeProtocolContract('MultiCallEntrypoint', MultiCallEntrypointArtifact);
+    protocolContract = makeProtocolContract('MultiCallEntrypoint', MultiCallEntrypointArtifact);
   }
-  return protocolContract;
+  return Promise.resolve(protocolContract);
 }

package/src/multi-call-entrypoint/lazy.ts

@@ -23,7 +23,7 @@ export async function getMultiCallEntrypointArtifact(): Promise<ContractArtifact
 export async function getCanonicalMultiCallEntrypoint(): Promise<ProtocolContract> {
   if (!protocolContract) {
     const multiCallEntrypointArtifact = await getMultiCallEntrypointArtifact();
-    protocolContract = await makeProtocolContract('MultiCallEntrypoint', multiCallEntrypointArtifact);
+    protocolContract = makeProtocolContract('MultiCallEntrypoint', multiCallEntrypointArtifact);
   }
   return protocolContract;
 }

package/src/protocol_contract_data.ts

@@ -1,6 +1,7 @@
 
     // GENERATED FILE - DO NOT EDIT. RUN `yarn generate` or `yarn generate:data`
     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';
 
@@ -11,7 +12,7 @@
 'ContractClassRegistry',
 'MultiCallEntrypoint',
 'FeeJuice',
-'Router'
+'PublicChecks'
     ] as const;
 
     export type ProtocolContractName = typeof protocolContractNames[number];
@@ -24,7 +25,7 @@ ContractInstanceRegistry: new Fr(1),
 ContractClassRegistry: new Fr(1),
 MultiCallEntrypoint: new Fr(1),
 FeeJuice: new Fr(1),
-Router: new Fr(1)
+PublicChecks: new Fr(1)
     };
   
 
@@ -35,29 +36,91 @@ ContractInstanceRegistry: AztecAddress.fromBigInt(2n),
 ContractClassRegistry: AztecAddress.fromBigInt(3n),
 MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
 FeeJuice: AztecAddress.fromBigInt(5n),
-Router: AztecAddress.fromBigInt(6n)
+PublicChecks: AztecAddress.fromBigInt(6n)
     };
   
 
     
     export const ProtocolContractDerivedAddress = {
-      AuthRegistry: AztecAddress.fromString('0x0b4c5a9ec45c5132dbbe9c6c67caa3a2810fb29cdde8442a7bed375a181e9b65'),
-ContractInstanceRegistry: AztecAddress.fromString('0x24f58ab2edfcaff61e9330ddf2e8c508785bdb746703424d1de26129432c4993'),
-ContractClassRegistry: AztecAddress.fromString('0x2f9ff6545041d143ed9b8edf3691ab2f37684b0766814c74c250f928b9dffd5b'),
-MultiCallEntrypoint: AztecAddress.fromString('0x025285627488b9bd0e344452faad21a597a75cd3c5768c736c846882f0f6da32'),
-FeeJuice: AztecAddress.fromString('0x2fba8d8f78fc11b66650a3805c0502d5ce3f102bac03a90384ec544805118aeb'),
-Router: AztecAddress.fromString('0x2278c3b1b8985060408c655dbcb90334d2c0515a7d294344b022ea8a922dd00f')
+      AuthRegistry: AztecAddress.fromString('0x05738188c145f5ae1f85ba32c2955df6cdadf5142a4a6db36c7bbf7919f07630'),
+ContractInstanceRegistry: AztecAddress.fromString('0x0e0e44c7fd88f06c1a52e67137d92be96399a7d47ee5ca033bb306ec8d2b54f3'),
+ContractClassRegistry: AztecAddress.fromString('0x14d670efa326a07b99777b01fb706427ca776095246569150f2a3f17a7d4dc66'),
+MultiCallEntrypoint: AztecAddress.fromString('0x15bff1f94c1c820c5f9384e45114ae5b4c25489f816fdc5b80bfb5f54d852077'),
+FeeJuice: AztecAddress.fromString('0x06ecf77d30887d7b701ad2235f560248e7c3d572e8640279f9d26d87312557ac'),
+PublicChecks: AztecAddress.fromString('0x289c56a961e343e67f77ed2a9119fdf8b50f63034d598c5bba8ff280129e1579')
+    };
+  
+
+    
+    export const ProtocolContractClassId: Record<ProtocolContractName, Fr> = {
+      AuthRegistry: Fr.fromString('0x07438c0ca498858064954149028e00a6038eb8ea5529373582574a77a0f913f1'),
+ContractInstanceRegistry: Fr.fromString('0x2112df65cee9b5fc9d222613fc7df8d3e05dd542ad565c9f255ab7b728dd9cc0'),
+ContractClassRegistry: Fr.fromString('0x013466b8a65dea98ad80c119cf236a0acf53acfede687769410cfd57876b8242'),
+MultiCallEntrypoint: Fr.fromString('0x1f87f80a8331b63219e4b04f618b371c04b73b2246c058a0962d9848f15cf1d8'),
+FeeJuice: Fr.fromString('0x0b0ee1791b48ea378c6aed2ccdc29c7a5e63a742d77871294174c6879509806f'),
+PublicChecks: Fr.fromString('0x0f1f06f003dd2ccb739a1719b8dccc2800b4015e7387d1e6ab1126b480871c54')
+    };
+
+    export const ProtocolContractClassIdPreimage: Record<ProtocolContractName, { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }> = {
+      AuthRegistry: {
+        artifactHash: Fr.fromString('0x2fcb5576b472becea02a1d5228473217bb2f63570d868abcf16205a23377ec70'),
+        privateFunctionsRoot: Fr.fromString('0x11900a485e3ffa03da98d89abb0c9419200644aaf17f5caa863953fccf1ed88f'),
+        publicBytecodeCommitment: Fr.fromString('0x2c9138ec76d2f7db9c313a411adb0855e334ba6bb1bbbe191fff14ee0799deea'),
+      },
+ContractInstanceRegistry: {
+        artifactHash: Fr.fromString('0x18601566bacdca7a5a40528f221b04ee7b74f382e6cd34fbdf69d31c50d5ee88'),
+        privateFunctionsRoot: Fr.fromString('0x136a6705c7ad1d47f65cb881a56909d4c78d3fa8944f5b103734cd91e654ed63'),
+        publicBytecodeCommitment: Fr.fromString('0x2ca33d0ab4d4cc2339aa7fa0788572ad32465cd461a222930e71b166aca83967'),
+      },
+ContractClassRegistry: {
+        artifactHash: Fr.fromString('0x232d868db8a4d1e0f013efa4bfe5c39d96e11f16a62e3e73abbbafc3028fc410'),
+        privateFunctionsRoot: Fr.fromString('0x2ac3bf890a7d534a768079aa86889caa1a86373c8e6fc2db48215b11bbb79106'),
+        publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+      },
+MultiCallEntrypoint: {
+        artifactHash: Fr.fromString('0x10292f802f1c5b7c6c813c003f6e068e4396892beeb195c9e031a841a4ce5800'),
+        privateFunctionsRoot: Fr.fromString('0x266505ecb7c02ce6e227227c0b6bdb44713c8ecd43164ee7bb00b8fb340e8b03'),
+        publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+      },
+FeeJuice: {
+        artifactHash: Fr.fromString('0x2eb476f12cce5207be118047fb7f603378b78aa619d6539a4d9eec4700ea2507'),
+        privateFunctionsRoot: Fr.fromString('0x0abef3cfc6ae314886c841b42dc33d3eed255ad3dee7773daabf05b229573759'),
+        publicBytecodeCommitment: Fr.fromString('0x140b663a54207869cc411e3731d38cd65ea323ac2fc6004d3d73b7f175bb0f33'),
+      },
+PublicChecks: {
+        artifactHash: Fr.fromString('0x003d3e0bff7456e270c38b0ae046cc77fa0b677df8d5bce6d7ff9bb7ecdfdbdd'),
+        privateFunctionsRoot: Fr.fromString('0x067243231eddf4222f3911defbba7705aff06ed45960b27f6f91319196ef97e1'),
+        publicBytecodeCommitment: Fr.fromString('0x2d0834fc9468fd2092091852543a2fbd7b6b313c7e5e4defe8730c8065366a03'),
+      }
+    };
+
+    export const ProtocolContractInitializationHash: Record<ProtocolContractName, Fr> = {
+      AuthRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+ContractInstanceRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+ContractClassRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+MultiCallEntrypoint: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+FeeJuice: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+PublicChecks: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+    };
+
+    export const ProtocolContractPrivateFunctions: Record<ProtocolContractName, { selector: FunctionSelector; vkHash: Fr }[]> = {
+      AuthRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000079a3d418')), vkHash: Fr.fromString('0x185a64e85b31ece67103f33ec67ddef374308c0a5dc2b7f37e016bca0dce63fb') }],
+ContractInstanceRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000016ec12aa')), vkHash: Fr.fromString('0x262f7a90ecf055779001b67dad01a3add1e549f6c27931f0e71e463ce2142b57') }],
+ContractClassRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x000000000000000000000000000000000000000000000000000000006934ed0d')), vkHash: Fr.fromString('0x1163f31e191528254c877fce0c7f62dd738f5552bbd2dda97512fe4777377f5b') }],
+MultiCallEntrypoint: [{ selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f04908a9')), vkHash: Fr.fromString('0x21732ab3cecf633e4c31a030df62c93e35a005b89941fdab568d2818c1355192') }],
+FeeJuice: [{ selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000cbe67243')), vkHash: Fr.fromString('0x2ad6083b4595f8076c014e5152191013167ab1b5a31ad0cbb06490054c7c59ae') }, { selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000e8d374b6')), vkHash: Fr.fromString('0x05aaffffdf797625ff24575d939339303775c5db77fb6bdcecbf955f726fd071') }],
+PublicChecks: []
     };
   
 
     
     export const ProtocolContractsList = new ProtocolContracts([
-      AztecAddress.fromString('0x0b4c5a9ec45c5132dbbe9c6c67caa3a2810fb29cdde8442a7bed375a181e9b65'),
-AztecAddress.fromString('0x24f58ab2edfcaff61e9330ddf2e8c508785bdb746703424d1de26129432c4993'),
-AztecAddress.fromString('0x2f9ff6545041d143ed9b8edf3691ab2f37684b0766814c74c250f928b9dffd5b'),
-AztecAddress.fromString('0x025285627488b9bd0e344452faad21a597a75cd3c5768c736c846882f0f6da32'),
-AztecAddress.fromString('0x2fba8d8f78fc11b66650a3805c0502d5ce3f102bac03a90384ec544805118aeb'),
-AztecAddress.fromString('0x2278c3b1b8985060408c655dbcb90334d2c0515a7d294344b022ea8a922dd00f'),
+      AztecAddress.fromString('0x05738188c145f5ae1f85ba32c2955df6cdadf5142a4a6db36c7bbf7919f07630'),
+AztecAddress.fromString('0x0e0e44c7fd88f06c1a52e67137d92be96399a7d47ee5ca033bb306ec8d2b54f3'),
+AztecAddress.fromString('0x14d670efa326a07b99777b01fb706427ca776095246569150f2a3f17a7d4dc66'),
+AztecAddress.fromString('0x15bff1f94c1c820c5f9384e45114ae5b4c25489f816fdc5b80bfb5f54d852077'),
+AztecAddress.fromString('0x06ecf77d30887d7b701ad2235f560248e7c3d572e8640279f9d26d87312557ac'),
+AztecAddress.fromString('0x289c56a961e343e67f77ed2a9119fdf8b50f63034d598c5bba8ff280129e1579'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
@@ -65,10 +128,10 @@ AztecAddress.fromString('0x00000000000000000000000000000000000000000000000000000
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
     ]);
 
-    export const protocolContractsHash = Fr.fromString('0x15120d8d1e0cc574b866b2b3cde7225352edda647cb79ba9f1b9f7b7b582ac69');
+    export const protocolContractsHash = Fr.fromString('0x1e13776ddffd17d2a72e97753ee4bdc8fa83f7c826e35421e3c0844ee732a82b');
   
 
     
-  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x28da3fc471387d4e20b646b77abc8cdfc02a339a7507285a73d84f9b97b13486');
+  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x1a7e1badb79abdd38c684b3c8306ffe7ecb33c69e3380d9855730aaaa83a21a8');