@aztec/sequencer-client 0.57.0 → 0.58.0

package/src/block_builder/light.ts

@@ -4,7 +4,7 @@ import {
   Body,
   L2Block,
   MerkleTreeId,
-  type MerkleTreeOperations,
+  type MerkleTreeWriteOperations,
   type ProcessedTx,
   type TxEffect,
   makeEmptyProcessedTx,
@@ -15,11 +15,11 @@ import {
   type GlobalVariables,
   NESTED_RECURSIVE_PROOF_LENGTH,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
-  VerificationKeyData,
   makeEmptyRecursiveProof,
 } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
+import { TubeVk, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { buildBaseRollupInput, buildHeaderFromTxEffects, getTreeSnapshot } from '@aztec/prover-client/helpers';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
@@ -36,7 +36,7 @@ export class LightweightBlockBuilder implements BlockBuilder {
 
   private readonly logger = createDebugLogger('aztec:sequencer-client:block_builder_light');
 
-  constructor(private db: MerkleTreeOperations, private telemetry: TelemetryClient) {}
+  constructor(private db: MerkleTreeWriteOperations, private telemetry: TelemetryClient) {}
 
   async startNewBlock(numTxs: number, globalVariables: GlobalVariables, l1ToL2Messages: Fr[]): Promise<void> {
     this.logger.verbose('Starting new block', { numTxs, globalVariables, l1ToL2Messages });
@@ -56,7 +56,7 @@ export class LightweightBlockBuilder implements BlockBuilder {
       makeEmptyRecursiveProof(NESTED_RECURSIVE_PROOF_LENGTH),
       this.globalVariables!,
       this.db,
-      VerificationKeyData.makeFake(),
+      TubeVk,
     );
   }
 
@@ -70,6 +70,7 @@ export class LightweightBlockBuilder implements BlockBuilder {
           this.globalVariables!.chainId,
           this.globalVariables!.version,
           getVKTreeRoot(),
+          protocolContractTreeRoot,
         ),
       );
     }
@@ -96,7 +97,7 @@ export class LightweightBlockBuilder implements BlockBuilder {
 export class LightweightBlockBuilderFactory {
   constructor(private telemetry?: TelemetryClient) {}
 
-  create(db: MerkleTreeOperations): BlockBuilder {
+  create(db: MerkleTreeWriteOperations): BlockBuilder {
     return new LightweightBlockBuilder(db, this.telemetry ?? new NoopTelemetryClient());
   }
 }

package/src/block_builder/orchestrator.ts

@@ -1,5 +1,10 @@
 import { TestCircuitProver } from '@aztec/bb-prover';
-import { type BlockBuilder, type L2Block, type MerkleTreeOperations, type ProcessedTx } from '@aztec/circuit-types';
+import {
+  type BlockBuilder,
+  type L2Block,
+  type MerkleTreeWriteOperations,
+  type ProcessedTx,
+} 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';
@@ -13,7 +18,7 @@ import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
  */
 export class OrchestratorBlockBuilder implements BlockBuilder {
   private orchestrator: ProvingOrchestrator;
-  constructor(db: MerkleTreeOperations, simulationProvider: SimulationProvider, telemetry: TelemetryClient) {
+  constructor(db: MerkleTreeWriteOperations, simulationProvider: SimulationProvider, telemetry: TelemetryClient) {
     const testProver = new TestCircuitProver(telemetry, simulationProvider);
     this.orchestrator = new ProvingOrchestrator(db, testProver, telemetry);
   }
@@ -32,7 +37,7 @@ export class OrchestratorBlockBuilder implements BlockBuilder {
 export class OrchestratorBlockBuilderFactory {
   constructor(private simulationProvider: SimulationProvider, private telemetry?: TelemetryClient) {}
 
-  create(db: MerkleTreeOperations): BlockBuilder {
+  create(db: MerkleTreeWriteOperations): BlockBuilder {
     return new OrchestratorBlockBuilder(db, this.simulationProvider, this.telemetry ?? new NoopTelemetryClient());
   }
 }

package/src/client/sequencer-client.ts

@@ -1,9 +1,9 @@
 import { type L1ToL2MessageSource, type L2BlockSource, type WorldStateSynchronizer } from '@aztec/circuit-types';
+import { type ContractDataSource } from '@aztec/circuits.js';
 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 { LightweightBlockBuilderFactory } from '../block_builder/index.js';
@@ -45,14 +45,8 @@ export class SequencerClient {
   ) {
     const publisher = new L1Publisher(config, telemetryClient);
     const globalsBuilder = new GlobalVariableBuilder(config);
-    const merkleTreeDb = worldStateSynchronizer.getLatest();
 
-    const publicProcessorFactory = new PublicProcessorFactory(
-      merkleTreeDb,
-      contractDataSource,
-      simulationProvider,
-      telemetryClient,
-    );
+    const publicProcessorFactory = new PublicProcessorFactory(contractDataSource, simulationProvider, telemetryClient);
 
     const sequencer = new Sequencer(
       publisher,
@@ -64,7 +58,7 @@ export class SequencerClient {
       l2BlockSource,
       l1ToL2MessageSource,
       publicProcessorFactory,
-      new TxValidatorFactory(merkleTreeDb, contractDataSource, !!config.enforceFees),
+      new TxValidatorFactory(worldStateSynchronizer.getCommitted(), contractDataSource, !!config.enforceFees),
       telemetryClient,
       config,
     );

package/src/config.ts

@@ -10,8 +10,7 @@ import {
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
-import { AuthRegistryAddress } from '@aztec/protocol-contracts/auth-registry';
-import { FeeJuiceAddress } from '@aztec/protocol-contracts/fee-juice';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 
 import {
   type PublisherConfig,
@@ -184,11 +183,11 @@ function getDefaultAllowedSetupFunctions(): AllowedElement[] {
   return [
     // needed for authwit support
     {
-      address: AuthRegistryAddress,
+      address: ProtocolContractAddress.AuthRegistry,
     },
     // needed for claiming on the same tx as a spend
     {
-      address: FeeJuiceAddress,
+      address: ProtocolContractAddress.FeeJuice,
       // We can't restrict the selector because public functions get routed via dispatch.
       // selector: FunctionSelector.fromSignature('_increase_public_balance((Field),Field)'),
     },

package/src/publisher/l1-publisher-metrics.ts

@@ -83,6 +83,7 @@ export class L1PublisherMetrics {
   private recordTx(txType: L1TxType, durationMs: number, stats: Omit<L1PublishProofStats, 'eventName'>) {
     const attributes = {
       [Attributes.L1_TX_TYPE]: txType,
+      [Attributes.L1_SENDER]: stats.sender,
     } as const;
 
     this.txCount.add(1, {

package/src/publisher/l1-publisher.ts

@@ -9,6 +9,7 @@ import {
 import { type L1PublishBlockStats, type L1PublishProofStats } from '@aztec/circuit-types/stats';
 import {
   AGGREGATION_OBJECT_LENGTH,
+  AZTEC_EPOCH_DURATION,
   ETHEREUM_SLOT_DURATION,
   EthAddress,
   type FeeRecipient,
@@ -18,11 +19,11 @@ import {
 } from '@aztec/circuits.js';
 import { createEthereumChain } from '@aztec/ethereum';
 import { makeTuple } from '@aztec/foundation/array';
-import { areArraysEqual, times } from '@aztec/foundation/collection';
+import { areArraysEqual, compactArray, times } from '@aztec/foundation/collection';
 import { type Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { type Tuple, serializeToBuffer } from '@aztec/foundation/serialize';
+import { type Tuple, serializeToBuffer, toFriendlyJSON } from '@aztec/foundation/serialize';
 import { InterruptibleSleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
@@ -34,6 +35,7 @@ import {
   type BaseError,
   type Chain,
   type Client,
+  type ContractFunctionExecutionError,
   ContractFunctionRevertedError,
   type GetContractReturnType,
   type Hex,
@@ -66,6 +68,8 @@ import { prettyLogViemError } from './utils.js';
  * Stats for a sent transaction.
  */
 export type TransactionStats = {
+  /** Address of the sender. */
+  sender: string;
   /** Hash of the transaction. */
   transactionHash: string;
   /** Size in bytes of the tx calldata */
@@ -81,13 +85,15 @@ export type MinimalTransactionReceipt = {
   /** True if the tx was successful, false if reverted. */
   status: boolean;
   /** Hash of the transaction. */
-  transactionHash: string;
+  transactionHash: `0x${string}`;
   /** Effective gas used by the tx. */
   gasUsed: bigint;
   /** Effective gas price paid by the tx. */
   gasPrice: bigint;
   /** Logs emitted in this tx. */
   logs: any[];
+  /** Block number in which this tx was mined. */
+  blockNumber: bigint;
 };
 
 /** Arguments to the process method of the rollup contract */
@@ -116,7 +122,7 @@ export type L1SubmitEpochProofArgs = {
   endTimestamp: Fr;
   outHash: Fr;
   proverId: Fr;
-  fees: Tuple<FeeRecipient, 32>;
+  fees: Tuple<FeeRecipient, typeof AZTEC_EPOCH_DURATION>;
   proof: Proof;
 };
 
@@ -133,7 +139,8 @@ export class L1Publisher {
   private sleepTimeMs: number;
   private interrupted = false;
   private metrics: L1PublisherMetrics;
-  private log = createDebugLogger('aztec:sequencer:publisher');
+
+  protected log = createDebugLogger('aztec:sequencer:publisher');
 
   private rollupContract: GetContractReturnType<
     typeof RollupAbi,
@@ -144,8 +151,8 @@ export class L1Publisher {
   private walletClient: WalletClient<HttpTransport, chains.Chain, PrivateKeyAccount>;
   private account: PrivateKeyAccount;
 
-  public static PROPOSE_GAS_GUESS: bigint = 500_000n;
-  public static PROPOSE_AND_CLAIM_GAS_GUESS: bigint = 600_000n;
+  public static PROPOSE_GAS_GUESS: bigint = 12_000_000n;
+  public static PROPOSE_AND_CLAIM_GAS_GUESS: bigint = this.PROPOSE_GAS_GUESS + 100_000n;
 
   constructor(config: TxSenderConfig & PublisherConfig, client: TelemetryClient) {
     this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
@@ -206,6 +213,9 @@ export class L1Publisher {
    * @return blockNumber - The L2 block number of the next L2 block
    */
   public async canProposeAtNextEthBlock(archive: Buffer): Promise<[bigint, bigint]> {
+    // FIXME: This should not throw if unable to propose but return a falsey value, so
+    // we can differentiate between errors when hitting the L1 rollup contract (eg RPC error)
+    // which may require a retry, vs actually not being the turn for proposing.
     const ts = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(ETHEREUM_SLOT_DURATION));
     const [slot, blockNumber] = await this.rollupContract.read.canProposeAtTime([ts, `0x${archive.toString('hex')}`]);
     return [slot, blockNumber];
@@ -258,8 +268,9 @@ export class L1Publisher {
     try {
       await this.rollupContract.read.validateEpochProofRightClaim(args, { account: this.account });
     } catch (err) {
+      this.log.verbose(toFriendlyJSON(err as object));
       const errorName = tryGetCustomErrorName(err);
-      this.log.verbose(`Proof quote validation failed: ${errorName}`);
+      this.log.warn(`Proof quote validation failed: ${errorName}`);
       return undefined;
     }
     return quote;
@@ -321,6 +332,7 @@ export class L1Publisher {
     }
     const calldata = hexToBytes(tx.input);
     return {
+      sender: tx.from.toString(),
       transactionHash: tx.hash,
       calldataSize: calldata.length,
       calldataGas: getCalldataGasUsage(calldata),
@@ -375,15 +387,17 @@ export class L1Publisher {
 
     this.log.verbose(`Submitting propose transaction`);
 
-    const txHash = proofQuote
+    const tx = proofQuote
       ? await this.sendProposeAndClaimTx(proposeTxArgs, proofQuote)
       : await this.sendProposeTx(proposeTxArgs);
 
-    if (!txHash) {
+    if (!tx) {
       this.log.info(`Failed to publish block ${block.number} to L1`, ctx);
       return false;
     }
 
+    const { hash: txHash, args, functionName, gasLimit } = tx;
+
     const receipt = await this.getTransactionReceipt(txHash);
     if (!receipt) {
       this.log.info(`Failed to get receipt for tx ${txHash}`, ctx);
@@ -395,7 +409,7 @@ export class L1Publisher {
       const tx = await this.getTransactionStats(txHash);
       const stats: L1PublishBlockStats = {
         ...pick(receipt, 'gasPrice', 'gasUsed', 'transactionHash'),
-        ...pick(tx!, 'calldataGas', 'calldataSize'),
+        ...pick(tx!, 'calldataGas', 'calldataSize', 'sender'),
         ...block.getStats(),
         eventName: 'rollup-published-to-l1',
       };
@@ -407,11 +421,45 @@ export class L1Publisher {
 
     this.metrics.recordFailedTx('process');
 
-    this.log.error(`Rollup.process tx status failed: ${receipt.transactionHash}`, ctx);
+    const errorMsg = await this.tryGetErrorFromRevertedTx({
+      args,
+      functionName,
+      gasLimit,
+      abi: RollupAbi,
+      address: this.rollupContract.address,
+      blockNumber: receipt.blockNumber,
+    });
+    this.log.error(`Rollup process tx reverted. ${errorMsg}`, undefined, {
+      ...ctx,
+      txHash: receipt.transactionHash,
+    });
     await this.sleepOrInterrupted();
     return false;
   }
 
+  private async tryGetErrorFromRevertedTx(args: {
+    args: any[];
+    functionName: string;
+    gasLimit: bigint;
+    abi: any;
+    address: Hex;
+    blockNumber: bigint | undefined;
+  }) {
+    try {
+      await this.publicClient.simulateContract({ ...args, account: this.walletClient.account });
+      return undefined;
+    } catch (err: any) {
+      if (err.name === 'ContractFunctionExecutionError') {
+        const execErr = err as ContractFunctionExecutionError;
+        return compactArray([
+          execErr.shortMessage,
+          ...(execErr.metaMessages ?? []).slice(0, 2).map(s => s.trim()),
+        ]).join(' ');
+      }
+      this.log.error(`Error getting error from simulation`, err);
+    }
+  }
+
   public async submitEpochProof(args: {
     epochNumber: number;
     fromBlock: number;
@@ -442,7 +490,7 @@ export class L1Publisher {
         const tx = await this.getTransactionStats(txHash);
         const stats: L1PublishProofStats = {
           ...pick(receipt, 'gasPrice', 'gasUsed', 'transactionHash'),
-          ...pick(tx!, 'calldataGas', 'calldataSize'),
+          ...pick(tx!, 'calldataGas', 'calldataSize', 'sender'),
           eventName: 'proof-published-to-l1',
         };
         this.log.info(`Published epoch proof to L1 rollup contract`, { ...stats, ...ctx });
@@ -601,7 +649,7 @@ export class L1Publisher {
         args.publicInputs.outHash.toString(),
         args.publicInputs.proverId.toString(),
       ],
-      makeTuple(64, i =>
+      makeTuple(AZTEC_EPOCH_DURATION * 2, i =>
         i % 2 === 0
           ? args.publicInputs.fees[i / 2].recipient.toField().toString()
           : args.publicInputs.fees[(i - 1) / 2].value.toString(),
@@ -610,17 +658,24 @@ export class L1Publisher {
     ] as const;
   }
 
-  private async sendProposeTx(encodedData: L1ProcessArgs): Promise<string | undefined> {
+  private async sendProposeTx(
+    encodedData: L1ProcessArgs,
+  ): Promise<{ hash: string; args: any; functionName: string; gasLimit: bigint } | undefined> {
     if (this.interrupted) {
-      return;
+      return undefined;
     }
     try {
       const { args, gasGuesstimate } = await this.prepareProposeTx(encodedData, L1Publisher.PROPOSE_GAS_GUESS);
 
-      return await this.rollupContract.write.propose(args, {
-        account: this.account,
-        gas: gasGuesstimate,
-      });
+      return {
+        hash: await this.rollupContract.write.propose(args, {
+          account: this.account,
+          gas: gasGuesstimate,
+        }),
+        args,
+        functionName: 'propose',
+        gasLimit: gasGuesstimate,
+      };
     } catch (err) {
       prettyLogViemError(err, this.log);
       this.log.error(`Rollup publish failed`, err);
@@ -628,9 +683,12 @@ export class L1Publisher {
     }
   }
 
-  private async sendProposeAndClaimTx(encodedData: L1ProcessArgs, quote: EpochProofQuote): Promise<string | undefined> {
+  private async sendProposeAndClaimTx(
+    encodedData: L1ProcessArgs,
+    quote: EpochProofQuote,
+  ): Promise<{ hash: string; args: any; functionName: string; gasLimit: bigint } | undefined> {
     if (this.interrupted) {
-      return;
+      return undefined;
     }
     try {
       const { args, gasGuesstimate } = await this.prepareProposeTx(
@@ -640,10 +698,15 @@ export class L1Publisher {
       this.log.info(`ProposeAndClaim`);
       this.log.info(inspect(quote.payload));
 
-      return await this.rollupContract.write.proposeAndClaim([...args, quote.toViemArgs()], {
-        account: this.account,
-        gas: gasGuesstimate,
-      });
+      return {
+        hash: await this.rollupContract.write.proposeAndClaim([...args, quote.toViemArgs()], {
+          account: this.account,
+          gas: gasGuesstimate,
+        }),
+        functionName: 'proposeAndClaim',
+        args,
+        gasLimit: gasGuesstimate,
+      };
     } catch (err) {
       prettyLogViemError(err, this.log);
       this.log.error(`Rollup publish failed`, err);
@@ -674,6 +737,7 @@ export class L1Publisher {
             gasUsed: receipt.gasUsed,
             gasPrice: receipt.effectiveGasPrice,
             logs: receipt.logs,
+            blockNumber: receipt.blockNumber,
           };
         }