@aztec/protocol-contracts 0.0.1-commit.2448fdb → 0.0.1-commit.2606882

package/src/instance-registry/contract_instance_published_event.ts

@@ -15,6 +15,7 @@ export class ContractInstancePublishedEvent {
     public readonly salt: Fr,
     public readonly contractClassId: Fr,
     public readonly initializationHash: Fr,
+    public readonly immutablesHash: Fr,
     public readonly publicKeys: PublicKeys,
     public readonly deployer: AztecAddress,
   ) {}
@@ -31,6 +32,7 @@ export class ContractInstancePublishedEvent {
     const salt = reader.readObject(Fr);
     const contractClassId = reader.readObject(Fr);
     const initializationHash = reader.readObject(Fr);
+    const immutablesHash = reader.readObject(Fr);
     const publicKeys = reader.readObject(PublicKeys);
     const deployer = reader.readObject(AztecAddress);
 
@@ -40,13 +42,14 @@ export class ContractInstancePublishedEvent {
       salt,
       contractClassId,
       initializationHash,
+      immutablesHash,
       publicKeys,
       deployer,
     );
   }
 
   toContractInstance(): ContractInstanceWithAddress {
-    if (this.version !== 1) {
+    if (this.version !== 2) {
       throw new Error(`Unexpected contract instance version ${this.version}`);
     }
 
@@ -56,6 +59,7 @@ export class ContractInstancePublishedEvent {
       currentContractClassId: this.contractClassId,
       originalContractClassId: this.contractClassId,
       initializationHash: this.initializationHash,
+      immutablesHash: this.immutablesHash,
       publicKeys: this.publicKeys,
       salt: this.salt,
       deployer: this.deployer,

package/src/make_protocol_contract.ts

@@ -1,3 +1,4 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
 
@@ -34,10 +35,11 @@ export function makeProtocolContract(name: ProtocolContractName, artifact: Contr
   };
 
   const instance = {
-    version: 1 as const,
+    version: 2 as const,
     currentContractClassId: classId,
     originalContractClassId: classId,
     initializationHash,
+    immutablesHash: Fr.ZERO, // Protocol Contracts Have No Immutables
     publicKeys: PublicKeys.default(),
     salt,
     deployer: address,

package/src/protocol_contract_data.ts

@@ -7,12 +7,9 @@
 
     
     export const protocolContractNames = [
-      'AuthRegistry',
-'ContractInstanceRegistry',
+      'ContractInstanceRegistry',
 'ContractClassRegistry',
-'MultiCallEntrypoint',
-'FeeJuice',
-'PublicChecks'
+'FeeJuice'
     ] as const;
 
     export type ProtocolContractName = typeof protocolContractNames[number];
@@ -20,107 +17,74 @@
 
     
     export const ProtocolContractSalt: Record<ProtocolContractName, Fr> = {
-      AuthRegistry: new Fr(1),
-ContractInstanceRegistry: new Fr(1),
+      ContractInstanceRegistry: new Fr(1),
 ContractClassRegistry: new Fr(1),
-MultiCallEntrypoint: new Fr(1),
-FeeJuice: new Fr(1),
-PublicChecks: new Fr(1)
+FeeJuice: new Fr(1)
     };
   
 
     
     export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress> = {
-      AuthRegistry: AztecAddress.fromBigInt(1n),
-ContractInstanceRegistry: AztecAddress.fromBigInt(2n),
-ContractClassRegistry: AztecAddress.fromBigInt(3n),
-MultiCallEntrypoint: AztecAddress.fromBigInt(4n),
-FeeJuice: AztecAddress.fromBigInt(5n),
-PublicChecks: AztecAddress.fromBigInt(6n)
+      ContractInstanceRegistry: AztecAddress.fromBigInt(2n),
+ContractClassRegistry: AztecAddress.fromBigInt(1n),
+FeeJuice: AztecAddress.fromBigInt(3n)
     };
   
 
     
     export const ProtocolContractDerivedAddress = {
-      AuthRegistry: AztecAddress.fromString('0x139f8eb6d6e7e7a7c0322c3b7558687a7e24201f11bf2c4cb2fe56c18d363695'),
-ContractInstanceRegistry: AztecAddress.fromString('0x1254246c88aca5a66fa66f3aa78c408a698ebca3b713120497c7555dfc718592'),
-ContractClassRegistry: AztecAddress.fromString('0x14d670efa326a07b99777b01fb706427ca776095246569150f2a3f17a7d4dc66'),
-MultiCallEntrypoint: AztecAddress.fromString('0x230d0b47ba6d5ed99afb89d584f32ff33438b64f51000f252a140cf995781628'),
-FeeJuice: AztecAddress.fromString('0x204913186c0dd70015d05bf9100a12e31ccb7cc2527aacdfae0c19ad6439fcf4'),
-PublicChecks: AztecAddress.fromString('0x1198142fd84a58c0ab22d5fde371ce527042db49487e05206a326ad154952ac8')
+      ContractInstanceRegistry: AztecAddress.fromString('0x290f7bf7cea0eb4c440a06dc8bcf825865479348c9ebf8f540b10ad10fd32c44'),
+ContractClassRegistry: AztecAddress.fromString('0x20b16259faa0a096d687572fc76221263f1cad4a4b726ef49e2cd7b7ce7c7465'),
+FeeJuice: AztecAddress.fromString('0x0fa3ba3e01e6646cd2adade41018dbfff04e59c444760e33bf773ec43d683019')
     };
   
 
     
     export const ProtocolContractClassId: Record<ProtocolContractName, Fr> = {
-      AuthRegistry: Fr.fromString('0x17ad10e1b5dba2877b9a973449c03d5227f2c719c0eb1989427c10c1d83867a5'),
-ContractInstanceRegistry: Fr.fromString('0x187c710b0d69b2da7a6f0663c15093a5d595c04e77762c249aa9b654bc12158c'),
-ContractClassRegistry: Fr.fromString('0x013466b8a65dea98ad80c119cf236a0acf53acfede687769410cfd57876b8242'),
-MultiCallEntrypoint: Fr.fromString('0x1acd7ab8bf186c16eafc9c4fe9049f35df27e172bb2d8319a2a22ddd0006966d'),
-FeeJuice: Fr.fromString('0x16b2d5ef5044c11126a16ccdb3778082eb423375977da9458d493fdf84505e81'),
-PublicChecks: Fr.fromString('0x03f2ebaef8d692422185e35d8fe35d0bb7289702cf023b525c022d77fc6b5ed5')
+      ContractInstanceRegistry: Fr.fromString('0x123597d7f3c460a3e91bfb92e729fcd048d4f50a88b7c25e694cf75827062e3f'),
+ContractClassRegistry: Fr.fromString('0x243b6ce1af8f520d531b26ce5081fa29c0870ce8d5949c5304a6705b07947a2e'),
+FeeJuice: Fr.fromString('0x1f65e3db036c48ac8f8635b156880ed17e9437ed8904a0c0554f0d6251bf0997')
     };
 
     export const ProtocolContractClassIdPreimage: Record<ProtocolContractName, { artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }> = {
-      AuthRegistry: {
-        artifactHash: Fr.fromString('0x029f3b5582e9e2f9cddb4f887fa67c06d8dbe9aef604aa7de91a6f5328bf477c'),
-        privateFunctionsRoot: Fr.fromString('0x0826df9bf86cf460935b2bd024edcb5a58532fcf0392abbdb33f5f2150753756'),
-        publicBytecodeCommitment: Fr.fromString('0x22db1f0a70bfefaf90371c7728e558cf60507b718e99ed276ed3143bec615f6f'),
-      },
-ContractInstanceRegistry: {
-        artifactHash: Fr.fromString('0x18601566bacdca7a5a40528f221b04ee7b74f382e6cd34fbdf69d31c50d5ee88'),
-        privateFunctionsRoot: Fr.fromString('0x136a6705c7ad1d47f65cb881a56909d4c78d3fa8944f5b103734cd91e654ed63'),
-        publicBytecodeCommitment: Fr.fromString('0x01c573f470ba9a17d362c7dd5a28931c39432f9ce527555049c71432f895ad6c'),
+      ContractInstanceRegistry: {
+        artifactHash: Fr.fromString('0x0cb37c0b0ec8670b88b472fca5858f8cb112a41ba2aad664903ac1a3bed468b3'),
+        privateFunctionsRoot: Fr.fromString('0x0239b0f293384aad456e2e27901eb97cd9073322a28d14b0ac7816a5297b2812'),
+        publicBytecodeCommitment: Fr.fromString('0x2c79b6699098244e947caca071a31799c20aa20e7124910a2b7c918fe817d65e'),
       },
 ContractClassRegistry: {
-        artifactHash: Fr.fromString('0x232d868db8a4d1e0f013efa4bfe5c39d96e11f16a62e3e73abbbafc3028fc410'),
-        privateFunctionsRoot: Fr.fromString('0x2ac3bf890a7d534a768079aa86889caa1a86373c8e6fc2db48215b11bbb79106'),
-        publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
-      },
-MultiCallEntrypoint: {
-        artifactHash: Fr.fromString('0x0d30526b6b786cf887d7e44ba59d2e9561d5791b0e3c78c681d0499ae45b225a'),
-        privateFunctionsRoot: Fr.fromString('0x266505ecb7c02ce6e227227c0b6bdb44713c8ecd43164ee7bb00b8fb340e8b03'),
+        artifactHash: Fr.fromString('0x1e252471ee2b770fba961d03289344f1798336d9a94e1d8f137397754708de0e'),
+        privateFunctionsRoot: Fr.fromString('0x0672f623ec0753ab9fbb02a9a241df81b9bcc0dbed8628d8cab8790e0cb0c03d'),
         publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
       },
 FeeJuice: {
-        artifactHash: Fr.fromString('0x2eb476f12cce5207be118047fb7f603378b78aa619d6539a4d9eec4700ea2507'),
-        privateFunctionsRoot: Fr.fromString('0x0abef3cfc6ae314886c841b42dc33d3eed255ad3dee7773daabf05b229573759'),
-        publicBytecodeCommitment: Fr.fromString('0x2a144b28b36efa21b7488467aba7e06b33e016d00bfe083a7bfa06ad6ff5aa2f'),
-      },
-PublicChecks: {
-        artifactHash: Fr.fromString('0x228ea8af66ff150f40a4b01b64115d12777b2f7fd3a4bfc0d97d38a91f139ef6'),
-        privateFunctionsRoot: Fr.fromString('0x067243231eddf4222f3911defbba7705aff06ed45960b27f6f91319196ef97e1'),
-        publicBytecodeCommitment: Fr.fromString('0x2d0834fc9468fd2092091852543a2fbd7b6b313c7e5e4defe8730c8065366a03'),
+        artifactHash: Fr.fromString('0x1243f24c1d3e8b42c900aa95d3a12448d84f8b5da3fe047f8ac8a46e67bb10b7'),
+        privateFunctionsRoot: Fr.fromString('0x247aaafc67f6bf5b06736649181a477dac9f18d3468969b14669708c3dabb275'),
+        publicBytecodeCommitment: Fr.fromString('0x1d4b1a8f71b8250d4fb65f8e16a4604e9165648279f47d80e024ce2684c4bdfb'),
       }
     };
 
     export const ProtocolContractInitializationHash: Record<ProtocolContractName, Fr> = {
-      AuthRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-ContractInstanceRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+      ContractInstanceRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 ContractClassRegistry: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-MultiCallEntrypoint: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-FeeJuice: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
-PublicChecks: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
+FeeJuice: Fr.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
     };
 
     export const ProtocolContractPrivateFunctions: Record<ProtocolContractName, { selector: FunctionSelector; vkHash: Fr }[]> = {
-      AuthRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000079a3d418')), vkHash: Fr.fromString('0x019c553854290b9b547841e45bf45e344d4a2d4f6702fee430ec5897ce7d3b78') }],
-ContractInstanceRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000016ec12aa')), vkHash: Fr.fromString('0x262f7a90ecf055779001b67dad01a3add1e549f6c27931f0e71e463ce2142b57') }],
-ContractClassRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x000000000000000000000000000000000000000000000000000000006934ed0d')), vkHash: Fr.fromString('0x1163f31e191528254c877fce0c7f62dd738f5552bbd2dda97512fe4777377f5b') }],
-MultiCallEntrypoint: [{ selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f04908a9')), vkHash: Fr.fromString('0x21732ab3cecf633e4c31a030df62c93e35a005b89941fdab568d2818c1355192') }],
-FeeJuice: [{ selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000cbe67243')), vkHash: Fr.fromString('0x2ad6083b4595f8076c014e5152191013167ab1b5a31ad0cbb06490054c7c59ae') }, { selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000e8d374b6')), vkHash: Fr.fromString('0x05aaffffdf797625ff24575d939339303775c5db77fb6bdcecbf955f726fd071') }],
-PublicChecks: []
+      ContractInstanceRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x0000000000000000000000000000000000000000000000000000000077cff62f')), vkHash: Fr.fromString('0x08a57d0b4d164c6c8d92da9c3bfe57a4ac1a639ab0a2a0ccb60bbb6bcd37f245') }],
+ContractClassRegistry: [{ selector: FunctionSelector.fromField(Fr.fromString('0x000000000000000000000000000000000000000000000000000000006934ed0d')), vkHash: Fr.fromString('0x1531ed0e20d6d05f1aeb06f746c8c4b8f467174836d6edf915b0c45099b393ed') }],
+FeeJuice: [{ selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000cbe67243')), vkHash: Fr.fromString('0x2dbad42bf59fe7ea908485dea59573b4d7fb8ddefb6a0f73bbcce79aa27d545c') }, { selector: FunctionSelector.fromField(Fr.fromString('0x00000000000000000000000000000000000000000000000000000000e8d374b6')), vkHash: Fr.fromString('0x2e9880e15fb0c9a5494faef915861144769e94aded54c737819ee75918fbda51') }]
     };
   
 
     
     export const ProtocolContractsList = new ProtocolContracts([
-      AztecAddress.fromString('0x139f8eb6d6e7e7a7c0322c3b7558687a7e24201f11bf2c4cb2fe56c18d363695'),
-AztecAddress.fromString('0x1254246c88aca5a66fa66f3aa78c408a698ebca3b713120497c7555dfc718592'),
-AztecAddress.fromString('0x14d670efa326a07b99777b01fb706427ca776095246569150f2a3f17a7d4dc66'),
-AztecAddress.fromString('0x230d0b47ba6d5ed99afb89d584f32ff33438b64f51000f252a140cf995781628'),
-AztecAddress.fromString('0x204913186c0dd70015d05bf9100a12e31ccb7cc2527aacdfae0c19ad6439fcf4'),
-AztecAddress.fromString('0x1198142fd84a58c0ab22d5fde371ce527042db49487e05206a326ad154952ac8'),
+      AztecAddress.fromString('0x20b16259faa0a096d687572fc76221263f1cad4a4b726ef49e2cd7b7ce7c7465'),
+AztecAddress.fromString('0x290f7bf7cea0eb4c440a06dc8bcf825865479348c9ebf8f540b10ad10fd32c44'),
+AztecAddress.fromString('0x0fa3ba3e01e6646cd2adade41018dbfff04e59c444760e33bf773ec43d683019'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
+AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000'),
@@ -128,7 +92,7 @@ AztecAddress.fromString('0x00000000000000000000000000000000000000000000000000000
 AztecAddress.fromString('0x0000000000000000000000000000000000000000000000000000000000000000')
     ]);
 
-    export const protocolContractsHash = Fr.fromString('0x2672340d9a0107a7b81e6d10d25b854debe613f3272e8738e8df0ca2ff297141');
+    export const protocolContractsHash = Fr.fromString('0x04194c6dd98d175d07d300b253a9967f5c46782d0e9c3c88473f79ca8b8b16d6');
   
 
     

package/src/provider/bundle.ts

@@ -1,23 +1,17 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 
-import { AuthRegistryArtifact } from '../auth-registry/index.js';
 import { ContractClassRegistryArtifact } from '../class-registry/index.js';
 import { FeeJuiceArtifact } from '../fee-juice/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';
 import type { ProtocolContractName } from '../protocol_contract_data.js';
-import { PublicChecksArtifact } from '../public-checks/index.js';
 import type { ProtocolContractsProvider } from './protocol_contracts_provider.js';
 
 export const ProtocolContractArtifact: Record<ProtocolContractName, ContractArtifact> = {
-  AuthRegistry: AuthRegistryArtifact,
   ContractInstanceRegistry: ContractInstanceRegistryArtifact,
   ContractClassRegistry: ContractClassRegistryArtifact,
-  MultiCallEntrypoint: MultiCallEntrypointArtifact,
   FeeJuice: FeeJuiceArtifact,
-  PublicChecks: PublicChecksArtifact,
 };
 
 export class BundledProtocolContractsProvider implements ProtocolContractsProvider {

package/src/provider/lazy.ts

@@ -1,28 +1,19 @@
-import { getCanonicalAuthRegistry } from '../auth-registry/lazy.js';
 import { getCanonicalClassRegistry } from '../class-registry/lazy.js';
 import { getCanonicalFeeJuice } from '../fee-juice/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';
-import { getCanonicalPublicChecks } from '../public-checks/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 'ContractInstanceRegistry':
         return getCanonicalInstanceRegistry();
       case 'ContractClassRegistry':
         return getCanonicalClassRegistry();
-      case 'MultiCallEntrypoint':
-        return getCanonicalMultiCallEntrypoint();
       case 'FeeJuice':
         return getCanonicalFeeJuice();
-      case 'PublicChecks':
-        return getCanonicalPublicChecks();
       default:
         throw new Error(`Unknown protocol contract name: ${name}`);
     }

package/src/tests/fixtures.ts

@@ -8,18 +8,6 @@ export function getSampleContractClassPublishedEventPayload(): Buffer {
   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 getSamplePrivateFunctionBroadcastedEventPayload(): Buffer {
-  const path = getPathToFixture('PrivateFunctionBroadcastedEventData.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 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 getSampleContractInstancePublishedEventPayload(): Buffer {
   const path = getPathToFixture('ContractInstancePublishedEventData.hex');

package/artifacts/AuthRegistry.d.json.ts

@@ -1,5 +0,0 @@
-
-    import type { NoirCompiledContract } from '@aztec/stdlib/noir';
-    const circuit: NoirCompiledContract;
-    export = circuit;
-