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

package/dest/tx/tx.d.ts

@@ -1,24 +1,27 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Buffer32 } from '@aztec/foundation/buffer';
+import { Fr } from '@aztec/foundation/fields';
 import type { ZodFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 import type { FieldsOf } from '@aztec/foundation/types';
 import type { GasSettings } from '../gas/gas_settings.js';
 import type { GetPublicLogsResponse } from '../interfaces/get_logs_response.js';
 import type { L2LogsSource } from '../interfaces/l2_logs_source.js';
-import type { ScopedLogHash } from '../kernel/log_hash.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import { ContractClassLog } from '../logs/contract_class_log.js';
+import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
+import { TopicType } from '../p2p/topic_type.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import type { TxStats } from '../stats/stats.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
+import { PublicCallRequestWithCalldata } from './public_call_request_with_calldata.js';
 import { TxHash } from './tx_hash.js';
 /**
  * The interface of an L2 transaction.
  */
 export declare class Tx extends Gossipable {
+    #private;
+    /** Identifier of the tx */
+    readonly txHash: TxHash;
     /**
      * Output of the private kernel circuit for this tx.
      */
@@ -26,24 +29,23 @@ export declare class Tx extends Gossipable {
     /**
      * Proof from the private kernel circuit.
      * TODO(#7368): This client IVC object currently contains various VKs that will eventually be more like static data.
-     *
      */
     readonly clientIvcProof: ClientIvcProof;
     /**
-     * Contract class logs generated by the tx.
+     * Contract class log fields emitted from the tx.
+     * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
+     * It's checked in data_validator.ts
      */
-    contractClassLogs: ContractClassLog[];
+    readonly contractClassLogFields: ContractClassLogFields[];
     /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
+     * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    readonly enqueuedPublicFunctionCalls: PublicExecutionRequest[];
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */
-    readonly publicTeardownFunctionCall: PublicExecutionRequest;
-    static p2pTopic: string;
-    private txHash;
+    readonly publicFunctionCalldata: HashedValues[];
+    static p2pTopic: TopicType;
+    private calldataMap;
     constructor(
+    /** Identifier of the tx */
+    txHash: TxHash, 
     /**
      * Output of the private kernel circuit for this tx.
      */
@@ -51,27 +53,26 @@ export declare class Tx extends Gossipable {
     /**
      * Proof from the private kernel circuit.
      * TODO(#7368): This client IVC object currently contains various VKs that will eventually be more like static data.
-     *
      */
     clientIvcProof: ClientIvcProof, 
     /**
-     * Contract class logs generated by the tx.
+     * Contract class log fields emitted from the tx.
+     * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
+     * It's checked in data_validator.ts
      */
-    contractClassLogs: ContractClassLog[], 
+    contractClassLogFields: ContractClassLogFields[], 
     /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
+     * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    enqueuedPublicFunctionCalls: PublicExecutionRequest[], 
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */
-    publicTeardownFunctionCall: PublicExecutionRequest);
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    publicFunctionCalldata: HashedValues[]);
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     hasPublicCalls(): boolean;
-    getNonRevertiblePublicExecutionRequests(): PublicExecutionRequest[];
-    getRevertiblePublicExecutionRequests(): PublicExecutionRequest[];
-    getPublicTeardownExecutionRequest(): PublicExecutionRequest | undefined;
-    getTotalPublicArgsCount(): number;
+    numberOfPublicCalls(): number;
+    getNonRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];
+    getRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];
+    getTeardownPublicCallRequestWithCalldata(): PublicCallRequestWithCalldata | undefined;
+    getPublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];
+    getTotalPublicCalldataCount(): number;
     getGasSettings(): GasSettings;
     /**
      * Deserializes the Tx object from a Buffer.
@@ -79,13 +80,14 @@ export declare class Tx extends Gossipable {
      * @returns An instance of Tx.
      */
     static fromBuffer(buffer: Buffer | BufferReader): Tx;
-    static newWithTxData(data: PrivateKernelTailCircuitPublicInputs, publicTeardownExecutionRequest?: PublicExecutionRequest): Tx;
     /**
      * Serializes the Tx object into a Buffer.
      * @returns Buffer representation of the Tx object.
      */
