@aztec/protocol-contracts 0.0.0-test.0 → 0.0.1-commit.24de95ac

package/src/{instance-deployer → instance-registry}/lazy.ts

@@ -3,30 +3,30 @@ import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 
-export * from './contract_instance_deployed_event.js';
+export * from './contract_instance_published_event.js';
 export * from './contract_instance_updated_event.js';
 
 let protocolContract: ProtocolContract;
 let protocolContractArtifact: ContractArtifact;
 
-export async function getContractInstanceDeployerArtifact(): Promise<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: contractInstanceDeployerJson } = await import('../../artifacts/ContractInstanceDeployer.json');
-    protocolContractArtifact = loadContractArtifact(contractInstanceDeployerJson);
+    const { default: contractInstanceRegistryJson } = await import('../../artifacts/ContractInstanceRegistry.json');
+    protocolContractArtifact = loadContractArtifact(contractInstanceRegistryJson);
   }
   return protocolContractArtifact;
 }
 
 /** Returns the canonical deployment of the auth registry. */
-export async function getCanonicalInstanceDeployer(): Promise<ProtocolContract> {
+export async function getCanonicalInstanceRegistry(): Promise<ProtocolContract> {
   if (!protocolContract) {
-    const contractInstanceDeployerArtifact = await getContractInstanceDeployerArtifact();
-    protocolContract = await makeProtocolContract('ContractInstanceDeployer', contractInstanceDeployerArtifact);
+    const contractInstanceRegistryArtifact = await getContractInstanceRegistryArtifact();
+    protocolContract = await makeProtocolContract('ContractInstanceRegistry', contractInstanceRegistryArtifact);
   }
   return protocolContract;
 }

package/src/make_protocol_contract.ts

@@ -1,5 +1,5 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 
 import type { ProtocolContract } from './protocol_contract.js';
 import { ProtocolContractAddress, type ProtocolContractName, ProtocolContractSalt } from './protocol_contract_data.js';
@@ -16,7 +16,7 @@ export async function makeProtocolContract(
   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 });
