@aztec/stdlib 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/logs/public_log.js

@@ -1,5 +1,6 @@
-import { PUBLIC_LOG_DATA_SIZE_IN_FIELDS, PUBLIC_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
+import { PUBLIC_LOG_LENGTH, PUBLIC_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
@@ -8,70 +9,88 @@ import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
 export class PublicLog {
     contractAddress;
-    log;
-    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * PUBLIC_LOG_SIZE_IN_FIELDS;
-    constructor(contractAddress, log){
+    fields;
+    emittedLength;
+    static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * PUBLIC_LOG_LENGTH;
+    constructor(contractAddress, fields, emittedLength){
         this.contractAddress = contractAddress;
-        this.log = log;
+        this.fields = fields;
+        this.emittedLength = emittedLength;
     }
-    toFields() {
-        return serializeToFields(...PublicLog.getFields(this));
+    static from(fields) {
+        return new PublicLog(...PublicLog.getFields(fields));
     }
     static getFields(fields) {
         return [
             fields.contractAddress,
-            fields.log
+            fields.fields,
+            fields.emittedLength
         ];
     }
+    toFields() {
+        return serializeToFields(...PublicLog.getFields(this));
+    }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new PublicLog(reader.readObject(AztecAddress), reader.readFieldArray(PUBLIC_LOG_DATA_SIZE_IN_FIELDS));
+        return new PublicLog(reader.readObject(AztecAddress), reader.readFieldArray(PUBLIC_LOG_SIZE_IN_FIELDS), reader.readU32());
+    }
+    getEmittedFields() {
+        return this.fields.slice(0, this.emittedLength);
+    }
+    getEmittedFieldsWithoutTag() {
+        return this.fields.slice(1, this.emittedLength);
+    }
+    toBlobFields() {
+        return [
+            new Fr(this.emittedLength),
+            this.contractAddress.toField()
+        ].concat(this.getEmittedFields());
+    }
+    static fromBlobFields(fields) {
+        const reader = FieldReader.asReader(fields);
+        const emittedLength = reader.readU32();
+        const contractAddress = reader.readObject(AztecAddress);
+        const emittedFields = reader.readFieldArray(emittedLength);
+        return new PublicLog(contractAddress, padArrayEnd(emittedFields, Fr.ZERO, PUBLIC_LOG_SIZE_IN_FIELDS), emittedLength);
     }
     isEmpty() {
-        return this.contractAddress.isZero() && this.log.every((f)=>f.isZero());
+        return this.contractAddress.isZero() && this.fields.every((f)=>f.isZero()) && this.emittedLength === 0;
     }
     static empty() {
-        return new PublicLog(AztecAddress.ZERO, makeTuple(PUBLIC_LOG_DATA_SIZE_IN_FIELDS, Fr.zero));
+        return new PublicLog(AztecAddress.ZERO, makeTuple(PUBLIC_LOG_SIZE_IN_FIELDS, Fr.zero), 0);
     }
     toBuffer() {
         return serializeToBuffer(...PublicLog.getFields(this));
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new PublicLog(reader.readObject(AztecAddress), reader.readArray(PUBLIC_LOG_DATA_SIZE_IN_FIELDS, Fr));
+        return new PublicLog(reader.readObject(AztecAddress), reader.readArray(PUBLIC_LOG_SIZE_IN_FIELDS, Fr), reader.readNumber());
     }
     static async random() {
-        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);
+        return new PublicLog(await AztecAddress.random(), makeTuple(PUBLIC_LOG_SIZE_IN_FIELDS, Fr.random), PUBLIC_LOG_SIZE_IN_FIELDS);
     }
     equals(other) {
-        return this.contractAddress.equals(other.contractAddress) && this.log.reduce((acc, field, i)=>acc && field.equals(other.log[i]), true);
+        return this.contractAddress.equals(other.contractAddress) && this.fields.every((field, i)=>field.equals(other.fields[i])) && this.emittedLength === other.emittedLength;
     }
     toHumanReadable() {
-        return `PublicLog: (contractAddress: ${this.contractAddress} log: ${this.log})`;
+        return `PublicLog: (contractAddress: ${this.contractAddress} fields: ${this.fields}) emittedLength: ${this.emittedLength}`;
     }
     static get schema() {
         return z.object({
             contractAddress: AztecAddress.schema,
-            log: z.array(schemas.Fr)
-        }).transform(({ contractAddress, log })=>PublicLog.fromFields([
+            fields: z.array(schemas.Fr).refine((arr)=>arr.length === PUBLIC_LOG_SIZE_IN_FIELDS),
+            emittedLength: z.number()
+        }).transform(({ contractAddress, fields, emittedLength })=>PublicLog.fromFields([
                 contractAddress.toField(),
-                ...log
+                ...fields,
+                new Fr(emittedLength)
             ]));
     }
     [inspect.custom]() {
         return `PublicLog {
       contractAddress: ${inspect(this.contractAddress)},
-      log: [${this.log.map((x)=>inspect(x)).join(', ')}],
+      fields: [${this.fields.map((x)=>inspect(x)).join(', ')}],
+      emittedLength: ${this.emittedLength},
     }`;
     }
 }

package/dest/logs/{l1_payload/shared_secret_derivation.d.ts → shared_secret_derivation.d.ts}

@@ -1,6 +1,5 @@
 import type { GrumpkinScalar, Point } from '@aztec/foundation/fields';
-import type { AztecAddress } from '../../aztec-address/index.js';
-import type { PublicKey } from '../../keys/public_key.js';
+import type { PublicKey } from '../keys/public_key.js';
 /**
  * Derive an Elliptic Curve Diffie-Hellman (ECDH) Shared Secret.
  * The function takes in an ECDH public key, a private key, and a Grumpkin instance to compute
@@ -10,7 +9,9 @@ import type { PublicKey } from '../../keys/public_key.js';
  * @param publicKey - The public key used to derive shared secret.
  * @returns A derived shared secret.
  * @throws If the publicKey is zero.
+ *
+ * TODO(#12656): This function is kept around because of the utilityGetSharedSecret oracle. Nuke this once returning
+ * the app-siloed secret.
  */
 export declare function deriveEcdhSharedSecret(secretKey: GrumpkinScalar, publicKey: PublicKey): Promise<Point>;
-export declare function deriveEcdhSharedSecretUsingAztecAddress(secretKey: GrumpkinScalar, address: AztecAddress): Promise<Point>;
 //# sourceMappingURL=shared_secret_derivation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shared_secret_derivation.d.ts","sourceRoot":"","sources":["../../src/logs/shared_secret_derivation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,CAS5G"}

package/dest/logs/{l1_payload/shared_secret_derivation.js → shared_secret_derivation.js}

@@ -8,6 +8,9 @@ import { Grumpkin } from '@aztec/foundation/crypto';
  * @param publicKey - The public key used to derive shared secret.
  * @returns A derived shared secret.
  * @throws If the publicKey is zero.
+ *
+ * TODO(#12656): This function is kept around because of the utilityGetSharedSecret oracle. Nuke this once returning
+ * the app-siloed secret.
  */ export async function deriveEcdhSharedSecret(secretKey, publicKey) {
     if (publicKey.isZero()) {
         throw new Error(`Attempting to derive a shared secret with a zero public key. You have probably passed a zero public key in your Noir code somewhere thinking that the note won't be broadcast... but it was.`);
@@ -16,8 +19,3 @@ import { Grumpkin } from '@aztec/foundation/crypto';
     const sharedSecret = await curve.mul(publicKey, secretKey);
     return sharedSecret;
 }
-export async function deriveEcdhSharedSecretUsingAztecAddress(secretKey, address) {
-    const addressPoint = await address.toAddressPoint();
-    const sharedSecret = await deriveEcdhSharedSecret(secretKey, addressPoint);
-    return sharedSecret;
-}

package/dest/logs/tx_scoped_l2_log.d.ts

@@ -1,60 +1,55 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { z } from 'zod';
 import { TxHash } from '../tx/tx_hash.js';
+import { PrivateLog } from './private_log.js';
+import { PublicLog } from './public_log.js';
 export declare class TxScopedL2Log {
     txHash: TxHash;
     dataStartIndexForTx: number;
+    logIndexInTx: number;
     blockNumber: number;
-    isFromPublic: boolean;
-    logData: Buffer;
-    constructor(txHash: TxHash, dataStartIndexForTx: number, blockNumber: number, isFromPublic: boolean, logData: Buffer);
+    log: PrivateLog | PublicLog;
+    constructor(txHash: TxHash, dataStartIndexForTx: number, logIndexInTx: number, blockNumber: number, log: PrivateLog | PublicLog);
+    get isFromPublic(): boolean;
     static get schema(): z.ZodEffects<z.ZodObject<{
-        txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer, string>, TxHash, string>;
+        txHash: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>;
         dataStartIndexForTx: z.ZodNumber;
+        logIndexInTx: z.ZodNumber;
         blockNumber: z.ZodNumber;
-        isFromPublic: z.ZodBoolean;
-        logData: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer, string>, z.ZodEffects<z.ZodObject<{
-            type: z.ZodLiteral<"Buffer">;
-            data: z.ZodArray<z.ZodNumber, "many">;
-        }, "strip", z.ZodTypeAny, {
-            type: "Buffer";
-            data: number[];
+        log: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
+            fields: z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, "many">;
+            emittedLength: z.ZodNumber;
+        }, "strict", z.ZodTypeAny, {
+            fields: import("@aztec/foundation/schemas").Fr[];
+            emittedLength: number;
         }, {
-            type: "Buffer";
-            data: number[];
-        }>, Buffer, {
-            type: "Buffer";
-            data: number[];
-        }>]>;
+            fields: string[];
+            emittedLength: number;
+        }>, PrivateLog, {
+            fields: string[];
+            emittedLength: number;
+        }>, import("@aztec/foundation/schemas").ZodFor<PublicLog>]>;
     }, "strip", z.ZodTypeAny, {
         blockNumber: number;
+        log: PrivateLog | PublicLog;
         txHash: TxHash;
         dataStartIndexForTx: number;
-        isFromPublic: boolean;
-        logData: Buffer;
+        logIndexInTx: number;
     }, {
         blockNumber: number;
         txHash: string;
         dataStartIndexForTx: number;
-        isFromPublic: boolean;
-        logData: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        logIndexInTx: number;
+        log?: any;
     }>, TxScopedL2Log, {
         blockNumber: number;
         txHash: string;
         dataStartIndexForTx: number;
-        isFromPublic: boolean;
-        logData: string | {
-            type: "Buffer";
-            data: number[];
-        };
+        logIndexInTx: number;
+        log?: any;
     }>;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBuffer>;
     static fromBuffer(buffer: Buffer): TxScopedL2Log;
-    static random(): TxScopedL2Log;
+    static random(isFromPublic?: boolean): Promise<TxScopedL2Log>;
     equals(other: TxScopedL2Log): boolean;
 }
 //# sourceMappingURL=tx_scoped_l2_log.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":";;AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAI3B,WAAW,EAAE,MAAM;IAInB,YAAY,EAAE,OAAO;IAIrB,OAAO,EAAE,MAAM;gBAjBf,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAI3B,WAAW,EAAE,MAAM,EAInB,YAAY,EAAE,OAAO,EAIrB,OAAO,EAAE,MAAM;IAGxB,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ;IAUR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;IAWhC,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,KAAK,EAAE,aAAa;CAS5B"}
+{"version":3,"file":"tx_scoped_l2_log.d.ts","sourceRoot":"","sources":["../../src/logs/tx_scoped_l2_log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,aAAa;IAKf,MAAM,EAAE,MAAM;IAKd,mBAAmB,EAAE,MAAM;IAK3B,YAAY,EAAE,MAAM;IAIpB,WAAW,EAAE,MAAM;IAInB,GAAG,EAAE,UAAU,GAAG,SAAS;gBAlB3B,MAAM,EAAE,MAAM,EAKd,mBAAmB,EAAE,MAAM,EAK3B,YAAY,EAAE,MAAM,EAIpB,WAAW,EAAE,MAAM,EAInB,GAAG,EAAE,UAAU,GAAG,SAAS;IAGpC,IAAI,YAAY,YAEf;IAED,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;IAED,QAAQ;IAYR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM;WAYnB,MAAM,CAAC,YAAY,UAAsB;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa;CAW5B"}

package/dest/logs/tx_scoped_l2_log.js

@@ -1,58 +1,75 @@
-import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, boolToBuffer, numToUInt32BE } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { schemas } from '../schemas/schemas.js';
 import { TxHash } from '../tx/tx_hash.js';
+import { PrivateLog } from './private_log.js';
+import { PublicLog } from './public_log.js';
+// TODO(#14460): Split to private and public versions instead of having this weird mix.
 export class TxScopedL2Log {
     txHash;
     dataStartIndexForTx;
+    logIndexInTx;
     blockNumber;
-    isFromPublic;
-    logData;
+    log;
     constructor(/*
      * Hash of the tx where the log is included
      */ txHash, /*
      * The next available leaf index for the note hash tree for this transaction. It is stored
      * with the log so the noteHashIndex can be reconstructed after decryption.
      */ dataStartIndexForTx, /*
+     * The index of the log in the transaction. Note that public and private logs are in separate arrays in the tx
+     * effect and for this reason these indices are independent (a private and public log can have the same index).
+     */ logIndexInTx, /*
      * The block this log is included in
      */ blockNumber, /*
-     * Indicates if the log comes from the public logs stream (partial note)
-     */ isFromPublic, /*
-     * The log data
-     */ logData){
+     * The log data as either a PrivateLog or PublicLog
+     */ log){
         this.txHash = txHash;
         this.dataStartIndexForTx = dataStartIndexForTx;
+        this.logIndexInTx = logIndexInTx;
         this.blockNumber = blockNumber;
-        this.isFromPublic = isFromPublic;
-        this.logData = logData;
+        this.log = log;
+    }
+    get isFromPublic() {
+        return this.log instanceof PublicLog;
     }
     static get schema() {
         return z.object({
             txHash: TxHash.schema,
             dataStartIndexForTx: z.number(),
+            logIndexInTx: z.number(),
             blockNumber: z.number(),
-            isFromPublic: z.boolean(),
-            logData: schemas.Buffer
-        }).transform(({ txHash, dataStartIndexForTx, blockNumber, isFromPublic, logData })=>new TxScopedL2Log(txHash, dataStartIndexForTx, blockNumber, isFromPublic, logData));
+            log: z.union([
+                PrivateLog.schema,
+                PublicLog.schema
+            ])
+        }).transform(({ txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log })=>new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log));
     }
     toBuffer() {
+        const isFromPublic = this.log instanceof PublicLog;
         return Buffer.concat([
             this.txHash.toBuffer(),
             numToUInt32BE(this.dataStartIndexForTx),
+            numToUInt32BE(this.logIndexInTx),
             numToUInt32BE(this.blockNumber),
-            boolToBuffer(this.isFromPublic),
-            this.logData
+            boolToBuffer(isFromPublic),
+            this.log.toBuffer()
         ]);
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new TxScopedL2Log(reader.readObject(TxHash), reader.readNumber(), reader.readNumber(), reader.readBoolean(), reader.readToEnd());
+        const txHash = reader.readObject(TxHash);
+        const dataStartIndexForTx = reader.readNumber();
+        const logIndexInTx = reader.readNumber();
+        const blockNumber = reader.readNumber();
+        const isFromPublic = reader.readBoolean();
+        const log = isFromPublic ? PublicLog.fromBuffer(reader) : PrivateLog.fromBuffer(reader);
+        return new TxScopedL2Log(txHash, dataStartIndexForTx, logIndexInTx, blockNumber, log);
     }
