@aztec/stdlib 0.0.1-commit.6c91f13 → 0.0.1-commit.7d4e6cd

package/dest/tx/tx_effect.js

@@ -1,3 +1,4 @@
+var _computedKey;
 import { decodeTxBlobData, encodeTxBlobData, getNumTxBlobFields } from '@aztec/blob-lib/encoding';
 import { MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX } from '@aztec/constants';
 import { makeTuple, makeTupleAsync } from '@aztec/foundation/array';
@@ -15,6 +16,7 @@ import { PrivateLog } from '../logs/private_log.js';
 import { FlatPublicLogs, PublicLog } from '../logs/public_log.js';
 import { computeTxOutHash } from '../messaging/out_hash.js';
 import { TxHash } from './tx_hash.js';
+_computedKey = inspect.custom;
 export class TxEffect {
     revertCode;
     txHash;
@@ -232,7 +234,7 @@ export class TxEffect {
             contractClassLogs: z.array(ContractClassLog.schema)
         }).transform(TxEffect.from);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `TxEffect {
       revertCode: ${this.revertCode.getCode()},
       txHash: ${this.txHash},

package/dest/tx/tx_execution_request.d.ts

@@ -89,4 +89,4 @@ export declare class TxExecutionRequest {
     static random(): Promise<TxExecutionRequest>;
     [inspect.custom](): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZXhlY3V0aW9uX3JlcXVlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC90eF9leGVjdXRpb25fcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjtJQUtwQixNQUFNLEVBQUUsWUFBWTtJQUlwQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFLbEMsaUJBQWlCLEVBQUUsRUFBRTtJQUlyQixTQUFTLEVBQUUsU0FBUztJQU1wQixXQUFXLEVBQUUsWUFBWSxFQUFFO0lBSzNCLGFBQWEsRUFBRSxXQUFXLEVBQUU7SUFJNUIsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUtuQixJQUFJO0lBckNiO0lBQ0U7O09BRUc7SUFDSSxNQUFNLEVBQUUsWUFBWTtJQUMzQjs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7O09BR0c7SUFDSSxpQkFBaUIsRUFBRSxFQUFFO0lBQzVCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFNBQVM7SUFDM0I7Ozs7T0FJRztJQUNJLFdBQVcsRUFBRSxZQUFZLEVBQUU7SUFDbEM7OztPQUdHO0lBQ0ksYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQzs7T0FFRztJQUNJLFFBQVEsRUFBRSxPQUFPLEVBQUU7SUFDMUI7OztPQUdHO0lBQ0ksSUFBSSxLQUFjLEVBQ3ZCO0lBRUosTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FhOUM7SUFFRCxXQUFXLElBQUksU0FBUyxDQVN2QjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQywwR0FXcEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsa0JBQWtCLENBQUMsR0FBRyxrQkFBa0IsQ0FFcEU7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQVdQO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixDQVluRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBRWpEO0lBRUQsT0FBYSxNQUFNLGdDQWNsQjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZXhlY3V0aW9uX3JlcXVlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eC90eF9leGVjdXRpb25fcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSw2QkFBNkIsQ0FBQztBQUU5RSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRy9CLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFXLE1BQU0scUJBQXFCLENBQUM7QUFFM0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1Qzs7R0FFRztBQUVILHFCQUFhLGtCQUFrQjtJQUtwQixNQUFNLEVBQUUsWUFBWTtJQUlwQixnQkFBZ0IsRUFBRSxnQkFBZ0I7SUFLbEMsaUJBQWlCLEVBQUUsRUFBRTtJQUlyQixTQUFTLEVBQUUsU0FBUztJQU1wQixXQUFXLEVBQUUsWUFBWSxFQUFFO0lBSzNCLGFBQWEsRUFBRSxXQUFXLEVBQUU7SUFJNUIsUUFBUSxFQUFFLE9BQU8sRUFBRTtJQUtuQixJQUFJO0lBckNiO0lBQ0U7O09BRUc7SUFDSSxNQUFNLEVBQUUsWUFBWTtJQUMzQjs7T0FFRztJQUNJLGdCQUFnQixFQUFFLGdCQUFnQjtJQUN6Qzs7O09BR0c7SUFDSSxpQkFBaUIsRUFBRSxFQUFFO0lBQzVCOztPQUVHO0lBQ0ksU0FBUyxFQUFFLFNBQVM7SUFDM0I7Ozs7T0FJRztJQUNJLFdBQVcsRUFBRSxZQUFZLEVBQUU7SUFDbEM7OztPQUdHO0lBQ0ksYUFBYSxFQUFFLFdBQVcsRUFBRTtJQUNuQzs7T0FFRztJQUNJLFFBQVEsRUFBRSxPQUFPLEVBQUU7SUFDMUI7OztPQUdHO0lBQ0ksSUFBSSxLQUFjLEVBQ3ZCO0lBR0osTUFBTSxLQUFLLE1BQU0sSUFBSSxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FhOUM7SUFFRCxXQUFXLElBQUksU0FBUyxDQVN2QjtJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQywwR0FXcEQ7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsa0JBQWtCLENBQUMsR0FBRyxrQkFBa0IsQ0FFcEU7SUFFRDs7O09BR0c7SUFDSCxRQUFRLDRCQVdQO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLGtCQUFrQixDQVluRTtJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsa0JBQWtCLENBRWpEO0lBRUQsT0FBYSxNQUFNLGdDQWNsQjtJQUVELENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUVmO0NBQ0YifQ==

package/dest/tx/tx_execution_request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,kBAAkB;IAKpB,MAAM,EAAE,YAAY;IAIpB,gBAAgB,EAAE,gBAAgB;IAKlC,iBAAiB,EAAE,EAAE;IAIrB,SAAS,EAAE,SAAS;IAMpB,WAAW,EAAE,YAAY,EAAE;IAK3B,aAAa,EAAE,WAAW,EAAE;IAI5B,QAAQ,EAAE,OAAO,EAAE;IAKnB,IAAI;IArCb;IACE;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc,EACvB;IAEJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS,CASvB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,0GAWpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAEpE;IAED;;;OAGG;IACH,QAAQ,4BAWP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAYnE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAEjD;IAED,OAAa,MAAM,gCAclB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF"}
+{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AAEH,qBAAa,kBAAkB;IAKpB,MAAM,EAAE,YAAY;IAIpB,gBAAgB,EAAE,gBAAgB;IAKlC,iBAAiB,EAAE,EAAE;IAIrB,SAAS,EAAE,SAAS;IAMpB,WAAW,EAAE,YAAY,EAAE;IAK3B,aAAa,EAAE,WAAW,EAAE;IAI5B,QAAQ,EAAE,OAAO,EAAE;IAKnB,IAAI;IArCb;IACE;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc,EACvB;IAGJ,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS,CASvB;IAED,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,0GAWpD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAEpE;IAED;;;OAGG;IACH,QAAQ,4BAWP;IAED;;;OAGG;IACH,QAAQ,kBAEP;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB,CAYnE;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAEjD;IAED,OAAa,MAAM,gCAclB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,WAEf;CACF"}

package/dest/tx/tx_execution_request.js

@@ -1,3 +1,4 @@
+var _computedKey;
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
@@ -13,9 +14,11 @@ import { FunctionData } from './function_data.js';
 import { HashedValues } from './hashed_values.js';
 import { TxContext } from './tx_context.js';
 import { TxRequest } from './tx_request.js';
+_computedKey = inspect.custom;
 /**
  * Request to execute a transaction. Similar to TxRequest, but has the full args.
- */ export class TxExecutionRequest {
+ */ // docs:start:tx_execution_request_class
+export class TxExecutionRequest {
     origin;
     functionSelector;
     firstCallArgsHash;
@@ -55,6 +58,7 @@ import { TxRequest } from './tx_request.js';
         this.capsules = capsules;
         this.salt = salt;
     }
+    // docs:end:tx_execution_request_class
     static get schema() {
         return z.object({
             origin: schemas.AztecAddress,
@@ -128,7 +132,7 @@ import { TxRequest } from './tx_request.js';
             ])
         ], Fr.random());
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `TxExecutionRequest(${this.origin} called ${this.functionSelector})`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.0.1-commit.6c91f13",
+  "version": "0.0.1-commit.7d4e6cd",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -77,13 +77,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "0.0.1-commit.6c91f13",
-    "@aztec/blob-lib": "0.0.1-commit.6c91f13",
-    "@aztec/constants": "0.0.1-commit.6c91f13",
-    "@aztec/ethereum": "0.0.1-commit.6c91f13",
-    "@aztec/foundation": "0.0.1-commit.6c91f13",
-    "@aztec/l1-artifacts": "0.0.1-commit.6c91f13",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.6c91f13",
+    "@aztec/bb.js": "0.0.1-commit.7d4e6cd",
+    "@aztec/blob-lib": "0.0.1-commit.7d4e6cd",
+    "@aztec/constants": "0.0.1-commit.7d4e6cd",
+    "@aztec/ethereum": "0.0.1-commit.7d4e6cd",
+    "@aztec/foundation": "0.0.1-commit.7d4e6cd",
+    "@aztec/l1-artifacts": "0.0.1-commit.7d4e6cd",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.7d4e6cd",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",

package/src/abi/contract_artifact.ts

@@ -1,5 +1,14 @@
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 
+import {
+  AZTEC_INITIALIZER_ATTRIBUTE,
+  AZTEC_ONLY_SELF_ATTRIBUTE,
+  AZTEC_PRIVATE_ATTRIBUTE,
+  AZTEC_PUBLIC_ATTRIBUTE,
+  AZTEC_UTILITY_ATTRIBUTE,
+  AZTEC_VIEW_ATTRIBUTE,
+  type NoirCompiledContract,
+} from '../noir/index.js';
 import {
   type ABIParameter,
   type ABIParameterVisibility,
@@ -14,16 +23,7 @@ import {
   type IntegerValue,
   type StructValue,
   type TypedStructFieldValue,
-} from '../abi/index.js';
-import {
-  AZTEC_INITIALIZER_ATTRIBUTE,
-  AZTEC_ONLY_SELF_ATTRIBUTE,
-  AZTEC_PRIVATE_ATTRIBUTE,
-  AZTEC_PUBLIC_ATTRIBUTE,
-  AZTEC_UTILITY_ATTRIBUTE,
-  AZTEC_VIEW_ATTRIBUTE,
-  type NoirCompiledContract,
-} from '../noir/index.js';
+} from './abi.js';
 
 /**
  * Serializes a contract artifact to a buffer for storage.

package/src/block/attestation_info.ts

@@ -1,9 +1,9 @@
 import { recoverAddress } from '@aztec/foundation/crypto/secp256k1-signer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 
+import { Checkpoint } from '../checkpoint/checkpoint.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
-import type { L2Block } from './l2_block.js';
 import type { CommitteeAttestation } from './proposal/committee_attestation.js';
 
 /**
@@ -29,14 +29,14 @@ export type AttestationInfo =
     };
 
 /**
- * Extracts attestation information from a published L2 block.
+ * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export function getAttestationInfoFromPublishedL2Block(block: {
+export function getAttestationInfoFromPublishedCheckpoint(block: {
   attestations: CommitteeAttestation[];
-  block: L2Block;
+  checkpoint: Checkpoint;
 }): AttestationInfo[] {
-  const payload = ConsensusPayload.fromBlock(block.block);
+  const payload = ConsensusPayload.fromCheckpoint(block.checkpoint);
   return getAttestationInfoFromPayload(payload, block.attestations);
 }
 
@@ -44,7 +44,10 @@ export function getAttestationInfoFromPayload(
   payload: ConsensusPayload,
   attestations: CommitteeAttestation[],
 ): AttestationInfo[] {
-  const hashedPayload = getHashedSignaturePayloadEthSignedMessage(payload, SignatureDomainSeparator.blockAttestation);
+  const hashedPayload = getHashedSignaturePayloadEthSignedMessage(
+    payload,
+    SignatureDomainSeparator.checkpointAttestation,
+  );
 
   return attestations.map(attestation => {
     // If signature is empty, check if we have an address directly

package/src/block/l2_block.ts

@@ -101,7 +101,7 @@ export class L2Block {
 
     return new L2Block(
       makeAppendOnlyTreeSnapshot(l2BlockNum + 1),
-      makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, {}, inHash),
+      makeL2BlockHeader(0, l2BlockNum, slotNumber ?? l2BlockNum, { inHash }),
       body,
     );
   }
@@ -151,13 +151,13 @@ export class L2Block {
     return this.header.toBlockHeader();
   }
 
-  public toL2Block() {
+  public toL2Block(args: { checkpointNumber?: CheckpointNumber; indexWithinCheckpoint?: number } = {}): L2BlockNew {
     return new L2BlockNew(
       this.archive,
       this.getBlockHeader(),
       this.body,
-      CheckpointNumber.fromBlockNumber(this.number),
-      0, // indexWithinCheckpoint
+      args?.checkpointNumber ?? CheckpointNumber.fromBlockNumber(this.number),
+      args?.indexWithinCheckpoint ?? 0,
     );
   }
 
@@ -175,7 +175,8 @@ export class L2Block {
     const block = checkpoint.blocks.at(-1)!;
     const header = new L2BlockHeader(
       new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, block.number),
-      checkpointHeader.contentCommitment,
+      checkpointHeader.blobsHash,
+      checkpointHeader.inHash,
       block.header.state,
       block.header.globalVariables,
       block.header.totalFees,

package/src/block/l2_block_code_to_purge.ts

@@ -7,7 +7,6 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { AztecAddress } from '../aztec-address/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { ContentCommitment } from '../tx/content_commitment.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { PartialStateReference } from '../tx/partial_state_reference.js';
 import { StateReference } from '../tx/state_reference.js';
@@ -18,12 +17,12 @@ export function makeL2BlockHeader(
   blockNumber?: number,
   slotNumber?: number,
   overrides: Partial<FieldsOf<L2BlockHeader>> = {},
-  inHash?: Fr,
 ) {
   return new L2BlockHeader(
     makeAppendOnlyTreeSnapshot(seed + 0x100),
-    overrides?.contentCommitment ?? makeContentCommitment(seed + 0x200, inHash),
-    overrides?.state ?? makeStateReference(seed + 0x600),
+    overrides.blobsHash ?? new Fr(seed + 0x200),
+    overrides.inHash ?? new Fr(seed + 0x300),
+    overrides.state ?? makeStateReference(seed + 0x600),
     makeGlobalVariables((seed += 0x700), {
       ...(blockNumber ? { blockNumber: BlockNumber(blockNumber) } : {}),
       ...(slotNumber ? { slotNumber: SlotNumber(slotNumber) } : {}),
@@ -44,13 +43,6 @@ export function makeAppendOnlyTreeSnapshot(seed = 1): AppendOnlyTreeSnapshot {
   return new AppendOnlyTreeSnapshot(new Fr(seed), seed);
 }
 
-/**
- * Makes content commitment
- */
-function makeContentCommitment(seed = 0, inHash?: Fr): ContentCommitment {
-  return new ContentCommitment(new Fr(seed + 0x100), inHash ?? new Fr(seed + 0x200), new Fr(seed + 0x300));
-}
-
 /**
  * Makes arbitrary state reference.
  * @param seed - The seed to use for generating the state reference.

package/src/block/l2_block_header.ts

@@ -10,7 +10,7 @@ import { z } from 'zod';
 
 import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import { AppendOnlyTreeSnapshot } from '../trees/append_only_tree_snapshot.js';
-import { BlockHeader, ContentCommitment, GlobalVariables, StateReference } from '../tx/index.js';
+import { BlockHeader, GlobalVariables, StateReference } from '../tx/index.js';
 
 /**
  * TO BE DELETED
@@ -25,8 +25,8 @@ export class L2BlockHeader {
   constructor(
     /** Snapshot of archive before the block is applied. */
     public lastArchive: AppendOnlyTreeSnapshot,
-    /** Hash of the body of an L2 block. */
-    public contentCommitment: ContentCommitment,
+    public blobsHash: Fr,
+    public inHash: Fr,
     /** State reference. */
     public state: StateReference,
     /** Global variables of an L2 block. */
@@ -45,7 +45,8 @@ export class L2BlockHeader {
     return z
       .object({
         lastArchive: AppendOnlyTreeSnapshot.schema,
-        contentCommitment: ContentCommitment.schema,
+        blobsHash: schemas.Fr,
+        inHash: schemas.Fr,
         state: StateReference.schema,
         globalVariables: GlobalVariables.schema,
         totalFees: schemas.Fr,
@@ -59,7 +60,8 @@ export class L2BlockHeader {
   static getFields(fields: FieldsOf<L2BlockHeader>) {
     return [
       fields.lastArchive,
-      fields.contentCommitment,
+      fields.blobsHash,
+      fields.inHash,
       fields.state,
       fields.globalVariables,
       fields.totalFees,
@@ -84,7 +86,8 @@ export class L2BlockHeader {
   getSize() {
     return (
       this.lastArchive.getSize() +
-      this.contentCommitment.getSize() +
+      this.blobsHash.size +
+      this.inHash.size +
       this.state.getSize() +
       this.globalVariables.getSize() +
       this.totalFees.size +
@@ -111,7 +114,8 @@ export class L2BlockHeader {
 
     return new L2BlockHeader(
       reader.readObject(AppendOnlyTreeSnapshot),
-      reader.readObject(ContentCommitment),
+      reader.readObject(Fr),
+      reader.readObject(Fr),
       reader.readObject(StateReference),
       reader.readObject(GlobalVariables),
       reader.readObject(Fr),
@@ -126,7 +130,8 @@ export class L2BlockHeader {
 
     return new L2BlockHeader(
       AppendOnlyTreeSnapshot.fromFields(reader),
-      ContentCommitment.fromFields(reader),
+      reader.readField(),
+      reader.readField(),
       StateReference.fromFields(reader),
       GlobalVariables.fromFields(reader),
       reader.readField(),
@@ -139,7 +144,8 @@ export class L2BlockHeader {
   static empty(fields: Partial<FieldsOf<L2BlockHeader>> = {}) {
     return L2BlockHeader.from({
       lastArchive: AppendOnlyTreeSnapshot.empty(),
-      contentCommitment: ContentCommitment.empty(),
+      blobsHash: Fr.ZERO,
+      inHash: Fr.ZERO,
       state: StateReference.empty(),
       globalVariables: GlobalVariables.empty(),
       totalFees: Fr.ZERO,
@@ -153,7 +159,8 @@ export class L2BlockHeader {
   isEmpty(): boolean {
     return (
       this.lastArchive.isEmpty() &&
-      this.contentCommitment.isEmpty() &&
+      this.blobsHash.isZero() &&
+      this.inHash.isZero() &&
       this.state.isEmpty() &&
       this.globalVariables.isEmpty() &&
       this.totalFees.isZero() &&
@@ -179,7 +186,8 @@ export class L2BlockHeader {
     return new CheckpointHeader(
       this.lastArchive.root,
       this.blockHeadersHash,
-      this.contentCommitment,
+      this.blobsHash,
+      this.inHash,
       this.globalVariables.slotNumber,
       this.globalVariables.timestamp,
       this.globalVariables.coinbase,
@@ -203,7 +211,8 @@ export class L2BlockHeader {
   toInspect() {
     return {
       lastArchive: this.lastArchive.root.toString(),
-      contentCommitment: this.contentCommitment.toInspect(),
+      blobsHash: this.blobsHash.toString(),
+      inHash: this.inHash.toString(),
       state: this.state.toInspect(),
       globalVariables: this.globalVariables.toInspect(),
       totalFees: this.totalFees.toBigInt(),
@@ -216,9 +225,8 @@ export class L2BlockHeader {
   [inspect.custom]() {
     return `L2BlockHeader {
   lastArchive: ${inspect(this.lastArchive)},
-  contentCommitment.blobsHash: ${inspect(this.contentCommitment.blobsHash)},
-  contentCommitment.inHash: ${inspect(this.contentCommitment.inHash)},
-  contentCommitment.outHash: ${inspect(this.contentCommitment.outHash)},
+  blobsHash: ${inspect(this.blobsHash)},
+  inHash: ${inspect(this.inHash)},
   state.l1ToL2MessageTree: ${inspect(this.state.l1ToL2MessageTree)},
   state.noteHashTree: ${inspect(this.state.partial.noteHashTree)},
   state.nullifierTree: ${inspect(this.state.partial.nullifierTree)},
@@ -233,12 +241,13 @@ export class L2BlockHeader {
 
   public equals(other: this): boolean {
     return (
-      this.contentCommitment.equals(other.contentCommitment) &&
+      this.lastArchive.equals(other.lastArchive) &&
+      this.blobsHash.equals(other.blobsHash) &&
+      this.inHash.equals(other.inHash) &&
       this.state.equals(other.state) &&
       this.globalVariables.equals(other.globalVariables) &&
       this.totalFees.equals(other.totalFees) &&
       this.totalManaUsed.equals(other.totalManaUsed) &&
-      this.lastArchive.equals(other.lastArchive) &&
       this.spongeBlobHash.equals(other.spongeBlobHash) &&
       this.blockHeadersHash.equals(other.blockHeadersHash)
     );

package/src/block/l2_block_new.ts

@@ -11,9 +11,13 @@ import { BlockHeader } from '../tx/block_header.js';
 import { Body } from './body.js';
 import type { L2BlockInfo } from './l2_block_info.js';
 
+// TODO(palla/mbps): Delete the existing `L2Block` class and rename this to `L2Block`.
+// TODO(palla/mbps): Consider moving the checkpointNumber and indexWithinCheckpoint to the header:
+// if the blockNumber is there, why not these as well? Consider whether they should be part of the
+// circuits structs though.
+
 /**
  * An L2 block with a header and a body.
- * TODO: Delete the existing `L2Block` class and rename this to `L2Block`.
  */
 export class L2BlockNew {
   constructor(

package/src/block/l2_block_source.ts

@@ -2,6 +2,7 @@ import {
   BlockNumber,
   BlockNumberSchema,
   CheckpointNumber,
+  CheckpointNumberSchema,
   type EpochNumber,
   type SlotNumber,
 } from '@aztec/foundation/branded-types';
@@ -14,6 +15,7 @@ import { z } from 'zod';
 import type { Checkpoint } from '../checkpoint/checkpoint.js';
 import type { PublishedCheckpoint } from '../checkpoint/published_checkpoint.js';
 import type { L1RollupConstants } from '../epoch-helpers/index.js';
+import { CheckpointHeader } from '../rollup/checkpoint_header.js';
 import type { BlockHeader } from '../tx/block_header.js';
 import type { IndexedTxEffect } from '../tx/indexed_tx_effect.js';
 import type { TxHash } from '../tx/tx_hash.js';
@@ -21,7 +23,7 @@ import type { TxReceipt } from '../tx/tx_receipt.js';
 import { type CheckpointedL2Block, PublishedL2Block } from './checkpointed_l2_block.js';
 import type { L2Block } from './l2_block.js';
 import type { L2BlockNew } from './l2_block_new.js';
-import type { ValidateBlockNegativeResult, ValidateBlockResult } from './validate_block_result.js';
+import type { ValidateCheckpointNegativeResult, ValidateCheckpointResult } from './validate_block_result.js';
 
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
@@ -66,6 +68,8 @@ export interface L2BlockSource {
    */
   getCheckpointedBlock(number: BlockNumber): Promise<CheckpointedL2Block | undefined>;
 
+  getCheckpointedBlocks(from: BlockNumber, limit: number, proven?: boolean): Promise<CheckpointedL2Block[]>;
+
   /**
    * Retrieves a collection of published checkpoints
    * @param checkpointNumber The first checkpoint to be retrieved
@@ -161,10 +165,10 @@ export interface L2BlockSource {
   isPendingChainInvalid(): Promise<boolean>;
 
   /**
-   * Returns the status of the pending chain validation. If the chain is invalid, reports the earliest consecutive block
-   * that is invalid, along with the reason for being invalid, which can be used to trigger an invalidation.
+   * Returns the status of the pending chain validation. If the chain is invalid, reports the earliest consecutive
+   * checkpoint that is invalid, along with the reason for being invalid, which can be used to trigger an invalidation.
    */
-  getPendingChainValidationStatus(): Promise<ValidateBlockResult>;
+  getPendingChainValidationStatus(): Promise<ValidateCheckpointResult>;
 
   /** Force a sync. */
   syncImmediate(): Promise<void>;
@@ -179,6 +183,10 @@ export interface L2BlockSource {
    */
   getBlock(number: BlockNumber): Promise<L2Block | undefined>;
 
+  getL2BlockNew(number: BlockNumber): Promise<L2BlockNew | undefined>;
+
+  getL2BlocksNew(from: BlockNumber, limit: number, proven?: boolean): Promise<L2BlockNew[]>;
+
   /**
    * Returns all blocks for a given epoch.
    * @dev Use this method only with recent epochs, since it walks the block list backwards.
@@ -232,24 +240,44 @@ export interface L2BlockSink {
 export type ArchiverEmitter = TypedEventEmitter<{
   [L2BlockSourceEvents.L2PruneDetected]: (args: L2BlockPruneEvent) => void;
   [L2BlockSourceEvents.L2BlockProven]: (args: L2BlockProvenEvent) => void;
-  [L2BlockSourceEvents.InvalidAttestationsBlockDetected]: (args: InvalidBlockDetectedEvent) => void;
+  [L2BlockSourceEvents.InvalidAttestationsCheckpointDetected]: (args: InvalidCheckpointDetectedEvent) => void;
+  [L2BlockSourceEvents.L2BlocksCheckpointed]: (args: L2CheckpointEvent) => void;
 }>;
 export interface L2BlockSourceEventEmitter extends L2BlockSource, ArchiverEmitter {}
 
 /**
  * Identifier for L2 block tags.
- * - latest: Latest block pushed to L1.
+ * - proposed: Latest block proposed on L2.
+ * - checkpointed: Checkpointed block on L1.
  * - proven: Proven block on L1.
  * - finalized: Proven block on a finalized L1 block (not implemented, set to proven for now).
  */
-export type L2BlockTag = 'latest' | 'proven' | 'finalized';
+export type L2BlockTag = 'proposed' | 'checkpointed' | 'proven' | 'finalized';
+
+/**
+ * Reason for L2 block prune.
+ * - uncheckpointed: L2 blocks were pruned due to a failure to checkpoint.
+ * - unproven: L2 blocks were pruned due to a failure to prove.
+ */
+export type L2BlockPruneReason = 'uncheckpointed' | 'unproven';
 
 /** Tips of the L2 chain. */
-export type L2Tips = Record<L2BlockTag, L2BlockId>;
+export type L2Tips = {
+  proposed: L2BlockId;
+  checkpointed: L2TipId;
+  proven: L2TipId;
+  finalized: L2TipId;
+};
+
+export const GENESIS_CHECKPOINT_HEADER_HASH = CheckpointHeader.empty().hash();
 
 /** Identifies a block by number and hash. */
 export type L2BlockId = { number: BlockNumber; hash: string };
 
+export type CheckpointId = { number: CheckpointNumber; hash: string };
+
+export type L2TipId = { block: L2BlockId; checkpoint: CheckpointId };
+
 /** Creates an L2 block id */
 export function makeL2BlockId(number: BlockNumber, hash?: string): L2BlockId {
   if (number !== 0 && !hash) {
@@ -258,21 +286,38 @@ export function makeL2BlockId(number: BlockNumber, hash?: string): L2BlockId {
   return { number, hash: hash! };
 }
 
+/** Creates an L2 checkpoint id */
+export function makeL2CheckpointId(number: CheckpointNumber, hash: string): CheckpointId {
+  return { number, hash };
+}
+
 const L2BlockIdSchema = z.object({
   number: BlockNumberSchema,
   hash: z.string(),
 });
 
+const L2CheckpointIdSchema = z.object({
+  number: CheckpointNumberSchema,
+  hash: z.string(),
+});
+
+const L2TipIdSchema = z.object({
+  block: L2BlockIdSchema,
+  checkpoint: L2CheckpointIdSchema,
+});
+
 export const L2TipsSchema = z.object({
-  latest: L2BlockIdSchema,
-  proven: L2BlockIdSchema,
-  finalized: L2BlockIdSchema,
+  proposed: L2BlockIdSchema,
+  checkpointed: L2TipIdSchema,
+  proven: L2TipIdSchema,
+  finalized: L2TipIdSchema,
 });
 
 export enum L2BlockSourceEvents {
   L2PruneDetected = 'l2PruneDetected',
   L2BlockProven = 'l2BlockProven',
-  InvalidAttestationsBlockDetected = 'invalidBlockDetected',
+  L2BlocksCheckpointed = 'l2BlocksCheckpointed',
+  InvalidAttestationsCheckpointDetected = 'invalidCheckpointDetected',
 }
 
 export type L2BlockProvenEvent = {
@@ -285,10 +330,15 @@ export type L2BlockProvenEvent = {
 export type L2BlockPruneEvent = {
   type: 'l2PruneDetected';
   epochNumber: EpochNumber;
-  blocks: L2Block[];
+  blocks: L2BlockNew[];
+};
+
+export type L2CheckpointEvent = {
+  type: 'l2BlocksCheckpointed';
+  checkpoint: PublishedCheckpoint;
 };
 
-export type InvalidBlockDetectedEvent = {
-  type: 'invalidBlockDetected';
-  validationResult: ValidateBlockNegativeResult;
+export type InvalidCheckpointDetectedEvent = {
+  type: 'invalidCheckpointDetected';
+  validationResult: ValidateCheckpointNegativeResult;
 };

package/src/block/l2_block_stream/index.ts

@@ -1,3 +1,4 @@
 export * from './interfaces.js';
 export * from './l2_block_stream.js';
 export * from './l2_tips_memory_store.js';
+export * from './l2_tips_store_base.js';

package/src/block/l2_block_stream/interfaces.ts

@@ -1,5 +1,6 @@
-import type { PublishedL2Block } from '../checkpointed_l2_block.js';
-import type { L2BlockId, L2Tips } from '../l2_block_source.js';
+import type { PublishedCheckpoint } from '../../checkpoint/published_checkpoint.js';
+import type { L2BlockNew } from '../l2_block_new.js';
+import type { CheckpointId, L2BlockId, L2BlockPruneReason, L2Tips } from '../l2_block_source.js';
 
 /** Interface to the local view of the chain. Implemented by world-state and l2-tips-store. */
 export interface L2BlockStreamLocalDataProvider {
@@ -15,11 +16,18 @@ export interface L2BlockStreamEventHandler {
 export type L2BlockStreamEvent =
   | /** Emits blocks added to the chain. */ {
       type: 'blocks-added';
-      blocks: PublishedL2Block[];
+      blocks: L2BlockNew[];
     }
-  | /** Reports last correct block (new tip of the unproven chain). */ {
+  | /** Emits checkpoints published to L1. */ {
+      type: 'chain-checkpointed';
+      checkpoint: PublishedCheckpoint;
+      block: L2BlockId;
+    }
+  | /** Reports last correct block (new tip of the proposed chain). */ {
       type: 'chain-pruned';
+      reason: L2BlockPruneReason;
       block: L2BlockId;
+      checkpoint: CheckpointId;
     }
   | /** Reports new proven block. */ {
       type: 'chain-proven';