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

package/dest/tx/tx_context.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, FieldReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
@@ -51,30 +49,30 @@ export declare class TxContext {
                 l2Gas: string | number | bigint;
             }>;
             maxFeesPerGas: z.ZodEffects<z.ZodObject<{
-                feePerDaGas: z.ZodType<Fr, any, string>;
-                feePerL2Gas: z.ZodType<Fr, any, string>;
+                feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                feePerDaGas: Fr;
-                feePerL2Gas: Fr;
+                feePerDaGas: bigint;
+                feePerL2Gas: bigint;
             }, {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             }>, import("../gas/gas_fees.js").GasFees, {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             }>;
             maxPriorityFeesPerGas: z.ZodEffects<z.ZodObject<{
-                feePerDaGas: z.ZodType<Fr, any, string>;
-                feePerL2Gas: z.ZodType<Fr, any, string>;
+                feePerDaGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
+                feePerL2Gas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
             }, "strip", z.ZodTypeAny, {
-                feePerDaGas: Fr;
-                feePerL2Gas: Fr;
+                feePerDaGas: bigint;
+                feePerL2Gas: bigint;
             }, {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             }>, import("../gas/gas_fees.js").GasFees, {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             }>;
         }, "strip", z.ZodTypeAny, {
             gasLimits: import("../gas/gas.js").Gas;
@@ -91,12 +89,12 @@ export declare class TxContext {
                 l2Gas: string | number | bigint;
             };
             maxFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
             maxPriorityFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
         }>, GasSettings, {
             gasLimits: {
@@ -108,12 +106,12 @@ export declare class TxContext {
                 l2Gas: string | number | bigint;
             };
             maxFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
             maxPriorityFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
         }>;
     }, "strip", z.ZodTypeAny, {
@@ -133,12 +131,12 @@ export declare class TxContext {
                 l2Gas: string | number | bigint;
             };
             maxFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
             maxPriorityFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
         };
     }>, TxContext, {
@@ -154,12 +152,12 @@ export declare class TxContext {
                 l2Gas: string | number | bigint;
             };
             maxFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
             maxPriorityFeesPerGas: {
-                feePerDaGas: string;
-                feePerL2Gas: string;
+                feePerDaGas: string | number | bigint;
+                feePerL2Gas: string | number | bigint;
             };
         };
     }>;
