@aztec/protocol-contracts 0.0.1-commit.fce3e4f → 0.0.1-commit.ffe5b04ea

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/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';
 
@@ -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('0x1dc64374e96b37a36d94b737a049efb4686f45f628457f5d6d74f5d45817944b'),
-ContractInstanceRegistry: AztecAddress.fromString('0x24b7c46308ae93c05e3bac8201935effd50b61504954eef96d7b0384f27ee80c'),
-ContractClassRegistry: AztecAddress.fromString('0x2f6b4852b69e0381596da99b3aad9b8d493312f47e1c0e3523928e010e1f9df2'),
-MultiCallEntrypoint: AztecAddress.fromString('0x1c93c2cb51b87faa1ee26b5f933a8136642cec5cdf95216bdd9aa4873d4b38ff'),
-FeeJuice: AztecAddress.fromString('0x2223ff211abddd65cb27b3fd9ef6cbcdfed867b1b5c2421f87624c6fe86c39ff'),
-Router: AztecAddress.fromString('0x090dc318c793abc5ee9a560dcf9f0ba54c73902086dd7258cd48da8c79ef201a')
+      AuthRegistry: AztecAddress.fromString('0x06c7f95239f8000261de312d9513021e0cd59ae0f0de86d89375572799adadcf'),
+ContractInstanceRegistry: AztecAddress.fromString('0x2436a1d64e15c142d46711ac9454523d36b6fa6eac494f5582f8b25c031e1489'),
+ContractClassRegistry: AztecAddress.fromString('0x2113f3e0335fe6fb46e6ecec2858b415ca04bae873e2893ae6c45b65ce686af1'),
+MultiCallEntrypoint: AztecAddress.fromString('0x19e23cc3ca3a51cc67ccf3a154e7565ff9fdcd2e06128ad7a8ceebf4aae7e41d'),
+FeeJuice: AztecAddress.fromString('0x14d0ab965abe4770e06a821e36f57affa4bb81ca050f66b9010098818154f04f'),
+PublicChecks: AztecAddress.fromString('0x1e7906ea624d5cc6395848408fc9dafeb89e69cb7a0329d622c9907b6fa5b113')
+    };
+  
+
+    
+    export const ProtocolContractClassId: Record<ProtocolContractName, Fr> = {
+      AuthRegistry: Fr.fromString('0x2228d1c5f3d032fc81ef464b9d342626aaf47d77920b85bff4577919b4cbd02e'),
+ContractInstanceRegistry: Fr.fromString('0x23a132ac4f0efe1476b2b5f144afdbc2f383ef12cf5982f68185f4d921802912'),
+ContractClassRegistry: Fr.fromString('0x2c053725122e23b1cf21cf781b0de4d2a2de5dd1cad4ccacf287d87c5918a794'),
+MultiCallEntrypoint: Fr.fromString('0x05298623a4d6a1a9cb57e707ac550845da938eb6e2977f50d6442925b2a370d3'),
+FeeJuice: Fr.fromString('0x1957b2b25fecce952a7f8058275778302c2647793d6adedc6969586a0ce73c43'),
+PublicChecks: Fr.fromString('0x27d10a145494aa34c35df4a526edffdb7b0ac10bb8dfe45be7143919d70d21cc')
+    };
+
+    export const ProtocolContractClassIdPreimage: Record<ProtocolContractName, { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }> = {
+      AuthRegistry: {
+        artifactHash: Fr.fromString('0x2b9451d83da1a8887f9485e0627d570f6205fc37745914965994277d25ed0040'),
+        privateFunctionsRoot: Fr.fromString('0x11900a485e3ffa03da98d89abb0c9419200644aaf17f5caa863953fccf1ed88f'),
+        publicBytecodeCommitment: Fr.fromString('0x1765c0a2af421f31ebfa03f11cd3ae7fb6a8b41c3128375e2b0b0c30cf493975'),
+      },
+ContractInstanceRegistry: {
+        artifactHash: Fr.fromString('0x252b9830d6ea67290fa5ab0308a67889ba888e75ae30ad2fff311e806c4e624e'),
+        privateFunctionsRoot: Fr.fromString('0x136a6705c7ad1d47f65cb881a56909d4c78d3fa8944f5b103734cd91e654ed63'),
+        publicBytecodeCommitment: Fr.fromString('0x1b34b6572f6b7e6d8b4ea5f3bc7a6b67a30e98bbc2e03f686fc7541ffb267b71'),
+      },
+ContractClassRegistry: {
+        artifactHash: Fr.fromString('0x2a954f0df191b1b7ba692629552e1fe13b1038bc72ccd23d5125dffe58bc58b4'),
+        privateFunctionsRoot: Fr.fromString('0x2ac3bf890a7d534a768079aa86889caa1a86373c8e6fc2db48215b11bbb79106'),
+        publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+      },
+MultiCallEntrypoint: {
+        artifactHash: Fr.fromString('0x13dc94c40802b063a4790ca4ba45f7fe6196fca741b243e815692688228ddfb5'),
+        privateFunctionsRoot: Fr.fromString('0x266505ecb7c02ce6e227227c0b6bdb44713c8ecd43164ee7bb00b8fb340e8b03'),
+        publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
+      },
+FeeJuice: {
+        artifactHash: Fr.fromString('0x16ad3120660333d9b612229be7d62953021fdb3129a5a8092c70844a8fb9a0ff'),
+        privateFunctionsRoot: Fr.fromString('0x0abef3cfc6ae314886c841b42dc33d3eed255ad3dee7773daabf05b229573759'),
+        publicBytecodeCommitment: Fr.fromString('0x022c20c2d96794f3254446d85c553e0b768e77e877d100a9fdf2a7778e27e333'),
+      },
+PublicChecks: {
+        artifactHash: Fr.fromString('0x22525f017e57bd13c28177789a541adc525089b1e9a185ff728221ee6b69108a'),
+        privateFunctionsRoot: Fr.fromString('0x067243231eddf4222f3911defbba7705aff06ed45960b27f6f91319196ef97e1'),
+        publicBytecodeCommitment: Fr.fromString('0x2425ba7086fdf347931ff0f487610b980fd0ad716f7631a51cef39190c3a6709'),
+      }
+    };
+
+    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('0x1dc64374e96b37a36d94b737a049efb4686f45f628457f5d6d74f5d45817944b'),
-AztecAddress.fromString('0x24b7c46308ae93c05e3bac8201935effd50b61504954eef96d7b0384f27ee80c'),
-AztecAddress.fromString('0x2f6b4852b69e0381596da99b3aad9b8d493312f47e1c0e3523928e010e1f9df2'),
-AztecAddress.fromString('0x1c93c2cb51b87faa1ee26b5f933a8136642cec5cdf95216bdd9aa4873d4b38ff'),
-AztecAddress.fromString('0x2223ff211abddd65cb27b3fd9ef6cbcdfed867b1b5c2421f87624c6fe86c39ff'),
-AztecAddress.fromString('0x090dc318c793abc5ee9a560dcf9f0ba54c73902086dd7258cd48da8c79ef201a'),
+      AztecAddress.fromString('0x06c7f95239f8000261de312d9513021e0cd59ae0f0de86d89375572799adadcf'),
+AztecAddress.fromString('0x2436a1d64e15c142d46711ac9454523d36b6fa6eac494f5582f8b25c031e1489'),
+AztecAddress.fromString('0x2113f3e0335fe6fb46e6ecec2858b415ca04bae873e2893ae6c45b65ce686af1'),
+AztecAddress.fromString('0x19e23cc3ca3a51cc67ccf3a154e7565ff9fdcd2e06128ad7a8ceebf4aae7e41d'),
+AztecAddress.fromString('0x14d0ab965abe4770e06a821e36f57affa4bb81ca050f66b9010098818154f04f'),
+AztecAddress.fromString('0x1e7906ea624d5cc6395848408fc9dafeb89e69cb7a0329d622c9907b6fa5b113'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
@@ -65,10 +128,10 @@ AztecAddress.fromString('0x00000000000000000000000000000000000000000000000000000
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
     ]);
 
