@aztec/archiver 0.54.0 → 0.55.0

package/src/archiver/eth_log_handlers.ts

@@ -1,22 +1,13 @@
-import { Body, InboxLeaf } from '@aztec/circuit-types';
+import { Body, InboxLeaf, L2Block, type ViemSignature } from '@aztec/circuit-types';
 import { AppendOnlyTreeSnapshot, Header, Proof } from '@aztec/circuits.js';
 import { type EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { numToUInt32BE } from '@aztec/foundation/serialize';
-import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
-import {
-  type Hex,
-  type Log,
-  type PublicClient,
-  decodeFunctionData,
-  getAbiItem,
-  getAddress,
-  hexToBytes,
-  slice,
-} from 'viem';
+import { type Hex, type Log, type PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
 
-import { type L1PublishedData } from './structs/published.js';
+import { type L1Published, type L1PublishedData } from './structs/published.js';
 
 /**
  * Processes newly received MessageSent (L1 to L2) logs.
@@ -39,25 +30,21 @@ export function processMessageSentLogs(
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param expectedL2BlockNumber - The next expected L2 block number.
  * @param logs - L2BlockProposed logs.
- * @returns - An array of tuples representing block metadata including the header, archive tree snapshot.
+ * @returns - An array blocks.
  */
 export async function processL2BlockProposedLogs(
   publicClient: PublicClient,
   expectedL2BlockNumber: bigint,
   logs: Log<bigint, number, false, undefined, true, typeof RollupAbi, 'L2BlockProposed'>[],
-): Promise<[Header, AppendOnlyTreeSnapshot, L1PublishedData][]> {
-  const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot, L1PublishedData][] = [];
+): Promise<L1Published<L2Block>[]> {
+  const retrievedBlocks: L1Published<L2Block>[] = [];
   for (const log of logs) {
     const blockNum = log.args.blockNumber;
     if (blockNum !== expectedL2BlockNumber) {
       throw new Error('Block number mismatch. Expected: ' + expectedL2BlockNumber + ' but got: ' + blockNum + '.');
     }
     // TODO: Fetch blocks from calldata in parallel
-    const [header, archive] = await getBlockMetadataFromRollupTx(
-      publicClient,
-      log.transactionHash!,
-      log.args.blockNumber,
-    );
+    const block = await getBlockFromRollupTx(publicClient, log.transactionHash!, log.args.blockNumber);
 
     const l1: L1PublishedData = {
       blockNumber: log.blockNumber,
@@ -65,11 +52,11 @@ export async function processL2BlockProposedLogs(
       timestamp: await getL1BlockTime(publicClient, log.blockNumber),
     };
 
-    retrievedBlockMetadata.push([header, archive, l1]);
+    retrievedBlocks.push({ data: block, l1 });
     expectedL2BlockNumber++;
   }
 
-  return retrievedBlockMetadata;
+  return retrievedBlocks;
 }
 
 export async function getL1BlockTime(publicClient: PublicClient, blockNumber: bigint): Promise<bigint> {
@@ -77,33 +64,20 @@ export async function getL1BlockTime(publicClient: PublicClient, blockNumber: bi
   return block.timestamp;
 }
 
-export async function processTxsPublishedLogs(
-  publicClient: PublicClient,
-  logs: Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>[],
-): Promise<[Body, Buffer][]> {
-  const retrievedBlockBodies: [Body, Buffer][] = [];
-  for (const log of logs) {
-    const newBlockBody = await getBlockBodiesFromAvailabilityOracleTx(publicClient, log.transactionHash!);
-    retrievedBlockBodies.push([newBlockBody, Buffer.from(hexToBytes(log.args.txsEffectsHash))]);
-  }
-
-  return retrievedBlockBodies;
-}
-
 /**
- * Gets block metadata (header and archive snapshot) from the calldata of an L1 transaction.
+ * Gets block from the calldata of an L1 transaction.
  * Assumes that the block was published from an EOA.
  * TODO: Add retries and error management.
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param txHash - Hash of the tx that published it.
  * @param l2BlockNum - L2 block number.
- * @returns L2 block metadata (header and archive) from the calldata, deserialized
+ * @returns L2 block from the calldata, deserialized
  */
-async function getBlockMetadataFromRollupTx(
+async function getBlockFromRollupTx(
   publicClient: PublicClient,
   txHash: `0x${string}`,
   l2BlockNum: bigint,
-): Promise<[Header, AppendOnlyTreeSnapshot]> {
+): Promise<L2Block> {
   const { input: data } = await publicClient.getTransaction({ hash: txHash });
   const { functionName, args } = decodeFunctionData({
     abi: RollupAbi,
@@ -113,9 +87,10 @@ async function getBlockMetadataFromRollupTx(
   if (!(functionName === 'propose')) {
     throw new Error(`Unexpected method called ${functionName}`);
   }
-  const [headerHex, archiveRootHex, _] = args! as readonly [Hex, Hex, Hex];
+  const [headerHex, archiveRootHex, , , , bodyHex] = args! as readonly [Hex, Hex, Hex, Hex[], ViemSignature[], Hex];
 
   const header = Header.fromBuffer(Buffer.from(hexToBytes(headerHex)));
+  const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
 
   const blockNumberFromHeader = header.globalVariables.blockNumber.toBigInt();
 
@@ -130,57 +105,7 @@ async function getBlockMetadataFromRollupTx(
     ]),
   );
 
-  return [header, archive];
-}
-
-/**
- * Gets block bodies from calldata of an L1 transaction, and deserializes them into Body objects.
- * @note Assumes that the block was published using `propose` or `publish`.
- * TODO: Add retries and error management.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param txHash - Hash of the tx that published it.
- * @returns An L2 block body from the calldata, deserialized
- */
-async function getBlockBodiesFromAvailabilityOracleTx(
-  publicClient: PublicClient,
-  txHash: `0x${string}`,
-): Promise<Body> {
-  const { input: data } = await publicClient.getTransaction({ hash: txHash });
-
-  // @note  Use `forge inspect Rollup methodIdentifiers to get this,
-  //        If using `forge sig` you will get an INVALID value for the case with a struct.
-  // [
-  //   "propose(bytes,bytes32,bytes32,(bool,uint8,bytes32,bytes32)[],bytes)": "08978fe9",
-  //   "propose(bytes,bytes32,bytes32,bytes)": "81e6f472",
-  //   "publish(bytes calldata _body)"
-  // ]
-  const DATA_INDEX = [4, 3, 0];
-  const SUPPORTED_SIGS = ['0x08978fe9', '0x81e6f472', '0x7fd28346'];
-
-  const signature = slice(data, 0, 4);
-
-  if (!SUPPORTED_SIGS.includes(signature)) {
-    throw new Error(`Unexpected method called ${signature}`);
-  }
-
-  if (signature === SUPPORTED_SIGS[SUPPORTED_SIGS.length - 1]) {
-    const { args } = decodeFunctionData({
-      abi: AvailabilityOracleAbi,
-      data,
-    });
-    const [bodyHex] = args! as [Hex];
-    const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
-    return blockBody;
-  } else {
-    const { args } = decodeFunctionData({
-      abi: RollupAbi,
-      data,
-    });
-    const index = SUPPORTED_SIGS.indexOf(signature);
-    const bodyHex = args![DATA_INDEX[index]] as Hex;
-    const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
-    return blockBody;
-  }
+  return new L2Block(archive, header, blockBody);
 }
 
 /**
@@ -208,31 +133,6 @@ export function getL2BlockProposedLogs(
   });
 }
 
-/**
- * Gets relevant `TxsPublished` logs from chain.
- * @param publicClient - The viem public client to use for transaction retrieval.
- * @param dataAvailabilityOracleAddress - The address of the availability oracle contract.
- * @param fromBlock - First block to get logs from (inclusive).
- * @param toBlock - Last block to get logs from (inclusive).
- * @returns An array of `TxsPublished` logs.
- */
-export function getTxsPublishedLogs(
-  publicClient: PublicClient,
-  dataAvailabilityOracleAddress: EthAddress,
-  fromBlock: bigint,
-  toBlock: bigint,
-): Promise<Log<bigint, number, false, undefined, true, typeof AvailabilityOracleAbi, 'TxsPublished'>[]> {
-  return publicClient.getLogs({
-    address: getAddress(dataAvailabilityOracleAddress.toString()),
-    event: getAbiItem({
-      abi: AvailabilityOracleAbi,
-      name: 'TxsPublished',
-    }),
-    fromBlock,
-    toBlock: toBlock + 1n, // the toBlock argument in getLogs is exclusive
-  });
-}
-
 /**
  * Get relevant `MessageSent` logs emitted by Inbox on chain.
  * @param publicClient - The viem public client to use for transaction retrieval.

package/src/index.ts

@@ -13,7 +13,7 @@ export * from './archiver/index.js';
 export * from './rpc/index.js';
 export * from './factory.js';
 
-export { retrieveL2ProofVerifiedEvents, retrieveBlockMetadataFromRollup } from './archiver/data_retrieval.js';
+export { retrieveL2ProofVerifiedEvents, retrieveBlockFromRollup } from './archiver/data_retrieval.js';
 
 export { getL2BlockProposedLogs } from './archiver/eth_log_handlers.js';
 
@@ -37,7 +37,6 @@ async function main() {
   const archiver = new Archiver(
     publicClient,
     l1Contracts.rollupAddress,
-    l1Contracts.availabilityOracleAddress,
     l1Contracts.inboxAddress,
     l1Contracts.registryAddress,
     archiverStore,