@aztec/protocol-contracts 0.41.0 → 0.43.0

package/src/auth-registry/artifact.ts

@@ -0,0 +1,6 @@
+import { loadContractArtifact } from '@aztec/types/abi';
+import { type NoirCompiledContract } from '@aztec/types/noir';
+
+import AuthRegistryJson from '../artifacts/AuthRegistry.json' assert { type: 'json' };
+
+export const AuthRegistryArtifact = loadContractArtifact(AuthRegistryJson as NoirCompiledContract);

package/src/auth-registry/index.ts

@@ -0,0 +1,22 @@
+import { AztecAddress, CANONICAL_AUTH_REGISTRY_ADDRESS } from '@aztec/circuits.js';
+
+import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
+import { AuthRegistryArtifact } from './artifact.js';
+
+/** Returns the canonical deployment of the auth registry. */
+export function getCanonicalAuthRegistry(): ProtocolContract {
+  const contract = getCanonicalProtocolContract(AuthRegistryArtifact, 1);
+
+  if (!contract.address.equals(AuthRegistryAddress)) {
+    throw new Error(
+      `Incorrect address for auth registry (got ${contract.address.toString()} but expected ${AuthRegistryAddress.toString()}). Check CANONICAL_AUTH_REGISTRY_ADDRESS is set to the correct value in the constants files and run the protocol-contracts package tests.`,
+    );
+  }
+  return contract;
+}
+
+export function getCanonicalAuthRegistryAddress(): AztecAddress {
+  return getCanonicalAuthRegistry().address;
+}
+
+export const AuthRegistryAddress = AztecAddress.fromBigInt(CANONICAL_AUTH_REGISTRY_ADDRESS);

package/src/class-registerer/index.ts

@@ -1,19 +1,17 @@
-import { type AztecAddress } from '@aztec/circuits.js';
+import { AztecAddress, REGISTERER_CONTRACT_ADDRESS } from '@aztec/circuits.js';
 
 import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
 import { ContractClassRegistererArtifact } from './artifact.js';
 
 /** Returns the canonical deployment of the class registerer contract. */
 export function getCanonicalClassRegisterer(): ProtocolContract {
-  return getCanonicalProtocolContract(ContractClassRegistererArtifact, 1);
-}
-
-let address: AztecAddress | undefined = undefined;
-
-/** Returns the address for the canonical deployment of the class registerer */
-export function getCanonicalClassRegistererAddress() {
-  if (!address) {
-    address = getCanonicalClassRegisterer().address;
+  const contract = getCanonicalProtocolContract(ContractClassRegistererArtifact, 1);
+  if (!contract.address.equals(ClassRegistererAddress)) {
+    throw new Error(
+      `Incorrect address for class registerer (got ${contract.address.toString()} but expected ${ClassRegistererAddress.toString()}).`,
+    );
   }
-  return address;
+  return contract;
 }
+
+export const ClassRegistererAddress = AztecAddress.fromBigInt(REGISTERER_CONTRACT_ADDRESS);

package/src/gas-token/index.ts

@@ -1,13 +1,19 @@
-import { type AztecAddress, type EthAddress } from '@aztec/circuits.js';
+import { AztecAddress, GAS_TOKEN_ADDRESS } from '@aztec/circuits.js';
 
 import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
 import { GasTokenArtifact } from './artifact.js';
 
 /** Returns the canonical deployment of the gas token. */
-export function getCanonicalGasToken(l1Bridge: EthAddress): ProtocolContract {
-  return getCanonicalProtocolContract(GasTokenArtifact, 1, [l1Bridge]);
+export function getCanonicalGasToken(): ProtocolContract {
+  const contract = getCanonicalProtocolContract(GasTokenArtifact, 1);
+  if (!contract.address.equals(GasTokenAddress)) {
+    throw new Error(
+      `Incorrect address for gas token (got ${contract.address.toString()} but expected ${GasTokenAddress.toString()}).`,
+    );
+  }
+  return contract;
 }
 
-export function getCanonicalGasTokenAddress(l1Bridge: EthAddress): AztecAddress {
-  return getCanonicalGasToken(l1Bridge).address;
-}
+export const GasTokenAddress = AztecAddress.fromBigInt(GAS_TOKEN_ADDRESS);
+
+export { GasTokenArtifact };

package/src/instance-deployer/index.ts

@@ -8,7 +8,7 @@ export function getCanonicalInstanceDeployer(): ProtocolContract {
   const contract = getCanonicalProtocolContract(ContractInstanceDeployerArtifact, 1);
   if (!contract.address.equals(InstanceDeployerAddress)) {
     throw new Error(
-      `Incorrect address for contract deployer (got ${contract.address.toString()} but expected ${InstanceDeployerAddress.toString()}). Check DEPLOYER_CONTRACT_ADDRESS is set to the correct value in the constants files and run the protocol-contracts package tests.`,
+      `Incorrect address for contract deployer (got ${contract.address.toString()} but expected ${InstanceDeployerAddress.toString()}).`,
     );
   }
   return contract;

package/src/protocol_contract.ts

@@ -1,5 +1,6 @@
 import {
   type AztecAddress,
+  type ContractClassIdPreimage,
   getContractClassFromArtifact,
   getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
@@ -12,7 +13,7 @@ export interface ProtocolContract {
   /** Canonical deployed instance. */
   instance: ContractInstanceWithAddress;
   /** Contract class of this contract. */
-  contractClass: ContractClassWithId;
+  contractClass: ContractClassWithId & ContractClassIdPreimage;
   /** Complete contract artifact. */
   artifact: ContractArtifact;
   /** Deployment address for the canonical instance.  */