@aztec/protocol-contracts 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df

package/src/instance-registry/contract_instance_published_event.ts

@@ -15,6 +15,7 @@ export class ContractInstancePublishedEvent {
     public readonly salt: Fr,
     public readonly contractClassId: Fr,
     public readonly initializationHash: Fr,
+    public readonly immutablesHash: Fr,
     public readonly publicKeys: PublicKeys,
     public readonly deployer: AztecAddress,
   ) {}
@@ -31,6 +32,7 @@ export class ContractInstancePublishedEvent {
     const salt = reader.readObject(Fr);
     const contractClassId = reader.readObject(Fr);
     const initializationHash = reader.readObject(Fr);
+    const immutablesHash = reader.readObject(Fr);
     const publicKeys = reader.readObject(PublicKeys);
     const deployer = reader.readObject(AztecAddress);
 
@@ -40,13 +42,14 @@ export class ContractInstancePublishedEvent {
       salt,
       contractClassId,
       initializationHash,
+      immutablesHash,
       publicKeys,
       deployer,
     );
   }
 
   toContractInstance(): ContractInstanceWithAddress {
-    if (this.version !== 1) {
+    if (this.version !== 2) {
       throw new Error(`Unexpected contract instance version ${this.version}`);
     }
 
@@ -56,6 +59,7 @@ export class ContractInstancePublishedEvent {
       currentContractClassId: this.contractClassId,
       originalContractClassId: this.contractClassId,
       initializationHash: this.initializationHash,
+      immutablesHash: this.immutablesHash,
       publicKeys: this.publicKeys,
       salt: this.salt,
       deployer: this.deployer,

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

@@ -13,7 +13,7 @@ export async function getContractInstanceRegistryArtifact(): Promise<ContractArt
   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
+    // Even if now supported by all 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');
@@ -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,50 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 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: 2 as const,
+    currentContractClassId: classId,
+    originalContractClassId: classId,
+    initializationHash,
+    immutablesHash: Fr.ZERO, // Protocol Contracts Have No Immutables
+    publicKeys: PublicKeys.default(),
+    salt,
+    deployer: address,
     address,
   };
+
+  return { instance, contractClass, artifact, address };
 }

package/src/protocol_contract.ts

@@ -1,8 +1,9 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractClassIdPreimage, ContractClassWithId, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
-import { ProtocolContractAddress } from './protocol_contract_data.js';
+import { ProtocolContractAddress, ProtocolContractClassId } from './protocol_contract_data.js';
 
 /** Represents a canonical contract in the protocol. */
 export interface ProtocolContract {
@@ -20,4 +21,11 @@ export function isProtocolContract(address: AztecAddress) {
   return Object.values(ProtocolContractAddress).some(a => a.equals(address));
 }
 
+const protocolContractClassIds = new Set(Object.values(ProtocolContractClassId).map(id => id.toString()));
+
+/** Returns whether the given contract class id belongs to a bundled protocol contract. */
+export function isProtocolContractClass(classId: Fr): boolean {
+  return protocolContractClassIds.has(classId.toString());
+}
+
 export { type ProtocolContractsProvider } from './provider/protocol_contracts_provider.js';

package/src/protocol_contract_data.ts

@@ -1,17 +1,15 @@
 
     // 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';
 
     
     export const protocolContractNames = [
-      'AuthRegistry',
-'ContractInstanceRegistry',
+      'ContractInstanceRegistry',
 'ContractClassRegistry',
-'MultiCallEntrypoint',
-'FeeJuice',
-'PublicChecks'
+'FeeJuice'
     ] as const;
 
     export type ProtocolContractName = typeof protocolContractNames[number];
@@ -19,53 +17,82 @@
 
     
     export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
-      AuthRegistry: new Fr(1),
-ContractInstanceRegistry: new Fr(1),
+      ContractInstanceRegistry: new Fr(1),
 ContractClassRegistry: new Fr(1),
-MultiCallEntrypoint: new Fr(1),
-FeeJuice: new Fr(1),
-PublicChecks: new Fr(1)
+FeeJuice: new Fr(1)
     };
   
 
     
     export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
-      AuthRegistry: AztecAddress.fromBigInt(1n),
-ContractInstanceRegistry: AztecAddress.fromBigInt(2n),
-ContractClassRegistry: AztecAddress.fromBigInt(3n),
-MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
-FeeJuice: AztecAddress.fromBigInt(5n),
-PublicChecks: AztecAddress.fromBigInt(6n)
+      ContractInstanceRegistry: AztecAddress.fromBigIntUnsafe(2n),
+ContractClassRegistry: AztecAddress.fromBigIntUnsafe(1n),
+FeeJuice: AztecAddress.fromBigIntUnsafe(3n)
     };
   
 
     
     export const ProtocolContractDerivedAddress = {
-      AuthRegistry: AztecAddress.fromString('0x01166b11e5ee8f78b579f174bea28705b25baad6ec906a51d42232cda5d16506'),
-ContractInstanceRegistry: AztecAddress.fromString('0x2ff9cedf841494ba6177f081c1e8a1237a7aadd50fec97873e76bab90887f13d'),
-ContractClassRegistry: AztecAddress.fromString('0x1c013984852562d43e6de2bbd62e9663cb362a127e28fb357cbfcf2084fcbc6f'),
-MultiCallEntrypoint: AztecAddress.fromString('0x28fd62239a256734d5d1bc1e731525f877622f247a8bf5f9395c7d6048737171'),
-FeeJuice: AztecAddress.fromString('0x304bff4b0d6584cf83a5b19466582c17b61a47382632039bc18de09f6d305ada'),
-PublicChecks: AztecAddress.fromString('0x0a53af9b0611e165bea936e33551da6e9f2f3431ed2f249c49f65c6d576cc611')
+      ContractInstanceRegistry: AztecAddress.fromStringUnsafe('0x2ce1dfe11c45332d557e8302d624b011eb471f0dfa40d2fae64d9fb21590321b'),
+ContractClassRegistry: AztecAddress.fromStringUnsafe('0x1bbb52d2b4ac8c634f4b5026f2228580627c918895c369495f71caae13d996fe'),
+FeeJuice: AztecAddress.fromStringUnsafe('0x258a4892dd83d064f6f250601711a82a7b2aaa20f39dbab216237af3ae0c63f2')
+    };
+  
+
+    
+    export const ProtocolContractClassId: Record<ProtocolContractName, Fr> = {
+      ContractInstanceRegistry: Fr.fromString('0x265816820ef83a476c1725199f5b25fefffcf30d564b31ae95fa8eeee579aa30'),
+ContractClassRegistry: Fr.fromString('0x0026d0944a8b8204b840c37cf238b145bdd6b1af9daf59eeb5e689022a708e5e'),
+FeeJuice: Fr.fromString('0x2a58e1588a3ee6ef0d4c951051959789ec8a3680c551f74148f4b4dab7a3df9d')
+    };
+
+    export const ProtocolContractClassIdPreimage: Record<ProtocolContractName, { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }> = {
+      ContractInstanceRegistry: {
+        artifactHash: Fr.fromString('0x19835337f0aee2e9042f3a0ae0d334bdb39ecb22794b40d2670d26b2ca72b98f'),
+        privateFunctionsRoot: Fr.fromString('0x05bb912d9d2871492d76c610472544d8219df70aa874768f9667e99861d7971f'),
+        publicBytecodeCommitment: Fr.fromString('0x1a226919cd754b17c3c32ad430ecb2ce41117aa6bab5d52f070d3ab4c103c45f'),
+      },
+ContractClassRegistry: {
+        artifactHash: Fr.fromString('0x0d0ef0a61d9c829c306eee702aa7914299d58e7d3fc9f11d5aebd38c838fa1d0'),
+        privateFunctionsRoot: Fr.fromString('0x119c77be6d76c221642b63a337d94bf7b6ed8f872927ef3645c7e6b5002baa34'),
+        publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+      },
+FeeJuice: {
+        artifactHash: Fr.fromString('0x2686d931d674aa3a340ad779b9464901ea46b645570f62ddf6beeafcab989e5b'),
+        privateFunctionsRoot: Fr.fromString('0x1c4bf54a4a33e3b9eae6f816dfc81e128d76d2646807a5443598c8adbd47f81f'),
+        publicBytecodeCommitment: Fr.fromString('0x1d4b1a8f71b8250d4fb65f8e16a4604e9165648279f47d80e024ce2684c4bdfb'),
+      }
+    };
+
+    export const ProtocolContractInitializationHash: Record<ProtocolContractName, Fr> = {
+      ContractInstanceRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+ContractClassRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+FeeJuice: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+    };
+
+    export const ProtocolContractPrivateFunctions: Record<ProtocolContractName, { selector: FunctionSelector; vkHash: Fr }[]> = {
+      ContractInstanceRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000077cff62f')), vkHash: Fr.fromString('0x19172c0acecd517dd8995c2e36178ca2aa16cbe001c3606d8cd848776ab80d23') }],
+ContractClassRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x000000000000000000000000000000000000000000000000000000006934ed0d')), vkHash: Fr.fromString('0x1241fdbf61631c59b977bb6a520cafe3169604036705b8680dea59f05fb71251') }],
+FeeJuice: [{ selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000cbe67243')), vkHash: Fr.fromString('0x0bdf2e5c4467f295f8defb436546a7f2e642e7fe75786d0d54aef497b76527a1') }, { selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000e8d374b6')), vkHash: Fr.fromString('0x2616a94d2d2981737c31ed7d74b9fd32ddc8376bf436dd60fb2507662b47c6dd') }]
     };
   
 
     
     export const ProtocolContractsList = new ProtocolContracts([
-      AztecAddress.fromString('0x01166b11e5ee8f78b579f174bea28705b25baad6ec906a51d42232cda5d16506'),
-AztecAddress.fromString('0x2ff9cedf841494ba6177f081c1e8a1237a7aadd50fec97873e76bab90887f13d'),
-AztecAddress.fromString('0x1c013984852562d43e6de2bbd62e9663cb362a127e28fb357cbfcf2084fcbc6f'),
-AztecAddress.fromString('0x28fd62239a256734d5d1bc1e731525f877622f247a8bf5f9395c7d6048737171'),
-AztecAddress.fromString('0x304bff4b0d6584cf83a5b19466582c17b61a47382632039bc18de09f6d305ada'),
-AztecAddress.fromString('0x0a53af9b0611e165bea936e33551da6e9f2f3431ed2f249c49f65c6d576cc611'),
-AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+      AztecAddress.fromStringUnsafe('0x1bbb52d2b4ac8c634f4b5026f2228580627c918895c369495f71caae13d996fe'),
+AztecAddress.fromStringUnsafe('0x2ce1dfe11c45332d557e8302d624b011eb471f0dfa40d2fae64d9fb21590321b'),
+AztecAddress.fromStringUnsafe('0x258a4892dd83d064f6f250601711a82a7b2aaa20f39dbab216237af3ae0c63f2'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromStringUnsafe('0x0000000000000000000000000000000000000000000000000000000000000000')
     ]);
 
-    export const protocolContractsHash = Fr.fromString('0x09b800aa6e4dc969fc07fcb8aaca0934e71464eac247e5d54bacdef57341225f');
+    export const protocolContractsHash = Fr.fromString('0x08d0026a4983c49638d0910859942c6648d5ea0a3a152c8a376e4983d0a003d9');
   
 
     

package/src/provider/bundle.ts

@@ -1,27 +1,21 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 
-import { AuthRegistryArtifact } from '../auth-registry/index.js';
 import { ContractClassRegistryArtifact } from '../class-registry/index.js';
 import { FeeJuiceArtifact } from '../fee-juice/index.js';
 import { ContractInstanceRegistryArtifact } from '../instance-registry/index.js';
 import { makeProtocolContract } from '../make_protocol_contract.js';
-import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
-import { PublicChecksArtifact } from '../public-checks/index.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
 
 export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
-  AuthRegistry: AuthRegistryArtifact,
   ContractInstanceRegistry: ContractInstanceRegistryArtifact,
   ContractClassRegistry: ContractClassRegistryArtifact,
-  MultiCallEntrypoint: MultiCallEntrypointArtifact,
   FeeJuice: FeeJuiceArtifact,
-  PublicChecks: PublicChecksArtifact,
 };
 
 export class BundledProtocolContractsProvider implements ProtocolContractsProvider {
   getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract> {
-    return makeProtocolContract(name, ProtocolContractArtifact[name]);
+    return Promise.resolve(makeProtocolContract(name, ProtocolContractArtifact[name]));
   }
 }

