@aztec/pxe 0.0.1-commit.2f68f620 → 0.0.1-commit.3100065

package/dest/bin/check_oracle_version.js

@@ -2,34 +2,24 @@ import { keccak256String } from '@aztec/foundation/crypto/keccak';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import { ORACLE_INTERFACE_HASH, ORACLE_VERSION_MAJOR } from '../oracle_version.js';
-import { getOracleInterfaceSignature, readNumericGlobal } from './oracle_version_helpers.js';
+import { getOracleRegistrySignature, readNumericGlobal } from './oracle_version_helpers.js';
 /**
  * Verifies that the Oracle interface matches the expected interface hash.
  *
  * The Oracle interface needs to be versioned to ensure compatibility between Aztec.nr and PXE. This function computes
- * a hash of the Oracle interface and compares it against a known hash. If they don't match, it means the interface has
- * changed and the oracle version needs to be bumped:
- *   - If the change is backward-breaking (e.g. removing/renaming an oracle), bump ORACLE_VERSION_MAJOR.
+ * a hash of the `ORACLE_REGISTRY` declaration (where each oracle's parameter names, parameter types, and return type
+ * live) and compares it against a known hash. If they don't match, it means the interface has changed and the oracle
+ * version needs to be bumped:
+ *   - If the change is backward-breaking (e.g. removing/renaming an oracle, or changing its params/return), bump
+ *     ORACLE_VERSION_MAJOR.
  *   - If the change is an oracle addition (non-breaking), bump ORACLE_VERSION_MINOR.
  */ function assertOracleInterfaceMatches() {
-    const excludedProps = [
-        'handler',
-        'constructor',
-        'toACIRCallback',
-        'handlerAsMisc',
-        'handlerAsUtility',
-        'handlerAsPrivate'
-    ];
-    // Get the path to Oracle.ts source file
-    // The script runs from dest/bin/ after compilation, so we need to go up to the package root
-    // then into src/ to find the source file
+    // The script runs from dest/bin/ after compilation, so we go up to the package root then into src/ to find
+    // the source file.
     const currentDir = dirname(fileURLToPath(import.meta.url));
-    // Go up from dest/bin/ or src/bin/ to the package root (pxe/), then into src/
     const packageRoot = dirname(dirname(currentDir)); // Go up from bin/ to pxe/
-    const oracleSourcePath = join(packageRoot, 'src/contract_function_simulator/oracle/oracle.ts');
-    const oracleInterfaceSignature = getOracleInterfaceSignature(oracleSourcePath, [
-        'Oracle'
-    ], excludedProps);
+    const registrySourcePath = join(packageRoot, 'src/contract_function_simulator/oracle/oracle_registry.ts');
+    const oracleInterfaceSignature = getOracleRegistrySignature(registrySourcePath, 'ORACLE_REGISTRY');
     // We use keccak256 here just because we already have it in the dependencies.
     const oracleInterfaceHash = keccak256String(oracleInterfaceSignature);
     if (oracleInterfaceHash !== ORACLE_INTERFACE_HASH) {

package/dest/bin/index.d.ts

@@ -1,2 +1,2 @@
-export { getOracleInterfaceSignature, readNumericGlobal } from './oracle_version_helpers.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUMifQ==
+export { getOracleInterfaceSignature, getOracleRegistrySignature, readNumericGlobal, } from './oracle_version_helpers.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iaW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLDJCQUEyQixFQUMzQiwwQkFBMEIsRUFDMUIsaUJBQWlCLEdBQ2xCLE1BQU0sNkJBQTZCLENBQUMifQ==

package/dest/bin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,6BAA6B,CAAC"}

package/dest/bin/index.js

@@ -1 +1 @@
-export { getOracleInterfaceSignature, readNumericGlobal } from './oracle_version_helpers.js';
+export { getOracleInterfaceSignature, getOracleRegistrySignature, readNumericGlobal } from './oracle_version_helpers.js';

package/dest/bin/oracle_version_helpers.d.ts

@@ -9,6 +9,31 @@
  * @param excludedMembers - Method names to skip (e.g. non-oracle helpers like `constructor`).
  */
 export declare function getOracleInterfaceSignature(sourcePath: string, targets: string[], excludedMembers: string[]): string;
+/**
+ * Extracts a deterministic signature string from an oracle registry object literal (e.g. PXE's `ORACLE_REGISTRY`).
+ *
+ * Reads the registry declaration where each oracle's wire ABI lives: the ordered parameter names with their
+ * `TypeMapping` expressions and the return type. The resulting hash is sensitive to parameter, type, and return
+ * changes, not just oracle additions and removals.
+ *
+ * Type expressions are captured as their source text (e.g. `OPTION(AZTEC_ADDRESS)`, `BOUNDED_VEC(NOTE)`), so the
+ * signature tracks the composition of types. However, if the internal serialization logic of a `TypeMapping` constant
+ * (e.g. `FIELD`) changes without the constant being renamed, the hash will not change.
+ *
+ * @example
+ * // Given a registry like:
+ * //   export const ORACLE_REGISTRY = {
+ * //     aztec_utl_foo: makeEntry({ params: [{ name: 'a', type: U32 }], returnType: BOOL }),
+ * //     aztec_prv_bar: makeEntry(),
+ * //   } satisfies Record<string, OracleRegistryEntry>;
+ * //
+ * // Returns (sorted, newline-joined):
+ * //   "aztec_prv_bar(): void\naztec_utl_foo(a: U32): BOOL"
+ *
+ * @param sourcePath - Absolute path to the TypeScript source file declaring the registry.
+ * @param registryName - Name of the registry constant to read (e.g. `ORACLE_REGISTRY`).
+ */
+export declare function getOracleRegistrySignature(sourcePath: string, registryName: string): string;
 /**
  * Reads an integer-valued global constant from a Noir or TypeScript source file.
  *
@@ -23,4 +48,4 @@ export declare function getOracleInterfaceSignature(sourcePath: string, targets:
  * @throws If the constant's declaration is not found in the file.
  */
 export declare function readNumericGlobal(sourcePath: string, name: string): number;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb25faGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9vcmFjbGVfdmVyc2lvbl9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQThDcEg7QUFFRDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCx3QkFBZ0IsaUJBQWlCLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0FPMUUifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb25faGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9vcmFjbGVfdmVyc2lvbl9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQThDcEg7QUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F1Qkc7QUFDSCx3QkFBZ0IsMEJBQTBCLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0EwQjNGO0FBRUQ7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBTzFFIn0=

package/dest/bin/oracle_version_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle_version_helpers.d.ts","sourceRoot":"","sources":["../../src/bin/oracle_version_helpers.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CA8CpH;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1E"}
+{"version":3,"file":"oracle_version_helpers.d.ts","sourceRoot":"","sources":["../../src/bin/oracle_version_helpers.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,MAAM,CA8CpH;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CA0B3F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAO1E"}

package/dest/bin/oracle_version_helpers.js

@@ -40,6 +40,48 @@ import ts from 'typescript';
     methodSignatures.sort();
     return methodSignatures.join('');
 }
+/**
+ * Extracts a deterministic signature string from an oracle registry object literal (e.g. PXE's `ORACLE_REGISTRY`).
+ *
+ * Reads the registry declaration where each oracle's wire ABI lives: the ordered parameter names with their
+ * `TypeMapping` expressions and the return type. The resulting hash is sensitive to parameter, type, and return
+ * changes, not just oracle additions and removals.
+ *
+ * Type expressions are captured as their source text (e.g. `OPTION(AZTEC_ADDRESS)`, `BOUNDED_VEC(NOTE)`), so the
+ * signature tracks the composition of types. However, if the internal serialization logic of a `TypeMapping` constant
+ * (e.g. `FIELD`) changes without the constant being renamed, the hash will not change.
+ *
+ * @example
+ * // Given a registry like:
+ * //   export const ORACLE_REGISTRY = {
+ * //     aztec_utl_foo: makeEntry({ params: [{ name: 'a', type: U32 }], returnType: BOOL }),
+ * //     aztec_prv_bar: makeEntry(),
+ * //   } satisfies Record<string, OracleRegistryEntry>;
+ * //
+ * // Returns (sorted, newline-joined):
+ * //   "aztec_prv_bar(): void\naztec_utl_foo(a: U32): BOOL"
+ *
+ * @param sourcePath - Absolute path to the TypeScript source file declaring the registry.
+ * @param registryName - Name of the registry constant to read (e.g. `ORACLE_REGISTRY`).
+ */ export function getOracleRegistrySignature(sourcePath, registryName) {
+    const sourceCode = readFileSync(sourcePath, 'utf-8');
+    const sourceFile = ts.createSourceFile(sourcePath, sourceCode, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const registry = findObjectLiteral(sourceFile, registryName);
+    if (!registry) {
+        throw new Error(`Could not find oracle registry '${registryName}' in ${sourcePath}.`);
+    }
+    const oracleSignatures = registry.properties.map((property)=>{
+        if (!ts.isPropertyAssignment(property)) {
+            throw new Error(`Unexpected member in oracle registry '${registryName}': ${property.getText(sourceFile)}. Spread elements ` + `are not supported.`);
+        }
+        const oracleName = getPropertyName(property.name, sourceFile);
+        const { params, returnType } = extractRegistryEntry(property.initializer, sourceFile);
+        const paramSignatures = params.map((param)=>`${param.name}: ${param.type}`);
+        return `${oracleName}(${paramSignatures.join(', ')}): ${returnType}`;
+    });
+    oracleSignatures.sort();
+    return oracleSignatures.join('\n');
+}
 /**
  * Reads an integer-valued global constant from a Noir or TypeScript source file.
  *
@@ -85,9 +127,128 @@ function extractParameterName(param, sourceFile) {
     }
     return name.getText(sourceFile);
 }
-function extractTypeString(typeNode, sourceFile) {
+/** Returns the source text of a type annotation, or `'void'` if absent. */ function extractTypeString(typeNode, sourceFile) {
     if (!typeNode) {
         return 'void';
     }
     return typeNode.getText(sourceFile).replace(/\s+/g, ' ').trim();
 }
+/**
+ * Finds a top-level object-literal-valued constant by name, unwrapping `satisfies`/`as`/parenthesized wrappers.
+ *
+ * @example
+ * // `const REGISTRY = { ... } satisfies Record<string, Entry>` => the `{ ... }` ObjectLiteralExpression
+ */ function findObjectLiteral(sourceFile, name) {
+    let result;
+    function visit(node) {
+        if (ts.isVariableDeclaration(node) && ts.isIdentifier(node.name) && node.name.text === name && node.initializer) {
+            result = unwrapObjectLiteral(node.initializer);
+        }
+        ts.forEachChild(node, visit);
+    }
+    visit(sourceFile);
+    return result;
+}
+/** Peels `satisfies`, `as`, and parenthesized wrappers off an expression to reach the underlying object literal. */ function unwrapObjectLiteral(node) {
+    let current = node;
+    while(ts.isSatisfiesExpression(current) || ts.isAsExpression(current) || ts.isParenthesizedExpression(current)){
+        current = current.expression;
+    }
+    return ts.isObjectLiteralExpression(current) ? current : undefined;
+}
+/**
+ * Extracts the ordered `params` (names + type expressions) and `returnType` from a `makeEntry({ ... })` call.
+ *
+ * @example
+ * // makeEntry({ params: [{ name: 'a', type: OPTION(FIELD) }], returnType: BOOL })
+ * // => { params: [{ name: 'a', type: 'OPTION(FIELD)' }], returnType: 'BOOL' }
+ * //
+ * // makeEntry()
+ * // => { params: [], returnType: 'void' }
+ */ function extractRegistryEntry(initializer, sourceFile) {
+    if (!ts.isCallExpression(initializer)) {
+        throw new Error(`Expected a makeEntry(...) call but got: ${initializer.getText(sourceFile)}`);
+    }
+    const [arg] = initializer.arguments;
+    if (arg === undefined) {
+        return {
+            params: [],
+            returnType: 'void'
+        };
+    }
+    if (!ts.isObjectLiteralExpression(arg)) {
+        throw new Error(`Expected a makeEntry object argument but got: ${arg.getText(sourceFile)}`);
+    }
+    let params = [];
+    let returnType = 'void';
+    arg.properties.forEach((property)=>{
+        if (!ts.isPropertyAssignment(property)) {
+            throw new Error(`Unexpected makeEntry property: ${property.getText(sourceFile)}`);
+        }
+        const key = getPropertyName(property.name, sourceFile);
+        if (key === 'params') {
+            params = extractRegistryParams(property.initializer, sourceFile);
+        } else if (key === 'returnType') {
+            returnType = normalizeExpressionText(property.initializer, sourceFile);
+        } else {
+            throw new Error(`Unexpected makeEntry property '${key}'.`);
+        }
+    });
+    return {
+        params,
+        returnType
+    };
+}
+/**
+ * Extracts `{ name, type }` pairs from the `params` array literal inside a `makeEntry` call.
+ */ function extractRegistryParams(initializer, sourceFile) {
+    if (!ts.isArrayLiteralExpression(initializer)) {
+        throw new Error(`Expected a params array but got: ${initializer.getText(sourceFile)}`);
+    }
+    return initializer.elements.map((element)=>{
+        if (!ts.isObjectLiteralExpression(element)) {
+            throw new Error(`Expected a param object but got: ${element.getText(sourceFile)}`);
+        }
+        let name;
+        let type;
+        element.properties.forEach((property)=>{
+            if (!ts.isPropertyAssignment(property)) {
+                throw new Error(`Unexpected param property: ${property.getText(sourceFile)}`);
+            }
+            const key = getPropertyName(property.name, sourceFile);
+            if (key === 'name') {
+                if (!ts.isStringLiteralLike(property.initializer)) {
+                    throw new Error(`Expected a string literal param name but got: ${property.initializer.getText(sourceFile)}`);
+                }
+                name = property.initializer.text;
+            } else if (key === 'type') {
+                type = normalizeExpressionText(property.initializer, sourceFile);
+            } else {
+                throw new Error(`Unexpected param property '${key}'.`);
+            }
+        });
+        if (name === undefined || type === undefined) {
+            throw new Error(`Param missing 'name' or 'type': ${element.getText(sourceFile)}`);
+        }
+        return {
+            name,
+            type
+        };
+    });
+}
+/** Returns the text of an identifier or string-literal property name, throwing on computed or numeric names. */ function getPropertyName(name, sourceFile) {
+    if (ts.isIdentifier(name) || ts.isStringLiteralLike(name)) {
+        return name.text;
+    }
+    throw new Error(`Unsupported property name: ${name.getText(sourceFile)}`);
+}
+/**
+ * Returns the source text of an expression with all whitespace stripped for format-insensitive comparison.
+ *
+ * @example
+ * // `OPTION(\n  AZTEC_ADDRESS\n)` => `"OPTION(AZTEC_ADDRESS)"`
+ */ function normalizeExpressionText(node, sourceFile) {
+    // Type expressions are TypeMapping references and calls (identifiers, parentheses, commas, numbers) with no
+    // meaningful whitespace, so we strip it entirely to keep the signature stable across reformatting.
+    return node.getText(sourceFile).replace(/\s+/g, '');
+}

package/dest/block_synchronizer/block_stream_source.d.ts

@@ -2,9 +2,9 @@ import { type L2BlockSource } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 /**
  * Lifts an {@link AztecNode} RPC client into the shape {@link L2BlockStream} expects.
- * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed;
- * `getCheckpoints` requests blocks + L1 info + attestations so that `PublishedCheckpoint`
- * instances are fully populated.
+ * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed. The stream no
+ * longer fetches checkpoint payloads (the `chain-checkpointed` event is a thin tip event), so `getCheckpoints`
+ * is not part of the lifted shape.
  */
-export declare function blockStreamSourceFromAztecNode(node: AztecNode): Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips' | 'getCheckpoints'>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RyZWFtX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrX3N5bmNocm9uaXplci9ibG9ja19zdHJlYW1fc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFNTCxLQUFLLGFBQWEsRUFDbkIsTUFBTSxxQkFBcUIsQ0FBQztBQUU3QixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FDNUMsSUFBSSxFQUFFLFNBQVMsR0FDZCxJQUFJLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxjQUFjLEdBQUcsV0FBVyxHQUFHLGdCQUFnQixDQUFDLENBNERwRiJ9
+export declare function blockStreamSourceFromAztecNode(node: AztecNode): Pick<L2BlockSource, 'getBlocks' | 'getBlockData' | 'getL2Tips'>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3RyZWFtX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jsb2NrX3N5bmNocm9uaXplci9ibG9ja19zdHJlYW1fc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBOEQsS0FBSyxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNySCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FDNUMsSUFBSSxFQUFFLFNBQVMsR0FDZCxJQUFJLENBQUMsYUFBYSxFQUFFLFdBQVcsR0FBRyxjQUFjLEdBQUcsV0FBVyxDQUFDLENBOEJqRSJ9

package/dest/block_synchronizer/block_stream_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_stream_source.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_stream_source.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,SAAS,GACd,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,cAAc,GAAG,WAAW,GAAG,gBAAgB,CAAC,CA4DpF"}
+{"version":3,"file":"block_stream_source.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_stream_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8D,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACrH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,SAAS,GACd,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,cAAc,GAAG,WAAW,CAAC,CA8BjE"}

package/dest/block_synchronizer/block_stream_source.js

@@ -1,20 +1,12 @@
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { L2Block } from '@aztec/stdlib/block';
-import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 /**
  * Lifts an {@link AztecNode} RPC client into the shape {@link L2BlockStream} expects.
- * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed;
- * `getCheckpoints` requests blocks + L1 info + attestations so that `PublishedCheckpoint`
- * instances are fully populated.
+ * `getBlocks` requests transaction bodies so that real `L2Block` instances can be constructed. The stream no
+ * longer fetches checkpoint payloads (the `chain-checkpointed` event is a thin tip event), so `getCheckpoints`
+ * is not part of the lifted shape.
  */ export function blockStreamSourceFromAztecNode(node) {
     return {
-        getL2Tips: async ()=>{
-            const tips = await node.getChainTips();
-            return {
-                ...tips,
-                proposedCheckpoint: tips.checkpointed
-            };
-        },
+        getL2Tips: ()=>node.getChainTips(),
         async getBlockData (query) {
             const response = await node.getBlock(query);
             if (!response) {
@@ -40,23 +32,6 @@ import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/
                 includeTransactions: true
             });
             return responses.map((r)=>new L2Block(r.archive, r.header, r.body, r.checkpointNumber, r.indexWithinCheckpoint));
-        },
-        async getCheckpoints (query) {
-            if (!('from' in query)) {
-                throw new Error('getCheckpoints with epoch query not supported via AztecNode RPC');
-            }
-            const { from, limit } = query;
-            const responses = await node.getCheckpoints(from, limit, {
-                includeBlocks: true,
-                includeTransactions: true,
-                includeL1PublishInfo: true,
-                includeAttestations: true
-            });
-            return responses.map((r)=>{
-                const checkpoint = new Checkpoint(r.archive, r.header, r.blocks.map((b)=>new L2Block(b.archive, b.header, b.body, b.checkpointNumber, b.indexWithinCheckpoint)), r.number, r.feeAssetPriceModifier);
-                const l1 = r.l1?.published === true ? new L1PublishedData(r.l1.blockNumber, r.l1.timestamp, r.l1.blockHash) : new L1PublishedData(0n, 0n, Fr.ZERO.toString());
-                return new PublishedCheckpoint(checkpoint, l1, r.attestations ?? []);
-            });
         }
     };
 }

package/dest/block_synchronizer/block_synchronizer.d.ts

@@ -4,9 +4,11 @@ import type { L2TipsKVStore } from '@aztec/kv-store/stores';
 import { L2BlockStream, type L2BlockStreamEvent, type L2BlockStreamEventHandler } from '@aztec/stdlib/block';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { BlockSynchronizerConfig } from '../config/index.js';
-import type { ContractSyncService } from '../contract_sync/contract_sync_service.js';
-import type { AnchorBlockStore } from '../storage/anchor_block_store/anchor_block_store.js';
-import type { NoteStore } from '../storage/note_store/note_store.js';
+import type { ContractClassService } from '../contract/contract_class_service.js';
+import type { ContractSyncService } from '../contract/contract_sync_service.js';
+import type { AnchorBlockStore } from '../storage/anchor_block_store/index.js';
+import type { FactStore } from '../storage/fact_store/fact_store.js';
+import type { NoteStore } from '../storage/note_store/index.js';
 import type { PrivateEventStore } from '../storage/private_event_store/private_event_store.js';
 /**
  * The BlockSynchronizer class orchestrates synchronization between PXE and Aztec node, maintaining an up-to-date
@@ -14,20 +16,22 @@ import type { PrivateEventStore } from '../storage/private_event_store/private_e
  * for querying sync status.
  */
 export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
-    private node;
-    private store;
-    private anchorBlockStore;
-    private noteStore;
-    private privateEventStore;
-    private l2TipsStore;
-    private contractSyncService;
-    private config;
+    private readonly node;
+    private readonly store;
+    private readonly anchorBlockStore;
+    private readonly noteStore;
+    private readonly privateEventStore;
+    private readonly factStore;
+    private readonly l2TipsStore;
+    private readonly contractSyncService;
+    private readonly contractClassService;
+    private readonly config;
     private log;
     private isSyncing;
     private readonly eventQueue;
     protected readonly blockStream: L2BlockStream;
-    constructor(node: AztecNode, store: AztecAsyncKVStore, anchorBlockStore: AnchorBlockStore, noteStore: NoteStore, privateEventStore: PrivateEventStore, l2TipsStore: L2TipsKVStore, contractSyncService: ContractSyncService, config?: Partial<BlockSynchronizerConfig>, bindings?: LoggerBindings);
-    protected createBlockStream(config: Partial<BlockSynchronizerConfig>): L2BlockStream;
+    constructor(node: AztecNode, store: AztecAsyncKVStore, anchorBlockStore: AnchorBlockStore, noteStore: NoteStore, privateEventStore: PrivateEventStore, factStore: FactStore, l2TipsStore: L2TipsKVStore, contractSyncService: ContractSyncService, contractClassService: ContractClassService, config?: Partial<BlockSynchronizerConfig>, bindings?: LoggerBindings);
+    protected createBlockStream(): L2BlockStream;
     /** Handle events emitted by the block stream. Serialized to prevent concurrent mutations to anchor state. */
     handleBlockStreamEvent(event: L2BlockStreamEvent): Promise<void>;
     private doHandleBlockStreamEvent;
@@ -46,4 +50,4 @@ export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
     stop(): Promise<void>;
     private doSync;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNyRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFEQUFxRCxDQUFDO0FBQzVGLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdURBQXVELENBQUM7QUFHL0Y7Ozs7R0FJRztBQUNILHFCQUFhLGlCQUFrQixZQUFXLHlCQUF5QjtJQU8vRCxPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLGdCQUFnQjtJQUN4QixPQUFPLENBQUMsU0FBUztJQUNqQixPQUFPLENBQUMsaUJBQWlCO0lBQ3pCLE9BQU8sQ0FBQyxXQUFXO0lBQ25CLE9BQU8sQ0FBQyxtQkFBbUI7SUFDM0IsT0FBTyxDQUFDLE1BQU07SUFiaEIsT0FBTyxDQUFDLEdBQUcsQ0FBUztJQUNwQixPQUFPLENBQUMsU0FBUyxDQUE0QjtJQUM3QyxPQUFPLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBcUI7SUFDaEQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsYUFBYSxDQUFDO0lBRTlDLFlBQ1UsSUFBSSxFQUFFLFNBQVMsRUFDZixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixpQkFBaUIsRUFBRSxpQkFBaUIsRUFDcEMsV0FBVyxFQUFFLGFBQWEsRUFDMUIsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQ3hDLE1BQU0sR0FBRSxPQUFPLENBQUMsdUJBQXVCLENBQU0sRUFDckQsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLHVCQUF1QixDQUFDLEdBQUcsYUFBYSxDQWFuRjtJQUVELDZHQUE2RztJQUN0RyxzQkFBc0IsQ0FBQyxLQUFLLEVBQUUsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUV0RTtZQUVhLHdCQUF3QjtZQThFeEIsdUJBQXVCO0lBU3JDOzs7Ozs7OztPQVFHO0lBQ1UsSUFBSSxrQkFpQmhCO0lBRUQsb0dBQW9HO0lBQ3ZGLElBQUksa0JBSWhCO1lBRWEsTUFBTTtDQWNyQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNsRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ2hGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1REFBdUQsQ0FBQztBQUcvRjs7OztHQUlHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcseUJBQXlCO0lBTy9ELE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUs7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7SUFDakMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBQ2xDLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFDNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxtQkFBbUI7SUFDcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0I7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBZnpCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBNEI7SUFDN0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQXFCO0lBQ2hELFNBQVMsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQztJQUU5QyxZQUNtQixJQUFJLEVBQUUsU0FBUyxFQUNmLEtBQUssRUFBRSxpQkFBaUIsRUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLGlCQUFpQixFQUNwQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsYUFBYSxFQUMxQixtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsb0JBQW9CLEVBQUUsb0JBQW9CLEVBQzFDLE1BQU0sR0FBRSxPQUFPLENBQUMsdUJBQXVCLENBQU0sRUFDOUQsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIsSUFBSSxhQUFhLENBWTNDO0lBRUQsNkdBQTZHO0lBQ3RHLHNCQUFzQixDQUFDLEtBQUssRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRXRFO1lBRWEsd0JBQXdCO1lBOEd4Qix1QkFBdUI7SUFlckM7Ozs7Ozs7O09BUUc7SUFDVSxJQUFJLGtCQWlCaEI7SUFFRCxvR0FBb0c7SUFDdkYsSUFBSSxrQkFJaEI7WUFFYSxNQUFNO0NBY3JCIn0=

package/dest/block_synchronizer/block_synchronizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_synchronizer.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAa,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAG/F;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB;IAO/D,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,MAAM;IAbhB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAE9C,YACU,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,iBAAiB,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,aAAa,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAM,EACrD,QAAQ,CAAC,EAAE,cAAc,EAK1B;IAED,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,uBAAuB,CAAC,GAAG,aAAa,CAanF;IAED,6GAA6G;IACtG,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;YAEa,wBAAwB;YA8ExB,uBAAuB;IASrC;;;;;;;;OAQG;IACU,IAAI,kBAiBhB;IAED,oGAAoG;IACvF,IAAI,kBAIhB;YAEa,MAAM;CAcrB"}
+{"version":3,"file":"block_synchronizer.d.ts","sourceRoot":"","sources":["../../src/block_synchronizer/block_synchronizer.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,uBAAuB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAa,aAAa,EAAE,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AACxH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAG/F;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,yBAAyB;IAO/D,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAfzB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,SAAS,CAA4B;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAE9C,YACmB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,iBAAiB,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,aAAa,EAC1B,mBAAmB,EAAE,mBAAmB,EACxC,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,GAAE,OAAO,CAAC,uBAAuB,CAAM,EAC9D,QAAQ,CAAC,EAAE,cAAc,EAK1B;IAED,SAAS,CAAC,iBAAiB,IAAI,aAAa,CAY3C;IAED,6GAA6G;IACtG,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtE;YAEa,wBAAwB;YA8GxB,uBAAuB;IAerC;;;;;;;;OAQG;IACU,IAAI,kBAiBhB;IAED,oGAAoG;IACvF,IAAI,kBAIhB;YAEa,MAAM;CAcrB"}

package/dest/block_synchronizer/block_synchronizer.js

@@ -13,55 +13,75 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
     anchorBlockStore;
     noteStore;
     privateEventStore;
+    factStore;
     l2TipsStore;
     contractSyncService;
+    contractClassService;
     config;
     log;
     isSyncing;
     eventQueue;
     blockStream;
-    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, l2TipsStore, contractSyncService, config = {}, bindings){
+    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, factStore, l2TipsStore, contractSyncService, contractClassService, config = {}, bindings){
         this.node = node;
         this.store = store;
         this.anchorBlockStore = anchorBlockStore;
         this.noteStore = noteStore;
         this.privateEventStore = privateEventStore;
+        this.factStore = factStore;
         this.l2TipsStore = l2TipsStore;
         this.contractSyncService = contractSyncService;
+        this.contractClassService = contractClassService;
         this.config = config;
         this.eventQueue = new SerialQueue();
         this.log = createLogger('pxe:block_synchronizer', bindings);
-        this.blockStream = this.createBlockStream(config);
+        this.blockStream = this.createBlockStream();
         this.eventQueue.start();
     }
-    createBlockStream(config) {
+    createBlockStream() {
         return new L2BlockStream(blockStreamSourceFromAztecNode(this.node), this.l2TipsStore, this, createLogger('pxe:block_stream', this.log.getBindings()), {
-            batchSize: config.l2BlockBatchSize,
-            // Skipping finalized blocks makes us sync much faster - we only need to download blocks other than the latest one
-            // in order to detect reorgs, and there can be no reorgs on finalized block, making this safe.
-            skipFinalized: true
+            // PXE only tracks chain tips (it anchors on tip events and never replays payloads), so the stream runs
+            // in tips-only mode: no block downloads, just the tip events that move the anchor and detect reorgs.
+            tipsOnly: true
         });
     }
     /** Handle events emitted by the block stream. Serialized to prevent concurrent mutations to anchor state. */ handleBlockStreamEvent(event) {
         return this.eventQueue.put(()=>this.doHandleBlockStreamEvent(event));
     }
     async doHandleBlockStreamEvent(event) {
-        await this.l2TipsStore.handleBlockStreamEvent(event);
         switch(event.type){
-            case 'blocks-added':
+            case 'chain-proposed':
                 {
                     if (this.config.syncChainTip === undefined || this.config.syncChainTip === 'proposed') {
-                        const lastBlock = event.blocks.at(-1);
-                        await this.updateAnchorBlockHeader(lastBlock.header);
+                        // Fetch the proposed tip header by hash. By-hash is safer than by-number against a same-height reorg.
+                        const block = await this.node.getBlockData(BlockHash.fromString(event.block.hash));
+                        if (!block) {
+                            // The node served a proposed tip whose block data it cannot return — a node inconsistency, since the
+                            // stream events and the block data come from the same node (same reasoning as the chain-pruned throw
+                            // below). Throwing here propagates before the tips-store cursor advances, so the cursor stays put and the
+                            // next sync re-emits chain-proposed (at-least-once). Were we to warn-and-skip, the cursor would advance and
+                            // a quiet chain would never re-emit, leaving the anchor stale indefinitely.
+                            throw new Error(`Block header for proposed block ${event.block.number} and hash ${event.block.hash} not found. This ` + `likely indicates a bug in the node, as we receive block stream events and fetch block headers from ` + `the same node.`);
+                        }
+                        await this.updateAnchorBlockHeader(block.header);
                     }
                     break;
                 }
+            // Never emitted in tips-only mode; PXE anchors on chain-proposed instead. Kept for union exhaustiveness.
+            case 'blocks-added':
+                break;
             case 'chain-checkpointed':
                 {
                     if (this.config.syncChainTip === 'checkpointed') {
-                        // Get the last block header from the checkpoint
-                        const lastBlock = event.checkpoint.checkpoint.blocks.at(-1);
-                        await this.updateAnchorBlockHeader(lastBlock.header);
+                        // Fetch the checkpointed tip header by hash. By-hash is safer than by-number against a
+                        // same-height reorg; a missing result means the block was reorged out between the event
+                        // and this fetch, so we skip the anchor update and let a later event correct it.
+                        const block = await this.node.getBlockData(BlockHash.fromString(event.block.hash));
+                        if (block) {
+                            await this.updateAnchorBlockHeader(block.header);
+                        } else {
+                            this.log.warn(`Block header not found for checkpointed block ${event.block.number}, skipping anchor update`);
+                        }
                     }
                     break;
                 }
@@ -98,9 +118,11 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
                             pruneEvent: event,
                             currentAnchorBlockHeader: currentAnchorBlockHeader.toInspect()
                         });
-                        return;
+                        break;
                     }
-                    this.log.warn(`Pruning data after block ${event.block.number} due to reorg`);
+                    this.log.warn(`Pruning data after block ${event.block.number} due to reorg`, {
+                        pruneBlock: event.block
+                    });
                     // Note that the following is not necessarily the anchor block that will be used in the transaction - if
                     // the chain has already moved past the reorg, we'll also see blocks-added events that will push the anchor
                     // forward.
@@ -111,19 +133,33 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
                     }
                     // Operations are wrapped in a single transaction to ensure atomicity.
                     await this.store.transactionAsync(async ()=>{
-                        await this.noteStore.rollback(event.block.number, currentAnchorBlockNumber);
-                        await this.privateEventStore.rollback(event.block.number, currentAnchorBlockNumber);
+                        await this.noteStore.rollback(event.block.number);
+                        await this.privateEventStore.rollback(event.block.number);
+                        await this.factStore.rollback(event.block.number);
                         await this.updateAnchorBlockHeader(newAnchorBlockHeader);
                     });
                     break;
                 }