@@ -169,7 +167,7 @@ export declare class TxContext {
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static fromFields(fields: Fr[] | FieldReader): TxContext;
     toFields(): Fr[];
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"tx_context.d.ts","sourceRoot":"","sources":["../../src/tx/tx_context.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD;;GAEG;AACH,qBAAa,SAAS;IASlB,uCAAuC;IAChC,WAAW,EAAE,WAAW;IAT1B,OAAO,EAAE,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE,CAAC;;IAGjB,+DAA+D;IAC/D,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,MAAM;IAC7B,8DAA8D;IAC9D,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,MAAM;IAC7B,uCAAuC;IAChC,WAAW,EAAE,WAAW;IAMjC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,OAAO;IAIP,KAAK;IAIL;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,SAAS;IAKxD,QAAQ,IAAI,EAAE,EAAE;IAQhB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAK3D,MAAM,CAAC,KAAK,CAAC,OAAO,GAAE,EAAE,GAAG,MAAU,EAAE,OAAO,GAAE,EAAE,GAAG,MAAU;IAI/D,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS;IAInD;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;CAG7C"}
+{"version":3,"file":"tx_context.d.ts","sourceRoot":"","sources":["../../src/tx/tx_context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD;;GAEG;AACH,qBAAa,SAAS;IASlB,uCAAuC;IAChC,WAAW,EAAE,WAAW;IAT1B,OAAO,EAAE,EAAE,CAAC;IACZ,OAAO,EAAE,EAAE,CAAC;;IAGjB,+DAA+D;IAC/D,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,MAAM;IAC7B,8DAA8D;IAC9D,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,MAAM;IAC7B,uCAAuC;IAChC,WAAW,EAAE,WAAW;IAMjC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED,OAAO;IAIP,KAAK;IAIL;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,SAAS;IAKxD,QAAQ,IAAI,EAAE,EAAE;IAQhB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAK3D,MAAM,CAAC,KAAK,CAAC,OAAO,GAAE,EAAE,GAAG,MAAU,EAAE,OAAO,GAAE,EAAE,GAAG,MAAU;IAI/D,OAAO,IAAI,OAAO;IAIlB;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS;IAInD;;;;OAIG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;CAG7C"}

package/dest/tx/tx_effect.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type FieldsOf } from '@aztec/foundation/array';
 import { Fr } from '@aztec/foundation/fields';
 import { type ZodFor } from '@aztec/foundation/schemas';
@@ -100,6 +97,7 @@ export declare class TxEffect {
      */
     contractClassLogs: ContractClassLog[]);
     toBuffer(): Buffer;
+    equals(other: TxEffect): boolean;
     /** Returns the size of this tx effect in bytes as serialized onto DA. */
     getDASize(): number;
     /**
@@ -110,11 +108,10 @@ export declare class TxEffect {
     static fromBuffer(buffer: Buffer | BufferReader): TxEffect;
     /**
      * Computes txOutHash of this tx effect.
-     * TODO(#7218): Revert to fixed height tree for outbox
-     * @dev Follows new_sha in variable_merkle_tree.nr
+     * @dev Follows new_sha in unbalanced_merkle_tree.nr
      */
     txOutHash(): Buffer;
-    static random(numPublicCallsPerTx?: number, numPublicLogsPerCall?: number): Promise<TxEffect>;
+    static random(numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, maxEffects?: number | undefined): Promise<TxEffect>;
     static empty(): TxEffect;
     isEmpty(): boolean;
     /** Returns a hex representation of the TxEffect object. */

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":";;;AAoBA,OAAO,EAAE,KAAK,QAAQ,EAA6B,MAAM,yBAAyB,CAAC;AAInF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,2BAA2B,CAAC;AACjE,OAAO,EACL,YAAY,EACZ,WAAW,EAGZ,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,eAAO,MAAM,eAAe,uBAAuB,CAAC;AAEpD,eAAO,MAAM,4BAA4B,QAA0C,CAAC;AAEpF,eAAO,MAAM,4BAA4B,QAAmC,CAAC;AAE7E,qBAAa,QAAQ;IAEjB;;OAEG;IACI,UAAU,EAAE,UAAU;IAC7B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,cAAc,EAAE,EAAE;IACzB;;OAEG;IACI,UAAU,EAAE,EAAE,EAAE;IACvB;;OAEG;IACI,UAAU,EAAE,EAAE,EAAE;IACvB;;;OAGG;IACI,UAAU,EAAE,EAAE,EAAE;IACvB;;OAEG;IACI,gBAAgB,EAAE,eAAe,EAAE;IAC1C;;OAEG;IACI,WAAW,EAAE,UAAU,EAAE;IAChC;;OAEG;IACI,UAAU,EAAE,SAAS,EAAE;IAC9B;;OAEG;IACI,iBAAiB,EAAE,gBAAgB,EAAE;;IAxC5C;;OAEG;IACI,UAAU,EAAE,UAAU;IAC7B;;OAEG;IACI,MAAM,EAAE,MAAM;IACrB;;OAEG;IACI,cAAc,EAAE,EAAE;IACzB;;OAEG;IACI,UAAU,EAAE,EAAE,EAAE;IACvB;;OAEG;IACI,UAAU,EAAE,EAAE,EAAE;IACvB;;;OAGG;IACI,UAAU,EAAE,EAAE,EAAE;IACvB;;OAEG;IACI,gBAAgB,EAAE,eAAe,EAAE;IAC1C;;OAEG;IACI,WAAW,EAAE,UAAU,EAAE;IAChC;;OAEG;IACI,UAAU,EAAE,SAAS,EAAE;IAC9B;;OAEG;IACI,iBAAiB,EAAE,gBAAgB,EAAE;IAoD9C,QAAQ,IAAI,MAAM;IAelB,yEAAyE;IACzE,SAAS;IAIT;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ;IAiB1D;;;;OAIG;IACH,SAAS;WAuBI,MAAM,CAAC,mBAAmB,SAAI,EAAE,oBAAoB,SAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;IAezF,MAAM,CAAC,KAAK,IAAI,QAAQ;IAIxB,OAAO,IAAI,OAAO;IAIlB,2DAA2D;IAC3D,QAAQ;IAIR;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAOhB;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;;;;IAK5B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE;;;;IAQjC;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE;IAuB7B;;OAEG;IACH,YAAY,IAAI,EAAE,EAAE;IAyEpB;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAiGhD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAetC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,CAepC;IAED,CAAC,OAAO,CAAC,MAAM,CAAC;IAehB;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}
+{"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

@@ -1,12 +1,11 @@
-import { CONTRACT_CLASS_LOGS_PREFIX, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, L2_L1_MSGS_PREFIX, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTES_PREFIX, NULLIFIERS_PREFIX, PRIVATE_LOGS_PREFIX, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, PUBLIC_LOGS_PREFIX, PUBLIC_LOG_SIZE_IN_FIELDS, REVERT_CODE_PREFIX, TX_FEE_PREFIX } from '@aztec/constants';
+import { CONTRACT_CLASS_LOGS_PREFIX, L2_L1_MSGS_PREFIX, MAX_CONTRACT_CLASS_LOGS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTES_PREFIX, NULLIFIERS_PREFIX, PRIVATE_LOGS_PREFIX, PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, PUBLIC_LOGS_PREFIX, REVERT_CODE_PREFIX, TX_FEE_PREFIX } from '@aztec/constants';
 import { makeTuple, makeTupleAsync } from '@aztec/foundation/array';
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { padArrayEnd } from '@aztec/foundation/collection';
-import { sha256Trunc } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
+import { computeUnbalancedMerkleTreeRoot } from '@aztec/foundation/trees';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { PublicDataWrite } from '../avm/public_data_write.js';
@@ -121,6 +120,9 @@ export class TxEffect {
             serializeArrayOfBufferableToVector(this.contractClassLogs, 1)
         ]);
     }
