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

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":"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"}

package/dest/contracts/empire_slashing_proposer.js

@@ -0,0 +1,209 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
+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([
+            BigInt(slot)
+        ]);
+    }
+    getInstance() {
+        return this.proposer.read.getInstance();
+    }
+    async getRoundInfo(rollupAddress, round) {
+        const result = await this.proposer.read.getRoundData([
+            rollupAddress,
+            round
+        ]);
+        const [signalCount, quorum] = await Promise.all([
+            this.proposer.read.signalCount([
+                rollupAddress,
+                round,
+                result.payloadWithMostSignals
+            ]),
+            this.getQuorumSize()
+        ]);
+        return {
+            lastSignalSlot: SlotNumber.fromBigInt(result.lastSignalSlot),
+            payloadWithMostSignals: result.payloadWithMostSignals,
+            quorumReached: signalCount >= quorum,
+            executed: result.executed
+        };
+    }
+    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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxxQkFBYSxtQkFBb0IsU0FBUSxLQUFLO0lBQzVDLFlBQVksUUFBUSxFQUFFLE1BQU0sR0FBRyxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sR0FBRyxNQUFNLEVBR2xFO0NBQ0Y7QUFFRCxxQkFBYSxnQkFBaUIsU0FBUSxLQUFLO0lBQ3pDLGNBR0M7Q0FDRiJ9

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;IAC5C,YAAY,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,EAGlE;CACF;AAED,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,cAGC;CACF"}

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,20 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { type Hex } from 'viem';
+import type { L1TxUtils } from '../l1_tx_utils/index.js';
+import type { ViemClient } from '../types.js';
+export declare class FeeAssetHandlerContract {
+    readonly client: ViemClient;
+    address: EthAddress;
+    constructor(client: ViemClient, address: Hex | EthAddress);
+    getOwner(): Promise<EthAddress>;
+    getMintAmount(): Promise<bigint>;
+    mint(txUtils: L1TxUtils, recipient: Hex | EthAddress): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        state: import("../l1_tx_utils/types.js").L1TxState;
+    }>;
+    setMintAmount(txUtils: L1TxUtils, amount: bigint): Promise<{
+        receipt: import("viem").TransactionReceipt;
+        state: import("../l1_tx_utils/types.js").L1TxState;
+    }>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2Fzc2V0X2hhbmRsZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdHMvZmVlX2Fzc2V0X2hhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRzNELE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBbUMsTUFBTSxNQUFNLENBQUM7QUFFakUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTlDLHFCQUFhLHVCQUF1QjthQUloQixNQUFNLEVBQUUsVUFBVTtJQUg3QixPQUFPLEVBQUUsVUFBVSxDQUFDO0lBRTNCLFlBQ2tCLE1BQU0sRUFBRSxVQUFVLEVBQ2xDLE9BQU8sRUFBRSxHQUFHLEdBQUcsVUFBVSxFQU0xQjtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLENBTzNDO0lBRU0sYUFBYSxvQkFPbkI7SUFFTSxJQUFJLENBQUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsR0FBRyxHQUFHLFVBQVU7OztPQVkxRDtJQUVNLGFBQWEsQ0FBQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNOzs7T0FTdEQ7Q0FDRiJ9

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;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,uBAAuB;aAIhB,MAAM,EAAE,UAAU;IAH7B,OAAO,EAAE,UAAU,CAAC;IAE3B,YACkB,MAAM,EAAE,UAAU,EAClC,OAAO,EAAE,GAAG,GAAG,UAAU,EAM1B;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CAO3C;IAEM,aAAa,oBAOnB;IAEM,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,GAAG,UAAU;;;OAY1D;IAEM,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM;;;OAStD;CACF"}

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 {
+    client;
+    address;
+    constructor(client, address){
+        this.client = client;
+        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.client
+        });
+        return EthAddress.fromString(await contract.read.owner());
+    }
+    getMintAmount() {
+        const contract = getContract({
+            abi: FeeAssetHandlerAbi,
+            address: this.address.toString(),
+            client: this.client
+        });
+        return contract.read.mintAmount();
+    }
+    mint(txUtils, recipient) {
+        if (recipient instanceof EthAddress) {
+            recipient = recipient.toString();
+        }
+        return txUtils.sendAndMonitorTransaction({
+            to: this.address.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetHandlerAbi,
+                functionName: 'mint',
+                args: [
+                    recipient
+                ]
+            })
+        });
+    }
+    setMintAmount(txUtils, amount) {
+        return txUtils.sendAndMonitorTransaction({
+            to: this.address.toString(),
+            data: encodeFunctionData({
+                abi: FeeAssetHandlerAbi,
+                functionName: 'setMintAmount',
+                args: [
+                    amount
+                ]
+            })
+        });
+    }
+}