+            default:
+                {
+                    const _ = event;
+                    break;
+                }
         }
+        // Advance the tips store cursor only after the anchor update / prune rollback above succeeds. If that work
+        // throws, the cursor stays put and the stream re-emits this event on the next sync pass (at-least-once),
+        // matching the prover-node's handle-first/tips-last ordering. The SerialQueue makes this reorder safe.
+        await this.l2TipsStore.handleBlockStreamEvent(event);
     }
     /** Updates the anchor block header to the target block */ async updateAnchorBlockHeader(blockHeader) {
         // Whenever the anchor block header is updated, we need to synchronize the private state of contracts again.
         // Therefore, we clear the contract synchronization cache here such that the sync is re-triggered upon new
         // execution.
         this.contractSyncService.wipe();
+        // The contract class service keeps a per-block cache - since updating our anchor means it is very unlikely we'd
+        // ever re-simulate at past anchors, we wipe its cache to prevent runaway memory growth on very long-lived PXE
+        // instances.
+        this.contractClassService.wipe();
         this.log.verbose(`Updated pxe last block to ${blockHeader.getBlockNumber()}`, blockHeader.toInspect());
         await this.anchorBlockStore.setHeader(blockHeader);
     }

package/dest/config/index.d.ts

@@ -2,6 +2,7 @@ import { type ConfigMappingsType } from '@aztec/foundation/config';
 import { type ChainConfig } from '@aztec/stdlib/config';
 import { type DataStoreConfig } from '@aztec/stdlib/kv-store';
 export { getPackageInfo } from './package_info.js';