+    equals(other) {
+        return this.revertCode.equals(other.revertCode) && this.txHash.equals(other.txHash) && this.transactionFee.equals(other.transactionFee) && this.noteHashes.length === other.noteHashes.length && this.noteHashes.every((h, i)=>h.equals(other.noteHashes[i])) && this.nullifiers.length === other.nullifiers.length && this.nullifiers.every((h, i)=>h.equals(other.nullifiers[i])) && this.l2ToL1Msgs.length === other.l2ToL1Msgs.length && this.l2ToL1Msgs.every((h, i)=>h.equals(other.l2ToL1Msgs[i])) && this.publicDataWrites.length === other.publicDataWrites.length && this.publicDataWrites.every((h, i)=>h.equals(other.publicDataWrites[i])) && this.privateLogs.length === other.privateLogs.length && this.privateLogs.every((h, i)=>h.equals(other.privateLogs[i])) && this.publicLogs.length === other.publicLogs.length && this.publicLogs.every((h, i)=>h.equals(other.publicLogs[i])) && this.contractClassLogs.length === other.contractClassLogs.length && this.contractClassLogs.every((h, i)=>h.equals(other.contractClassLogs[i]));
+    }
     /** Returns the size of this tx effect in bytes as serialized onto DA. */ getDASize() {
         return this.toBlobFields().length * Fr.SIZE_IN_BYTES;
     }
