@aztec/stdlib 0.0.1-commit.96dac018d → 0.0.1-commit.993d240

package/src/rollup/block_headers_hash.ts

@@ -1,5 +1,7 @@
+import { DomainSeparator } from '@aztec/constants';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { computeUnbalancedPoseidonRoot } from '@aztec/foundation/trees';
+import { computeUnbalancedMerkleTreeRootAsync } from '@aztec/foundation/trees';
 
 import type { BlockHeader } from '../tx/block_header.js';
 
@@ -7,6 +9,13 @@ export async function computeBlockHeadersHash(blockHeaders: BlockHeader[]): Prom
   const blockHeaderHashes = await Promise.all(blockHeaders.map(header => header.hash()));
   // Must match the implementation in merge_block_rollups.nr, with the **unbalanced** rollup structure
   // (see validate_consecutive_block_rollups.nr > assert_rollups_filled_greedily.nr).
-  const blockHeadersHash = await computeUnbalancedPoseidonRoot(blockHeaderHashes.map(hash => hash.toBuffer()));
+  const blockHeadersHasher = async (left: Uint8Array, right: Uint8Array) =>
+    (
+      await poseidon2HashWithSeparator([Buffer.from(left), Buffer.from(right)], DomainSeparator.BLOCK_HEADERS_HASH)
+    ).toBuffer() as Buffer<ArrayBuffer>;
+  const blockHeadersHash = await computeUnbalancedMerkleTreeRootAsync(
+    blockHeaderHashes.map(hash => hash.toBuffer()),
+    blockHeadersHasher,
+  );
   return Fr.fromBuffer(blockHeadersHash);
 }

package/src/rollup/block_rollup_public_inputs.ts

@@ -119,6 +119,19 @@ export class BlockRollupPublicInputs {
     return this.toBuffer();
   }
 
+  toInspect() {
+    return {
+      previousArchiveRoot: this.previousArchive.root.toString(),
+      newArchiveRoot: this.newArchive.root.toString(),
+      blockHeadersHash: this.blockHeadersHash.toString(),
+      inHash: this.inHash.toString(),
+      outHash: this.outHash.toString(),
+      timestamp: this.timestamp.toString(),
+      accumulatedFees: this.accumulatedFees.toString(),
+      accumulatedManaUsed: this.accumulatedManaUsed.toString(),
+    };
+  }
+
   static get schema() {
     return bufferSchemaFor(BlockRollupPublicInputs);
   }

package/src/rollup/checkpoint_rollup_public_inputs.ts

@@ -101,6 +101,16 @@ export class CheckpointRollupPublicInputs {
     return this.toBuffer();
   }
 