-    export const protocolContractsHash = Fr.fromString('0x12f22ad1b89f09c9a684cb5f36820a7d678527270547e489536c586d3c1756a4');
+    export const protocolContractsHash = Fr.fromString('0x0e0f38d4c5646612ac162168852b5e09091e1749d5ddb0dce645f2453b95237d');
   
 
     
-  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x28da3fc471387d4e20b646b77abc8cdfc02a339a7507285a73d84f9b97b13486');
+  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x1a7e1badb79abdd38c684b3c8306ffe7ecb33c69e3380d9855730aaaa83a21a8');
   
   

package/src/provider/bundle.ts

@@ -8,7 +8,7 @@ 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 { RouterArtifact } from '../router/index.js';
+import { PublicChecksArtifact } from '../public-checks/index.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
 
 export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
@@ -17,11 +17,11 @@ export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArti
   ContractClassRegistry: ContractClassRegistryArtifact,
   MultiCallEntrypoint: MultiCallEntrypointArtifact,
   FeeJuice: FeeJuiceArtifact,
-  Router: RouterArtifact,
+  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

@@ -5,7 +5,7 @@ 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 { getCanonicalRouter } from '../router/lazy.js';
+import { getCanonicalPublicChecks } from '../public-checks/lazy.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
 
 export class LazyProtocolContractsProvider implements ProtocolContractsProvider {
@@ -21,8 +21,8 @@ export class LazyProtocolContractsProvider implements ProtocolContractsProvider
         return getCanonicalMultiCallEntrypoint();
       case 'FeeJuice':
         return getCanonicalFeeJuice();
-      case 'Router':
-        return getCanonicalRouter();
+      case 'PublicChecks':
+        return getCanonicalPublicChecks();
       default:
         throw new Error(`Unknown protocol contract name: ${name}`);
     }