@@ -134,31 +136,16 @@ export class TxEffect {
     }
     /**
    * Computes txOutHash of this tx effect.
-   * TODO(#7218): Revert to fixed height tree for outbox
-   * @dev Follows new_sha in variable_merkle_tree.nr
+   * @dev Follows new_sha in unbalanced_merkle_tree.nr
    */ txOutHash() {
         const { l2ToL1Msgs } = this;
         if (l2ToL1Msgs.length == 0) {
             return Buffer.alloc(32);
         }
-        const depth = l2ToL1Msgs.length == 1 ? 1 : Math.ceil(Math.log2(l2ToL1Msgs.length));
-        let thisLayer = padArrayEnd(l2ToL1Msgs.map((msg)=>msg.toBuffer()), Buffer.alloc(32), 2 ** depth);
-        let nextLayer = [];
-        for(let i = 0; i < depth; i++){
-            for(let j = 0; j < thisLayer.length; j += 2){
-                // Store the hash of each pair one layer up
-                nextLayer[j / 2] = sha256Trunc(Buffer.concat([
-                    thisLayer[j],
-                    thisLayer[j + 1]
-                ]));
-            }
-            thisLayer = nextLayer;
-            nextLayer = [];
-        }
-        return thisLayer[0];
+        return computeUnbalancedMerkleTreeRoot(l2ToL1Msgs.map((msg)=>msg.toBuffer()));
     }
-    static async random(numPublicCallsPerTx = 3, numPublicLogsPerCall = 1) {
-        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(MAX_NOTE_HASHES_PER_TX, Fr.random), makeTuple(MAX_NULLIFIERS_PER_TX, Fr.random), makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, Fr.random), makeTuple(MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, ()=>new PublicDataWrite(Fr.random(), Fr.random())), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ()=>new PrivateLog(makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, Fr.random))), await makeTupleAsync(numPublicCallsPerTx * numPublicLogsPerCall, PublicLog.random), await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random));
+    static async random(numPublicCallsPerTx = 3, numPublicLogsPerCall = 1, maxEffects = undefined) {
+        return new TxEffect(RevertCode.random(), TxHash.random(), new Fr(Math.floor(Math.random() * 100_000)), makeTuple(maxEffects === undefined ? MAX_NOTE_HASHES_PER_TX : Math.min(maxEffects, MAX_NOTE_HASHES_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_NULLIFIERS_PER_TX : Math.min(maxEffects, MAX_NULLIFIERS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_L2_TO_L1_MSGS_PER_TX : Math.min(maxEffects, MAX_L2_TO_L1_MSGS_PER_TX), Fr.random), makeTuple(maxEffects === undefined ? MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX : Math.min(maxEffects, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX), PublicDataWrite.random), makeTuple(MAX_PRIVATE_LOGS_PER_TX, ()=>PrivateLog.random()), await makeTupleAsync(numPublicCallsPerTx * numPublicLogsPerCall, async ()=>await PublicLog.random()), await makeTupleAsync(MAX_CONTRACT_CLASS_LOGS_PER_TX, ContractClassLog.random));
     }
     static empty() {
         return new TxEffect(RevertCode.OK, TxHash.zero(), Fr.ZERO, [], [], [], [], [], [], []);
@@ -263,39 +250,20 @@ export class TxEffect {
             flattened.push(...this.l2ToL1Msgs);
         }
         if (this.publicDataWrites.length) {
-            flattened.push(this.toPrefix(PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, this.publicDataWrites.length * 2));
-            flattened.push(...this.publicDataWrites.map((w)=>[
-                    w.leafSlot,
-                    w.value
-                ]).flat());
+            flattened.push(this.toPrefix(PUBLIC_DATA_UPDATE_REQUESTS_PREFIX, this.publicDataWrites.length));
+            flattened.push(...this.publicDataWrites.flatMap((w)=>w.toBlobFields()));
         }
         if (this.privateLogs.length) {
-            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()
-                ]));
+            flattened.push(this.toPrefix(PRIVATE_LOGS_PREFIX, this.privateLogs.length));
+            flattened.push(...this.privateLogs.flatMap((l)=>l.toBlobFields()));
         }
         if (this.publicLogs.length) {
-            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()
-                ]));
+            flattened.push(this.toPrefix(PUBLIC_LOGS_PREFIX, this.publicLogs.length));
+            flattened.push(...this.publicLogs.flatMap((l)=>l.toBlobFields()));
         }
         if (this.contractClassLogs.length) {
-            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()),
-                    l.contractAddress.toField(),
-                    ...l.getEmittedFields()
-                ]));
+            flattened.push(this.toPrefix(CONTRACT_CLASS_LOGS_PREFIX, this.contractClassLogs.length));
+            flattened.push(...this.contractClassLogs.flatMap((l)=>l.toBlobFields()));
         }
         // The first value appended to each list of fields representing a tx effect is:
         // TX_START_PREFIX | 0 | txlen[0] txlen[1] | 0 | REVERT_CODE_PREFIX | 0 | revert_code
