@aztec/archiver 0.0.1-commit.6d63667d → 0.0.1-commit.86469d5

package/dest/l1/bin/retrieve-calldata.js

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
-import { createPublicClient, getAbiItem, http, toEventSelector } from 'viem';
+import { createPublicClient, http } from 'viem';
 import { mainnet } from 'viem/chains';
 import { CalldataRetriever } from '../calldata_retriever.js';
 const logger = createLogger('archiver:calldata-test');
@@ -87,33 +86,35 @@ async function main() {
             slashingProposerAddress,
             slashFactoryAddress
         });
-        // Extract checkpoint number from transaction logs
-        logger.info('Decoding transaction to extract checkpoint number...');
+        // Extract L2 block number from transaction logs
+        logger.info('Decoding transaction to extract L2 block number...');
         const receipt = await publicClient.getTransactionReceipt({
             hash: txHash
         });
-        // Look for CheckpointProposed event (emitted when a checkpoint is proposed to the rollup)
-        // Event signature: CheckpointProposed(uint256 indexed checkpointNumber, bytes32 indexed archive, bytes32[], bytes32, bytes32)
-        // Hash: keccak256("CheckpointProposed(uint256,bytes32,bytes32[],bytes32,bytes32)")
-        const checkpointProposedEvent = receipt.logs.find((log)=>{
+        const l2BlockProposedEvent = receipt.logs.find((log)=>{
             try {
-                return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === toEventSelector(getAbiItem({
-                    abi: RollupAbi,
-                    name: 'CheckpointProposed'
-                }));
+                // Try to match the L2BlockProposed event
+                return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === '0x2f1d0e696fa5186494a2f2f89a0e0bcbb15d607f6c5eac4637e07e1e5e7d3c00' // L2BlockProposed event signature
+                ;
             } catch  {
                 return false;
             }
         });
-        if (!checkpointProposedEvent || checkpointProposedEvent.topics[1] === undefined) {
-            throw new Error(`Checkpoint proposed event not found`);
+        let l2BlockNumber;
+        if (l2BlockProposedEvent && l2BlockProposedEvent.topics[1]) {
+            // L2 block number is typically the first indexed parameter
+            l2BlockNumber = Number(BigInt(l2BlockProposedEvent.topics[1]));
+            logger.info(`L2 Block Number (from event): ${l2BlockNumber}`);
+        } else {
+            // Fallback: try to extract from transaction data or use a default
+            logger.warn('Could not extract L2 block number from event, using block number as fallback');
+            l2BlockNumber = Number(tx.blockNumber);
         }
-        const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(checkpointProposedEvent.topics[1]));
         logger.info('');
-        logger.info('Retrieving checkpoint from rollup transaction...');
+        logger.info('Retrieving block header from rollup transaction...');
         logger.info('');
         // For this script, we don't have blob hashes or expected hashes, so pass empty arrays/objects
-        const result = await retriever.getCheckpointFromRollupTx(txHash, [], checkpointNumber, {});
+        const result = await retriever.getCheckpointFromRollupTx(txHash, [], CheckpointNumber.fromBlockNumber(BlockNumber(l2BlockNumber)), {});
         logger.info(' Successfully retrieved block header!');
         logger.info('');
         logger.info('Block Header Details:');

package/dest/store/log_store.d.ts

@@ -51,4 +51,4 @@ export declare class LogStore {
      */
     getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBYSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNHLE9BQU8sRUFJTCxLQUFLLFNBQVMsRUFHZCxLQUFLLFNBQVMsRUFDZCxHQUFHLEVBQ0gsYUFBYSxFQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFHNUIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxxQkFBYSxRQUFROztJQWFqQixPQUFPLENBQUMsRUFBRTtJQUNWLE9BQU8sQ0FBQyxVQUFVO0lBRnBCLFlBQ1UsRUFBRSxFQUFFLGlCQUFpQixFQUNyQixVQUFVLEVBQUUsVUFBVSxFQUM5QixlQUFlLEdBQUUsTUFBYSxFQVUvQjtJQThNRDs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUzNDO0lBZ0JELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTJCOUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0csb0JBQW9CLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUFFLElBQUksR0FBRSxNQUFVLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FRMUY7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLCtCQUErQixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsSUFBSSxHQUFFLE1BQVUsR0FDZixPQUFPLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQWE1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUErRkQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBc0pGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBYSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNHLE9BQU8sRUFJTCxLQUFLLFNBQVMsRUFHZCxLQUFLLFNBQVMsRUFDZCxHQUFHLEVBQ0gsYUFBYSxFQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFFNUIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxxQkFBYSxRQUFROztJQWFqQixPQUFPLENBQUMsRUFBRTtJQUNWLE9BQU8sQ0FBQyxVQUFVO0lBRnBCLFlBQ1UsRUFBRSxFQUFFLGlCQUFpQixFQUNyQixVQUFVLEVBQUUsVUFBVSxFQUM5QixlQUFlLEdBQUUsTUFBYSxFQVUvQjtJQTRNRDs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUzNDO0lBZ0JELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTJCOUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0csb0JBQW9CLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUFFLElBQUksR0FBRSxNQUFVLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FRMUY7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLCtCQUErQixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsSUFBSSxHQUFFLE1BQVUsR0FDZixPQUFPLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQWE1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUE2RUQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBNkdGIn0=

package/dest/store/log_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IA8MD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAgBD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B9C;IAED;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,GAAE,MAAU,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAQ1F;IAED;;;;;;;;OAQG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,GACf,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAa5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA+FD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CAsJF"}
+{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IA4MD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAgBD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B9C;IAED;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,GAAE,MAAU,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAQ1F;IAED;;;;;;;;OAQG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,GACf,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAa5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA6ED;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CA6GF"}

package/dest/store/log_store.js

@@ -7,7 +7,6 @@ import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 import { BlockHash } from '@aztec/stdlib/block';
 import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/api-limit';
 import { ContractClassLog, ExtendedContractClassLog, ExtendedPublicLog, LogId, PublicLog, TxScopedL2Log } from '@aztec/stdlib/logs';
-import { TxHash } from '@aztec/stdlib/tx';
 /**
  * A store for logs
  */ export class LogStore {
@@ -143,7 +142,6 @@ import { TxHash } from '@aztec/stdlib/tx';
             await this.#publicLogKeysByBlock.set(block.number, publicTagsInBlock);
             const publicLogsInBlock = block.body.txEffects.map((txEffect, txIndex)=>[
                     numToUInt32BE(txIndex),
-                    txEffect.txHash.toBuffer(),
                     numToUInt32BE(txEffect.publicLogs.length),
                     txEffect.publicLogs.map((log)=>log.toBuffer())
                 ].flat()).flat();
@@ -156,7 +154,6 @@ import { TxHash } from '@aztec/stdlib/tx';
             const blockHash = await block.hash();
             const contractClassLogsInBlock = block.body.txEffects.map((txEffect, txIndex)=>[
                     numToUInt32BE(txIndex),
-                    txEffect.txHash.toBuffer(),
                     numToUInt32BE(txEffect.contractClassLogs.length),
                     txEffect.contractClassLogs.map((log)=>log.toBuffer())
                 ].flat()).flat();
@@ -264,24 +261,22 @@ import { TxHash } from '@aztec/stdlib/tx';
             };
         }
         const buffer = await this.#publicLogsByBlock.getAsync(blockNumber) ?? Buffer.alloc(0);
-        const publicLogsInBlock = [];
+        const publicLogsInBlock = [
+            []
+        ];
         const reader = new BufferReader(buffer);
         const blockHash = this.#unpackBlockHash(reader);
         while(reader.remainingBytes() > 0){
             const indexOfTx = reader.readNumber();
-            const txHash = reader.readObject(TxHash);
             const numLogsInTx = reader.readNumber();
-            publicLogsInBlock[indexOfTx] = {
-                txHash,
-                logs: []
-            };
+            publicLogsInBlock[indexOfTx] = [];
             for(let i = 0; i < numLogsInTx; i++){
-                publicLogsInBlock[indexOfTx].logs.push(reader.readObject(PublicLog));
+                publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
             }
         }
-        const txData = publicLogsInBlock[txIndex];
+        const txLogs = publicLogsInBlock[txIndex];
         const logs = [];
-        const maxLogsHit = this.#accumulatePublicLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
+        const maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
         return {
             logs,
             maxLogsHit
@@ -302,24 +297,22 @@ import { TxHash } from '@aztec/stdlib/tx';
             start,
             end
         })){
-            const publicLogsInBlock = [];
+            const publicLogsInBlock = [
+                []
+            ];
             const reader = new BufferReader(logBuffer);
             const blockHash = this.#unpackBlockHash(reader);
             while(reader.remainingBytes() > 0){
                 const indexOfTx = reader.readNumber();
-                const txHash = reader.readObject(TxHash);
                 const numLogsInTx = reader.readNumber();
-                publicLogsInBlock[indexOfTx] = {
-                    txHash,
-                    logs: []
-                };
+                publicLogsInBlock[indexOfTx] = [];
                 for(let i = 0; i < numLogsInTx; i++){
-                    publicLogsInBlock[indexOfTx].logs.push(reader.readObject(PublicLog));
+                    publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
                 }
             }
             for(let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < publicLogsInBlock.length; txIndex++){
-                const txData = publicLogsInBlock[txIndex];
-                maxLogsHit = this.#accumulatePublicLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
+                const txLogs = publicLogsInBlock[txIndex];
+                maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
                 if (maxLogsHit) {
                     this.#log.debug(`Max logs hit at block ${blockNumber}`);
                     break loopOverBlocks;
@@ -356,24 +349,22 @@ import { TxHash } from '@aztec/stdlib/tx';
             };
         }
         const contractClassLogsBuffer = await this.#contractClassLogsByBlock.getAsync(blockNumber) ?? Buffer.alloc(0);
-        const contractClassLogsInBlock = [];
+        const contractClassLogsInBlock = [
+            []
+        ];
         const reader = new BufferReader(contractClassLogsBuffer);
         const blockHash = this.#unpackBlockHash(reader);
         while(reader.remainingBytes() > 0){
             const indexOfTx = reader.readNumber();
-            const txHash = reader.readObject(TxHash);
             const numLogsInTx = reader.readNumber();
-            contractClassLogsInBlock[indexOfTx] = {
-                txHash,
-                logs: []
-            };
+            contractClassLogsInBlock[indexOfTx] = [];
             for(let i = 0; i < numLogsInTx; i++){
-                contractClassLogsInBlock[indexOfTx].logs.push(reader.readObject(ContractClassLog));
+                contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
             }
         }
-        const txData = contractClassLogsInBlock[txIndex];
+        const txLogs = contractClassLogsInBlock[txIndex];
         const logs = [];
-        const maxLogsHit = this.#accumulateContractClassLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
+        const maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
         return {
             logs,
             maxLogsHit
@@ -394,24 +385,22 @@ import { TxHash } from '@aztec/stdlib/tx';
             start,
             end
         })){
-            const contractClassLogsInBlock = [];
+            const contractClassLogsInBlock = [
+                []
+            ];
             const reader = new BufferReader(logBuffer);
             const blockHash = this.#unpackBlockHash(reader);
             while(reader.remainingBytes() > 0){
                 const indexOfTx = reader.readNumber();
-                const txHash = reader.readObject(TxHash);
                 const numLogsInTx = reader.readNumber();
-                contractClassLogsInBlock[indexOfTx] = {
-                    txHash,
-                    logs: []
-                };
+                contractClassLogsInBlock[indexOfTx] = [];
                 for(let i = 0; i < numLogsInTx; i++){
-                    contractClassLogsInBlock[indexOfTx].logs.push(reader.readObject(ContractClassLog));
+                    contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
                 }
             }
             for(let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.length; txIndex++){
-                const txData = contractClassLogsInBlock[txIndex];
-                maxLogsHit = this.#accumulateContractClassLogs(logs, blockNumber, blockHash, txIndex, txData.txHash, txData.logs, filter);
+                const txLogs = contractClassLogsInBlock[txIndex];
+                maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
                 if (maxLogsHit) {
                     this.#log.debug(`Max logs hit at block ${blockNumber}`);
                     break loopOverBlocks;
@@ -423,28 +412,19 @@ import { TxHash } from '@aztec/stdlib/tx';
             maxLogsHit
         };
     }
-    #accumulatePublicLogs(results, blockNumber, blockHash, txIndex, txHash, txLogs, filter = {}) {
+    #accumulateLogs(results, blockNumber, blockHash, txIndex, txLogs, filter = {}) {
         let maxLogsHit = false;
         let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
         for(; logIndex < txLogs.length; logIndex++){
             const log = txLogs[logIndex];
             if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
-                results.push(new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log));
-                if (results.length >= this.#logsMaxPageSize) {
-                    maxLogsHit = true;
-                    break;
+                if (log instanceof ContractClassLog) {
+                    results.push(new ExtendedContractClassLog(new LogId(BlockNumber(blockNumber), blockHash, txIndex, logIndex), log));
+                } else if (log instanceof PublicLog) {
+                    results.push(new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txIndex, logIndex), log));
+                } else {
+                    throw new Error('Unknown log type');
                 }