+  toInspect() {
+    return {
+      checkpointHeaderHash: this.checkpointHeaderHashes[0].toString(),
+      previousArchiveRoot: this.previousArchive.root.toString(),
+      newArchiveRoot: this.newArchive.root.toString(),
+      previousOutHashRoot: this.previousOutHash.root.toString(),
+      newOutHashRoot: this.newOutHash.root.toString(),
+    };
+  }
+
   /** Creates an instance from a hex string. */
   static get schema() {
     return bufferSchemaFor(CheckpointRollupPublicInputs);

package/src/schemas/schemas.ts

@@ -89,7 +89,10 @@ export const AbiDecodedSchema: ZodFor<AbiDecoded> = z.union([
   z.boolean(),
   schemas.AztecAddress,
   z.array(z.lazy(() => AbiDecodedSchema)),
-  z.record(z.lazy(() => AbiDecodedSchema)),
+  z.record(
+    z.string(),
+    z.lazy(() => AbiDecodedSchema),
+  ),
 ]);
 
 // C++ only supports null values, which we want to convert to undefined.
@@ -103,6 +106,8 @@ export {
   hexSchemaFor,
   bufferSchemaFor,
   type ApiSchemaFor,
+  getSchemaParameters,
+  getSchemaReturnType,
   optional,
   mapSchema,
   pickFromSchema,

package/src/slashing/helpers.ts

@@ -48,11 +48,12 @@ export function getPenaltyForOffense(
   offense: OffenseType,
   config: Pick<
     SlasherConfig,
-    | 'slashAttestDescendantOfInvalidPenalty'
+    | 'slashProposeDescendantOfCheckpointWithInvalidAttestationsPenalty'
     | 'slashBroadcastedInvalidBlockPenalty'
+    | 'slashBroadcastedInvalidCheckpointProposalPenalty'
     | 'slashDuplicateProposalPenalty'
     | 'slashDuplicateAttestationPenalty'
-    | 'slashPrunePenalty'
+    | 'slashAttestInvalidCheckpointProposalPenalty'
     | 'slashDataWithholdingPenalty'
     | 'slashUnknownPenalty'
     | 'slashInactivityPenalty'
@@ -60,8 +61,6 @@ export function getPenaltyForOffense(
   >,
 ) {
   switch (offense) {
-    case OffenseType.VALID_EPOCH_PRUNED:
-      return config.slashPrunePenalty;
     case OffenseType.DATA_WITHHOLDING:
       return config.slashDataWithholdingPenalty;
     case OffenseType.INACTIVITY:
@@ -69,14 +68,18 @@ export function getPenaltyForOffense(
     case OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS:
     case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
       return config.slashProposeInvalidAttestationsPenalty;
-    case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
-      return config.slashAttestDescendantOfInvalidPenalty;
+    case OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS:
+      return config.slashProposeDescendantOfCheckpointWithInvalidAttestationsPenalty;
     case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
       return config.slashBroadcastedInvalidBlockPenalty;
+    case OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL:
+      return config.slashBroadcastedInvalidCheckpointProposalPenalty;
     case OffenseType.DUPLICATE_PROPOSAL:
       return config.slashDuplicateProposalPenalty;
     case OffenseType.DUPLICATE_ATTESTATION:
       return config.slashDuplicateAttestationPenalty;
+    case OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL:
+      return config.slashAttestInvalidCheckpointProposalPenalty;
     case OffenseType.UNKNOWN:
       return config.slashUnknownPenalty;
     default: {
@@ -89,17 +92,18 @@ export function getPenaltyForOffense(
 /** Returns whether the `epochOrSlot` field for an offense references an epoch or a slot */
 export function getTimeUnitForOffense(offense: OffenseType): 'epoch' | 'slot' {
   switch (offense) {
-    case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
+    case OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS:
     case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
+    case OffenseType.DATA_WITHHOLDING:
+    case OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL:
     case OffenseType.DUPLICATE_PROPOSAL:
     case OffenseType.DUPLICATE_ATTESTATION:
+    case OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL:
     case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
     case OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS:
       return 'slot';
     case OffenseType.INACTIVITY:
-    case OffenseType.DATA_WITHHOLDING:
     case OffenseType.UNKNOWN:
-    case OffenseType.VALID_EPOCH_PRUNED:
       return 'epoch';
     default: {
       const _exhaustiveCheck: never = offense;

package/src/slashing/index.ts

@@ -1,6 +1,5 @@
 export * from './types.js';
 export * from './interfaces.js';
 export * from './helpers.js';
-export * from './empire.js';
-export * from './tally.js';
+export * from './votes.js';
 export * from './serialization.js';

package/src/slashing/serialization.ts

@@ -1,15 +1,7 @@
-import { times } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { BufferReader, bigintToUInt64BE, bigintToUInt128BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
-import type {
-  Offense,
-  OffenseType,
-  SlashPayload,
-  SlashPayloadRound,
-  ValidatorSlash,
-  ValidatorSlashOffense,
-} from './types.js';
+import type { Offense, OffenseType } from './types.js';
 
 export function serializeOffense(offense: Offense): Buffer {
   return serializeToBuffer(
@@ -29,75 +21,3 @@ export function deserializeOffense(buffer: Buffer): Offense {
 
   return { validator, amount, offenseType: offense, epochOrSlot };
 }
-
-function serializeValidatorSlashOffense(offense: ValidatorSlashOffense): Buffer {
-  return serializeToBuffer(bigintToUInt64BE(offense.epochOrSlot), offense.offenseType);
-}
-
-function deserializeValidatorSlashOffense(buffer: Buffer | BufferReader): ValidatorSlashOffense {
-  const reader = BufferReader.asReader(buffer);
-  return {
-    epochOrSlot: reader.readUInt64(),
-    offenseType: reader.readNumber() as OffenseType,
-  };
-}
-
-function serializeValidatorSlash(slash: ValidatorSlash): Buffer {
-  return serializeToBuffer(
-    slash.validator,
-    bigintToUInt128BE(slash.amount),
-    slash.offenses.length,
-    slash.offenses.map(serializeValidatorSlashOffense),
-  );
-}
-
-function deserializeValidatorSlash(buffer: Buffer | BufferReader): ValidatorSlash {
-  const reader = BufferReader.asReader(buffer);
-  const validator = reader.readObject(EthAddress);
-  const amount = reader.readUInt128();
-  const offensesCount = reader.readNumber();
-  const offenses = times(offensesCount, () => deserializeValidatorSlashOffense(reader));
-
-  return { validator, amount, offenses };
-}
-
-export function serializeSlashPayload(payload: SlashPayload): Buffer {
-  return serializeToBuffer(
-    payload.address,
-    payload.slashes.length,
-    payload.slashes.map(serializeValidatorSlash),
-    bigintToUInt64BE(payload.timestamp),
-  );
-}
-
-export function deserializeSlashPayload(buffer: Buffer): SlashPayload {
-  const reader = BufferReader.asReader(buffer);
-  const address = reader.readObject(EthAddress);
-  const slashesCount = reader.readNumber();
-  const slashes = times(slashesCount, () => deserializeValidatorSlash(reader));
-  const timestamp = reader.readUInt64();
-  return { address, slashes, timestamp };
-}
-
-export function serializeSlashPayloadRound(payload: SlashPayloadRound): Buffer {
-  return serializeToBuffer(
-    payload.address,
-    payload.slashes.length,
-    payload.slashes.map(serializeValidatorSlash),
-    bigintToUInt64BE(payload.timestamp),
-    Number(payload.votes),
-    bigintToUInt64BE(payload.round),
-  );
-}
-
-export function deserializeSlashPayloadRound(buffer: Buffer): SlashPayloadRound {
-  const reader = BufferReader.asReader(buffer);
-  const address = reader.readObject(EthAddress);
-  const slashesCount = reader.readNumber();
-  const slashes = times(slashesCount, () => deserializeValidatorSlash(reader));
-  const timestamp = reader.readUInt64();
-  const votes = BigInt(reader.readNumber());
-  const round = reader.readUInt64();
-
-  return { address, slashes, timestamp, votes, round };
-}

package/src/slashing/types.ts

@@ -6,10 +6,8 @@ import { schemas, zodFor } from '../schemas/index.js';
 
 export enum OffenseType {
   UNKNOWN = 0,
-  /** The data for proving an epoch was not publicly available, we slash its committee */
+  /** The data for the txs in a published checkpoint was not available within the tolerance window, we slash the checkpoint's attesters */
   DATA_WITHHOLDING = 1,
-  /** An epoch was not successfully proven in time, we slash its committee */
-  VALID_EPOCH_PRUNED = 2,
   /** A proposer failed to attest or propose during an epoch according to the Sentinel */
   INACTIVITY = 3,
   /** A proposer sent an invalid block proposal over the p2p network to the committee */
@@ -18,12 +16,16 @@ export enum OffenseType {
   PROPOSED_INSUFFICIENT_ATTESTATIONS = 5,
   /** A proposer pushed to L1 a block with incorrect committee attestations (ie signature from a non-committee member) */
   PROPOSED_INCORRECT_ATTESTATIONS = 6,
-  /** A committee member attested to a block that was built as a descendent of an invalid block (as in a block with invalid attestations) */
-  ATTESTED_DESCENDANT_OF_INVALID = 7,
+  /** A proposer published a checkpoint to L1 that builds on an invalid checkpoint (as in a checkpoint with invalid or insufficient attestations) */
+  PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS = 7,
   /** A proposer sent duplicate proposals for the same position (slot, indexWithinCheckpoint for blocks or slot for checkpoints) */
   DUPLICATE_PROPOSAL = 8,
   /** A validator signed attestations for different proposals at the same slot (equivocation) */
   DUPLICATE_ATTESTATION = 9,
+  /** A committee member attested to a checkpoint proposal in a slot with an invalid block proposal */
+  ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL = 10,
+  /** A proposer broadcast an invalid checkpoint proposal, detected by retained evidence or deterministic recomputation */
+  BROADCASTED_INVALID_CHECKPOINT_PROPOSAL = 11,
 }
 
 export function getOffenseTypeName(offense: OffenseType) {
@@ -32,8 +34,6 @@ export function getOffenseTypeName(offense: OffenseType) {
       return 'unknown';
     case OffenseType.DATA_WITHHOLDING:
       return 'data_withholding';
-    case OffenseType.VALID_EPOCH_PRUNED:
-      return 'valid_epoch_pruned';
     case OffenseType.INACTIVITY:
       return 'inactivity';
     case OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL:
@@ -42,12 +42,16 @@ export function getOffenseTypeName(offense: OffenseType) {
       return 'proposed_insufficient_attestations';
     case OffenseType.PROPOSED_INCORRECT_ATTESTATIONS:
       return 'proposed_incorrect_attestations';
-    case OffenseType.ATTESTED_DESCENDANT_OF_INVALID:
-      return 'attested_descendant_of_invalid';
+    case OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS:
+      return 'proposed_descendant_of_checkpoint_with_invalid_attestations';
     case OffenseType.DUPLICATE_PROPOSAL:
       return 'duplicate_proposal';
     case OffenseType.DUPLICATE_ATTESTATION:
       return 'duplicate_attestation';
+    case OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL:
+      return 'attested_to_invalid_checkpoint_proposal';
+    case OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL:
+      return 'broadcasted_invalid_checkpoint_proposal';
     default:
       throw new Error(`Unknown offense type: ${offense}`);
   }
@@ -58,14 +62,15 @@ export const OffenseTypeSchema = z.nativeEnum(OffenseType);
 export const OffenseToBigInt: Record<OffenseType, bigint> = {
   [OffenseType.UNKNOWN]: 0n,
   [OffenseType.DATA_WITHHOLDING]: 1n,
-  [OffenseType.VALID_EPOCH_PRUNED]: 2n,
   [OffenseType.INACTIVITY]: 3n,
   [OffenseType.BROADCASTED_INVALID_BLOCK_PROPOSAL]: 4n,
   [OffenseType.PROPOSED_INSUFFICIENT_ATTESTATIONS]: 5n,
   [OffenseType.PROPOSED_INCORRECT_ATTESTATIONS]: 6n,
-  [OffenseType.ATTESTED_DESCENDANT_OF_INVALID]: 7n,
+  [OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS]: 7n,
   [OffenseType.DUPLICATE_PROPOSAL]: 8n,
   [OffenseType.DUPLICATE_ATTESTATION]: 9n,
+  [OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL]: 10n,
+  [OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL]: 11n,
 };
 
 export function bigIntToOffense(offense: bigint): OffenseType {
@@ -74,8 +79,6 @@ export function bigIntToOffense(offense: bigint): OffenseType {
       return OffenseType.UNKNOWN;
     case 1n:
       return OffenseType.DATA_WITHHOLDING;
-    case 2n:
-      return OffenseType.VALID_EPOCH_PRUNED;
     case 3n:
       return OffenseType.INACTIVITY;
     case 4n:
@@ -85,11 +88,15 @@ export function bigIntToOffense(offense: bigint): OffenseType {
     case 6n:
       return OffenseType.PROPOSED_INCORRECT_ATTESTATIONS;
     case 7n:
-      return OffenseType.ATTESTED_DESCENDANT_OF_INVALID;
+      return OffenseType.PROPOSED_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS;
     case 8n:
       return OffenseType.DUPLICATE_PROPOSAL;
     case 9n:
       return OffenseType.DUPLICATE_ATTESTATION;
+    case 10n:
+      return OffenseType.ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL;
+    case 11n:
+      return OffenseType.BROADCASTED_INVALID_CHECKPOINT_PROPOSAL;
     default:
       throw new Error(`Unknown offense: ${offense}`);
   }
@@ -126,45 +133,13 @@ export type ValidatorSlash = {
   offenses: ValidatorSlashOffense[];
 };
 
-/** Slash payload as published by the empire slash proposer */
-export type SlashPayload = {
-  address: EthAddress;
-  slashes: ValidatorSlash[];
-  timestamp: bigint;
-};
-
-/** Slash payload with round information from empire slash proposer */
-export type SlashPayloadRound = SlashPayload & { votes: bigint; round: bigint };
-
-export const SlashPayloadRoundSchema = zodFor<SlashPayloadRound>()(
-  z.object({
-    address: schemas.EthAddress,
-    timestamp: schemas.BigInt,
-    votes: schemas.BigInt,
-    round: schemas.BigInt,
-    slashes: z.array(
-      z.object({
-        validator: schemas.EthAddress,
-        amount: schemas.BigInt,
-        offenses: z.array(z.object({ offenseType: OffenseTypeSchema, epochOrSlot: schemas.BigInt })),
-      }),
-    ),
-  }),
-);
-
-/** Votes for a validator slash in the consensus slash proposer */
+/** Votes for a validator slash in the slashing proposer */
 export type ValidatorSlashVote = number;
 
 export type ProposerSlashAction =
-  /** Create a new slash payload on an empire-based slash proposer */
-  | { type: 'create-empire-payload'; data: ValidatorSlash[] }
-  /** Vote for a slashing payload on an empire-based slash proposer */
-  | { type: 'vote-empire-payload'; payload: EthAddress }
-  /** Execute a slashing payload on an empire-based slash proposer */
-  | { type: 'execute-empire-payload'; round: bigint }
-  /** Vote for offenses on a consensus slashing proposer */
+  /** Vote for offenses on the slashing proposer */
   | { type: 'vote-offenses'; votes: ValidatorSlashVote[]; committees: EthAddress[][]; round: bigint }
-  /** Execute a slashing round on a consensus slashing proposer */
+  /** Execute a slashing round on the slashing proposer */
   | { type: 'execute-slash'; committees: EthAddress[][]; round: bigint };
 
 export type ProposerSlashActionType = ProposerSlashAction['type'];

package/src/slashing/{tally.ts → votes.ts}

@@ -1,6 +1,7 @@
 import { sumBigint } from '@aztec/foundation/bigint';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import type { PartialBy } from '@aztec/foundation/types';
 
 import { getEpochForOffense } from './helpers.js';
@@ -12,6 +13,9 @@ import type { Offense, ValidatorSlashVote } from './types.js';
  * @param committees - Array of committees (each containing array of validator addresses)
  * @param epochsForCommittees - Array of epochs corresponding to each committee
  * @param settings - Settings including slashingAmounts and optional validator override lists
+ * @param settings.maxSlashedValidators - If set, limits the total number of [validator, epoch] pairs
+ *   with non-zero votes. The lowest-vote pairs are zeroed out to stay within the limit.
+ * @param logger - Logger, logs which validators were dropped.
  * @returns Array of ValidatorSlashVote, where each vote is how many slash units the validator in that position should be slashed
  */
 export function getSlashConsensusVotesFromOffenses(
@@ -22,9 +26,11 @@ export function getSlashConsensusVotesFromOffenses(
     slashingAmounts: [bigint, bigint, bigint];
     epochDuration: number;
     targetCommitteeSize: number;
+    maxSlashedValidators?: number;
   },
+  logger: Logger = createLogger('slasher:votes'),
 ): ValidatorSlashVote[] {
-  const { slashingAmounts, targetCommitteeSize } = settings;
+  const { slashingAmounts, targetCommitteeSize, maxSlashedValidators } = settings;
 
   if (committees.length !== epochsForCommittees.length) {
     throw new Error('committees and epochsForCommittees must have the same length');
@@ -53,6 +59,33 @@ export function getSlashConsensusVotesFromOffenses(
     return padArrayEnd(votes, 0, targetCommitteeSize);
   });
 
+  // if a cap is set, zero out the lowest-vote [validator, epoch] pairs so that the most severe slashes stay.
+  if (maxSlashedValidators === undefined) {
+    return votes;
+  }
+
+  const nonZeroByDescendingVote = [...votes.entries()].filter(([, vote]) => vote > 0).sort(([, a], [, b]) => b - a);
+
+  const toTruncate = nonZeroByDescendingVote.slice(maxSlashedValidators);
+  for (const [idx] of toTruncate) {
+    votes[idx] = 0;
+  }
+
+  if (toTruncate.length > 0) {
+    const truncated = toTruncate.map(([idx]) => {
+      const committeeIndex = Math.floor(idx / targetCommitteeSize);
+      const positionInCommittee = idx % targetCommitteeSize;
+      return {
+        validator: committees[committeeIndex][positionInCommittee].toString(),
+        epoch: epochsForCommittees[committeeIndex],
+      };
+    });
+    logger.warn(
+      `Truncated ${toTruncate.length} validator-epoch pairs to stay within limit of ${maxSlashedValidators}`,
+      { truncated },
+    );
+  }
+
   return votes;
 }
 

package/src/stats/stats.ts

@@ -84,7 +84,11 @@ export type NodeSyncedChainHistoryStats = {
 
 export type ClientCircuitName =
   | 'private-kernel-init'
+  | 'private-kernel-init-2'
+  | 'private-kernel-init-3'
   | 'private-kernel-inner'
+  | 'private-kernel-inner-2'
+  | 'private-kernel-inner-3'
   | 'private-kernel-reset'
   | 'private-kernel-tail'
   | 'private-kernel-tail-to-public'