@@ -313,15 +281,16 @@ export class TxEffect {
             }
         };
         const effect = this.empty();
-        if (!(fields instanceof FieldReader) && !fields.length) {
+        const reader = FieldReader.asReader(fields);
+        const totalFields = reader.remainingFields();
+        if (!totalFields) {
             return effect;
         }
-        const reader = FieldReader.asReader(fields);
         const firstField = reader.readField();
         if (!this.isFirstField(firstField)) {
             throw new Error('Invalid fields given to TxEffect.fromBlobFields(): First field invalid.');
         }
-        const { length: _, revertCode } = this.decodeFirstField(firstField);
+        const { length: fieldsToProcess, revertCode } = this.decodeFirstField(firstField);
         effect.revertCode = RevertCode.fromField(new Fr(revertCode));
         effect.txHash = new TxHash(reader.readField());
         // TODO: how long should tx fee be? For now, not using fromPrefix()
@@ -332,7 +301,8 @@ export class TxEffect {
             Buffer.alloc(3),
             prefixedFee.toBuffer().subarray(3)
         ]));
-        while(!reader.isFinished()){
+        let fieldsProcessed = totalFields - reader.remainingFields();
+        while(fieldsProcessed < fieldsToProcess){
             const { type, length } = this.fromPrefix(reader.readField());
             switch(type){
                 case NOTES_PREFIX:
@@ -350,53 +320,40 @@ export class TxEffect {
                 case PUBLIC_DATA_UPDATE_REQUESTS_PREFIX:
                     {
                         ensureEmpty(effect.publicDataWrites);
-                        const publicDataPairs = reader.readFieldArray(length);
-                        for(let i = 0; i < length; i += 2){
-                            effect.publicDataWrites.push(new PublicDataWrite(publicDataPairs[i], publicDataPairs[i + 1]));
-                        }
+                        effect.publicDataWrites = Array.from({
+                            length
+                        }, ()=>PublicDataWrite.fromBlobFields(reader));
                         break;
                     }
                 case PRIVATE_LOGS_PREFIX:
                     {
                         ensureEmpty(effect.privateLogs);
-                        const flatPrivateLogs = reader.readFieldArray(length);
-                        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))));
-                        }
+                        effect.privateLogs = Array.from({
+                            length
+                        }, ()=>PrivateLog.fromBlobFields(reader));
                         break;
                     }
                 case PUBLIC_LOGS_PREFIX:
                     {
                         ensureEmpty(effect.publicLogs);
-                        const flatPublicLogs = reader.readFieldArray(length);
-                        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))));
-                        }
+                        effect.publicLogs = Array.from({
+                            length
+                        }, ()=>PublicLog.fromBlobFields(reader));
                         break;
                     }
                 case CONTRACT_CLASS_LOGS_PREFIX:
                     {
                         ensureEmpty(effect.contractClassLogs);
-                        const flatContractClassLogs = reader.readFieldArray(length);
-                        let i = 0;
-                        while(i < length){
-                            const logLen = flatContractClassLogs[i++].toNumber();
-                            // +1 for address
-                            const logFields = flatContractClassLogs.slice(i, i += logLen + 1);
-                            effect.contractClassLogs.push(ContractClassLog.fromFields(logFields.concat(new Array(CONTRACT_CLASS_LOG_SIZE_IN_FIELDS - logLen).fill(Fr.ZERO))));
-                        }
+                        effect.contractClassLogs = Array.from({
+                            length
+                        }, ()=>ContractClassLog.fromBlobFields(reader));
                         break;
                     }
                 case REVERT_CODE_PREFIX:
                 default:
                     throw new Error(`Too many fields to decode given to TxEffect.fromBlobFields()`);
             }
+            fieldsProcessed = totalFields - reader.remainingFields();
         }
         return effect;
     }
