@aztec/protocol-contracts 0.40.1 → 0.42.0

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;