@aztec/protocol-contracts 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/auth-registry/lazy.js

@@ -4,10 +4,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getAuthRegistryArtifact() {
     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/dest/class-registry/contract_class_published_event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class_published_event.d.ts","sourceRoot":"","sources":["../../src/class-registry/contract_class_published_event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,oDAAoD;AACpD,qBAAa,2BAA2B;aAEpB,eAAe,EAAE,EAAE;aACnB,OAAO,EAAE,MAAM;aACf,YAAY,EAAE,EAAE;aAChB,oBAAoB,EAAE,EAAE;aACxB,oBAAoB,EAAE,MAAM;gBAJ5B,eAAe,EAAE,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,EAAE,EAChB,oBAAoB,EAAE,EAAE,EACxB,oBAAoB,EAAE,MAAM;IAG9C,MAAM,CAAC,6BAA6B,CAAC,GAAG,EAAE,gBAAgB;IAO1D,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB;IAkB9B,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;CA2B5D"}
+{"version":3,"file":"contract_class_published_event.d.ts","sourceRoot":"","sources":["../../src/class-registry/contract_class_published_event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAI3D,oDAAoD;AACpD,qBAAa,2BAA2B;aAEpB,eAAe,EAAE,EAAE;aACnB,OAAO,EAAE,MAAM;aACf,YAAY,EAAE,EAAE;aAChB,oBAAoB,EAAE,EAAE;aACxB,oBAAoB,EAAE,MAAM;gBAJ5B,eAAe,EAAE,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,EAAE,EAChB,oBAAoB,EAAE,EAAE,EACxB,oBAAoB,EAAE,MAAM;IAG9C,MAAM,CAAC,6BAA6B,CAAC,GAAG,EAAE,gBAAgB;IAO1D,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB;IAmB9B,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;CA2B5D"}

package/dest/class-registry/contract_class_published_event.js

@@ -20,6 +20,7 @@ import { ProtocolContractAddress } from '../protocol_contract_data.js';
         return log.contractAddress.equals(ProtocolContractAddress.ContractClassRegistry) && log.fields.fields[0].toBigInt() === CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE;
     }
     static fromLog(log) {
+        // 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();

package/dest/class-registry/lazy.js

@@ -7,10 +7,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getContractClassRegistryArtifact() {
     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/dest/fee-juice/lazy.js

@@ -4,10 +4,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getFeeJuiceArtifact() {
     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/dest/index.d.ts

@@ -1,4 +1,3 @@
 export * from './protocol_contract.js';
 export * from './protocol_contract_data.js';
-export * from './protocol_contract_tree.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC"}

package/dest/index.js

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

package/dest/instance-registry/contract_instance_updated_event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_instance_updated_event.d.ts","sourceRoot":"","sources":["../../src/instance-registry/contract_instance_updated_event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,uDAAuD;AACvD,qBAAa,4BAA4B;aAErB,OAAO,EAAE,YAAY;aACrB,mBAAmB,EAAE,EAAE;aACvB,kBAAkB,EAAE,EAAE;aACtB,iBAAiB,EAAE,MAAM;gBAHzB,OAAO,EAAE,YAAY,EACrB,mBAAmB,EAAE,EAAE,EACvB,kBAAkB,EAAE,EAAE,EACtB,iBAAiB,EAAE,MAAM;IAG3C,MAAM,CAAC,8BAA8B,CAAC,GAAG,EAAE,SAAS;IAOpD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS;IAW7B,wBAAwB,IAAI,iCAAiC;CAQ9D"}
+{"version":3,"file":"contract_instance_updated_event.d.ts","sourceRoot":"","sources":["../../src/instance-registry/contract_instance_updated_event.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,uDAAuD;AACvD,qBAAa,4BAA4B;aAErB,OAAO,EAAE,YAAY;aACrB,mBAAmB,EAAE,EAAE;aACvB,kBAAkB,EAAE,EAAE;aACtB,iBAAiB,EAAE,MAAM;gBAHzB,OAAO,EAAE,YAAY,EACrB,mBAAmB,EAAE,EAAE,EACvB,kBAAkB,EAAE,EAAE,EACtB,iBAAiB,EAAE,MAAM;IAG3C,MAAM,CAAC,8BAA8B,CAAC,GAAG,EAAE,SAAS;IAOpD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS;IAS7B,wBAAwB,IAAI,iCAAiC;CAQ9D"}

package/dest/instance-registry/contract_instance_updated_event.js

@@ -1,6 +1,5 @@
 import { CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE } from '@aztec/constants';
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
+import { FieldReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { ProtocolContractAddress } from '../protocol_contract_data.js';
 /** Event emitted from the ContractInstanceRegistry. */ export class ContractInstanceUpdatedEvent {
@@ -18,12 +17,11 @@ import { ProtocolContractAddress } from '../protocol_contract_data.js';
         return log.contractAddress.equals(ProtocolContractAddress.ContractInstanceRegistry) && log.fields[0].toBigInt() === CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE;
     }
     static fromLog(log) {
-        const bufferWithoutAddressAndTag = log.toBuffer().subarray(64);
-        const reader = new BufferReader(bufferWithoutAddressAndTag);
+        const reader = new FieldReader(log.fields.slice(1));
         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);
     }
     toContractInstanceUpdate() {

package/dest/instance-registry/lazy.js

@@ -6,10 +6,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getContractInstanceRegistryArtifact() {
     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/dest/multi-call-entrypoint/lazy.js

@@ -4,10 +4,10 @@ let protocolContract;
 let protocolContractArtifact;
 export async function getMultiCallEntrypointArtifact() {
     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/dest/protocol_contract_data.d.ts

@@ -1,17 +1,19 @@
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { ProtocolContracts } from '@aztec/stdlib/tx';
 export declare const protocolContractNames: readonly ["AuthRegistry", "ContractInstanceRegistry", "ContractClassRegistry", "MultiCallEntrypoint", "FeeJuice", "Router"];
 export type ProtocolContractName = typeof protocolContractNames[number];
 export declare const ProtocolContractSalt: Record<ProtocolContractName, Fr>;
 export declare const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>;
-export declare const ProtocolContractLeaves: {
-    AuthRegistry: Fr;
-    ContractInstanceRegistry: Fr;
-    ContractClassRegistry: Fr;
-    MultiCallEntrypoint: Fr;
-    FeeJuice: Fr;
-    Router: Fr;
+export declare const ProtocolContractDerivedAddress: {
+    AuthRegistry: AztecAddress;
+    ContractInstanceRegistry: AztecAddress;
+    ContractClassRegistry: AztecAddress;
+    MultiCallEntrypoint: AztecAddress;
+    FeeJuice: AztecAddress;
+    Router: AztecAddress;
 };
-export declare const protocolContractTreeRoot: Fr;
+export declare const ProtocolContractsList: ProtocolContracts;
+export declare const protocolContractsHash: Fr;
 export declare const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG: Fr;
 //# sourceMappingURL=protocol_contract_data.d.ts.map

package/dest/protocol_contract_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_data.d.ts","sourceRoot":"","sources":["../src/protocol_contract_data.ts"],"names":[],"mappings":"AAEI,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAG3D,eAAO,MAAM,qBAAqB,6HAOxB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAIxE,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAOjE,CAAC;AAIF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAO9E,CAAC;AAIF,eAAO,MAAM,sBAAsB;;;;;;;CAOlC,CAAC;AAIF,eAAO,MAAM,wBAAwB,IAAyF,CAAC;AAIjI,eAAO,MAAM,qCAAqC,IAAyF,CAAC"}
+{"version":3,"file":"protocol_contract_data.d.ts","sourceRoot":"","sources":["../src/protocol_contract_data.ts"],"names":[],"mappings":"AAEI,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGrD,eAAO,MAAM,qBAAqB,6HAOxB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;AAIxE,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAOjE,CAAC;AAIF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAO9E,CAAC;AAIF,eAAO,MAAM,8BAA8B;;;;;;;CAO1C,CAAC;AAIF,eAAO,MAAM,qBAAqB,mBAYhC,CAAC;AAEH,eAAO,MAAM,qBAAqB,IAAsF,CAAC;AAI3H,eAAO,MAAM,qCAAqC,IAAyF,CAAC"}

package/dest/protocol_contract_data.js

@@ -1,6 +1,7 @@
 // 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';
+import { ProtocolContracts } from '@aztec/stdlib/tx';
 export const protocolContractNames = [
     'AuthRegistry',
     'ContractInstanceRegistry',
@@ -25,13 +26,26 @@ export const ProtocolContractAddress = {
     FeeJuice: AztecAddress.fromBigInt(5n),
     Router: AztecAddress.fromBigInt(6n)
 };
-export const ProtocolContractLeaves = {
-    AuthRegistry: Fr.fromHexString('0x1c2474a77af3c756895867fa7622e5e9295121b35849e965f4614d51f00c62e2'),
-    ContractInstanceRegistry: Fr.fromHexString('0x001e627e78063a4944f1331b4c59544f8ad6d6d478f2fc79b025e8240b94b816'),
-    ContractClassRegistry: Fr.fromHexString('0x1bd2e13b35e2745e638132262e6642a86ac4219f1b7a95086bebe250f5d557ea'),
-    MultiCallEntrypoint: Fr.fromHexString('0x27b35c8e0851d28c56846ce8977155ffbb5725c4e6b47a67f5d5c6639d1c1a1c'),
-    FeeJuice: Fr.fromHexString('0x2ee34a2d304636f81114dffc8a2357e03e08345a008262eb36112f95aaa58eb1'),
-    Router: Fr.fromHexString('0x180b58198cce7c0866a828841df6eca6369a71a6e884ca5cf08938301d7ad0ca')
+export const ProtocolContractDerivedAddress = {
+    AuthRegistry: AztecAddress.fromString('0x211f1e41d3063b70fbd60030ffcee7020a405d4777af3467f20b0d7fe5637a61'),
+    ContractInstanceRegistry: AztecAddress.fromString('0x1f33581fd9e68afaa9afb20370a2059911fa816b5d7a348903555c06b31d79a5'),
+    ContractClassRegistry: AztecAddress.fromString('0x25b3403229608574dd1397592093c27e7f1b37018c199e4c00608010c404c490'),
+    MultiCallEntrypoint: AztecAddress.fromString('0x016c38dc8b63d9589f872fa9ed121c0700e1cc3c695e540349e8e9b727c1233a'),
+    FeeJuice: AztecAddress.fromString('0x1363751f5f38916a38a88d8b536c53eaf07058e077b22bef4288b0f9178021dc'),
+    Router: AztecAddress.fromString('0x17a6c8d0be66035edb32677e3f121669926df68bef5b009024216b3c22d60183')
 };
-export const protocolContractTreeRoot = Fr.fromHexString('0x227802391f582e49922178a4d4de61384eda4ee4ba69708f0349b76dd04db461');
+export const ProtocolContractsList = new ProtocolContracts([
+    AztecAddress.fromString('0x211f1e41d3063b70fbd60030ffcee7020a405d4777af3467f20b0d7fe5637a61'),
+    AztecAddress.fromString('0x1f33581fd9e68afaa9afb20370a2059911fa816b5d7a348903555c06b31d79a5'),
+    AztecAddress.fromString('0x25b3403229608574dd1397592093c27e7f1b37018c199e4c00608010c404c490'),
+    AztecAddress.fromString('0x016c38dc8b63d9589f872fa9ed121c0700e1cc3c695e540349e8e9b727c1233a'),
+    AztecAddress.fromString('0x1363751f5f38916a38a88d8b536c53eaf07058e077b22bef4288b0f9178021dc'),
+    AztecAddress.fromString('0x17a6c8d0be66035edb32677e3f121669926df68bef5b009024216b3c22d60183'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+    AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+]);
+export const protocolContractsHash = Fr.fromString('0x27638bf36029626c609c64210f0e027e95b2975edc8359afa6f7a77974acf52a');
 export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x28da3fc471387d4e20b646b77abc8cdfc02a339a7507285a73d84f9b97b13486');

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 { 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';
 import { Fr } from '@aztec/foundation/fields';
 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 { 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/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": "2.1.0-rc.9",
+  "version": "3.0.0-devnet.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -73,9 +73,9 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/stdlib": "2.1.0-rc.9",
+    "@aztec/constants": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
     "lodash.chunk": "^4.2.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.4.0"

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

@@ -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();

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/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_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 { 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

@@ -2,6 +2,7 @@
     // 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';
+    import { ProtocolContracts } from '@aztec/stdlib/tx';
 
     
     export const protocolContractNames = [
@@ -39,18 +40,32 @@ Router: AztecAddress.fromBigInt(6n)
   
 
     
-    export const ProtocolContractLeaves = {
-      AuthRegistry: Fr.fromHexString('0x1c2474a77af3c756895867fa7622e5e9295121b35849e965f4614d51f00c62e2'),
-ContractInstanceRegistry: Fr.fromHexString('0x001e627e78063a4944f1331b4c59544f8ad6d6d478f2fc79b025e8240b94b816'),
-ContractClassRegistry: Fr.fromHexString('0x1bd2e13b35e2745e638132262e6642a86ac4219f1b7a95086bebe250f5d557ea'),
-MultiCallEntrypoint: Fr.fromHexString('0x27b35c8e0851d28c56846ce8977155ffbb5725c4e6b47a67f5d5c6639d1c1a1c'),
-FeeJuice: Fr.fromHexString('0x2ee34a2d304636f81114dffc8a2357e03e08345a008262eb36112f95aaa58eb1'),
-Router: Fr.fromHexString('0x180b58198cce7c0866a828841df6eca6369a71a6e884ca5cf08938301d7ad0ca')
+    export const ProtocolContractDerivedAddress = {
+      AuthRegistry: AztecAddress.fromString('0x211f1e41d3063b70fbd60030ffcee7020a405d4777af3467f20b0d7fe5637a61'),
+ContractInstanceRegistry: AztecAddress.fromString('0x1f33581fd9e68afaa9afb20370a2059911fa816b5d7a348903555c06b31d79a5'),
+ContractClassRegistry: AztecAddress.fromString('0x25b3403229608574dd1397592093c27e7f1b37018c199e4c00608010c404c490'),
+MultiCallEntrypoint: AztecAddress.fromString('0x016c38dc8b63d9589f872fa9ed121c0700e1cc3c695e540349e8e9b727c1233a'),
+FeeJuice: AztecAddress.fromString('0x1363751f5f38916a38a88d8b536c53eaf07058e077b22bef4288b0f9178021dc'),
+Router: AztecAddress.fromString('0x17a6c8d0be66035edb32677e3f121669926df68bef5b009024216b3c22d60183')
     };
   
 
     
-    export const protocolContractTreeRoot = Fr.fromHexString('0x227802391f582e49922178a4d4de61384eda4ee4ba69708f0349b76dd04db461');
+    export const ProtocolContractsList = new ProtocolContracts([
+      AztecAddress.fromString('0x211f1e41d3063b70fbd60030ffcee7020a405d4777af3467f20b0d7fe5637a61'),
+AztecAddress.fromString('0x1f33581fd9e68afaa9afb20370a2059911fa816b5d7a348903555c06b31d79a5'),
+AztecAddress.fromString('0x25b3403229608574dd1397592093c27e7f1b37018c199e4c00608010c404c490'),
+AztecAddress.fromString('0x016c38dc8b63d9589f872fa9ed121c0700e1cc3c695e540349e8e9b727c1233a'),
+AztecAddress.fromString('0x1363751f5f38916a38a88d8b536c53eaf07058e077b22bef4288b0f9178021dc'),
+AztecAddress.fromString('0x17a6c8d0be66035edb32677e3f121669926df68bef5b009024216b3c22d60183'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+    ]);
+
+    export const protocolContractsHash = Fr.fromString('0x27638bf36029626c609c64210f0e027e95b2975edc8359afa6f7a77974acf52a');
   
 
     

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"}