@aztec/ethereum 0.0.1-commit.b1c78909e → 0.0.1-commit.b2a5d0dd1

package/src/test/start_anvil.ts

@@ -1,5 +1,6 @@
 import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
+import type { TestDateProvider } from '@aztec/foundation/timer';
 import { fileURLToPath } from '@aztec/foundation/url';
 
 import { type ChildProcess, spawn } from 'child_process';
@@ -33,6 +34,12 @@ export async function startAnvil(
      * L1-finality-based logic work without needing hundreds of mined blocks.
      */
     slotsInAnEpoch?: number;
+    /**
+     * If provided, the date provider will be synced to anvil's block time on every mined block.
+     * This keeps the dateProvider in lockstep with anvil's chain time, avoiding drift between
+     * the wall clock and the L1 chain when computing L1 slot timestamps.
+     */
+    dateProvider?: TestDateProvider;
   } = {},
 ): Promise<{ anvil: Anvil; methodCalls?: string[]; rpcUrl: string; stop: () => Promise<void> }> {
   const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
@@ -108,12 +115,15 @@ export async function startAnvil(
         child.once('close', onClose);
       });
 
-      // Continue piping for logging / method-call capture after startup.
-      if (logger || opts.captureMethodCalls) {
+      // Continue piping for logging, method-call capture, and/or dateProvider sync after startup.
+      if (logger || opts.captureMethodCalls || opts.dateProvider) {
         child.stdout?.on('data', (data: Buffer) => {
           const text = data.toString();
           logger?.debug(text.trim());
           methodCalls?.push(...(text.match(/eth_[^\s]+/g) || []));
+          if (opts.dateProvider) {
+            syncDateProviderFromAnvilOutput(text, opts.dateProvider);
+          }
         });
         child.stderr?.on('data', (data: Buffer) => {
           logger?.debug(data.toString().trim());
@@ -160,6 +170,19 @@ export async function startAnvil(
   return { anvil: anvilObj, methodCalls, stop, rpcUrl: `http://127.0.0.1:${port}` };
 }
 
+/** Extracts block time from anvil stdout and syncs the dateProvider. */
+function syncDateProviderFromAnvilOutput(text: string, dateProvider: TestDateProvider): void {
+  // Anvil logs mined blocks as:
+  //   Block Time: "Fri, 20 Mar 2026 02:10:46 +0000"
+  const match = text.match(/Block Time:\s*"([^"]+)"/);
+  if (match) {
+    const blockTimeMs = new Date(match[1]).getTime();
+    if (!isNaN(blockTimeMs)) {
+      dateProvider.setTime(blockTimeMs);
+    }
+  }
+}
+
 /** Send SIGTERM, wait up to 5 s, then SIGKILL. All timers are always cleared. */
 function killChild(child: ChildProcess): Promise<void> {
   return new Promise<void>(resolve => {

package/dest/contracts/empire_slashing_proposer.d.ts

@@ -1,69 +0,0 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
-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: SlotNumber): Promise<bigint>;
-    getInstance(): Promise<`0x${string}`>;
-    getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{
-        lastSignalSlot: SlotNumber;
-        payloadWithMostSignals: Hex;
-        quorumReached: boolean;
-        executed: boolean;
-    }>;
-    getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint>;
-    createSignalRequest(payload: Hex): L1TxRequest;
-    createSignalRequestWithSignature(payload: Hex, slot: SlotNumber, chainId: number, signerAddress: Hex, signer: (msg: TypedDataDefinition) => Promise<Hex>): Promise<L1TxRequest>;
-    /** Checks if a payload was ever submitted to governance via submitRoundWinner. */
-    hasPayloadBeenProposed(payload: Hex, fromBlock: bigint): Promise<boolean>;
-    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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1waXJlX3NsYXNoaW5nX3Byb3Bvc2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3RzL2VtcGlyZV9zbGFzaGluZ19wcm9wb3Nlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSzNELE9BQU8sWUFBWSxNQUFNLFFBQVEsQ0FBQztBQUNsQyxPQUFPLEVBRUwsS0FBSyxHQUFHLEVBQ1IsS0FBSyxHQUFHLEVBQ1IsS0FBSyxtQkFBbUIsRUFHekIsTUFBTSxNQUFNLENBQUM7QUFFZCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRTlDLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBOEQsTUFBTSxrQkFBa0IsQ0FBQztBQUVoSCxxQkFBYSw0QkFBNkIsU0FBUSxLQUFLO0lBQ3JELFlBQVksS0FBSyxFQUFFLE1BQU0sRUFFeEI7Q0FDRjtBQUVELHFCQUFhLDhCQUErQixTQUFRLFlBQWEsWUFBVyxXQUFXO2FBT25FLE1BQU0sRUFBRSxVQUFVO0lBTnBDLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUErRDtJQUN0RixPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBc0U7SUFFL0YsU0FBZ0IsSUFBSSxXQUFxQjtJQUV6QyxZQUNrQixNQUFNLEVBQUUsVUFBVSxFQUNsQyxPQUFPLEVBQUUsR0FBRyxHQUFHLFVBQVUsRUFRMUI7SUFFRCxJQUFXLE9BQU8sZUFFakI7SUFFTSxhQUFhLG9CQUVuQjtJQUVNLFlBQVksb0JBRWxCO0lBRU0sbUJBQW1CLG9CQUV6QjtJQUVNLHlCQUF5QixvQkFFL0I7SUFFTSxlQUFlLG9CQUVyQjtJQUVNLFlBQVksQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFckQ7SUFFTSxXQUFXLDJCQUVqQjtJQUVZLFlBQVksQ0FDdkIsYUFBYSxFQUFFLEdBQUcsRUFDbEIsS0FBSyxFQUFFLE1BQU0sR0FDWixPQUFPLENBQUM7UUFBRSxjQUFjLEVBQUUsVUFBVSxDQUFDO1FBQUMsc0JBQXNCLEVBQUUsR0FBRyxDQUFDO1FBQUMsYUFBYSxFQUFFLE9BQU8sQ0FBQztRQUFDLFFBQVEsRUFBRSxPQUFPLENBQUE7S0FBRSxDQUFDLENBWWpIO0lBRU0saUJBQWlCLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUV6RjtJQUVNLG1CQUFtQixDQUFDLE9BQU8sRUFBRSxHQUFHLEdBQUcsV0FBVyxDQU1wRDtJQUVZLGdDQUFnQyxDQUMzQyxPQUFPLEVBQUUsR0FBRyxFQUNaLElBQUksRUFBRSxVQUFVLEVBQ2hCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLEdBQUcsRUFDbEIsTUFBTSxFQUFFLENBQUMsR0FBRyxFQUFFLG1CQUFtQixLQUFLLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FDakQsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQWN0QjtJQUVELGtGQUFrRjtJQUNyRSxzQkFBc0IsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUdyRjtJQUVNLDJCQUEyQixDQUFDLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRTtRQUFFLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEtBQUssT0FBTywrQ0FleEc7SUFFTSx3QkFBd0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxJQUFJLEVBQUU7UUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDO1FBQUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFFLENBQUE7S0FBRSxLQUFLLE9BQU8sK0NBY3JHO0lBRU0sb0JBQW9CLENBQ3pCLFFBQVEsRUFBRSxDQUFDLElBQUksRUFBRTtRQUFFLEtBQUssRUFBRSxNQUFNLENBQUM7UUFBQyxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQUUsQ0FBQztRQUFDLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFBO0tBQUUsS0FBSyxPQUFPLCtDQWVoRztJQUVELDZFQUE2RTtJQUN0RSx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsTUFBTSxHQUFHLFdBQVcsQ0FVMUQ7SUFFRCxxRUFBcUU7SUFDOUQsK0JBQStCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRTs7Ozs7O2tCQUVqRDtJQUVEOzs7Ozs7T0FNRztJQUNJLFlBQVksQ0FBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLHNCQUFzQixHQUFFLE1BQVUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBYXZGO0lBRVksWUFBWSxDQUN2QixPQUFPLEVBQUUsU0FBUyxFQUNsQixLQUFLLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FDckIsVUFBVSxDQUFDLE9BQU8sT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBbUN0RDtDQUNGIn0=

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

@@ -1 +0,0 @@
-{"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

@@ -1,216 +0,0 @@
-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(),
-            abi: EmpireSlashingProposerAbi,
-            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(),
-            abi: EmpireSlashingProposerAbi,
-            data: encodeSignalWithSignature(payload, signature)
-        };
-    }
-    /** Checks if a payload was ever submitted to governance via submitRoundWinner. */ async hasPayloadBeenProposed(payload, fromBlock) {
-        const events = await this.proposer.getEvents.PayloadSubmitted({
-            payload
-        }, {
-            fromBlock,
-            strict: true
-        });
-        return events.length > 0;
-    }
-    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(),
-            abi: EmpireSlashingProposerAbi,
-            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 request = this.buildExecuteRoundRequest(round);
-        const response = await txUtils.sendAndMonitorTransaction(request, {
-            // 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 args = {
-                abi: EmpireSlashingProposerAbi,
-                functionName: 'submitRoundWinner',
-                args: [
-                    round
-                ],
-                address: this.address.toString()
-            };
-            const error = await txUtils.tryGetErrorFromRevertedTx(request.data, args, 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/tally_slashing_proposer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tally_slashing_proposer.d.ts","sourceRoot":"","sources":["../../src/contracts/tally_slashing_proposer.ts"],"names":[],"mappings":"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"}

package/src/contracts/empire_slashing_proposer.ts

@@ -1,265 +0,0 @@
-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 {
-  type GetContractReturnType,
-  type Hex,
-  type Log,
-  type TypedDataDefinition,
-  encodeFunctionData,
-  getContract,
-} from 'viem';
-
-import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils/index.js';
-import type { ViemClient } from '../types.js';
-import { FormattedViemError, tryExtractEvent } from '../utils.js';
-import { type IEmpireBase, encodeSignal, encodeSignalWithSignature, signSignalWithSig } from './empire_base.js';
-
-export class ProposalAlreadyExecutedError extends Error {
-  constructor(round: bigint) {
-    super(`Proposal already executed: ${round}`);
-  }
-}
-
-export class EmpireSlashingProposerContract extends EventEmitter implements IEmpireBase {
-  private readonly logger = createLogger('ethereum:contracts:empire_slashing_proposer');
-  private readonly proposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>;
-
-  public readonly type = 'empire' as const;
-
-  constructor(
-    public readonly client: ViemClient,
-    address: Hex | EthAddress,
-  ) {
-    super();
-    this.proposer = getContract({
-      address: typeof address === 'string' ? address : address.toString(),
-      abi: EmpireSlashingProposerAbi,
-      client,
-    });
-  }
-
-  public get address() {
-    return EthAddress.fromString(this.proposer.address);
-  }
-
-  public getQuorumSize() {
-    return this.proposer.read.QUORUM_SIZE();
-  }
-
-  public getRoundSize() {
-    return this.proposer.read.ROUND_SIZE();
-  }
-
-  public getLifetimeInRounds() {
-    return this.proposer.read.LIFETIME_IN_ROUNDS();
-  }
-
-  public getExecutionDelayInRounds() {
-    return this.proposer.read.EXECUTION_DELAY_IN_ROUNDS();
-  }
-
-  public getCurrentRound() {
-    return this.proposer.read.getCurrentRound();
-  }
-
-  public computeRound(slot: SlotNumber): Promise<bigint> {
-    return this.proposer.read.computeRound([BigInt(slot)]);
-  }
-
-  public getInstance() {
-    return this.proposer.read.getInstance();
-  }
-
-  public async getRoundInfo(
-    rollupAddress: Hex,
-    round: bigint,
-  ): Promise<{ lastSignalSlot: SlotNumber; payloadWithMostSignals: Hex; quorumReached: boolean; executed: boolean }> {
-    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,
-    };
-  }
-
-  public getPayloadSignals(rollupAddress: Hex, round: bigint, payload: Hex): Promise<bigint> {
-    return this.proposer.read.signalCount([rollupAddress, round, payload]);
-  }
-
-  public createSignalRequest(payload: Hex): L1TxRequest {
-    return {
-      to: this.address.toString(),
-      abi: EmpireSlashingProposerAbi,
-      data: encodeSignal(payload),
-    };
-  }
-
-  public async createSignalRequestWithSignature(
-    payload: Hex,
-    slot: SlotNumber,
-    chainId: number,
-    signerAddress: Hex,
-    signer: (msg: TypedDataDefinition) => Promise<Hex>,
-  ): Promise<L1TxRequest> {
-    const signature = await signSignalWithSig(
-      signer,
-      payload,
-      slot,
-      await this.getInstance(),
-      this.address.toString(),
-      chainId,
-    );
-    return {
-      to: this.address.toString(),
-      abi: EmpireSlashingProposerAbi,
-      data: encodeSignalWithSignature(payload, signature),
-    };
-  }
-
-  /** Checks if a payload was ever submitted to governance via submitRoundWinner. */
-  public async hasPayloadBeenProposed(payload: Hex, fromBlock: bigint): Promise<boolean> {
-    const events = await this.proposer.getEvents.PayloadSubmitted({ payload }, { fromBlock, strict: true });
-    return events.length > 0;
-  }
-
-  public listenToSubmittablePayloads(callback: (args: { payload: `0x${string}`; round: bigint }) => unknown) {
-    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 });
-            }
-          }
-        },
-      },
-    );
-  }
-
-  public listenToPayloadSubmitted(callback: (args: { round: bigint; payload: `0x${string}` }) => unknown) {
-    return this.proposer.watchEvent.PayloadSubmitted(
-      {},
-      {
-        onLogs: logs => {
-          for (const log of logs) {
-            const { payload, round } = log.args;
-            if (round && payload) {
-              callback({ round, payload });
-            }
-          }
-        },
-      },
-    );
-  }
-
-  public listenToSignalCasted(
-    callback: (args: { round: bigint; payload: `0x${string}`; signaler: `0x${string}` }) => unknown,
-  ) {
-    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. */
-  public buildExecuteRoundRequest(round: bigint): L1TxRequest {
-    return {
-      to: this.address.toString(),
-      abi: EmpireSlashingProposerAbi,
-      data: encodeFunctionData({
-        abi: EmpireSlashingProposerAbi,
-        functionName: 'submitRoundWinner',
-        args: [round],
-      }),
-    };
-  }
-
-  /** Tries to extract a PayloadSubmitted event from the given logs. */
-  public tryExtractPayloadSubmittedEvent(logs: Log[]) {
-    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.
-   */
-  public waitForRound(round: bigint, pollingIntervalSeconds: number = 1): Promise<boolean> {
-    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, // no timeout
-      pollingIntervalSeconds,
-    ).catch(() => false);
-  }
-
-  public async executeRound(
-    txUtils: L1TxUtils,
-    round: bigint | number,
-  ): ReturnType<typeof txUtils.sendAndMonitorTransaction> {
-    if (typeof round === 'number') {
-      round = BigInt(round);
-    }
-    const request = this.buildExecuteRoundRequest(round);
-    const response = await txUtils
-      .sendAndMonitorTransaction(request, {
-        // Gas estimation is way off for this, likely because we are creating the contract/selector to call
-        // for the actual slashing dynamically.
-        gasLimitBufferPercentage: 50, // +50% gas
-      })
-      .catch(err => {
-        if (err instanceof FormattedViemError && err.message.includes('ProposalAlreadyExecuted')) {
-          throw new ProposalAlreadyExecutedError(round);
-        }
-        throw err;
-      });
-
-    if (response.receipt.status === 'reverted') {
-      const args = {
-        abi: EmpireSlashingProposerAbi,
-        functionName: 'submitRoundWinner' as const,
-        args: [round] as const,
-        address: this.address.toString(),
-      };
-      const error = await txUtils.tryGetErrorFromRevertedTx(request.data!, args, 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;
-  }
-}