+export * from '../hooks/index.js';
 /**
  * Configuration settings for the prover factory
  */
@@ -40,4 +41,4 @@ export declare const allPxeConfigMappings: ConfigMappingsType<CliPXEOptions & PX
  * Creates an instance of CliPxeOptions out of environment variables
  */
 export declare function getCliPXEOptions(): CliPXEOptions & PXEConfig;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBTXhCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUF1QixNQUFNLHNCQUFzQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx3QkFBd0IsQ0FBQztBQUVsRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLDhDQUE4QztJQUM5QyxhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDekI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyx1QkFBdUI7SUFDdEMseUZBQXlGO0lBQ3pGLGdCQUFnQixFQUFFLE1BQU0sQ0FBQztJQUN6Qiw2RUFBNkU7SUFDN0UsWUFBWSxDQUFDLEVBQUUsVUFBVSxHQUFHLGNBQWMsR0FBRyxRQUFRLEdBQUcsV0FBVyxDQUFDO0lBQ3BFOzs7O09BSUc7SUFDSCxRQUFRLEVBQUUsT0FBTyxDQUFDO0NBQ25CO0FBRUQsTUFBTSxNQUFNLFNBQVMsR0FBRyxrQkFBa0IsR0FBRyxlQUFlLEdBQUcsV0FBVyxHQUFHLHVCQUF1QixDQUFDO0FBRXJHLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQixDQUFDO0FBRUYsZUFBTyxNQUFNLGlCQUFpQixFQUFFLGtCQUFrQixDQUFDLFNBQVMsQ0ErQjNELENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixZQUFZLElBQUksU0FBUyxDQUV4QztBQUVELGVBQU8sTUFBTSxvQkFBb0IsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLENBS2xFLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsa0JBQWtCLENBQUMsYUFBYSxHQUFHLFNBQVMsQ0FXOUUsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLGFBQWEsR0FBRyxTQUFTLENBUTVEIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssa0JBQWtCLEVBTXhCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLEtBQUssV0FBVyxFQUF1QixNQUFNLHNCQUFzQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx3QkFBd0IsQ0FBQztBQUVsRixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDbkQsY0FBYyxtQkFBbUIsQ0FBQztBQUVsQzs7R0FFRztBQUNILE1BQU0sV0FBVyxrQkFBa0I7SUFDakMsOENBQThDO0lBQzlDLGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUN6QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLHVCQUF1QjtJQUN0Qyx5RkFBeUY7SUFDekYsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDO0lBQ3pCLDZFQUE2RTtJQUM3RSxZQUFZLENBQUMsRUFBRSxVQUFVLEdBQUcsY0FBYyxHQUFHLFFBQVEsR0FBRyxXQUFXLENBQUM7SUFDcEU7Ozs7T0FJRztJQUNILFFBQVEsRUFBRSxPQUFPLENBQUM7Q0FDbkI7QUFFRCxNQUFNLE1BQU0sU0FBUyxHQUFHLGtCQUFrQixHQUFHLGVBQWUsR0FBRyxXQUFXLEdBQUcsdUJBQXVCLENBQUM7QUFFckcsTUFBTSxNQUFNLGFBQWEsR0FBRztJQUMxQiwyQ0FBMkM7SUFDM0MsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2xCLENBQUM7QUFFRixlQUFPLE1BQU0saUJBQWlCLEVBQUUsa0JBQWtCLENBQUMsU0FBUyxDQStCM0QsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLFlBQVksSUFBSSxTQUFTLENBRXhDO0FBRUQsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGtCQUFrQixDQUFDLGFBQWEsQ0FLbEUsQ0FBQztBQUVGLGVBQU8sTUFBTSxvQkFBb0IsRUFBRSxrQkFBa0IsQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQVc5RSxDQUFDO0FBRUY7O0dBRUc7QUFDSCx3QkFBZ0IsZ0JBQWdCLElBQUksYUFBYSxHQUFHLFNBQVMsQ0FRNUQifQ==