-            }
-        }
-        return maxLogsHit;
-    }
-    #accumulateContractClassLogs(results, blockNumber, blockHash, txIndex, txHash, txLogs, filter = {}) {
-        let maxLogsHit = false;
-        let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
-        for(; logIndex < txLogs.length; logIndex++){
-            const log = txLogs[logIndex];
-            if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
-                results.push(new ExtendedContractClassLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log));
                 if (results.length >= this.#logsMaxPageSize) {
                     maxLogsHit = true;
                     break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "0.0.1-commit.6d63667d",
+  "version": "0.0.1-commit.86469d5",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -65,18 +65,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-client": "0.0.1-commit.6d63667d",
-    "@aztec/blob-lib": "0.0.1-commit.6d63667d",
-    "@aztec/constants": "0.0.1-commit.6d63667d",
-    "@aztec/epoch-cache": "0.0.1-commit.6d63667d",
-    "@aztec/ethereum": "0.0.1-commit.6d63667d",
-    "@aztec/foundation": "0.0.1-commit.6d63667d",
-    "@aztec/kv-store": "0.0.1-commit.6d63667d",
-    "@aztec/l1-artifacts": "0.0.1-commit.6d63667d",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.6d63667d",
-    "@aztec/protocol-contracts": "0.0.1-commit.6d63667d",
-    "@aztec/stdlib": "0.0.1-commit.6d63667d",
-    "@aztec/telemetry-client": "0.0.1-commit.6d63667d",
+    "@aztec/blob-client": "0.0.1-commit.86469d5",
+    "@aztec/blob-lib": "0.0.1-commit.86469d5",
+    "@aztec/constants": "0.0.1-commit.86469d5",
+    "@aztec/epoch-cache": "0.0.1-commit.86469d5",
+    "@aztec/ethereum": "0.0.1-commit.86469d5",
+    "@aztec/foundation": "0.0.1-commit.86469d5",
+    "@aztec/kv-store": "0.0.1-commit.86469d5",
+    "@aztec/l1-artifacts": "0.0.1-commit.86469d5",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.86469d5",
+    "@aztec/protocol-contracts": "0.0.1-commit.86469d5",
+    "@aztec/stdlib": "0.0.1-commit.86469d5",
+    "@aztec/telemetry-client": "0.0.1-commit.86469d5",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.5.0",

package/src/l1/bin/retrieve-calldata.ts

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec/ethereum/types';
-import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
-import { type Hex, createPublicClient, getAbiItem, http, toEventSelector } from 'viem';
+import { type Hex, createPublicClient, http } from 'viem';
 import { mainnet } from 'viem/chains';
 
 import { CalldataRetriever } from '../calldata_retriever.js';
@@ -112,36 +111,43 @@ async function main() {
       },
     );
 
