@aztec/protocol-contracts 0.35.1 → 0.37.0

package/src/gas-token/index.ts

@@ -1,11 +1,11 @@
-import { type AztecAddress, type EthAddress, Point } from '@aztec/circuits.js';
+import { type AztecAddress, type EthAddress } 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, [], Point.ZERO, l1Bridge);
+  return getCanonicalProtocolContract(GasTokenArtifact, 1, [l1Bridge]);
 }
 
 export function getCanonicalGasTokenAddress(l1Bridge: EthAddress): AztecAddress {

package/src/instance-deployer/index.ts

@@ -5,7 +5,13 @@ import { ContractInstanceDeployerArtifact } from './artifact.js';
 
 /** Returns the canonical deployment of the instance deployer contract. */
 export function getCanonicalInstanceDeployer(): ProtocolContract {
-  return getCanonicalProtocolContract(ContractInstanceDeployerArtifact, 1);
+  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.`,
+    );
+  }
+  return contract;
 }
 
 export const InstanceDeployerAddress = AztecAddress.fromBigInt(DEPLOYER_CONTRACT_ADDRESS);

package/src/key-registry/artifact.ts

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

package/src/key-registry/index.ts

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

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

@@ -1,10 +1,10 @@
-import { type AztecAddress, EthAddress, Point } from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/circuits.js';
 
 import { type ProtocolContract, getCanonicalProtocolContract } from '../protocol_contract.js';
 import { MultiCallEntrypointArtifact } from './artifact.js';
 
 export function getCanonicalMultiCallEntrypointContract(): ProtocolContract {
-  return getCanonicalProtocolContract(MultiCallEntrypointArtifact, 1, [], Point.ZERO, EthAddress.ZERO);
+  return getCanonicalProtocolContract(MultiCallEntrypointArtifact, 1, []);
 }
 
 export function getCanonicalMultiCallEntrypointAddress(): AztecAddress {

package/src/protocol_contract.ts

@@ -1,11 +1,10 @@
 import {
   type AztecAddress,
-  EthAddress,
   getContractClassFromArtifact,
   getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
-import { Fr, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 /** Represents a canonical contract in the protocol. */
@@ -25,16 +24,12 @@ export function getCanonicalProtocolContract(
   artifact: ContractArtifact,
   salt: Fr | number | bigint,
   constructorArgs: any[] = [],
-  publicKey: Point = Point.ZERO,
-  portalAddress = EthAddress.ZERO,
 ): ProtocolContract {
   // TODO(@spalladino): This computes the contract class from the artifact twice.
   const contractClass = getContractClassFromArtifact(artifact);
   const instance = getContractInstanceFromDeployParams(artifact, {
     constructorArgs,
     salt: new Fr(salt),
-    publicKey,
-    portalAddress,
   });
   return {
     instance,