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

package/dest/contracts/empire_slashing_proposer.d.ts

@@ -0,0 +1,65 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import EventEmitter from 'events';
+import { type Hex, type Log, type TypedDataDefinition } from 'viem';
+import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
+import type { ViemClient } from '../types.js';
+import { type IEmpireBase } from './empire_base.js';
+export declare class ProposalAlreadyExecutedError extends Error {
+    constructor(round: bigint);
+}
+export declare class EmpireSlashingProposerContract extends EventEmitter implements IEmpireBase {
+    readonly client: ViemClient;
+    private readonly logger;
+    private readonly proposer;
+    readonly type: "empire";
+    constructor(client: ViemClient, address: Hex | EthAddress);
+    get address(): EthAddress;
+    getQuorumSize(): Promise<bigint>;
+    getRoundSize(): Promise<bigint>;
+    getLifetimeInRounds(): Promise<bigint>;
+    getExecutionDelayInRounds(): Promise<bigint>;
+    getCurrentRound(): Promise<bigint>;
+    computeRound(slot: bigint): Promise<bigint>;
+    getInstance(): Promise<`0x${string}`>;
+    getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{
+        lastSignalSlot: bigint;
+        payloadWithMostSignals: Hex;
+        executed: boolean;
+    }>;
+    getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint>;
+    createSignalRequest(payload: Hex): L1TxRequest;
+    createSignalRequestWithSignature(payload: Hex, slot: bigint, chainId: number, signerAddress: Hex, signer: (msg: TypedDataDefinition) => Promise<Hex>): Promise<L1TxRequest>;
+    listenToSubmittablePayloads(callback: (args: {
+        payload: `0x${string}`;
+        round: bigint;
+    }) => unknown): import("viem").WatchContractEventReturnType;
+    listenToPayloadSubmitted(callback: (args: {
+        round: bigint;
+        payload: `0x${string}`;
+    }) => unknown): import("viem").WatchContractEventReturnType;
+    listenToSignalCasted(callback: (args: {
+        round: bigint;
+        payload: `0x${string}`;
+        signaler: `0x${string}`;
+    }) => unknown): import("viem").WatchContractEventReturnType;
+    /** Creates an L1TxRequest to submit the round winner for the given round. */
+    buildExecuteRoundRequest(round: bigint): L1TxRequest;
+    /** Tries to extract a PayloadSubmitted event from the given logs. */
+    tryExtractPayloadSubmittedEvent(logs: Log[]): {
+        eventName: "PayloadSubmitted";
+        args: {
+            payload: `0x${string}`;
+            round: bigint;
+        };
+    } | undefined;
+    /**
+     * Wait for a round to be reached.
+     *
+     * @param round - The round to wait for.
+     * @param pollingIntervalSeconds - The interval in seconds to poll for the round.
+     * @returns True if the round was reached, false otherwise.
+     */
+    waitForRound(round: bigint, pollingIntervalSeconds?: number): Promise<boolean>;
+    executeRound(txUtils: L1TxUtils, round: bigint | number): ReturnType<typeof txUtils.sendAndMonitorTransaction>;
+}
+//# sourceMappingURL=empire_slashing_proposer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"empire_slashing_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/empire_slashing_proposer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAK3D,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAGL,KAAK,GAAG,EACR,KAAK,GAAG,EACR,KAAK,mBAAmB,EAGzB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,KAAK,WAAW,EAA8D,MAAM,kBAAkB,CAAC;AAEhH,qBAAa,4BAA6B,SAAQ,KAAK;gBACzC,KAAK,EAAE,MAAM;CAG1B;AAED,qBAAa,8BAA+B,SAAQ,YAAa,YAAW,WAAW;aAOnE,MAAM,EAAE,UAAU;IANpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+D;IACtF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsE;IAE/F,SAAgB,IAAI,EAAG,QAAQ,CAAU;gBAGvB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU;IAU3B,IAAW,OAAO,eAEjB;IAEM,aAAa;IAIb,YAAY;IAIZ,mBAAmB;IAInB,yBAAyB;IAIzB,eAAe;IAIf,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI3C,WAAW;IAIL,YAAY,CACvB,aAAa,EAAE,GAAG,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,sBAAsB,EAAE,GAAG,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IAI/E,iBAAiB,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,WAAW;IAOxC,gCAAgC,CAC3C,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,GACjD,OAAO,CAAC,WAAW,CAAC;IAehB,2BAA2B,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO;IAiBlG,wBAAwB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO;IAgB/F,oBAAoB,CACzB,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;QAAC,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAA;KAAE,KAAK,OAAO;IAiBjG,6EAA6E;IACtE,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAW3D,qEAAqE;IAC9D,+BAA+B,CAAC,IAAI,EAAE,GAAG,EAAE;;;;;;;IAIlD;;;;;;OAMG;IACI,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAsB,GAAE,MAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAe3E,YAAY,CACvB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,MAAM,GAAG,MAAM,GACrB,UAAU,CAAC,OAAO,OAAO,CAAC,yBAAyB,CAAC;CAiDxD"}

