@aztec/stdlib 0.0.1-commit.d1f2d6c → 0.0.1-commit.d431d1c

package/src/interfaces/block-builder.ts

@@ -1,7 +1,7 @@
 import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { Fr } from '@aztec/foundation/curves/bn254';
 
-import type { L2Block } from '../block/l2_block.js';
+import type { L2BlockNew } from '../block/l2_block_new.js';
 import type { ChainConfig, SequencerConfig } from '../config/chain-config.js';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
 import type { Gas } from '../gas/gas.js';
@@ -31,7 +31,7 @@ export interface IBlockFactory extends ProcessedTxHandler {
   /**
    * Assembles the block and updates the archive tree.
    */
-  setBlockCompleted(expectedBlockHeader?: BlockHeader): Promise<L2Block>;
+  setBlockCompleted(expectedBlockHeader?: BlockHeader): Promise<L2BlockNew>;
 }
 
 export interface PublicProcessorLimits {
@@ -63,7 +63,7 @@ export const FullNodeBlockBuilderConfigKeys: (keyof FullNodeBlockBuilderConfig)[
 
 /** Result of building a block within a checkpoint. */
 export interface BuildBlockInCheckpointResult {
-  block: L2Block;
+  block: L2BlockNew;
   publicGas: Gas;
   publicProcessorDuration: number;
   numTxs: number;

package/src/interfaces/configs.ts

@@ -67,7 +67,9 @@ export interface SequencerConfig {
   blockDurationMs?: number;
   /** Have sequencer build and publish an empty checkpoint if there are no txs */
   buildCheckpointIfEmpty?: boolean;
-  /** Skip pushing proposed blocks to archiver (default: false) */
+
+  // TODO(palla/mbps): Change default to false once block sync is stable
+  /** Skip pushing proposed blocks to archiver (default: true) */
   skipPushProposedBlocksToArchiver?: boolean;
 }
 

package/src/interfaces/prover-client.ts

@@ -17,12 +17,6 @@ export type ActualProverConfig = {
   proverTestDelayMs: number;
   /** If using realistic delays, what percentage of realistic times to apply. */
   proverTestDelayFactor: number;
-  /**
-   * Whether to abort pending proving jobs when the orchestrator is cancelled.
-   * When false (default), jobs remain in the broker queue and can be reused on restart/reorg.
-   * When true, jobs are explicitly cancelled with the broker, which prevents reuse.
-   */
-  cancelJobsOnStop: boolean;
 };
 
 /**
@@ -49,7 +43,6 @@ export const ProverConfigSchema = zodFor<ProverConfig>()(
     proverTestDelayFactor: z.number(),
     proverAgentCount: z.number(),
     failedProofStore: z.string().optional(),
-    cancelJobsOnStop: z.boolean(),
   }),
 );
 
@@ -92,14 +85,6 @@ export const proverConfigMappings: ConfigMappingsType<ProverConfig> = {
     description:
       'Store for failed proof inputs. Google cloud storage is only supported at the moment. Set this value as gs://bucket-name/path/to/store.',
   },
-  cancelJobsOnStop: {
-    env: 'PROVER_CANCEL_JOBS_ON_STOP',
-    description:
-      'Whether to abort pending proving jobs when the orchestrator is cancelled. ' +
-      'When false (default), jobs remain in the broker queue and can be reused on restart/reorg. ' +
-      'When true, jobs are explicitly cancelled with the broker, which prevents reuse.',
-    ...booleanConfigHelper(false),
-  },
 };
 
 function parseProverId(str?: string) {

package/src/interfaces/tx_provider.ts

@@ -1,4 +1,4 @@
-import type { L2Block } from '@aztec/stdlib/block';
+import type { L2BlockNew } from '@aztec/stdlib/block';
 import type { BlockProposal } from '@aztec/stdlib/p2p';
 import { type Tx, TxHash } from '@aztec/stdlib/tx';
 
@@ -13,5 +13,5 @@ export interface ITxProvider {
     opts: { pinnedPeer: PeerId | undefined; deadline: Date },
   ): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
 
-  getTxsForBlock(block: L2Block, opts: { deadline: Date }): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
+  getTxsForBlock(block: L2BlockNew, opts: { deadline: Date }): Promise<{ txs: Tx[]; missingTxs: TxHash[] }>;
 }

package/src/interfaces/validator.ts

@@ -55,7 +55,8 @@ export type ValidatorClientConfig = ValidatorHASignerConfig & {
   /** Skip checkpoint proposal validation and always attest (default: true) */
   skipCheckpointProposalValidation?: boolean;
 
-  /** Skip pushing re-executed blocks to archiver (default: false) */
+  // TODO(palla/mbps): Change default to false once block sync is stable
+  /** Skip pushing re-executed blocks to archiver (default: true) */
   skipPushProposedBlocksToArchiver?: boolean;
 };
 

package/src/kernel/hints/build_nullifier_read_request_hints.ts

@@ -6,6 +6,7 @@ import {
 import type { Fr } from '@aztec/foundation/curves/bn254';
 import { MembershipWitness } from '@aztec/foundation/trees';
 
+import { siloNullifier } from '../../hash/hash.js';
 import type { NullifierLeafPreimage } from '../../trees/nullifier_leaf.js';
 import type { ClaimedLengthArray } from '../claimed_length_array.js';
 import type { ScopedNullifier } from '../nullifier.js';
@@ -73,6 +74,7 @@ export async function buildNullifierReadRequestHintsFromResetActions<PENDING ext
   resetActions: ReadRequestResetActions<typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>,
   maxPending: PENDING = MAX_NULLIFIER_READ_REQUESTS_PER_TX as PENDING,
   maxSettled: SETTLED = MAX_NULLIFIER_READ_REQUESTS_PER_TX as SETTLED,
+  siloed = false,
 ) {
   const builder = new NullifierReadRequestHintsBuilder(maxPending, maxSettled);
 
@@ -88,7 +90,12 @@ export async function buildNullifierReadRequestHintsFromResetActions<PENDING ext
     }
   }
 
-  const siloedValues = settledRequests.map(({ readRequest }) => readRequest.value);
+  // Compute siloed values in parallel (if not already siloed)
+  const siloedValues = siloed
+    ? settledRequests.map(({ readRequest }) => readRequest.value)
+    : await Promise.all(
+        settledRequests.map(({ readRequest }) => siloNullifier(readRequest.contractAddress, readRequest.value)),
+      );
 
   // Fetch all membership witnesses in parallel
   const membershipWitnesses = await Promise.all(siloedValues.map(value => oracle.getNullifierMembershipWitness(value)));
@@ -114,6 +121,7 @@ export async function buildNullifierReadRequestHints<PENDING extends number, SET
   futureNullifiers: ScopedNullifier[],
   maxPending: PENDING = MAX_NULLIFIER_READ_REQUESTS_PER_TX as PENDING,
   maxSettled: SETTLED = MAX_NULLIFIER_READ_REQUESTS_PER_TX as SETTLED,
+  siloed = false,
 ) {
   const resetActions = getNullifierReadRequestResetActions(nullifierReadRequests, nullifiers, futureNullifiers);
   return await buildNullifierReadRequestHintsFromResetActions(
@@ -122,5 +130,6 @@ export async function buildNullifierReadRequestHints<PENDING extends number, SET
     resetActions,
     maxPending,
     maxSettled,
+    siloed,
   );
 }

