@aztec/stdlib 0.0.1-commit.9b94fc1 → 0.0.1-commit.c7c42ec

package/dest/block/l2_block_code_to_purge.js

@@ -1,7 +1,7 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { compact } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
@@ -13,7 +13,7 @@ import { L2BlockHeader } from './l2_block_header.js';
 export function makeL2BlockHeader(seed = 0, blockNumber, slotNumber, overrides = {}, inHash) {
     return new L2BlockHeader(makeAppendOnlyTreeSnapshot(seed + 0x100), overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200, inHash), overrides?.state ?? makeStateReference(seed + 0x600), makeGlobalVariables(seed += 0x700, {
         ...blockNumber ? {
-            blockNumber
+            blockNumber: BlockNumber(blockNumber)
         } : {},
         ...slotNumber ? {
             slotNumber: SlotNumber(slotNumber)
@@ -50,7 +50,7 @@ function makeGlobalVariables(seed = 1, overrides = {}) {
     return GlobalVariables.from({
         chainId: new Fr(seed),
         version: new Fr(seed + 1),
-        blockNumber: seed + 2,
+        blockNumber: BlockNumber(seed + 2),
         slotNumber: SlotNumber(seed + 3),
         timestamp: BigInt(seed + 4),
         coinbase: EthAddress.fromField(new Fr(seed + 5)),

package/dest/block/l2_block_header.d.ts

@@ -1,5 +1,5 @@
 import { SlotNumber } from '@aztec/foundation/branded-types';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -46,7 +46,7 @@ export declare class L2BlockHeader {
     static getFields(fields: FieldsOf<L2BlockHeader>): readonly [AppendOnlyTreeSnapshot, ContentCommitment, StateReference, GlobalVariables, Fr, Fr, Fr, Fr];
     static from(fields: FieldsOf<L2BlockHeader>): L2BlockHeader;
     getSlot(): SlotNumber;
-    getBlockNumber(): number;
+    getBlockNumber(): import("@aztec/foundation/branded-types").BlockNumber;
     getSize(): number;
     toBuffer(): Buffer<ArrayBufferLike>;
     toFields(): Fr[];
@@ -79,7 +79,7 @@ export declare class L2BlockHeader {
         globalVariables: {
             chainId: number;
             version: number;
-            blockNumber: number;
+            blockNumber: import("@aztec/foundation/branded-types").BlockNumber;
             slotNumber: SlotNumber;
             timestamp: bigint;
             coinbase: `0x${string}`;
@@ -95,4 +95,4 @@ export declare class L2BlockHeader {
     [inspect.custom](): string;
     equals(other: this): boolean;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaGVhZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfaGVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFOUcsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUcvQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRzs7Ozs7Ozs7R0FRRztBQUNILHFCQUFhLGFBQWE7SUFHZixXQUFXLEVBQUUsc0JBQXNCO0lBRW5DLGlCQUFpQixFQUFFLGlCQUFpQjtJQUVwQyxLQUFLLEVBQUUsY0FBYztJQUVyQixlQUFlLEVBQUUsZUFBZTtJQUVoQyxTQUFTLEVBQUUsRUFBRTtJQUViLGFBQWEsRUFBRSxFQUFFO0lBRWpCLGNBQWMsRUFBRSxFQUFFO0lBRWxCLGdCQUFnQixFQUFFLEVBQUU7SUFoQjdCO0lBQ0UsdURBQXVEO0lBQ2hELFdBQVcsRUFBRSxzQkFBc0I7SUFDMUMsdUNBQXVDO0lBQ2hDLGlCQUFpQixFQUFFLGlCQUFpQjtJQUMzQyx1QkFBdUI7SUFDaEIsS0FBSyxFQUFFLGNBQWM7SUFDNUIsdUNBQXVDO0lBQ2hDLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLG1FQUFtRTtJQUM1RCxTQUFTLEVBQUUsRUFBRTtJQUNwQix3RUFBd0U7SUFDakUsYUFBYSxFQUFFLEVBQUU7SUFDeEIsNENBQTRDO0lBQ3JDLGNBQWMsRUFBRSxFQUFFO0lBQ3pCLG1EQUFtRDtJQUM1QyxnQkFBZ0IsRUFBRSxFQUFFLEVBQ3pCO0lBRUosTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLENBYXpDO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGFBQWEsQ0FBQyx5R0FXL0M7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsYUFBYSxDQUFDLGlCQUUxQztJQUVELE9BQU8sSUFBSSxVQUFVLENBRXBCO0lBRUQsY0FBYyxXQUViO0lBRUQsT0FBTyxXQVdOO0lBRUQsUUFBUSw0QkFFUDtJQUVELFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELEtBQUssa0JBRUo7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxpQkFhOUM7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsR0FBRyxXQUFXLGlCQWEzQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQU0saUJBWXpEO0lBRUQsT0FBTyxJQUFJLE9BQU8sQ0FXakI7SUFFRDs7O09BR0c7SUFDSSxRQUFRLGtCQUVkO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxpQkFFNUI7SUFFRCxrQkFBa0IscUJBWWpCO0lBRUQsYUFBYSxnQkFTWjtJQUVELFNBQVM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7TUFXUjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQWdCZjtJQUVNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsSUFBSSxHQUFHLE9BQU8sQ0FXbEM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaGVhZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfaGVhZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM3RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0sMkJBQTJCLENBQUM7QUFDakUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXdDLE1BQU0sNkJBQTZCLENBQUM7QUFFOUcsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFeEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUcvQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsV0FBVyxFQUFFLGlCQUFpQixFQUFFLGVBQWUsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRzs7Ozs7Ozs7R0FRRztBQUNILHFCQUFhLGFBQWE7SUFHZixXQUFXLEVBQUUsc0JBQXNCO0lBRW5DLGlCQUFpQixFQUFFLGlCQUFpQjtJQUVwQyxLQUFLLEVBQUUsY0FBYztJQUVyQixlQUFlLEVBQUUsZUFBZTtJQUVoQyxTQUFTLEVBQUUsRUFBRTtJQUViLGFBQWEsRUFBRSxFQUFFO0lBRWpCLGNBQWMsRUFBRSxFQUFFO0lBRWxCLGdCQUFnQixFQUFFLEVBQUU7SUFoQjdCO0lBQ0UsdURBQXVEO0lBQ2hELFdBQVcsRUFBRSxzQkFBc0I7SUFDMUMsdUNBQXVDO0lBQ2hDLGlCQUFpQixFQUFFLGlCQUFpQjtJQUMzQyx1QkFBdUI7SUFDaEIsS0FBSyxFQUFFLGNBQWM7SUFDNUIsdUNBQXVDO0lBQ2hDLGVBQWUsRUFBRSxlQUFlO0lBQ3ZDLG1FQUFtRTtJQUM1RCxTQUFTLEVBQUUsRUFBRTtJQUNwQix3RUFBd0U7SUFDakUsYUFBYSxFQUFFLEVBQUU7SUFDeEIsNENBQTRDO0lBQ3JDLGNBQWMsRUFBRSxFQUFFO0lBQ3pCLG1EQUFtRDtJQUM1QyxnQkFBZ0IsRUFBRSxFQUFFLEVBQ3pCO0lBRUosTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsYUFBYSxDQUFDLENBYXpDO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLGFBQWEsQ0FBQyx5R0FXL0M7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsYUFBYSxDQUFDLGlCQUUxQztJQUVELE9BQU8sSUFBSSxVQUFVLENBRXBCO0lBRUQsY0FBYywwREFFYjtJQUVELE9BQU8sV0FXTjtJQUVELFFBQVEsNEJBRVA7SUFFRCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRCxLQUFLLGtCQUVKO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksaUJBYTlDO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxpQkFhM0M7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sR0FBRSxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBQyxDQUFNLGlCQVl6RDtJQUVELE9BQU8sSUFBSSxPQUFPLENBV2pCO0lBRUQ7OztPQUdHO0lBQ0ksUUFBUSxrQkFFZDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0saUJBRTVCO0lBRUQsa0JBQWtCLHFCQVlqQjtJQUVELGFBQWEsZ0JBU1o7SUFFRCxTQUFTOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BV1I7SUFFRCxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsV0FnQmY7SUFFTSxNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksR0FBRyxPQUFPLENBV2xDO0NBQ0YifQ==

package/dest/block/l2_block_header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block_header.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEjG;;;;;;;;GAQG;AACH,qBAAa,aAAa;IAGf,WAAW,EAAE,sBAAsB;IAEnC,iBAAiB,EAAE,iBAAiB;IAEpC,KAAK,EAAE,cAAc;IAErB,eAAe,EAAE,eAAe;IAEhC,SAAS,EAAE,EAAE;IAEb,aAAa,EAAE,EAAE;IAEjB,cAAc,EAAE,EAAE;IAElB,gBAAgB,EAAE,EAAE;IAhB7B;IACE,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uCAAuC;IAChC,iBAAiB,EAAE,iBAAiB;IAC3C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IACxB,4CAA4C;IACrC,cAAc,EAAE,EAAE;IACzB,mDAAmD;IAC5C,gBAAgB,EAAE,EAAE,EACzB;IAEJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,CAazC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,yGAW/C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,iBAE1C;IAED,OAAO,IAAI,UAAU,CAEpB;IAED,cAAc,WAEb;IAED,OAAO,WAWN;IAED,QAAQ,4BAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,KAAK,kBAEJ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAa9C;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,iBAa3C;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAM,iBAYzD;IAED,OAAO,IAAI,OAAO,CAWjB;IAED;;;OAGG;IACI,QAAQ,kBAEd;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,iBAE5B;IAED,kBAAkB,qBAYjB;IAED,aAAa,gBASZ;IAED,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAWR;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAgBf;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAWlC;CACF"}
+{"version":3,"file":"l2_block_header.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_header.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAE9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEjG;;;;;;;;GAQG;AACH,qBAAa,aAAa;IAGf,WAAW,EAAE,sBAAsB;IAEnC,iBAAiB,EAAE,iBAAiB;IAEpC,KAAK,EAAE,cAAc;IAErB,eAAe,EAAE,eAAe;IAEhC,SAAS,EAAE,EAAE;IAEb,aAAa,EAAE,EAAE;IAEjB,cAAc,EAAE,EAAE;IAElB,gBAAgB,EAAE,EAAE;IAhB7B;IACE,uDAAuD;IAChD,WAAW,EAAE,sBAAsB;IAC1C,uCAAuC;IAChC,iBAAiB,EAAE,iBAAiB;IAC3C,uBAAuB;IAChB,KAAK,EAAE,cAAc;IAC5B,uCAAuC;IAChC,eAAe,EAAE,eAAe;IACvC,mEAAmE;IAC5D,SAAS,EAAE,EAAE;IACpB,wEAAwE;IACjE,aAAa,EAAE,EAAE;IACxB,4CAA4C;IACrC,cAAc,EAAE,EAAE;IACzB,mDAAmD;IAC5C,gBAAgB,EAAE,EAAE,EACzB;IAEJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,aAAa,CAAC,CAazC;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,yGAW/C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,iBAE1C;IAED,OAAO,IAAI,UAAU,CAEpB;IAED,cAAc,0DAEb;IAED,OAAO,WAWN;IAED,QAAQ,4BAEP;IAED,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,KAAK,kBAEJ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,iBAa9C;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,iBAa3C;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,GAAE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAM,iBAYzD;IAED,OAAO,IAAI,OAAO,CAWjB;IAED;;;OAGG;IACI,QAAQ,kBAEd;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,iBAE5B;IAED,kBAAkB,qBAYjB;IAED,aAAa,gBASZ;IAED,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAWR;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAgBf;IAEM,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAWlC;CACF"}

package/dest/block/l2_block_header.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';

package/dest/block/l2_block_info.d.ts

@@ -1,41 +1,46 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 export type L2BlockInfo = {
     blockHash?: Fr;
     archive: Fr;
     lastArchive: Fr;
-    blockNumber: number;
-    slotNumber: number;
+    blockNumber: BlockNumber;
+    slotNumber: SlotNumber;
     txCount: number;
     timestamp: bigint;
 };
-export declare function randomBlockInfo(blockNumber?: number): L2BlockInfo;
+export declare function randomBlockInfo(blockNumber?: BlockNumber | number): L2BlockInfo;
 export declare const BlockInfoSchema: z.ZodObject<{
     blockHash: z.ZodOptional<z.ZodType<Fr, any, string>>;
     archive: z.ZodType<Fr, any, string>;
     lastArchive: z.ZodType<Fr, any, string>;
-    blockNumber: z.ZodNumber;
-    slotNumber: z.ZodNumber;
+    blockNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, BlockNumber, string | number | bigint>;
+    slotNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, SlotNumber, string | number | bigint>;
     txCount: z.ZodNumber;
     timestamp: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
 }, "strip", z.ZodTypeAny, {
     blockHash?: Fr | undefined;
     archive: Fr;
     lastArchive: Fr;
-    blockNumber: number;
-    slotNumber: number;
+    blockNumber: number & {
+        _branding: "BlockNumber";
+    };
+    slotNumber: number & {
+        _branding: "SlotNumber";
+    };
     txCount: number;
     timestamp: bigint;
 }, {
     blockHash?: string | undefined;
     archive: string;
     lastArchive: string;
-    blockNumber: number;
-    slotNumber: number;
+    blockNumber: string | number | bigint;
+    slotNumber: string | number | bigint;
     txCount: number;
     timestamp: string | number | bigint;
 }>;
 export declare function serializeBlockInfo(blockInfo: L2BlockInfo): Buffer;
 export declare function deserializeBlockInfo(buffer: Buffer | BufferReader): L2BlockInfo;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2luZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFFOUUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixNQUFNLE1BQU0sV0FBVyxHQUFHO0lBQ3hCLFNBQVMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNmLE9BQU8sRUFBRSxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsRUFBRSxNQUFNLENBQUM7SUFDcEIsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFNBQVMsRUFBRSxNQUFNLENBQUM7Q0FDbkIsQ0FBQztBQUVGLHdCQUFnQixlQUFlLENBQUMsV0FBVyxDQUFDLEVBQUUsTUFBTSxHQUFHLFdBQVcsQ0FVakU7QUFFRCxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBUTFCLENBQUM7QUFFSCx3QkFBZ0Isa0JBQWtCLENBQUMsU0FBUyxFQUFFLFdBQVcsR0FBRyxNQUFNLENBVWpFO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLFdBQVcsQ0FZL0UifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfaW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrL2wyX2Jsb2NrX2luZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBcUIsVUFBVSxFQUFvQixNQUFNLGlDQUFpQyxDQUFDO0FBQy9HLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsTUFBTSxNQUFNLFdBQVcsR0FBRztJQUN4QixTQUFTLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDZixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osV0FBVyxFQUFFLEVBQUUsQ0FBQztJQUNoQixXQUFXLEVBQUUsV0FBVyxDQUFDO0lBQ3pCLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFDdkIsT0FBTyxFQUFFLE1BQU0sQ0FBQztJQUNoQixTQUFTLEVBQUUsTUFBTSxDQUFDO0NBQ25CLENBQUM7QUFFRix3QkFBZ0IsZUFBZSxDQUFDLFdBQVcsQ0FBQyxFQUFFLFdBQVcsR0FBRyxNQUFNLEdBQUcsV0FBVyxDQVUvRTtBQUVELGVBQU8sTUFBTSxlQUFlOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBUTFCLENBQUM7QUFFSCx3QkFBZ0Isa0JBQWtCLENBQUMsU0FBUyxFQUFFLFdBQVcsR0FBRyxNQUFNLENBVWpFO0FBRUQsd0JBQWdCLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLFdBQVcsQ0FZL0UifQ==

package/dest/block/l2_block_info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block_info.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE,EAAE,CAAC;IACf,OAAO,EAAE,EAAE,CAAC;IACZ,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAUjE;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;EAQ1B,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAUjE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAY/E"}
+{"version":3,"file":"l2_block_info.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,UAAU,EAAoB,MAAM,iCAAiC,CAAC;AAC/G,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,EAAE,EAAE,CAAC;IACf,OAAO,EAAE,EAAE,CAAC;IACZ,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,WAAW,CAU/E;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQ1B,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAUjE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW,CAY/E"}

package/dest/block/l2_block_info.js

@@ -1,4 +1,5 @@
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, BlockNumberSchema, SlotNumber, SlotNumberSchema } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
@@ -7,8 +8,8 @@ export function randomBlockInfo(blockNumber) {
         blockHash: Fr.random(),
         archive: Fr.random(),
         lastArchive: Fr.random(),
-        blockNumber: blockNumber ?? Math.floor(Math.random() * 100000) + 1,
-        slotNumber: Math.floor(Math.random() * 100000) + 1,
+        blockNumber: BlockNumber(blockNumber ?? Math.floor(Math.random() * 100000) + 1),
+        slotNumber: SlotNumber(Math.floor(Math.random() * 100000) + 1),
         txCount: Math.floor(Math.random() * 100),
         timestamp: BigInt(Math.floor(Date.now() / 1000))
     };
@@ -17,8 +18,8 @@ export const BlockInfoSchema = z.object({
     blockHash: schemas.Fr.optional(),
     archive: schemas.Fr,
     lastArchive: schemas.Fr,
-    blockNumber: z.number(),
-    slotNumber: z.number(),
+    blockNumber: BlockNumberSchema,
+    slotNumber: SlotNumberSchema,
     txCount: z.number(),
     timestamp: schemas.BigInt
 });
@@ -32,8 +33,8 @@ export function deserializeBlockInfo(buffer) {
         blockHash: blockHash.equals(Fr.ZERO) ? undefined : blockHash,
         archive: reader.readObject(Fr),
         lastArchive: reader.readObject(Fr),
-        blockNumber: reader.readNumber(),
-        slotNumber: reader.readNumber(),
+        blockNumber: BlockNumber(reader.readNumber()),
+        slotNumber: SlotNumber(reader.readNumber()),
         txCount: reader.readNumber(),
         timestamp: reader.readBigInt()
     };

package/dest/block/l2_block_new.d.ts

@@ -1,7 +1,9 @@
 import { type BlockBlobData } from '@aztec/blob-lib/encoding';
-import { Fr } from '@aztec/foundation/fields';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { z } from 'zod';
+import type { PrivateLog } from '../logs/private_log.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
 import { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
@@ -14,15 +16,20 @@ export declare class L2BlockNew {
     archive: AppendOnlyTreeSnapshot;
     header: BlockHeader;
     body: Body;
-    private blockHash;
+    checkpointNumber: CheckpointNumber;
+    indexWithinCheckpoint: number;
     constructor(
     /** Snapshot of archive tree after the block is applied. */
     archive: AppendOnlyTreeSnapshot, 
     /** Header of the block. */
     header: BlockHeader, 
     /** L2 block body. */
-    body: Body, blockHash?: Fr | undefined);
-    get number(): number;
+    body: Body, 
+    /** Number of the checkpoint that the block belongs to. */
+    checkpointNumber: CheckpointNumber, 
+    /** Index of the block within the checkpoint. */
+    indexWithinCheckpoint: number);
+    get number(): BlockNumber;
     get timestamp(): bigint;
     static get schema(): z.ZodEffects<z.ZodObject<{
         archive: z.ZodEffects<z.ZodObject<{
@@ -40,10 +47,16 @@ export declare class L2BlockNew {
         }>;
         header: import("../schemas/schemas.js").ZodFor<BlockHeader>;
         body: import("../schemas/schemas.js").ZodFor<Body>;
+        checkpointNumber: z.ZodEffects<z.ZodPipeline<z.ZodUnion<[z.ZodNumber, z.ZodBigInt, z.ZodString]>, z.ZodNumber>, CheckpointNumber, string | number | bigint>;
+        indexWithinCheckpoint: z.ZodNumber;
     }, "strip", z.ZodTypeAny, {
         archive: AppendOnlyTreeSnapshot;
         header: BlockHeader;
         body: Body;
+        checkpointNumber: number & {
+            _branding: "CheckpointNumber";
+        };
+        indexWithinCheckpoint: number;
     }, {
         archive: {
             root: string;
@@ -51,6 +64,8 @@ export declare class L2BlockNew {
         };
         header?: any;
         body?: any;
+        checkpointNumber: string | number | bigint;
+        indexWithinCheckpoint: number;
     }>, L2BlockNew, {
         archive: {
             root: string;
@@ -58,6 +73,8 @@ export declare class L2BlockNew {
         };
         header?: any;
         body?: any;
+        checkpointNumber: string | number | bigint;
+        indexWithinCheckpoint: number;
     }>;
     /**
      * Deserializes a block from a buffer
@@ -74,8 +91,15 @@ export declare class L2BlockNew {
      * @returns The block's hash.
      */
     hash(): Promise<Fr>;
-    toBlobFields(isFirstBlock: boolean): Fr[];
-    toBlockBlobData(isFirstBlock: boolean): BlockBlobData;
+    /**
+     * Checks if this block equals another block.
+     * @param other - The other block to compare with.
+     * @returns True if both blocks are equal.
+     */
+    equals(other: this): boolean;
+    toBlobFields(): Fr[];
+    toBlockBlobData(): BlockBlobData;
+    static empty(): L2BlockNew;
     /**
      * Creates an L2 block containing random data.
      * @param l2BlockNum - The number of the L2 block.
@@ -85,7 +109,9 @@ export declare class L2BlockNew {
      * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
      * @returns The L2 block.
      */
-    static random(blockNumber: number, { txsPerBlock, txOptions, makeTxOptions, ...blockHeaderOverrides }?: {
+    static random(blockNumber: BlockNumber, { checkpointNumber, indexWithinCheckpoint, txsPerBlock, txOptions, makeTxOptions, ...blockHeaderOverrides }?: {
+        checkpointNumber?: CheckpointNumber;
+        indexWithinCheckpoint?: number;
         txsPerBlock?: number;
         txOptions?: Partial<Parameters<typeof Body.random>[0]>;
         makeTxOptions?: (txIndex: number) => Partial<Parameters<typeof Body.random>[0]>;
@@ -100,9 +126,10 @@ export declare class L2BlockNew {
         contractClassLogCount: number;
         contractClassLogSize: number;
         txCount: number;
-        blockNumber: number;
+        blockNumber: BlockNumber;
         blockTimestamp: number;
     };
+    getPrivateLogs(): PrivateLog[];
     toBlockInfo(): L2BlockInfo;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfbmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXREOzs7R0FHRztBQUNILHFCQUFhLFVBQVU7SUFHWixPQUFPLEVBQUUsc0JBQXNCO0lBRS9CLE1BQU0sRUFBRSxXQUFXO0lBRW5CLElBQUksRUFBRSxJQUFJO0lBQ2pCLE9BQU8sQ0FBQyxTQUFTO0lBUG5CO0lBQ0UsMkRBQTJEO0lBQ3BELE9BQU8sRUFBRSxzQkFBc0I7SUFDdEMsMkJBQTJCO0lBQ3BCLE1BQU0sRUFBRSxXQUFXO0lBQzFCLHFCQUFxQjtJQUNkLElBQUksRUFBRSxJQUFJLEVBQ1QsU0FBUyxHQUFFLEVBQUUsR0FBRyxTQUFxQixFQUMzQztJQUVKLElBQUksTUFBTSxJQUFJLE1BQU0sQ0FFbkI7SUFFRCxJQUFJLFNBQVMsSUFBSSxNQUFNLENBRXRCO0lBRUQsTUFBTSxLQUFLLE1BQU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FRaEI7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsWUFBWSxjQU8zQztJQUVEOzs7T0FHRztJQUNILFFBQVEsNEJBRVA7SUFFRDs7O09BR0c7SUFDVSxJQUFJLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUsvQjtJQUVNLFlBQVksQ0FBQyxZQUFZLEVBQUUsT0FBTyxHQUFHLEVBQUUsRUFBRSxDQUcvQztJQUVNLGVBQWUsQ0FBQyxZQUFZLEVBQUUsT0FBTyxHQUFHLGFBQWEsQ0FxQjNEO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxPQUFhLE1BQU0sQ0FDakIsV0FBVyxFQUFFLE1BQU0sRUFDbkIsRUFDRSxXQUFlLEVBQ2YsU0FBYyxFQUNkLGFBQWEsRUFDYixHQUFHLG9CQUFvQixFQUN4QixHQUFFO1FBQ0QsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3JCLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RCxhQUFhLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pGLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBTSxHQUN6RCxPQUFPLENBQUMsVUFBVSxDQUFDLENBS3JCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUTs7Ozs7Ozs7TUFxQlA7SUFFRCxXQUFXLElBQUksV0FBVyxDQVV6QjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfYmxvY2tfbmV3LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2svbDJfYmxvY2tfbmV3LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRixPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUEwQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3hHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRTlFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDekQsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDL0UsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFdEQ7OztHQUdHO0FBQ0gscUJBQWEsVUFBVTtJQUdaLE9BQU8sRUFBRSxzQkFBc0I7SUFFL0IsTUFBTSxFQUFFLFdBQVc7SUFFbkIsSUFBSSxFQUFFLElBQUk7SUFFVixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFFbEMscUJBQXFCLEVBQUUsTUFBTTtJQVZ0QztJQUNFLDJEQUEyRDtJQUNwRCxPQUFPLEVBQUUsc0JBQXNCO0lBQ3RDLDJCQUEyQjtJQUNwQixNQUFNLEVBQUUsV0FBVztJQUMxQixxQkFBcUI7SUFDZCxJQUFJLEVBQUUsSUFBSTtJQUNqQiwwREFBMEQ7SUFDbkQsZ0JBQWdCLEVBQUUsZ0JBQWdCO0lBQ3pDLGdEQUFnRDtJQUN6QyxxQkFBcUIsRUFBRSxNQUFNLEVBQ2xDO0lBRUosSUFBSSxNQUFNLElBQUksV0FBVyxDQUV4QjtJQUVELElBQUksU0FBUyxJQUFJLE1BQU0sQ0FFdEI7SUFFRCxNQUFNLEtBQUssTUFBTTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7T0FhaEI7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsWUFBWSxjQVMzQztJQUVEOzs7T0FHRztJQUNILFFBQVEsNEJBRVA7SUFFRDs7O09BR0c7SUFDSSxJQUFJLElBQUksT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUV6QjtJQUVEOzs7O09BSUc7SUFDSSxNQUFNLENBQUMsS0FBSyxFQUFFLElBQUksR0FBRyxPQUFPLENBUWxDO0lBRU0sWUFBWSxJQUFJLEVBQUUsRUFBRSxDQUcxQjtJQUVNLGVBQWUsSUFBSSxhQUFhLENBc0J0QztJQUVELE1BQU0sQ0FBQyxLQUFLLGVBRVg7SUFFRDs7Ozs7Ozs7T0FRRztJQUNILE9BQWEsTUFBTSxDQUNqQixXQUFXLEVBQUUsV0FBVyxFQUN4QixFQUNFLGdCQUF3RCxFQUN4RCxxQkFBeUIsRUFDekIsV0FBZSxFQUNmLFNBQWMsRUFDZCxhQUFhLEVBQ2IsR0FBRyxvQkFBb0IsRUFDeEIsR0FBRTtRQUNELGdCQUFnQixDQUFDLEVBQUUsZ0JBQWdCLENBQUM7UUFDcEMscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDL0IsV0FBVyxDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQ3JCLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RCxhQUFhLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLEtBQUssT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pGLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBTSxHQUN6RCxPQUFPLENBQUMsVUFBVSxDQUFDLENBS3JCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUTs7Ozs7Ozs7TUFxQlA7SUFFRCxjQUFjLElBQUksVUFBVSxFQUFFLENBRTdCO0lBRUQsV0FBVyxJQUFJLFdBQVcsQ0FTekI7Q0FDRiJ9

package/dest/block/l2_block_new.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_block_new.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAuB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;;GAGG;AACH,qBAAa,UAAU;IAGZ,OAAO,EAAE,sBAAsB;IAE/B,MAAM,EAAE,WAAW;IAEnB,IAAI,EAAE,IAAI;IACjB,OAAO,CAAC,SAAS;IAPnB;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,2BAA2B;IACpB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI,EACT,SAAS,GAAE,EAAE,GAAG,SAAqB,EAC3C;IAEJ,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,cAO3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACU,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC,CAK/B;IAEM,YAAY,CAAC,YAAY,EAAE,OAAO,GAAG,EAAE,EAAE,CAG/C;IAEM,eAAe,CAAC,YAAY,EAAE,OAAO,GAAG,aAAa,CAqB3D;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,WAAW,EAAE,MAAM,EACnB,EACE,WAAe,EACf,SAAc,EACd,aAAa,EACb,GAAG,oBAAoB,EACxB,GAAE;QACD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,GACzD,OAAO,CAAC,UAAU,CAAC,CAKrB;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,WAAW,IAAI,WAAW,CAUzB;CACF"}
+{"version":3,"file":"l2_block_new.d.ts","sourceRoot":"","sources":["../../src/block/l2_block_new.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAuB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAA0B,MAAM,iCAAiC,CAAC;AACxG,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;;GAGG;AACH,qBAAa,UAAU;IAGZ,OAAO,EAAE,sBAAsB;IAE/B,MAAM,EAAE,WAAW;IAEnB,IAAI,EAAE,IAAI;IAEV,gBAAgB,EAAE,gBAAgB;IAElC,qBAAqB,EAAE,MAAM;IAVtC;IACE,2DAA2D;IACpD,OAAO,EAAE,sBAAsB;IACtC,2BAA2B;IACpB,MAAM,EAAE,WAAW;IAC1B,qBAAqB;IACd,IAAI,EAAE,IAAI;IACjB,0DAA0D;IACnD,gBAAgB,EAAE,gBAAgB;IACzC,gDAAgD;IACzC,qBAAqB,EAAE,MAAM,EAClC;IAEJ,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,cAS3C;IAED;;;OAGG;IACH,QAAQ,4BAEP;IAED;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,EAAE,CAAC,CAEzB;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAQlC;IAEM,YAAY,IAAI,EAAE,EAAE,CAG1B;IAEM,eAAe,IAAI,aAAa,CAsBtC;IAED,MAAM,CAAC,KAAK,eAEX;IAED;;;;;;;;OAQG;IACH,OAAa,MAAM,CACjB,WAAW,EAAE,WAAW,EACxB,EACE,gBAAwD,EACxD,qBAAyB,EACzB,WAAe,EACf,SAAc,EACd,aAAa,EACb,GAAG,oBAAoB,EACxB,GAAE;QACD,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,MAAM,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACjF,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAM,GACzD,OAAO,CAAC,UAAU,CAAC,CAKrB;IAED;;;OAGG;IACH,QAAQ;;;;;;;;MAqBP;IAED,cAAc,IAAI,UAAU,EAAE,CAE7B;IAED,WAAW,IAAI,WAAW,CASzB;CACF"}

package/dest/block/l2_block_new.js

@@ -1,5 +1,6 @@
 import { encodeBlockBlobData } from '@aztec/blob-lib/encoding';
-import { Fr } from '@aztec/foundation/fields';
+import { CheckpointNumber, CheckpointNumberSchema } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
@@ -12,12 +13,14 @@ import { Body } from './body.js';
     archive;
     header;
     body;
-    blockHash;
-    constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** Header of the block. */ header, /** L2 block body. */ body, blockHash = undefined){
+    checkpointNumber;
+    indexWithinCheckpoint;
+    constructor(/** Snapshot of archive tree after the block is applied. */ archive, /** Header of the block. */ header, /** L2 block body. */ body, /** Number of the checkpoint that the block belongs to. */ checkpointNumber, /** Index of the block within the checkpoint. */ indexWithinCheckpoint){
         this.archive = archive;
         this.header = header;
         this.body = body;
-        this.blockHash = blockHash;
+        this.checkpointNumber = checkpointNumber;
+        this.indexWithinCheckpoint = indexWithinCheckpoint;
     }
     get number() {
         return this.header.globalVariables.blockNumber;
@@ -29,8 +32,10 @@ import { Body } from './body.js';
         return z.object({
             archive: AppendOnlyTreeSnapshot.schema,
             header: BlockHeader.schema,
-            body: Body.schema
-        }).transform(({ archive, header, body })=>new L2BlockNew(archive, header, body));
+            body: Body.schema,
+            checkpointNumber: CheckpointNumberSchema,
+            indexWithinCheckpoint: z.number()
+        }).transform(({ archive, header, body, checkpointNumber, indexWithinCheckpoint })=>new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint));
     }
     /**
    * Deserializes a block from a buffer
@@ -40,28 +45,35 @@ import { Body } from './body.js';
         const header = reader.readObject(BlockHeader);
         const archive = reader.readObject(AppendOnlyTreeSnapshot);
         const body = reader.readObject(Body);
-        return new L2BlockNew(archive, header, body);
+        const checkpointNumber = CheckpointNumber(reader.readNumber());
+        const indexWithinCheckpoint = reader.readNumber();
+        return new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint);
     }
     /**
    * Serializes a block
    * @returns A serialized L2 block as a Buffer.
    */ toBuffer() {
-        return serializeToBuffer(this.header, this.archive, this.body);
+        return serializeToBuffer(this.header, this.archive, this.body, this.checkpointNumber, this.indexWithinCheckpoint);
     }
     /**
    * Returns the block's hash (hash of block header).
    * @returns The block's hash.
-   */ async hash() {
-        if (this.blockHash === undefined) {
-            this.blockHash = await this.header.hash();
-        }
-        return this.blockHash;
+   */ hash() {
+        return this.header.hash();
     }
-    toBlobFields(isFirstBlock) {
-        const blockBlobData = this.toBlockBlobData(isFirstBlock);
+    /**
+   * Checks if this block equals another block.
+   * @param other - The other block to compare with.
+   * @returns True if both blocks are equal.
+   */ equals(other) {
+        return this.archive.equals(other.archive) && this.header.equals(other.header) && this.body.equals(other.body) && this.checkpointNumber === other.checkpointNumber && this.indexWithinCheckpoint === other.indexWithinCheckpoint;
+    }
+    toBlobFields() {
+        const blockBlobData = this.toBlockBlobData();
         return encodeBlockBlobData(blockBlobData);
     }
-    toBlockBlobData(isFirstBlock) {
+    toBlockBlobData() {
+        const isFirstBlock = this.indexWithinCheckpoint === 0;
         return {
             blockEndMarker: {
                 numTxs: this.body.txEffects.length,
@@ -83,6 +95,9 @@ import { Body } from './body.js';
             txs: this.body.toTxBlobData()
         };
     }
+    static empty() {
+        return new L2BlockNew(AppendOnlyTreeSnapshot.empty(), BlockHeader.empty(), Body.empty(), CheckpointNumber(0), 0);
+    }
     /**
    * Creates an L2 block containing random data.
    * @param l2BlockNum - The number of the L2 block.
@@ -91,7 +106,7 @@ import { Body } from './body.js';
    * @param numPublicLogsPerCall - The number of public logs per 1 public function invocation.
    * @param inHash - The hash of the L1 to L2 messages subtree which got inserted in this block.
    * @returns The L2 block.
-   */ static async random(blockNumber, { txsPerBlock = 1, txOptions = {}, makeTxOptions, ...blockHeaderOverrides } = {}) {
+   */ static async random(blockNumber, { checkpointNumber = CheckpointNumber(Number(blockNumber)), indexWithinCheckpoint = 0, txsPerBlock = 1, txOptions = {}, makeTxOptions, ...blockHeaderOverrides } = {}) {
         const archive = new AppendOnlyTreeSnapshot(Fr.random(), blockNumber + 1);
         const header = BlockHeader.random({
             blockNumber,
@@ -102,7 +117,7 @@ import { Body } from './body.js';
             makeTxOptions,
             ...txOptions
         });
-        return new L2BlockNew(archive, header, body);
+        return new L2BlockNew(archive, header, body, checkpointNumber, indexWithinCheckpoint);
     }
     /**
    * Returns stats used for logging.
@@ -121,13 +136,15 @@ import { Body } from './body.js';
             ...logsStats
         };
     }
+    getPrivateLogs() {
+        return this.body.txEffects.map((txEffect)=>txEffect.privateLogs).flat();
+    }
     toBlockInfo() {
         return {
-            blockHash: this.blockHash,
             archive: this.archive.root,
             lastArchive: this.header.lastArchive.root,
             blockNumber: this.number,
-            slotNumber: Number(this.header.getSlot()),
+            slotNumber: this.header.getSlot(),
             txCount: this.body.txEffects.length,
             timestamp: this.header.globalVariables.timestamp
         };