@aztec/ethereum 1.0.0 → 1.1.0

package/dest/test/start_anvil.d.ts

@@ -5,8 +5,10 @@ import { type Anvil } from '@viem/anvil';
 export declare function startAnvil(opts?: {
     port?: number;
     l1BlockTime?: number;
+    captureMethodCalls?: boolean;
 }): Promise<{
     anvil: Anvil;
+    methodCalls?: string[];
     rpcUrl: string;
     stop: () => Promise<void>;
 }>;

package/dest/test/start_anvil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACjB,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAuCtE"}
+{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,IAAI,GAAE;IACJ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAwC9F"}

package/dest/test/start_anvil.js

@@ -6,6 +6,7 @@ import { dirname, resolve } from 'path';
  * Ensures there's a running Anvil instance and returns the RPC URL.
  */ export async function startAnvil(opts = {}) {
     const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
+    const methodCalls = opts.captureMethodCalls ? [] : undefined;
     let port;
     // Start anvil.
     // We go via a wrapper script to ensure if the parent dies, anvil dies.
@@ -19,6 +20,7 @@ import { dirname, resolve } from 'path';
         });
         // Listen to the anvil output to get the port.
         const removeHandler = anvil.on('message', (message)=>{
+            methodCalls?.push(...message.match(/eth_[^\s]+/g) || []);
             if (port === undefined && message.includes('Listening on')) {
                 port = parseInt(message.match(/Listening on ([^:]+):(\d+)/)[2]);
             }
@@ -38,6 +40,7 @@ import { dirname, resolve } from 'path';
     // Object.defineProperty(anvil, 'port', { value: port, writable: false });
     return {
         anvil,
+        methodCalls,
         stop: ()=>anvil.stop(),
         rpcUrl: `http://127.0.0.1:${port}`
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -32,11 +32,12 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "1.0.0",
-    "@aztec/foundation": "1.0.0",
-    "@aztec/l1-artifacts": "1.0.0",
+    "@aztec/blob-lib": "1.1.0",
+    "@aztec/foundation": "1.1.0",
+    "@aztec/l1-artifacts": "1.1.0",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
+    "lodash.pickby": "^4.5.0",
     "tslib": "^2.4.0",
     "viem": "2.23.7",
     "zod": "^3.23.8"
@@ -44,6 +45,7 @@
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
+    "@types/lodash.pickby": "^4",
     "@types/node": "^22.15.17",
     "@viem/anvil": "^0.0.10",
     "get-port": "^7.1.0",

package/src/config.ts

@@ -1,10 +1,12 @@
 import {
   type ConfigMappingsType,
+  type NetworkNames,
   bigintConfigHelper,
   booleanConfigHelper,
   getConfigFromMappings,
   numberConfigHelper,
 } from '@aztec/foundation/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
 
 import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils.js';
 
@@ -42,6 +44,8 @@ export type L1ContractsConfig = {
   manaTarget: bigint;
   /** The proving cost per mana */
   provingCostPerMana: bigint;
+  /** The number of seconds to wait for an exit */
+  exitDelaySeconds: number;
 } & L1TxUtilsConfig;
 
 export const DefaultL1ContractsConfig = {
@@ -52,19 +56,73 @@ export const DefaultL1ContractsConfig = {
   aztecProofSubmissionEpochs: 1, // you have a full epoch to submit a proof after the epoch to prove ends
   depositAmount: BigInt(100e18),
   minimumStake: BigInt(50e18),
-  slashingQuorum: 6,
-  slashingRoundSize: 10,
-  governanceProposerQuorum: 51,
-  governanceProposerRoundSize: 100,
+  slashingQuorum: 101,
+  slashingRoundSize: 200,
+  governanceProposerQuorum: 151,
+  governanceProposerRoundSize: 300,
   manaTarget: BigInt(1e10),
   provingCostPerMana: BigInt(100),
+  exitDelaySeconds: 2 * 24 * 60 * 60,
 } satisfies L1ContractsConfig;
 
+const LocalGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 60n * 60n * 24n * 30n,
+    lockAmount: 1n * 10n ** 24n,
+  },
+  votingDelay: 60n,
+  votingDuration: 60n * 60n,
+  executionDelay: 60n,
+  gracePeriod: 60n * 60n * 24n * 7n,
+  quorum: 1n * 10n ** 17n,
+  voteDifferential: 4n * 10n ** 16n,
+  minimumVotes: 400n * 10n ** 18n,
+};
+
+const TestnetGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 60n * 60n * 24n,
+    lockAmount: DefaultL1ContractsConfig.depositAmount * 100n,
+  },
+  votingDelay: 60n,
+  votingDuration: 60n * 60n,
+  executionDelay: 60n * 60n * 24n,
+  gracePeriod: 60n * 60n * 24n * 7n,
+  quorum: 3n * 10n ** 17n,
+  voteDifferential: 4n * 10n ** 16n,
+  minimumVotes: DefaultL1ContractsConfig.minimumStake * 200n,
+};
+
+export const getGovernanceConfiguration = (networkName: NetworkNames) => {
+  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    return TestnetGovernanceConfiguration;
+  }
+  return LocalGovernanceConfiguration;
+};
+
 // Making a default config here as we are only using it thought the deployment
 // and do not expect to be using different setups, so having environment variables
 // for it seems overkill
