@aztec/protocol-contracts 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/router/lazy.js

@@ -4,10 +4,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getRouterArtifact() {
     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
+        // 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);

package/dest/scripts/generate_data.js

@@ -1,13 +1,14 @@
-import { CANONICAL_AUTH_REGISTRY_ADDRESS, CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS, CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE, CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, ROUTER_ADDRESS } from '@aztec/constants';
-import { poseidon2Hash } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+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 { 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 { ProtocolContracts } from '@aztec/stdlib/tx';
 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');
@@ -49,20 +50,12 @@ async function copyArtifact(srcName, destName) {
     await fs.copyFile(src, dest);
     return artifact;
 }
-async function computeContractLeaf(artifact) {
+async function computeAddress(artifact) {
     const instance = await getContractInstanceFromInstantiationParams(loadContractArtifact(artifact), {
         salt
     });
     return instance.address;
 }
-async function computeRoot(names, leaves) {
-    const data = names.map((name, i)=>({
-            address: new AztecAddress(new Fr(contractAddressMapping[name])),
-            leaf: leaves[i]
-        }));
-    const tree = await buildProtocolContractTree(data);
-    return Fr.fromBuffer(tree.root);
-}
 async function generateDeclarationFile(destName) {
     const content = `
     import type { NoirCompiledContract } from '@aztec/stdlib/noir';
@@ -95,17 +88,30 @@ function generateContractAddresses(names) {
     };
   `;
 }
-function generateContractLeaves(names, leaves) {
+function generateDerivedAddresses(names, derivedAddresses) {
     return `
-    export const ProtocolContractLeaves = {
-      ${leaves.map((leaf, i)=>`${names[i]}: Fr.fromHexString('${leaf.toString()}')`).join(',\n')}
+    export const ProtocolContractDerivedAddress = {
+      ${derivedAddresses.map((address, i)=>`${names[i]}: AztecAddress.fromString('${address.toString()}')`).join(',\n')}
     };
   `;
 }
-async function generateRoot(names, leaves) {
-    const root = await computeRoot(names, leaves);
+async function generateProtocolContractsList(names, derivedAddresses) {
+    const list = makeTuple(MAX_PROTOCOL_CONTRACTS, ()=>AztecAddress.zero());
+    for(let i = 0; i < names.length; i++){
+        const name = names[i];
+        const address = contractAddressMapping[name];
+        const derivedAddressIndex = address - 1;
+        if (!list[derivedAddressIndex].equals(AztecAddress.zero())) {
+            throw new Error(`Duplicate protocol contract address: ${address.toString()}`);
+        }
+        list[derivedAddressIndex] = derivedAddresses[i];
+    }
     return `
-    export const protocolContractTreeRoot = Fr.fromHexString('${root.toString()}');
+    export const ProtocolContractsList = new ProtocolContracts([
+      ${list.map((address)=>`AztecAddress.fromString('${address.toString()}')`).join(',\n')}
+    ]);
+
+    export const protocolContractsHash = Fr.fromString('${(await new ProtocolContracts(list).hash()).toString()}');
   `;
 }
 // Generate the siloed log tags for events emitted via private logs.
@@ -117,11 +123,12 @@ async function generateLogTags() {
     ])}');
   `;
 }
-async function generateOutputFile(names, leaves) {
+async function generateOutputFile(names, derivedAddresses) {
     const content = `
     // 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 { AztecAddress } from '@aztec/stdlib/aztec-address';
+    import { ProtocolContracts } from '@aztec/stdlib/tx';
 
     ${generateNames(names)}
 
@@ -129,9 +136,9 @@ async function generateOutputFile(names, leaves) {
 
     ${generateContractAddresses(names)}
 
-    ${generateContractLeaves(names, leaves)}
+    ${generateDerivedAddresses(names, derivedAddresses)}
 
-    ${await generateRoot(names, leaves)}
+    ${await generateProtocolContractsList(names, derivedAddresses)}
 
     ${await generateLogTags()}
   `;
@@ -140,17 +147,16 @@ async function generateOutputFile(names, leaves) {
 async function main() {
     await clearDestDir();
     const srcNames = JSON.parse(await fs.readFile(path.join(noirContractsRoot, 'protocol_contracts.json'), 'utf8'));
-    const leaves = [];
+    const derivedAddresses = [];
     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);
-        const contractLeaf = await computeContractLeaf(artifact);
-        leaves.push(contractLeaf.toField());
+        derivedAddresses.push(await computeAddress(artifact));
     }
-    await generateOutputFile(destNames, leaves);
+    await generateOutputFile(destNames, derivedAddresses);
 }
 try {
     await main();

package/dest/tests/fixtures.d.ts

@@ -3,4 +3,4 @@ export declare function getSamplePrivateFunctionBroadcastedEventPayload(): Buffe
 export declare function getSampleUtilityFunctionBroadcastedEventPayload(): Buffer;
 export declare function getSampleContractInstancePublishedEventPayload(): Buffer;
 export declare function getPathToFixture(name: string): string;
-//# sourceMappingURL=fixtures.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZml4dHVyZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0cy9maXh0dXJlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSx3QkFBZ0IsMkNBQTJDLElBQUksTUFBTSxDQUdwRTtBQUdELHdCQUFnQiwrQ0FBK0MsSUFBSSxNQUFNLENBR3hFO0FBR0Qsd0JBQWdCLCtDQUErQyxJQUFJLE1BQU0sQ0FHeEU7QUFHRCx3QkFBZ0IsOENBQThDLElBQUksTUFBTSxDQUd2RTtBQUVELHdCQUFnQixnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsTUFBTSxVQUU1QyJ9

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": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.2-patch.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -21,13 +21,13 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn generate && yarn generate:cleanup-artifacts && tsc -b",
-    "build:keep-debug-symbols": "yarn clean && yarn generate && tsc -b",
+    "build": "yarn clean && yarn generate && yarn generate:cleanup-artifacts && ../scripts/tsc.sh",
+    "build:keep-debug-symbols": "yarn clean && yarn generate && tsgo -b",
     "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": "tsc -b --watch",
-    "build:ts": "tsc -b",
+    "build:dev": "../scripts/tsc.sh --watch",
+    "build:ts": "tsgo -b",
     "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": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/stdlib": "3.0.0-canary.a9708bd",
+    "@aztec/constants": "3.0.0-devnet.2-patch.1",
+    "@aztec/foundation": "3.0.0-devnet.2-patch.1",
+    "@aztec/stdlib": "3.0.0-devnet.2-patch.1",
     "lodash.chunk": "^4.2.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.4.0"
@@ -86,9 +86,10 @@
     "@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",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
-    "ts-loader": "^9.4.4",
+    "ts-loader": "^9.5.4",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"
   },

package/src/auth-registry/lazy.ts

@@ -8,10 +8,10 @@ let protocolContractArtifact: ContractArtifact;
 
 export async function getAuthRegistryArtifact(): 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
+    // 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: authRegistryJson } = await import('../../artifacts/AuthRegistry.json');
     protocolContractArtifact = loadContractArtifact(authRegistryJson);

package/src/class-registry/contract_class_published_event.ts

@@ -1,5 +1,5 @@
 import { CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { bufferFromFields } from '@aztec/stdlib/abi';
 import {
@@ -29,6 +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`.
     const fieldsWithoutTag = log.fields.fields.slice(1);
     const reader = new FieldReader(fieldsWithoutTag);
     const contractClassId = reader.readField();
@@ -73,4 +74,10 @@ export class ContractClassPublishedEvent {
       utilityFunctions: [],
     };
   }
+
+  public static extractContractClassEvents(logs: ContractClassLog[]): ContractClassPublishedEvent[] {
+    return logs
+      .filter((log: ContractClassLog) => ContractClassPublishedEvent.isContractClassPublishedEvent(log))
+      .map((log: ContractClassLog) => ContractClassPublishedEvent.fromLog(log));
+  }
 }

package/src/class-registry/lazy.ts

@@ -12,10 +12,10 @@ let protocolContractArtifact: ContractArtifact;
 
 export async function getContractClassRegistryArtifact(): 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
+    // 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: contractClassRegistryJson } = await import('../../artifacts/ContractClassRegistry.json');
     protocolContractArtifact = loadContractArtifact(contractClassRegistryJson);

package/src/class-registry/private_function_broadcasted_event.ts

@@ -4,7 +4,7 @@ import {
   FUNCTION_TREE_HEIGHT,
   MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS,
 } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Tuple } from '@aztec/foundation/serialize';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { FunctionSelector, bufferFromFields } from '@aztec/stdlib/abi';

package/src/class-registry/utility_function_broadcasted_event.ts

@@ -4,7 +4,7 @@ import {
   MAX_PACKED_BYTECODE_SIZE_PER_UTILITY_FUNCTION_IN_FIELDS,
 } from '@aztec/constants';
 import { removeArrayPaddingEnd } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Tuple } from '@aztec/foundation/serialize';
 import { FieldReader } from '@aztec/foundation/serialize';
 import { FunctionSelector, bufferFromFields } from '@aztec/stdlib/abi';

