@aztec/archiver 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/dest/test/mock_l2_block_source.js

@@ -1,10 +1,12 @@
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
-import { DefaultL1ContractsConfig } from '@aztec/ethereum';
+import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
+import { BlockNumber } 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 { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { 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';
 /**
@@ -17,7 +19,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     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`);
@@ -55,10 +57,14 @@ 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) {
+        // In this mock, we don't track checkpointed blocks separately
+        return Promise.resolve(undefined);
     }
     /**
    * Gets an l2 block.
@@ -68,6 +74,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.
@@ -75,15 +89,19 @@ 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: {
-                    blockNumber: BigInt(block.number),
-                    blockHash: Buffer32.random().toString(),
-                    timestamp: BigInt(block.number)
-                },
+                l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
                 attestations: []
             }));
     }
@@ -93,11 +111,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
             if (hash.equals(blockHash)) {
                 return PublishedL2Block.fromFields({
                     block,
-                    l1: {
-                        blockNumber: BigInt(block.number),
-                        blockHash: Buffer32.random().toString(),
-                        timestamp: BigInt(block.number)
-                    },
+                    l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
                     attestations: []
                 });
             }
@@ -111,11 +125,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         }
         return Promise.resolve(PublishedL2Block.fromFields({
             block,
-            l1: {
-                blockNumber: BigInt(block.number),
-                blockHash: Buffer32.random().toString(),
-                timestamp: BigInt(block.number)
-            },
+            l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
             attestations: []
         }));
     }
@@ -135,13 +145,17 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     getBlockHeader(number) {
         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;
         const [start, end] = getSlotRangeForEpoch(epochNumber, {
             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);
@@ -195,15 +209,15 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         const finalizedBlock = this.l2Blocks[finalized - 1];
         return {
             latest: {
-                number: latest,
+                number: BlockNumber(latest),
                 hash: (await latestBlock?.hash())?.toString()
             },
             proven: {
-                number: proven,
+                number: BlockNumber(proven),
                 hash: (await provenBlock?.hash())?.toString()
             },
             finalized: {
-                number: finalized,
+                number: BlockNumber(finalized),
                 hash: (await finalizedBlock?.hash())?.toString()
             }
         };

package/dest/test/mock_structs.d.ts

@@ -1,9 +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;
-    initialL2BlockNumber?: number;
+    initialCheckpointNumber?: CheckpointNumber;
     overrideFn?: (msg: InboxMessage, index: number) => InboxMessage;
 }): InboxMessage[];
-//# sourceMappingURL=mock_structs.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19zdHJ1Y3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9tb2NrX3N0cnVjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxFQUFFLFFBQVEsRUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBSzlELE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBcUIsTUFBTSxzQ0FBc0MsQ0FBQztBQUU1Rix3QkFBZ0IsZ0JBQWdCLENBQzlCLG1CQUFtQixXQUFnQixFQUNuQyxTQUFTLEdBQUUsT0FBTyxDQUFDLFlBQVksQ0FBTSxHQUNwQyxZQUFZLENBZ0JkO0FBRUQsd0JBQWdCLGlCQUFpQixDQUMvQixLQUFLLEVBQUUsTUFBTSxFQUNiLElBQUksR0FBRTtJQUNKLFdBQVcsQ0FBQyxFQUFFLFFBQVEsQ0FBQztJQUN2Qix1QkFBdUIsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQzNDLFVBQVUsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsTUFBTSxLQUFLLFlBQVksQ0FBQztDQUM1RCxHQUNMLFlBQVksRUFBRSxDQWFoQiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"mock_structs.d.ts","sourceRoot":"","sources":["../../src/test/mock_structs.ts"],"names":[],"mappings":"AAAA,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,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC;CAC5D,GACL,YAAY,EAAE,CAahB"}
+{"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

@@ -1,34 +1,35 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
-import { randomBigInt, randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+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 { l2BlockNumber = randomInt(100) + 1 } = 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.smallestIndexFromL2Block(l2BlockNumber) } = overrides;
+    const { index = InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) } = overrides;
     return {
         index,
         leaf,
-        l2BlockNumber,
+        checkpointNumber,
         l1BlockNumber,
         l1BlockHash,
         rollingHash
     };
 }
 export function makeInboxMessages(count, opts = {}) {
-    const { initialHash = Buffer16.ZERO, overrideFn = (msg)=>msg, initialL2BlockNumber = 1 } = 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 l2BlockNumber = i + initialL2BlockNumber;
+        const checkpointNumber = CheckpointNumber(i + initialCheckpointNumber);
         const message = overrideFn(makeInboxMessage(rollingHash, {
             leaf,
-            l2BlockNumber
+            checkpointNumber
         }), i);
         rollingHash = message.rollingHash;
         messages.push(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.c7c42ec",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -17,8 +17,8 @@
     "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",
     "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\"",
@@ -66,23 +66,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.b655e406",
-    "@aztec/blob-sink": "0.0.1-commit.b655e406",
-    "@aztec/constants": "0.0.1-commit.b655e406",
-    "@aztec/epoch-cache": "0.0.1-commit.b655e406",
-    "@aztec/ethereum": "0.0.1-commit.b655e406",
-    "@aztec/foundation": "0.0.1-commit.b655e406",
-    "@aztec/kv-store": "0.0.1-commit.b655e406",
-    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b655e406",
-    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406",
-    "@aztec/telemetry-client": "0.0.1-commit.b655e406",
+    "@aztec/blob-client": "0.0.1-commit.c7c42ec",
+    "@aztec/blob-lib": "0.0.1-commit.c7c42ec",
+    "@aztec/constants": "0.0.1-commit.c7c42ec",
+    "@aztec/epoch-cache": "0.0.1-commit.c7c42ec",
+    "@aztec/ethereum": "0.0.1-commit.c7c42ec",
+    "@aztec/foundation": "0.0.1-commit.c7c42ec",
+    "@aztec/kv-store": "0.0.1-commit.c7c42ec",
+    "@aztec/l1-artifacts": "0.0.1-commit.c7c42ec",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.c7c42ec",
+    "@aztec/protocol-contracts": "0.0.1-commit.c7c42ec",
+    "@aztec/stdlib": "0.0.1-commit.c7c42ec",
+    "@aztec/telemetry-client": "0.0.1-commit.c7c42ec",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
-    "tsc-watch": "^6.0.0",
     "tslib": "^2.5.0",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
+    "viem": "npm:@aztec/viem@2.38.2",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
@@ -90,6 +90,7 @@
     "@types/lodash.groupby": "^4.6.9",
     "@types/lodash.omit": "^4.5.7",
     "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "concurrently": "^8.0.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",