-export const DefaultRewardConfig = {
+const LocalRewardConfig = {
+  sequencerBps: 5000,
+  rewardDistributor: EthAddress.ZERO.toString(),
+  booster: EthAddress.ZERO.toString(),
+};
+
+const TestnetRewardConfig = {
   sequencerBps: 5000,
+  rewardDistributor: EthAddress.ZERO.toString(),
+  booster: EthAddress.ZERO.toString(),
+};
+
+export const getRewardConfig = (networkName: NetworkNames) => {
+  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    return TestnetRewardConfig;
+  }
+  return LocalRewardConfig;
+};
+
+const LocalRewardBoostConfig = {
   increment: 200000,
   maxScore: 5000000,
   a: 5000,
@@ -72,10 +130,41 @@ export const DefaultRewardConfig = {
   minimum: 100000,
 };
 
+const TestnetRewardBoostConfig = {
+  increment: 125000,
+  maxScore: 15000000,
+  a: 1000,
+  k: 1000000,
+  minimum: 100000,
+};
+
+export const getRewardBoostConfig = (networkName: NetworkNames) => {
+  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    return TestnetRewardBoostConfig;
+  }
+  return LocalRewardBoostConfig;
+};
+
 // Similar to the above, no need for environment variables for this.
-export const DefaultEntryQueueConfig = {
-  flushSizeMin: 48,
-  flushSizeQuotient: 2,
+const LocalEntryQueueConfig = {
+  bootstrapValidatorSetSize: 0,
+  bootstrapFlushSize: 0,
+  normalFlushSizeMin: 48,
+  normalFlushSizeQuotient: 2,
+};
+
+const TestnetEntryQueueConfig = {
+  bootstrapValidatorSetSize: 750,
+  bootstrapFlushSize: 75,
+  normalFlushSizeMin: 1,
+  normalFlushSizeQuotient: 2475,
+};
+
+export const getEntryQueueConfig = (networkName: NetworkNames) => {
+  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    return TestnetEntryQueueConfig;
+  }
+  return LocalEntryQueueConfig;
 };
 
 export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
@@ -144,6 +233,11 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The proving cost per mana',
     ...bigintConfigHelper(DefaultL1ContractsConfig.provingCostPerMana),
   },
+  exitDelaySeconds: {
+    env: 'AZTEC_EXIT_DELAY_SECONDS',
+    description: 'The delay before a validator can exit the set',
+    ...numberConfigHelper(DefaultL1ContractsConfig.exitDelaySeconds),
+  },
   ...l1TxUtilsConfigMappings,
 };
 

package/src/contracts/empire_base.ts

@@ -1,16 +1,20 @@
 import { Signature } from '@aztec/foundation/eth-signature';
 import { EmpireBaseAbi } from '@aztec/l1-artifacts/EmpireBaseAbi';
 
-import { type Hex, type WalletClient, encodeFunctionData } from 'viem';
+import { type Hex, encodeFunctionData, hashTypedData } from 'viem';
 
 import type { L1TxRequest } from '../l1_tx_utils.js';
-import type { ExtendedViemWalletClient } from '../types.js';
 
 export interface IEmpireBase {
   getRoundInfo(rollupAddress: Hex, round: bigint): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }>;
   computeRound(slot: bigint): Promise<bigint>;
   createVoteRequest(payload: Hex): L1TxRequest;
