@aztec/ethereum 0.85.0 → 0.86.0

package/dest/client.d.ts

@@ -1,5 +1,6 @@
 import type { Logger } from '@aztec/foundation/log';
-import type { ViemPublicClient } from './types.js';
+import { type Chain, type HDAccount, type LocalAccount, type PrivateKeyAccount } from 'viem';
+import type { ExtendedViemWalletClient, ViemPublicClient } from './types.js';
 type Config = {
     /** The RPC Url of the ethereum host. */
     l1RpcUrls: string[];
@@ -13,4 +14,5 @@ export type { Config as EthereumClientConfig };
 export declare function getPublicClient(config: Config): ViemPublicClient;
 /** Returns a viem public client after waiting for the L1 RPC node to become available. */
 export declare function waitForPublicClient(config: Config, logger?: Logger): Promise<ViemPublicClient>;
+export declare function createExtendedL1Client(rpcUrls: string[], mnemonicOrPrivateKeyOrHdAccount: string | `0x${string}` | HDAccount | PrivateKeyAccount | LocalAccount, chain?: Chain, pollingIntervalMS?: number, addressIndex?: number): ExtendedViemWalletClient;
 //# sourceMappingURL=client.d.ts.map

package/dest/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAMpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,KAAK,MAAM,GAAG;IACZ,wCAAwC;IACxC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAI/C,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAOhE;AAED,0FAA0F;AAC1F,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIpG"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EACL,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAMvB,MAAM,MAAM,CAAC;AAKd,OAAO,KAAK,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,MAAM,GAAG;IACZ,wCAAwC;IACxC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,YAAY,EAAE,MAAM,IAAI,oBAAoB,EAAE,CAAC;AAI/C,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAOhE;AAED,0FAA0F;AAC1F,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIpG;AAyBD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EAAE,EACjB,+BAA+B,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,GAAG,SAAS,GAAG,iBAAiB,GAAG,YAAY,EACtG,KAAK,GAAE,KAAe,EACtB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,YAAY,CAAC,EAAE,MAAM,GACpB,wBAAwB,CAgB1B"}

package/dest/client.js

@@ -1,5 +1,7 @@
 import { retryUntil } from '@aztec/foundation/retry';
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient, createWalletClient, fallback, http, publicActions } from 'viem';
+import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { foundry } from 'viem/chains';
 import { createEthereumChain } from './chain.js';
 // TODO: Use these methods to abstract the creation of viem clients.
 /** Returns a viem public client given the L1 config. */ export function getPublicClient(config) {
@@ -29,3 +31,15 @@ async function waitForRpc(client, config, logger) {
         throw new Error(`Ethereum node at ${config.l1RpcUrls.join(', ')} has chain ID ${l1ChainId} but expected ${config.l1ChainId}`);
     }
 }
+export function createExtendedL1Client(rpcUrls, mnemonicOrPrivateKeyOrHdAccount, chain = foundry, pollingIntervalMS, addressIndex) {
+    const hdAccount = typeof mnemonicOrPrivateKeyOrHdAccount === 'string' ? mnemonicOrPrivateKeyOrHdAccount.startsWith('0x') ? privateKeyToAccount(mnemonicOrPrivateKeyOrHdAccount) : mnemonicToAccount(mnemonicOrPrivateKeyOrHdAccount, {
+        addressIndex
+    }) : mnemonicOrPrivateKeyOrHdAccount;
+    const extendedClient = createWalletClient({
+        account: hdAccount,
+        chain,
+        transport: fallback(rpcUrls.map((url)=>http(url))),
+        pollingInterval: pollingIntervalMS
+    }).extend(publicActions);
+    return extendedClient;
+}

package/dest/contracts/fee_asset_handler.js

@@ -12,7 +12,7 @@ export class FeeAssetHandlerContract {
         const contract = getContract({
             abi: FeeAssetHandlerAbi,
             address: this.address.toString(),
-            client: this.txUtils.publicClient
+            client: this.txUtils.client
         });
         return contract.read.mintAmount();
     }

package/dest/contracts/fee_juice.d.ts

