@aztec/stdlib 0.77.0-testnet-ignition.30 → 0.77.0

package/dest/contract/interfaces/contract_instance_update.js

@@ -3,7 +3,7 @@ import { schemas } from '../../schemas/index.js';
 export const ContractInstanceUpdateSchema = z.object({
     prevContractClassId: schemas.Fr,
     newContractClassId: schemas.Fr,
-    blockOfChange: z.number()
+    blockOfChange: z.number().int().nonnegative()
 });
 export const ContractInstanceUpdateWithAddressSchema = ContractInstanceUpdateSchema.and(z.object({
     address: schemas.AztecAddress

package/dest/contract/interfaces/node-info.js

@@ -3,8 +3,8 @@ import { z } from 'zod';
 import { ProtocolContractAddressesSchema } from './protocol_contract_addresses.js';
 export const NodeInfoSchema = z.object({
     nodeVersion: z.string(),
-    l1ChainId: z.number(),
-    protocolVersion: z.number(),
+    l1ChainId: z.number().int().nonnegative(),
+    protocolVersion: z.number().int().nonnegative(),
     enr: z.string().optional(),
     l1ContractAddresses: L1ContractAddressesSchema,
     protocolContractAddresses: ProtocolContractAddressesSchema

package/dest/database-version/index.d.ts

@@ -0,0 +1,2 @@
+export * from './version_manager.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/database-version/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/database-version/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}

package/dest/database-version/index.js

@@ -0,0 +1 @@
+export * from './version_manager.js';

package/dest/database-version/version_manager.d.ts

@@ -0,0 +1,99 @@
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import { EthAddress } from '@aztec/foundation/eth-address';
+import fs from 'fs/promises';
+import { z } from 'zod';
+/**
+ * Represents a version record for storing in a version file.
+ */
+export declare class DatabaseVersion {
+    readonly schemaVersion: number;
+    readonly rollupAddress: EthAddress;
+    constructor(schemaVersion: number, rollupAddress: EthAddress);
+    toBuffer(): Buffer;
+    static fromBuffer(buf: Buffer): DatabaseVersion;
+    /**
+     * Compares two versions. If the rollups addresses are different then it returns undefined
+     */
+    cmp(other: DatabaseVersion): undefined | -1 | 0 | 1;
+    /**
+     * Checks if two versions exactly match
+     */
+    equals(other: DatabaseVersion): boolean;
+    /**
+     * Returns the schema for this class
+     */
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        schemaVersion: z.ZodNumber;
+        rollupAddress: z.ZodType<EthAddress, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        rollupAddress: EthAddress;
+        schemaVersion: number;
+    }, {
+        rollupAddress: string;
+        schemaVersion: number;
+    }>, DatabaseVersion, {
+        rollupAddress: string;
+        schemaVersion: number;
+    }>;
+    /**
+     * Returns an empty instance
+     */
+    static empty(): DatabaseVersion;
+}
+export type DatabaseVersionManagerFs = Pick<typeof fs, 'readFile' | 'writeFile' | 'rm' | 'mkdir'>;
+/**
+ * A manager for handling database versioning and migrations.
+ * This class will check the version of data in a directory and either
+ * reset or upgrade based on version compatibility.
+ */
+export declare class DatabaseVersionManager<T> {
+    private dataDirectory;
+    private onOpen;
+    private onUpgrade?;
+    private fileSystem;
+    private log;
+    static readonly VERSION_FILE = "db_version";
+    private readonly versionFile;
+    private readonly currentVersion;
+    /**
+     * Create a new version manager
+     *
+     * @param schemaVersion - The current version of the application
+     * @param rollupAddress - The rollup contract address
+     * @param dataDirectory - The directory where version information will be stored
+     * @param onOpen - A callback to the open the database at the given location
+     * @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the database
+     * @param fileSystem - An interface to access the filesystem
+     * @param log - Optional custom logger
+     * @param options - Configuration options
+     */
+    constructor(schemaVersion: number, rollupAddress: EthAddress, dataDirectory: string, onOpen: (dataDir: string) => Promise<T>, onUpgrade?: ((dataDir: string, currentVersion: number, latestVersion: number) => Promise<void>) | undefined, fileSystem?: DatabaseVersionManagerFs, log?: import("@aztec/foundation/log").Logger);
+    /**
+     * Checks the stored version against the current version and handles the outcome
+     * by either resetting the data directory or calling an upgrade function
+     *
+     * @param onReset - Function to call when a full reset is needed
+     * @param onUpgrade - Function to call when an upgrade is needed
+     * @returns True if data was reset, false if upgraded or no change needed
+     */
+    open(): Promise<[T, boolean]>;
+    /**
+     * Writes the current version to the version file
+     */
+    private writeVersion;
+    /**
+     * Resets the data directory by deleting it and recreating it
+     */
+    private resetDataDirectory;
+    /**
+     * Get the data directory path
+     */
+    getDataDirectory(): string;
+    /**
+     * Get the current version number
+     */
+    getSchemaVersion(): number;
+}
+//# sourceMappingURL=version_manager.d.ts.map

package/dest/database-version/version_manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version_manager.d.ts","sourceRoot":"","sources":["../../src/database-version/version_manager.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAI3D,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,qBAAa,eAAe;aACE,aAAa,EAAE,MAAM;aAAkB,aAAa,EAAE,UAAU;gBAAhE,aAAa,EAAE,MAAM,EAAkB,aAAa,EAAE,UAAU;IAErF,QAAQ,IAAI,MAAM;WAIX,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe;IAQtD;;OAEG;IACI,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAa1D;;OAEG;IACI,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAI9C;;OAEG;IACH,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED;;OAEG;IACH,MAAM,CAAC,KAAK;CAGb;AAED,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,GAAG,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;AAElG;;;;GAIG;AACH,qBAAa,sBAAsB,CAAC,CAAC;IAqBjC,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS,CAAC;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IAxBb,gBAAuB,YAAY,gBAAgB;IAEnD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD;;;;;;;;;;;OAWG;gBAED,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EACvC,SAAS,CAAC,aAAY,MAAM,kBAAkB,MAAM,iBAAiB,MAAM,KAAK,QAAQ,IAAI,CAAC,aAAA,EAC7F,UAAU,GAAE,wBAA6B,EACzC,GAAG,yCAA6C;IAU1D;;;;;;;OAOG;IACU,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAmD1C;;OAEG;YACW,YAAY;IAO1B;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACI,gBAAgB,IAAI,MAAM;IAIjC;;OAEG;IACI,gBAAgB,IAAI,MAAM;CAGlC"}

package/dest/database-version/version_manager.js

@@ -0,0 +1,188 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { jsonParseWithSchemaSync, jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import fs from 'fs/promises';
+import { join } from 'path';
+import { z } from 'zod';
+/**
+ * Represents a version record for storing in a version file.
+ */ export class DatabaseVersion {
+    schemaVersion;
+    rollupAddress;
+    constructor(schemaVersion, rollupAddress){
+        this.schemaVersion = schemaVersion;
+        this.rollupAddress = rollupAddress;
+    }
+    toBuffer() {
+        return Buffer.from(jsonStringify(this));
+    }
+    static fromBuffer(buf) {
+        try {
+            return jsonParseWithSchemaSync(buf.toString('utf-8'), DatabaseVersion.schema);
+        } catch (err) {
+            throw new Error(`Failed to deserialize version information: ${err}`, {
+                cause: err
+            });
+        }
+    }
+    /**
+   * Compares two versions. If the rollups addresses are different then it returns undefined
+   */ cmp(other) {
+        if (this.rollupAddress.equals(other.rollupAddress)) {
+            if (this.schemaVersion < other.schemaVersion) {
+                return -1;
+            } else if (this.schemaVersion > other.schemaVersion) {
+                return 1;
+            } else {
+                return 0;
+            }
+        }
+        return undefined;
+    }
+    /**
+   * Checks if two versions exactly match
+   */ equals(other) {
+        return this.cmp(other) === 0;
+    }
+    /**
+   * Returns the schema for this class
+   */ static get schema() {
+        return z.object({
+            schemaVersion: z.number(),
+            rollupAddress: EthAddress.schema
+        }).transform(({ schemaVersion, rollupAddress })=>new DatabaseVersion(schemaVersion, rollupAddress));
+    }
+    /**
+   * Returns an empty instance
+   */ static empty() {
+        return new DatabaseVersion(0, EthAddress.ZERO);
+    }
+}
+/**
+ * A manager for handling database versioning and migrations.
+ * This class will check the version of data in a directory and either
+ * reset or upgrade based on version compatibility.
+ */ export class DatabaseVersionManager {
+    dataDirectory;
+    onOpen;
+    onUpgrade;
+    fileSystem;
+    log;
+    static VERSION_FILE = 'db_version';
+    versionFile;
+    currentVersion;
+    /**
+   * Create a new version manager
+   *
+   * @param schemaVersion - The current version of the application
+   * @param rollupAddress - The rollup contract address
+   * @param dataDirectory - The directory where version information will be stored
+   * @param onOpen - A callback to the open the database at the given location
+   * @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the database
+   * @param fileSystem - An interface to access the filesystem
+   * @param log - Optional custom logger
+   * @param options - Configuration options
+   */ constructor(schemaVersion, rollupAddress, dataDirectory, onOpen, onUpgrade, fileSystem = fs, log = createLogger(`foundation:version-manager`)){
+        this.dataDirectory = dataDirectory;
+        this.onOpen = onOpen;
+        this.onUpgrade = onUpgrade;
+        this.fileSystem = fileSystem;
+        this.log = log;
+        if (schemaVersion < 1) {
+            throw new TypeError(`Invalid schema version received: ${schemaVersion}`);
+        }
+        this.versionFile = join(this.dataDirectory, DatabaseVersionManager.VERSION_FILE);
+        this.currentVersion = new DatabaseVersion(schemaVersion, rollupAddress);
+    }
+    /**
+   * Checks the stored version against the current version and handles the outcome
+   * by either resetting the data directory or calling an upgrade function
+   *
+   * @param onReset - Function to call when a full reset is needed
+   * @param onUpgrade - Function to call when an upgrade is needed
+   * @returns True if data was reset, false if upgraded or no change needed
+   */ async open() {
+        // const storedVersion = await DatabaseVersion.readVersion(this.versionFile);
+        let storedVersion;
+        try {
+            const versionBuf = await this.fileSystem.readFile(this.versionFile);
+            storedVersion = DatabaseVersion.fromBuffer(versionBuf);
+        } catch (err) {
+            if (err && err.code === 'ENOENT') {
+                storedVersion = DatabaseVersion.empty();
+            } else {
+                this.log.warn(`Failed to read stored version information: ${err}. Defaulting to empty version`);
+                storedVersion = DatabaseVersion.empty();
+            }
+        }
+        const cmp = storedVersion.cmp(this.currentVersion);
+        let needsReset = false;
+        if (typeof cmp === 'number') {
+            // only allow forward upgrades
+            if (cmp === -1 && this.onUpgrade) {
+                this.log.info(`Upgrading from version ${storedVersion.schemaVersion} to ${this.currentVersion.schemaVersion}`);
+                try {
+                    await this.onUpgrade(this.dataDirectory, storedVersion.schemaVersion, this.currentVersion.schemaVersion);
+                } catch (error) {
+                    this.log.error(`Failed to upgrade: ${error}. Falling back to reset.`);
+                    needsReset = true;
+                }
+            } else if (cmp !== 0) {
+                this.log.info(`Can't upgrade from version ${storedVersion.schemaVersion} to ${this.currentVersion}. Resetting database at ${this.dataDirectory}`);
+                needsReset = true;
+            }
+        } else {
+            this.log.warn('Rollup address changed, resetting data directory');
+            needsReset = true;
+        }
+        // Handle reset if needed
+        if (needsReset) {
+            await this.resetDataDirectory();
+        }
+        // Write the current version to disk
+        await this.writeVersion();
+        return [
+            await this.onOpen(this.dataDirectory),
+            needsReset
+        ];
+    }
+    /**
+   * Writes the current version to the version file
+   */ async writeVersion() {
+        // Ensure the directory exists
+        await this.fileSystem.mkdir(this.dataDirectory, {
+            recursive: true
+        });
+        // Write the version file
+        await this.fileSystem.writeFile(this.versionFile, this.currentVersion.toBuffer());
+    }
+    /**
+   * Resets the data directory by deleting it and recreating it
+   */ async resetDataDirectory() {
+        try {
+            await this.fileSystem.rm(this.dataDirectory, {
+                recursive: true,
+                force: true,
+                maxRetries: 3
+            });
+            await this.fileSystem.mkdir(this.dataDirectory, {
+                recursive: true
+            });
+        } catch (err) {
+            this.log.error(`Failed to reset data directory: ${err}`);
+            throw new Error(`Failed to reset data directory: ${err}`, {
+                cause: err
+            });
+        }
+    }
+    /**
+   * Get the data directory path
+   */ getDataDirectory() {
+        return this.dataDirectory;
+    }
+    /**
+   * Get the current version number
+   */ getSchemaVersion() {
+        return this.currentVersion.schemaVersion;
+    }
+}

package/dest/errors/simulation_error.js

@@ -4,8 +4,8 @@ import { AztecAddress } from '../aztec-address/index.js';
 import { schemas } from '../schemas/index.js';
 const SourceCodeLocationSchema = z.object({
     filePath: z.string(),
-    line: z.number(),
-    column: z.number(),
+    line: z.number().int().nonnegative(),
+    column: z.number().int().nonnegative(),
     fileSource: z.string(),
     locationText: z.string()
 });

package/dest/hash/hash.d.ts

@@ -1,6 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '../aztec-address/index.js';
-import type { ContractClassLog } from '../logs/index.js';
 import type { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 /**
  * Computes a hash of a given verification key.
@@ -73,5 +72,4 @@ export declare function computeL1ToL2MessageNullifier(contract: AztecAddress, me
  * @returns Fr containing 248 bits of information of sha256 hash.
  */
 export declare function siloL2ToL1Message(l2ToL1Message: ScopedL2ToL1Message, version: Fr, chainId: Fr): Fr;
-export declare function siloContractClassLog(log: ContractClassLog, contract: AztecAddress): Promise<ContractClassLog>;
 //# sourceMappingURL=hash.d.ts.map

package/dest/hash/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/hash/hash.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE5E;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAE1F;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE9E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhF;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzG;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAM1D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzD;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,eAMtG;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,mBAAmB,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAiBlG;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAOnH"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../../src/hash/hash.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE5E;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAE1F;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAE9E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhF;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAErF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,CAExD;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzG;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAM1D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAEzD;AAED,wBAAsB,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,eAMtG;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,mBAAmB,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAiBlG"}

package/dest/hash/hash.js

@@ -122,14 +122,3 @@ export async function computeL1ToL2MessageNullifier(contract, messageHash, secre
     ]);
     return Fr.fromBuffer(sha256Trunc(preimage));
 }
-export async function siloContractClassLog(log, contract) {
-    const innerLog = log.clone();
-    if (contract.isZero()) {
-        return innerLog;
-    }
-    innerLog.fields[0] = await poseidon2Hash([
-        contract,
-        innerLog.fields[0]
-    ]);
-    return innerLog;
-}

package/dest/interfaces/world_state.js

@@ -9,9 +9,9 @@ import { z } from 'zod';
     return WorldStateRunningState;
 }({});
 export const WorldStateSyncStatusSchema = z.object({
-    finalisedBlockNumber: z.number(),
-    latestBlockNumber: z.number(),
+    finalisedBlockNumber: z.number().int().nonnegative(),
+    latestBlockNumber: z.number().int().nonnegative(),
     latestBlockHash: z.string(),
-    oldestHistoricBlockNumber: z.number(),
+    oldestHistoricBlockNumber: z.number().int().nonnegative(),
     treesAreSynched: z.boolean()
 });

package/dest/logs/contract_class_log.d.ts

@@ -10,6 +10,7 @@ export declare class ContractClassLog {
     contractAddress: AztecAddress;
     fields: Fr[];
     static SIZE_IN_BYTES: number;
+    unsiloedFirstField?: Fr | undefined;
     constructor(contractAddress: AztecAddress, fields: Fr[]);
     toFields(): Fr[];
     static fromFields(fields: Fr[] | FieldReader): ContractClassLog;
@@ -21,6 +22,9 @@ export declare class ContractClassLog {
     static random(): Promise<ContractClassLog>;
     getEmittedLength(): number;
     getEmittedFields(): Fr[];
+    setUnsiloedFirstField(field: Fr): void;
+    toUnsiloed(): ContractClassLog;
+    silo(): Promise<ContractClassLog>;
     hash(): Promise<Fr>;
     static get schema(): z.ZodEffects<z.ZodObject<{
         contractAddress: import("@aztec/foundation/schemas").ZodFor<AztecAddress>;

package/dest/logs/contract_class_log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/contract_class_log.ts"],"names":[],"mappings":";;;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,gBAAgB;IAKR,eAAe,EAAE,YAAY;IAAS,MAAM,EAAE,EAAE,EAAE;IAJrE,MAAM,CAAC,aAAa,SAAwD;gBAIzD,eAAe,EAAE,YAAY,EAAS,MAAM,EAAE,EAAE,EAAE;IAQrE,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAU5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,KAAK;WAIQ,MAAM;IAWnB,gBAAgB;IAMhB,gBAAgB;IAWV,IAAI;IAIV,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAK3B"}
+{"version":3,"file":"contract_class_log.d.ts","sourceRoot":"","sources":["../../src/logs/contract_class_log.ts"],"names":[],"mappings":";;;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,gBAAgB;IAOR,eAAe,EAAE,YAAY;IAAS,MAAM,EAAE,EAAE,EAAE;IANrE,MAAM,CAAC,aAAa,SAAwD;IAErE,kBAAkB,CAAC,EAAE,EAAE,GAAG,SAAS,CAAC;gBAIxB,eAAe,EAAE,YAAY,EAAS,MAAM,EAAE,EAAE,EAAE;IAQrE,QAAQ,IAAI,EAAE,EAAE;IAIhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAU5C,OAAO;IAIP,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAW/C,KAAK;WAIQ,MAAM;IAWnB,gBAAgB;IAMhB,gBAAgB;IAWhB,qBAAqB,CAAC,KAAK,EAAE,EAAE;IAI/B,UAAU;IAQJ,IAAI;IAUJ,IAAI;IAIV,MAAM,KAAK,MAAM;;;;;;;;;;;;OAOhB;IAED,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAK3B"}

package/dest/logs/contract_class_log.js

@@ -10,6 +10,8 @@ export class ContractClassLog {
     contractAddress;
     fields;
     static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * CONTRACT_CLASS_LOG_SIZE_IN_FIELDS;
+    // Keeps original first field pre-siloing. Only set by silo().
+    unsiloedFirstField;
     // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
     // public fields: Tuple<Fr, typeof CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS>
     constructor(contractAddress, fields){
@@ -84,8 +86,32 @@ export class ContractClassLog {
         }
         return this.fields.slice(0, lastZeroIndex);
     }
+    setUnsiloedFirstField(field) {
+        this.unsiloedFirstField = field;
+    }
+    toUnsiloed() {
+        if (this.unsiloedFirstField) {
+            return new ContractClassLog(this.contractAddress, [
+                this.unsiloedFirstField
+            ].concat(this.fields.slice(1)));
+        } else {
+            return this;
+        }
+    }
+    async silo() {
+        const innerLog = this.clone();
+        if (innerLog.contractAddress.isZero()) {
+            return innerLog;
+        }
+        innerLog.setUnsiloedFirstField(innerLog.fields[0]);
+        innerLog.fields[0] = await poseidon2Hash([
+            innerLog.contractAddress,
+            innerLog.fields[0]
+        ]);
+        return innerLog;
+    }
     async hash() {
-        return await poseidon2Hash(this.getEmittedFields());
+        return await poseidon2Hash(this.fields);
     }
     static get schema() {
         return z.object({

package/dest/messaging/l2_to_l1_message.js

@@ -18,7 +18,7 @@ export class L2ToL1Message {
         return z.object({
             recipient: schemas.EthAddress,
             content: schemas.Fr,
-            counter: z.number()
+            counter: z.number().int().nonnegative()
         }).transform(({ recipient, content, counter })=>new L2ToL1Message(recipient, content, counter));
     }
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}

package/dest/tx/tx.js

@@ -3,7 +3,6 @@ import { arraySerializedSizeOfNonEmpty } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { siloContractClassLog } from '../hash/hash.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
 import { PrivateLog } from '../logs/private_log.js';
@@ -135,9 +134,9 @@ import { TxHash } from './tx_hash.js';
         const contractClassLogs = [];
         for (const log of this.contractClassLogs){
             const hashedLog = await log.hash();
-            const logHash = logHashes.find((hash)=>hash.value.equals(hashedLog));
+            const logHash = logHashes.find((hash)=>hash.value.equals(hashedLog) && hash.contractAddress.equals(log.contractAddress));
             if (logHash) {
-                contractClassLogs.push(silo ? await siloContractClassLog(log, logHash.contractAddress) : log);
+                contractClassLogs.push(silo ? await log.silo() : log);
             }
         }
         return contractClassLogs;

package/dest/tx/tx_receipt.js

@@ -46,7 +46,7 @@ import { TxHash } from './tx_hash.js';
             status: z.nativeEnum(TxStatus),
             error: z.string(),
             blockHash: L2BlockHash.schema.optional(),
-            blockNumber: z.number().optional(),
+            blockNumber: z.number().int().nonnegative().optional(),
             transactionFee: schemas.BigInt.optional(),
             debugInfo: DebugInfoSchema.optional()
         }).transform(TxReceipt.from);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.77.0-testnet-ignition.30",
+  "version": "0.77.0",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -46,7 +46,8 @@
     "./interfaces/server": "./dest/interfaces/server.js",
     "./epoch-helpers": "./dest/epoch-helpers/index.js",
     "./config": "./dest/config/index.js",
-    "./testing/jest": "./dest/tests/jest.js"
+    "./testing/jest": "./dest/tests/jest.js",
+    "./database-version": "./dest/database-version/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -65,11 +66,11 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.77.0-testnet-ignition.30",
-    "@aztec/blob-lib": "0.77.0-testnet-ignition.30",
-    "@aztec/constants": "0.77.0-testnet-ignition.30",
-    "@aztec/ethereum": "0.77.0-testnet-ignition.30",
-    "@aztec/foundation": "0.77.0-testnet-ignition.30",
+    "@aztec/bb.js": "0.77.0",
+    "@aztec/blob-lib": "0.77.0",
+    "@aztec/constants": "0.77.0",
+    "@aztec/ethereum": "0.77.0",
+    "@aztec/foundation": "0.77.0",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",
     "lodash.omit": "^4.5.0",

package/src/contract/interfaces/contract_instance_update.ts

@@ -22,7 +22,7 @@ export type ContractInstanceUpdateWithAddress = ContractInstanceUpdate & { addre
 export const ContractInstanceUpdateSchema = z.object({
   prevContractClassId: schemas.Fr,
   newContractClassId: schemas.Fr,
-  blockOfChange: z.number(),
+  blockOfChange: z.number().int().nonnegative(),
 }) satisfies ZodFor<ContractInstanceUpdate>;
 
 export const ContractInstanceUpdateWithAddressSchema = ContractInstanceUpdateSchema.and(

package/src/contract/interfaces/node-info.ts

@@ -24,8 +24,8 @@ export interface NodeInfo {
 export const NodeInfoSchema: ZodFor<NodeInfo> = z
   .object({
     nodeVersion: z.string(),
-    l1ChainId: z.number(),
-    protocolVersion: z.number(),
+    l1ChainId: z.number().int().nonnegative(),
+    protocolVersion: z.number().int().nonnegative(),
     enr: z.string().optional(),
     l1ContractAddresses: L1ContractAddressesSchema,
     protocolContractAddresses: ProtocolContractAddressesSchema,

package/src/database-version/README.md

@@ -0,0 +1,63 @@
+# Version Manager
+
+The Version Manager helps manage database migrations and version compatibility across different versions of the software.
+
+## Features
+
+- Track database schema versions
+- Handle migrations between versions
+- Reset database when necessary (incompatible versions, rollup address change)
+- Simple, clean API for version management
+
+## Usage
+
+```typescript
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { version } from '@aztec/foundation';
+
+// Define your current database version
+const DB_VERSION = 3;
+const rollupAddress = EthAddress.fromString('0x1234567890123456789012345678901234567890');
+
+// Create version manager for your service
+const versionManager = new version.VersionManager(DB_VERSION, rollupAddress, {
+  dataDir: '/path/to/data',
+  serviceName: 'my-database',
+});
+
+// When initializing your database
+await versionManager.checkVersionAndHandle(
+  // Called when a reset is needed
+  async () => {
+    // Initialize a fresh database
+    await initializeFreshDatabase();
+  },
+  // Called when an upgrade is needed (optional)
+  async (oldVersion, newVersion) => {
+    if (oldVersion === 1 && newVersion === 2) {
+      // Migrate from version 1 to 2
+      await migrateV1ToV2();
+    } else if (oldVersion === 2 && newVersion === 3) {
+      // Migrate from version 2 to 3
+      await migrateV2ToV3();
+    } else {
+      // Unsupported migration path, will fall back to reset
+      throw new Error(`Cannot upgrade from ${oldVersion} to ${newVersion}`);
+    }
+  }
+);
+
+// Get the data directory for your service
+const dataDir = versionManager.getDataDirectory();
+```
+
+## Automatic Reset Conditions
+
+The database will be reset in the following conditions:
+
+1. No version information exists (first run)
+2. Rollup address has changed
+3. Version has changed and no upgrade callback is provided
+4. Upgrade callback throws an error
+
+When a reset occurs, the data directory is deleted and recreated, and the reset callback is called to initialize a fresh database.

package/src/database-version/index.ts

@@ -0,0 +1 @@
+export * from './version_manager.js';

package/src/database-version/version_manager.ts

@@ -0,0 +1,207 @@
+import { EthAddress } from '@aztec/foundation/eth-address';
+import { jsonParseWithSchemaSync, jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+
+import fs from 'fs/promises';
+import { join } from 'path';
+import { z } from 'zod';
+
+/**
+ * Represents a version record for storing in a version file.
+ */
+export class DatabaseVersion {
+  constructor(public readonly schemaVersion: number, public readonly rollupAddress: EthAddress) {}
+
+  public toBuffer(): Buffer {
+    return Buffer.from(jsonStringify(this));
+  }
+
+  public static fromBuffer(buf: Buffer): DatabaseVersion {
+    try {
+      return jsonParseWithSchemaSync(buf.toString('utf-8'), DatabaseVersion.schema);
+    } catch (err) {
+      throw new Error(`Failed to deserialize version information: ${err}`, { cause: err });
+    }
+  }
+
+  /**
+   * Compares two versions. If the rollups addresses are different then it returns undefined
+   */
+  public cmp(other: DatabaseVersion): undefined | -1 | 0 | 1 {
+    if (this.rollupAddress.equals(other.rollupAddress)) {
+      if (this.schemaVersion < other.schemaVersion) {
+        return -1;
+      } else if (this.schemaVersion > other.schemaVersion) {
+        return 1;
+      } else {
+        return 0;
+      }
+    }
+    return undefined;
+  }
+
+  /**
+   * Checks if two versions exactly match
+   */
+  public equals(other: DatabaseVersion): boolean {
+    return this.cmp(other) === 0;
+  }
+
+  /**
+   * Returns the schema for this class
+   */
+  static get schema() {
+    return z
+      .object({
+        schemaVersion: z.number(),
+        rollupAddress: EthAddress.schema,
+      })
+      .transform(({ schemaVersion, rollupAddress }) => new DatabaseVersion(schemaVersion, rollupAddress));
+  }
+
+  /**
+   * Returns an empty instance
+   */
+  static empty() {
+    return new DatabaseVersion(0, EthAddress.ZERO);
+  }
+}
+
+export type DatabaseVersionManagerFs = Pick<typeof fs, 'readFile' | 'writeFile' | 'rm' | 'mkdir'>;
+
+/**
+ * A manager for handling database versioning and migrations.
+ * This class will check the version of data in a directory and either
+ * reset or upgrade based on version compatibility.
+ */
+export class DatabaseVersionManager<T> {
+  public static readonly VERSION_FILE = 'db_version';
+
+  private readonly versionFile: string;
+  private readonly currentVersion: DatabaseVersion;
+
+  /**
+   * Create a new version manager
+   *
+   * @param schemaVersion - The current version of the application
+   * @param rollupAddress - The rollup contract address
+   * @param dataDirectory - The directory where version information will be stored
+   * @param onOpen - A callback to the open the database at the given location
+   * @param onUpgrade - An optional callback to upgrade the database before opening. If not provided it will reset the database
+   * @param fileSystem - An interface to access the filesystem
+   * @param log - Optional custom logger
+   * @param options - Configuration options
+   */
+  constructor(
+    schemaVersion: number,
+    rollupAddress: EthAddress,
+    private dataDirectory: string,
+    private onOpen: (dataDir: string) => Promise<T>,
+    private onUpgrade?: (dataDir: string, currentVersion: number, latestVersion: number) => Promise<void>,
+    private fileSystem: DatabaseVersionManagerFs = fs,
+    private log = createLogger(`foundation:version-manager`),
+  ) {
+    if (schemaVersion < 1) {
+      throw new TypeError(`Invalid schema version received: ${schemaVersion}`);
+    }
+
+    this.versionFile = join(this.dataDirectory, DatabaseVersionManager.VERSION_FILE);
+    this.currentVersion = new DatabaseVersion(schemaVersion, rollupAddress);
+  }
+
+  /**
+   * Checks the stored version against the current version and handles the outcome
+   * by either resetting the data directory or calling an upgrade function
+   *
+   * @param onReset - Function to call when a full reset is needed
+   * @param onUpgrade - Function to call when an upgrade is needed
+   * @returns True if data was reset, false if upgraded or no change needed
+   */
+  public async open(): Promise<[T, boolean]> {
+    // const storedVersion = await DatabaseVersion.readVersion(this.versionFile);
+    let storedVersion: DatabaseVersion;
+
+    try {
+      const versionBuf = await this.fileSystem.readFile(this.versionFile);
+      storedVersion = DatabaseVersion.fromBuffer(versionBuf);
+    } catch (err) {
+      if (err && (err as Error & { code: string }).code === 'ENOENT') {
+        storedVersion = DatabaseVersion.empty();
+      } else {
+        this.log.warn(`Failed to read stored version information: ${err}. Defaulting to empty version`);
+        storedVersion = DatabaseVersion.empty();
+      }
+    }
+
+    const cmp = storedVersion.cmp(this.currentVersion);
+    let needsReset = false;
+
+    if (typeof cmp === 'number') {
+      // only allow forward upgrades
+      if (cmp === -1 && this.onUpgrade) {
+        this.log.info(`Upgrading from version ${storedVersion.schemaVersion} to ${this.currentVersion.schemaVersion}`);
+        try {
+          await this.onUpgrade(this.dataDirectory, storedVersion.schemaVersion, this.currentVersion.schemaVersion);
+        } catch (error) {
+          this.log.error(`Failed to upgrade: ${error}. Falling back to reset.`);
+          needsReset = true;
+        }
+      } else if (cmp !== 0) {
+        this.log.info(
+          `Can't upgrade from version ${storedVersion.schemaVersion} to ${this.currentVersion}. Resetting database at ${this.dataDirectory}`,
+        );
+        needsReset = true;
+      }
+    } else {
+      this.log.warn('Rollup address changed, resetting data directory');
+      needsReset = true;
+    }
+
+    // Handle reset if needed
+    if (needsReset) {
+      await this.resetDataDirectory();
+    }
+
+    // Write the current version to disk
+    await this.writeVersion();
+
+    return [await this.onOpen(this.dataDirectory), needsReset];
+  }
+
+  /**
+   * Writes the current version to the version file
+   */
+  private async writeVersion(): Promise<void> {
+    // Ensure the directory exists
+    await this.fileSystem.mkdir(this.dataDirectory, { recursive: true });
+    // Write the version file
+    await this.fileSystem.writeFile(this.versionFile, this.currentVersion.toBuffer());
+  }
+
+  /**
+   * Resets the data directory by deleting it and recreating it
+   */
+  private async resetDataDirectory(): Promise<void> {
+    try {
+      await this.fileSystem.rm(this.dataDirectory, { recursive: true, force: true, maxRetries: 3 });
+      await this.fileSystem.mkdir(this.dataDirectory, { recursive: true });
+    } catch (err) {
+      this.log.error(`Failed to reset data directory: ${err}`);
+      throw new Error(`Failed to reset data directory: ${err}`, { cause: err });
+    }
+  }
+
+  /**
+   * Get the data directory path
+   */
+  public getDataDirectory(): string {
+    return this.dataDirectory;
+  }
+
+  /**
+   * Get the current version number
+   */
+  public getSchemaVersion(): number {
+    return this.currentVersion.schemaVersion;
+  }
+}

package/src/errors/simulation_error.ts

@@ -57,8 +57,8 @@ export interface SourceCodeLocation {
 
 const SourceCodeLocationSchema = z.object({
   filePath: z.string(),
-  line: z.number(),
-  column: z.number(),
+  line: z.number().int().nonnegative(),
+  column: z.number().int().nonnegative(),
   fileSource: z.string(),
   locationText: z.string(),
 });

package/src/hash/hash.ts

@@ -3,7 +3,6 @@ import { poseidon2Hash, poseidon2HashWithSeparator, sha256Trunc } from '@aztec/f
 import { Fr } from '@aztec/foundation/fields';
 
 import type { AztecAddress } from '../aztec-address/index.js';
-import type { ContractClassLog } from '../logs/index.js';
 import type { ScopedL2ToL1Message } from '../messaging/l2_to_l1_message.js';
 
 /**
@@ -132,12 +131,3 @@ export function siloL2ToL1Message(l2ToL1Message: ScopedL2ToL1Message, version: F
   ]);
   return Fr.fromBuffer(sha256Trunc(preimage));
 }
-
-export async function siloContractClassLog(log: ContractClassLog, contract: AztecAddress): Promise<ContractClassLog> {
-  const innerLog = log.clone();
-  if (contract.isZero()) {
-    return innerLog;
-  }
-  innerLog.fields[0] = await poseidon2Hash([contract, innerLog.fields[0]]);
-  return innerLog;
-}

package/src/interfaces/world_state.ts

@@ -76,9 +76,9 @@ export interface WorldStateSynchronizer extends ForkMerkleTreeOperations {
 }
 
 export const WorldStateSyncStatusSchema = z.object({
-  finalisedBlockNumber: z.number(),
-  latestBlockNumber: z.number(),
+  finalisedBlockNumber: z.number().int().nonnegative(),
+  latestBlockNumber: z.number().int().nonnegative(),
   latestBlockHash: z.string(),
-  oldestHistoricBlockNumber: z.number(),
+  oldestHistoricBlockNumber: z.number().int().nonnegative(),
   treesAreSynched: z.boolean(),
 }) satisfies z.ZodType<WorldStateSyncStatus>;

package/src/logs/contract_class_log.ts

@@ -11,6 +11,8 @@ import { AztecAddress } from '../aztec-address/index.js';
 
 export class ContractClassLog {
   static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * CONTRACT_CLASS_LOG_SIZE_IN_FIELDS;
+  // Keeps original first field pre-siloing. Only set by silo().
+  public unsiloedFirstField?: Fr | undefined;
 
   // Below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
   // public fields: Tuple<Fr, typeof CONTRACT_CLASS_LOG_DATA_SIZE_IN_FIELDS>
@@ -91,8 +93,30 @@ export class ContractClassLog {
     return this.fields.slice(0, lastZeroIndex);
   }
 
+  setUnsiloedFirstField(field: Fr) {
+    this.unsiloedFirstField = field;
+  }
+
+  toUnsiloed() {
+    if (this.unsiloedFirstField) {
+      return new ContractClassLog(this.contractAddress, [this.unsiloedFirstField].concat(this.fields.slice(1)));
+    } else {
+      return this;
+    }
+  }
+
+  async silo() {
+    const innerLog = this.clone();
+    if (innerLog.contractAddress.isZero()) {
+      return innerLog;
+    }
+    innerLog.setUnsiloedFirstField(innerLog.fields[0]);
+    innerLog.fields[0] = await poseidon2Hash([innerLog.contractAddress, innerLog.fields[0]]);
+    return innerLog;
+  }
+
   async hash() {
-    return await poseidon2Hash(this.getEmittedFields());
+    return await poseidon2Hash(this.fields);
   }
 
   static get schema() {

package/src/messaging/l2_to_l1_message.ts

@@ -17,7 +17,7 @@ export class L2ToL1Message {
       .object({
         recipient: schemas.EthAddress,
         content: schemas.Fr,
-        counter: z.number(),
+        counter: z.number().int().nonnegative(),
       })
       .transform(({ recipient, content, counter }) => new L2ToL1Message(recipient, content, counter));
   }

package/src/tx/tx.ts

@@ -8,7 +8,6 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 
 import type { GasSettings } from '../gas/gas_settings.js';
-import { siloContractClassLog } from '../hash/hash.js';
 import type { GetPublicLogsResponse } from '../interfaces/get_logs_response.js';
 import type { L2LogsSource } from '../interfaces/l2_logs_source.js';
 import type { ScopedLogHash } from '../kernel/log_hash.js';
@@ -197,9 +196,11 @@ export class Tx extends Gossipable {
     const contractClassLogs = [];
     for (const log of this.contractClassLogs) {
       const hashedLog = await log.hash();
-      const logHash = logHashes.find(hash => hash.value.equals(hashedLog));
+      const logHash = logHashes.find(
+        hash => hash.value.equals(hashedLog) && hash.contractAddress.equals(log.contractAddress),
+      );
       if (logHash) {
-        contractClassLogs.push(silo ? await siloContractClassLog(log, logHash.contractAddress) : log);
+        contractClassLogs.push(silo ? await log.silo() : log);
       }
     }
     return contractClassLogs;

package/src/tx/tx_receipt.ts

@@ -56,7 +56,7 @@ export class TxReceipt {
         status: z.nativeEnum(TxStatus),
         error: z.string(),
         blockHash: L2BlockHash.schema.optional(),
-        blockNumber: z.number().optional(),
+        blockNumber: z.number().int().nonnegative().optional(),
         transactionFee: schemas.BigInt.optional(),
         debugInfo: DebugInfoSchema.optional(),
       })