@aztec/ethereum 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/src/config.ts

@@ -1,6 +1,6 @@
 import {
   type ConfigMappingsType,
-  type NetworkNames,
+  // type NetworkNames,
   bigintConfigHelper,
   booleanConfigHelper,
   enumConfigHelper,
@@ -10,7 +10,7 @@ import {
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
-import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils/index.js';
+import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils/config.js';
 
 export type GenesisStateConfig = {
   /** Whether to populate the genesis state with initial fee juice for the test accounts */
@@ -29,7 +29,11 @@ export type L1ContractsConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: number;
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: number;
+  lagInEpochsForValidatorSet: number;
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: number;
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: number;
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: number;
   /** The deposit amount for a validator */
@@ -77,7 +81,9 @@ export const DefaultL1ContractsConfig = {
   aztecSlotDuration: 36,
   aztecEpochDuration: 32,
   aztecTargetCommitteeSize: 48,
-  lagInEpochs: 2,
+  lagInEpochsForValidatorSet: 2,
+  lagInEpochsForRandao: 2, // For PROD, this value should be > lagInEpochsForValidatorSet
+  inboxLag: 1, // Default inbox lag to prevent sequencer DOS attacks
   aztecProofSubmissionEpochs: 1, // you have a full epoch to submit a proof after the epoch to prove ends
   activationThreshold: 100n * 10n ** 18n,
   ejectionThreshold: 50n * 10n ** 18n,
@@ -90,7 +96,7 @@ export const DefaultL1ContractsConfig = {
   slashingExecutionDelayInRounds: 0, // round N may be submitted in round N + 1
   slashingVetoer: EthAddress.ZERO,
   governanceProposerRoundSize: 300,
-  manaTarget: BigInt(1e10),
+  manaTarget: BigInt(100e6),
   provingCostPerMana: BigInt(100),
   exitDelaySeconds: 2 * 24 * 60 * 60,
   slasherFlavor: 'tally' as const,
@@ -98,208 +104,6 @@ export const DefaultL1ContractsConfig = {
   slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days in seconds
 } 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, // 10%
-  requiredYeaMargin: 4n * 10n ** 16n, // 4%
-  minimumVotes: 400n * 10n ** 18n,
-};
-
-const StagingPublicGovernanceConfiguration = {
-  proposeConfig: {
-    lockDelay: 60n * 60n * 24n * 30n,
-    lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
-  },
-  votingDelay: 60n,
-  votingDuration: 60n * 60n,
-  executionDelay: 60n,
-  gracePeriod: 60n * 60n * 24n * 7n,
-  quorum: 3n * 10n ** 17n, // 30%
-  requiredYeaMargin: 4n * 10n ** 16n, // 4%
-  minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n, // >= 200 validators must vote
-};
-
-const TestnetGovernanceConfiguration = {
-  proposeConfig: {
-    lockDelay: 10n * 365n * 24n * 60n * 60n,
-    lockAmount: 1250n * 200_000n * 10n ** 18n,
-  },
-
-  votingDelay: 12n * 60n * 60n, // 12 hours
-  votingDuration: 1n * 24n * 60n * 60n, // 1 day
-  executionDelay: 12n * 60n * 60n, // 12 hours
-  gracePeriod: 1n * 24n * 60n * 60n, // 1 day
-  quorum: 2n * 10n ** 17n, // 20%
-  requiredYeaMargin: 1n * 10n ** 17n, // 10%
-  minimumVotes: 100n * 200_000n * 10n ** 18n,
-};
-
-const StagingIgnitionGovernanceConfiguration = {
-  proposeConfig: {
-    lockDelay: 10n * 365n * 24n * 60n * 60n,
-    lockAmount: 1250n * 200_000n * 10n ** 18n,
-  },
-
-  votingDelay: 7n * 24n * 60n * 60n,
-  votingDuration: 7n * 24n * 60n * 60n,
-  executionDelay: 30n * 24n * 60n * 60n,
-  gracePeriod: 7n * 24n * 60n * 60n,
-  quorum: 2n * 10n ** 17n, // 20%
-  requiredYeaMargin: 1n * 10n ** 17n, // 10%
-  minimumVotes: 1250n * 200_000n * 10n ** 18n,
-};
-
-const MainnetGovernanceConfiguration = {
-  proposeConfig: {
-    lockDelay: 90n * 24n * 60n * 60n,
-    lockAmount: 258_750_000n * 10n ** 18n,
-  },
-
-  votingDelay: 3n * 24n * 60n * 60n,
-  votingDuration: 7n * 24n * 60n * 60n,
-  executionDelay: 7n * 24n * 60n * 60n,
-  gracePeriod: 7n * 24n * 60n * 60n,
-  quorum: 2n * 10n ** 17n, // 20%
-  requiredYeaMargin: 33n * 10n ** 16n, // 33%
-  minimumVotes: 1000n * 200_000n * 10n ** 18n,
-};
-
-export const getGovernanceConfiguration = (networkName: NetworkNames) => {
-  switch (networkName) {
-    case 'local':
-      return LocalGovernanceConfiguration;
-    case 'next-net':
-      return LocalGovernanceConfiguration;
-    case 'devnet':
-      return LocalGovernanceConfiguration;
-    case 'staging-public':
-      return StagingPublicGovernanceConfiguration;
-    case 'testnet':
-      return TestnetGovernanceConfiguration;
-    case 'staging-ignition':
-      return StagingIgnitionGovernanceConfiguration;
-    case 'mainnet':
-      return MainnetGovernanceConfiguration;
-    default:
-      throw new Error(`Unrecognized network name: ${networkName}`);
-  }
-};
-
-// 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
-
-const DefaultRewardConfig = {
-  sequencerBps: 8000,
-  rewardDistributor: EthAddress.ZERO.toString(),
-  booster: EthAddress.ZERO.toString(),
-  blockReward: 500n * 10n ** 18n,
-};
-
-const MainnetRewardConfig = {
-  sequencerBps: 7_000,
-  rewardDistributor: EthAddress.ZERO.toString(),
-  booster: EthAddress.ZERO.toString(),
-  blockReward: 400n * 10n ** 18n,
-};
-
-export const getRewardConfig = (networkName: NetworkNames) => {
-  switch (networkName) {
-    case 'local':
-    case 'devnet':
-    case 'next-net':
-    case 'staging-public':
-    case 'testnet':
-    case 'staging-ignition':
-      return DefaultRewardConfig;
-    case 'mainnet':
-      return MainnetRewardConfig;
-    default:
-      throw new Error(`Unrecognized network name: ${networkName}`);
-  }
-};
-
-export const getRewardBoostConfig = () => {
-  // The reward configuration is specified with a precision of 1e5, and we use the same across
-  // all networks.
-  return {
-    increment: 125_000, // 1.25
-    maxScore: 15_000_000, // 150
-    a: 1_000, // 0.01
-    k: 1_000_000, // 10
-    minimum: 100_000, // 1
-  };
-};
-
-// Similar to the above, no need for environment variables for this.
-const LocalEntryQueueConfig = {
-  bootstrapValidatorSetSize: 0n,
-  bootstrapFlushSize: 0n,
-  normalFlushSizeMin: 48n,
-  normalFlushSizeQuotient: 2n,
-  maxQueueFlushSize: 48n,
-};
-
-const StagingPublicEntryQueueConfig = {
-  bootstrapValidatorSetSize: 48n,
-  bootstrapFlushSize: 48n,
-  normalFlushSizeMin: 1n,
-  normalFlushSizeQuotient: 2475n,
-  maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
-};
-
-const TestnetEntryQueueConfig = {
-  bootstrapValidatorSetSize: 256n,
-  bootstrapFlushSize: 256n,
-  normalFlushSizeMin: 4n,
-  normalFlushSizeQuotient: 2048n,
-  maxQueueFlushSize: 8n,
-};
-
-const StagingIgnitionEntryQueueConfig = {
-  bootstrapValidatorSetSize: 48n,
-  bootstrapFlushSize: 48n,
-  normalFlushSizeMin: 1n,
-  normalFlushSizeQuotient: 2048n,
-  maxQueueFlushSize: 24n,
-};
-
-const MainnetEntryQueueConfig = {
-  bootstrapValidatorSetSize: 1_000n,
-  bootstrapFlushSize: 1_000n,
-  normalFlushSizeMin: 1n,
-  normalFlushSizeQuotient: 2_048n,
-  maxQueueFlushSize: 8n,
-};
-
-export const getEntryQueueConfig = (networkName: NetworkNames) => {
-  switch (networkName) {
-    case 'local':
-      return LocalEntryQueueConfig;
-    case 'next-net':
-      return LocalEntryQueueConfig;
-    case 'devnet':
-      return LocalEntryQueueConfig;
-    case 'staging-public':
-      return StagingPublicEntryQueueConfig;
-    case 'testnet':
-      return TestnetEntryQueueConfig;
-    case 'staging-ignition':
-      return StagingIgnitionEntryQueueConfig;
-    case 'mainnet':
-      return MainnetEntryQueueConfig;
-    default:
-      throw new Error(`Unrecognized network name: ${networkName}`);
-  }
-};
-
 export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
   ethereumSlotDuration: {
     env: 'ETHEREUM_SLOT_DURATION',
@@ -321,10 +125,20 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The target validator committee size.',
     ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize),
   },
-  lagInEpochs: {
-    env: 'AZTEC_LAG_IN_EPOCHS',
+  lagInEpochsForValidatorSet: {
+    env: 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
     description: 'The number of epochs to lag behind the current epoch for validator selection.',
-    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochs),
+    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForValidatorSet),
+  },
+  lagInEpochsForRandao: {
+    env: 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
+    description: 'The number of epochs to lag behind the current epoch for randao selection.',
+    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForRandao),
+  },
+  inboxLag: {
+    env: 'AZTEC_INBOX_LAG',
+    description: 'The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks).',
+    ...numberConfigHelper(DefaultL1ContractsConfig.inboxLag),
   },
   aztecProofSubmissionEpochs: {
     env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
@@ -452,205 +266,3 @@ export function getL1ContractsConfigEnvVars(): L1ContractsConfig {
 export function getGenesisStateConfigEnvVars(): GenesisStateConfig {
   return getConfigFromMappings(genesisStateConfigMappings);
 }
-
-/**
- * Validates the L1 contracts configuration to ensure all requirements enforced by L1 contracts
- * during construction are satisfied before deployment.
- * Accumulates all validation errors and throws an exception listing them all if any are found.
- */
-export function validateConfig(config: Omit<L1ContractsConfig, keyof L1TxUtilsConfig>): void {
-  const errors: string[] = [];
-
-  // RollupCore constructor validation: normalFlushSizeMin > 0
-  // From: require(_config.stakingQueueConfig.normalFlushSizeMin > 0, Errors.Staking__InvalidStakingQueueConfig());
-  const entryQueueConfig = getEntryQueueConfig('testnet'); // Get config to check normalFlushSizeMin
-  if (entryQueueConfig.normalFlushSizeMin <= 0n) {
-    errors.push('normalFlushSizeMin must be greater than 0');
-  }
-
-  // TimeLib initialization validation: aztecSlotDuration should be a multiple of ethereumSlotDuration
-  // While not explicitly required in constructor, this is a common validation for time-based systems
-  if (config.aztecSlotDuration % config.ethereumSlotDuration !== 0) {
-    errors.push(
-      `aztecSlotDuration (${config.aztecSlotDuration}) must be a multiple of ethereumSlotDuration (${config.ethereumSlotDuration})`,
-    );
-  }
-
-  // EmpireBase constructor validations for governance/slashing proposers
-  // From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.EmpireBase__InvalidQuorumAndRoundSize(QUORUM_SIZE, ROUND_SIZE));
-  const { governanceProposerQuorum, governanceProposerRoundSize } = config;
-  if (
-    governanceProposerQuorum !== undefined &&
-    governanceProposerQuorum <= Math.floor(governanceProposerRoundSize / 2)
-  ) {
-    errors.push(
-      `governanceProposerQuorum (${governanceProposerQuorum}) must be greater than half of governanceProposerRoundSize (${Math.floor(governanceProposerRoundSize / 2)})`,
-    );
-  }
-
-  // From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.EmpireBase__QuorumCannotBeLargerThanRoundSize(QUORUM_SIZE, ROUND_SIZE));
-  if (governanceProposerQuorum !== undefined && governanceProposerQuorum > governanceProposerRoundSize) {
-    errors.push(
-      `governanceProposerQuorum (${governanceProposerQuorum}) cannot be larger than governanceProposerRoundSize (${governanceProposerRoundSize})`,
-    );
-  }
-
-  // Slashing quorum validations (similar to governance quorum)
-  const slashingRoundSize = config.slashingRoundSizeInEpochs * config.aztecEpochDuration;
-  const { slashingQuorum } = config;
-  if (slashingQuorum !== undefined && slashingQuorum <= Math.floor(slashingRoundSize / 2)) {
-    errors.push(
-      `slashingQuorum (${slashingQuorum}) must be greater than half of slashingRoundSizeInEpochs (${Math.floor(slashingRoundSize / 2)})`,
-    );
-  }
-
-  if (slashingQuorum !== undefined && slashingQuorum > slashingRoundSize) {
-    errors.push(
-      `slashingQuorum (${slashingQuorum}) cannot be larger than slashingRoundSizeInEpochs (${slashingRoundSize})`,
-    );
-  }
-
-  // EmpireBase and TallySlashingProposer lifetime and execution delay validation
-  // From: require(LIFETIME_IN_ROUNDS > EXECUTION_DELAY_IN_ROUNDS);
-  if (config.slashingLifetimeInRounds <= config.slashingExecutionDelayInRounds) {
-    errors.push(
-      `slashingLifetimeInRounds (${config.slashingLifetimeInRounds}) must be greater than slashingExecutionDelayInRounds (${config.slashingExecutionDelayInRounds})`,
-    );
-  }
-
-  // Staking asset validation: activationThreshold > ejectionThreshold
-  if (config.activationThreshold < config.ejectionThreshold) {
-    errors.push(
-      `activationThreshold (${config.activationThreshold}) must be greater than ejectionThreshold (${config.ejectionThreshold})`,
-    );
-  }
-
-  // TallySlashingProposer constructor validations
-  if (config.slasherFlavor === 'tally') {
-    validateTallySlasherConfig(config, errors);
-  }
-
-  // Epoch and slot duration validations
-  if (config.aztecSlotDuration <= 0) {
-    errors.push('aztecSlotDuration must be greater than 0');
-  }
-
-  if (config.ethereumSlotDuration <= 0) {
-    errors.push('ethereumSlotDuration must be greater than 0');
-  }
-
-  if (config.aztecEpochDuration <= 0) {
-    errors.push('aztecEpochDuration must be greater than 0');
-  }
-
-  // Committee size validation
-  if (config.aztecTargetCommitteeSize < 0) {
-    errors.push('aztecTargetCommitteeSize cannot be negative');
-  }
-
-  // Proof submission epochs validation
-  if (config.aztecProofSubmissionEpochs < 0) {
-    errors.push('aztecProofSubmissionEpochs cannot be negative');
-  }
-
-  // Exit delay validation
-  if (config.exitDelaySeconds < 0) {
-    errors.push('exitDelaySeconds cannot be negative');
-  }
-
-  // Mana validation
-  if (config.manaTarget < 0n) {
-    errors.push('manaTarget cannot be negative');
-  }
-
-  if (config.provingCostPerMana < 0n) {
-    errors.push('provingCostPerMana cannot be negative');
-  }
-
-  // If any errors were found, throw an exception with all of them
-  if (errors.length > 0) {
-    throw new Error(
-      `L1 contracts configuration validation failed with ${errors.length} error(s):\n${errors.map((error, index) => `${index + 1}. ${error}`).join('\n')}`,
-    );
-  }
-}
-
-function validateTallySlasherConfig(config: L1ContractsConfig, errors: string[]) {
-  if (config.slasherFlavor !== 'tally') {
-    return;
-  }
-
-  // From: require(SLASH_OFFSET_IN_ROUNDS > 0, Errors.TallySlashingProposer__SlashOffsetMustBeGreaterThanZero(...));
-  if (config.slashingOffsetInRounds <= 0) {
-    errors.push(`slashingOffsetInRounds (${config.slashingOffsetInRounds}) must be greater than 0`);
-  }
-
-  // From: require(ROUND_SIZE_IN_EPOCHS * _epochDuration == ROUND_SIZE, Errors.TallySlashingProposer__RoundSizeMustBeMultipleOfEpochDuration(...));
-  const roundSizeInSlots = config.slashingRoundSizeInEpochs * config.aztecEpochDuration;
-
-  // From: require(QUORUM > 0, Errors.TallySlashingProposer__QuorumMustBeGreaterThanZero());
-  const { slashingQuorum } = config;
-  if (slashingQuorum !== undefined && slashingQuorum <= 0) {
-    errors.push(`slashingQuorum (${slashingQuorum}) must be greater than 0`);
-  }
-
-  // From: require(ROUND_SIZE > 1, Errors.TallySlashingProposer__InvalidQuorumAndRoundSize(QUORUM, ROUND_SIZE));
-  if (roundSizeInSlots <= 1) {
-    errors.push(`slashing round size in slots (${roundSizeInSlots}) must be greater than 1`);
-  }
-
-  // From: require(_slashAmounts[0] <= _slashAmounts[1], Errors.TallySlashingProposer__InvalidSlashAmounts(_slashAmounts));
-  if (config.slashAmountSmall > config.slashAmountMedium) {
-    errors.push(
-      `slashAmountSmall (${config.slashAmountSmall}) must be less than or equal to slashAmountMedium (${config.slashAmountMedium})`,
-    );
-  }
-
-  // From: require(_slashAmounts[1] <= _slashAmounts[2], Errors.TallySlashingProposer__InvalidSlashAmounts(_slashAmounts));
-  if (config.slashAmountMedium > config.slashAmountLarge) {
-    errors.push(
-      `slashAmountMedium (${config.slashAmountMedium}) must be less than or equal to slashAmountLarge (${config.slashAmountLarge})`,
-    );
-  }
-
-  // From: require(LIFETIME_IN_ROUNDS < ROUNDABOUT_SIZE, Errors.TallySlashingProposer__LifetimeMustBeLessThanRoundabout(...));
-  const ROUNDABOUT_SIZE = 128; // Constant from TallySlashingProposer
-  if (config.slashingLifetimeInRounds >= ROUNDABOUT_SIZE) {
-    errors.push(`slashingLifetimeInRounds (${config.slashingLifetimeInRounds}) must be less than ${ROUNDABOUT_SIZE}`);
-  }
-
-  // From: require(ROUND_SIZE_IN_EPOCHS > 0, Errors.TallySlashingProposer__RoundSizeInEpochsMustBeGreaterThanZero(...));
-  if (config.slashingRoundSizeInEpochs <= 0) {
-    errors.push(`slashingRoundSizeInEpochs (${config.slashingRoundSizeInEpochs}) must be greater than 0`);
-  }
-
-  // From: require(ROUND_SIZE < MAX_ROUND_SIZE, Errors.TallySlashingProposer__RoundSizeTooLarge(ROUND_SIZE, MAX_ROUND_SIZE));
-  const MAX_ROUND_SIZE = 1024; // Constant from TallySlashingProposer
-  if (roundSizeInSlots >= MAX_ROUND_SIZE) {
-    errors.push(`slashing round size in slots (${roundSizeInSlots}) must be less than ${MAX_ROUND_SIZE}`);
-  }
-
-  // From: require(COMMITTEE_SIZE > 0, Errors.TallySlashingProposer__CommitteeSizeMustBeGreaterThanZero(COMMITTEE_SIZE));
-  if (config.aztecTargetCommitteeSize <= 0) {
-    errors.push(`aztecTargetCommitteeSize (${config.aztecTargetCommitteeSize}) must be greater than 0`);
-  }
-
-  // From: require(voteSize <= 128, Errors.TallySlashingProposer__VoteSizeTooBig(voteSize, 128));
-  // voteSize = COMMITTEE_SIZE * ROUND_SIZE_IN_EPOCHS / 4
-  const voteSize = (config.aztecTargetCommitteeSize * config.slashingRoundSizeInEpochs) / 4;
-  if (voteSize > 128) {
-    errors.push(`vote size (${voteSize}) must be <= 128 (committee size * round size in epochs / 4)`);
-  }
-
-  // From: require(COMMITTEE_SIZE * ROUND_SIZE_IN_EPOCHS % 4 == 0, Errors.TallySlashingProposer__InvalidCommitteeAndRoundSize(...));
-  if ((config.aztecTargetCommitteeSize * config.slashingRoundSizeInEpochs) % 4 !== 0) {
-    errors.push(
-      `aztecTargetCommitteeSize * slashingRoundSizeInEpochs (${config.aztecTargetCommitteeSize * config.slashingRoundSizeInEpochs}) must be divisible by 4`,
-    );
-  }
-
-  // Slashing offset validation: should be positive to allow proper slashing timing
-  if (config.slashingOffsetInRounds < 0) {
-    errors.push('slashingOffsetInRounds cannot be negative');
-  }
-}

package/src/contracts/empire_base.ts

@@ -1,3 +1,4 @@
+import type { SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { EmpireBaseAbi } from '@aztec/l1-artifacts/EmpireBaseAbi';
@@ -11,12 +12,12 @@ export interface IEmpireBase {
   getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }>;
-  computeRound(slot: bigint): Promise<bigint>;
+  ): Promise<{ lastSignalSlot: SlotNumber; payloadWithMostSignals: Hex; quorumReached: boolean; executed: boolean }>;
+  computeRound(slot: SlotNumber): Promise<bigint>;
   createSignalRequest(payload: Hex): L1TxRequest;
   createSignalRequestWithSignature(
     payload: Hex,
-    round: bigint,
+    slot: SlotNumber,
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,
@@ -51,7 +52,7 @@ export function encodeSignalWithSignature(payload: Hex, signature: Signature) {
 export async function signSignalWithSig(
   signer: (msg: TypedDataDefinition) => Promise<Hex>,
   payload: Hex,
-  slot: bigint,
+  slot: SlotNumber,
   instance: Hex,
   verifyingContract: Hex,
   chainId: number,
@@ -79,7 +80,7 @@ export async function signSignalWithSig(
 
   const message = {
     payload,
-    slot,
+    slot: BigInt(slot),
     instance,
   };
 

package/src/contracts/empire_slashing_proposer.ts

@@ -1,3 +1,4 @@
+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';
@@ -67,8 +68,8 @@ export class EmpireSlashingProposerContract extends EventEmitter implements IEmp
     return this.proposer.read.getCurrentRound();
   }
 
-  public computeRound(slot: bigint): Promise<bigint> {
-    return this.proposer.read.computeRound([slot]);
+  public computeRound(slot: SlotNumber): Promise<bigint> {
+    return this.proposer.read.computeRound([BigInt(slot)]);
   }
 
   public getInstance() {
@@ -78,8 +79,18 @@ export class EmpireSlashingProposerContract extends EventEmitter implements IEmp
   public async getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }> {
-    return await this.proposer.read.getRoundData([rollupAddress, round]);
+  ): 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> {
@@ -95,7 +106,7 @@ export class EmpireSlashingProposerContract extends EventEmitter implements IEmp
 
   public async createSignalRequestWithSignature(
     payload: Hex,
-    slot: bigint,
+    slot: SlotNumber,
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,

package/src/contracts/governance_proposer.ts

@@ -1,3 +1,4 @@
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import { memoize } from '@aztec/foundation/decorators';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { GovernanceProposerAbi } from '@aztec/l1-artifacts/GovernanceProposerAbi';
@@ -54,15 +55,25 @@ export class GovernanceProposerContract implements IEmpireBase {
     return this.proposer.read.getInstance();
   }
 
-  public computeRound(slot: bigint): Promise<bigint> {
-    return this.proposer.read.computeRound([slot]);
+  public computeRound(slot: SlotNumber): Promise<bigint> {
+    return this.proposer.read.computeRound([BigInt(slot)]);
   }
 
   public async getRoundInfo(
     rollupAddress: Hex,
     round: bigint,
-  ): Promise<{ lastSignalSlot: bigint; payloadWithMostSignals: Hex; executed: boolean }> {
-    return await this.proposer.read.getRoundData([rollupAddress, round]);
+  ): 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> {
@@ -78,7 +89,7 @@ export class GovernanceProposerContract implements IEmpireBase {
 
   public async createSignalRequestWithSignature(
     payload: Hex,
-    slot: bigint,
+    slot: SlotNumber,
     chainId: number,
     signerAddress: Hex,
     signer: (msg: TypedDataDefinition) => Promise<Hex>,

package/src/contracts/inbox.ts

@@ -5,7 +5,7 @@ import { InboxAbi } from '@aztec/l1-artifacts/InboxAbi';
 import { type BlockTag, type GetContractReturnType, type Hex, getContract } from 'viem';
 
 import { getPublicClient } from '../client.js';
-import type { DeployL1ContractsReturnType } from '../deploy_l1_contracts.js';
+import type { DeployAztecL1ContractsReturnType } from '../deploy_aztec_l1_contracts.js';
 import type { L1ReaderConfig } from '../l1_reader.js';
 import type { ViemClient } from '../types.js';
 import { checkBlockTag } from './utils.js';
@@ -13,7 +13,7 @@ import { checkBlockTag } from './utils.js';
 export class InboxContract {
   private readonly inbox: GetContractReturnType<typeof InboxAbi, ViemClient>;
 
-  static getFromL1ContractsValues(deployL1ContractsValues: DeployL1ContractsReturnType) {
+  static getFromL1ContractsValues(deployL1ContractsValues: DeployAztecL1ContractsReturnType) {
     const {
       l1Client,
       l1ContractAddresses: { inboxAddress },
@@ -45,6 +45,11 @@ export class InboxContract {
     return this.inbox;
   }
 
+  public async getLag(opts: { blockTag?: BlockTag; blockNumber?: bigint } = {}): Promise<bigint> {
+    await checkBlockTag(opts.blockNumber, this.client);
+    return await this.inbox.read.LAG(opts);
+  }
+
   public async getState(opts: { blockTag?: BlockTag; blockNumber?: bigint } = {}): Promise<InboxContractState> {
     await checkBlockTag(opts.blockNumber, this.client);
     const state = await this.inbox.read.getState(opts);