package/src/{router → public-checks}/index.ts

@@ -1,18 +1,18 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import RouterJson from '../../artifacts/Router.json' with { type: 'json' };
+import PublicChecksJson from '../../artifacts/PublicChecks.json' with { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
-export const RouterArtifact = loadContractArtifact(RouterJson as NoirCompiledContract);
+export const PublicChecksArtifact = loadContractArtifact(PublicChecksJson as NoirCompiledContract);
 
 let protocolContract: ProtocolContract;
 
 /** Returns the canonical deployment of the contract. */
-export async function getCanonicalRouter(): Promise<ProtocolContract> {
+export function getCanonicalPublicChecks(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    protocolContract = await makeProtocolContract('Router', RouterArtifact);
+    protocolContract = makeProtocolContract('PublicChecks', PublicChecksArtifact);
   }
-  return protocolContract;
+  return Promise.resolve(protocolContract);
 }

package/src/{router → public-checks}/lazy.ts

@@ -6,24 +6,24 @@ import type { ProtocolContract } from '../protocol_contract.js';
 let protocolContract: ProtocolContract;
 let protocolContractArtifact: ContractArtifact;
 
-export async function getRouterArtifact(): Promise<ContractArtifact> {
+export async function getPublicChecksArtifact(): Promise<ContractArtifact> {
   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(): Promise<ProtocolContract> {
+/** Returns the canonical deployment of the public checks contract. */
+export async function getCanonicalPublicChecks(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    const routerArtifact = await getRouterArtifact();
-    protocolContract = await makeProtocolContract('Router', routerArtifact);
+    const publicChecksArtifact = await getPublicChecksArtifact();
+    protocolContract = makeProtocolContract('PublicChecks', publicChecksArtifact);
   }
   return protocolContract;
 }