package/src/fee-juice/index.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computePublicDataTreeLeafSlot, deriveStorageSlotInMap } from '@aztec/stdlib/hash';

package/src/fee-juice/lazy.ts

@@ -8,10 +8,10 @@ let protocolContractArtifact: ContractArtifact;
 
 export async function getFeeJuiceArtifact(): 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
+    // 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: feeJuiceJson } = await import('../../artifacts/FeeJuice.json');
     protocolContractArtifact = loadContractArtifact(feeJuiceJson);

package/src/index.ts

@@ -1,3 +1,2 @@
 export * from './protocol_contract.js';
 export * from './protocol_contract_data.js';
-export * from './protocol_contract_tree.js';

package/src/instance-registry/contract_instance_published_event.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
@@ -61,4 +61,10 @@ export class ContractInstancePublishedEvent {
       deployer: this.deployer,
     };
   }
+
+  public static extractContractInstanceEvents(logs: PrivateLog[]): ContractInstancePublishedEvent[] {
+    return logs
+      .filter(log => ContractInstancePublishedEvent.isContractInstancePublishedEvent(log))
+      .map(log => ContractInstancePublishedEvent.fromLog(log));
+  }
 }

package/src/instance-registry/contract_instance_updated_event.ts

@@ -1,6 +1,6 @@
 import { CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractInstanceUpdateWithAddress } from '@aztec/stdlib/contract';
 import type { PublicLog } from '@aztec/stdlib/logs';