+  const instance = await getContractInstanceFromInstantiationParams(artifact, { salt });
   return {
     instance: { ...instance, address },
     contractClass,

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

@@ -1,7 +1,7 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' assert { type: 'json' };
+import MultiCallEntrypointJson from '../../artifacts/MultiCallEntrypoint.json' with { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 

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,12 +2,13 @@
     // 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',
-'ContractInstanceDeployer',
-'ContractClassRegisterer',
+'ContractInstanceRegistry',
+'ContractClassRegistry',
 'MultiCallEntrypoint',
 'FeeJuice',
 'Router'
@@ -19,8 +20,8 @@
     
     export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
       AuthRegistry: new Fr(1),
-ContractInstanceDeployer: new Fr(1),
-ContractClassRegisterer: new Fr(1),
+ContractInstanceRegistry: new Fr(1),
+ContractClassRegistry: new Fr(1),
 MultiCallEntrypoint: new Fr(1),
 FeeJuice: new Fr(1),
 Router: new Fr(1)
@@ -30,8 +31,8 @@ Router: new Fr(1)
     
     export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
       AuthRegistry: AztecAddress.fromBigInt(1n),
-ContractInstanceDeployer: AztecAddress.fromBigInt(2n),
-ContractClassRegisterer: AztecAddress.fromBigInt(3n),
+ContractInstanceRegistry: AztecAddress.fromBigInt(2n),
+ContractClassRegistry: AztecAddress.fromBigInt(3n),
 MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
 FeeJuice: AztecAddress.fromBigInt(5n),
 Router: AztecAddress.fromBigInt(6n)
@@ -39,25 +40,35 @@ Router: AztecAddress.fromBigInt(6n)
   
 
     
-    export const ProtocolContractLeaves = {
-      AuthRegistry: Fr.fromHexString('0x1dc70bdab08ce08aef9f6ddcc8fd54fb91fdb72a6433c2dd6b69b33cf1fb87a2'),
-ContractInstanceDeployer: Fr.fromHexString('0x005d6d6addbbda03dcad6fc9a3c3b7de457c30990ec2acaaf74f139a3a506e06'),
-ContractClassRegisterer: Fr.fromHexString('0x110ef3d93e27fd61a5a56e479a9f9cbdb099d2d968cdcc16c01d2bdfd6cb0ddd'),
-MultiCallEntrypoint: Fr.fromHexString('0x121f834b03a64d38463ae18ddebceeb4dce8192cc289052e175ad754a883a7fe'),
-FeeJuice: Fr.fromHexString('0x141a566ade0bef915526762c2c2fb19b2a756ad7c82e83fde6dbf86848ecc131'),
-Router: Fr.fromHexString('0x2c20bd328fbd33c01fbcda9e6299c31da5d5b29ea30e9c7b9d631618b839bca9')
+    export const ProtocolContractDerivedAddress = {
+      AuthRegistry: AztecAddress.fromString('0x2e35b6e1a89ac2f901f3513f505249b9a485513ac7dd57f29f1183c0862473f2'),
+ContractInstanceRegistry: AztecAddress.fromString('0x136eade704b136bae7c5282cf8f4e1ccc51835db840123034cfefbad76215c91'),
+ContractClassRegistry: AztecAddress.fromString('0x2b9543f587c4d7976627ed8dfe0345f9e2efa846f618dea97372c1be7240994b'),
+MultiCallEntrypoint: AztecAddress.fromString('0x191a929597d30fafe8d5708533b89bd4022c8d3194c8fcf37d04ac51a2f804eb'),
+FeeJuice: AztecAddress.fromString('0x2f3ffae9d3b40e8f162fc2dabbd8dba5deaf112191dfa7be263a55073e16d082'),
+Router: AztecAddress.fromString('0x00943dfa60dc08d7fb79f30220fdab942c0ba3364e45b69777015613983bab58')
     };
   
 
     
-    export const protocolContractTreeRoot = Fr.fromHexString('0x093cc9324e5a7b44883f515ac490e7294ef8cb1e6d2d8c503255b1b3a9409262');
+    export const ProtocolContractsList = new ProtocolContracts([
+      AztecAddress.fromString('0x2e35b6e1a89ac2f901f3513f505249b9a485513ac7dd57f29f1183c0862473f2'),
+AztecAddress.fromString('0x136eade704b136bae7c5282cf8f4e1ccc51835db840123034cfefbad76215c91'),
+AztecAddress.fromString('0x2b9543f587c4d7976627ed8dfe0345f9e2efa846f618dea97372c1be7240994b'),
+AztecAddress.fromString('0x191a929597d30fafe8d5708533b89bd4022c8d3194c8fcf37d04ac51a2f804eb'),
+AztecAddress.fromString('0x2f3ffae9d3b40e8f162fc2dabbd8dba5deaf112191dfa7be263a55073e16d082'),
+AztecAddress.fromString('0x00943dfa60dc08d7fb79f30220fdab942c0ba3364e45b69777015613983bab58'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+    ]);
+
+    export const protocolContractsHash = Fr.fromString('0x1114ed602f51159e3e07a19f1b0ad7acbd7dee60fbf342ea0e46d9013f744679');
   
 
     
-  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);
+  export const CONTRACT_INSTANCE_PUBLISHED_EVENT_TAG = Fr.fromHexString('0x28da3fc471387d4e20b646b77abc8cdfc02a339a7507285a73d84f9b97b13486');
   
   

package/src/provider/bundle.ts

@@ -1,9 +1,9 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 
 import { AuthRegistryArtifact } from '../auth-registry/index.js';
-import { ContractClassRegistererArtifact } from '../class-registerer/index.js';
+import { ContractClassRegistryArtifact } from '../class-registry/index.js';
 import { FeeJuiceArtifact } from '../fee-juice/index.js';
-import { ContractInstanceDeployerArtifact } from '../instance-deployer/index.js';
+import { ContractInstanceRegistryArtifact } from '../instance-registry/index.js';
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import { MultiCallEntrypointArtifact } from '../multi-call-entrypoint/index.js';
 import type { ProtocolContract } from '../protocol_contract.js';
@@ -13,8 +13,8 @@ import type { ProtocolContractsProvider } from './protocol_contracts_provider.js
 
 export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
   AuthRegistry: AuthRegistryArtifact,
-  ContractInstanceDeployer: ContractInstanceDeployerArtifact,
-  ContractClassRegisterer: ContractClassRegistererArtifact,
+  ContractInstanceRegistry: ContractInstanceRegistryArtifact,
+  ContractClassRegistry: ContractClassRegistryArtifact,
   MultiCallEntrypoint: MultiCallEntrypointArtifact,
   FeeJuice: FeeJuiceArtifact,
   Router: RouterArtifact,

package/src/provider/lazy.ts

@@ -1,7 +1,7 @@
 import { getCanonicalAuthRegistry } from '../auth-registry/lazy.js';
-import { getCanonicalClassRegisterer } from '../class-registerer/lazy.js';
+import { getCanonicalClassRegistry } from '../class-registry/lazy.js';
 import { getCanonicalFeeJuice } from '../fee-juice/lazy.js';
-import { getCanonicalInstanceDeployer } from '../instance-deployer/lazy.js';
+import { getCanonicalInstanceRegistry } from '../instance-registry/lazy.js';
 import { getCanonicalMultiCallEntrypoint } from '../multi-call-entrypoint/lazy.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
@@ -13,10 +13,10 @@ export class LazyProtocolContractsProvider implements ProtocolContractsProvider
     switch (name) {
       case 'AuthRegistry':
         return getCanonicalAuthRegistry();
-      case 'ContractInstanceDeployer':
-        return getCanonicalInstanceDeployer();
-      case 'ContractClassRegisterer':
-        return getCanonicalClassRegisterer();
+      case 'ContractInstanceRegistry':
+        return getCanonicalInstanceRegistry();
+      case 'ContractClassRegistry':
+        return getCanonicalClassRegistry();
       case 'MultiCallEntrypoint':
         return getCanonicalMultiCallEntrypoint();
       case 'FeeJuice':

package/src/router/index.ts

@@ -1,7 +1,7 @@
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import RouterJson from '../../artifacts/Router.json' assert { type: 'json' };
+import RouterJson from '../../artifacts/Router.json' with { type: 'json' };
 import { makeProtocolContract } from '../make_protocol_contract.js';
 import type { ProtocolContract } from '../protocol_contract.js';
 

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/src/tests/fixtures.ts

@@ -3,8 +3,8 @@ import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleContractClassRegisteredEventPayload(): Buffer {
-  const path = getPathToFixture('ContractClassRegisteredEventData.hex');
+export function getSampleContractClassPublishedEventPayload(): Buffer {
+  const path = getPathToFixture('ContractClassPublishedEventData.hex');
   return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 
@@ -15,14 +15,14 @@ export function getSamplePrivateFunctionBroadcastedEventPayload(): Buffer {
 }
 
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleUnconstrainedFunctionBroadcastedEventPayload(): Buffer {
-  const path = getPathToFixture('UnconstrainedFunctionBroadcastedEventData.hex');
+export function getSampleUtilityFunctionBroadcastedEventPayload(): Buffer {
+  const path = getPathToFixture('UtilityFunctionBroadcastedEventData.hex');
   return Buffer.from(readFileSync(path).toString(), 'hex');
 }
 
 // Generated from end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts with AZTEC_GENERATE_TEST_DATA=1
-export function getSampleContractInstanceDeployedEventPayload(): Buffer {
-  const path = getPathToFixture('ContractInstanceDeployedEventData.hex');
+export function getSampleContractInstancePublishedEventPayload(): Buffer {
+  const path = getPathToFixture('ContractInstancePublishedEventData.hex');
   return Buffer.from(readFileSync(path).toString(), 'hex');
 }