@aztec/archiver 0.0.0-test.1 → 0.0.1-commit.1142ef1

package/dest/test/mock_l2_block_source.js

@@ -1,19 +1,26 @@
-import { DefaultL1ContractsConfig } from '@aztec/ethereum';
+import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
+import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { L2Block, L2BlockHash } from '@aztec/stdlib/block';
-import { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { CheckpointedL2Block, L2Block, L2BlockHash, PublishedL2Block } from '@aztec/stdlib/block';
+import { L1PublishedData } from '@aztec/stdlib/checkpoint';
+import { EmptyL1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 /**
  * A mocked implementation of L2BlockSource to be used in tests.
  */ export class MockL2BlockSource {
     l2Blocks = [];
     provenBlockNumber = 0;
+    finalizedBlockNumber = 0;
+    checkpointedBlockNumber = 0;
     log = createLogger('archiver:mock_l2_block_source');
     async createBlocks(numBlocks) {
         for(let i = 0; i < numBlocks; i++){
             const blockNum = this.l2Blocks.length + 1;
-            const block = await L2Block.random(blockNum);
+            const block = await L2Block.random(BlockNumber(blockNum));
             this.l2Blocks.push(block);
         }
         this.log.verbose(`Created ${numBlocks} blocks in the mock L2 block source`);
@@ -29,6 +36,15 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     setProvenBlockNumber(provenBlockNumber) {
         this.provenBlockNumber = provenBlockNumber;
     }
+    setFinalizedBlockNumber(finalizedBlockNumber) {
+        if (finalizedBlockNumber > this.provenBlockNumber) {
+            this.provenBlockNumber = finalizedBlockNumber;
+        }
+        this.finalizedBlockNumber = finalizedBlockNumber;
+    }
+    setCheckpointedBlockNumber(checkpointedBlockNumber) {
+        this.checkpointedBlockNumber = checkpointedBlockNumber;
+    }
     /**
    * Method to fetch the rollup contract address at the base-layer.
    * @returns The rollup address.
@@ -45,10 +61,35 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
    * Gets the number of the latest L2 block processed by the block source implementation.
    * @returns In this mock instance, returns the number of L2 blocks that we've mocked.
    */ getBlockNumber() {
-        return Promise.resolve(this.l2Blocks.length);
+        return Promise.resolve(BlockNumber(this.l2Blocks.length));
     }
     getProvenBlockNumber() {
-        return Promise.resolve(this.provenBlockNumber);
+        return Promise.resolve(BlockNumber(this.provenBlockNumber));
+    }
+    getCheckpointedBlock(number) {
+        if (number > this.checkpointedBlockNumber) {
+            return Promise.resolve(undefined);
+        }
+        const block = this.l2Blocks[number - 1];
+        if (!block) {
+            return Promise.resolve(undefined);
+        }
+        const checkpointedBlock = new CheckpointedL2Block(CheckpointNumber(number), block.toL2Block(), new L1PublishedData(BigInt(number), BigInt(number), `0x${number.toString(16).padStart(64, '0')}`), []);
+        return Promise.resolve(checkpointedBlock);
+    }
+    async getCheckpointedBlocks(from, limit, _proven) {
+        const result = [];
+        for(let i = 0; i < limit; i++){
+            const blockNum = from + i;
+            if (blockNum > this.checkpointedBlockNumber) {
+                break;
+            }
+            const block = await this.getCheckpointedBlock(BlockNumber(blockNum));
+            if (block) {
+                result.push(block);
+            }
+        }
+        return result;
     }
     /**
    * Gets an l2 block.
@@ -58,6 +99,14 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         return Promise.resolve(this.l2Blocks[number - 1]);
     }
     /**
+   * Gets an L2 block (new format).
+   * @param number - The block number to return.
+   * @returns The requested L2 block.
+   */ getL2BlockNew(number) {
+        const block = this.l2Blocks[number - 1];
+        return Promise.resolve(block?.toL2Block());
+    }
+    /**
    * Gets up to `limit` amount of L2 blocks starting from `from`.
    * @param from - Number of the first block to return (inclusive).
    * @param limit - The maximum number of blocks to return.
@@ -65,8 +114,69 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
    */ getBlocks(from, limit, proven) {
         return Promise.resolve(this.l2Blocks.slice(from - 1, from - 1 + limit).filter((b)=>!proven || this.provenBlockNumber === undefined || b.number <= this.provenBlockNumber));
     }
+    async getPublishedCheckpoints(from, limit) {
+        // TODO: Implement this properly. This only works when we have one block per checkpoint.
+        return (await this.getPublishedBlocks(from, limit)).map((block)=>block.toPublishedCheckpoint());
+    }
+    async getCheckpointByArchive(archive) {
+        // TODO: Implement this properly. This only works when we have one block per checkpoint.
+        return (await this.getPublishedBlockByArchive(archive))?.block.toCheckpoint();
+    }
+    async getPublishedBlocks(from, limit, proven) {
+        const blocks = await this.getBlocks(from, limit, proven);
+        return blocks.map((block)=>PublishedL2Block.fromFields({
+                block,
+                l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
+                attestations: []
+            }));
+    }
+    async getL2BlocksNew(from, limit, proven) {
+        const blocks = await this.getBlocks(from, limit, proven);
+        return blocks.map((x)=>x.toL2Block());
+    }
+    async getPublishedBlockByHash(blockHash) {
+        for (const block of this.l2Blocks){
+            const hash = await block.hash();
+            if (hash.equals(blockHash)) {
+                return PublishedL2Block.fromFields({
+                    block,
+                    l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
+                    attestations: []
+                });
+            }
+        }
+        return undefined;
+    }
+    getPublishedBlockByArchive(archive) {
+        const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
+        if (!block) {
+            return Promise.resolve(undefined);
+        }
+        return Promise.resolve(PublishedL2Block.fromFields({
+            block,
+            l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
+            attestations: []
+        }));
+    }
+    async getBlockHeaderByHash(blockHash) {
+        for (const block of this.l2Blocks){
+            const hash = await block.hash();
+            if (hash.equals(blockHash)) {
+                return block.getBlockHeader();
+            }
+        }
+        return undefined;
+    }
+    getBlockHeaderByArchive(archive) {
+        const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
+        return Promise.resolve(block?.getBlockHeader());
+    }
     getBlockHeader(number) {
-        return Promise.resolve(this.l2Blocks.at(typeof number === 'number' ? number - 1 : -1)?.header);
+        return Promise.resolve(this.l2Blocks.at(typeof number === 'number' ? number - 1 : -1)?.getBlockHeader());
+    }
+    getCheckpointsForEpoch(epochNumber) {
+        // TODO: Implement this properly. This only works when we have one block per checkpoint.
+        return this.getBlocksForEpoch(epochNumber).then((blocks)=>blocks.map((b)=>b.toCheckpoint()));
     }
     getBlocksForEpoch(epochNumber) {
         const epochDuration = DefaultL1ContractsConfig.aztecEpochDuration;
@@ -74,15 +184,19 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
             epochDuration
         });
         const blocks = this.l2Blocks.filter((b)=>{
-            const slot = b.header.globalVariables.slotNumber.toBigInt();
+            const slot = b.header.globalVariables.slotNumber;
             return slot >= start && slot <= end;
         });
         return Promise.resolve(blocks);
     }
+    async getBlockHeadersForEpoch(epochNumber) {
+        const blocks = await this.getBlocksForEpoch(epochNumber);
+        return blocks.map((b)=>b.getBlockHeader());
+    }
     /**
    * Gets a tx effect.
-   * @param txHash - The hash of a transaction which resulted in the returned tx effect.
-   * @returns The requested tx effect.
+   * @param txHash - The hash of the tx corresponding to the tx effect.
+   * @returns The requested tx effect with block info (or undefined if not found).
    */ async getTxEffect(txHash) {
         const match = this.l2Blocks.flatMap((b)=>b.body.txEffects.map((tx)=>[
                     tx,
@@ -95,7 +209,8 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         return {
             data: txEffect,
             l2BlockNumber: block.number,
-            l2BlockHash: (await block.hash()).toString()
+            l2BlockHash: L2BlockHash.fromField(await block.hash()),
+            txIndexInBlock: block.body.txEffects.indexOf(txEffect)
         };
     }
     /**
@@ -113,27 +228,44 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         return undefined;
     }
     async getL2Tips() {
-        const [latest, proven, finalized] = [
+        const [latest, proven, finalized, checkpointed] = [
             await this.getBlockNumber(),
             await this.getProvenBlockNumber(),
-            await this.getProvenBlockNumber()
+            this.finalizedBlockNumber,
+            this.checkpointedBlockNumber
         ];
         const latestBlock = this.l2Blocks[latest - 1];
         const provenBlock = this.l2Blocks[proven - 1];
         const finalizedBlock = this.l2Blocks[finalized - 1];
+        const checkpointedBlock = this.l2Blocks[checkpointed - 1];
+        const latestBlockId = {
+            number: BlockNumber(latest),
+            hash: (await latestBlock?.hash())?.toString()
+        };
+        const provenBlockId = {
+            number: BlockNumber(proven),
+            hash: (await provenBlock?.hash())?.toString()
+        };
+        const finalizedBlockId = {
+            number: BlockNumber(finalized),
+            hash: (await finalizedBlock?.hash())?.toString()
+        };
+        const checkpointedBlockId = {
+            number: BlockNumber(checkpointed),
+            hash: (await checkpointedBlock?.hash())?.toString()
+        };
+        const makeTipId = (blockId)=>({
+                block: blockId,
+                checkpoint: {
+                    number: CheckpointNumber(blockId.number),
+                    hash: blockId.hash
+                }
+            });
         return {
-            latest: {
-                number: latest,
-                hash: (await latestBlock?.hash())?.toString()
-            },
-            proven: {
-                number: proven,
-                hash: (await provenBlock?.hash())?.toString()
-            },
-            finalized: {
-                number: finalized,
-                hash: (await finalizedBlock?.hash())?.toString()
-            }
+            proposed: latestBlockId,
+            checkpointed: makeTipId(checkpointedBlockId),
+            proven: makeTipId(provenBlockId),
+            finalized: makeTipId(finalizedBlockId)
         };
     }
     getL2EpochNumber() {
@@ -146,18 +278,57 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         throw new Error('Method not implemented.');
     }
     getL1Constants() {
+        return Promise.resolve(EmptyL1RollupConstants);
+    }
+    getGenesisValues() {
+        return Promise.resolve({
+            genesisArchiveRoot: new Fr(GENESIS_ARCHIVE_ROOT)
+        });
+    }
+    getL1Timestamp() {
         throw new Error('Method not implemented.');
     }
     /**
    * Starts the block source. In this mock implementation, this is a noop.
    * @returns A promise that signals the initialization of the l2 block source on completion.
    */ start() {
+        this.log.verbose('Starting mock L2 block source');
         return Promise.resolve();
     }
     /**
    * Stops the block source. In this mock implementation, this is a noop.
    * @returns A promise that signals the l2 block source is now stopped.
    */ stop() {
+        this.log.verbose('Stopping mock L2 block source');
+        return Promise.resolve();
+    }
+    getContractClass(_id) {
+        return Promise.resolve(undefined);
+    }
+    getBytecodeCommitment(_id) {
+        return Promise.resolve(undefined);
+    }
+    getContract(_address, _timestamp) {
+        return Promise.resolve(undefined);
+    }
+    getContractClassIds() {
+        return Promise.resolve([]);
+    }
+    getDebugFunctionName(_address, _selector) {
+        return Promise.resolve(undefined);
+    }
+    registerContractFunctionSignatures(_signatures) {
+        return Promise.resolve();
+    }
+    syncImmediate() {
         return Promise.resolve();
     }
+    isPendingChainInvalid() {
+        return Promise.resolve(false);
+    }
+    getPendingChainValidationStatus() {
+        return Promise.resolve({
+            valid: true
+        });
+    }
 }

package/dest/test/mock_structs.d.ts

@@ -0,0 +1,10 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer16 } from '@aztec/foundation/buffer';
+import { type InboxMessage } from '../archiver/structs/inbox_message.js';
+export declare function makeInboxMessage(previousRollingHash?: Buffer16, overrides?: Partial<InboxMessage>): InboxMessage;
+export declare function makeInboxMessages(count: number, opts?: {
+    initialHash?: Buffer16;
+    initialCheckpointNumber?: CheckpointNumber;
+    overrideFn?: (msg: InboxMessage, index: number) => InboxMessage;
+}): InboxMessage[];
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19zdHJ1Y3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9tb2NrX3N0cnVjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxFQUFFLFFBQVEsRUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBSzlELE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBcUIsTUFBTSxzQ0FBc0MsQ0FBQztBQUU1Rix3QkFBZ0IsZ0JBQWdCLENBQzlCLG1CQUFtQixXQUFnQixFQUNuQyxTQUFTLEdBQUUsT0FBTyxDQUFDLFlBQVksQ0FBTSxHQUNwQyxZQUFZLENBZ0JkO0FBRUQsd0JBQWdCLGlCQUFpQixDQUMvQixLQUFLLEVBQUUsTUFBTSxFQUNiLElBQUksR0FBRTtJQUNKLFdBQVcsQ0FBQyxFQUFFLFFBQVEsQ0FBQztJQUN2Qix1QkFBdUIsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQzNDLFVBQVUsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsTUFBTSxLQUFLLFlBQVksQ0FBQztDQUM1RCxHQUNMLFlBQVksRUFBRSxDQWFoQiJ9

package/dest/test/mock_structs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock_structs.d.ts","sourceRoot":"","sources":["../../src/test/mock_structs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAK9D,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,sCAAsC,CAAC;AAE5F,wBAAgB,gBAAgB,CAC9B,mBAAmB,WAAgB,EACnC,SAAS,GAAE,OAAO,CAAC,YAAY,CAAM,GACpC,YAAY,CAgBd;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IACJ,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,uBAAuB,CAAC,EAAE,gBAAgB,CAAC;IAC3C,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC;CAC5D,GACL,YAAY,EAAE,CAahB"}

package/dest/test/mock_structs.js

@@ -0,0 +1,38 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { randomBigInt, randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { updateRollingHash } from '../archiver/structs/inbox_message.js';
+export function makeInboxMessage(previousRollingHash = Buffer16.ZERO, overrides = {}) {
+    const { checkpointNumber = CheckpointNumber(randomInt(100) + 1) } = overrides;
+    const { l1BlockNumber = randomBigInt(100n) + 1n } = overrides;
+    const { l1BlockHash = Buffer32.random() } = overrides;
+    const { leaf = Fr.random() } = overrides;
+    const { rollingHash = updateRollingHash(previousRollingHash, leaf) } = overrides;
+    const { index = InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) } = overrides;
+    return {
+        index,
+        leaf,
+        checkpointNumber,
+        l1BlockNumber,
+        l1BlockHash,
+        rollingHash
+    };
+}
+export function makeInboxMessages(count, opts = {}) {
+    const { initialHash = Buffer16.ZERO, overrideFn = (msg)=>msg, initialCheckpointNumber = 1 } = opts;
+    const messages = [];
+    let rollingHash = initialHash;
+    for(let i = 0; i < count; i++){
+        const leaf = Fr.random();
+        const checkpointNumber = CheckpointNumber(i + initialCheckpointNumber);
+        const message = overrideFn(makeInboxMessage(rollingHash, {
+            leaf,
+            checkpointNumber
+        }), i);
+        rollingHash = message.rollingHash;
+        messages.push(message);
+    }
+    return messages;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.1142ef1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -17,11 +17,9 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
@@ -61,42 +59,43 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "0.0.0-test.1",
-    "@aztec/blob-sink": "0.0.0-test.1",
-    "@aztec/constants": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/kv-store": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
-    "@aztec/noir-contracts.js": "0.0.0-test.1",
-    "@aztec/noir-protocol-circuits-types": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
-    "@aztec/telemetry-client": "0.0.0-test.1",
-    "debug": "^4.3.4",
+    "@aztec/blob-client": "0.0.1-commit.1142ef1",
+    "@aztec/blob-lib": "0.0.1-commit.1142ef1",
+    "@aztec/constants": "0.0.1-commit.1142ef1",
+    "@aztec/epoch-cache": "0.0.1-commit.1142ef1",
+    "@aztec/ethereum": "0.0.1-commit.1142ef1",
+    "@aztec/foundation": "0.0.1-commit.1142ef1",
+    "@aztec/kv-store": "0.0.1-commit.1142ef1",
+    "@aztec/l1-artifacts": "0.0.1-commit.1142ef1",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.1142ef1",
+    "@aztec/protocol-contracts": "0.0.1-commit.1142ef1",
+    "@aztec/stdlib": "0.0.1-commit.1142ef1",
+    "@aztec/telemetry-client": "0.0.1-commit.1142ef1",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
-    "tsc-watch": "^6.0.0",
     "tslib": "^2.5.0",
-    "viem": "2.22.8",
-    "ws": "^8.13.0"
+    "viem": "npm:@aztec/viem@2.38.2",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/debug": "^4.1.7",
-    "@types/jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
     "@types/lodash.groupby": "^4.6.9",
     "@types/lodash.omit": "^4.5.7",
-    "@types/node": "^18.15.11",
-    "@types/ws": "^8.5.4",
+    "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "concurrently": "^8.0.1",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.4",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",
@@ -105,6 +104,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }