@aztec/sequencer-client 0.55.1 → 0.56.0

package/src/block_builder/orchestrator.ts

@@ -0,0 +1,51 @@
+import { TestCircuitProver } from '@aztec/bb-prover';
+import {
+  type BlockSimulator,
+  type MerkleTreeOperations,
+  type ProcessedTx,
+  type ProvingTicket,
+  type SimulationBlockResult,
+} from '@aztec/circuit-types';
+import { type Fr, type GlobalVariables } from '@aztec/circuits.js';
+import { ProvingOrchestrator } from '@aztec/prover-client/orchestrator';
+import { type SimulationProvider } from '@aztec/simulator';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
+
+/**
+ * Implements a block simulator using a test circuit prover under the hood, which just simulates circuits and outputs empty proofs.
+ * This class is temporary and should die once we switch from tx effects to tx objects submissions, since sequencers won't have
+ * the need to create L2 block headers to submit to L1. When we do that, we should also remove the references to the
+ * prover-client and bb-prover packages from this package.
+ */
+export class OrchestratorBlockBuilder implements BlockSimulator {
+  private orchestrator: ProvingOrchestrator;
+  constructor(db: MerkleTreeOperations, simulationProvider: SimulationProvider, telemetry: TelemetryClient) {
+    const testProver = new TestCircuitProver(telemetry, simulationProvider);
+    this.orchestrator = new ProvingOrchestrator(db, testProver, telemetry);
+  }
+
+  startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<ProvingTicket> {
+    return this.orchestrator.startNewBlock(numTxs, globalVariables, l1ToL2Messages);
+  }
+  cancel(): void {
+    this.orchestrator.cancel();
+  }
+  finaliseBlock(): Promise<SimulationBlockResult> {
+    return this.orchestrator.finaliseBlock();
+  }
+  setBlockCompleted(): Promise<void> {
+    return this.orchestrator.setBlockCompleted();
+  }
+  addNewTx(tx: ProcessedTx): Promise<void> {
+    return this.orchestrator.addNewTx(tx);
+  }
+}
+
+export class OrchestratorBlockBuilderFactory {
+  constructor(private simulationProvider: SimulationProvider, private telemetry?: TelemetryClient) {}
+
+  create(db: MerkleTreeOperations): BlockSimulator {
+    return new OrchestratorBlockBuilder(db, this.simulationProvider, this.telemetry ?? new NoopTelemetryClient());
+  }
+}

package/src/client/sequencer-client.ts

@@ -1,11 +1,12 @@
 import { type L1ToL2MessageSource, type L2BlockSource, type WorldStateSynchronizer } from '@aztec/circuit-types';
+import { type EthAddress } from '@aztec/foundation/eth-address';
 import { type P2P } from '@aztec/p2p';
 import { PublicProcessorFactory, type SimulationProvider } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type ContractDataSource } from '@aztec/types/contracts';
 import { type ValidatorClient } from '@aztec/validator-client';
 
-import { BlockBuilderFactory } from '../block_builder/index.js';
+import { LightweightBlockBuilderFactory } from '../block_builder/index.js';
 import { type SequencerClientConfig } from '../config.js';
 import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
 import { L1Publisher } from '../publisher/index.js';