-    toBuffer(): Buffer;
+    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.
@@ -93,51 +95,27 @@ export declare class Tx extends Gossipable {
      * @returns The requested logs.
      */
     getPublicLogs(logsSource: L2LogsSource): Promise<GetPublicLogsResponse>;
+    getContractClassLogs(): ContractClassLog[];
     /**
      * Gets either revertible or non revertible contract class logs emitted by this tx.
-     * @param revertible - true for revertible only logs, false for non reverible only logs.
+     * @param revertible - true for revertible only logs, false for non revertible only logs.
      * @returns The requested logs.
      */
-    getSplitContractClassLogs(revertible: boolean, silo?: boolean): Promise<ContractClassLog[]>;
+    getSplitContractClassLogs(revertible: boolean): ContractClassLog[];
     /**
-     * Filters contract class logs emitted by this tx.
-     * @param logHashes - logs to keep represented by their hashes.
-     * @param silo - whether to silo the logs before returning them.
-     * @returns The requested logs.
-     */
-    filterContractClassLogs(logHashes: ScopedLogHash[], silo?: boolean): Promise<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>;
-    /**
-     * 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;
+    getTxHash(): TxHash;
+    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.
@@ -149,26 +127,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): Promise<Tx>;
-    /**
-     * Filters out logs from functions that are not present in the provided kernel output.
-     *
-     * The purpose of this is to remove logs that got dropped due to a revert,
-     * in which case, we only have the kernel's hashes to go on, as opposed to
-     * this grouping by function maintained in this class.
-     *
-     * The logic therefore is to drop all FunctionLogs if any constituent hash
-     * does not appear in the provided hashes: it is impossible for part of a
-     * function to revert.
-     *
-     * @param logHashes the individual log hashes we want to keep
-     * @param out the output to put passing logs in, to keep this function abstract
-     */
-    filterRevertedLogs(): Promise<void>;
+    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

@@ -4,66 +4,70 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeArrayOfBufferableToVector, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import { ContractClassLog } from '../logs/contract_class_log.js';
+import { ContractClassLog, ContractClassLogFields } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.js';
-import { TopicType, createTopicString } from '../p2p/topic_type.js';
+import { TopicType } from '../p2p/topic_type.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
+import { PublicCallRequestWithCalldata } from './public_call_request_with_calldata.js';
 import { TxHash } from './tx_hash.js';
 /**
  * The interface of an L2 transaction.
  */ export class Tx extends Gossipable {
+    txHash;
     data;
     clientIvcProof;
-    contractClassLogs;
-    enqueuedPublicFunctionCalls;
-    publicTeardownFunctionCall;
-    static p2pTopic;
-    // For memoization
-    txHash;
-    constructor(/**
+    contractClassLogFields;
+    publicFunctionCalldata;
+    static p2pTopic = TopicType.tx;
+    calldataMap;
+    constructor(/** Identifier of the tx */ txHash, /**
      * Output of the private kernel circuit for this tx.
      */ data, /**
      * Proof from the private kernel circuit.
      * TODO(#7368): This client IVC object currently contains various VKs that will eventually be more like static data.
-     *
      */ clientIvcProof, /**
-     * Contract class logs generated by the tx.
-     */ contractClassLogs, /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
-     */ enqueuedPublicFunctionCalls, /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */ publicTeardownFunctionCall){
-        super(), this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogs = contractClassLogs, this.enqueuedPublicFunctionCalls = enqueuedPublicFunctionCalls, this.publicTeardownFunctionCall = publicTeardownFunctionCall;
-    }
-    // Gossipable method
-    static{
-        this.p2pTopic = createTopicString(TopicType.tx);
+     * Contract class log fields emitted from the tx.
+     * Their order should match the order of the log hashes returned from `this.data.getNonEmptyContractClassLogsHashes`.
+     * It's checked in data_validator.ts
+     */ contractClassLogFields, /**
+     * An array of calldata for the enqueued public function calls and the teardown function call.
+     */ publicFunctionCalldata){
+        super(), this.txHash = txHash, this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogFields = contractClassLogFields, this.publicFunctionCalldata = publicFunctionCalldata;
     }
     // Gossipable method
-    async p2pMessageIdentifier() {
-        return new Buffer32((await this.getTxHash()).toBuffer());
+    generateP2PMessageIdentifier() {
+        return Promise.resolve(new Buffer32(this.getTxHash().toBuffer()));
     }
     hasPublicCalls() {
-        return this.data.numberOfPublicCallRequests() > 0;
+        return this.numberOfPublicCalls() > 0;
     }
-    getNonRevertiblePublicExecutionRequests() {
-        const numRevertible = this.data.numberOfRevertiblePublicCallRequests();
-        return this.enqueuedPublicFunctionCalls.slice(numRevertible);
+    numberOfPublicCalls() {
+        return this.data.numberOfPublicCallRequests();
     }
-    getRevertiblePublicExecutionRequests() {
-        const numRevertible = this.data.numberOfRevertiblePublicCallRequests();
-        return this.enqueuedPublicFunctionCalls.slice(0, numRevertible);
+    getNonRevertiblePublicCallRequestsWithCalldata() {
+        return this.data.getNonRevertiblePublicCallRequests().map((r)=>this.#combinePublicCallRequestWithCallData(r));
     }
-    getPublicTeardownExecutionRequest() {
-        return this.publicTeardownFunctionCall.isEmpty() ? undefined : this.publicTeardownFunctionCall;
+    getRevertiblePublicCallRequestsWithCalldata() {
+        return this.data.getRevertiblePublicCallRequests().map((r)=>this.#combinePublicCallRequestWithCallData(r));
     }
-    getTotalPublicArgsCount() {
-        let count = this.enqueuedPublicFunctionCalls.reduce((acc, execRequest)=>acc + execRequest.args.length, 0);
-        if (!this.publicTeardownFunctionCall.isEmpty()) {
-            count += this.publicTeardownFunctionCall.args.length;
-        }
-        return count;
+    getTeardownPublicCallRequestWithCalldata() {
+        const request = this.data.getTeardownPublicCallRequest();
+        return request ? this.#combinePublicCallRequestWithCallData(request) : undefined;
+    }
+    getPublicCallRequestsWithCalldata() {
+        const teardown = this.data.getTeardownPublicCallRequest();
+        const callRequests = [
+            ...this.data.getNonRevertiblePublicCallRequests(),
+            ...this.data.getRevertiblePublicCallRequests(),
+            ...teardown ? [
+                teardown
+            ] : []
+        ];
+        return callRequests.map((r)=>this.#combinePublicCallRequestWithCallData(r));
+    }
+    getTotalPublicCalldataCount() {
+        return this.publicFunctionCalldata.reduce((accum, cd)=>accum + cd.values.length, 0);
     }
     getGasSettings() {
         return this.data.constants.txContext.gasSettings;
@@ -74,108 +78,101 @@ 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(ContractClassLog), reader.readVectorUint8Prefix(PublicExecutionRequest), reader.readObject(PublicExecutionRequest));
-    }
-    static newWithTxData(data, publicTeardownExecutionRequest) {
-        return new Tx(data, ClientIvcProof.empty(), [], [], publicTeardownExecutionRequest ? publicTeardownExecutionRequest : PublicExecutionRequest.empty());
+        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.contractClassLogs, 1),
-            serializeArrayOfBufferableToVector(this.enqueuedPublicFunctionCalls, 1),
-            this.publicTeardownFunctionCall
+            serializeArrayOfBufferableToVector(this.contractClassLogFields, 1),
+            serializeArrayOfBufferableToVector(this.publicFunctionCalldata, 1)
         ]);
     }
     static get schema() {
         return z.object({
             data: PrivateKernelTailCircuitPublicInputs.schema,
             clientIvcProof: ClientIvcProof.schema,
-            contractClassLogs: z.array(ContractClassLog.schema),
-            enqueuedPublicFunctionCalls: z.array(PublicExecutionRequest.schema),
-            publicTeardownFunctionCall: PublicExecutionRequest.schema
-        }).transform(Tx.from);
+            contractClassLogFields: z.array(ContractClassLogFields.schema),
+            publicFunctionCalldata: z.array(HashedValues.schema)
+        }).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.contractClassLogs, fields.enqueuedPublicFunctionCalls, fields.publicTeardownFunctionCall);
+        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() {
+        const logHashes = this.data.getNonEmptyContractClassLogsHashes();
+        return logHashes.map((logHash, i)=>ContractClassLog.from({
+                contractAddress: logHash.contractAddress,
+                fields: this.contractClassLogFields[i],
+                emittedLength: logHash.logHash.length
+            }));
+    }
     /**
    * Gets either revertible or non revertible contract class logs emitted by this tx.
-   * @param revertible - true for revertible only logs, false for non reverible only logs.
+   * @param revertible - true for revertible only logs, false for non revertible only logs.
    * @returns The requested logs.
-   */ async getSplitContractClassLogs(revertible, silo = false) {
-        // Should only be called on txs with public calls
+   */ getSplitContractClassLogs(revertible) {
         if (!this.data.forPublic) {
-            return [];
-        }
-        const contractClassLogsHashes = revertible ? this.data.forPublic.revertibleAccumulatedData.contractClassLogsHashes.filter((h)=>!h.isEmpty()) : this.data.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes.filter((h)=>!h.isEmpty());
-        return await this.filterContractClassLogs(contractClassLogsHashes, silo);
-    }
-    /**
-   * Filters contract class logs emitted by this tx.
-   * @param logHashes - logs to keep represented by their hashes.
-   * @param silo - whether to silo the logs before returning them.
-   * @returns The requested logs.
-   */ async filterContractClassLogs(logHashes, silo = false) {
-        const contractClassLogs = [];
-        for (const log of this.contractClassLogs){
-            const hashedLog = await log.hash();
-            const logHash = logHashes.find((hash)=>hash.value.equals(hashedLog) && hash.contractAddress.equals(log.contractAddress));
-            if (logHash) {
-                contractClassLogs.push(silo ? await log.silo() : log);
-            }
+            throw new Error('`getSplitContractClassLogs` should only be called on txs with public calls');
         }
-        return contractClassLogs;
+        const contractClassLogs = this.getContractClassLogs();
+        const numNonRevertible = this.data.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes.filter((h)=>!h.isEmpty()).length;
+        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;
     }
-    /**
-   * 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) {
-        this.txHash = hash;
-    }
-    /** Returns stats about this tx. */ async getStats() {
+    getCalldataMap() {
+        if (!this.calldataMap) {
+            const calldataMap = new Map();
+            this.publicFunctionCalldata.forEach((cd)=>calldataMap.set(cd.hash.toString(), cd.values));
+            this.calldataMap = calldataMap;
+        }
+        return this.calldataMap;
+    }
+    /** 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,
             feePaymentMethod: // needsSetup? then we pay through a fee payment contract
-            this.data.forPublic?.needsSetup ? this.data.getNonRevertiblePublicCallRequests().at(-1).functionSelector.toField().toBigInt() === 0x43417bb1n ? 'fpc_public' : 'fpc_private' : 'fee_juice'
+            this.data.forPublic?.needsSetup ? 'fpc' : 'fee_juice'
         };
     }
     getSize() {
-        return this.data.getSize() + this.clientIvcProof.clientIvcProofBuffer.length + arraySerializedSizeOfNonEmpty(this.contractClassLogs) + arraySerializedSizeOfNonEmpty(this.enqueuedPublicFunctionCalls) + arraySerializedSizeOfNonEmpty([
-            this.publicTeardownFunctionCall
-        ]);
+        return this.data.getSize() + this.clientIvcProof.clientIvcProofBuffer.length + arraySerializedSizeOfNonEmpty(this.contractClassLogFields) + this.publicFunctionCalldata.reduce((accum, cd)=>accum + cd.getSize(), 0);
     }
     /**
    * Estimates the tx size based on its private effects. Note that the actual size of the tx
@@ -184,63 +181,58 @@ 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.
    */ static clone(tx) {
         const publicInputs = PrivateKernelTailCircuitPublicInputs.fromBuffer(tx.data.toBuffer());
         const clientIvcProof = ClientIvcProof.fromBuffer(tx.clientIvcProof.toBuffer());
-        const contractClassLogs = tx.contractClassLogs.map((x)=>ContractClassLog.fromBuffer(x.toBuffer()));
-        const enqueuedPublicFunctionCalls = tx.enqueuedPublicFunctionCalls.map((x)=>PublicExecutionRequest.fromBuffer(x.toBuffer()));
-        const publicTeardownFunctionCall = PublicExecutionRequest.fromBuffer(tx.publicTeardownFunctionCall.toBuffer());
-        const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogs, enqueuedPublicFunctionCalls, publicTeardownFunctionCall);
-        if (tx.txHash) {
-            clonedTx.setTxHash(TxHash.fromBuffer(tx.txHash.toBuffer()));
-        }
+        const contractClassLogFields = tx.contractClassLogFields.map((p)=>p.clone());
+        const publicFunctionCalldata = tx.publicFunctionCalldata.map((cd)=>HashedValues.fromBuffer(cd.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 async random(randomProof = false) {
-        return new Tx(PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(), randomProof ? ClientIvcProof.random() : ClientIvcProof.empty(), [
-            await ContractClassLog.random()
-        ], [
-            await PublicExecutionRequest.random()
-        ], await PublicExecutionRequest.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()
+            ]
+        });
     }
-    /**
-   * Filters out logs from functions that are not present in the provided kernel output.
-   *
-   * The purpose of this is to remove logs that got dropped due to a revert,
-   * in which case, we only have the kernel's hashes to go on, as opposed to
-   * this grouping by function maintained in this class.
-   *
-   * The logic therefore is to drop all FunctionLogs if any constituent hash
-   * does not appear in the provided hashes: it is impossible for part of a
-   * function to revert.
-   *
-   * @param logHashes the individual log hashes we want to keep
-   * @param out the output to put passing logs in, to keep this function abstract
-   */ async filterRevertedLogs() {
-        this.contractClassLogs = await this.getSplitContractClassLogs(false);
+    /** 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();
+        // Assume empty calldata if nothing is given for the hash.
+        // The verification of calldata vs hash should be handled outside of this class.
+        const calldata = calldataMap.get(request.calldataHash.toString()) ?? [];
+        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_constant_data.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';
@@ -53,7 +51,7 @@ export declare class TxConstantData {
     static fromFields(fields: Fr[] | FieldReader): TxConstantData;
     toFields(): Fr[];
     static fromBuffer(buffer: Buffer | BufferReader): TxConstantData;
-    toBuffer(): Buffer;
+    toBuffer(): Buffer<ArrayBufferLike>;
     static empty(): TxConstantData;
     getSize(): number;
     clone(): TxConstantData;

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

@@ -1 +1 @@
-{"version":3,"file":"tx_constant_data.d.ts","sourceRoot":"","sources":["../../src/tx/tx_constant_data.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,cAAc;IAEvB,6GAA6G;IACtG,gBAAgB,EAAE,WAAW;IACpC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;;IAlBnC,6GAA6G;IACtG,gBAAgB,EAAE,WAAW;IACpC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IAGrC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC;IAI5C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC;IAIjD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc;IAU7D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAUhE,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,OAAO;IASP,KAAK,IAAI,cAAc;CAGxB"}
+{"version":3,"file":"tx_constant_data.d.ts","sourceRoot":"","sources":["../../src/tx/tx_constant_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAwC,MAAM,6BAA6B,CAAC;AAC9G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;GAEG;AACH,qBAAa,cAAc;IAEvB,6GAA6G;IACtG,gBAAgB,EAAE,WAAW;IACpC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;;IAlBnC,6GAA6G;IACtG,gBAAgB,EAAE,WAAW;IACpC;;;;;;;OAOG;IACI,SAAS,EAAE,SAAS;IAC3B;;OAEG;IACI,UAAU,EAAE,EAAE;IACrB;;OAEG;IACI,wBAAwB,EAAE,EAAE;IAGrC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC;IAI5C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC;IAIjD,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,cAAc;IAU7D,QAAQ,IAAI,EAAE,EAAE;IAUhB,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,cAAc;IAUhE,QAAQ;IAIR,MAAM,CAAC,KAAK;IAIZ,OAAO;IASP,KAAK,IAAI,cAAc;CAGxB"}