package/dest/contracts/empire_slashing_proposer.js

@@ -0,0 +1,194 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+import { EmpireSlashingProposerAbi } from '@aztec/l1-artifacts/EmpireSlashingProposerAbi';
+import EventEmitter from 'events';
+import { encodeFunctionData, getContract } from 'viem';
+import { FormattedViemError, tryExtractEvent } from '../utils.js';
+import { encodeSignal, encodeSignalWithSignature, signSignalWithSig } from './empire_base.js';
+export class ProposalAlreadyExecutedError extends Error {
+    constructor(round){
+        super(`Proposal already executed: ${round}`);
+    }
+}
+export class EmpireSlashingProposerContract extends EventEmitter {
+    client;
+    logger;
+    proposer;
+    type;
+    constructor(client, address){
+        super(), this.client = client, this.logger = createLogger('ethereum:contracts:empire_slashing_proposer'), this.type = 'empire';
+        this.proposer = getContract({
+            address: typeof address === 'string' ? address : address.toString(),
+            abi: EmpireSlashingProposerAbi,
+            client
+        });
+    }
+    get address() {
+        return EthAddress.fromString(this.proposer.address);
+    }
+    getQuorumSize() {
+        return this.proposer.read.QUORUM_SIZE();
+    }
+    getRoundSize() {
+        return this.proposer.read.ROUND_SIZE();
+    }
+    getLifetimeInRounds() {
+        return this.proposer.read.LIFETIME_IN_ROUNDS();
+    }
+    getExecutionDelayInRounds() {
+        return this.proposer.read.EXECUTION_DELAY_IN_ROUNDS();
+    }
+    getCurrentRound() {
+        return this.proposer.read.getCurrentRound();
+    }
+    computeRound(slot) {
+        return this.proposer.read.computeRound([
+            slot
+        ]);
+    }
+    getInstance() {
+        return this.proposer.read.getInstance();
+    }
+    async getRoundInfo(rollupAddress, round) {
+        return await this.proposer.read.getRoundData([
+            rollupAddress,
+            round
+        ]);
+    }
+    getPayloadSignals(rollupAddress, round, payload) {
+        return this.proposer.read.signalCount([
+            rollupAddress,
+            round,
+            payload
+        ]);
+    }
+    createSignalRequest(payload) {
+        return {
+            to: this.address.toString(),
+            data: encodeSignal(payload)
+        };
+    }
+    async createSignalRequestWithSignature(payload, slot, chainId, signerAddress, signer) {
+        const signature = await signSignalWithSig(signer, payload, slot, await this.getInstance(), this.address.toString(), chainId);
+        return {
+            to: this.address.toString(),
+            data: encodeSignalWithSignature(payload, signature)
+        };
+    }
+    listenToSubmittablePayloads(callback) {
+        return this.proposer.watchEvent.PayloadSubmittable({}, {
+            strict: true,
+            onLogs: (logs)=>{
+                for (const log of logs){
+                    const { payload, round } = log.args;
+                    if (payload && round) {
+                        callback({
+                            payload,
+                            round
+                        });
+                    }
+                }
+            }
+        });
+    }
+    listenToPayloadSubmitted(callback) {
+        return this.proposer.watchEvent.PayloadSubmitted({}, {
+            onLogs: (logs)=>{
+                for (const log of logs){
+                    const { payload, round } = log.args;
+                    if (round && payload) {
+                        callback({
+                            round,
+                            payload
+                        });
+                    }
+                }
+            }
+        });
+    }
+    listenToSignalCasted(callback) {
+        return this.proposer.watchEvent.SignalCast({}, {
+            onLogs: (logs)=>{
+                for (const log of logs){
+                    const { round, payload, signaler } = log.args;
+                    if (round && payload && signaler) {
+                        callback({
+                            round,
+                            payload,
+                            signaler
+                        });
+                    }
+                }
+            }
+        });
+    }
+    /** Creates an L1TxRequest to submit the round winner for the given round. */ buildExecuteRoundRequest(round) {
+        return {
+            to: this.address.toString(),
+            data: encodeFunctionData({
+                abi: EmpireSlashingProposerAbi,
+                functionName: 'submitRoundWinner',
+                args: [
+                    round
+                ]
+            })
+        };
+    }
+    /** Tries to extract a PayloadSubmitted event from the given logs. */ tryExtractPayloadSubmittedEvent(logs) {
+        return tryExtractEvent(logs, this.address.toString(), EmpireSlashingProposerAbi, 'PayloadSubmitted');
+    }
+    /**
+   * Wait for a round to be reached.
+   *
+   * @param round - The round to wait for.
+   * @param pollingIntervalSeconds - The interval in seconds to poll for the round.
+   * @returns True if the round was reached, false otherwise.
+   */ waitForRound(round, pollingIntervalSeconds = 1) {
+        return retryUntil(async ()=>{
+            const currentRound = await this.proposer.read.getCurrentRound().catch((e)=>{
+                this.logger.error('Error getting current round', e);
+                return undefined;
+            });
+            return currentRound !== undefined && currentRound >= round;
+        }, `Waiting for round ${round} to be reached`, 0, pollingIntervalSeconds).catch(()=>false);
+    }
+    async executeRound(txUtils, round) {
+        if (typeof round === 'number') {
+            round = BigInt(round);
+        }
+        const args = {
+            abi: EmpireSlashingProposerAbi,
+            functionName: 'submitRoundWinner',
+            args: [
+                round
+            ]
+        };
+        const data = encodeFunctionData(args);
+        const response = await txUtils.sendAndMonitorTransaction({
+            to: this.address.toString(),
+            data
+        }, {
+            // Gas estimation is way off for this, likely because we are creating the contract/selector to call
+            // for the actual slashing dynamically.
+            gasLimitBufferPercentage: 50
+        }).catch((err)=>{
+            if (err instanceof FormattedViemError && err.message.includes('ProposalAlreadyExecuted')) {
+                throw new ProposalAlreadyExecutedError(round);
+            }
+            throw err;
+        });
+        if (response.receipt.status === 'reverted') {
+            const error = await txUtils.tryGetErrorFromRevertedTx(data, {
+                ...args,
+                address: this.address.toString()
+            }, undefined, []);
+            if (error?.includes('ProposalAlreadyExecuted')) {
+                throw new ProposalAlreadyExecutedError(round);
+            }
+            const errorMessage = `Failed to execute round ${round}, TxHash: ${response.receipt.transactionHash}, Error: ${error ?? 'Unknown error'}`;
+            throw new Error(errorMessage);
+        }
+        return response;
+    }
+}