-  createVoteRequestWithSignature(payload: Hex, wallet: ExtendedViemWalletClient): Promise<L1TxRequest>;
+  createVoteRequestWithSignature(
+    payload: Hex,
+    chainId: number,
+    signerAddress: Hex,
+    signer: (msg: Hex) => Promise<Hex>,
+  ): Promise<L1TxRequest>;
 }
 
 export function encodeVote(payload: Hex): Hex {
@@ -39,7 +43,7 @@ export function encodeVoteWithSignature(payload: Hex, signature: Signature) {
  * @returns The EIP-712 signature
  */
 export async function signVoteWithSig(
-  walletClient: WalletClient,
+  signer: (msg: Hex) => Promise<Hex>,
   proposal: Hex,
   nonce: bigint,
   verifyingContract: Hex,
@@ -64,16 +68,6 @@ export async function signVoteWithSig(
     nonce,
   };
 
-  if (!walletClient.account) {
-    throw new Error('Wallet client must be connected to an account');
-  }
-
-  const signatureHex = await walletClient.signTypedData({
-    account: walletClient.account.address,
-    domain,
-    types,
-    primaryType: 'Vote',
-    message,
-  });
-  return Signature.fromString(signatureHex);
+  const msg = hashTypedData({ domain, types, primaryType: 'Vote', message });
+  return Signature.fromString(await signer(msg));
 }

package/src/contracts/governance_proposer.ts

@@ -5,7 +5,7 @@ import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi
 import { type GetContractReturnType, type Hex, type TransactionReceipt, encodeFunctionData, getContract } from 'viem';
 
 import type { GasPrice, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
-import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
+import type { ViemClient } from '../types.js';
 import { type IEmpireBase, encodeVote, encodeVoteWithSignature, signVoteWithSig } from './empire_base.js';
 import { extractProposalIdFromLogs } from './governance.js';
 
@@ -52,12 +52,7 @@ export class GovernanceProposerContract implements IEmpireBase {
     rollupAddress: Hex,
     round: bigint,
   ): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }> {
-    const roundInfo = await this.proposer.read.rounds([rollupAddress, round]);
-    return {
-      lastVote: roundInfo[0],
-      leader: roundInfo[1],
-      executed: roundInfo[2],
-    };
+    return await this.proposer.read.getRoundData([rollupAddress, round]);
   }
 
   public getProposalVotes(rollupAddress: Hex, round: bigint, proposal: Hex): Promise<bigint> {
@@ -71,9 +66,14 @@ export class GovernanceProposerContract implements IEmpireBase {
     };
   }
 
-  public async createVoteRequestWithSignature(payload: Hex, wallet: ExtendedViemWalletClient): Promise<L1TxRequest> {
-    const nonce = await this.getNonce(wallet.account.address);
-    const signature = await signVoteWithSig(wallet, payload, nonce, this.address.toString(), wallet.chain.id);
+  public async createVoteRequestWithSignature(
+    payload: Hex,
+    chainId: number,
+    signerAddress: Hex,
+    signer: (msg: Hex) => Promise<Hex>,
+  ): Promise<L1TxRequest> {
+    const nonce = await this.getNonce(signerAddress);
+    const signature = await signVoteWithSig(signer, payload, nonce, this.address.toString(), chainId);
     return {
       to: this.address.toString(),
       data: encodeVoteWithSignature(payload, signature),

package/src/contracts/multicall.ts

@@ -5,6 +5,7 @@ import { type EncodeFunctionDataParameters, type Hex, encodeFunctionData, multic
 
 import type { L1BlobInputs, L1GasConfig, L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
 import type { ExtendedViemWalletClient } from '../types.js';
+import { FormattedViemError, formatViemError } from '../utils.js';
 import { RollupContract } from './rollup.js';
 
 export const MULTI_CALL_3_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11' as const;
@@ -32,61 +33,87 @@ export class Multicall3 {
 
     const encodedForwarderData = encodeFunctionData(forwarderFunctionData);
 
-    const { receipt, gasPrice } = await l1TxUtils.sendAndMonitorTransaction(
-      {
-        to: MULTI_CALL_3_ADDRESS,
-        data: encodedForwarderData,
-      },
-      gasConfig,
-      blobConfig,
-    );
+    try {
+      const { receipt, gasPrice } = await l1TxUtils.sendAndMonitorTransaction(
+        {
+          to: MULTI_CALL_3_ADDRESS,
+          data: encodedForwarderData,
+        },
+        gasConfig,
+        blobConfig,
+      );
 
-    if (receipt.status === 'success') {
-      const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
-      return { receipt, gasPrice, stats };
-    } else {
-      logger.error('Forwarder transaction failed', undefined, { receipt });
+      if (receipt.status === 'success') {
+        const stats = await l1TxUtils.getTransactionStats(receipt.transactionHash);
+        return { receipt, gasPrice, stats };
+      } else {
+        logger.error('Forwarder transaction failed', undefined, { receipt });
 
-      const args = {
-        ...forwarderFunctionData,
-        address: MULTI_CALL_3_ADDRESS,
-      };
+        const args = {
+          ...forwarderFunctionData,
+          address: MULTI_CALL_3_ADDRESS,
+        };
 
-      let errorMsg: string | undefined;
+        let errorMsg: string | undefined;
 
-      if (blobConfig) {
-        const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? gasPrice.maxFeePerBlobGas;
-        if (maxFeePerBlobGas === undefined) {
-          errorMsg = 'maxFeePerBlobGas is required to get the error message';
-        } else {
-          logger.debug('Trying to get error from reverted tx with blob config');
-          errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(
-            encodedForwarderData,
-            args,
-            {
-              blobs: blobConfig.blobs,
-              kzg: blobConfig.kzg,
-              maxFeePerBlobGas,
-            },
-            [
+        if (blobConfig) {
+          const maxFeePerBlobGas = blobConfig.maxFeePerBlobGas ?? gasPrice.maxFeePerBlobGas;
+          if (maxFeePerBlobGas === undefined) {
+            errorMsg = 'maxFeePerBlobGas is required to get the error message';
+          } else {
+            logger.debug('Trying to get error from reverted tx with blob config');
+            errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(
+              encodedForwarderData,
+              args,
               {
-                address: rollupAddress,
-                stateDiff: [
-                  {
-                    slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
-                    value: toPaddedHex(0n, true),
-                  },
-                ],
+                blobs: blobConfig.blobs,
+                kzg: blobConfig.kzg,
+                maxFeePerBlobGas,
               },
-            ],
-          );
+              [
+                {
+                  address: rollupAddress,
+                  stateDiff: [
+                    {
+                      slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true),
+                      value: toPaddedHex(0n, true),
+                    },
+                  ],
+                },
+              ],
+            );
+          }
+        } else {
+          logger.debug('Trying to get error from reverted tx without blob config');
+          errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, undefined, []);
         }
-      } else {
-        logger.debug('Trying to get error from reverted tx without blob config');
-        errorMsg = await l1TxUtils.tryGetErrorFromRevertedTx(encodedForwarderData, args, undefined, []);
+
+        return { receipt, gasPrice, errorMsg };
       }
+    } catch (err) {
+      for (const request of requests) {
+        logger.debug('Simulating request', { request });
+        const result = await l1TxUtils
+          .simulate(request, undefined, [
+            {
+              address: rollupAddress,
+              stateDiff: [
+                { slot: toPaddedHex(RollupContract.checkBlobStorageSlot, true), value: toPaddedHex(0n, true) },
+              ],
+            },
+          ])
+          .catch(err => formatViemError(err, request.abi));
+        if (result instanceof FormattedViemError) {
+          logger.error('Found error in simulation', result, {
+            to: request.to ?? 'null',
+            data: request.data,
+          });
 
-      return { receipt, gasPrice, errorMsg };
+          return result;
+        }
+      }
+      logger.warn('Failed to get error from reverted tx', { err });
+      throw err;
     }
   }
 }

package/src/contracts/rollup.ts

@@ -22,6 +22,11 @@ export type ViemCommitteeAttestation = {
   signature: ViemSignature;
 };
 
+export type ViemCommitteeAttestations = {
+  signatureIndices: `0x${string}`;
+  signaturesOrAddresses: `0x${string}`;
+};
+
 export type L1RollupContractAddresses = Pick<
   L1ContractAddresses,
   | 'rollupAddress'
@@ -174,6 +179,11 @@ export class RollupContract {
     return this.rollup.read.getDepositAmount();
   }
 
+  @memoize
+  getExitDelay() {
+    return this.rollup.read.getExitDelay();
+  }
+
   @memoize
   getManaTarget() {
     return this.rollup.read.getManaTarget();
@@ -376,7 +386,7 @@ export class RollupContract {
   public async validateHeader(
     args: readonly [
       ViemHeader,
-      ViemCommitteeAttestation[],
+      ViemCommitteeAttestations,
       `0x${string}`,
       `0x${string}`,
       {
@@ -399,6 +409,77 @@ export class RollupContract {
     }
   }
 
+  /**
+   * Packs an array of committee attestations into the format expected by the Solidity contract
+   *
+   * @param attestations - Array of committee attestations with addresses and signatures
+   * @returns Packed attestations with bitmap and tightly packed signature/address data
+   */
+  static packAttestations(attestations: ViemCommitteeAttestation[]): ViemCommitteeAttestations {
+    const length = attestations.length;
+
+    // Calculate bitmap size (1 bit per attestation, rounded up to nearest byte)
+    const bitmapSize = Math.ceil(length / 8);
+    const signatureIndices = new Uint8Array(bitmapSize);
+
+    // Calculate total data size needed
+    let totalDataSize = 0;
+    for (let i = 0; i < length; i++) {
+      const signature = attestations[i].signature;
+      // Check if signature is empty (v = 0)
+      const isEmpty = signature.v === 0;
+
+      if (!isEmpty) {
+        totalDataSize += 65; // v (1) + r (32) + s (32)
+      } else {
+        totalDataSize += 20; // address only
+      }
+    }
+
+    const signaturesOrAddresses = new Uint8Array(totalDataSize);
+    let dataIndex = 0;
+
+    // Pack the data
+    for (let i = 0; i < length; i++) {
+      const attestation = attestations[i];
+      const signature = attestation.signature;
+
+      // Check if signature is empty
+      const isEmpty = signature.v === 0;
+
+      if (!isEmpty) {
+        // Set bit in bitmap (bit 7-0 in each byte, left to right)
+        const byteIndex = Math.floor(i / 8);
+        const bitIndex = 7 - (i % 8);
+        signatureIndices[byteIndex] |= 1 << bitIndex;
+
+        // Pack signature: v + r + s
+        signaturesOrAddresses[dataIndex] = signature.v;
+        dataIndex++;
+
+        // Pack r (32 bytes)
+        const rBytes = Buffer.from(signature.r.slice(2), 'hex');
+        signaturesOrAddresses.set(rBytes, dataIndex);
+        dataIndex += 32;
+
+        // Pack s (32 bytes)
+        const sBytes = Buffer.from(signature.s.slice(2), 'hex');
+        signaturesOrAddresses.set(sBytes, dataIndex);
+        dataIndex += 32;
+      } else {
+        // Pack address only (20 bytes)
+        const addrBytes = Buffer.from(attestation.addr.slice(2), 'hex');
+        signaturesOrAddresses.set(addrBytes, dataIndex);
+        dataIndex += 20;
+      }
+    }
+
+    return {
+      signatureIndices: `0x${Buffer.from(signatureIndices).toString('hex')}`,
+      signaturesOrAddresses: `0x${Buffer.from(signaturesOrAddresses).toString('hex')}`,
+    };
+  }
+
   /**
    * @notice  Calls `canProposeAtTime` with the time of the next Ethereum block and the sender address
    *

package/src/contracts/slashing_proposer.ts

@@ -12,7 +12,7 @@ import {
 } from 'viem';
 
 import type { L1TxRequest, L1TxUtils } from '../l1_tx_utils.js';
-import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
+import type { ViemClient } from '../types.js';
 import { FormattedViemError } from '../utils.js';
 import { type IEmpireBase, encodeVote, encodeVoteWithSignature, signVoteWithSig } from './empire_base.js';
 
@@ -57,12 +57,7 @@ export class SlashingProposerContract extends EventEmitter implements IEmpireBas
     rollupAddress: Hex,
     round: bigint,
   ): Promise<{ lastVote: bigint; leader: Hex; executed: boolean }> {
-    const roundInfo = await this.proposer.read.rounds([rollupAddress, round]);
-    return {
-      lastVote: roundInfo[0],
-      leader: roundInfo[1],
-      executed: roundInfo[2],
-    };
+    return await this.proposer.read.getRoundData([rollupAddress, round]);
   }
 
   public getProposalVotes(rollupAddress: Hex, round: bigint, proposal: Hex): Promise<bigint> {
@@ -76,9 +71,14 @@ export class SlashingProposerContract extends EventEmitter implements IEmpireBas
     };
   }
 
-  public async createVoteRequestWithSignature(payload: Hex, wallet: ExtendedViemWalletClient): Promise<L1TxRequest> {
-    const nonce = await this.getNonce(wallet.account.address);
-    const signature = await signVoteWithSig(wallet, payload, nonce, this.address.toString(), wallet.chain.id);
+  public async createVoteRequestWithSignature(
+    payload: Hex,
+    chainId: number,
+    signerAddress: Hex,
+    signer: (msg: Hex) => Promise<Hex>,
+  ): Promise<L1TxRequest> {
+    const nonce = await this.getNonce(signerAddress);
+    const signature = await signVoteWithSig(signer, payload, nonce, this.address.toString(), chainId);
     return {
       to: this.address.toString(),
       data: encodeVoteWithSignature(payload, signature),
@@ -152,7 +152,7 @@ export class SlashingProposerContract extends EventEmitter implements IEmpireBas
         {
           // Gas estimation is way off for this, likely because we are creating the contract/selector to call
           // for the actual slashing dynamically.
-          gasLimitBufferPercentage: 1000,
+          gasLimitBufferPercentage: 50, // +50% gas
         },
       )
       .catch(err => {