@@ -25,13 +25,11 @@ export class ContractInstanceUpdatedEvent {
   }
 
   static fromLog(log: PublicLog) {
-    const bufferWithoutAddressAndTag = log.toBuffer().subarray(64);
-    const reader = new BufferReader(bufferWithoutAddressAndTag);
+    const reader = new FieldReader(log.fields.slice(1) /* remove tag */);
     const address = reader.readObject(AztecAddress);
-    const prevContractClassId = reader.readObject(Fr);
-    const newContractClassId = reader.readObject(Fr);
-    const timestampOfChange = reader.readObject(Fr).toBigInt();
-
+    const prevContractClassId = reader.readField();
+    const newContractClassId = reader.readField();
+    const timestampOfChange = reader.readField().toBigInt();
     return new ContractInstanceUpdatedEvent(address, prevContractClassId, newContractClassId, timestampOfChange);
   }
 

package/src/instance-registry/lazy.ts

@@ -11,10 +11,10 @@ let protocolContractArtifact: ContractArtifact;
 
 export async function getContractInstanceRegistryArtifact(): 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
+    // 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: contractInstanceRegistryJson } = await import('../../artifacts/ContractInstanceRegistry.json');
     protocolContractArtifact = loadContractArtifact(contractInstanceRegistryJson);

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

