@aztec/pxe 0.0.1-commit.3100065 → 0.0.1-commit.330febf

package/dest/bin/check_oracle_version.js

@@ -1,63 +1,22 @@
 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 { getOracleRegistrySignature, readNumericGlobal } from './oracle_version_helpers.js';
+import { ORACLE_REGISTRY } from '../contract_function_simulator/index.js';
+import { ORACLE_INTERFACE_HASH } from '../oracle_version.js';
+import { getOracleRegistrySignature } 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_REGISTRY` declaration (where each oracle's parameter names, parameter types, and return type
+ * a hash of `ORACLE_REGISTRY` (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() {
-    // 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));
-    const packageRoot = dirname(dirname(currentDir)); // Go up from bin/ to pxe/
-    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);
+    const oracleInterfaceHash = keccak256String(getOracleRegistrySignature(ORACLE_REGISTRY));
     if (oracleInterfaceHash !== ORACLE_INTERFACE_HASH) {
         throw new Error(`The Oracle interface has changed. Update ORACLE_INTERFACE_HASH to ${oracleInterfaceHash} in pxe/src/oracle_version.ts and bump the oracle version (ORACLE_VERSION_MAJOR for breaking changes, ORACLE_VERSION_MINOR for oracle additions).`);
     }
 }
-/**
- * Verifies that `ORACLE_VERSION_MAJOR` is identical across all of its hand-maintained copies.
- *
- * The major version is duplicated across the PXE TypeScript constant and two Noir constants (Aztec.nr and the protocol
- * contracts' `aztec_sublib`) because those layers can't import each other. This static check fails fast at build time,
- * naming each file and its value.
- *
- * Only the major version is checked: the minor version legitimately diverges under the "environment minor >= contract
- * minor" tolerance, so asserting minor equality would false-positive.
- */ function assertContractOracleVersionMajorInSync() {
-    const currentDir = dirname(fileURLToPath(import.meta.url));
-    // Go up from dest/bin/ or src/bin/ to the package root (pxe/), then up two more to the git root.
-    const packageRoot = dirname(dirname(currentDir));
-    const gitRoot = join(packageRoot, '..', '..');
-    const copies = [
-        {
-            label: 'pxe/src/oracle_version.ts',
-            value: ORACLE_VERSION_MAJOR
-        },
-        {
-            label: 'aztec-nr/aztec/src/oracle/version.nr',
-            value: readNumericGlobal(join(gitRoot, 'noir-projects/aztec-nr/aztec/src/oracle/version.nr'), 'ORACLE_VERSION_MAJOR')
-        },
-        {
-            label: 'aztec_sublib/src/oracle/version.nr',
-            value: readNumericGlobal(join(gitRoot, 'noir-projects/noir-contracts/contracts/protocol/aztec_sublib/src/oracle/version.nr'), 'ORACLE_VERSION_MAJOR')
-        }
-    ];
-    if (new Set(copies.map((copy)=>copy.value)).size > 1) {
-        const details = copies.map((copy)=>`${copy.label}=${copy.value}`).join(', ');
-        throw new Error(`ORACLE_VERSION_MAJOR is out of sync: ${details}. Bump all copies together.`);
-    }
-}
 assertOracleInterfaceMatches();
-assertContractOracleVersionMajorInSync();

package/dest/bin/index.d.ts

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

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

package/dest/bin/index.js

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

package/dest/bin/oracle_version_helpers.d.ts

@@ -1,24 +1,10 @@
+import type { OracleRegistryEntry } from '../contract_function_simulator/index.js';
 /**
- * Extracts method signatures from TypeScript classes or interfaces and returns a deterministic string representation.
+ * Extracts a deterministic signature string from an oracle registry (e.g. PXE's `ORACLE_REGISTRY`).
  *
- * This is used to detect when an oracle interface changes so that the oracle version can be bumped. It works with both
- * class declarations (e.g. PXE's `Oracle` class) and interface declarations (e.g. TXE's `IAvmExecutionOracle`).
- *
- * @param sourcePath - Absolute path to the TypeScript source file to parse.
- * @param targets - Names of classes or interfaces to extract methods from.
- * @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.
+ * Reads the registry where each oracle's wire ABI lives: the ordered parameter names with their `TypeMapping` labels
+ * and the return type. The resulting hash is sensitive to parameter, type, and return changes, not just oracle
+ * additions and removals.
  *
  * @example
  * // Given a registry like:
@@ -28,24 +14,7 @@ export declare function getOracleInterfaceSignature(sourcePath: string, targets:
  * //   } 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.
- *
- * Matches both the Noir form (`pub global NAME: Field = N;`) and the TypeScript form (`export const NAME = N;`). This
- * lets us compare a version constant that is hand-duplicated across the TS and Noir layers (which can't import each
- * other) without depending on either compiler. Only the assignment form `NAME = N` matches, so later usages of the
- * constant are ignored regardless of their order in the file.
- *
- * @param sourcePath - Absolute path to the source file to read.
- * @param name - Name of the global constant whose integer value should be extracted.
- * @returns The integer value assigned to the constant.
- * @throws If the constant's declaration is not found in the file.
+ * //   "aztec_prv_bar(): void\naztec_utl_foo(a: u32): bool"
  */
-export declare function readNumericGlobal(sourcePath: string, name: string): number;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb25faGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9vcmFjbGVfdmVyc2lvbl9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQiwyQkFBMkIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQThDcEg7QUFFRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F1Qkc7QUFDSCx3QkFBZ0IsMEJBQTBCLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxHQUFHLE1BQU0sQ0EwQjNGO0FBRUQ7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQWdCLGlCQUFpQixDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBTzFFIn0=
+export declare function getOracleRegistrySignature(registry: Record<string, OracleRegistryEntry>): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JhY2xlX3ZlcnNpb25faGVscGVycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Jpbi9vcmFjbGVfdmVyc2lvbl9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFbkY7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCx3QkFBZ0IsMEJBQTBCLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxNQUFNLEVBQUUsbUJBQW1CLENBQUMsR0FBRyxNQUFNLENBVWhHIn0=

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;;;;;;;;;;;;;;;;;;;;;;;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"}
+{"version":3,"file":"oracle_version_helpers.d.ts","sourceRoot":"","sources":["../../src/bin/oracle_version_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAEnF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAUhG"}

package/dest/bin/oracle_version_helpers.js

@@ -1,55 +1,9 @@
-/* eslint-disable import-x/no-named-as-default-member */ import { readFileSync } from 'fs';
-import ts from 'typescript';
 /**
- * Extracts method signatures from TypeScript classes or interfaces and returns a deterministic string representation.
+ * Extracts a deterministic signature string from an oracle registry (e.g. PXE's `ORACLE_REGISTRY`).
  *
- * This is used to detect when an oracle interface changes so that the oracle version can be bumped. It works with both
- * class declarations (e.g. PXE's `Oracle` class) and interface declarations (e.g. TXE's `IAvmExecutionOracle`).
- *
- * @param sourcePath - Absolute path to the TypeScript source file to parse.
- * @param targets - Names of classes or interfaces to extract methods from.
- * @param excludedMembers - Method names to skip (e.g. non-oracle helpers like `constructor`).
- */ export function getOracleInterfaceSignature(sourcePath, targets, excludedMembers) {
-    const sourceCode = readFileSync(sourcePath, 'utf-8');
-    const sourceFile = ts.createSourceFile(sourcePath, sourceCode, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
-    const methodSignatures = [];
-    function visit(node) {
-        const isTarget = (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && targets.includes(node.name?.text ?? '');
-        if (isTarget) {
-            node.members.forEach((member)=>{
-                if ((ts.isMethodDeclaration(member) || ts.isMethodSignature(member)) && member.name && ts.isIdentifier(member.name)) {
-                    const methodName = member.name.text;
-                    if (excludedMembers.includes(methodName)) {
-                        return;
-                    }
-                    const paramSignatures = [];
-                    member.parameters.forEach((param)=>{
-                        const paramName = extractParameterName(param, sourceFile);
-                        const paramType = extractTypeString(param.type, sourceFile);
-                        paramSignatures.push(`${paramName}: ${paramType}`);
-                    });
-                    const returnType = extractTypeString(member.type, sourceFile);
-                    const signature = `${methodName}(${paramSignatures.join(', ')}): ${returnType}`;
-                    methodSignatures.push(signature);
-                }
-            });
-        }
-        ts.forEachChild(node, visit);
-    }
-    visit(sourceFile);
-    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.
+ * Reads the registry where each oracle's wire ABI lives: the ordered parameter names with their `TypeMapping` labels
+ * and the return type. The resulting hash is sensitive to parameter, type, and return changes, not just oracle
+ * additions and removals.
  *
  * @example
  * // Given a registry like:
@@ -59,196 +13,13 @@ import ts from 'typescript';
  * //   } 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}`;