-    // Extract checkpoint number from transaction logs
-    logger.info('Decoding transaction to extract checkpoint number...');
+    // Extract L2 block number from transaction logs
+    logger.info('Decoding transaction to extract L2 block number...');
     const receipt = await publicClient.getTransactionReceipt({ hash: txHash });
-
-    // Look for CheckpointProposed event (emitted when a checkpoint is proposed to the rollup)
-    // Event signature: CheckpointProposed(uint256 indexed checkpointNumber, bytes32 indexed archive, bytes32[], bytes32, bytes32)
-    // Hash: keccak256("CheckpointProposed(uint256,bytes32,bytes32[],bytes32,bytes32)")
-    const checkpointProposedEvent = receipt.logs.find(log => {
+    const l2BlockProposedEvent = receipt.logs.find(log => {
       try {
+        // Try to match the L2BlockProposed event
         return (
           log.address.toLowerCase() === rollupAddress.toString().toLowerCase() &&
-          log.topics[0] === toEventSelector(getAbiItem({ abi: RollupAbi, name: 'CheckpointProposed' }))
+          log.topics[0] === '0x2f1d0e696fa5186494a2f2f89a0e0bcbb15d607f6c5eac4637e07e1e5e7d3c00' // L2BlockProposed event signature
         );
       } catch {
         return false;
       }
     });
 
-    if (!checkpointProposedEvent || checkpointProposedEvent.topics[1] === undefined) {
-      throw new Error(`Checkpoint proposed event not found`);
+    let l2BlockNumber: number;
+    if (l2BlockProposedEvent && l2BlockProposedEvent.topics[1]) {
+      // L2 block number is typically the first indexed parameter
+      l2BlockNumber = Number(BigInt(l2BlockProposedEvent.topics[1]));
+      logger.info(`L2 Block Number (from event): ${l2BlockNumber}`);
+    } else {
+      // Fallback: try to extract from transaction data or use a default
+      logger.warn('Could not extract L2 block number from event, using block number as fallback');
+      l2BlockNumber = Number(tx.blockNumber);
     }
 
-    const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(checkpointProposedEvent.topics[1]));
-
     logger.info('');
-    logger.info('Retrieving checkpoint from rollup transaction...');
+    logger.info('Retrieving block header from rollup transaction...');
     logger.info('');
 
     // For this script, we don't have blob hashes or expected hashes, so pass empty arrays/objects
-    const result = await retriever.getCheckpointFromRollupTx(txHash, [], checkpointNumber, {});
+    const result = await retriever.getCheckpointFromRollupTx(
+      txHash,
+      [],
+      CheckpointNumber.fromBlockNumber(BlockNumber(l2BlockNumber)),
+      {},
+    );
 
     logger.info(' Successfully retrieved block header!');
     logger.info('');

package/src/store/log_store.ts

@@ -20,7 +20,6 @@ import {
   Tag,
   TxScopedL2Log,
 } from '@aztec/stdlib/logs';
-import { TxHash } from '@aztec/stdlib/tx';
 
 import type { BlockStore } from './block_store.js';
 
@@ -220,7 +219,6 @@ export class LogStore {
         .map((txEffect, txIndex) =>
           [
             numToUInt32BE(txIndex),
-            txEffect.txHash.toBuffer(),
             numToUInt32BE(txEffect.publicLogs.length),
             txEffect.publicLogs.map(log => log.toBuffer()),
           ].flat(),
@@ -244,7 +242,6 @@ export class LogStore {
         .map((txEffect, txIndex) =>
           [
             numToUInt32BE(txIndex),
-            txEffect.txHash.toBuffer(),
             numToUInt32BE(txEffect.contractClassLogs.length),
             txEffect.contractClassLogs.map(log => log.toBuffer()),
           ].flat(),
@@ -389,33 +386,24 @@ export class LogStore {
     }
 
     const buffer = (await this.#publicLogsByBlock.getAsync(blockNumber)) ?? Buffer.alloc(0);
-    const publicLogsInBlock: { txHash: TxHash; logs: PublicLog[] }[] = [];
+    const publicLogsInBlock: [PublicLog[]] = [[]];
     const reader = new BufferReader(buffer);
 
     const blockHash = this.#unpackBlockHash(reader);
 
     while (reader.remainingBytes() > 0) {
       const indexOfTx = reader.readNumber();
-      const txHash = reader.readObject(TxHash);
       const numLogsInTx = reader.readNumber();
-      publicLogsInBlock[indexOfTx] = { txHash, logs: [] };
+      publicLogsInBlock[indexOfTx] = [];
       for (let i = 0; i < numLogsInTx; i++) {
-        publicLogsInBlock[indexOfTx].logs.push(reader.readObject(PublicLog));
+        publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
       }
     }
 
-    const txData = publicLogsInBlock[txIndex];
+    const txLogs = publicLogsInBlock[txIndex];
 
     const logs: ExtendedPublicLog[] = [];
-    const maxLogsHit = this.#accumulatePublicLogs(
-      logs,
-      blockNumber,
-      blockHash,
-      txIndex,
-      txData.txHash,
-      txData.logs,
-      filter,
-    );
+    const maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
 
     return { logs, maxLogsHit };
   }
@@ -436,31 +424,22 @@ export class LogStore {
 
     let maxLogsHit = false;
     loopOverBlocks: for await (const [blockNumber, logBuffer] of this.#publicLogsByBlock.entriesAsync({ start, end })) {
-      const publicLogsInBlock: { txHash: TxHash; logs: PublicLog[] }[] = [];
+      const publicLogsInBlock: [PublicLog[]] = [[]];
       const reader = new BufferReader(logBuffer);
 
       const blockHash = this.#unpackBlockHash(reader);
 
       while (reader.remainingBytes() > 0) {
         const indexOfTx = reader.readNumber();
-        const txHash = reader.readObject(TxHash);
         const numLogsInTx = reader.readNumber();
-        publicLogsInBlock[indexOfTx] = { txHash, logs: [] };
+        publicLogsInBlock[indexOfTx] = [];
         for (let i = 0; i < numLogsInTx; i++) {
-          publicLogsInBlock[indexOfTx].logs.push(reader.readObject(PublicLog));
+          publicLogsInBlock[indexOfTx].push(reader.readObject(PublicLog));
         }
       }
       for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < publicLogsInBlock.length; txIndex++) {
-        const txData = publicLogsInBlock[txIndex];
-        maxLogsHit = this.#accumulatePublicLogs(
-          logs,
-          blockNumber,
-          blockHash,
-          txIndex,
-          txData.txHash,
-          txData.logs,
-          filter,
-        );
+        const txLogs = publicLogsInBlock[txIndex];
+        maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
         if (maxLogsHit) {
           this.#log.debug(`Max logs hit at block ${blockNumber}`);
           break loopOverBlocks;
@@ -496,33 +475,24 @@ export class LogStore {
       return { logs: [], maxLogsHit: false };
     }
     const contractClassLogsBuffer = (await this.#contractClassLogsByBlock.getAsync(blockNumber)) ?? Buffer.alloc(0);
-    const contractClassLogsInBlock: { txHash: TxHash; logs: ContractClassLog[] }[] = [];
+    const contractClassLogsInBlock: [ContractClassLog[]] = [[]];
 
     const reader = new BufferReader(contractClassLogsBuffer);
     const blockHash = this.#unpackBlockHash(reader);
 
     while (reader.remainingBytes() > 0) {
       const indexOfTx = reader.readNumber();
-      const txHash = reader.readObject(TxHash);
       const numLogsInTx = reader.readNumber();
-      contractClassLogsInBlock[indexOfTx] = { txHash, logs: [] };
+      contractClassLogsInBlock[indexOfTx] = [];
       for (let i = 0; i < numLogsInTx; i++) {
-        contractClassLogsInBlock[indexOfTx].logs.push(reader.readObject(ContractClassLog));
+        contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
       }
     }
 
-    const txData = contractClassLogsInBlock[txIndex];
+    const txLogs = contractClassLogsInBlock[txIndex];
 
     const logs: ExtendedContractClassLog[] = [];
-    const maxLogsHit = this.#accumulateContractClassLogs(
-      logs,
-      blockNumber,
-      blockHash,
-      txIndex,
-      txData.txHash,
-      txData.logs,
-      filter,
-    );
+    const maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
 
     return { logs, maxLogsHit };
   }
@@ -546,29 +516,20 @@ export class LogStore {
       start,
       end,
     })) {
-      const contractClassLogsInBlock: { txHash: TxHash; logs: ContractClassLog[] }[] = [];
+      const contractClassLogsInBlock: [ContractClassLog[]] = [[]];
       const reader = new BufferReader(logBuffer);
       const blockHash = this.#unpackBlockHash(reader);
       while (reader.remainingBytes() > 0) {
         const indexOfTx = reader.readNumber();
-        const txHash = reader.readObject(TxHash);
         const numLogsInTx = reader.readNumber();
-        contractClassLogsInBlock[indexOfTx] = { txHash, logs: [] };
+        contractClassLogsInBlock[indexOfTx] = [];
         for (let i = 0; i < numLogsInTx; i++) {
-          contractClassLogsInBlock[indexOfTx].logs.push(reader.readObject(ContractClassLog));
+          contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
         }
       }
       for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.length; txIndex++) {
-        const txData = contractClassLogsInBlock[txIndex];
-        maxLogsHit = this.#accumulateContractClassLogs(
-          logs,
-          blockNumber,
-          blockHash,
-          txIndex,
-          txData.txHash,
-          txData.logs,
-          filter,
-        );
+        const txLogs = contractClassLogsInBlock[txIndex];
+        maxLogsHit = this.#accumulateLogs(logs, blockNumber, blockHash, txIndex, txLogs, filter);
         if (maxLogsHit) {
           this.#log.debug(`Max logs hit at block ${blockNumber}`);
           break loopOverBlocks;
@@ -579,13 +540,12 @@ export class LogStore {
     return { logs, maxLogsHit };
   }
 
-  #accumulatePublicLogs(
-    results: ExtendedPublicLog[],
+  #accumulateLogs(
+    results: (ExtendedContractClassLog | ExtendedPublicLog)[],
     blockNumber: number,
     blockHash: BlockHash,
     txIndex: number,
-    txHash: TxHash,
-    txLogs: PublicLog[],
+    txLogs: (ContractClassLog | PublicLog)[],
     filter: LogFilter = {},
   ): boolean {
     let maxLogsHit = false;
@@ -593,37 +553,15 @@ export class LogStore {
     for (; logIndex < txLogs.length; logIndex++) {
       const log = txLogs[logIndex];
       if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
-        results.push(
-          new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log),
-        );
-
-        if (results.length >= this.#logsMaxPageSize) {
-          maxLogsHit = true;
-          break;
+        if (log instanceof ContractClassLog) {
+          results.push(
+            new ExtendedContractClassLog(new LogId(BlockNumber(blockNumber), blockHash, txIndex, logIndex), log),
+          );
+        } else if (log instanceof PublicLog) {
+          results.push(new ExtendedPublicLog(new LogId(BlockNumber(blockNumber), blockHash, txIndex, logIndex), log));
+        } else {
+          throw new Error('Unknown log type');
         }
-      }
-    }
-
-    return maxLogsHit;
-  }
-
-  #accumulateContractClassLogs(
-    results: ExtendedContractClassLog[],
-    blockNumber: number,
-    blockHash: BlockHash,
-    txIndex: number,
-    txHash: TxHash,
-    txLogs: ContractClassLog[],
-    filter: LogFilter = {},
-  ): boolean {
-    let maxLogsHit = false;
-    let logIndex = typeof filter.afterLog?.logIndex === 'number' ? filter.afterLog.logIndex + 1 : 0;
-    for (; logIndex < txLogs.length; logIndex++) {
-      const log = txLogs[logIndex];
-      if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
-        results.push(
-          new ExtendedContractClassLog(new LogId(BlockNumber(blockNumber), blockHash, txHash, txIndex, logIndex), log),
-        );
 
         if (results.length >= this.#logsMaxPageSize) {
           maxLogsHit = true;