-    static random() {
-        return new TxScopedL2Log(TxHash.random(), 1, 1, false, Fr.random().toBuffer());
+    static async random(isFromPublic = Math.random() < 0.5) {
+        const log = isFromPublic ? await PublicLog.random() : PrivateLog.random();
+        return new TxScopedL2Log(TxHash.random(), 1, 1, 1, log);
     }
     equals(other) {
-        return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.blockNumber === other.blockNumber && this.isFromPublic === other.isFromPublic && this.logData.equals(other.logData);
+        return this.txHash.equals(other.txHash) && this.dataStartIndexForTx === other.dataStartIndexForTx && this.logIndexInTx === other.logIndexInTx && this.blockNumber === other.blockNumber && (this.log instanceof PublicLog && other.log instanceof PublicLog || this.log instanceof PrivateLog && other.log instanceof PrivateLog) && this.log.equals(other.log);
     }
 }

package/dest/messaging/inbox_leaf.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 export declare class InboxLeaf {
@@ -14,6 +12,13 @@ export declare class InboxLeaf {
     leaf: Fr);
     toBuffer(): Buffer;
     fromBuffer(buffer: Buffer | BufferReader): InboxLeaf;
-    static smallestIndexFromL2Block(l2block: bigint): bigint;
+    static smallestIndexFromL2Block(l2blockNumber: number): bigint;
+    /**
+     * Returns the range of valid indices for a given L2 block.
+     * Start index is inclusive, end index is exclusive.
+     */
+    static indexRangeFromL2Block(l2blockNumber: number): [bigint, bigint];
+    /** Returns the L2 block number for a given leaf index */
+    static l2BlockFromIndex(index: bigint): number;
 }
 //# sourceMappingURL=inbox_leaf.d.ts.map