package/dest/contracts/errors.d.ts

@@ -0,0 +1,7 @@
+export declare class BlockTagTooOldError extends Error {
+    constructor(blockTag: bigint | number, latestBlock: bigint | number);
+}
+export declare class NoCommitteeError extends Error {
+    constructor();
+}
+//# sourceMappingURL=errors.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/contracts/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM;CAIpE;AAED,qBAAa,gBAAiB,SAAQ,KAAK;;CAK1C"}

package/dest/contracts/errors.js

@@ -0,0 +1,12 @@
+export class BlockTagTooOldError extends Error {
+    constructor(blockTag, latestBlock){
+        super(`Block tag ${blockTag} is more than 128 blocks behind the latest block ${latestBlock}`);
+        this.name = 'BlockTagTooOldError';
+    }
+}
+export class NoCommitteeError extends Error {
+    constructor(){
+        super('The committee does not exist on L1');
+        this.name = 'NoCommitteeError';
+    }
+}

package/dest/contracts/fee_asset_handler.d.ts

@@ -0,0 +1,19 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { type Hex } from 'viem';
+import type { L1TxUtils } from '../l1_tx_utils/index.js';
+export declare class FeeAssetHandlerContract {
+    readonly txUtils: L1TxUtils;
+    address: EthAddress;
+    constructor(address: Hex | EthAddress, txUtils: L1TxUtils);
+    getOwner(): Promise<EthAddress>;
+    getMintAmount(): Promise<bigint>;
+    mint(recipient: Hex | EthAddress): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        state: import("../l1_tx_utils/types.js").L1TxState;
+    }>;
+    setMintAmount(amount: bigint): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        state: import("../l1_tx_utils/types.js").L1TxState;
+    }>;
+}
+//# sourceMappingURL=fee_asset_handler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fee_asset_handler.d.ts","sourceRoot":"","sources":["../../src/contracts/fee_asset_handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,KAAK,GAAG,EAAmC,MAAM,MAAM,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEzD,qBAAa,uBAAuB;aAKhB,OAAO,EAAE,SAAS;IAJ7B,OAAO,EAAE,UAAU,CAAC;gBAGzB,OAAO,EAAE,GAAG,GAAG,UAAU,EACT,OAAO,EAAE,SAAS;IAQvB,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IASrC,aAAa;IASb,IAAI,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU;;;;IAchC,aAAa,CAAC,MAAM,EAAE,MAAM;;;;CAUpC"}