package/dest/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,yFAAyF;IACzF,gBAAgB,EAAE,MAAM,CAAC;IACzB,6EAA6E;IAC7E,YAAY,CAAC,EAAE,UAAU,GAAG,cAAc,GAAG,QAAQ,GAAG,WAAW,CAAC;IACpE;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,WAAW,GAAG,uBAAuB,CAAC;AAErG,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,SAAS,CA+B3D,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAExC;AAED,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAKlE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,GAAG,SAAS,CAW9E,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAQ5D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,cAAc,mBAAmB,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,8CAA8C;IAC9C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,yFAAyF;IACzF,gBAAgB,EAAE,MAAM,CAAC;IACzB,6EAA6E;IAC7E,YAAY,CAAC,EAAE,UAAU,GAAG,cAAc,GAAG,QAAQ,GAAG,WAAW,CAAC;IACpE;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,WAAW,GAAG,uBAAuB,CAAC;AAErG,MAAM,MAAM,aAAa,GAAG;IAC1B,2CAA2C;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,SAAS,CA+B3D,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAExC;AAED,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,CAKlE,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,kBAAkB,CAAC,aAAa,GAAG,SAAS,CAW9E,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAQ5D"}

package/dest/config/index.js

@@ -2,6 +2,7 @@ import { booleanConfigHelper, enumConfigHelper, getConfigFromMappings, numberCon
 import { chainConfigMappings } from '@aztec/stdlib/config';
 import { dataConfigMappings } from '@aztec/stdlib/kv-store';
 export { getPackageInfo } from './package_info.js';
+export * from '../hooks/index.js';
 export const pxeConfigMappings = {
     ...dataConfigMappings,
     ...chainConfigMappings,

package/dest/config/package_info.js

@@ -1,6 +1,6 @@
 export function getPackageInfo() {
     return {
-        version: '6.0.0',
+        version: '5.0.0',
         name: '@aztec/pxe'
     };
 }