package/dest/contracts/fee_juice.d.ts

@@ -1,15 +1,14 @@
 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>;
 }
-//# sourceMappingURL=fee_juice.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL2ZlZV9qdWljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFHM0QsT0FBTyxFQUE4QixLQUFLLEdBQUcsRUFBZSxNQUFNLE1BQU0sQ0FBQztBQUV6RSxPQUFPLEVBQWlDLEtBQUssVUFBVSxFQUFvQixNQUFNLGFBQWEsQ0FBQztBQUUvRixxQkFBYSxnQkFBZ0I7YUFLVCxNQUFNLEVBQUUsVUFBVTtJQUpwQyxPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUF3RDtJQUV6RixZQUNFLE9BQU8sRUFBRSxHQUFHLEdBQUcsVUFBVSxFQUNULE1BQU0sRUFBRSxVQUFVLEVBTW5DO0lBRUQsSUFBVyxPQUFPLGVBRWpCO0lBRVksUUFBUSxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FFM0M7SUFFRCxPQUFPLENBQUMsb0JBQW9CO0lBT2YsSUFBSSxDQUFDLEVBQUUsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBU3hDO0lBRVksT0FBTyxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBU2hEO0NBQ0YifQ==

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;IAEzF,YACE,OAAO,EAAE,GAAG,GAAG,UAAU,EACT,MAAM,EAAE,UAAU,EAMnC;IAED,IAAW,OAAO,eAEjB;IAEY,QAAQ,IAAI,OAAO,CAAC,UAAU,CAAC,CAE3C;IAED,OAAO,CAAC,oBAAoB;IAOf,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBASxC;IAEY,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAShD;CACF"}

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<{
+        executionDelay: bigint;
+        gracePeriod: bigint;
+        minimumVotes: bigint;
+        proposeConfig: {
+            lockAmount: bigint;
+            lockDelay: bigint;
+        };
+        quorum: bigint;
+        requiredYeaMargin: bigint;
+        votingDelay: bigint;
+        votingDuration: bigint;
+    }>;
     getProposal(proposalId: bigint): Promise<{
+        cachedState: number;
         config: {
-            proposeConfig: {
-                lockDelay: bigint;
-                lockAmount: bigint;
-            };
-            votingDelay: bigint;
-            votingDuration: bigint;
             executionDelay: bigint;
             gracePeriod: bigint;
-            quorum: bigint;
-            voteDifferential: bigint;
             minimumVotes: bigint;
+            quorum: bigint;
+            requiredYeaMargin: bigint;
+            votingDelay: bigint;
+            votingDuration: bigint;
         };
-        state: number;
-        payload: `0x${string}`;
-        governanceProposer: `0x${string}`;
         creation: bigint;
+        payload: `0x${string}`;
+        proposer: `0x${string}`;
         summedBallot: {
+            nay: bigint;
             yea: bigint;
-            nea: 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,18 +63,28 @@ 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, }: {
+    vote({ proposalId, voteAmount, inFavor, retries, logger }: {
         proposalId: bigint;
         voteAmount: bigint | undefined;
         inFavor: boolean;
         retries: number;
         logger: Logger;
     }): Promise<void>;
-    executeProposal({ proposalId, retries, logger, }: {
+    executeProposal({ proposalId, retries, logger }: {
         proposalId: bigint;
         retries: number;
         logger: Logger;
     }): Promise<void>;
 }
-//# sourceMappingURL=governance.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ292ZXJuYW5jZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0cy9nb3Zlcm5hbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFbEUsT0FBTyxFQUVMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssR0FBRyxFQUNSLEtBQUssR0FBRyxFQUlULE1BQU0sTUFBTSxDQUFDO0FBRWQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV2RSxPQUFPLEVBQUUsS0FBSyx3QkFBd0IsRUFBRSxLQUFLLFVBQVUsRUFBb0IsTUFBTSxhQUFhLENBQUM7QUFFL0YsTUFBTSxNQUFNLDZCQUE2QixHQUFHLElBQUksQ0FDOUMsbUJBQW1CLEVBQ25CLG1CQUFtQixHQUFHLGVBQWUsR0FBRyxpQkFBaUIsR0FBRywyQkFBMkIsQ0FDeEYsQ0FBQztBQUdGLG9CQUFZLGFBQWE7SUFDdkIsT0FBTyxJQUFBO0lBQ1AsTUFBTSxJQUFBO0lBQ04sTUFBTSxJQUFBO0lBQ04sVUFBVSxJQUFBO0lBQ1YsUUFBUSxJQUFBO0lBQ1IsUUFBUSxJQUFBO0lBQ1IsT0FBTyxJQUFBO0lBQ1AsT0FBTyxJQUFBO0NBQ1I7QUFFRCx3QkFBZ0IseUJBQXlCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLE1BQU0sQ0FXN0Q7QUFFRCxxQkFBYSwwQkFBMEI7YUFLbkIsTUFBTSxFQUFFLFVBQVU7SUFKcEMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxPQUFPLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUUvRixZQUNFLE9BQU8sRUFBRSxHQUFHLEVBQ0ksTUFBTSxFQUFFLFVBQVUsRUFHbkM7SUFFRCxJQUFXLE9BQU8sZUFFakI7SUFFWSw0QkFBNEIsd0JBRXhDO0lBRU0sZ0JBQWdCOzs7Ozs7Ozs7Ozs7T0FFdEI7SUFFTSxXQUFXLENBQUMsVUFBVSxFQUFFLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7OztPQUVwQztJQUVZLGdCQUFnQixDQUFDLFVBQVUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQU94RTtJQUVZLG1CQUFtQixDQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQUUsVUFBVSxFQUFFLE1BQU0sQ0FBQztRQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7S0FBRSxpQkFvQjlGO0lBRVksdUJBQXVCLENBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFBRSxVQUFVLEVBQUUsTUFBTSxDQUFDO1FBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQTtLQUFFLGlCQXlCbEc7Q0FDRjtBQUVELHFCQUFhLGtCQUFtQixTQUFRLDBCQUEwQjthQUtyQyxNQUFNLEVBQUUsd0JBQXdCO0lBSjNELG1CQUE0QixrQkFBa0IsRUFBRSxxQkFBcUIsQ0FBQyxPQUFPLGFBQWEsRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO0lBRXRILFlBQ0UsT0FBTyxFQUFFLEdBQUcsR0FBRyxVQUFVLEVBQ0EsTUFBTSxFQUFFLHdCQUF3QixFQVUxRDtJQUVZLE9BQU8sQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUduRDtJQUVZLGVBQWUsQ0FBQyxFQUMzQixjQUFjLEVBQ2QsZUFBZSxFQUNoQixFQUFFO1FBQ0QsY0FBYyxFQUFFLEdBQUcsQ0FBQztRQUNwQixlQUFlLEVBQUUsR0FBRyxDQUFDO0tBQ3RCLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQU9sQjtJQUVZLFFBQVEsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBR3ZDO0lBRVksSUFBSSxDQUFDLEVBQ2hCLFVBQVUsRUFDVixVQUFVLEVBQ1YsT0FBTyxFQUNQLE9BQVksRUFDWixNQUFNLEVBQ1AsRUFBRTtRQUNELFVBQVUsRUFBRSxNQUFNLENBQUM7UUFDbkIsVUFBVSxFQUFFLE1BQU0sR0FBRyxTQUFTLENBQUM7UUFDL0IsT0FBTyxFQUFFLE9BQU8sQ0FBQztRQUNqQixPQUFPLEVBQUUsTUFBTSxDQUFDO1FBQ2hCLE1BQU0sRUFBRSxNQUFNLENBQUM7S0FDaEIsaUJBK0NBO0lBRVksZUFBZSxDQUFDLEVBQzNCLFVBQVUsRUFDVixPQUFZLEVBQ1osTUFBTSxFQUNQLEVBQUU7UUFDRCxVQUFVLEVBQUUsTUFBTSxDQUFDO1FBQ25CLE9BQU8sRUFBRSxNQUFNLENBQUM7UUFDaEIsTUFBTSxFQUFFLE1BQU0sQ0FBQztLQUNoQixpQkF5Q0E7Q0FDRiJ9

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":"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"}