+ * //   "aztec_prv_bar(): void\naztec_utl_foo(a: u32): bool"
+ */ export function getOracleRegistrySignature(registry) {
+    const oracleSignatures = Object.entries(registry).map(([name, entry])=>{
+        const paramSignatures = entry.params.map((p)=>`${p.name}: ${p.type.label}`);
+        const returnType = entry.returnType === undefined ? 'void' : entry.returnType.label;
+        return `${name}(${paramSignatures.join(', ')}): ${returnType}`;
     });
     oracleSignatures.sort();
     return oracleSignatures.join('\n');
 }
-/**
- * Reads an integer-valued global constant from a Noir or TypeScript source file.
- *
- * Matches both the Noir form (`pub global NAME: Field = N;`) and the TypeScript form (`export const NAME = N;`). This
- * lets us compare a version constant that is hand-duplicated across the TS and Noir layers (which can't import each
- * other) without depending on either compiler. Only the assignment form `NAME = N` matches, so later usages of the
- * constant are ignored regardless of their order in the file.
- *
- * @param sourcePath - Absolute path to the source file to read.
- * @param name - Name of the global constant whose integer value should be extracted.
- * @returns The integer value assigned to the constant.
- * @throws If the constant's declaration is not found in the file.
- */ export function readNumericGlobal(sourcePath, name) {
-    const sourceCode = readFileSync(sourcePath, 'utf-8');
-    const match = sourceCode.match(new RegExp(`\\b${name}\\s*(?::\\s*\\w+\\s*)?=\\s*(\\d+)`));
-    if (!match) {
-        throw new Error(`Could not find numeric global '${name}' in ${sourcePath}.`);
-    }
-    return Number(match[1]);
-}
-function extractParameterName(param, sourceFile) {
-    const name = param.name;
-    if (ts.isIdentifier(name)) {
-        return name.text;
-    }
-    if (ts.isArrayBindingPattern(name)) {
-        if (name.elements.length > 0) {
-            const element = name.elements[0];
-            if (ts.isBindingElement(element)) {
-                const elementName = element.name;
-                if (ts.isIdentifier(elementName)) {
-                    return elementName.text;
-                }
-                if (ts.isArrayBindingPattern(elementName) || ts.isObjectBindingPattern(elementName)) {
-                    return elementName.getText(sourceFile);
-                }
-            }
-        }
-        return name.getText(sourceFile);
-    }
-    if (ts.isObjectBindingPattern(name)) {
-        return name.getText(sourceFile);
-    }
-    return name.getText(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_synchronizer.d.ts

@@ -2,10 +2,9 @@ import { type LoggerBindings } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 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 { ContractClassService } from '../contract/contract_class_service.js';
 import type { ContractSyncService } from '../contract/contract_sync_service.js';
+import type { CachingAztecNode } from '../node/caching_aztec_node.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';
@@ -24,13 +23,12 @@ export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
     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, factStore: FactStore, l2TipsStore: L2TipsKVStore, contractSyncService: ContractSyncService, contractClassService: ContractClassService, config?: Partial<BlockSynchronizerConfig>, bindings?: LoggerBindings);
+    constructor(node: CachingAztecNode, store: AztecAsyncKVStore, anchorBlockStore: AnchorBlockStore, noteStore: NoteStore, privateEventStore: PrivateEventStore, factStore: FactStore, l2TipsStore: L2TipsKVStore, contractSyncService: ContractSyncService, 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>;
@@ -50,4 +48,4 @@ export declare class BlockSynchronizer implements L2BlockStreamEventHandler {
     stop(): Promise<void>;
     private doSync;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hILE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBR2pFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUNsRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ2hGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1REFBdUQsQ0FBQztBQUcvRjs7OztHQUlHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcseUJBQXlCO0lBTy9ELE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUs7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7SUFDakMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBQ2xDLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFDNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxtQkFBbUI7SUFDcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0I7SUFDckMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBZnpCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBNEI7SUFDN0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQXFCO0lBQ2hELFNBQVMsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQztJQUU5QyxZQUNtQixJQUFJLEVBQUUsU0FBUyxFQUNmLEtBQUssRUFBRSxpQkFBaUIsRUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLGlCQUFpQixFQUNwQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsYUFBYSxFQUMxQixtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsb0JBQW9CLEVBQUUsb0JBQW9CLEVBQzFDLE1BQU0sR0FBRSxPQUFPLENBQUMsdUJBQXVCLENBQU0sRUFDOUQsUUFBUSxDQUFDLEVBQUUsY0FBYyxFQUsxQjtJQUVELFNBQVMsQ0FBQyxpQkFBaUIsSUFBSSxhQUFhLENBWTNDO0lBRUQsNkdBQTZHO0lBQ3RHLHNCQUFzQixDQUFDLEtBQUssRUFBRSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRXRFO1lBRWEsd0JBQXdCO1lBOEd4Qix1QkFBdUI7SUFlckM7Ozs7Ozs7O09BUUc7SUFDVSxJQUFJLGtCQWlCaEI7SUFFRCxvR0FBb0c7SUFDdkYsSUFBSSxrQkFJaEI7WUFFYSxNQUFNO0NBY3JCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfc3luY2hyb25pemVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfc3luY2hyb25pemVyL2Jsb2NrX3N5bmNocm9uaXplci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWUsS0FBSyxjQUFjLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFFdkYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsYUFBYSxFQUFFLEtBQUssa0JBQWtCLEVBQUUsS0FBSyx5QkFBeUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBR3hILE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNoRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1REFBdUQsQ0FBQztBQUcvRjs7OztHQUlHO0FBQ0gscUJBQWEsaUJBQWtCLFlBQVcseUJBQXlCO0lBTy9ELE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSTtJQUNyQixPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUs7SUFDdEIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0I7SUFDakMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsaUJBQWlCO0lBQ2xDLE9BQU8sQ0FBQyxRQUFRLENBQUMsU0FBUztJQUMxQixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVc7SUFDNUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxtQkFBbUI7SUFDcEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNO0lBZHpCLE9BQU8sQ0FBQyxHQUFHLENBQVM7SUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBNEI7SUFDN0MsT0FBTyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQXFCO0lBQ2hELFNBQVMsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQztJQUU5QyxZQUNtQixJQUFJLEVBQUUsZ0JBQWdCLEVBQ3RCLEtBQUssRUFBRSxpQkFBaUIsRUFDeEIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGlCQUFpQixFQUFFLGlCQUFpQixFQUNwQyxTQUFTLEVBQUUsU0FBUyxFQUNwQixXQUFXLEVBQUUsYUFBYSxFQUMxQixtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsTUFBTSxHQUFFLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBTSxFQUM5RCxRQUFRLENBQUMsRUFBRSxjQUFjLEVBSzFCO0lBRUQsU0FBUyxDQUFDLGlCQUFpQixJQUFJLGFBQWEsQ0FZM0M7SUFFRCw2R0FBNkc7SUFDdEcsc0JBQXNCLENBQUMsS0FBSyxFQUFFLGtCQUFrQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFdEU7WUFFYSx3QkFBd0I7WUFnR3hCLHVCQUF1QjtJQWNyQzs7Ozs7Ozs7T0FRRztJQUNVLElBQUksa0JBaUJoQjtJQUVELG9HQUFvRztJQUN2RixJQUFJLGtCQUloQjtZQUVhLE1BQU07Q0FjckIifQ==

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,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"}
+{"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;AAGxH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,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,MAAM;IAdzB,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,gBAAgB,EACtB,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,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;YAgGxB,uBAAuB;IAcrC;;;;;;;;OAQG;IACU,IAAI,kBAiBhB;IAED,oGAAoG;IACvF,IAAI,kBAIhB;YAEa,MAAM;CAcrB"}

package/dest/block_synchronizer/block_synchronizer.js

@@ -16,13 +16,12 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
     factStore;
     l2TipsStore;
     contractSyncService;
-    contractClassService;
     config;
     log;
     isSyncing;
     eventQueue;
     blockStream;
-    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, factStore, l2TipsStore, contractSyncService, contractClassService, config = {}, bindings){
+    constructor(node, store, anchorBlockStore, noteStore, privateEventStore, factStore, l2TipsStore, contractSyncService, config = {}, bindings){
         this.node = node;
         this.store = store;
         this.anchorBlockStore = anchorBlockStore;
@@ -31,7 +30,6 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
         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);
@@ -53,17 +51,7 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
             case 'chain-proposed':
                 {
                     if (this.config.syncChainTip === undefined || this.config.syncChainTip === 'proposed') {
-                        // 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);
+                        await this.updateAnchorBlockHeader(event.header);
                     }
                     break;
                 }
@@ -156,10 +144,9 @@ import { blockStreamSourceFromAztecNode } from './block_stream_source.js';
         // 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();
+        // Cached node reads stay correct indefinitely, so this wipe is only about bounding memory growth. An anchor
+        // update is the recurring trigger PXE already has.
+        this.node.wipeCache();
         this.log.verbose(`Updated pxe last block to ${blockHeader.getBlockNumber()}`, blockHeader.toInspect());
         await this.anchorBlockStore.setHeader(blockHeader);
     }

package/dest/config/package_info.js

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

package/dest/contract/contract_class_service.d.ts

@@ -11,7 +11,6 @@ import type { ContractStore } from '../storage/contract_store/contract_store.js'
  * falling back to a local instance if no upgrades were scheduled.
  */
 export declare class ContractClassService {
-    #private;
     private node;
     private contractStore;
     constructor(node: AztecNode, contractStore: ContractStore);
@@ -21,11 +20,5 @@ export declare class ContractClassService {
      * failures (e.g. the node being unreachable) still throw.
      */
     getCurrentClassId(address: AztecAddress, anchorBlockHeader: BlockHeader): Promise<Fr | undefined>;
-    /**
-     * Clears the cache.
-     *
-     * This is not required for correctness, only to limit how much memory the cache uses. The cache is resilient against
-     * reorgs etc. as it is based on block hashes, not block numbers. */
-    wipe(): void;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc2VydmljZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbnRyYWN0X2NsYXNzX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFFakY7Ozs7OztHQU1HO0FBQ0gscUJBQWEsb0JBQW9COztJQVU3QixPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxhQUFhO0lBRnZCLFlBQ1UsSUFBSSxFQUFFLFNBQVMsRUFDZixhQUFhLEVBQUUsYUFBYSxFQUNsQztJQUVKOzs7O09BSUc7SUFDRyxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLGlCQUFpQixFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQXNDdEc7SUFFRDs7Ozt3RUFJb0U7SUFDcEUsSUFBSSxJQUFJLElBQUksQ0FFWDtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc2VydmljZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbnRyYWN0X2NsYXNzX3NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFFakY7Ozs7OztHQU1HO0FBQ0gscUJBQWEsb0JBQW9CO0lBRTdCLE9BQU8sQ0FBQyxJQUFJO0lBQ1osT0FBTyxDQUFDLGFBQWE7SUFGdkIsWUFDVSxJQUFJLEVBQUUsU0FBUyxFQUNmLGFBQWEsRUFBRSxhQUFhLEVBQ2xDO0lBRUo7Ozs7T0FJRztJQUNHLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsaUJBQWlCLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBaUJ0RztDQUNGIn0=

package/dest/contract/contract_class_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class_service.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAEjF;;;;;;GAMG;AACH,qBAAa,oBAAoB;;IAU7B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IAFvB,YACU,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,aAAa,EAClC;IAEJ;;;;OAIG;IACG,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAsCtG;IAED;;;;wEAIoE;IACpE,IAAI,IAAI,IAAI,CAEX;CACF"}
+{"version":3,"file":"contract_class_service.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAEjF;;;;;;GAMG;AACH,qBAAa,oBAAoB;IAE7B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,aAAa;IAFvB,YACU,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,aAAa,EAClC;IAEJ;;;;OAIG;IACG,iBAAiB,CAAC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAiBtG;CACF"}

package/dest/contract/contract_class_service.js

@@ -8,16 +8,9 @@ import { isProtocolContract } from '@aztec/protocol-contracts';
  */ export class ContractClassService {
     node;
     contractStore;
-    /**
-   * Class ids are cached per `(address, anchorHash)`. This avoid unnecessary network roundtrips in scenarios where
-   * multiple executions are done on the same anchor block (e.g. simulation followed by witgen), or when the same
-   * contract is invoked multiple times in an execution (e.g. authwit checks).
-   * It also means the callers don't need to worry about caching this service's return values, simplifying callsites.
-   */ #cache;
     constructor(node, contractStore){
         this.node = node;
         this.contractStore = contractStore;
-        this.#cache = new Map();
     }
     /**
    * Returns the class id that corresponds to `address` as of `anchorBlockHeader`, or `undefined` if no instance is
@@ -30,39 +23,14 @@ import { isProtocolContract } from '@aztec/protocol-contracts';
             const instance = await this.contractStore.getContractInstance(address);
             return instance?.originalContractClassId;
         }
-        const key = `${address.toString()}:${(await anchorBlockHeader.hash()).toString()}`;
-        let promise = this.#cache.get(key);
-        if (!promise) {
-            promise = (async ()=>{
-                // The node resolves the current class from the same scheduled value change the AVM enforces against the public
-                // data tree. If the contract was upgraded the node returns a non-undefined instance; an undefined result means
-                // no upgrade happened (or the node has no record of it, e.g. it was never publicly deployed), so the original
-                // class is current.
-                const nodeInstance = await this.node.getContract(address, await anchorBlockHeader.hash());
-                if (nodeInstance) {
-                    return nodeInstance.currentContractClassId;
-                } else {
-                    return (await this.contractStore.getContractInstance(address))?.originalContractClassId;
-                }
-            })().catch((err)=>{
-                this.#cache.delete(key);
-                throw err;
-            });
-            this.#cache.set(key, promise);
-        }
-        const classId = await promise;
-        if (classId === undefined) {
-            // Don't memoize a missing instance: it may be registered later in this PXE (e.g. via contract sync
-            // mid-execution), and a cached miss would then hide it. Only successful resolutions stay cached.
-            this.#cache.delete(key);
+        // The node resolves the current class from the same scheduled value change the AVM enforces against the public
+        // data tree. If the contract was upgraded the node returns a non-undefined instance; an undefined result means no
+        // upgrade happened (or the node has no record of it, e.g. it was never publicly deployed), so the original class
+        // is current.
+        const nodeInstance = await this.node.getContract(address, await anchorBlockHeader.hash());
+        if (nodeInstance) {
+            return nodeInstance.currentContractClassId;
         }
-        return classId;
-    }
-    /**
-   * Clears the cache.
-   *
-   * This is not required for correctness, only to limit how much memory the cache uses. The cache is resilient against
-   * reorgs etc. as it is based on block hashes, not block numbers. */ wipe() {
-        this.#cache.clear();
+        return (await this.contractStore.getContractInstance(address))?.originalContractClassId;
     }
 }