@@ -1,12 +1,10 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Hex } from 'viem';
-import type { L1Clients } from '../types.js';
+import { type ViemClient } from '../types.js';
 export declare class FeeJuiceContract {
-    readonly publicClient: L1Clients['publicClient'];
-    readonly walletClient: L1Clients['walletClient'] | undefined;
-    private readonly publicFeeJuice;
-    private readonly walletFeeJuice;
-    constructor(address: Hex, publicClient: L1Clients['publicClient'], walletClient: L1Clients['walletClient'] | undefined);
+    readonly client: ViemClient;
+    private readonly feeJuiceContract;
+    constructor(address: Hex, client: ViemClient);
     get address(): EthAddress;
     private assertWalletFeeJuice;
     mint(to: Hex, amount: bigint): Promise<void>;

package/dest/contracts/fee_juice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee_juice.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_juice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,qBAAa,gBAAgB;aAMT,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC;aACvC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS;IANrE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuE;IACtG,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmF;gBAGhH,OAAO,EAAE,GAAG,EACI,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,EACvC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS;IAMrE,IAAW,OAAO,eAEjB;IAED,OAAO,CAAC,oBAAoB;IAOf,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAW5B,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;CAUlD"}
+{"version":3,"file":"fee_juice.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_juice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,EAAiC,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAE/F,qBAAa,gBAAgB;aAGe,MAAM,EAAE,UAAU;IAF5D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwD;gBAE7E,OAAO,EAAE,GAAG,EAAkB,MAAM,EAAE,UAAU;IAI5D,IAAW,OAAO,eAEjB;IAED,OAAO,CAAC,oBAAoB;IAOf,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAW5B,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;CAUlD"}

package/dest/contracts/fee_juice.js

@@ -1,33 +1,26 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestERC20Abi as FeeJuiceAbi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { getContract } from 'viem';
+import { isExtendedClient } from '../types.js';
 export class FeeJuiceContract {
-    publicClient;
-    walletClient;
-    publicFeeJuice;
-    walletFeeJuice;
-    constructor(address, publicClient, walletClient){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
-        this.publicFeeJuice = getContract({
+    client;
+    feeJuiceContract;
+    constructor(address, client){
+        this.client = client;
+        this.feeJuiceContract = getContract({
             address,
             abi: FeeJuiceAbi,
-            client: publicClient
+            client
         });
-        this.walletFeeJuice = walletClient ? getContract({
-            address,
-            abi: FeeJuiceAbi,
-            client: walletClient
-        }) : undefined;
     }
     get address() {
-        return EthAddress.fromString(this.publicFeeJuice.address);
+        return EthAddress.fromString(this.feeJuiceContract.address);
     }
     assertWalletFeeJuice() {
-        if (!this.walletFeeJuice) {
+        if (!isExtendedClient(this.client)) {
             throw new Error('Wallet client is required for this operation');
         }
-        return this.walletFeeJuice;
+        return this.feeJuiceContract;
     }
     async mint(to, amount) {
         const walletFeeJuice = this.assertWalletFeeJuice();
@@ -35,7 +28,7 @@ export class FeeJuiceContract {
             to,
             amount
         ]);
-        const receipt = await this.publicClient.waitForTransactionReceipt({
+        const receipt = await this.client.waitForTransactionReceipt({
             hash: tx
         });
         if (receipt.status === 'success') {
@@ -49,7 +42,7 @@ export class FeeJuiceContract {
             spender,
             amount
         ]);
-        const receipt = await this.publicClient.waitForTransactionReceipt({
+        const receipt = await this.client.waitForTransactionReceipt({
             hash: tx
         });
         if (receipt.status === 'success') {

package/dest/contracts/forwarder.d.ts

@@ -1,14 +1,14 @@
 import type { Logger } from '@aztec/foundation/log';
 import { type Hex } from 'viem';
 import type { L1BlobInputs, L1GasConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
-import type { L1Clients, ViemPublicClient, ViemWalletClient } from '../types.js';
+import type { ExtendedViemWalletClient } from '../types.js';
 export declare class ForwarderContract {
-    readonly client: L1Clients['publicClient'];
+    readonly client: ExtendedViemWalletClient;
     readonly rollupAddress: Hex;
     private readonly forwarder;
-    constructor(client: L1Clients['publicClient'], address: Hex, rollupAddress: Hex);
+    constructor(client: ExtendedViemWalletClient, address: Hex, rollupAddress: Hex);
     static expectedAddress(owner: Hex): `0x${string}`;
-    static create(owner: Hex, walletClient: ViemWalletClient, publicClient: ViemPublicClient, logger: Logger, rollupAddress: Hex): Promise<ForwarderContract>;
+    static create(owner: Hex, l1Client: ExtendedViemWalletClient, logger: Logger, rollupAddress: Hex): Promise<ForwarderContract>;
     getAddress(): `0x${string}`;
     forward(requests: L1TxRequest[], l1TxUtils: L1TxUtils, gasConfig: L1GasConfig | undefined, blobConfig: L1BlobInputs | undefined, logger: Logger): Promise<{
         receipt: import("viem").TransactionReceipt;

package/dest/contracts/forwarder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../../src/contracts/forwarder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAGL,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGjF,qBAAa,iBAAiB;aAGA,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC;aAAgC,aAAa,EAAE,GAAG;IAF/G,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+D;gBAE7D,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAkB,aAAa,EAAE,GAAG;IAI/G,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG;WAKpB,MAAM,CACjB,KAAK,EAAE,GAAG,EACV,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,GAAG;IAwBb,UAAU;IAIJ,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,MAAM,EAAE,MAAM;;;;;;;;;;;CAqEjB"}
+{"version":3,"file":"forwarder.d.ts","sourceRoot":"","sources":["../../src/contracts/forwarder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAGL,KAAK,GAAG,EAGT,MAAM,MAAM,CAAC;AAGd,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,wBAAwB,EAAc,MAAM,aAAa,CAAC;AAGxE,qBAAa,iBAAiB;aAGA,MAAM,EAAE,wBAAwB;aAAgC,aAAa,EAAE,GAAG;IAF9G,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAyD;gBAEvD,MAAM,EAAE,wBAAwB,EAAE,OAAO,EAAE,GAAG,EAAkB,aAAa,EAAE,GAAG;IAI9G,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG;WAKpB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG;IAsB/F,UAAU;IAIJ,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,MAAM,EAAE,MAAM;;;;;;;;;;;CAqEjB"}

package/dest/contracts/forwarder.js

@@ -23,18 +23,18 @@ export class ForwarderContract {
         ], owner);
         return address;
     }
-    static async create(owner, walletClient, publicClient, logger, rollupAddress) {
+    static async create(owner, l1Client, logger, rollupAddress) {
         logger.info('Deploying forwarder contract');
-        const { address, txHash } = await deployL1Contract(walletClient, publicClient, ForwarderAbi, ForwarderBytecode, [
+        const { address, txHash } = await deployL1Contract(l1Client, ForwarderAbi, ForwarderBytecode, [
             owner
         ], owner, undefined, logger);
         if (txHash) {
-            await publicClient.waitForTransactionReceipt({
+            await l1Client.waitForTransactionReceipt({
                 hash: txHash
             });
         }
         logger.info(`Forwarder contract deployed at ${address} with owner ${owner}`);
-        return new ForwarderContract(publicClient, address.toString(), rollupAddress);
+        return new ForwarderContract(l1Client, address.toString(), rollupAddress);
     }
     getAddress() {
         return this.forwarder.address;

package/dest/contracts/governance.d.ts

@@ -1,8 +1,9 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
-import { type Hex, type Log } from 'viem';
+import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
+import { type GetContractReturnType, type Hex, type Log } from 'viem';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { ViemPublicClient, ViemWalletClient } from '../types.js';
+import { type ExtendedViemWalletClient, type ViemClient } from '../types.js';
 export type L1GovernanceContractAddresses = Pick<L1ContractAddresses, 'governanceAddress' | 'rollupAddress' | 'registryAddress' | 'governanceProposerAddress'>;
 export declare enum ProposalState {
     Pending = 0,
@@ -15,12 +16,10 @@ export declare enum ProposalState {
     Expired = 7
 }
 export declare function extractProposalIdFromLogs(logs: Log[]): bigint;
-export declare class GovernanceContract {
-    readonly publicClient: ViemPublicClient;
-    readonly walletClient: ViemWalletClient | undefined;
-    private readonly publicGovernance;
-    private readonly walletGovernance;
-    constructor(address: Hex, publicClient: ViemPublicClient, walletClient: ViemWalletClient | undefined);
+export declare class ReadOnlyGovernanceContract {
+    readonly client: ViemClient;
+    protected readonly governanceContract: GetContractReturnType<typeof GovernanceAbi, ViemClient>;
+    constructor(address: Hex, client: ViemClient);
     get address(): EthAddress;
     getGovernanceProposerAddress(): Promise<EthAddress>;
     getConfiguration(): Promise<{
@@ -60,12 +59,6 @@ export declare class GovernanceContract {
         };
     }>;
     getProposalState(proposalId: bigint): Promise<ProposalState>;
-    private assertWalletGovernance;
-    deposit(onBehalfOf: Hex, amount: bigint): Promise<void>;
-    proposeWithLock({ payloadAddress, withdrawAddress, }: {
-        payloadAddress: Hex;
-        withdrawAddress: Hex;
-    }): Promise<bigint>;
     awaitProposalActive({ proposalId, logger }: {
         proposalId: bigint;
         logger: Logger;
@@ -74,6 +67,16 @@ export declare class GovernanceContract {
         proposalId: bigint;
         logger: Logger;
     }): Promise<void>;
+}
+export declare class GovernanceContract extends ReadOnlyGovernanceContract {
+    readonly client: ExtendedViemWalletClient;
+    protected readonly governanceContract: GetContractReturnType<typeof GovernanceAbi, ExtendedViemWalletClient>;
+    constructor(address: Hex, client: ExtendedViemWalletClient);
+    deposit(onBehalfOf: Hex, amount: bigint): Promise<void>;
+    proposeWithLock({ payloadAddress, withdrawAddress, }: {
+        payloadAddress: Hex;
+        withdrawAddress: Hex;
+    }): Promise<bigint>;
     getPower(): Promise<bigint>;
     vote({ proposalId, voteAmount, inFavor, retries, logger, }: {
         proposalId: bigint;

package/dest/contracts/governance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governance.d.ts","sourceRoot":"","sources":["../../src/contracts/governance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,GAAG,EAIT,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEtE,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,mBAAmB,EACnB,mBAAmB,GAAG,eAAe,GAAG,iBAAiB,GAAG,2BAA2B,CACxF,CAAC;AAGF,oBAAY,aAAa;IACvB,OAAO,IAAA;IACP,MAAM,IAAA;IACN,MAAM,IAAA;IACN,UAAU,IAAA;IACV,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAW7D;AAED,qBAAa,kBAAkB;aAMX,YAAY,EAAE,gBAAgB;aAC9B,YAAY,EAAE,gBAAgB,GAAG,SAAS;IAN5D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAgE;IACjG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA4E;gBAG3G,OAAO,EAAE,GAAG,EACI,YAAY,EAAE,gBAAgB,EAC9B,YAAY,EAAE,gBAAgB,GAAG,SAAS;IAQ5D,IAAW,OAAO,eAEjB;IAEY,4BAA4B;IAIlC,gBAAgB;;;;;;;;;;;;;IAIhB,WAAW,CAAC,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;IAIxB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAQzE,OAAO,CAAC,sBAAsB;IAOjB,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAMvC,eAAe,CAAC,EAC3B,cAAc,EACd,eAAe,GAChB,EAAE;QACD,cAAc,EAAE,GAAG,CAAC;QACpB,eAAe,EAAE,GAAG,CAAC;KACtB,GAAG,OAAO,CAAC,MAAM,CAAC;IAUN,mBAAmB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAsBlF,uBAAuB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IA2BtF,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAM3B,IAAI,CAAC,EAChB,UAAU,EACV,UAAU,EACV,OAAO,EACP,OAAY,EACZ,MAAM,GACP,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB;IAkDY,eAAe,CAAC,EAC3B,UAAU,EACV,OAAY,EACZ,MAAM,GACP,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB;CA2CF"}
+{"version":3,"file":"governance.d.ts","sourceRoot":"","sources":["../../src/contracts/governance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,GAAG,EACR,KAAK,GAAG,EAIT,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,EAAE,KAAK,wBAAwB,EAAE,KAAK,UAAU,EAAoB,MAAM,aAAa,CAAC;AAE/F,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,mBAAmB,EACnB,mBAAmB,GAAG,eAAe,GAAG,iBAAiB,GAAG,2BAA2B,CACxF,CAAC;AAGF,oBAAY,aAAa;IACvB,OAAO,IAAA;IACP,MAAM,IAAA;IACN,MAAM,IAAA;IACN,UAAU,IAAA;IACV,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,OAAO,IAAA;IACP,OAAO,IAAA;CACR;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAW7D;AAED,qBAAa,0BAA0B;aAGK,MAAM,EAAE,UAAU;IAF5D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC;gBAEnF,OAAO,EAAE,GAAG,EAAkB,MAAM,EAAE,UAAU;IAI5D,IAAW,OAAO,eAEjB;IAEY,4BAA4B;IAIlC,gBAAgB;;;;;;;;;;;;;IAIhB,WAAW,CAAC,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;IAIxB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAQ5D,mBAAmB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAsBlF,uBAAuB,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CA0BpG;AAED,qBAAa,kBAAmB,SAAQ,0BAA0B;aAGb,MAAM,EAAE,wBAAwB;IAFnF,mBAA4B,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,wBAAwB,CAAC,CAAC;gBAE1G,OAAO,EAAE,GAAG,EAA2B,MAAM,EAAE,wBAAwB;IAQtE,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;IAKvC,eAAe,CAAC,EAC3B,cAAc,EACd,eAAe,GAChB,EAAE;QACD,cAAc,EAAE,GAAG,CAAC;QACpB,eAAe,EAAE,GAAG,CAAC;KACtB,GAAG,OAAO,CAAC,MAAM,CAAC;IASN,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAK3B,IAAI,CAAC,EAChB,UAAU,EACV,UAAU,EACV,OAAO,EACP,OAAY,EACZ,MAAM,GACP,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB;IAiDY,eAAe,CAAC,EAC3B,UAAU,EACV,OAAY,EACZ,MAAM,GACP,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB;CA0CF"}

package/dest/contracts/governance.js

@@ -3,6 +3,7 @@ import { sleep } from '@aztec/foundation/sleep';
 import { GovernanceAbi } from '@aztec/l1-artifacts/GovernanceAbi';
 import { encodeFunctionData, getContract, parseEventLogs } from 'viem';
 import { L1TxUtils } from '../l1_tx_utils.js';
+import { isExtendedClient } from '../types.js';
 // NOTE: Must be kept in sync with DataStructures.ProposalState in l1-contracts
 export var ProposalState = /*#__PURE__*/ function(ProposalState) {
     ProposalState[ProposalState["Pending"] = 0] = "Pending";
@@ -26,41 +27,33 @@ export function extractProposalIdFromLogs(logs) {
     }
     return parsedLogs[0].args.proposalId;
 }
-export class GovernanceContract {
-    publicClient;
-    walletClient;
-    publicGovernance;
-    walletGovernance;
-    constructor(address, publicClient, walletClient){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
-        this.publicGovernance = getContract({
+export class ReadOnlyGovernanceContract {
+    client;
+    governanceContract;
+    constructor(address, client){
+        this.client = client;
+        this.governanceContract = getContract({
             address,
             abi: GovernanceAbi,
-            client: publicClient
+            client: client
         });
-        this.walletGovernance = walletClient ? getContract({
-            address,
-            abi: GovernanceAbi,
-            client: walletClient
-        }) : undefined;
     }
     get address() {
-        return EthAddress.fromString(this.publicGovernance.address);
+        return EthAddress.fromString(this.governanceContract.address);
     }
     async getGovernanceProposerAddress() {
-        return EthAddress.fromString(await this.publicGovernance.read.governanceProposer());
+        return EthAddress.fromString(await this.governanceContract.read.governanceProposer());
     }
     getConfiguration() {
-        return this.publicGovernance.read.getConfiguration();
+        return this.governanceContract.read.getConfiguration();
     }
     getProposal(proposalId) {
-        return this.publicGovernance.read.getProposal([
+        return this.governanceContract.read.getProposal([
             proposalId
         ]);
     }
     async getProposalState(proposalId) {
-        const state = await this.publicGovernance.read.getProposalState([
+        const state = await this.governanceContract.read.getProposalState([
             proposalId
         ]);
         if (state < 0 || state > 7) {
@@ -68,36 +61,6 @@ export class GovernanceContract {
         }
         return state;
     }
-    assertWalletGovernance() {
-        if (!this.walletGovernance) {
-            throw new Error('Wallet client is required for this operation');
-        }
-        return this.walletGovernance;
-    }
-    async deposit(onBehalfOf, amount) {
-        const walletGovernance = this.assertWalletGovernance();
-        const depositTx = await walletGovernance.write.deposit([
-            onBehalfOf,
-            amount
-        ]);
-        await this.publicClient.waitForTransactionReceipt({
-            hash: depositTx
-        });
-    }
-    async proposeWithLock({ payloadAddress, withdrawAddress }) {
-        const walletGovernance = this.assertWalletGovernance();
-        const proposeTx = await walletGovernance.write.proposeWithLock([
-            payloadAddress,
-            withdrawAddress
-        ]);
-        const receipt = await this.publicClient.waitForTransactionReceipt({
-            hash: proposeTx
-        });
-        if (receipt.status !== 'success') {
-            throw new Error(`Proposal failed: ${receipt.status}`);
-        }
-        return extractProposalIdFromLogs(receipt.logs);
-    }
     async awaitProposalActive({ proposalId, logger }) {
         const state = await this.getProposalState(proposalId);
         if (state === 1) {
@@ -107,7 +70,7 @@ export class GovernanceContract {
         } else {
             const proposal = await this.getProposal(proposalId);
             const startOfActive = proposal.creation + proposal.config.votingDelay;
-            const block = await this.publicClient.getBlock();
+            const block = await this.client.getBlock();
             // Add 12 seconds to the time to make sure we don't vote too early
             const secondsToActive = Number(startOfActive - block.timestamp) + 12;
             const now = new Date();
@@ -133,7 +96,7 @@ export class GovernanceContract {
         } else {
             const proposal = await this.getProposal(proposalId);
             const startOfExecutable = proposal.creation + proposal.config.votingDelay + proposal.config.votingDuration + proposal.config.executionDelay;
-            const block = await this.publicClient.getBlock();
+            const block = await this.client.getBlock();
             const secondsToExecutable = Number(startOfExecutable - block.timestamp) + 12;
             const now = new Date();
             logger.info(`
@@ -144,17 +107,52 @@ export class GovernanceContract {
             await sleep(secondsToExecutable * 1000);
         }
     }
+}
+export class GovernanceContract extends ReadOnlyGovernanceContract {
+    client;
+    governanceContract;
+    constructor(address, client){
+        super(address, client), this.client = client;
+        if (!isExtendedClient(client)) {
+            throw new Error('GovernanceContract has to be instantiated with a wallet client.');
+        }
+        this.governanceContract = getContract({
+            address,
+            abi: GovernanceAbi,
+            client
+        });
+    }
+    async deposit(onBehalfOf, amount) {
+        const depositTx = await this.governanceContract.write.deposit([
+            onBehalfOf,
+            amount
+        ]);
+        await this.client.waitForTransactionReceipt({
+            hash: depositTx
+        });
+    }
+    async proposeWithLock({ payloadAddress, withdrawAddress }) {
+        const proposeTx = await this.governanceContract.write.proposeWithLock([
+            payloadAddress,
+            withdrawAddress
+        ]);
+        const receipt = await this.client.waitForTransactionReceipt({
+            hash: proposeTx
+        });
+        if (receipt.status !== 'success') {
+            throw new Error(`Proposal failed: ${receipt.status}`);
+        }
+        return extractProposalIdFromLogs(receipt.logs);
+    }
     async getPower() {
-        const walletGovernance = this.assertWalletGovernance();
-        const now = await this.publicClient.getBlock();
-        return walletGovernance.read.powerAt([
-            this.walletClient.account.address,
+        const now = await this.client.getBlock();
+        return this.governanceContract.read.powerAt([
+            this.client.account.address,
             now.timestamp
         ]);
     }
     async vote({ proposalId, voteAmount, inFavor, retries = 10, logger }) {
-        const walletGovernance = this.assertWalletGovernance();
-        const l1TxUtils = new L1TxUtils(this.publicClient, this.walletClient, logger);
+        const l1TxUtils = new L1TxUtils(this.client, logger);
         const retryDelaySeconds = 12;
         voteAmount = voteAmount ?? await this.getPower();
         let success = false;
@@ -171,7 +169,7 @@ export class GovernanceContract {
                 };
                 const encodedVoteData = encodeFunctionData(voteFunctionData);
                 const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
-                    to: walletGovernance.address,
+                    to: this.governanceContract.address,
                     data: encodedVoteData
                 });
                 if (receipt.status === 'success') {
@@ -180,7 +178,7 @@ export class GovernanceContract {
                 } else {
                     const args = {
                         ...voteFunctionData,
-                        address: walletGovernance.address
+                        address: this.governanceContract.address
                     };
                     const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedVoteData, args, undefined, []);
                     logger.error(`Error voting on proposal ${proposalId}: ${errorMsg}`);
@@ -201,8 +199,7 @@ export class GovernanceContract {
         logger.info(`Proposal [${proposalId}] has summedBallot nea [${proposal.summedBallot.nea}]`);
     }
     async executeProposal({ proposalId, retries = 10, logger }) {
-        const walletGovernance = this.assertWalletGovernance();
-        const l1TxUtils = new L1TxUtils(this.publicClient, this.walletClient, logger);
+        const l1TxUtils = new L1TxUtils(this.client, logger);
         const retryDelaySeconds = 12;
         let success = false;
         for(let i = 0; i < retries; i++){
@@ -216,7 +213,7 @@ export class GovernanceContract {
                 };
                 const encodedExecuteData = encodeFunctionData(executeFunctionData);
                 const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
-                    to: walletGovernance.address,
+                    to: this.governanceContract.address,
                     data: encodedExecuteData
                 });
                 if (receipt.status === 'success') {
@@ -225,7 +222,7 @@ export class GovernanceContract {
                 } else {
                     const args = {
                         ...executeFunctionData,
-                        address: walletGovernance.address
+                        address: this.governanceContract.address
                     };
                     const errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedExecuteData, args, undefined, []);
                     logger.error(`Error executing proposal ${proposalId}: ${errorMsg}`);

package/dest/contracts/governance_proposer.d.ts

@@ -1,12 +1,12 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Hex, type TransactionReceipt } from 'viem';
 import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
-import type { ViemPublicClient } from '../types.js';
+import type { ViemClient } from '../types.js';
 import { type IEmpireBase } from './empire_base.js';
 export declare class GovernanceProposerContract implements IEmpireBase {
-    readonly client: ViemPublicClient;
+    readonly client: ViemClient;
     private readonly proposer;
-    constructor(client: ViemPublicClient, address: Hex);
+    constructor(client: ViemClient, address: Hex);
     get address(): EthAddress;
     getRollupAddress(): Promise<EthAddress>;
     getRegistryAddress(): Promise<EthAddress>;

package/dest/contracts/governance_proposer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAA8B,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAmC,MAAM,MAAM,CAAC;AAEtH,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,kBAAkB,CAAC;AAGhE,qBAAa,0BAA2B,YAAW,WAAW;aAGhC,MAAM,EAAE,gBAAgB;IAFpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwE;gBAErE,MAAM,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG;IAIlE,IAAW,OAAO,eAEjB;IAEY,gBAAgB;IAKhB,kBAAkB;IAIxB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrC,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IASzD,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOtC,eAAe,CAC1B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,QAAQ,EAAE,QAAQ,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CAYH"}
+{"version":3,"file":"governance_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/governance_proposer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAA8B,KAAK,GAAG,EAAE,KAAK,kBAAkB,EAAmC,MAAM,MAAM,CAAC;AAEtH,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,kBAAkB,CAAC;AAGhE,qBAAa,0BAA2B,YAAW,WAAW;aAGhC,MAAM,EAAE,UAAU;IAF9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkE;gBAE/D,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG;IAI5D,IAAW,OAAO,eAEjB;IAEY,gBAAgB;IAKhB,kBAAkB;IAIxB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAIhC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrC,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IASzD,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOtC,eAAe,CAC1B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC;QACT,OAAO,EAAE,kBAAkB,CAAC;QAC5B,QAAQ,EAAE,QAAQ,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CAYH"}

package/dest/contracts/registry.d.ts

@@ -1,12 +1,13 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Hex } from 'viem';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
-import type { L1Clients, ViemPublicClient } from '../types.js';
+import type { ViemClient } from '../types.js';
 export declare class RegistryContract {
-    readonly client: L1Clients['publicClient'];
+    readonly client: ViemClient;
     address: EthAddress;
+    private readonly log;
     private readonly registry;
-    constructor(client: L1Clients['publicClient'], address: Hex | EthAddress);
+    constructor(client: ViemClient, address: Hex | EthAddress);
     /**
      * 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).
@@ -19,7 +20,7 @@ export declare class RegistryContract {
      */
     getCanonicalAddress(): Promise<EthAddress>;
     getGovernanceAddresses(): Promise<Pick<L1ContractAddresses, 'governanceProposerAddress' | 'governanceAddress'>>;
-    static collectAddresses(client: ViemPublicClient, registryAddress: Hex | EthAddress, rollupVersion: number | bigint | 'canonical'): Promise<L1ContractAddresses>;
+    static collectAddresses(client: ViemClient, registryAddress: Hex | EthAddress, rollupVersion: number | bigint | 'canonical'): Promise<L1ContractAddresses>;
     getNumberOfVersions(): Promise<number>;
     getRollupVersions(): Promise<bigint[]>;
     getRewardDistributor(): Promise<EthAddress>;

package/dest/contracts/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/contracts/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAI3D,OAAO,EAGL,KAAK,GAAG,EAIT,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAI/D,qBAAa,gBAAgB;aAIC,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC;IAHtD,OAAO,EAAE,UAAU,CAAC;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgF;gBAE7E,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,UAAU;IAQxF;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAgB1F;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC;IAI1C,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E;WAUmB,gBAAgB,CAClC,MAAM,EAAE,gBAAgB,EACxB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC;IAyBlB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAWtC,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAGzD"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/contracts/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,EAA8B,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAEzE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI9C,qBAAa,gBAAgB;aAMC,MAAM,EAAE,UAAU;IALvC,OAAO,EAAE,UAAU,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA+C;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;gBAErD,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,GAAG,UAAU;IAQzE;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAwB1F;;;OAGG;IACU,mBAAmB,IAAI,OAAO,CAAC,UAAU,CAAC;IAI1C,sBAAsB,IAAI,OAAO,CAC5C,IAAI,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,mBAAmB,CAAC,CAC7E;WAUmB,gBAAgB,CAClC,MAAM,EAAE,UAAU,EAClB,eAAe,EAAE,GAAG,GAAG,UAAU,EACjC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW,GAC3C,OAAO,CAAC,mBAAmB,CAAC;IAyBlB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAWtC,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC;CAGzD"}

package/dest/contracts/registry.js

@@ -1,15 +1,18 @@
 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 { getContract } from 'viem';
-import { GovernanceContract } from './governance.js';
+import { ReadOnlyGovernanceContract } from './governance.js';
 import { RollupContract } from './rollup.js';
 export class RegistryContract {
     client;
     address;
+    log;
     registry;
     constructor(client, address){
         this.client = client;
+        this.log = createLogger('ethereum:contracts:registry');
         if (address instanceof EthAddress) {
             address = address.toString();
         }
@@ -35,6 +38,17 @@ export class RegistryContract {
             return EthAddress.fromString(await this.registry.read.getRollup([
                 version
             ]));
+        } catch (e) {
+            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 (e) {
             throw new Error('Rollup address is undefined');
         }
@@ -47,7 +61,7 @@ export class RegistryContract {
     }
     async getGovernanceAddresses() {
         const governanceAddress = await this.registry.read.getGovernance();
-        const governance = new GovernanceContract(governanceAddress, this.client, undefined);
+        const governance = new ReadOnlyGovernanceContract(governanceAddress, this.client);
         const governanceProposerAddress = await governance.getGovernanceProposerAddress();
         return {
             governanceAddress: governance.address,

package/dest/contracts/rollup.d.ts

@@ -7,27 +7,25 @@ import { type Account, type GetContractReturnType, type Hex } from 'viem';
 import type { DeployL1ContractsReturnType } from '../deploy_l1_contracts.js';
 import type { L1ContractAddresses } from '../l1_contract_addresses.js';
 import type { L1ReaderConfig } from '../l1_reader.js';
-import type { ViemPublicClient } from '../types.js';
+import type { ViemClient } from '../types.js';
 import { SlashingProposerContract } from './slashing_proposer.js';
 export type L1RollupContractAddresses = Pick<L1ContractAddresses, 'rollupAddress' | 'inboxAddress' | 'outboxAddress' | 'feeJuicePortalAddress' | 'feeJuiceAddress' | 'stakingAssetAddress' | 'rewardDistributorAddress' | 'slashFactoryAddress'>;
 export type EpochProofPublicInputArgs = {
     previousArchive: `0x${string}`;
     endArchive: `0x${string}`;
-    previousBlockHash: `0x${string}`;
-    endBlockHash: `0x${string}`;
     endTimestamp: bigint;
     outHash: `0x${string}`;
     proverId: `0x${string}`;
 };
 export declare class RollupContract {
-    readonly client: ViemPublicClient;
+    readonly client: ViemClient;
     private readonly rollup;
     static get checkBlobStorageSlot(): bigint;
     static getFromL1ContractsValues(deployL1ContractsValues: DeployL1ContractsReturnType): RollupContract;
     static getFromConfig(config: L1ReaderConfig): RollupContract;
-    constructor(client: ViemPublicClient, address: Hex | EthAddress);
+    constructor(client: ViemClient, address: Hex | EthAddress);
     get address(): `0x${string}`;
-    getContract(): GetContractReturnType<typeof RollupAbi, ViemPublicClient>;
+    getContract(): GetContractReturnType<typeof RollupAbi, ViemClient>;
     getSlashingProposer(): Promise<SlashingProposerContract>;
     getL1StartBlock(): Promise<bigint>;
     getL1GenesisTime(): Promise<bigint>;
@@ -57,7 +55,6 @@ export declare class RollupContract {
     getEpochCommittee(epoch: bigint): Promise<readonly `0x${string}`[]>;
     getBlock(blockNumber: bigint): Promise<{
         archive: `0x${string}`;
-        blockHash: `0x${string}`;
         slotNumber: bigint;
     }>;
     getTips(): Promise<{