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

package/dest/tx/tx.js

@@ -3,10 +3,8 @@ 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';
 import { Gossipable } from '../p2p/gossipable.js';
 import { TopicType, createTopicString } from '../p2p/topic_type.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
@@ -135,9 +133,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;
@@ -167,7 +165,7 @@ import { TxHash } from './tx_hash.js';
             nullifierCount: this.data.getNonEmptyNullifiers().length,
             privateLogCount: this.data.getNonEmptyPrivateLogs().length,
             classRegisteredCount: this.data.getNonEmptyContractClassLogsHashes().length,
-            contractClassLogSize: this.data.getNonEmptyContractClassLogsLength(),
+            contractClassLogSize: this.data.getEmittedContractClassLogsLength(),
             proofSize: this.clientIvcProof.clientIvcProofBuffer.length,
             size: this.toBuffer().length,
             feePaymentMethod: // needsSetup? then we pay through a fee payment contract
@@ -183,7 +181,7 @@ import { TxHash } from './tx_hash.js';
    * Estimates the tx size based on its private effects. Note that the actual size of the tx
    * after processing will probably be larger, as public execution would generate more data.
    */ getEstimatedPrivateTxEffectsSize() {
-        return this.data.getNonEmptyNoteHashes().length * Fr.SIZE_IN_BYTES + this.data.getNonEmptyNullifiers().length * Fr.SIZE_IN_BYTES + this.data.getNonEmptyPrivateLogs().length * PrivateLog.SIZE_IN_BYTES + this.data.getNonEmptyContractClassLogsLength() * Fr.SIZE_IN_BYTES;
+        return this.data.getNonEmptyNoteHashes().length * Fr.SIZE_IN_BYTES + this.data.getNonEmptyNullifiers().length * Fr.SIZE_IN_BYTES + this.data.getEmittedPrivateLogsLength() * Fr.SIZE_IN_BYTES + this.data.getEmittedContractClassLogsLength() * Fr.SIZE_IN_BYTES;
     }
     /**
    * Convenience function to get a hash out of a tx or a tx-like.

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

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

package/dest/tx/tx_effect.js

@@ -270,15 +270,26 @@ export class TxEffect {
                 ]).flat());
         }
         if (this.privateLogs.length) {
-            flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, this.privateLogs.length * PRIVATE_LOG_SIZE_IN_FIELDS));
-            flattened.push(...this.privateLogs.map((l)=>l.fields).flat());
+            const totalLogLen = this.privateLogs.reduce(// +1 for length prefix
+            (total, log)=>total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 1), 0);
+            flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, totalLogLen));
+            flattened.push(...this.privateLogs.flatMap((l)=>[
+                    new Fr(l.getEmittedLength()),
+                    ...l.getEmittedFields()
+                ]));
         }
         if (this.publicLogs.length) {
-            flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, this.publicLogs.length * PUBLIC_LOG_SIZE_IN_FIELDS));
-            flattened.push(...this.publicLogs.map((l)=>l.toFields()).flat());
+            const totalLogLen = this.publicLogs.reduce(// +1 for length prefix
+            (total, log)=>total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 1), 0);
+            flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, totalLogLen));
+            flattened.push(...this.publicLogs.flatMap((l)=>[
+                    new Fr(l.getEmittedLength()),
+                    ...l.getEmittedFields()
+                ]));
         }
         if (this.contractClassLogs.length) {
-            const totalLogLen = this.contractClassLogs.reduce((total, log)=>total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 2), 0);
+            const totalLogLen = this.contractClassLogs.reduce(// +2 for length prefix and contract address
+            (total, log)=>total + (log.getEmittedLength() == 0 ? 0 : log.getEmittedLength() + 2), 0);
             flattened.push(this.toPrefix(CONTRACT_CLASS_LOGS_PREFIX, totalLogLen));
             flattened.push(...this.contractClassLogs.flatMap((l)=>[
                     new Fr(l.getEmittedLength()),
@@ -347,11 +358,13 @@ export class TxEffect {
                     }
                 case PRIVATE_LOGS_PREFIX:
                     {
-                        // TODO(Miranda): squash log 0s in a nested loop and add len prefix?
                         ensureEmpty(effect.privateLogs);
                         const flatPrivateLogs = reader.readFieldArray(length);
-                        for(let i = 0; i < length; i += PRIVATE_LOG_SIZE_IN_FIELDS){
-                            effect.privateLogs.push(PrivateLog.fromFields(flatPrivateLogs.slice(i, i + PRIVATE_LOG_SIZE_IN_FIELDS)));
+                        let i = 0;
+                        while(i < length){
+                            const logLen = flatPrivateLogs[i++].toNumber();
+                            const logFields = flatPrivateLogs.slice(i, i += logLen);
+                            effect.privateLogs.push(PrivateLog.fromFields(logFields.concat(new Array(PRIVATE_LOG_SIZE_IN_FIELDS - logLen).fill(Fr.ZERO))));
                         }
                         break;
                     }
@@ -359,8 +372,11 @@ export class TxEffect {
                     {
                         ensureEmpty(effect.publicLogs);
                         const flatPublicLogs = reader.readFieldArray(length);
-                        for(let i = 0; i < length; i += PUBLIC_LOG_SIZE_IN_FIELDS){
-                            effect.publicLogs.push(PublicLog.fromFields(flatPublicLogs.slice(i, i + PUBLIC_LOG_SIZE_IN_FIELDS)));
+                        let i = 0;
+                        while(i < length){
+                            const logLen = flatPublicLogs[i++].toNumber();
+                            const logFields = flatPublicLogs.slice(i, i += logLen);
+                            effect.publicLogs.push(PublicLog.fromFields(logFields.concat(new Array(PUBLIC_LOG_SIZE_IN_FIELDS - logLen).fill(Fr.ZERO))));
                         }
                         break;
                     }

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.1",
   "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.1",
+    "@aztec/blob-lib": "0.77.1",
+    "@aztec/constants": "0.77.1",
+    "@aztec/ethereum": "0.77.1",
+    "@aztec/foundation": "0.77.1",
     "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/kernel/private_kernel_tail_circuit_public_inputs.ts

@@ -253,10 +253,14 @@ export class PrivateKernelTailCircuitPublicInputs {
     return contractClassLogsHashes.filter(h => !h.isEmpty());
   }
 
-  getNonEmptyContractClassLogsLength() {
+  getEmittedContractClassLogsLength() {
     return this.getNonEmptyContractClassLogsHashes().reduce((total, log) => total + log.logHash.length, 0);
   }
 
+  getEmittedPrivateLogsLength() {
+    return this.getNonEmptyPrivateLogs().reduce((total, log) => total + log.getEmittedLength(), 0);
+  }
+
   static fromBuffer(buffer: Buffer | BufferReader): PrivateKernelTailCircuitPublicInputs {
     const reader = BufferReader.asReader(buffer);
     const isForPublic = reader.readBoolean();

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>
@@ -76,23 +78,40 @@ export class ContractClassLog {
 
   getEmittedLength() {
     // This assumes that we cut trailing zeroes from the end of the log. In ts, these will always be added back.
-    // Does not include address and length prefix.
+    // Does not include address or length prefix.
+    // Note: Unlike public logs, address is not included here because it is not included in the log itself.
     return this.getEmittedFields().length;
   }
 
   getEmittedFields() {
-    let lastZeroIndex = 0;
-    for (let i = this.fields.length - 1; i >= 0; i--) {
-      if (!this.fields[i].isZero() && lastZeroIndex == 0) {
-        lastZeroIndex = i + 1;
-        break;
-      }
+    const lastNonZeroIndex = this.fields.findLastIndex(f => !f.isZero());
+    return this.fields.slice(0, lastNonZeroIndex + 1);
+  }
+
+  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;
     }
-    return this.fields.slice(0, lastZeroIndex);
+    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/logs/private_log.ts

@@ -42,6 +42,17 @@ export class PrivateLog {
     return new PrivateLog(makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, Fr.random));
   }
 
+  getEmittedLength() {
+    // This assumes that we cut trailing zeroes from the end of the log. In ts, these will always be added back.
+    // Does not include length prefix.
+    return this.getEmittedFields().length;
+  }
+
+  getEmittedFields() {
+    const lastNonZeroIndex = this.fields.findLastIndex(f => !f.isZero());
+    return this.fields.slice(0, lastNonZeroIndex + 1);
+  }
+
   static get schema() {
     return z
       .object({

package/src/logs/public_log.ts

@@ -54,6 +54,18 @@ export class PublicLog {
     return new PublicLog(await AztecAddress.random(), makeTuple(PUBLIC_LOG_DATA_SIZE_IN_FIELDS, Fr.random));
   }
 
+  getEmittedLength() {
+    // This assumes that we cut trailing zeroes from the end of the log. In ts, these will always be added back.
+    // Does not include length prefix.
+    return this.getEmittedFields().length;
+  }
+
+  getEmittedFields() {
+    const fields = this.toFields();
+    const lastNonZeroIndex = fields.findLastIndex(f => !f.isZero());
+    return fields.slice(0, lastNonZeroIndex + 1);
+  }
+
   equals(other: this) {
     return (
       this.contractAddress.equals(other.contractAddress) &&

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));
   }