@aztec/ethereum 0.0.0-test.1 → 0.0.1-commit.1142ef1

package/src/contracts/registry.ts

@@ -1,26 +1,25 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
 import { RegistryAbi } from '@aztec/l1-artifacts/RegistryAbi';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 
-import {
-  type Chain,
-  type GetContractReturnType,
-  type Hex,
-  type HttpTransport,
-  type PublicClient,
-  getContract,
-} from 'viem';
+import { type GetContractReturnType, type Hex, getContract } from 'viem';
 
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { L1Clients, ViemPublicClient } from '../types.js';
-import { GovernanceContract } from './governance.js';
+import type { ViemClient } from '../types.js';
+import { ReadOnlyGovernanceContract } from './governance.js';
 import { RollupContract } from './rollup.js';
 
 export class RegistryContract {
   public address: EthAddress;
-  private readonly registry: GetContractReturnType<typeof RegistryAbi, PublicClient<HttpTransport, Chain>>;
 
-  constructor(public readonly client: L1Clients['publicClient'], address: Hex | EthAddress) {
+  private readonly log = createLogger('ethereum:contracts:registry');
+  private readonly registry: GetContractReturnType<typeof RegistryAbi, ViemClient>;
+
+  constructor(
+    public readonly client: ViemClient,
+    address: Hex | EthAddress,
+  ) {
     if (address instanceof EthAddress) {
       address = address.toString();
     }
@@ -28,6 +27,10 @@ export class RegistryContract {
     this.registry = getContract({ address, abi: RegistryAbi, client });
   }
 
+  public async getOwner(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.registry.read.owner());
+  }
+
   /**
    * Returns the address of the rollup for a given version.
    * @param version - The version of the rollup. 'canonical' can be used to get the canonical address (i.e. the latest version).
@@ -42,12 +45,19 @@ export class RegistryContract {
       version = BigInt(version);
     }
 
-    const snapshot = await this.registry.read.getSnapshot([version]);
-    const address = EthAddress.fromString(snapshot.rollup);
-    if (address.equals(EthAddress.ZERO)) {
+    try {
+      return EthAddress.fromString(await this.registry.read.getRollup([version]));
+    } catch {
+      this.log.warn(`Failed fetching rollup address for version ${version}. Retrying as index.`);
+    }
+
+    try {
+      const actualVersion = await this.registry.read.getVersion([version]);
+      const rollupAddress = await this.registry.read.getRollup([actualVersion]);
+      return EthAddress.fromString(rollupAddress);
+    } catch {
       throw new Error('Rollup address is undefined');
     }
-    return address;
   }
 
   /**
@@ -55,28 +65,23 @@ export class RegistryContract {
    * @returns The canonical address of the rollup. If the rollup is not set, throws an error.
    */
   public async getCanonicalAddress(): Promise<EthAddress> {
-    const snapshot = await this.registry.read.getCurrentSnapshot();
-    const address = EthAddress.fromString(snapshot.rollup);
-    if (address.equals(EthAddress.ZERO)) {
-      throw new Error('Rollup address is undefined');
-    }
-    return address;
+    return EthAddress.fromString(await this.registry.read.getCanonicalRollup());
   }
 
   public async getGovernanceAddresses(): Promise<
     Pick<L1ContractAddresses, 'governanceProposerAddress' | 'governanceAddress'>
   > {
     const governanceAddress = await this.registry.read.getGovernance();
-    const governance = new GovernanceContract(governanceAddress, this.client, undefined);
-    const governanceProposer = await governance.getProposer();
+    const governance = new ReadOnlyGovernanceContract(governanceAddress, this.client);
+    const governanceProposerAddress = await governance.getGovernanceProposerAddress();
     return {
       governanceAddress: governance.address,
-      governanceProposerAddress: governanceProposer.address,
+      governanceProposerAddress: governanceProposerAddress,
     };
   }
 
   public static async collectAddresses(
-    client: ViemPublicClient,
+    client: ViemClient,
     registryAddress: Hex | EthAddress,
     rollupVersion: number | bigint | 'canonical',
   ): Promise<L1ContractAddresses> {
@@ -103,4 +108,24 @@ export class RegistryContract {
       coinIssuerAddress: EthAddress.fromString(coinIssuer),
     };
   }
+
+  public async getNumberOfVersions(): Promise<number> {
+    const version = await this.registry.read.numberOfVersions();
+    return Number(version);
+  }
+
+  public async getRollupVersions(): Promise<bigint[]> {
+    const count = await this.getNumberOfVersions();
+
+    const versions: bigint[] = [];
+    for (let i = 0; i < count; i++) {
+      versions.push(await this.registry.read.getVersion([BigInt(i)]));
+    }
+
+    return versions;
+  }
+
+  public async getRewardDistributor(): Promise<EthAddress> {
+    return EthAddress.fromString(await this.registry.read.getRewardDistributor());
+  }
 }