@aztec/sequencer-client 0.0.1-commit.993d240 → 0.0.1-commit.9a89641

package/src/publisher/l1_to_l2_messaging.ts

@@ -0,0 +1,85 @@
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { tryJsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import { InboxAbi } from '@aztec/l1-artifacts';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+
+import { decodeEventLog, getContract } from 'viem';
+
+/**
+ * Sends an L1-to-L2 message via the Inbox contract and returns its hash and global leaf index.
+ * Test helper copied from the end-to-end fixtures so this integration test can live in sequencer-client.
+ */
+export async function sendL1ToL2Message(
+  message: { recipient: AztecAddress; content: Fr; secretHash: Fr },
+  ctx: {
+    l1Client: ExtendedViemWalletClient;
+    l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress' | 'rollupAddress'>;
+  },
+) {
+  const logger = createLogger('sequencer-client:l1_to_l2_messaging');
+  const inbox = getContract({
+    address: ctx.l1ContractAddresses.inboxAddress.toString(),
+    abi: InboxAbi,
+    client: ctx.l1Client,
+  });
+
+  const { recipient, content, secretHash } = message;
+
+  const version = await new RollupContract(ctx.l1Client, ctx.l1ContractAddresses.rollupAddress.toString()).getVersion();
+
+  // We inject the message to Inbox
+  const txHash = await inbox.write.sendL2Message(
+    [{ actor: recipient.toString(), version: BigInt(version) }, content.toString(), secretHash.toString()],
+    {
+      gas: 1_000_000n,
+    },
+  );
+  logger.info(`L1 to L2 message sent in tx ${txHash}`);
+
+  // We check that the message was correctly injected by checking the emitted event
+  const txReceipt = await ctx.l1Client.waitForTransactionReceipt({ hash: txHash });
+
+  if (txReceipt.status !== 'success') {
+    throw new Error(`L1 to L2 message failed to be sent in tx ${txHash}. Status: ${txReceipt.status}`);
+  }
+
+  logger.info(`L1 to L2 message receipt retrieved for tx ${txReceipt.transactionHash}`, txReceipt);
+
+  if (txReceipt.transactionHash !== txHash) {
+    throw new Error(`Receipt transaction hash mismatch: ${txReceipt.transactionHash} !== ${txHash}`);
+  }
+
+  // Filter for MessageSent events from the Inbox contract by trying to decode each log
+  const messageSentLogs = txReceipt.logs
+    .filter(log => log.address.toLowerCase() === ctx.l1ContractAddresses.inboxAddress.toString().toLowerCase())
+    .map(log => {
+      try {
+        const decoded = decodeEventLog({
+          abi: InboxAbi,
+          data: log.data,
+          topics: log.topics,
+        });
+        return { log, decoded };
+      } catch {
+        return null; // Not a decodable event from this ABI
+      }
+    })
+    .filter((item): item is { log: any; decoded: any } => item !== null && item.decoded.eventName === 'MessageSent');
+
+  if (messageSentLogs.length !== 1) {
+    throw new Error(
+      `Wrong number of MessageSent logs found in ${txHash} transaction (got ${messageSentLogs.length} expected 1)\n${tryJsonStringify(messageSentLogs.map(item => item.log))}`,
+    );
+  }
+
+  // We already have the decoded event
+  const topics = messageSentLogs[0].decoded;
+  const receivedMsgHash = topics.args.hash;
+  const receivedGlobalLeafIndex = topics.args.index;
+
+  return { msgHash: Fr.fromHexString(receivedMsgHash), globalLeafIndex: new Fr(receivedGlobalLeafIndex), txReceipt };
+}

package/src/publisher/l1_tx_failed_store/failed_tx_store.ts

@@ -1,33 +1,40 @@
+import type { WindowBlockFees } from '@aztec/ethereum/l1-fee-analysis';
+import type { GasPrice } from '@aztec/ethereum/l1-tx-utils';
 import type { Branded } from '@aztec/foundation/branded-types';
+import { type ZodFor, schemas } from '@aztec/foundation/schemas';
 
 import type { Hex } from 'viem';
+import { z } from 'zod';
 
 /** URI pointing to a stored failed L1 transaction. */
 export type FailedL1TxUri = Branded<string, 'FailedL1TxUri'>;
 
-/** A failed L1 transaction captured for debugging and replay. */
+/**
+ * A failed L1 transaction captured for debugging and replay. Serialized with jsonStringify (bigints
+ * become decimal strings on disk) and parsed back via FailedL1TxSchema.
+ */
 export type FailedL1Tx = {
   /** Tx hash (for reverts) or keccak256(request.data) (for simulation/send failures). */
   id: Hex;
   /** Unix timestamp (ms) when failure occurred. */
   timestamp: number;
-  /** Whether the failure was during simulation or after sending. */
-  failureType: 'simulation' | 'revert' | 'send-error';
+  /** How the failure occurred. */
+  failureType: 'simulation' | 'revert' | 'send-error' | 'timeout';
   /** The actual L1 transaction for replay (multicall-encoded for bundled txs). */
   request: {
     to: Hex;
     data: Hex;
-    value?: string; // bigint as string
+    value?: bigint;
   };
   /** Raw blob data as hex for replay. */
   blobData?: Hex[];
   /** L1 block number at time of failure (simulation target or receipt block). */
-  l1BlockNumber: string; // bigint as string
+  l1BlockNumber: bigint;
   /** Receipt info (present only for on-chain reverts). */
   receipt?: {
     transactionHash: Hex;
-    blockNumber: string; // bigint as string
-    gasUsed: string; // bigint as string
+    blockNumber: bigint;
+    gasUsed: bigint;
     status: 'reverted';
   };
   /** Error information. */
@@ -46,8 +53,108 @@ export type FailedL1Tx = {
     slot?: number;
     sender: Hex;
   };
+  /** Gas pricing info at time of failure for underpricing diagnosis. */
+  gasInfo?: {
+    /** Gas prices the tx was sent with (present for revert/send-error/timeout, not simulation). */
+    sentGasPrice?: GasPrice;
+    /** Gas limit used or estimated. */
+    gasLimit?: bigint;
+    /** Nonce used for the sent tx. */
+    nonce?: number;
+    /**
+     * For timeouts: the escalating gas prices used across the initial send and each speed-up retry,
+     * in order. Compare against windowBlocks[].minIncludedPriorityFee to see if any attempt cleared the bar.
+     */
+    sentGasPriceLadder?: GasPrice[];
+    /** Number of send attempts (initial send + speed-ups). */
+    attempts?: number;
+    /**
+     * Per-block fee data for the L1 blocks the tx could have been included in (the target L2 slot's
+     * inclusion window), in chronological order. Compare sentGasPrice against these to see whether
+     * the tx was underpriced for each block it competed for. May be a partial or empty list if the
+     * window was not yet mined when the failure was recorded (e.g. an early send failure).
+     */
+    windowBlocks?: WindowBlockFees[];
+  };
+  /** Timing info relative to the L2 slot. */
+  timing?: {
+    /** The target L2 slot this tx was for. */
+    targetL2Slot?: number;
+    /** Unix timestamp (seconds) when the target slot ends. */
+    slotDeadlineTimestampS?: bigint;
+    /** Milliseconds remaining until the slot deadline. Negative = past deadline. */
+    msUntilSlotDeadline?: number;
+  };
 };
 
+const hexSchema = schemas.HexStringWith0x;
+
+const gasPriceSchema = z.object({
+  maxFeePerGas: schemas.BigInt,
+  maxPriorityFeePerGas: schemas.BigInt,
+  maxFeePerBlobGas: schemas.BigInt.optional(),
+}) satisfies ZodFor<GasPrice>;
+
+const windowBlockFeesSchema = z.object({
+  blockNumber: schemas.BigInt,
+  timestamp: schemas.BigInt,
+  baseFeePerGas: schemas.BigInt,
+  p75PriorityFee: schemas.BigInt,
+  minIncludedPriorityFee: schemas.BigInt,
+  blockBlobsFull: z.boolean(),
+  includedBlobCount: z.number(),
+}) satisfies ZodFor<WindowBlockFees>;
+
+/** Parses a stored failed-tx record, coercing the on-disk decimal strings back to bigints. */
+export const FailedL1TxSchema: ZodFor<FailedL1Tx> = z.object({
+  id: hexSchema,
+  timestamp: z.number(),
+  failureType: z.enum(['simulation', 'revert', 'send-error', 'timeout']),
+  request: z.object({
+    to: hexSchema,
+    data: hexSchema,
+    value: schemas.BigInt.optional(),
+  }),
+  blobData: z.array(hexSchema).optional(),
+  l1BlockNumber: schemas.BigInt,
+  receipt: z
+    .object({
+      transactionHash: hexSchema,
+      blockNumber: schemas.BigInt,
+      gasUsed: schemas.BigInt,
+      status: z.literal('reverted'),
+    })
+    .optional(),
+  error: z.object({
+    message: z.string(),
+    name: z.string().optional(),
+  }),
+  context: z.object({
+    actions: z.array(z.string()),
+    requests: z.array(z.object({ action: z.string(), to: hexSchema, data: hexSchema })).optional(),
+    checkpointNumber: z.number().optional(),
+    slot: z.number().optional(),
+    sender: hexSchema,
+  }),
+  gasInfo: z
+    .object({
+      sentGasPrice: gasPriceSchema.optional(),
+      gasLimit: schemas.BigInt.optional(),
+      nonce: z.number().optional(),
+      sentGasPriceLadder: z.array(gasPriceSchema).optional(),
+      attempts: z.number().optional(),
+      windowBlocks: z.array(windowBlockFeesSchema).optional(),
+    })
+    .optional(),
+  timing: z
+    .object({
+      targetL2Slot: z.number().optional(),
+      slotDeadlineTimestampS: schemas.BigInt.optional(),
+      msUntilSlotDeadline: z.number().optional(),
+    })
+    .optional(),
+});
+
 /** Store for failed L1 transactions for debugging purposes. */
 export interface L1TxFailedStore {
   /** Saves a failed transaction and returns its URI. */

package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts

@@ -1,7 +1,8 @@
+import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import type { FileStore } from '@aztec/stdlib/file-store';
 
-import type { FailedL1Tx, FailedL1TxUri, L1TxFailedStore } from './failed_tx_store.js';
+import { type FailedL1Tx, FailedL1TxSchema, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
 
 /**
  * L1TxFailedStore implementation using the FileStore abstraction.
@@ -20,7 +21,7 @@ export class FileStoreL1TxFailedStore implements L1TxFailedStore {
   public async saveFailedTx(tx: FailedL1Tx): Promise<FailedL1TxUri> {
     const prefix = tx.receipt ? 'tx' : 'data';
     const path = `${tx.failureType}/${prefix}-${tx.id}.json`;
-    const json = JSON.stringify(tx, null, 2);
+    const json = jsonStringify(tx, true);
 
     const uri = await this.fileStore.save(path, Buffer.from(json), {
       metadata: {
@@ -41,6 +42,6 @@ export class FileStoreL1TxFailedStore implements L1TxFailedStore {
 
   public async getFailedTx(uri: FailedL1TxUri): Promise<FailedL1Tx> {
     const data = await this.fileStore.read(uri);
-    return JSON.parse(data.toString()) as FailedL1Tx;
+    return jsonParseWithSchema(data.toString(), FailedL1TxSchema);
   }
 }

package/src/publisher/l1_tx_failed_store/index.ts

@@ -1,3 +1,3 @@
-export { type FailedL1Tx, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
+export { type FailedL1Tx, FailedL1TxSchema, type FailedL1TxUri, type L1TxFailedStore } from './failed_tx_store.js';
 export { createL1TxFailedStore } from './factory.js';
 export { FileStoreL1TxFailedStore } from './file_store_failed_tx_store.js';