@@ -59,7 +60,7 @@ export class SequencerClient {
       globalsBuilder,
       p2pClient,
       worldStateSynchronizer,
-      new BlockBuilderFactory(simulationProvider, telemetryClient),
+      new LightweightBlockBuilderFactory(telemetryClient),
       l2BlockSource,
       l1ToL2MessageSource,
       publicProcessorFactory,
@@ -99,7 +100,7 @@ export class SequencerClient {
     this.sequencer.restart();
   }
 
-  get coinbase() {
+  get coinbase(): EthAddress {
     return this.sequencer.coinbase;
   }
 

package/src/publisher/l1-publisher.ts

@@ -1,8 +1,8 @@
-import { type L2Block, type Signature, type TxHash } from '@aztec/circuit-types';
-import { getHashedSignaturePayload } from '@aztec/circuit-types';
+import { ConsensusPayload, type L2Block, type TxHash, getHashedSignaturePayload } from '@aztec/circuit-types';
 import { type L1PublishBlockStats, type L1PublishProofStats } from '@aztec/circuit-types/stats';
 import { ETHEREUM_SLOT_DURATION, EthAddress, type Header, type Proof } from '@aztec/circuits.js';
 import { createEthereumChain } from '@aztec/ethereum';
+import { type Signature } from '@aztec/foundation/eth-signature';
 import { type Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
@@ -236,7 +236,9 @@ export class L1Publisher {
       blockHash: block.hash().toString(),
     };
 
-    const digest = getHashedSignaturePayload(block.archive.root, txHashes ?? []);
+    const consensusPayload = new ConsensusPayload(block.header, block.archive.root, txHashes ?? []);
+
+    const digest = getHashedSignaturePayload(consensusPayload);
     const proposeTxArgs = {
       header: block.header.toBuffer(),
       archive: block.archive.root.toBuffer(),
@@ -255,7 +257,7 @@ export class L1Publisher {
       //        By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
       //        make time consistency checks break.
       await this.validateBlockForSubmission(block.header, {
-        digest,
+        digest: digest.toBuffer(),
         signatures: attestations ?? [],
       });
 

package/src/sequencer/sequencer.ts

@@ -4,7 +4,6 @@ import {
   type L2Block,
   type L2BlockSource,
   type ProcessedTx,
-  Signature,
   Tx,
   type TxHash,
   type TxValidator,
@@ -15,13 +14,14 @@ import { type AllowedElement, BlockProofError, PROVING_STATUS } from '@aztec/cir
 import { type L2BlockBuiltStats } from '@aztec/circuit-types/stats';
 import {
   AppendOnlyTreeSnapshot,
-  AztecAddress,
   ContentCommitment,
-  EthAddress,
   GENESIS_ARCHIVE_ROOT,
   Header,
   StateReference,
 } from '@aztec/circuits.js';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -443,7 +443,7 @@ export class Sequencer {
         processedTxsCount: processedTxs.length,
       })
     ) {
-      blockBuilder.cancelBlock();
+      blockBuilder.cancel();
       throw new Error('Should not propose the block');
     }
 
@@ -537,7 +537,7 @@ export class Sequencer {
     this.log.verbose(`Collected attestations from validators, number of attestations: ${attestations.length}`);
 
     // note: the smart contract requires that the signatures are provided in the order of the committee
-    return await orderAttestations(attestations, committee);
+    return orderAttestations(attestations, committee);
   }
 
   /**
@@ -666,12 +666,12 @@ export enum SequencerState {
  *
  * @todo: perform this logic within the memory attestation store instead?
  */
-async function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): Promise<Signature[]> {
+function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): Signature[] {
   // Create a map of sender addresses to BlockAttestations
   const attestationMap = new Map<string, BlockAttestation>();
 
   for (const attestation of attestations) {
-    const sender = await attestation.getSender();
+    const sender = attestation.getSender();
     if (sender) {
       attestationMap.set(sender.toString(), attestation);
     }

package/src/tx_validator/gas_validator.ts

@@ -1,8 +1,8 @@
-import { PublicKernelType, type Tx, type TxValidator } from '@aztec/circuit-types';
+import { PublicKernelPhase, type Tx, type TxValidator } from '@aztec/circuit-types';
 import { type AztecAddress, type Fr } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { FeeJuiceArtifact } from '@aztec/protocol-contracts/fee-juice';
-import { AbstractPhaseManager, computeFeePayerBalanceStorageSlot } from '@aztec/simulator';
+import { EnqueuedCallsProcessor, computeFeePayerBalanceStorageSlot } from '@aztec/simulator';
 
 /** Provides a view into public contract state */
 export interface PublicStateSource {
@@ -34,6 +34,10 @@ export class GasTxValidator implements TxValidator<Tx> {
     return [validTxs, invalidTxs];
   }
 
+  validateTx(tx: Tx): Promise<boolean> {
+    return this.#validateTxFee(tx);
+  }
+
   async #validateTxFee(tx: Tx): Promise<boolean> {
     const feePayer = tx.data.feePayer;
     // TODO(@spalladino) Eventually remove the is_zero condition as we should always charge fees to every tx
@@ -55,7 +59,7 @@ export class GasTxValidator implements TxValidator<Tx> {
     );
 
     // If there is a claim in this tx that increases the fee payer balance in Fee Juice, add it to balance
-    const { [PublicKernelType.SETUP]: setupFns } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx);
+    const setupFns = EnqueuedCallsProcessor.getExecutionRequestsByPhase(tx, PublicKernelPhase.SETUP);
     const claimFunctionCall = setupFns.find(
       fn =>
         fn.contractAddress.equals(this.#feeJuiceAddress) &&

package/src/tx_validator/phases_validator.ts

@@ -1,12 +1,12 @@
 import {
   type AllowedElement,
   type PublicExecutionRequest,
-  PublicKernelType,
+  PublicKernelPhase,
   Tx,
   type TxValidator,
 } from '@aztec/circuit-types';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AbstractPhaseManager, ContractsDataSourcePublicDB } from '@aztec/simulator';
+import { ContractsDataSourcePublicDB, EnqueuedCallsProcessor } from '@aztec/simulator';
 import { type ContractDataSource } from '@aztec/types/contracts';
 
 export class PhasesTxValidator implements TxValidator<Tx> {
@@ -27,7 +27,7 @@ export class PhasesTxValidator implements TxValidator<Tx> {
       // which is what we're trying to do as part of the current txs.
       await this.contractDataSource.addNewContracts(tx);
 
-      if (await this.#validateTx(tx)) {
+      if (await this.validateTx(tx)) {
         validTxs.push(tx);
       } else {
         invalidTxs.push(tx);
@@ -39,14 +39,13 @@ export class PhasesTxValidator implements TxValidator<Tx> {
     return Promise.resolve([validTxs, invalidTxs]);
   }
 
-  async #validateTx(tx: Tx): Promise<boolean> {
+  async validateTx(tx: Tx): Promise<boolean> {
     if (!tx.data.forPublic) {
       this.#log.debug(`Tx ${Tx.getHash(tx)} does not contain enqueued public functions. Skipping phases validation.`);
       return true;
     }
 
-    const { [PublicKernelType.SETUP]: setupFns } = AbstractPhaseManager.extractEnqueuedPublicCallsByPhase(tx);
-
+    const setupFns = EnqueuedCallsProcessor.getExecutionRequestsByPhase(tx, PublicKernelPhase.SETUP);
     for (const setupFn of setupFns) {
       if (!(await this.isOnAllowList(setupFn, this.setupAllowList))) {
         this.#log.warn(

package/src/tx_validator/test_utils.ts

@@ -32,9 +32,9 @@ function patchFn(
   tx.enqueuedPublicFunctionCalls[index] = fn;
 
   const request = tx.data.forPublic![where].publicCallStack[index];
-  request.item.contractAddress = fn.contractAddress;
-  request.item.callContext = fn.callContext;
-  request.item.argsHash = computeVarArgsHash(fn.args);
+  request.contractAddress = fn.contractAddress;
+  request.callContext = fn.callContext;
+  request.argsHash = computeVarArgsHash(fn.args);
   tx.data.forPublic![where].publicCallStack[index] = request;
 
   return {

package/src/tx_validator/tx_validator_factory.ts

@@ -2,7 +2,7 @@ import { type AllowedElement, type ProcessedTx, type Tx, type TxValidator } from
 import { type GlobalVariables } from '@aztec/circuits.js';
 import { AggregateTxValidator, DataTxValidator, DoubleSpendTxValidator, MetadataTxValidator } from '@aztec/p2p';
 import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
-import { WorldStateDB, WorldStatePublicDB } from '@aztec/simulator';
+import { WorldStateDB } from '@aztec/simulator';
 import { type ContractDataSource } from '@aztec/types/contracts';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 
@@ -17,16 +17,17 @@ export class TxValidatorFactory {
   ) {}
 
   validatorForNewTxs(globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): TxValidator<Tx> {
+    const worldStateDB = new WorldStateDB(this.merkleTreeDb, this.contractDataSource);
     return new AggregateTxValidator(
       new DataTxValidator(),
       new MetadataTxValidator(globalVariables.chainId, globalVariables.blockNumber),
-      new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb)),
+      new DoubleSpendTxValidator(worldStateDB),
       new PhasesTxValidator(this.contractDataSource, setupAllowList),
-      new GasTxValidator(new WorldStatePublicDB(this.merkleTreeDb), FeeJuiceAddress, this.enforceFees),
+      new GasTxValidator(worldStateDB, FeeJuiceAddress, this.enforceFees),
     );
   }
 
   validatorForProcessedTxs(): TxValidator<ProcessedTx> {
-    return new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb));
+    return new DoubleSpendTxValidator(new WorldStateDB(this.merkleTreeDb, this.contractDataSource));
   }
 }