package/dest/contracts/fee_asset_handler.js

@@ -0,0 +1,57 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts/FeeAssetHandlerAbi';
+import { encodeFunctionData, getContract } from 'viem';
+export class FeeAssetHandlerContract {
+    txUtils;
+    address;
+    constructor(address, txUtils){
+        this.txUtils = txUtils;
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
+        this.address = EthAddress.fromString(address);
+    }
+    async getOwner() {
+        const contract = getContract({
+            abi: FeeAssetHandlerAbi,
+            address: this.address.toString(),
+            client: this.txUtils.client
+        });
+        return EthAddress.fromString(await contract.read.owner());
+    }
+    getMintAmount() {
+        const contract = getContract({
+            abi: FeeAssetHandlerAbi,
+            address: this.address.toString(),
+            client: this.txUtils.client
+        });
+        return contract.read.mintAmount();
+    }
+    mint(recipient) {
+        if (recipient instanceof EthAddress) {
+            recipient = recipient.toString();
+        }
+        return this.txUtils.sendAndMonitorTransaction({
+            to: this.address.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetHandlerAbi,
+                functionName: 'mint',
+                args: [
+                    recipient
+                ]
+            })
+        });
+    }
+    setMintAmount(amount) {
+        return this.txUtils.sendAndMonitorTransaction({
+            to: this.address.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetHandlerAbi,
+                functionName: 'setMintAmount',
+                args: [
+                    amount
+                ]
+            })
+        });
+    }
+}

package/dest/contracts/fee_juice.d.ts

@@ -1,13 +1,12 @@
 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 | EthAddress, client: ViemClient);
     get address(): EthAddress;
+    getOwner(): Promise<EthAddress>;
     private assertWalletFeeJuice;
     mint(to: Hex, amount: bigint): Promise<void>;
     approve(spender: 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;IAM5B,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM;CAKlD"}
+{"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;aAKT,MAAM,EAAE,UAAU;IAJpC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAwD;gBAGvF,OAAO,EAAE,GAAG,GAAG,UAAU,EACT,MAAM,EAAE,UAAU;IAQpC,IAAW,OAAO,eAEjB;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC;IAI5C,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,32 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { TestERC20Abi as FeeJuiceAbi } from '@aztec/l1-artifacts';
+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;
+        if (address instanceof EthAddress) {
+            address = address.toString();
+        }
+        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);
+    }
+    async getOwner() {
+        return EthAddress.fromString(await this.feeJuiceContract.read.owner());
     }
     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,9 +34,13 @@ export class FeeJuiceContract {
             to,
             amount
         ]);
