@aztec/protocol-contracts 0.76.4-devnet-test-rc3 → 0.77.0-testnet-ignition.17

package/src/protocol_contract_data.ts

@@ -1,57 +1,63 @@
-// GENERATED FILE - DO NOT EDIT. RUN `yarn generate` or `yarn generate:data`
-import { AztecAddress, Fr } from '@aztec/circuits.js';
-
-export const protocolContractNames = [
-  'AuthRegistry',
-  'ContractInstanceDeployer',
-  'ContractClassRegisterer',
-  'MultiCallEntrypoint',
-  'FeeJuice',
-  'Router',
-] as const;
-
-export type ProtocolContractName = (typeof protocolContractNames)[number];
-
-export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
-  AuthRegistry: new Fr(1),
-  ContractInstanceDeployer: new Fr(1),
-  ContractClassRegisterer: new Fr(1),
-  MultiCallEntrypoint: new Fr(1),
-  FeeJuice: new Fr(1),
-  Router: new Fr(1),
-};
-
-export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
-  AuthRegistry: AztecAddress.fromBigInt(1n),
-  ContractInstanceDeployer: AztecAddress.fromBigInt(2n),
-  ContractClassRegisterer: AztecAddress.fromBigInt(3n),
-  MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
-  FeeJuice: AztecAddress.fromBigInt(5n),
-  Router: AztecAddress.fromBigInt(6n),
-};
-
-export const ProtocolContractLeaves = {
-  AuthRegistry: Fr.fromHexString('0x2e9b53693d0b765a2b3ba243a294d01280ad7cd80014562779c0e3fa7769c6c0'),
-  ContractInstanceDeployer: Fr.fromHexString('0x1665c5fbc1e58ba19c82f64c0402d29e8bbf94b1fde1a056280d081c15b0dac1'),
-  ContractClassRegisterer: Fr.fromHexString('0x1a11045c0895e4ba1d6bd55c52e7b493c301c079234354dd85f113903f0a8270'),
-  MultiCallEntrypoint: Fr.fromHexString('0x237a0bac451ebac796b96dbe27ccfda5230e8c962b391b84b0304c3775e9e0c0'),
-  FeeJuice: Fr.fromHexString('0x0bd5f44eb8429a4ea8ca193232e5ee576b300995ce5f88935aa03b0869fe13d5'),
-  Router: Fr.fromHexString('0x1281e0c1842212e79fa2249877524dda4f07f3d42cb502097302737bd3177550'),
-};
-
-export const protocolContractTreeRoot = Fr.fromHexString(
-  '0x26d63d5bcf09b75cc6e123b591dd3e327347d30fe236061f7613ba8d7c5fdac6',
-);
-
-export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(
-  11121068431693264234253912047066709627593769337094408533543930778360n,
-);
-export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(
-  2889881020989534926461066592611988634597302675057895885580456197069n,
-);
-export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(
-  24399338136397901754495080759185489776044879232766421623673792970137n,
-);
-export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString(
-  '0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2',
-);
+
+    // GENERATED FILE - DO NOT EDIT. RUN `yarn generate` or `yarn generate:data`
+    import { Fr } from '@aztec/foundation/fields';
+    import { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+    
+    export const protocolContractNames = [
+      'AuthRegistry',
+'ContractInstanceDeployer',
+'ContractClassRegisterer',
+'MultiCallEntrypoint',
+'FeeJuice',
+'Router'
+    ] as const;
+
+    export type ProtocolContractName = typeof protocolContractNames[number];
+  
+
+    
+    export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
+      AuthRegistry: new Fr(1),
+ContractInstanceDeployer: new Fr(1),
+ContractClassRegisterer: new Fr(1),
+MultiCallEntrypoint: new Fr(1),
+FeeJuice: new Fr(1),
+Router: new Fr(1)
+    };
+  
+
+    
+    export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
+      AuthRegistry: AztecAddress.fromBigInt(1n),
+ContractInstanceDeployer: AztecAddress.fromBigInt(2n),
+ContractClassRegisterer: AztecAddress.fromBigInt(3n),
+MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
+FeeJuice: AztecAddress.fromBigInt(5n),
+Router: AztecAddress.fromBigInt(6n)
+    };
+  
+
+    
+    export const ProtocolContractLeaves = {
+      AuthRegistry: Fr.fromHexString('0x2e21b68d7ba0d9a47965a892c304e1906e9ff3309fd1a19f2d6d20764ad0904d'),
+ContractInstanceDeployer: Fr.fromHexString('0x1cd18d02cf497df9523f3c8aed73075e93210f448a3d1a22aaf2787b2fcc3156'),
+ContractClassRegisterer: Fr.fromHexString('0x1e50aba05fd759d9225eb756d17ba4f79a7b607ba8e0bb753e35456983b10d5a'),
+MultiCallEntrypoint: Fr.fromHexString('0x121f834b03a64d38463ae18ddebceeb4dce8192cc289052e175ad754a883a7fe'),
+FeeJuice: Fr.fromHexString('0x26824d7dd736eb4ed60e4f920de3183e071223a769a533a0b422a3da9bbe2e57'),
+Router: Fr.fromHexString('0x26924a7b4fb3f63e61ed0bd53bca870f66660c18e032973ac063ba3f1d4a9b4d')
+    };
+  
+
+    
+    export const protocolContractTreeRoot = Fr.fromHexString('0x2c8fc46351bda26dff22c6f7d13f51ef1b7b7245475ed6f0857b8aeac417b36f');
+  
+
+    
+  export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = Fr.fromHexString('0x20cd27645f65c15a38720ca984aef936592f3938a705db706d068ad13fc58ae9');
+  export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = Fr.fromHexString('0x0abf338154e355442d9916d630da0491036d5a7b23c42b477c1395ba3bf9b42d');
+  export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = Fr.fromHexString('0x27774539896271d6dbe0c1de45ddc44709d1e8d9a9fb686ca3c105d87c417bb8');
+  export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2');
+   export const DEPLOYER_CONTRACT_INSTANCE_UPDATED_TAG = new Fr(1534834688047131268740281708431107902615560100979874281215533519862n);
+  
+  