package/dest/messaging/inbox_leaf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inbox_leaf.d.ts","sourceRoot":"","sources":["../../src/messaging/inbox_leaf.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,SAAS;IAElB,2CAA2C;aAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;aACxB,IAAI,EAAE,EAAE;;IAHxB,2CAA2C;IAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;IACxB,IAAI,EAAE,EAAE;IAG1B,QAAQ,IAAI,MAAM;IAIlB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAOpD,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAGzD"}
+{"version":3,"file":"inbox_leaf.d.ts","sourceRoot":"","sources":["../../src/messaging/inbox_leaf.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,SAAS;IAElB,2CAA2C;aAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;aACxB,IAAI,EAAE,EAAE;;IAHxB,2CAA2C;IAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;IACxB,IAAI,EAAE,EAAE;IAG1B,QAAQ,IAAI,MAAM;IAIlB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAOpD,MAAM,CAAC,wBAAwB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAI9D;;;OAGG;IACH,MAAM,CAAC,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAMrE,yDAAyD;IACzD,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAG/C"}

package/dest/messaging/inbox_leaf.js

@@ -21,7 +21,21 @@ export class InboxLeaf {
         const leaf = reader.readObject(Fr);
         return new InboxLeaf(index, leaf);
     }
-    static smallestIndexFromL2Block(l2block) {
-        return (l2block - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+    static smallestIndexFromL2Block(l2blockNumber) {
+        return BigInt(l2blockNumber - INITIAL_L2_BLOCK_NUM) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+    }
+    /**
+   * Returns the range of valid indices for a given L2 block.
+   * Start index is inclusive, end index is exclusive.
+   */ static indexRangeFromL2Block(l2blockNumber) {
+        const start = this.smallestIndexFromL2Block(l2blockNumber);
+        const end = start + BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+        return [
+            start,
+            end
+        ];
+    }
+    /** Returns the L2 block number for a given leaf index */ static l2BlockFromIndex(index) {
+        return Number(index / BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP)) + INITIAL_L2_BLOCK_NUM;
     }
 }

package/dest/messaging/index.d.ts

@@ -4,4 +4,5 @@ export * from './l1_to_l2_message_source.js';
 export * from './l1_actor.js';
 export * from './l2_actor.js';
 export * from './l2_to_l1_message.js';
+export * from './l2_to_l1_membership.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/messaging/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/messaging/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC"}

package/dest/messaging/index.js

@@ -4,3 +4,4 @@ export * from './l1_to_l2_message_source.js';
 export * from './l1_actor.js';
 export * from './l2_actor.js';
 export * from './l2_to_l1_message.js';
+export * from './l2_to_l1_membership.js';

package/dest/messaging/l1_actor.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';

package/dest/messaging/l1_actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_actor.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_actor.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E;;GAEG;AACH,qBAAa,OAAO;IAEhB;;OAEG;aACa,MAAM,EAAE,UAAU;IAClC;;OAEG;aACa,OAAO,EAAE,MAAM;;IAP/B;;OAEG;IACa,MAAM,EAAE,UAAU;IAClC;;OAEG;IACa,OAAO,EAAE,MAAM;IAGjC,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAOzD,MAAM,CAAC,MAAM,IAAI,OAAO;CAGzB"}
+{"version":3,"file":"l1_actor.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_actor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E;;GAEG;AACH,qBAAa,OAAO;IAEhB;;OAEG;aACa,MAAM,EAAE,UAAU;IAClC;;OAEG;aACa,OAAO,EAAE,MAAM;;IAP/B;;OAEG;IACa,MAAM,EAAE,UAAU;IAClC;;OAEG;IACa,OAAO,EAAE,MAAM;IAGjC,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;IAOzD,MAAM,CAAC,MAAM,IAAI,OAAO;CAGzB"}

package/dest/messaging/l1_to_l2_message.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';

package/dest/messaging/l1_to_l2_message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_to_l2_message.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_to_l2_message.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC;;GAEG;AACH,qBAAa,aAAa;IAEtB,uCAAuC;aACvB,MAAM,EAAE,OAAO;IAC/B,0CAA0C;aAC1B,SAAS,EAAE,OAAO;IAClC,2BAA2B;aACX,OAAO,EAAE,EAAE;IAC3B,uCAAuC;aACvB,UAAU,EAAE,EAAE;IAC9B,gDAAgD;aAChC,KAAK,EAAE,EAAE;;IATzB,uCAAuC;IACvB,MAAM,EAAE,OAAO;IAC/B,0CAA0C;IAC1B,SAAS,EAAE,OAAO;IAClC,2BAA2B;IACX,OAAO,EAAE,EAAE;IAC3B,uCAAuC;IACvB,UAAU,EAAE,EAAE;IAC9B,gDAAgD;IAChC,KAAK,EAAE,EAAE;IAG3B;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,IAAI,IAAI,EAAE;IAIV,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAU/D,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAK9C,MAAM,CAAC,KAAK,IAAI,aAAa;WAIhB,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC;CAG9C;AAGD,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAejE"}
+{"version":3,"file":"l1_to_l2_message.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_to_l2_message.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC;;GAEG;AACH,qBAAa,aAAa;IAEtB,uCAAuC;aACvB,MAAM,EAAE,OAAO;IAC/B,0CAA0C;aAC1B,SAAS,EAAE,OAAO;IAClC,2BAA2B;aACX,OAAO,EAAE,EAAE;IAC3B,uCAAuC;aACvB,UAAU,EAAE,EAAE;IAC9B,gDAAgD;aAChC,KAAK,EAAE,EAAE;;IATzB,uCAAuC;IACvB,MAAM,EAAE,OAAO;IAC/B,0CAA0C;IAC1B,SAAS,EAAE,OAAO;IAClC,2BAA2B;IACX,OAAO,EAAE,EAAE;IAC3B,uCAAuC;IACvB,UAAU,EAAE,EAAE;IAC9B,gDAAgD;IAChC,KAAK,EAAE,EAAE;IAG3B;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,IAAI,IAAI,EAAE;IAIV,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAU/D,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAK9C,MAAM,CAAC,KAAK,IAAI,aAAa;WAIhB,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC;CAG9C;AAGD,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAejE"}

package/dest/messaging/l1_to_l2_message_source.d.ts

@@ -1,4 +1,5 @@
 import type { Fr } from '@aztec/foundation/fields';
+import type { L2Tips } from '../block/l2_block_source.js';
 /**
  * Interface of classes allowing for the retrieval of L1 to L2 messages.
  */
@@ -8,7 +9,7 @@ export interface L1ToL2MessageSource {
      * @param blockNumber - L2 block number to get messages for.
      * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
      */
-    getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
+    getL1ToL2Messages(blockNumber: number): Promise<Fr[]>;
     /**
      * Gets the L1 to L2 message index in the L1 to L2 message tree.
      * @param l1ToL2Message - The L1 to L2 message.
@@ -20,5 +21,9 @@ export interface L1ToL2MessageSource {
      * @returns The number of the latest L2 block processed by the implementation.
      */
     getBlockNumber(): Promise<number>;
+    /**
+     * Returns the tips of the L2 chain.
+     */
+    getL2Tips(): Promise<L2Tips>;
 }
 //# sourceMappingURL=l1_to_l2_message_source.d.ts.map

package/dest/messaging/l1_to_l2_message_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_to_l2_message_source.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_to_l2_message_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAEtD;;;;OAIG;IACH,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEtE;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACnC"}
+{"version":3,"file":"l1_to_l2_message_source.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_to_l2_message_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAEtD;;;;OAIG;IACH,qBAAqB,CAAC,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEtE;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC;;OAEG;IACH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B"}

package/dest/messaging/l2_actor.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 import { AztecAddress } from '../aztec-address/index.js';

package/dest/messaging/l2_actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_actor.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_actor.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;GAEG;AACH,qBAAa,OAAO;IAEhB;;OAEG;aACa,SAAS,EAAE,YAAY;IACvC;;OAEG;aACa,OAAO,EAAE,MAAM;;IAP/B;;OAEG;IACa,SAAS,EAAE,YAAY;IACvC;;OAEG;IACa,OAAO,EAAE,MAAM;IAGjC,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;WAO5C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAGxC"}
+{"version":3,"file":"l2_actor.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_actor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;GAEG;AACH,qBAAa,OAAO;IAEhB;;OAEG;aACa,SAAS,EAAE,YAAY;IACvC;;OAEG;aACa,OAAO,EAAE,MAAM;;IAP/B;;OAEG;IACa,SAAS,EAAE,YAAY;IACvC;;OAEG;IACa,OAAO,EAAE,MAAM;IAGjC,MAAM,CAAC,KAAK;IAIZ,QAAQ,IAAI,EAAE,EAAE;IAIhB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO;WAO5C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;CAGxC"}

package/dest/messaging/l2_to_l1_membership.d.ts

@@ -0,0 +1,14 @@
+import { Fr } from '@aztec/foundation/fields';
+import { SiblingPath } from '@aztec/foundation/trees';
+export interface MessageRetrieval {
+    getL2ToL1Messages(l2BlockNumber: number): Promise<Fr[][] | undefined>;
+}
+export type L2ToL1MembershipWitness = {
+    root: Fr;
+    leafIndex: bigint;
+    siblingPath: SiblingPath<number>;
+};
+export declare function computeL2ToL1MembershipWitness(messageRetriever: MessageRetrieval, l2BlockNumber: number, message: Fr): Promise<L2ToL1MembershipWitness | undefined>;
+export declare function computeL2ToL1MembershipWitnessFromMessagesForAllTxs(messagesForAllTxs: Fr[][], message: Fr): Promise<L2ToL1MembershipWitness>;
+export declare function getL2ToL1MessageLeafId(membershipWitness: Pick<L2ToL1MembershipWitness, 'leafIndex' | 'siblingPath'>): bigint;
+//# sourceMappingURL=l2_to_l1_membership.d.ts.map

package/dest/messaging/l2_to_l1_membership.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"l2_to_l1_membership.d.ts","sourceRoot":"","sources":["../../src/messaging/l2_to_l1_membership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EACL,WAAW,EAKZ,MAAM,yBAAyB,CAAC;AASjC,MAAM,WAAW,gBAAgB;IAC/B,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,CAAC;CACvE;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,EAAE,CAAC;IACT,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,wBAAsB,8BAA8B,CAClD,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,EAAE,GACV,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC,CAO9C;AAED,wBAAsB,mDAAmD,CACvE,iBAAiB,EAAE,EAAE,EAAE,EAAE,EACzB,OAAO,EAAE,EAAE,GACV,OAAO,CAAC,uBAAuB,CAAC,CAuDlC;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,IAAI,CAAC,uBAAuB,EAAE,WAAW,GAAG,aAAa,CAAC,GAC5E,MAAM,CAER"}

package/dest/messaging/l2_to_l1_membership.js

@@ -0,0 +1,65 @@
+import { Fr } from '@aztec/foundation/fields';
+import { SiblingPath, UnbalancedMerkleTreeCalculator, computeUnbalancedMerkleTreeRoot, findLeafLevelAndIndex, getMaxUnbalancedTreeDepth } from '@aztec/foundation/trees';
+async function createOutHashTree(messages) {
+    const messageSubtreeHeight = getMaxUnbalancedTreeDepth(messages.length);
+    const calculator = UnbalancedMerkleTreeCalculator.create(messageSubtreeHeight);
+    await calculator.appendLeaves(messages.map((msg)=>msg.toBuffer()));
+    return calculator;
+}
+export async function computeL2ToL1MembershipWitness(messageRetriever, l2BlockNumber, message) {
+    const messagesForAllTxs = await messageRetriever.getL2ToL1Messages(l2BlockNumber);
+    if (!messagesForAllTxs) {
+        return undefined;
+    }
+    return computeL2ToL1MembershipWitnessFromMessagesForAllTxs(messagesForAllTxs, message);
+}
+export async function computeL2ToL1MembershipWitnessFromMessagesForAllTxs(messagesForAllTxs, message) {
+    // Find index of message in subtree and index of tx in a block.
+    let messageIndexInTx = -1;
+    const txIndex = messagesForAllTxs.findIndex((messages)=>{
+        messageIndexInTx = messages.findIndex((msg)=>msg.equals(message));
+        return messageIndexInTx !== -1;
+    });
+    if (txIndex === -1) {
+        throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
+    }
+    // Get the txOutHash and the sibling path of the message in the tx subtree.
+    const txMessages = messagesForAllTxs[txIndex];
+    const txOutHashTree = await createOutHashTree(txMessages);
+    const txOutHash = txOutHashTree.getRoot();
+    const messagePathInSubtree = await txOutHashTree.getSiblingPath(message);
+    // Calculate txOutHash for all txs.
+    const txSubtreeRoots = messagesForAllTxs.map((messages, i)=>{
+        // For a tx with no messages, we have to set an out hash of 0 to match what the circuit does.
+        if (messages.length === 0) {
+            return Fr.ZERO;
+        }
+        if (i === txIndex) {
+            return Fr.fromBuffer(txOutHash);
+        }
+        const root = computeUnbalancedMerkleTreeRoot(messages.map((msg)=>msg.toBuffer()));
+        return Fr.fromBuffer(root);
+    });
+    // Construct the top tree.
+    // The leaves of this tree are the txOutHashes.
+    // The root of this tree is the out_hash calculated in the circuit.
+    const topTree = await createOutHashTree(txSubtreeRoots);
+    const root = Fr.fromBuffer(topTree.getRoot());
+    // Compute the combined sibling path by appending the tx subtree path to the top tree path.
+    const txPathInTopTree = await topTree.getSiblingPath(txOutHash);
+    const combinedPath = messagePathInSubtree.toBufferArray().concat(txPathInTopTree.toBufferArray());
+    // Compute the combined index.
+    // It is the index of the message in the balanced tree at its current height.
+    const txLeafPosition = findLeafLevelAndIndex(messagesForAllTxs.length, txIndex);
+    const messageLeafPosition = findLeafLevelAndIndex(txMessages.length, messageIndexInTx);
+    const numLeavesInLeftSubtrees = txLeafPosition.indexAtLevel * (1 << messageLeafPosition.level);
+    const combinedIndex = numLeavesInLeftSubtrees + messageLeafPosition.indexAtLevel;
+    return {
+        root,
+        leafIndex: BigInt(combinedIndex),
+        siblingPath: new SiblingPath(combinedPath.length, combinedPath)
+    };
+}
+export function getL2ToL1MessageLeafId(membershipWitness) {
+    return 2n ** BigInt(membershipWitness.siblingPath.pathSize) + membershipWitness.leafIndex;
+}