package/src/p2p/block_proposal.ts

@@ -8,8 +8,8 @@ import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { DutyType, type SigningContext } from '@aztec/validator-ha-signer/types';
 
-import type { L2Block } from '../block/l2_block.js';
 import type { L2BlockInfo } from '../block/l2_block_info.js';
+import type { L2BlockNew } from '../block/l2_block_new.js';
 import { MAX_TXS_PER_BLOCK } from '../deserialization/index.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { TxHash } from '../tx/index.js';
@@ -284,10 +284,10 @@ export class BlockProposal extends Gossipable {
   /**
    * Check if this proposal matches the given block.
    * Compares the archive root and block header.
-   * @param block - The L2Block to compare against
+   * @param block - The L2BlockNew to compare against
    * @returns True if the proposal matches the block
    */
-  matchesBlock(block: L2Block): boolean {
+  matchesBlock(block: L2BlockNew): boolean {
     return this.archiveRoot.equals(block.archive.root) && this.blockHeader.equals(block.header);
   }
 

package/src/p2p/message_validator.ts

@@ -1,22 +1,10 @@
 import type { PeerErrorSeverity } from './peer_error.js';
 
-/**
- * Result of validating a P2P message.
- * - 'accept': Message is valid and should be accepted and processed
- * - 'ignore': Message should be ignored (not propagated or processed, but sender not penalized)
- * - 'reject': Message is invalid (rejected and sender penalized)
- */
-export type ValidationResult =
-  | { result: 'accept' }
-  | { result: 'ignore' }
-  | { result: 'reject'; severity: PeerErrorSeverity };
-
 /**
  * P2PValidator
  *
- * A validator for P2P messages, which returns a ValidationResult indicating
- * whether to accept, ignore, or reject the message
+ * A validator for P2P messages, which returns a severity of error to be applied to the peer
  */
 export interface P2PValidator<T> {
-  validate(message: T): Promise<ValidationResult>;
+  validate(message: T): Promise<PeerErrorSeverity | undefined>;
 }

package/src/tests/factories.ts

@@ -1739,7 +1739,7 @@ export function makeL2Tips(
       ? typeof checkpointNumber === 'number'
         ? CheckpointNumber(checkpointNumber)
         : checkpointNumber
-      : CheckpointNumber.fromBlockNumber(bn);
+      : CheckpointNumber(bn);
   const cph = checkpointHash ?? hash;
   return {
     proposed: { number: bn, hash },

package/src/tests/jest.ts

@@ -1,26 +1,26 @@
-import { L2Block } from '../block/l2_block.js';
+import { L2BlockNew } from '../block/l2_block_new.js';
 
 /**
- * Checks if two objects are the same L2Block.
+ * Checks if two objects are the same L2BlockNew.
  *
- * Sometimes we might be comparing two L2Block instances that represent the same block but one of them might not have
+ * Sometimes we might be comparing two L2BlockNew instances that represent the same block but one of them might not have
  * calculated and filled its `blockHash` property (which is computed on demand). This function ensures both objects
- * are really the same L2Block.
+ * are really the same L2BlockNew.
  *
  * @param a - An object
  * @param b - Another object
- * @returns True if both a and b are the same L2Block
+ * @returns True if both a and b are the same L2BlockNew
  */
 export function equalL2Blocks(a: any, b: any) {
-  const aAsL2Block = a && a instanceof L2Block ? a : undefined;
-  const bAsL2Block = b && b instanceof L2Block ? b : undefined;
+  const aAsL2Block = a && a instanceof L2BlockNew ? a : undefined;
+  const bAsL2Block = b && b instanceof L2BlockNew ? b : undefined;
 
   if (aAsL2Block && bAsL2Block) {
-    // we got two L2Block instances, so we can compare them
+    // we got two L2BlockNew instances, so we can compare them
     // use a custom comparator because the blockHash property is lazily computed and one instance might not have it
     return aAsL2Block.toBuffer().equals(bAsL2Block.toBuffer());
   } else if (aAsL2Block || bAsL2Block) {
-    // one value is an L2Block and the other isn't. Definitely not equal.
+    // one value is an L2BlockNew and the other isn't. Definitely not equal.
     return false;
   } else {
     // we don't know what they are, tell Jest to keep looking

package/src/tests/mocks.ts

@@ -22,7 +22,7 @@ import { AvmCircuitPublicInputs } from '../avm/avm_circuit_public_inputs.js';
 import { PublicDataWrite } from '../avm/public_data_write.js';
 import { RevertCode } from '../avm/revert_code.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { CheckpointedL2Block, CommitteeAttestation, L2Block } from '../block/index.js';
+import { CheckpointedL2Block, CommitteeAttestation, L2BlockNew } from '../block/index.js';
 import type { CommitteeAttestationsAndSigners } from '../block/proposal/attestations_and_signers.js';
 import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { L1PublishedData } from '../checkpoint/published_checkpoint.js';
@@ -404,37 +404,32 @@ export async function mockCheckpointAndMessages(
     numL1ToL2Messages = 1,
     makeBlockOptions = () => ({}),
     previousArchive,
-    maxEffects,
     ...options
   }: {
     startBlockNumber?: BlockNumber;
     numBlocks?: number;
     numTxsPerBlock?: number;
     numL1ToL2Messages?: number;
-    makeBlockOptions?: (blockNumber: BlockNumber) => Partial<Parameters<typeof L2Block.random>[1]>;
+    makeBlockOptions?: (blockNumber: BlockNumber) => Partial<Parameters<typeof L2BlockNew.random>[1]>;
     previousArchive?: AppendOnlyTreeSnapshot;
-    blocks?: L2Block[];
-    maxEffects?: number;
+    blocks?: L2BlockNew[];
   } & Partial<Parameters<typeof Checkpoint.random>[1]> &
-    Partial<Parameters<typeof L2Block.random>[1]> = {},
+    Partial<Parameters<typeof L2BlockNew.random>[1]> = {},
 ) {
-  const slotNumber = options.slotNumber ?? SlotNumber(Number(checkpointNumber) * 10);
+  const slotNumber = options.slotNumber ?? SlotNumber(checkpointNumber * 10);
   const blocksAndMessages = [];
   // Track the previous block's archive to ensure consecutive blocks have consistent archive roots.
   // The current block's header.lastArchive must equal the previous block's archive.
   let lastArchive: AppendOnlyTreeSnapshot | undefined = previousArchive;
-  // Pass maxEffects via txOptions so it reaches TxEffect.random
-  const txOptions = maxEffects !== undefined ? { maxEffects } : {};
   for (let i = 0; i < (blocks?.length ?? numBlocks); i++) {
     const blockNumber = BlockNumber(startBlockNumber + i);
     const { block, messages } = {
       block:
         blocks?.[i] ??
-        (await L2Block.random(blockNumber, {
+        (await L2BlockNew.random(blockNumber, {
           checkpointNumber,
           indexWithinCheckpoint: IndexWithinCheckpoint(i),
           txsPerBlock: numTxsPerBlock,
-          txOptions,
           slotNumber,
           ...options,
           ...makeBlockOptions(blockNumber),
@@ -675,15 +670,15 @@ export const makeCheckpointAttestationFromCheckpoint = (
 };
 
 /**
- * Create a checkpoint attestation from an L2Block
- * Note: This is a compatibility function for tests. L2Block doesn't have a checkpoint header directly.
+ * Create a checkpoint attestation from an L2BlockNew
+ * Note: This is a compatibility function for tests. L2BlockNew doesn't have a checkpoint header directly.
  */
 export const makeCheckpointAttestationFromBlock = (
-  block: L2Block,
+  block: L2BlockNew,
   attesterSigner?: Secp256k1Signer,
   proposerSigner?: Secp256k1Signer,
 ): CheckpointAttestation => {
-  // For L2Block, we create a minimal checkpoint header for testing purposes
+  // For L2BlockNew, we create a minimal checkpoint header for testing purposes
   const header = CheckpointHeader.empty({
     lastArchiveRoot: block.header.lastArchive.root,
     slotNumber: block.slot,
@@ -699,7 +694,7 @@ export async function randomPublishedL2Block(
   l2BlockNumber: number,
   opts: { signers?: Secp256k1Signer[] } = {},
 ): Promise<CheckpointedL2Block> {
-  const block = await L2Block.random(BlockNumber(l2BlockNumber));
+  const block = await L2BlockNew.random(BlockNumber(l2BlockNumber));
   const l1 = L1PublishedData.fromFields({
     blockNumber: BigInt(block.number),
     timestamp: block.header.globalVariables.timestamp,
@@ -707,9 +702,7 @@ export async function randomPublishedL2Block(
   });
 
   const signers = opts.signers ?? times(3, () => Secp256k1Signer.random());
-  const checkpoint = await Checkpoint.random(CheckpointNumber.fromBlockNumber(BlockNumber(l2BlockNumber)), {
-    numBlocks: 0,
-  });
+  const checkpoint = await Checkpoint.random(CheckpointNumber(l2BlockNumber), { numBlocks: 0 });
   checkpoint.blocks = [block];
   const atts = signers.map(signer =>
     makeCheckpointAttestation({
@@ -721,5 +714,5 @@ export async function randomPublishedL2Block(
   const attestations = atts.map(
     (attestation, i) => new CommitteeAttestation(signers[i].address, attestation.signature),
   );
-  return new CheckpointedL2Block(CheckpointNumber.fromBlockNumber(BlockNumber(l2BlockNumber)), block, l1, attestations);
+  return new CheckpointedL2Block(CheckpointNumber(l2BlockNumber), block, l1, attestations);
 }

package/src/tx/tx_receipt.ts

@@ -1,4 +1,5 @@
 import { BlockNumber, BlockNumberSchema } from '@aztec/foundation/branded-types';
+import type { FieldsOf } from '@aztec/foundation/types';
 
 import { z } from 'zod';
 
@@ -7,28 +8,12 @@ import { L2BlockHash } from '../block/block_hash.js';
 import { type ZodFor, schemas } from '../schemas/schemas.js';
 import { TxHash } from './tx_hash.js';
 
-/** Block inclusion/finalization status. */
+/**
+ * Possible status of a transaction.
+ */
 export enum TxStatus {
   DROPPED = 'dropped',
   PENDING = 'pending',
-  PROPOSED = 'proposed',
-  CHECKPOINTED = 'checkpointed',
-  PROVEN = 'proven',
-  FINALIZED = 'finalized', // TODO(#13569): Implement finalized status properly
-}
-
-/** Tx status sorted by finalization progress. */
-export const SortedTxStatuses: TxStatus[] = [
-  TxStatus.DROPPED,
-  TxStatus.PENDING,
-  TxStatus.PROPOSED,
-  TxStatus.CHECKPOINTED,
-  TxStatus.PROVEN,
-  TxStatus.FINALIZED,
-];
-
-/** Execution result - only set when tx is in a block. */
-export enum TxExecutionResult {
   SUCCESS = 'success',
   APP_LOGIC_REVERTED = 'app_logic_reverted',
   TEARDOWN_REVERTED = 'teardown_reverted',
@@ -45,12 +30,10 @@ export class TxReceipt {
   constructor(
     /** A unique identifier for a transaction. */
     public txHash: TxHash,
-    /** The transaction's block finalization status. */
+    /** The transaction's status. */
     public status: TxStatus,
-    /** The execution result of the transaction, only set when tx is in a block. */
-    public executionResult: TxExecutionResult | undefined,
     /** Description of transaction error, if any. */
-    public error: string | undefined,
+    public error: string,
     /** The transaction fee paid for the transaction. */
     public transactionFee?: bigint,
     /** The hash of the block containing the transaction. */
@@ -59,38 +42,8 @@ export class TxReceipt {
     public blockNumber?: BlockNumber,
   ) {}
 
-  /** Returns true if the transaction was executed successfully. */
-  hasExecutionSucceeded(): boolean {
-    return this.executionResult === TxExecutionResult.SUCCESS;
-  }
-
-  /** Returns true if the transaction execution reverted. */
-  hasExecutionReverted(): boolean {
-    return this.executionResult !== undefined && this.executionResult !== TxExecutionResult.SUCCESS;
-  }
-
-  /** Returns true if the transaction has been included in a block (proposed, checkpointed, proven, or finalized). */
-  isMined(): boolean {
-    return (
-      this.status === TxStatus.PROPOSED ||
-      this.status === TxStatus.CHECKPOINTED ||
-      this.status === TxStatus.PROVEN ||
-      this.status === TxStatus.FINALIZED
-    );
-  }
-
-  /** Returns true if the transaction is pending. */
-  isPending(): boolean {
-    return this.status === TxStatus.PENDING;
-  }
-
-  /** Returns true if the transaction was dropped. */
-  isDropped(): boolean {
-    return this.status === TxStatus.DROPPED;
-  }
-
   static empty() {
-    return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, undefined, undefined);
+    return new TxReceipt(TxHash.zero(), TxStatus.DROPPED, '');
   }
 
   static get schema(): ZodFor<TxReceipt> {
@@ -98,28 +51,18 @@ export class TxReceipt {
       .object({
         txHash: TxHash.schema,
         status: z.nativeEnum(TxStatus),
-        executionResult: z.nativeEnum(TxExecutionResult).optional(),
-        error: z.string().optional(),
+        error: z.string(),
         blockHash: L2BlockHash.schema.optional(),
         blockNumber: BlockNumberSchema.optional(),
         transactionFee: schemas.BigInt.optional(),
       })
-      .transform(fields => TxReceipt.from(fields));
+      .transform(TxReceipt.from);
   }
 
-  static from(fields: {
-    txHash: TxHash;
-    status: TxStatus;
-    executionResult?: TxExecutionResult;
-    error?: string;
-    transactionFee?: bigint;
-    blockHash?: L2BlockHash;
-    blockNumber?: BlockNumber;
-  }) {
+  static from(fields: FieldsOf<TxReceipt>) {
     return new TxReceipt(
       fields.txHash,
       fields.status,
-      fields.executionResult,
       fields.error,
       fields.transactionFee,
       fields.blockHash,
@@ -127,15 +70,15 @@ export class TxReceipt {
     );
   }
 
-  public static executionResultFromRevertCode(revertCode: RevertCode): TxExecutionResult {
+  public static statusFromRevertCode(revertCode: RevertCode) {
     if (revertCode.equals(RevertCode.OK)) {
-      return TxExecutionResult.SUCCESS;
+      return TxStatus.SUCCESS;
     } else if (revertCode.equals(RevertCode.APP_LOGIC_REVERTED)) {
-      return TxExecutionResult.APP_LOGIC_REVERTED;
+      return TxStatus.APP_LOGIC_REVERTED;
     } else if (revertCode.equals(RevertCode.TEARDOWN_REVERTED)) {
-      return TxExecutionResult.TEARDOWN_REVERTED;
+      return TxStatus.TEARDOWN_REVERTED;
     } else if (revertCode.equals(RevertCode.BOTH_REVERTED)) {
-      return TxExecutionResult.BOTH_REVERTED;
+      return TxStatus.BOTH_REVERTED;
     } else {
       throw new Error(`Unknown revert code: ${revertCode.getCode()}`);
     }

package/dest/block/l2_block.d.ts.map

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