@aztec/stdlib 1.2.0 → 2.0.0-nightly.20250813

package/dest/tx/simulated_tx.d.ts

@@ -2,7 +2,6 @@ import { type ZodFor } from '@aztec/foundation/schemas';
 import type { FieldsOf } from '@aztec/foundation/types';
 import { z } from 'zod';
 import { type ContractArtifact } from '../abi/abi.js';
-import { AztecAddress } from '../aztec-address/index.js';
 import { type ContractInstanceWithAddress } from '../contract/interfaces/contract_instance.js';
 import type { GasUsed } from '../gas/gas_used.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
@@ -16,14 +15,13 @@ export type ContractOverrides = Record<string, {
 }>;
 export declare class SimulationOverrides {
     contracts?: ContractOverrides | undefined;
-    msgSender?: AztecAddress | undefined;
-    constructor(contracts?: ContractOverrides | undefined, msgSender?: AztecAddress | undefined);
+    constructor(contracts?: ContractOverrides | undefined);
     static get schema(): z.ZodEffects<z.ZodObject<{
         contracts: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
             instance: z.ZodIntersection<z.ZodObject<{
                 version: z.ZodLiteral<1>;
                 salt: ZodFor<import("@aztec/foundation/schemas").Fr>;
-                deployer: ZodFor<AztecAddress>;
+                deployer: ZodFor<import("../aztec-address/index.js").AztecAddress>;
                 currentContractClassId: ZodFor<import("@aztec/foundation/schemas").Fr>;
                 originalContractClassId: ZodFor<import("@aztec/foundation/schemas").Fr>;
                 initializationHash: ZodFor<import("@aztec/foundation/schemas").Fr>;
@@ -52,7 +50,7 @@ export declare class SimulationOverrides {
                 version: 1;
                 salt: import("@aztec/foundation/schemas").Fr;
                 publicKeys: import("../keys/public_keys.js").PublicKeys;
-                deployer: AztecAddress;
+                deployer: import("../aztec-address/index.js").AztecAddress;
                 currentContractClassId: import("@aztec/foundation/schemas").Fr;
                 originalContractClassId: import("@aztec/foundation/schemas").Fr;
                 initializationHash: import("@aztec/foundation/schemas").Fr;
@@ -70,9 +68,9 @@ export declare class SimulationOverrides {
                 originalContractClassId?: any;
                 initializationHash?: any;
             }>, z.ZodObject<{
-                address: ZodFor<AztecAddress>;
+                address: ZodFor<import("../aztec-address/index.js").AztecAddress>;
             }, "strip", z.ZodTypeAny, {
-                address: AztecAddress;
+                address: import("../aztec-address/index.js").AztecAddress;
             }, {
                 address?: any;
             }>>;
@@ -82,12 +80,12 @@ export declare class SimulationOverrides {
                 version: 1;
                 salt: import("@aztec/foundation/schemas").Fr;
                 publicKeys: import("../keys/public_keys.js").PublicKeys;
-                deployer: AztecAddress;
+                deployer: import("../aztec-address/index.js").AztecAddress;
                 currentContractClassId: import("@aztec/foundation/schemas").Fr;
                 originalContractClassId: import("@aztec/foundation/schemas").Fr;
                 initializationHash: import("@aztec/foundation/schemas").Fr;
             } & {
-                address: AztecAddress;
+                address: import("../aztec-address/index.js").AztecAddress;
             };
             artifact: ContractArtifact;
         }, {
@@ -109,25 +107,22 @@ export declare class SimulationOverrides {
             };
             artifact?: any;
         }>>>;
-        msgSender: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
     }, "strip", z.ZodTypeAny, {
-        msgSender?: AztecAddress | undefined;
         contracts?: Record<string, {
             instance: {
                 version: 1;
                 salt: import("@aztec/foundation/schemas").Fr;
                 publicKeys: import("../keys/public_keys.js").PublicKeys;
-                deployer: AztecAddress;
+                deployer: import("../aztec-address/index.js").AztecAddress;
                 currentContractClassId: import("@aztec/foundation/schemas").Fr;
                 originalContractClassId: import("@aztec/foundation/schemas").Fr;
                 initializationHash: import("@aztec/foundation/schemas").Fr;
             } & {
-                address: AztecAddress;
+                address: import("../aztec-address/index.js").AztecAddress;
             };
             artifact: ContractArtifact;
         }> | undefined;
     }, {
-        msgSender?: any;
         contracts?: Record<string, {
             instance: {
                 version: 1;
@@ -148,7 +143,6 @@ export declare class SimulationOverrides {
             artifact?: any;
         }> | undefined;
     }>, SimulationOverrides, {
-        msgSender?: any;
         contracts?: Record<string, {
             instance: {
                 version: 1;
@@ -175,7 +169,7 @@ export declare class PrivateSimulationResult {
     publicInputs: PrivateKernelTailCircuitPublicInputs;
     constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs);
     getPrivateReturnValues(): NestedProcessReturnValues;
-    toSimulatedTx(): Tx;
+    toSimulatedTx(): Promise<Tx>;
 }
 export declare class TxSimulationResult {
     privateExecutionResult: PrivateExecutionResult;
@@ -189,7 +183,7 @@ export declare class TxSimulationResult {
     static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult: PrivateSimulationResult, publicOutput?: PublicSimulationOutput, stats?: SimulationStats): TxSimulationResult;
     static random(): Promise<TxSimulationResult>;
     getPrivateReturnValues(): NestedProcessReturnValues;
-    toSimulatedTx(): Tx;
+    toSimulatedTx(): Promise<Tx>;
     getPublicReturnValues(): NestedProcessReturnValues[];
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"simulated_tx.d.ts","sourceRoot":"","sources":["../../src/tx/simulated_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,6CAA6C,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAE9G,OAAO,EAEL,sBAAsB,EAEvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAO7B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CACpC,MAAM,EACN;IAAE,QAAQ,EAAE,2BAA2B,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CACtE,CAAC;AAMF,qBAAa,mBAAmB;IAErB,SAAS,CAAC,EAAE,iBAAiB;IAC7B,SAAS,CAAC,EAAE,YAAY;gBADxB,SAAS,CAAC,EAAE,iBAAiB,YAAA,EAC7B,SAAS,CAAC,EAAE,YAAY,YAAA;IAGjC,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAchB;CACF;AAED,qBAAa,uBAAuB;IAEzB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;gBADlD,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC;IAG3D,sBAAsB;IAItB,aAAa,IAAI,EAAE;CAWpB;AAED,qBAAa,kBAAkB;IAEpB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,YAAY,CAAC,EAAE,sBAAsB;IACrC,KAAK,CAAC,EAAE,eAAe;gBAHvB,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,YAAY,CAAC,EAAE,sBAAsB,YAAA,EACrC,KAAK,CAAC,EAAE,eAAe,YAAA;IAGhC,IAAI,OAAO,IAAI,OAAO,CASrB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAS9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IASjE,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB,EACrC,KAAK,CAAC,EAAE,eAAe;WAUZ,MAAM;IAQnB,sBAAsB;IAItB,aAAa,IAAI,EAAE;IAInB,qBAAqB;CAGtB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,sBAAsB,GAAG,yBAAyB,CAWhH"}
+{"version":3,"file":"simulated_tx.d.ts","sourceRoot":"","sources":["../../src/tx/simulated_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAY,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,gBAAgB,EAA0B,MAAM,eAAe,CAAC;AAC9E,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,6CAA6C,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAE9G,OAAO,EAEL,sBAAsB,EAEvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAO7B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CACpC,MAAM,EACN;IAAE,QAAQ,EAAE,2BAA2B,CAAC;IAAC,QAAQ,EAAE,gBAAgB,CAAA;CAAE,CACtE,CAAC;AAMF,qBAAa,mBAAmB;IACX,SAAS,CAAC,EAAE,iBAAiB;gBAA7B,SAAS,CAAC,EAAE,iBAAiB,YAAA;IAEhD,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAahB;CACF;AAED,qBAAa,uBAAuB;IAEzB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;gBADlD,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC;IAG3D,sBAAsB;IAIhB,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC;CAUnC;AAED,qBAAa,kBAAkB;IAEpB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,YAAY,CAAC,EAAE,sBAAsB;IACrC,KAAK,CAAC,EAAE,eAAe;gBAHvB,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,YAAY,CAAC,EAAE,sBAAsB,YAAA,EACrC,KAAK,CAAC,EAAE,eAAe,YAAA;IAGhC,IAAI,OAAO,IAAI,OAAO,CASrB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAS9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IASjE,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB,EACrC,KAAK,CAAC,EAAE,eAAe;WAUZ,MAAM;IAQnB,sBAAsB;IAItB,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC;IAI5B,qBAAqB;CAGtB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,sBAAsB,GAAG,yBAAyB,CAWhH"}

package/dest/tx/simulated_tx.js

@@ -1,7 +1,6 @@
 import { optional } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 import { ContractArtifactSchema } from '../abi/abi.js';
-import { AztecAddress } from '../aztec-address/index.js';
 import { ContractInstanceWithAddressSchema } from '../contract/interfaces/contract_instance.js';
 import { Gas } from '../gas/gas.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
@@ -15,20 +14,17 @@ import { Tx } from './tx.js';
  * set, it *must* be run without the kernel circuits, or validations will fail
  */ export class SimulationOverrides {
     contracts;
-    msgSender;
-    constructor(contracts, msgSender){
+    constructor(contracts){
         this.contracts = contracts;
-        this.msgSender = msgSender;
     }
     static get schema() {
         return z.object({
             contracts: optional(z.record(z.string(), z.object({
                 instance: ContractInstanceWithAddressSchema,
                 artifact: ContractArtifactSchema
-            }))),
-            msgSender: optional(AztecAddress.schema)
-        }).transform(({ contracts, msgSender })=>{
-            return new SimulationOverrides(contracts, msgSender);
+            })))
+        }).transform(({ contracts })=>{
+            return new SimulationOverrides(contracts);
         });
     }
 }
@@ -42,10 +38,14 @@ export class PrivateSimulationResult {
     getPrivateReturnValues() {
         return accumulatePrivateReturnValues(this.privateExecutionResult);
     }
-    toSimulatedTx() {
+    async toSimulatedTx() {
         const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
-        const tx = new Tx(this.publicInputs, ClientIvcProof.empty(), contractClassLogs, this.privateExecutionResult.publicFunctionCalldata);
-        return tx;
+        return await Tx.create({
+            data: this.publicInputs,
+            clientIvcProof: ClientIvcProof.empty(),
+            contractClassLogFields: contractClassLogs,
+            publicFunctionCalldata: this.privateExecutionResult.publicFunctionCalldata
+        });
     }
 }
 export class TxSimulationResult {
@@ -102,7 +102,7 @@ export class TxSimulationResult {
  */ export function accumulatePrivateReturnValues(executionResult) {
     const collectPrivateReturnValuesRecursive = (executionResult)=>{
         const acc = new NestedProcessReturnValues(executionResult.returnValues);
-        acc.nested = executionResult.nestedExecutions.map((nestedExecution)=>collectPrivateReturnValuesRecursive(nestedExecution));
+        acc.nested = executionResult.nestedExecutionResults.map((nestedExecutionResult)=>collectPrivateReturnValuesRecursive(nestedExecutionResult));
         return acc;
     };
     return collectPrivateReturnValuesRecursive(executionResult.entrypoint);

package/dest/tx/tx.d.ts

@@ -20,6 +20,8 @@ import { TxHash } from './tx_hash.js';
  */
 export declare class Tx extends Gossipable {
     #private;
+    /** Identifier of the tx */
+    readonly txHash: TxHash;
     /**
      * Output of the private kernel circuit for this tx.
      */
@@ -34,15 +36,16 @@ export declare class Tx extends Gossipable {
      * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
      * It's checked in data_validator.ts
      */
-    contractClassLogFields: ContractClassLogFields[];
+    readonly contractClassLogFields: ContractClassLogFields[];
     /**
      * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    publicFunctionCalldata: HashedValues[];
+    readonly publicFunctionCalldata: HashedValues[];
     static p2pTopic: TopicType;
-    private txHash;
     private calldataMap;
     constructor(
+    /** Identifier of the tx */
+    txHash: TxHash, 
     /**
      * Output of the private kernel circuit for this tx.
      */
@@ -83,6 +86,8 @@ export declare class Tx extends Gossipable {
      */
     toBuffer(): Buffer<ArrayBufferLike>;
     static get schema(): ZodFor<Tx>;
+    static computeTxHash(fields: Pick<FieldsOf<Tx>, 'data'>): Promise<TxHash>;
+    static create(fields: Omit<FieldsOf<Tx>, 'txHash'>): Promise<Tx>;
     static from(fields: FieldsOf<Tx>): Tx;
     /**
      * Gets public logs emitted by this tx.
@@ -98,38 +103,26 @@ export declare class Tx extends Gossipable {
      */
     getSplitContractClassLogs(revertible: boolean): ContractClassLog[];
     /**
-     * Computes (if necessary) & return transaction hash.
+     * Return transaction hash.
      * @returns The hash of the public inputs of the private kernel tail circuit.
      */
-    getTxHash(forceRecompute?: boolean): Promise<TxHash>;
+    getTxHash(): TxHash;
     /**
      * Allows setting the hash of the Tx.
      * Use this when you want to skip computing it from the original data.
      * Don't set a Tx hash received from an untrusted source.
      * @param hash - The hash to set.
      */
-    setTxHash(hash: TxHash): void;
+    setTxHash(_hash: TxHash): this;
     getCalldataMap(): Map<string, Fr[]>;
     /** Returns stats about this tx. */
-    getStats(): Promise<TxStats>;
+    getStats(): TxStats;
     getSize(): number;
     /**
      * 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(): number;
-    /**
-     * Convenience function to get a hash out of a tx or a tx-like.
-     * @param tx - Tx-like object.
-     * @returns - The hash.
-     */
-    static getHash(tx: Tx | HasHash): Promise<TxHash>;
-    /**
-     * Convenience function to get array of hashes for an array of txs.
-     * @param txs - The txs to get the hashes from.
-     * @returns The corresponding array of hashes.
-     */
-    static getHashes(txs: (Tx | HasHash)[]): Promise<TxHash[]>;
     /**
      * Clones a tx, making a deep copy of all fields.
      * @param tx - The transaction to be cloned.
@@ -141,11 +134,18 @@ export declare class Tx extends Gossipable {
      * @param randomProof - Whether to create a random proof - this will be random bytes of the full size.
      * @returns A random tx.
      */
-    static random(randomProof?: boolean): Tx;
+    static random(args?: {
+        randomProof?: boolean;
+        txHash?: string | TxHash;
+    }): Tx;
+    /** Recomputes the tx hash. Used for testing purposes only when a property of the tx was mutated. */
+    recomputeHash(): Promise<void>;
+}
+/**
+ * Helper class to handle Serialization and Deserialization of Txs array.
+ */
+export declare class TxArray extends Array<Tx> {
+    static fromBuffer(buffer: Buffer | BufferReader): TxArray;
+    toBuffer(): Buffer;
 }
-/** Utility type for an entity that has a hash property for a txhash */
-type HasHash = {
-    hash: TxHash;
-};
-export {};
 //# sourceMappingURL=tx.d.ts.map

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

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

package/dest/tx/tx.js

@@ -14,15 +14,14 @@ import { TxHash } from './tx_hash.js';
 /**
  * The interface of an L2 transaction.
  */ export class Tx extends Gossipable {
+    txHash;
     data;
     clientIvcProof;
     contractClassLogFields;
     publicFunctionCalldata;
     static p2pTopic = TopicType.tx;
-    // For memoization
-    txHash;
     calldataMap;
-    constructor(/**
+    constructor(/** Identifier of the tx */ txHash, /**
      * Output of the private kernel circuit for this tx.
      */ data, /**
      * Proof from the private kernel circuit.
@@ -34,11 +33,11 @@ import { TxHash } from './tx_hash.js';
      */ contractClassLogFields, /**
      * An array of calldata for the enqueued public function calls and the teardown function call.
      */ publicFunctionCalldata){
-        super(), this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogFields = contractClassLogFields, this.publicFunctionCalldata = publicFunctionCalldata;
+        super(), this.txHash = txHash, this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogFields = contractClassLogFields, this.publicFunctionCalldata = publicFunctionCalldata;
     }
     // Gossipable method
-    async generateP2PMessageIdentifier() {
-        return new Buffer32((await this.getTxHash()).toBuffer());
+    generateP2PMessageIdentifier() {
+        return Promise.resolve(new Buffer32(this.getTxHash().toBuffer()));
     }
     hasPublicCalls() {
         return this.numberOfPublicCalls() > 0;
@@ -79,13 +78,14 @@ import { TxHash } from './tx_hash.js';
    * @returns An instance of Tx.
    */ static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new Tx(reader.readObject(PrivateKernelTailCircuitPublicInputs), reader.readObject(ClientIvcProof), reader.readVectorUint8Prefix(ContractClassLogFields), reader.readVectorUint8Prefix(HashedValues));
+        return new Tx(reader.readObject(TxHash), reader.readObject(PrivateKernelTailCircuitPublicInputs), reader.readObject(ClientIvcProof), reader.readVectorUint8Prefix(ContractClassLogFields), reader.readVectorUint8Prefix(HashedValues));
     }
     /**
    * Serializes the Tx object into a Buffer.
    * @returns Buffer representation of the Tx object.
    */ toBuffer() {
         return serializeToBuffer([
+            this.txHash,
             this.data,
             this.clientIvcProof,
             serializeArrayOfBufferableToVector(this.contractClassLogFields, 1),
@@ -98,18 +98,29 @@ import { TxHash } from './tx_hash.js';
             clientIvcProof: ClientIvcProof.schema,
             contractClassLogFields: z.array(ContractClassLogFields.schema),
             publicFunctionCalldata: z.array(HashedValues.schema)
-        }).transform(Tx.from);
+        }).transform(Tx.create);
+    }
+    static async computeTxHash(fields) {
+        const hash = fields.data.forPublic ? await fields.data.toPrivateToPublicKernelCircuitPublicInputs().hash() : await fields.data.toPrivateToRollupKernelCircuitPublicInputs().hash();
+        return new TxHash(hash);
+    }
+    static async create(fields) {
+        const txHash = await Tx.computeTxHash(fields);
+        return Tx.from({
+            ...fields,
+            txHash
+        });
     }
     static from(fields) {
-        return new Tx(fields.data, fields.clientIvcProof, fields.contractClassLogFields, fields.publicFunctionCalldata);
+        return new Tx(fields.txHash, fields.data, fields.clientIvcProof, fields.contractClassLogFields, fields.publicFunctionCalldata);
     }
     /**
    * Gets public logs emitted by this tx.
    * @param logsSource - An instance of `L2LogsSource` which can be used to obtain the logs.
    * @returns The requested logs.
-   */ async getPublicLogs(logsSource) {
+   */ getPublicLogs(logsSource) {
         return logsSource.getPublicLogs({
-            txHash: await this.getTxHash()
+            txHash: this.getTxHash()
         });
     }
     getContractClassLogs() {
@@ -133,13 +144,9 @@ import { TxHash } from './tx_hash.js';
         return revertible ? contractClassLogs.slice(numNonRevertible) : contractClassLogs.slice(0, numNonRevertible);
     }
     /**
-   * Computes (if necessary) & return transaction hash.
+   * Return transaction hash.
    * @returns The hash of the public inputs of the private kernel tail circuit.
-   */ async getTxHash(forceRecompute = false) {
-        if (!this.txHash || forceRecompute) {
-            const hash = this.data.forPublic ? await this.data.toPrivateToPublicKernelCircuitPublicInputs().hash() : await this.data.toPrivateToRollupKernelCircuitPublicInputs().hash();
-            this.txHash = new TxHash(hash);
-        }
+   */ getTxHash() {
         return this.txHash;
     }
     /**
@@ -147,8 +154,8 @@ import { TxHash } from './tx_hash.js';
    * Use this when you want to skip computing it from the original data.
    * Don't set a Tx hash received from an untrusted source.
    * @param hash - The hash to set.
-   */ setTxHash(hash) {
-        this.txHash = hash;
+   */ setTxHash(_hash) {
+        return this;
     }
     getCalldataMap() {
         if (!this.calldataMap) {
@@ -158,13 +165,13 @@ import { TxHash } from './tx_hash.js';
         }
         return this.calldataMap;
     }
-    /** Returns stats about this tx. */ async getStats() {
+    /** Returns stats about this tx. */ getStats() {
         return {
-            txHash: (await this.getTxHash()).toString(),
+            txHash: this.txHash.toString(),
             noteHashCount: this.data.getNonEmptyNoteHashes().length,
             nullifierCount: this.data.getNonEmptyNullifiers().length,
             privateLogCount: this.data.getNonEmptyPrivateLogs().length,
-            classRegisteredCount: this.data.getNonEmptyContractClassLogsHashes().length,
+            classPublishedCount: this.data.getNonEmptyContractClassLogsHashes().length,
             contractClassLogSize: this.data.getEmittedContractClassLogsLength(),
             proofSize: this.clientIvcProof.clientIvcProofBuffer.length,
             size: this.toBuffer().length,
@@ -182,20 +189,6 @@ import { TxHash } from './tx_hash.js';
         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.
-   * @param tx - Tx-like object.
-   * @returns - The hash.
-   */ static async getHash(tx) {
-        return hasHash(tx) ? tx.hash : await tx.getTxHash();
-    }
-    /**
-   * Convenience function to get array of hashes for an array of txs.
-   * @param txs - The txs to get the hashes from.
-   * @returns The corresponding array of hashes.
-   */ static async getHashes(txs) {
-        return await Promise.all(txs.map(Tx.getHash));
-    }
-    /**
    * Clones a tx, making a deep copy of all fields.
    * @param tx - The transaction to be cloned.
    * @returns The cloned transaction.
@@ -204,22 +197,28 @@ import { TxHash } from './tx_hash.js';
         const clientIvcProof = ClientIvcProof.fromBuffer(tx.clientIvcProof.toBuffer());
         const contractClassLogFields = tx.contractClassLogFields.map((p)=>p.clone());
         const publicFunctionCalldata = tx.publicFunctionCalldata.map((cd)=>HashedValues.fromBuffer(cd.toBuffer()));
-        const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogFields, publicFunctionCalldata);
-        if (tx.txHash) {
-            clonedTx.setTxHash(TxHash.fromBuffer(tx.txHash.toBuffer()));
-        }
+        const clonedTx = new Tx(tx.txHash, publicInputs, clientIvcProof, contractClassLogFields, publicFunctionCalldata);
         return clonedTx;
     }
     /**
    * Creates a random tx.
    * @param randomProof - Whether to create a random proof - this will be random bytes of the full size.
    * @returns A random tx.
-   */ static random(randomProof = false) {
-        return new Tx(PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(), randomProof ? ClientIvcProof.random() : ClientIvcProof.empty(), [
-            ContractClassLogFields.random()
-        ], [
-            HashedValues.random()
-        ]);
+   */ static random(args = {}) {
+        return Tx.from({
+            txHash: (typeof args.txHash === 'string' ? TxHash.fromString(args.txHash) : args.txHash) ?? TxHash.random(),
+            data: PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(),
+            clientIvcProof: args.randomProof ? ClientIvcProof.random() : ClientIvcProof.empty(),
+            contractClassLogFields: [
+                ContractClassLogFields.random()
+            ],
+            publicFunctionCalldata: [
+                HashedValues.random()
+            ]
+        });
+    }
+    /** Recomputes the tx hash. Used for testing purposes only when a property of the tx was mutated. */ async recomputeHash() {
+        this.txHash = await Tx.computeTxHash(this);
     }
     #combinePublicCallRequestWithCallData(request) {
         const calldataMap = this.getCalldataMap();
@@ -229,6 +228,19 @@ import { TxHash } from './tx_hash.js';
         return new PublicCallRequestWithCalldata(request, calldata);
     }
 }
-function hasHash(tx) {
-    return tx.hash !== undefined;
+/**
+ * Helper class to handle Serialization and Deserialization of Txs array.
+ */ export class TxArray extends Array {
+    static fromBuffer(buffer) {
+        try {
+            const reader = BufferReader.asReader(buffer);
+            const txs = reader.readVector(Tx);
+            return new TxArray(...txs);
+        } catch  {
+            return new TxArray();
+        }
+    }
+    toBuffer() {
+        return serializeArrayOfBufferableToVector(this);
+    }
 }

package/dest/tx/tx_effect.d.ts

@@ -108,9 +108,9 @@ export declare class TxEffect {
     static fromBuffer(buffer: Buffer | BufferReader): TxEffect;
     /**
      * Computes txOutHash of this tx effect.
-     * @dev Follows new_sha in variable_merkle_tree.nr
+     * @dev Follows new_sha in unbalanced_merkle_tree.nr
      */
-    txOutHash(): Buffer<ArrayBufferLike>;
+    txOutHash(): Buffer;
     static random(numPublicCallsPerTx?: number, numPublicLogsPerCall?: number, maxEffects?: number | undefined): Promise<TxEffect>;
     static empty(): TxEffect;
     isEmpty(): boolean;

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

@@ -1,12 +1,11 @@
 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';
@@ -137,27 +136,13 @@ export class TxEffect {
     }
     /**
    * Computes txOutHash of this tx effect.
-   * @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, 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));

package/dest/tx/tx_execution_request.js

@@ -68,8 +68,8 @@ import { TxRequest } from './tx_request.js';
         }).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, this.salt);
+        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 [

package/dest/tx/tx_hash.d.ts

@@ -24,4 +24,11 @@ export declare class TxHash {
     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;;;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"}
+{"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"}

package/dest/tx/tx_hash.js

@@ -1,5 +1,5 @@
 import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
+import { BufferReader, serializeArrayOfBufferableToVector } from '@aztec/foundation/serialize';
 import { schemas } from '../schemas/index.js';
 /**
  * A class representing hash of Aztec transaction.
@@ -50,3 +50,21 @@ import { schemas } from '../schemas/index.js';
         return Fr.SIZE_IN_BYTES;
     }
 }
+/**
+ * Helper class to handle Serialization and Deserialization of TxHashes array.
+ **/ export class TxHashArray extends Array {
+    static fromBuffer(buffer) {
+        try {
+            const reader = BufferReader.asReader(buffer);
+            const hashes = reader.readVector(TxHash);
+            return new TxHashArray(...hashes);
+        } catch  {
+            return new TxHashArray();
+        }
+    }
+    toBuffer() {
+        return serializeArrayOfBufferableToVector([
+            ...this
+        ]);
+    }
+}