package/src/provider/lazy.ts

@@ -1,28 +1,19 @@
-import { getCanonicalAuthRegistry } from '../auth-registry/lazy.js';
 import { getCanonicalClassRegistry } from '../class-registry/lazy.js';
 import { getCanonicalFeeJuice } from '../fee-juice/lazy.js';
 import { getCanonicalInstanceRegistry } from '../instance-registry/lazy.js';
-import { getCanonicalMultiCallEntrypoint } from '../multi-call-entrypoint/lazy.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
-import { getCanonicalPublicChecks } from '../public-checks/lazy.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
 
 export class LazyProtocolContractsProvider implements ProtocolContractsProvider {
   getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract> {
     switch (name) {
-      case 'AuthRegistry':
-        return getCanonicalAuthRegistry();
       case 'ContractInstanceRegistry':
         return getCanonicalInstanceRegistry();
       case 'ContractClassRegistry':
         return getCanonicalClassRegistry();
-      case 'MultiCallEntrypoint':
-        return getCanonicalMultiCallEntrypoint();
       case 'FeeJuice':
         return getCanonicalFeeJuice();
-      case 'PublicChecks':
-        return getCanonicalPublicChecks();
       default:
         throw new Error(`Unknown protocol contract name: ${name}`);
     }

package/src/tests/fixtures.ts

@@ -2,25 +2,13 @@ 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
+// Generated from end-to-end/src/automine/contracts/deploy/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
 export function getSampleContractClassPublishedEventPayload(): Buffer {
   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
-export function getSamplePrivateFunctionBroadcastedEventPayload(): Buffer {
-  const path = getPathToFixture('PrivateFunctionBroadcastedEventData.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 getSampleUtilityFunctionBroadcastedEventPayload(): Buffer {
-  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
+// Generated from end-to-end/src/automine/contracts/deploy/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
 export function getSampleContractInstancePublishedEventPayload(): Buffer {
   const path = getPathToFixture('ContractInstancePublishedEventData.hex');
   return Buffer.from(readFileSync(path).toString(), 'hex');

package/artifacts/AuthRegistry.d.json.ts

@@ -1,5 +0,0 @@
-
-    import type { NoirCompiledContract } from '@aztec/stdlib/noir';
-    const circuit: NoirCompiledContract;
-    export = circuit;
-