-        await this.publicClient.waitForTransactionReceipt({
+        const receipt = await this.client.waitForTransactionReceipt({
             hash: tx
         });
+        if (receipt.status === 'success') {
+            return;
+        }
+        throw new Error('Mint failed');
     }
     async approve(spender, amount) {
         const walletFeeJuice = this.assertWalletFeeJuice();
@@ -45,8 +48,12 @@ export class FeeJuiceContract {
             spender,
             amount
         ]);
-        await this.publicClient.waitForTransactionReceipt({
+        const receipt = await this.client.waitForTransactionReceipt({
             hash: tx
         });
+        if (receipt.status === 'success') {
+            return;
+        }
+        throw new Error('Approve failed');
     }
 }

package/dest/contracts/governance.d.ts

@@ -1,9 +1,9 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
-import { type Hex } 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 { GovernanceProposerContract } from './governance_proposer.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,45 +15,46 @@ export declare enum ProposalState {
     Dropped = 6,
     Expired = 7
 }
-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 function extractProposalIdFromLogs(logs: Log[]): bigint;
+export declare class ReadOnlyGovernanceContract {
+    readonly client: ViemClient;
+    protected readonly governanceContract: GetContractReturnType<typeof GovernanceAbi, ViemClient>;
+    constructor(address: Hex, client: ViemClient);
     get address(): EthAddress;
-    getProposer(): Promise<GovernanceProposerContract>;
-    getGovernanceAddresses(): Promise<L1GovernanceContractAddresses>;
+    getGovernanceProposerAddress(): Promise<EthAddress>;
+    getConfiguration(): Promise<{
+        proposeConfig: {
+            lockDelay: bigint;
+            lockAmount: bigint;
+        };
+        votingDelay: bigint;
+        votingDuration: bigint;
+        executionDelay: bigint;
+        gracePeriod: bigint;
+        quorum: bigint;
+        requiredYeaMargin: bigint;
+        minimumVotes: bigint;
+    }>;
     getProposal(proposalId: bigint): Promise<{
         config: {
-            proposeConfig: {
-                lockDelay: bigint;
-                lockAmount: bigint;
-            };
             votingDelay: bigint;
             votingDuration: bigint;
             executionDelay: bigint;
             gracePeriod: bigint;
             quorum: bigint;
-            voteDifferential: bigint;
+            requiredYeaMargin: bigint;
             minimumVotes: bigint;
         };
-        state: number;
+        cachedState: number;
         payload: `0x${string}`;
-        governanceProposer: `0x${string}`;
+        proposer: `0x${string}`;
         creation: bigint;
         summedBallot: {
             yea: bigint;
-            nea: bigint;
+            nay: bigint;
         };
     }>;
     getProposalState(proposalId: bigint): Promise<ProposalState>;
-    private assertWalletGovernance;
-    deposit(onBehalfOf: Hex, amount: bigint): Promise<void>;
-    proposeWithLock({ payloadAddress, withdrawAddress, }: {
-        payloadAddress: Hex;
-        withdrawAddress: Hex;
-    }): Promise<number>;
     awaitProposalActive({ proposalId, logger }: {
         proposalId: bigint;
         logger: Logger;
@@ -62,6 +63,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 | EthAddress, 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,EAGT,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAEvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,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,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,WAAW;IAKX,sBAAsB,IAAI,OAAO,CAAC,6BAA6B,CAAC;IActE,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;IAYN,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;aAKnB,MAAM,EAAE,UAAU;IAJpC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC;gBAG7F,OAAO,EAAE,GAAG,EACI,MAAM,EAAE,UAAU;IAKpC,IAAW,OAAO,eAEjB;IAEY,4BAA4B;IAIlC,gBAAgB;;;;;;;;;;;;;IAIhB,WAAW,CAAC,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;IAIxB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAS5D,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;aAKrC,MAAM,EAAE,wBAAwB;IAJ3D,mBAA4B,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,aAAa,EAAE,wBAAwB,CAAC,CAAC;gBAGpH,OAAO,EAAE,GAAG,GAAG,UAAU,EACA,MAAM,EAAE,wBAAwB;IAY9C,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"}