@aztec/protocol-contracts 0.67.1 → 0.68.1

package/src/class-registerer/index.ts

@@ -1,10 +1,25 @@
-import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { loadContractArtifact } from '@aztec/types/abi';
+import { type NoirCompiledContract } from '@aztec/types/noir';
+
+import ContractClassRegistererJson from '../../artifacts/ContractClassRegisterer.json' assert { type: 'json' };
+import { makeProtocolContract } from '../make_protocol_contract.js';
+import { type ProtocolContract } from '../protocol_contract.js';
 
 export * from './contract_class_registered_event.js';
 export * from './private_function_broadcasted_event.js';
 export * from './unconstrained_function_broadcasted_event.js';
 
-/** Returns the canonical deployment of the class registerer contract. */
+export const ContractClassRegistererArtifact = loadContractArtifact(
+  ContractClassRegistererJson as NoirCompiledContract,
+);
+
+let protocolContract: ProtocolContract;
+
+/** Returns the canonical deployment of the contract. */
 export function getCanonicalClassRegisterer(): ProtocolContract {
-  return getCanonicalProtocolContract('ContractClassRegisterer');
+  if (!protocolContract) {
+    const artifact = ContractClassRegistererArtifact;
+    protocolContract = makeProtocolContract('ContractClassRegisterer', artifact);
+  }
+  return protocolContract;
 }

package/src/fee-juice/index.ts

@@ -1,6 +1,18 @@
-import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { loadContractArtifact } from '@aztec/types/abi';
+import { type NoirCompiledContract } from '@aztec/types/noir';
 
-/** Returns the canonical deployment of the Fee Juice. */
+import FeeJuiceJson from '../../artifacts/FeeJuice.json' assert { type: 'json' };
+import { makeProtocolContract } from '../make_protocol_contract.js';
+import { type ProtocolContract } from '../protocol_contract.js';
+
+export const FeeJuiceArtifact = loadContractArtifact(FeeJuiceJson as NoirCompiledContract);
+
+let protocolContract: ProtocolContract;
+
+/** Returns the canonical deployment of the contract. */
 export function getCanonicalFeeJuice(): ProtocolContract {
-  return getCanonicalProtocolContract('FeeJuice');
+  if (!protocolContract) {
+    protocolContract = makeProtocolContract('FeeJuice', FeeJuiceArtifact);
+  }
+  return protocolContract;
 }

package/src/index.ts

@@ -1,8 +1,3 @@
-export * from './auth-registry/index.js';
-export * from './class-registerer/index.js';
-export * from './fee-juice/index.js';
-export * from './instance-deployer/index.js';
-export * from './multi-call-entrypoint/index.js';
 export * from './protocol_contract.js';
 export * from './protocol_contract_data.js';
 export * from './protocol_contract_tree.js';

package/src/instance-deployer/index.ts

@@ -1,8 +1,22 @@
-import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { loadContractArtifact } from '@aztec/types/abi';
+import { type NoirCompiledContract } from '@aztec/types/noir';
+
+import ContractInstanceDeployerJson from '../../artifacts/ContractInstanceDeployer.json' assert { type: 'json' };
+import { makeProtocolContract } from '../make_protocol_contract.js';
+import { type ProtocolContract } from '../protocol_contract.js';
 
 export * from './contract_instance_deployed_event.js';
 
-/** Returns the canonical deployment of the instance deployer contract. */
+export const ContractInstanceDeployerArtifact = loadContractArtifact(
+  ContractInstanceDeployerJson as NoirCompiledContract,
+);
+
+let protocolContract: ProtocolContract;
+
+/** Returns the canonical deployment of the contract. */
 export function getCanonicalInstanceDeployer(): ProtocolContract {
-  return getCanonicalProtocolContract('ContractInstanceDeployer');
+  if (!protocolContract) {
+    protocolContract = makeProtocolContract('ContractInstanceDeployer', ContractInstanceDeployerArtifact);
+  }
+  return protocolContract;
 }

package/src/make_protocol_contract.ts

@@ -0,0 +1,23 @@
+import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
+import { type ContractArtifact } from '@aztec/foundation/abi';
+
+import { type ProtocolContract } from './protocol_contract.js';
+import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from './protocol_contract_data.js';
+
+/**
+ * Returns the canonical deployment given its name and artifact.
+ * To be used internally within the protocol-contracts package.
+ */
+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 = getContractClassFromArtifact(artifact);
+  const instance = getContractInstanceFromDeployParams(artifact, { salt });
+  return {
+    instance: { ...instance, address },
+    contractClass,
+    artifact,
+    address,
+  };
+}

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