package/src/protocol_contract_tree.ts

@@ -1,10 +1,8 @@
-import {
-  type AztecAddress,
-  type IndexedMerkleTree,
-  type PROTOCOL_CONTRACT_TREE_HEIGHT,
-  type ProtocolContractLeafPreimage,
-} from '@aztec/circuits.js';
+import type { PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
+import type { IndexedMerkleTree } from '@aztec/foundation/trees';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees';
 
 import { buildProtocolContractTree } from './build_protocol_contract_tree.js';
 import { isProtocolContract } from './protocol_contract.js';
@@ -25,16 +23,20 @@ async function getTree() {
   return protocolContractTree;
 }
 
-export async function getProtocolContractLeafAndMembershipWitness(address: AztecAddress) {
+// Computed address can be different from contract address due to upgrades
+export async function getProtocolContractLeafAndMembershipWitness(
+  contractAddress: AztecAddress,
+  computedAddress: AztecAddress,
+) {
   const tree = await getTree();
   let lowLeaf;
   let witness;
-  if (isProtocolContract(address)) {
-    const index = address.toField().toNumber();
+  if (isProtocolContract(contractAddress)) {
+    const index = contractAddress.toField().toNumber();
     lowLeaf = tree.leafPreimages[index];
     witness = tree.getMembershipWitness(index);
   } else {
-    lowLeaf = tree.getLowLeaf(address.toBigInt());
+    lowLeaf = tree.getLowLeaf(computedAddress.toBigInt());
     const hashed = (await poseidon2Hash(lowLeaf.toHashInputs())).toBuffer();
     witness = tree.getMembershipWitness(hashed);
   }

package/src/provider/bundle.ts

@@ -0,0 +1,27 @@
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+
+import { AuthRegistryArtifact } from '../auth-registry/index.js';
+import { ContractClassRegistererArtifact } from '../class-registerer/index.js';
+import { FeeJuiceArtifact } from '../fee-juice/index.js';
+import { ContractInstanceDeployerArtifact } from '../instance-deployer/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 { RouterArtifact } from '../router/index.js';
+import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
+
+export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
+  AuthRegistry: AuthRegistryArtifact,
+  ContractInstanceDeployer: ContractInstanceDeployerArtifact,
+  ContractClassRegisterer: ContractClassRegistererArtifact,
+  MultiCallEntrypoint: MultiCallEntrypointArtifact,
+  FeeJuice: FeeJuiceArtifact,
+  Router: RouterArtifact,
+};
+
+export class BundledProtocolContractsProvider implements ProtocolContractsProvider {
+  getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract> {
+    return makeProtocolContract(name, ProtocolContractArtifact[name]);
+  }
+}

package/src/provider/lazy.ts

@@ -0,0 +1,30 @@
+import { getCanonicalAuthRegistry } from '../auth-registry/lazy.js';
+import { getCanonicalClassRegisterer } from '../class-registerer/lazy.js';
+import { getCanonicalFeeJuice } from '../fee-juice/lazy.js';
+import { getCanonicalInstanceDeployer } from '../instance-deployer/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 type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
+
+export class LazyProtocolContractsProvider implements ProtocolContractsProvider {
+  getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract> {
+    switch (name) {
+      case 'AuthRegistry':
+        return getCanonicalAuthRegistry();
+      case 'ContractInstanceDeployer':
+        return getCanonicalInstanceDeployer();
+      case 'ContractClassRegisterer':
+        return getCanonicalClassRegisterer();
+      case 'MultiCallEntrypoint':
+        return getCanonicalMultiCallEntrypoint();
+      case 'FeeJuice':
+        return getCanonicalFeeJuice();
+      case 'Router':
+        return getCanonicalRouter();
+      default:
+        throw new Error(`Unknown protocol contract name: ${name}`);
+    }
+  }
+}

package/src/provider/protocol_contracts_provider.ts

@@ -0,0 +1,7 @@
+import type { ProtocolContract } from '../protocol_contract.js';
+import type { ProtocolContractName } from '../protocol_contract_data.js';
+
+/** Returns the canonical deployment of a given artifact. */
+export interface ProtocolContractsProvider {
+  getProtocolContractArtifact(name: ProtocolContractName): Promise<ProtocolContract>;
+}

package/src/router/index.ts

@@ -1,9 +1,9 @@
-import { loadContractArtifact } from '@aztec/types/abi';
-import { type NoirCompiledContract } from '@aztec/types/noir';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import RouterJson from '../../artifacts/Router.json' assert { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
-import { type ProtocolContract } from '../protocol_contract.js';
+import type { ProtocolContract } from '../protocol_contract.js';
 
 export const RouterArtifact = loadContractArtifact(RouterJson as NoirCompiledContract);
 

package/src/router/lazy.ts

@@ -0,0 +1,29 @@
+import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { makeProtocolContract } from '../make_protocol_contract.js';
+import type { ProtocolContract } from '../protocol_contract.js';
+
+let protocolContract: ProtocolContract;
+let protocolContractArtifact: ContractArtifact;
+
+export async function getRouterArtifact(): Promise<ContractArtifact> {
+  if (!protocolContractArtifact) {
+    // Cannot assert this import as it's incompatible with browsers
+    // https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
+    // Use the new "with" syntax once supported by firefox
+    // https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
+    // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
+    const { default: routerJson } = await import('../../artifacts/Router.json');
+    protocolContractArtifact = loadContractArtifact(routerJson);
+  }
+  return protocolContractArtifact;
+}
+
+/** Returns the canonical deployment of the auth registry. */
+export async function getCanonicalRouter(): Promise<ProtocolContract> {
+  if (!protocolContract) {
+    const routerArtifact = await getRouterArtifact();
+    protocolContract = await makeProtocolContract('Router', routerArtifact);
+  }
+  return protocolContract;
+}

package/dest/bundle/index.d.ts

@@ -1,7 +0,0 @@
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type ProtocolContract } from '../protocol_contract.js';
-import { type ProtocolContractName } from '../protocol_contract_data.js';
-/** Returns the canonical deployment a given artifact. */
-export declare function getCanonicalProtocolContract(name: ProtocolContractName): Promise<ProtocolContract>;
-export declare const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact>;
-//# sourceMappingURL=index.d.ts.map

package/dest/bundle/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bundle/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAO9D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAA2B,KAAK,oBAAoB,EAAwB,MAAM,8BAA8B,CAAC;AAGxH,yDAAyD;AACzD,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAaxG;AAED,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,oBAAoB,EAAE,gBAAgB,CAOnF,CAAC"}

package/dest/bundle/index.js

@@ -1,32 +0,0 @@
-import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
-import { AuthRegistryArtifact } from '../auth-registry/index.js';
-import { ContractClassRegistererArtifact } from '../class-registerer/index.js';
-import { FeeJuiceArtifact } from '../fee-juice/index.js';
-import { ContractInstanceDeployerArtifact } from '../instance-deployer/index.js';
-import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js';
-import { ProtocolContractAddress, ProtocolContractSalt } from '../protocol_contract_data.js';
-import { RouterArtifact } from '../router/index.js';
-/** Returns the canonical deployment a given artifact. */
-export async function getCanonicalProtocolContract(name) {
-    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 = await getContractClassFromArtifact(artifact);
-    const instance = await getContractInstanceFromDeployParams(artifact, { salt });
-    return {
-        instance: { ...instance, address },
-        contractClass,
-        artifact,
-        address,
-    };
-}
-export const ProtocolContractArtifact = {
-    AuthRegistry: AuthRegistryArtifact,
-    ContractInstanceDeployer: ContractInstanceDeployerArtifact,
-    ContractClassRegisterer: ContractClassRegistererArtifact,
-    MultiCallEntrypoint: MultiCallEntrypointArtifact,
-    FeeJuice: FeeJuiceArtifact,
-    Router: RouterArtifact,
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnVuZGxlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBR3ZHLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2pFLE9BQU8sRUFBRSwrQkFBK0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQy9FLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3pELE9BQU8sRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pGLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBRWhGLE9BQU8sRUFBRSx1QkFBdUIsRUFBNkIsb0JBQW9CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN4SCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQseURBQXlEO0FBQ3pELE1BQU0sQ0FBQyxLQUFLLFVBQVUsNEJBQTRCLENBQUMsSUFBMEI7SUFDM0UsTUFBTSxRQUFRLEdBQUcsd0JBQXdCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEQsTUFBTSxPQUFPLEdBQUcsdUJBQXVCLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUMsTUFBTSxJQUFJLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEMsK0VBQStFO0lBQy9FLE1BQU0sYUFBYSxHQUFHLE1BQU0sNEJBQTRCLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDbkUsTUFBTSxRQUFRLEdBQUcsTUFBTSxtQ0FBbUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQy9FLE9BQU87UUFDTCxRQUFRLEVBQUUsRUFBRSxHQUFHLFFBQVEsRUFBRSxPQUFPLEVBQUU7UUFDbEMsYUFBYTtRQUNiLFFBQVE7UUFDUixPQUFPO0tBQ1IsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSx3QkFBd0IsR0FBbUQ7SUFDdEYsWUFBWSxFQUFFLG9CQUFvQjtJQUNsQyx3QkFBd0IsRUFBRSxnQ0FBZ0M7SUFDMUQsdUJBQXVCLEVBQUUsK0JBQStCO0lBQ3hELG1CQUFtQixFQUFFLDJCQUEyQjtJQUNoRCxRQUFRLEVBQUUsZ0JBQWdCO0lBQzFCLE1BQU0sRUFBRSxjQUFjO0NBQ3ZCLENBQUMifQ==

package/src/bundle/index.ts

@@ -1,36 +0,0 @@
-import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-
-import { AuthRegistryArtifact } from '../auth-registry/index.js';
-import { ContractClassRegistererArtifact } from '../class-registerer/index.js';
-import { FeeJuiceArtifact } from '../fee-juice/index.js';
-import { ContractInstanceDeployerArtifact } from '../instance-deployer/index.js';
-import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js';
-import { type ProtocolContract } from '../protocol_contract.js';
-import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from '../protocol_contract_data.js';
-import { RouterArtifact } from '../router/index.js';
-
-/** Returns the canonical deployment a given artifact. */
-export async function getCanonicalProtocolContract(name: ProtocolContractName): Promise<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 = await getContractClassFromArtifact(artifact);
-  const instance = await getContractInstanceFromDeployParams(artifact, { salt });
-  return {
-    instance: { ...instance, address },
-    contractClass,
-    artifact,
-    address,
-  };
-}
-
-export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
-  AuthRegistry: AuthRegistryArtifact,
-  ContractInstanceDeployer: ContractInstanceDeployerArtifact,
-  ContractClassRegisterer: ContractClassRegistererArtifact,
-  MultiCallEntrypoint: MultiCallEntrypointArtifact,
-  FeeJuice: FeeJuiceArtifact,
-  Router: RouterArtifact,
-};