@@ -419,16 +376,16 @@ export class TxEffect {
     }
     [inspect.custom]() {
         return `TxEffect {
-      revertCode: ${this.revertCode},
+      revertCode: ${this.revertCode.getCode()},
       txHash: ${this.txHash},
       transactionFee: ${this.transactionFee},
       note hashes: [${this.noteHashes.map((h)=>h.toString()).join(', ')}],
       nullifiers: [${this.nullifiers.map((h)=>h.toString()).join(', ')}],
       l2ToL1Msgs: [${this.l2ToL1Msgs.map((h)=>h.toString()).join(', ')}],
       publicDataWrites: [${this.publicDataWrites.map((h)=>h.toString()).join(', ')}],
-      privateLogs: [${this.privateLogs.map((l)=>l.toString()).join(', ')}],
-      publicLogs: [${this.publicLogs.map((l)=>l.toString()).join(', ')}],
-      contractClassLogs: [${this.contractClassLogs.map((l)=>l.toString()).join(', ')}],
+      privateLogs: [${this.privateLogs.map((l)=>l.fields.map((f)=>f.toString()).join(',')).join(', ')}],
+      publicLogs: [${this.publicLogs.map((l)=>l.fields.map((f)=>f.toString()).join(',')).join(', ')}],
+      contractClassLogs: [${this.contractClassLogs.map((l)=>l.toFields().map((f)=>f.toString()).join(',')).join(', ')}],
      }`;
     }
     /**

package/dest/tx/tx_execution_request.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <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 type { FieldsOf } from '@aztec/foundation/types';
@@ -49,6 +46,11 @@ export declare class TxExecutionRequest {
      * Read-only data passed through the oracle calls during this tx execution.
      */
     capsules: Capsule[];
+    /**
+     * A salt to make the tx request hash difficult to predict.
+     * The hash is used as the first nullifier if there is no nullifier emitted throughout the tx.
+     */
+    salt: Fr;
     constructor(
     /**
      * Sender.
@@ -81,16 +83,21 @@ export declare class TxExecutionRequest {
     /**
      * Read-only data passed through the oracle calls during this tx execution.
      */
-    capsules: Capsule[]);
+    capsules: Capsule[], 
+    /**
+     * A salt to make the tx request hash difficult to predict.
+     * The hash is used as the first nullifier if there is no nullifier emitted throughout the tx.
+     */
+    salt?: Fr);
     static get schema(): ZodFor<TxExecutionRequest>;
     toTxRequest(): TxRequest;