@@ -1,5 +1,18 @@
-import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { loadContractArtifact } from '@aztec/types/abi';
+import { type NoirCompiledContract } from '@aztec/types/noir';
 
-export function getCanonicalMultiCallEntrypointContract(): ProtocolContract {
-  return getCanonicalProtocolContract('MultiCallEntrypoint');
+import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' assert { type: 'json' };
+import { makeProtocolContract } from '../make_protocol_contract.js';
+import { type ProtocolContract } from '../protocol_contract.js';
+
+export const MultiCallEntrypointArtifact = loadContractArtifact(MultiCallEntrypointJson as NoirCompiledContract);
+
+let protocolContract: ProtocolContract;
+
+/** Returns the canonical deployment of the contract. */
+export function getCanonicalMultiCallEntrypoint(): ProtocolContract {
+  if (!protocolContract) {
+    protocolContract = makeProtocolContract('MultiCallEntrypoint', MultiCallEntrypointArtifact);
+  }
+  return protocolContract;
 }

package/src/protocol_contract.ts

@@ -3,17 +3,10 @@ import {
   type ContractClassIdPreimage,
   type ContractClassWithId,
   type ContractInstanceWithAddress,
-  getContractClassFromArtifact,
-  getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 
-import {
-  ProtocolContractAddress,
-  ProtocolContractArtifact,
-  type ProtocolContractName,
-  ProtocolContractSalt,
-} from './protocol_contract_data.js';
+import { ProtocolContractAddress } from './protocol_contract_data.js';
 
 /** Represents a canonical contract in the protocol. */
 export interface ProtocolContract {
@@ -27,22 +20,6 @@ export interface ProtocolContract {
   address: AztecAddress;
 }
 
-/** Returns the canonical deployment a given artifact. */
-export function getCanonicalProtocolContract(name: ProtocolContractName): ProtocolContract {
-  const artifact = ProtocolContractArtifact[name];
-  const address = ProtocolContractAddress[name];
-  const salt = ProtocolContractSalt[name];
-  // TODO(@spalladino): This computes the contract class from the artifact twice.
-  const contractClass = getContractClassFromArtifact(artifact);
-  const instance = getContractInstanceFromDeployParams(artifact, { salt });
-  return {
-    instance: { ...instance, address },
-    contractClass,
-    artifact,
-    address,
-  };
-}
-
 export function isProtocolContract(address: AztecAddress) {
   return Object.values(ProtocolContractAddress).some(a => a.equals(address));
 }

package/src/protocol_contract_data.ts

@@ -1,15 +1,5 @@
 // GENERATED FILE - DO NOT EDIT. RUN `yarn generate` or `yarn generate:data`
 import { AztecAddress, Fr } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { loadContractArtifact } from '@aztec/types/abi';
-import { type NoirCompiledContract } from '@aztec/types/noir';
-
-import AuthRegistryJson from '../artifacts/AuthRegistry.json' assert { type: 'json' };
-import ContractClassRegistererJson from '../artifacts/ContractClassRegisterer.json' assert { type: 'json' };
-import ContractInstanceDeployerJson from '../artifacts/ContractInstanceDeployer.json' assert { type: 'json' };
-import FeeJuiceJson from '../artifacts/FeeJuice.json' assert { type: 'json' };
-import MultiCallEntrypointJson from '../artifacts/MultiCallEntrypoint.json' assert { type: 'json' };
-import RouterJson from '../artifacts/Router.json' assert { type: 'json' };
 
 export const protocolContractNames = [
   'AuthRegistry',
@@ -22,15 +12,6 @@ export const protocolContractNames = [
 
 export type ProtocolContractName = (typeof protocolContractNames)[number];
 
-export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
-  AuthRegistry: loadContractArtifact(AuthRegistryJson as NoirCompiledContract),
-  ContractInstanceDeployer: loadContractArtifact(ContractInstanceDeployerJson as NoirCompiledContract),
-  ContractClassRegisterer: loadContractArtifact(ContractClassRegistererJson as NoirCompiledContract),
-  MultiCallEntrypoint: loadContractArtifact(MultiCallEntrypointJson as NoirCompiledContract),
-  FeeJuice: loadContractArtifact(FeeJuiceJson as NoirCompiledContract),
-  Router: loadContractArtifact(RouterJson as NoirCompiledContract),
-};
-
 export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
   AuthRegistry: new Fr(1),
   ContractInstanceDeployer: new Fr(1),
@@ -50,16 +31,16 @@ export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>
 };
 
 export const ProtocolContractLeaf = {
-  AuthRegistry: Fr.fromHexString('0x20cbeffab0531a2ee8fa157414c739bfc0e0342ea09f6d01585788d9f240604c'),
-  ContractInstanceDeployer: Fr.fromHexString('0x2a4082a69fc451db387d9f144b787ac902ad578240e7d36b14d177636d337bb0'),
-  ContractClassRegisterer: Fr.fromHexString('0x2b0db891d2642079a447e67e7d680dc246686a195412972676c8f3144a34fce5'),
-  MultiCallEntrypoint: Fr.fromHexString('0x0a4a88882c1846ddfcfda6ed67c443bdfc75603a2ab08d893ab7b62c671461ce'),
-  FeeJuice: Fr.fromHexString('0x1848a1f8bdcfe420358552e038f34fd9dd60c92ae2f5e3d6e6b252d3e2f5f109'),
-  Router: Fr.fromHexString('0x071af2035c8806f50406f313bc3d482fac6adba36cc4b3b83d16371e69bc7f66'),
+  AuthRegistry: Fr.fromHexString('0x23413f98beb033d7bfa8a9b5addc441f26759faf00dff5c848da5f3518bf7eb0'),
+  ContractInstanceDeployer: Fr.fromHexString('0x032447de7cc74649ca4fc97e444029c6410065fa7878f0198389dbc0cc51eb47'),
+  ContractClassRegisterer: Fr.fromHexString('0x0a39c154e69a1d9ad1ae1f179b77988a64c46825eb88a8fd48818c6d149a5f0d'),
+  MultiCallEntrypoint: Fr.fromHexString('0x1c1001e61223368d2d563234664e585ef5f77dab4a35fa00b3ea804cb7651e2b'),
+  FeeJuice: Fr.fromHexString('0x17f297c7e65113aabcf5e683c54295a4c2518dc99138af24b2999f87f6a75f74'),
+  Router: Fr.fromHexString('0x004836601b82afe289d5447afb230ba866499992a7c61f26d8a628dc38db054a'),
 };
 
 export const protocolContractTreeRoot = Fr.fromHexString(
-  '0x296690a67333fb896eff0ef812d31f9be26161726e47057bb688ddcf08164453',
+  '0x2431e1d42149c19a560e80cfde544d97aa75833c7d3a54f9c7545372aff2d295',
 );
 
 export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(

package/src/router/index.ts

@@ -1,6 +1,18 @@
-import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { loadContractArtifact } from '@aztec/types/abi';
+import { type NoirCompiledContract } from '@aztec/types/noir';
 
-/** Returns the canonical deployment of the router. */
+import RouterJson from '../../artifacts/Router.json' assert { type: 'json' };
+import { makeProtocolContract } from '../make_protocol_contract.js';
+import { type ProtocolContract } from '../protocol_contract.js';
+
+export const RouterArtifact = loadContractArtifact(RouterJson as NoirCompiledContract);
+
+let protocolContract: ProtocolContract;
+
+/** Returns the canonical deployment of the contract. */
 export function getCanonicalRouter(): ProtocolContract {
-  return getCanonicalProtocolContract('Router');
+  if (!protocolContract) {
+    protocolContract = makeProtocolContract('Router', RouterArtifact);
+  }
+  return protocolContract;
 }

package/dest/scripts/generate_data.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=generate_data.d.ts.map

package/dest/scripts/generate_data.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generate_data.d.ts","sourceRoot":"","sources":["../../src/scripts/generate_data.ts"],"names":[],"mappings":""}

package/dest/scripts/generate_data.js

@@ -1,175 +0,0 @@
-import { AztecAddress, CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE, FEE_JUICE_ADDRESS, Fr, 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, getContractInstanceFromDeployParams, } from '@aztec/circuits.js';
-import { poseidon2Hash } from '@aztec/foundation/crypto';
-import { createConsoleLogger } from '@aztec/foundation/log';
-import { loadContractArtifact } from '@aztec/types/abi';
-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');
-const destArtifactsDir = './artifacts';
-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,
-    MultiCallEntrypoint: MULTI_CALL_ENTRYPOINT_ADDRESS,
-    FeeJuice: FEE_JUICE_ADDRESS,
-    Router: ROUTER_ADDRESS,
-};
-async function clearDestDir() {
-    try {
-        await fs.access(destArtifactsDir);
-        // If the directory exists, remove it recursively.
-        await fs.rm(destArtifactsDir, { recursive: true, force: true });
-    }
-    catch (err) {
-        if (err.code === 'ENOENT') {
-            // If the directory does not exist, do nothing.
-        }
-        else {
-            log(`Error removing dest directory: ${err}`);
-        }
-    }
-    await fs.mkdir(destArtifactsDir, { recursive: true });
-}
-async function copyArtifact(srcName, destName) {
-    const src = path.join(srcPath, `${srcName}.json`);
-    const artifact = JSON.parse(await fs.readFile(src, 'utf8'));
-    const dest = path.join(destArtifactsDir, `${destName}.json`);
-    await fs.copyFile(src, dest);
-    return artifact;
-}
-function computeContractLeaf(artifact) {
-    const instance = getContractInstanceFromDeployParams(loadContractArtifact(artifact), { salt });
-    return instance.address;
-}
-function computeRoot(names, leaves) {
-    const data = names.map((name, i) => ({
-        address: new AztecAddress(new Fr(contractAddressMapping[name])),
-        leaf: leaves[i],
-    }));
-    const tree = buildProtocolContractTree(data);
-    return Fr.fromBuffer(tree.root);
-}
-async function generateDeclarationFile(destName) {
-    const content = `
-    import { type NoirCompiledContract } from '@aztec/types/noir';
-    const circuit: NoirCompiledContract;
-    export = circuit;
-  `;
-    await fs.writeFile(path.join(destArtifactsDir, `${destName}.d.json.ts`), content);
-}
-function generateNames(names) {
-    return `
-    export const protocolContractNames = [
-      ${names.map(name => `'${name}'`).join(',\n')}
-    ] as const;
-
-    export type ProtocolContractName = typeof protocolContractNames[number];
-  `;
-}
-function generateArtifacts(names) {
-    const imports = names
-        .map(name => {
-        return `
-      import ${name}Json from '../artifacts/${name}.json' assert { type: 'json' };
-    `;
-    })
-        .join('\n');
-    const exports = names.map(name => `${name}: loadContractArtifact(${name}Json as NoirCompiledContract)`).join(',\n');
-    return `
-    ${imports}
-
-    export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
-      ${exports}
-    };
-  `;
-}
-function generateSalts(names) {
-    return `
-    export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
-      ${names.map(name => `${name}: new Fr(${salt.toNumber()})`).join(',\n')}
-    };
-  `;
-}
-function generateContractAddresses(names) {
-    const addresses = names.map(name => `${name}: AztecAddress.fromBigInt(${contractAddressMapping[name]}n)`).join(',\n');
-    return `
-    export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
-      ${addresses}
-    };
-  `;
-}
-function generateContractLeaves(names, leaves) {
-    return `
-    export const ProtocolContractLeaf = {
-      ${leaves.map((leaf, i) => `${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
-    };
-  `;
-}
-function generateRoot(names, leaves) {
-    const root = computeRoot(names, leaves);
-    return `
-    export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
-  `;
-}
-function generateLogTags() {
-    return `
-  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}n);
-  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
-  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
-  export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('${poseidon2Hash([
-        DEPLOYER_CONTRACT_ADDRESS,
-        DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
-    ])}');
-  `;
-}
-async function generateOutputFile(names, leaves) {
-    const content = `
-    // GENERATED FILE - DO NOT EDIT. RUN \`yarn generate\` or \`yarn generate:data\`
-    import { AztecAddress, Fr } from '@aztec/circuits.js';
-    import { type ContractArtifact } from '@aztec/foundation/abi';
-    import { loadContractArtifact } from '@aztec/types/abi';
-    import { type NoirCompiledContract } from '@aztec/types/noir';
-
-    ${generateNames(names)}
-
-    ${generateArtifacts(names)}
-
-    ${generateSalts(names)}
-
-    ${generateContractAddresses(names)}
-
-    ${generateContractLeaves(names, leaves)}
-
-    ${generateRoot(names, leaves)}
-
-    ${generateLogTags()}
-  `;
-    await fs.writeFile(outputFilePath, content);
-}
-async function main() {
-    await clearDestDir();
-    const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
-    const leaves = [];
-    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);
-        leaves.push(computeContractLeaf(artifact).toField());
-    }
-    await generateOutputFile(destNames, leaves);
-}
-try {
-    await main();
-}
-catch (err) {
-    log(`Error copying protocol contract artifacts: ${err}`);
-    process.exit(1);
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY3JpcHRzL2dlbmVyYXRlX2RhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLFlBQVksRUFDWiwrQkFBK0IsRUFDL0IseUJBQXlCLEVBQ3pCLCtDQUErQyxFQUMvQyxpQkFBaUIsRUFDakIsRUFBRSxFQUNGLDZCQUE2QixFQUM3QiwyQkFBMkIsRUFDM0IsZ0RBQWdELEVBQ2hELG1EQUFtRCxFQUNuRCx5REFBeUQsRUFDekQsY0FBYyxFQUNkLG1DQUFtQyxHQUNwQyxNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUd4RCxPQUFPLEVBQUUsUUFBUSxJQUFJLEVBQUUsRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQyxPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFFeEIsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFFL0UsTUFBTSxHQUFHLEdBQUcsbUJBQW1CLENBQUMsY0FBYyxDQUFDLENBQUM7QUFFaEQsTUFBTSxpQkFBaUIsR0FBRyxvQ0FBb0MsQ0FBQztBQUMvRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLFVBQVUsQ0FBQyxDQUFDO0FBQ3pELE1BQU0sZ0JBQWdCLEdBQUcsYUFBYSxDQUFDO0FBQ3ZDLE1BQU0sY0FBYyxHQUFHLGlDQUFpQyxDQUFDO0FBRXpELE1BQU0sSUFBSSxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRXZCLE1BQU0sc0JBQXNCLEdBQStCO0lBQ3pELFlBQVksRUFBRSwrQkFBK0I7SUFDN0Ms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

package/src/scripts/generate_data.ts

@@ -1,214 +0,0 @@
-import {
-  AztecAddress,
-  CANONICAL_AUTH_REGISTRY_ADDRESS,
-  DEPLOYER_CONTRACT_ADDRESS,
-  DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
-  FEE_JUICE_ADDRESS,
-  Fr,
-  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,
-  getContractInstanceFromDeployParams,
-} from '@aztec/circuits.js';
-import { poseidon2Hash } from '@aztec/foundation/crypto';
-import { createConsoleLogger } from '@aztec/foundation/log';
-import { loadContractArtifact } from '@aztec/types/abi';
-import { type NoirCompiledContract } from '@aztec/types/noir';
-
-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');
-const destArtifactsDir = './artifacts';
-const outputFilePath = './src/protocol_contract_data.ts';
-
-const salt = new Fr(1);
-
-const contractAddressMapping: { [name: string]: number } = {
-  AuthRegistry: CANONICAL_AUTH_REGISTRY_ADDRESS,
-  ContractInstanceDeployer: DEPLOYER_CONTRACT_ADDRESS,
-  ContractClassRegisterer: REGISTERER_CONTRACT_ADDRESS,
-  MultiCallEntrypoint: MULTI_CALL_ENTRYPOINT_ADDRESS,
-  FeeJuice: FEE_JUICE_ADDRESS,
-  Router: ROUTER_ADDRESS,
-};
-
-async function clearDestDir() {
-  try {
-    await fs.access(destArtifactsDir);
-    // If the directory exists, remove it recursively.
-    await fs.rm(destArtifactsDir, { recursive: true, force: true });
-  } catch (err: any) {
-    if (err.code === 'ENOENT') {
-      // If the directory does not exist, do nothing.
-    } else {
-      log(`Error removing dest directory: ${err}`);
-    }
-  }
-  await fs.mkdir(destArtifactsDir, { recursive: true });
-}
-
-async function copyArtifact(srcName: string, destName: string) {
-  const src = path.join(srcPath, `${srcName}.json`);
-  const artifact = JSON.parse(await fs.readFile(src, 'utf8')) as NoirCompiledContract;
-  const dest = path.join(destArtifactsDir, `${destName}.json`);
-  await fs.copyFile(src, dest);
-  return artifact;
-}
-
-function computeContractLeaf(artifact: NoirCompiledContract) {
-  const instance = getContractInstanceFromDeployParams(loadContractArtifact(artifact), { salt });
-  return instance.address;
-}
-
-function computeRoot(names: string[], leaves: Fr[]) {
-  const data = names.map((name, i) => ({
-    address: new AztecAddress(new Fr(contractAddressMapping[name])),
-    leaf: leaves[i],
-  }));
-  const tree = buildProtocolContractTree(data);
-  return Fr.fromBuffer(tree.root);
-}
-
-async function generateDeclarationFile(destName: string) {
-  const content = `
-    import { type NoirCompiledContract } from '@aztec/types/noir';
-    const circuit: NoirCompiledContract;
-    export = circuit;
-  `;
-  await fs.writeFile(path.join(destArtifactsDir, `${destName}.d.json.ts`), content);
-}
-
-function generateNames(names: string[]) {
-  return `
-    export const protocolContractNames = [
-      ${names.map(name => `'${name}'`).join(',\n')}
-    ] as const;
-
-    export type ProtocolContractName = typeof protocolContractNames[number];
-  `;
-}
-
-function generateArtifacts(names: string[]) {
-  const imports = names
-    .map(name => {
-      return `
-      import ${name}Json from '../artifacts/${name}.json' assert { type: 'json' };
-    `;
-    })
-    .join('\n');
-
-  const exports = names.map(name => `${name}: loadContractArtifact(${name}Json as NoirCompiledContract)`).join(',\n');
-
-  return `
-    ${imports}
-
-    export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
-      ${exports}
-    };
-  `;
-}
-
-function generateSalts(names: string[]) {
-  return `
-    export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
-      ${names.map(name => `${name}: new Fr(${salt.toNumber()})`).join(',\n')}
-    };
-  `;
-}
-
-function generateContractAddresses(names: string[]) {
-  const addresses = names.map(name => `${name}: AztecAddress.fromBigInt(${contractAddressMapping[name]}n)`).join(',\n');
-  return `
-    export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
-      ${addresses}
-    };
-  `;
-}
-
-function generateContractLeaves(names: string[], leaves: Fr[]) {
-  return `
-    export const ProtocolContractLeaf = {
-      ${leaves.map((leaf, i) => `${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
-    };
-  `;
-}
-
-function generateRoot(names: string[], leaves: Fr[]) {
-  const root = computeRoot(names, leaves);
-  return `
-    export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
-  `;
-}
-
-function generateLogTags() {
-  return `
-  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(${REGISTERER_CONTRACT_CLASS_REGISTERED_MAGIC_VALUE}n);
-  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
-  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(${REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_MAGIC_VALUE}n);
-  export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('${poseidon2Hash([
-    DEPLOYER_CONTRACT_ADDRESS,
-    DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_MAGIC_VALUE,
-  ])}');
-  `;
-}
-
-async function generateOutputFile(names: string[], leaves: Fr[]) {
-  const content = `
-    // GENERATED FILE - DO NOT EDIT. RUN \`yarn generate\` or \`yarn generate:data\`
-    import { AztecAddress, Fr } from '@aztec/circuits.js';
-    import { type ContractArtifact } from '@aztec/foundation/abi';
-    import { loadContractArtifact } from '@aztec/types/abi';
-    import { type NoirCompiledContract } from '@aztec/types/noir';
-
-    ${generateNames(names)}
-
-    ${generateArtifacts(names)}
-
-    ${generateSalts(names)}
-
-    ${generateContractAddresses(names)}
-
-    ${generateContractLeaves(names, leaves)}
-
-    ${generateRoot(names, leaves)}
-
-    ${generateLogTags()}
-  `;
-  await fs.writeFile(outputFilePath, content);
-}
-
-async function main() {
-  await clearDestDir();
-
-  const srcNames = JSON.parse(
-    await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'),
-  ) as string[];
-
-  const leaves = [];
-  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);
-    leaves.push(computeContractLeaf(artifact).toField());
-  }
-
-  await generateOutputFile(destNames, leaves);
-}
-
-try {
-  await main();
-} catch (err: unknown) {
-  log(`Error copying protocol contract artifacts: ${err}`);
-  process.exit(1);
-}