@@ -8,10 +8,10 @@ let protocolContractArtifact: ContractArtifact;
 
 export async function getMultiCallEntrypointArtifact(): 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
+    // 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: multiCallEntrypointJson } = await import('../../artifacts/MultiCallEntrypoint.json');
     protocolContractArtifact = loadContractArtifact(multiCallEntrypointJson);

package/src/protocol_contract_data.ts

@@ -1,7 +1,8 @@
 
     // 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 { AztecAddress } from '@aztec/stdlib/aztec-address';
+    import { ProtocolContracts } from '@aztec/stdlib/tx';
 
     
     export const protocolContractNames = [
@@ -39,18 +40,32 @@ Router: AztecAddress.fromBigInt(6n)
   
 
     
-    export const ProtocolContractLeaves = {
-      AuthRegistry: Fr.fromHexString('0x288ca72d9121175bf02bf3d1db95420b3a3b71ecab2df6836e82bb7eab016b03'),
-ContractInstanceRegistry: Fr.fromHexString('0x15b43fb84cb3f1cfddbb1ce47383e8fabf1ebbff402f8cd3ace2a703bde0f42c'),
-ContractClassRegistry: Fr.fromHexString('0x2bf5f175f63f44f4b861c46ce6c186928c9cebba7fd3a5ba3bc19ca43fca28cb'),
-MultiCallEntrypoint: Fr.fromHexString('0x1b0f47860b942aa342a69c59d0e2626dd191760fdac6c89fc1ecad74baaad798'),
-FeeJuice: Fr.fromHexString('0x17ed1ecf287e9cbcd4b3b591a3c873d08aa90de0888e369e31dd5b37e3046e20'),
-Router: Fr.fromHexString('0x2c0c3298030d7fcf0ec09cf0066437bfb09eba45d130c88bb87a5ab011caac2e')
+    export const ProtocolContractDerivedAddress = {
+      AuthRegistry: AztecAddress.fromString('0x154bc3dc5cea44ef4c3d3578cdce2f81f34300d2d7819a8d72ef0d4d135cdfd4'),
+ContractInstanceRegistry: AztecAddress.fromString('0x04265e72412c0b74d741e805252a0cb54e703a68f513cd91306ad0b400a24b0d'),
+ContractClassRegistry: AztecAddress.fromString('0x0b7a3b99c7051ee329d2c905b9f646d3706ed031fa1f97b0c19274e5773ebec5'),
+MultiCallEntrypoint: AztecAddress.fromString('0x0961995245e0f34801e7ca5e83a0a6fbf2d78cfce788134b6ef6e877715d594a'),
+FeeJuice: AztecAddress.fromString('0x13d932791f9e77dce1dcbdbb0a562ceab5dcb491866905471cf7cfc1136001b0'),
+Router: AztecAddress.fromString('0x2fed59e101da3e1f0f7e959fd154d042ca447729a80925faf4da42bc8ff05865')
     };
   
 
     
-    export const protocolContractTreeRoot = Fr.fromHexString('0x2be917f3d28579f9c10495c9076b6f3e2d59d33ddc22385bcda8ecb56810ab9e');
+    export const ProtocolContractsList = new ProtocolContracts([
+      AztecAddress.fromString('0x154bc3dc5cea44ef4c3d3578cdce2f81f34300d2d7819a8d72ef0d4d135cdfd4'),
+AztecAddress.fromString('0x04265e72412c0b74d741e805252a0cb54e703a68f513cd91306ad0b400a24b0d'),
+AztecAddress.fromString('0x0b7a3b99c7051ee329d2c905b9f646d3706ed031fa1f97b0c19274e5773ebec5'),
+AztecAddress.fromString('0x0961995245e0f34801e7ca5e83a0a6fbf2d78cfce788134b6ef6e877715d594a'),
+AztecAddress.fromString('0x13d932791f9e77dce1dcbdbb0a562ceab5dcb491866905471cf7cfc1136001b0'),
+AztecAddress.fromString('0x2fed59e101da3e1f0f7e959fd154d042ca447729a80925faf4da42bc8ff05865'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+    ]);
+
+    export const protocolContractsHash = Fr.fromString('0x2348b12e0edd63c38dbb849b6c788c4975ed3f1f3706fcb5e17431e805da672d');
   
 
     

package/src/router/lazy.ts

@@ -8,10 +8,10 @@ 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
+    // 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);

package/dest/build_protocol_contract_tree.d.ts

@@ -1,10 +0,0 @@
-import { PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants';
-import type { Fr } from '@aztec/foundation/fields';
-import { type IndexedMerkleTree } from '@aztec/foundation/trees';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees';
-export declare function buildProtocolContractTree(contracts: {
-    address: AztecAddress;
-    leaf: Fr;
-}[]): Promise<IndexedMerkleTree<ProtocolContractLeafPreimage, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>>;
-//# sourceMappingURL=build_protocol_contract_tree.d.ts.map

package/dest/build_protocol_contract_tree.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build_protocol_contract_tree.d.ts","sourceRoot":"","sources":["../src/build_protocol_contract_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,6BAA6B,EAAE,MAAM,kBAAkB,CAAC;AAEzF,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,iBAAiB,EAA+B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAEnE,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,EAAE,CAAA;CAAE,EAAE,GAC/C,OAAO,CAAC,iBAAiB,CAAC,4BAA4B,EAAE,OAAO,6BAA6B,CAAC,CAAC,CAmBhG"}

package/dest/build_protocol_contract_tree.js

@@ -1,20 +0,0 @@
-import { MAX_PROTOCOL_CONTRACTS, PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants';
-import { poseidon2Hash } from '@aztec/foundation/crypto';
-import { IndexedMerkleTreeCalculator } from '@aztec/foundation/trees';
-import { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees';
-export async function buildProtocolContractTree(contracts) {
-    const hasher = {
-        hash: async (l, r)=>(await poseidon2Hash([
-                l,
-                r
-            ])).toBuffer(),
-        hashInputs: async (i)=>(await poseidon2Hash(i)).toBuffer()
-    };
-    const calculator = await IndexedMerkleTreeCalculator.create(PROTOCOL_CONTRACT_TREE_HEIGHT, hasher, ProtocolContractLeafPreimage);
-    const leaves = new Array(MAX_PROTOCOL_CONTRACTS).fill(Buffer.alloc(32));
-    for (const contract of contracts){
-        const index = contract.address.toField().toNumber();
-        leaves[index] = contract.leaf.toBuffer();
-    }
-    return calculator.computeTree(leaves);
-}

package/dest/protocol_contract_tree.d.ts

@@ -1,7 +0,0 @@
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees';
-export declare function getProtocolContractLeafAndMembershipWitness(contractAddress: AztecAddress, computedAddress: AztecAddress): Promise<{
-    lowLeaf: ProtocolContractLeafPreimage;
-    witness: import("@aztec/foundation/trees").MembershipWitness<3>;
-}>;
-//# sourceMappingURL=protocol_contract_tree.d.ts.map

package/dest/protocol_contract_tree.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"protocol_contract_tree.d.ts","sourceRoot":"","sources":["../src/protocol_contract_tree.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAsBxE,wBAAsB,2CAA2C,CAC/D,eAAe,EAAE,YAAY,EAC7B,eAAe,EAAE,YAAY;;;GAe9B"}

package/dest/protocol_contract_tree.js

@@ -1,34 +0,0 @@
-import { poseidon2Hash } from '@aztec/foundation/crypto';
-import { buildProtocolContractTree } from './build_protocol_contract_tree.js';
-import { isProtocolContract } from './protocol_contract.js';
-import { ProtocolContractAddress, ProtocolContractLeaves, protocolContractNames } from './protocol_contract_data.js';
-let protocolContractTree;
-async function getTree() {
-    if (!protocolContractTree) {
-        const leaves = protocolContractNames.map((name)=>({
-                address: ProtocolContractAddress[name],
-                leaf: ProtocolContractLeaves[name]
-            }));
-        protocolContractTree = await buildProtocolContractTree(leaves);
-    }
-    return protocolContractTree;
-}
-// Computed address can be different from contract address due to upgrades
-export async function getProtocolContractLeafAndMembershipWitness(contractAddress, computedAddress) {
-    const tree = await getTree();
-    let lowLeaf;
-    let witness;
-    if (isProtocolContract(contractAddress)) {
-        const index = contractAddress.toField().toNumber();
-        lowLeaf = tree.leafPreimages[index];
-        witness = tree.getMembershipWitness(index);
-    } else {
-        lowLeaf = tree.getLowLeaf(computedAddress.toBigInt());
-        const hashed = (await poseidon2Hash(lowLeaf.toHashInputs())).toBuffer();
-        witness = tree.getMembershipWitness(hashed);
-    }
-    return {
-        lowLeaf,
-        witness
-    };
-}

package/src/build_protocol_contract_tree.ts

@@ -1,29 +0,0 @@
-import { MAX_PROTOCOL_CONTRACTS, PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/constants';
-import { poseidon2Hash } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
-import { type IndexedMerkleTree, IndexedMerkleTreeCalculator } from '@aztec/foundation/trees';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { ProtocolContractLeafPreimage } from '@aztec/stdlib/trees';
-
-export async function buildProtocolContractTree(
-  contracts: { address: AztecAddress; leaf: Fr }[],
-): Promise<IndexedMerkleTree<ProtocolContractLeafPreimage, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>> {
-  const hasher = {
-    hash: async (l: Buffer, r: Buffer) => (await poseidon2Hash([l, r])).toBuffer() as Buffer<ArrayBuffer>,
-    hashInputs: async (i: Buffer[]) => (await poseidon2Hash(i)).toBuffer() as Buffer<ArrayBuffer>,
-  };
-  const calculator = await IndexedMerkleTreeCalculator.create(
-    PROTOCOL_CONTRACT_TREE_HEIGHT,
-    hasher,
-    ProtocolContractLeafPreimage,
-  );
-
-  const leaves = new Array(MAX_PROTOCOL_CONTRACTS).fill(Buffer.alloc(32));
-
-  for (const contract of contracts) {
-    const index = contract.address.toField().toNumber();
-    leaves[index] = contract.leaf.toBuffer();
-  }
-
-  return calculator.computeTree(leaves);
-}

package/src/protocol_contract_tree.ts

@@ -1,44 +0,0 @@
-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';
-import { ProtocolContractAddress, ProtocolContractLeaves, protocolContractNames } from './protocol_contract_data.js';
-
-let protocolContractTree:
-  | IndexedMerkleTree<ProtocolContractLeafPreimage, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>
-  | undefined;
-
-async function getTree() {
-  if (!protocolContractTree) {
-    const leaves = protocolContractNames.map(name => ({
-      address: ProtocolContractAddress[name],
-      leaf: ProtocolContractLeaves[name],
-    }));
-    protocolContractTree = await buildProtocolContractTree(leaves);
-  }
-  return protocolContractTree;
-}
-
-// 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(contractAddress)) {
-    const index = contractAddress.toField().toNumber();
-    lowLeaf = tree.leafPreimages[index];
-    witness = tree.getMembershipWitness(index);
-  } else {
-    lowLeaf = tree.getLowLeaf(computedAddress.toBigInt());
-    const hashed = (await poseidon2Hash(lowLeaf.toHashInputs())).toBuffer();
-    witness = tree.getMembershipWitness(hashed);
-  }
-  return { lowLeaf, witness };
-}