-    static getFields(fields: FieldsOf<TxExecutionRequest>): readonly [AztecAddress, FunctionSelector, Fr, TxContext, HashedValues[], AuthWitness[], Capsule[]];
+    static getFields(fields: FieldsOf<TxExecutionRequest>): readonly [AztecAddress, FunctionSelector, Fr, TxContext, HashedValues[], AuthWitness[], Capsule[], Fr];
     static from(fields: FieldsOf<TxExecutionRequest>): TxExecutionRequest;
     /**
      * Serialize as a buffer.
      * @returns The buffer.
      */
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     /**
      * Serialize as a string.
      * @returns The string.

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

@@ -1 +1 @@
-{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;;IA/B1B;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAG5B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAY9C;IAED,WAAW,IAAI,SAAS;IAUxB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAYrD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB;IAIrE;;;OAGG;IACH,QAAQ;IAYR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;IAapE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;WAIrC,MAAM;IAenB,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}
+{"version":3,"file":"tx_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/tx_execution_request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,kBAAkB;IAE3B;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI;;IApCX;;OAEG;IACI,MAAM,EAAE,YAAY;IAC3B;;OAEG;IACI,gBAAgB,EAAE,gBAAgB;IACzC;;;OAGG;IACI,iBAAiB,EAAE,EAAE;IAC5B;;OAEG;IACI,SAAS,EAAE,SAAS;IAC3B;;;;OAIG;IACI,WAAW,EAAE,YAAY,EAAE;IAClC;;;OAGG;IACI,aAAa,EAAE,WAAW,EAAE;IACnC;;OAEG;IACI,QAAQ,EAAE,OAAO,EAAE;IAC1B;;;OAGG;IACI,IAAI,KAAc;IAG3B,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAa9C;IAED,WAAW,IAAI,SAAS;IAWxB,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAarD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,kBAAkB;IAIrE;;;OAGG;IACH,QAAQ;IAaR;;;OAGG;IACH,QAAQ;IAIR;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,kBAAkB;IAcpE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;WAIrC,MAAM;IAgBnB,CAAC,OAAO,CAAC,MAAM,CAAC;CAGjB"}

package/dest/tx/tx_execution_request.js

@@ -23,6 +23,7 @@ import { TxRequest } from './tx_request.js';
     argsOfCalls;
     authWitnesses;
     capsules;
+    salt;
     constructor(/**
      * Sender.
      */ origin, /**
@@ -41,7 +42,10 @@ import { TxRequest } from './tx_request.js';
      * These witnesses are not expected to be stored in the local witnesses database of the PXE.
      */ authWitnesses, /**
      * Read-only data passed through the oracle calls during this tx execution.
-     */ capsules){
+     */ capsules, /**
+     * A salt to make the tx request hash difficult to predict.
+     * The hash is used as the first nullifier if there is no nullifier emitted throughout the tx.
+     */ salt = Fr.random()){
         this.origin = origin;
         this.functionSelector = functionSelector;
         this.firstCallArgsHash = firstCallArgsHash;
@@ -49,6 +53,7 @@ import { TxRequest } from './tx_request.js';
         this.argsOfCalls = argsOfCalls;
         this.authWitnesses = authWitnesses;
         this.capsules = capsules;
+        this.salt = salt;
     }
     static get schema() {
         return z.object({
@@ -58,12 +63,13 @@ import { TxRequest } from './tx_request.js';
             txContext: TxContext.schema,
             argsOfCalls: z.array(HashedValues.schema),
             authWitnesses: z.array(AuthWitness.schema),
-            capsules: z.array(Capsule.schema)
+            capsules: z.array(Capsule.schema),
+            salt: schemas.Fr
         }).transform(TxExecutionRequest.from);
     }
     toTxRequest() {
-        return new TxRequest(this.origin, // Entrypoints must be private as as defined by the protocol.
-        new FunctionData(this.functionSelector, true), this.firstCallArgsHash, this.txContext);
+        return new TxRequest(this.origin, this.firstCallArgsHash, this.txContext, // Entrypoints must be private as defined by the protocol.
+        new FunctionData(this.functionSelector, true), this.salt);
     }
     static getFields(fields) {
         return [
@@ -73,7 +79,8 @@ import { TxRequest } from './tx_request.js';
             fields.txContext,
             fields.argsOfCalls,
             fields.authWitnesses,
-            fields.capsules
+            fields.capsules,
+            fields.salt
         ];
     }
     static from(fields) {
@@ -83,7 +90,7 @@ import { TxRequest } from './tx_request.js';
    * Serialize as a buffer.
    * @returns The buffer.
    */ toBuffer() {
-        return serializeToBuffer(this.origin, this.functionSelector, this.firstCallArgsHash, this.txContext, new Vector(this.argsOfCalls), new Vector(this.authWitnesses), new Vector(this.capsules));
+        return serializeToBuffer(this.origin, this.functionSelector, this.firstCallArgsHash, this.txContext, new Vector(this.argsOfCalls), new Vector(this.authWitnesses), new Vector(this.capsules), this.salt);
     }
     /**
    * Serialize as a string.
@@ -97,7 +104,7 @@ import { TxRequest } from './tx_request.js';
    * @returns The deserialized TxRequest object.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new TxExecutionRequest(reader.readObject(AztecAddress), reader.readObject(FunctionSelector), Fr.fromBuffer(reader), reader.readObject(TxContext), reader.readVector(HashedValues), reader.readVector(AuthWitness), reader.readVector(Capsule));
+        return new TxExecutionRequest(reader.readObject(AztecAddress), reader.readObject(FunctionSelector), Fr.fromBuffer(reader), reader.readObject(TxContext), reader.readVector(HashedValues), reader.readVector(AuthWitness), reader.readVector(Capsule), Fr.fromBuffer(reader));
     }
     /**
    * Deserializes from a string, corresponding to a write in cpp.
@@ -108,7 +115,7 @@ import { TxRequest } from './tx_request.js';
     }
     static async random() {
         return new TxExecutionRequest(await AztecAddress.random(), FunctionSelector.random(), Fr.random(), TxContext.empty(), [
-            await HashedValues.random()
+            HashedValues.random()
         ], [
             AuthWitness.random()
         ], [
@@ -119,7 +126,7 @@ import { TxRequest } from './tx_request.js';
             new Capsule(await AztecAddress.random(), Fr.random(), [
                 Fr.random()
             ])
-        ]);
+        ], Fr.random());
     }
     [inspect.custom]() {
         return `TxExecutionRequest(${this.origin} called ${this.functionSelector})`;

package/dest/tx/tx_hash.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
 /**
  * A class representing hash of Aztec transaction.
+ * @dev Computed by hashing the public inputs of the private kernel tail circuit (see Tx::getTxHash function).
  */
 export declare class TxHash {
     /** A field representing the tx hash (tx hash is an output of poseidon hash hence it's a field). */
@@ -15,13 +14,21 @@ export declare class TxHash {
     static fromBuffer(buffer: Uint8Array | BufferReader): TxHash;
     static fromString(str: string): TxHash;
     static fromBigInt(value: bigint): TxHash;
-    toBuffer(): Buffer;
+    static fromField(value: Fr): TxHash;
+    toBuffer(): Buffer<ArrayBufferLike>;
     toString(): `0x${string}`;
     toBigInt(): bigint;
     toJSON(): `0x${string}`;
     equals(other: TxHash): boolean;
-    static get schema(): import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, string, string>, Buffer, string>, TxHash, string>;
+    static get schema(): import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodString, string, string>, string, string>, Buffer<ArrayBuffer>, string>, TxHash, string>;
     static zero(): TxHash;
     static get SIZE(): number;
 }
+/**
+ * Helper class to handle Serialization and Deserialization of TxHashes array.
+ **/
+export declare class TxHashArray extends Array<TxHash> {
+    static fromBuffer(buffer: Buffer | BufferReader): TxHashArray;
+    toBuffer(): Buffer;
+}
 //# sourceMappingURL=tx_hash.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tx_hash.d.ts","sourceRoot":"","sources":["../../src/tx/tx_hash.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D;;GAEG;AACH,qBAAa,MAAM;IAEf,mGAAmG;aACnF,IAAI,EAAE,EAAE;;IADxB,mGAAmG;IACnF,IAAI,EAAE,EAAE;IAO1B,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY;IAKnD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM;IAIxB,QAAQ;IAIR,QAAQ;IAIR,QAAQ;IAIf,MAAM;IAIC,MAAM,CAAC,KAAK,EAAE,MAAM;IAI3B,MAAM,KAAK,MAAM,oMAEhB;IAED,MAAM,CAAC,IAAI;IAIX,MAAM,KAAK,IAAI,WAEd;CACF"}
+{"version":3,"file":"tx_hash.d.ts","sourceRoot":"","sources":["../../src/tx/tx_hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAsC,MAAM,6BAA6B,CAAC;AAI/F;;;GAGG;AACH,qBAAa,MAAM;IAEf,mGAAmG;aACnF,IAAI,EAAE,EAAE;;IADxB,mGAAmG;IACnF,IAAI,EAAE,EAAE;IAG1B,MAAM,CAAC,MAAM;IAIb,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY;IAKnD,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;IAI7B,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM;IAI/B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE;IAInB,QAAQ;IAIR,QAAQ;IAIR,QAAQ;IAIf,MAAM;IAIC,MAAM,CAAC,KAAK,EAAE,MAAM;IAI3B,MAAM,KAAK,MAAM,iNAEhB;IAED,MAAM,CAAC,IAAI;IAIX,MAAM,KAAK,IAAI,WAEd;CACF;AAED;;IAEI;AACJ,qBAAa,WAAY,SAAQ,KAAK,CAAC,MAAM,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAWxC,QAAQ,IAAI,MAAM;CAG1B"}