@aztec/stdlib 0.81.0 → 0.82.1-alpha-testnet.1

package/dest/tx/profiled_tx.js

@@ -0,0 +1,27 @@
+import { z } from 'zod';
+import { PrivateExecutionStepSchema } from '../kernel/private_kernel_prover_output.js';
+export class TxProfileResult {
+    executionSteps;
+    constructor(executionSteps){
+        this.executionSteps = executionSteps;
+    }
+    static get schema() {
+        return z.object({
+            executionSteps: z.array(PrivateExecutionStepSchema)
+        }).transform(({ executionSteps })=>new TxProfileResult(executionSteps));
+    }
+    static random() {
+        return new TxProfileResult([
+            {
+                functionName: 'random',
+                bytecode: Buffer.from('random'),
+                witness: new Map([
+                    [
+                        1,
+                        'random'
+                    ]
+                ])
+            }
+        ]);
+    }
+}

package/dest/tx/proven_tx.d.ts

@@ -0,0 +1,33 @@
+import type { FieldsOf } from '@aztec/foundation/types';
+import { z } from 'zod';
+import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
+import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
+import { PrivateExecutionResult } from './private_execution_result.js';
+import { Tx } from './tx.js';
+export declare class TxProvingResult {
+    privateExecutionResult: PrivateExecutionResult;
+    publicInputs: PrivateKernelTailCircuitPublicInputs;
+    clientIvcProof: ClientIvcProof;
+    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, clientIvcProof: ClientIvcProof);
+    toTx(): Tx;
+    static get schema(): z.ZodEffects<z.ZodObject<{
+        privateExecutionResult: import("@aztec/foundation/schemas").ZodFor<PrivateExecutionResult>;
+        publicInputs: z.ZodType<PrivateKernelTailCircuitPublicInputs, any, string>;
+        clientIvcProof: z.ZodType<ClientIvcProof, any, string>;
+    }, "strip", z.ZodTypeAny, {
+        publicInputs: PrivateKernelTailCircuitPublicInputs;
+        clientIvcProof: ClientIvcProof;
+        privateExecutionResult: PrivateExecutionResult;
+    }, {
+        publicInputs: string;
+        clientIvcProof: string;
+        privateExecutionResult?: any;
+    }>, TxProvingResult, {
+        publicInputs: string;
+        clientIvcProof: string;
+        privateExecutionResult?: any;
+    }>;
+    static from(fields: FieldsOf<TxProvingResult>): TxProvingResult;
+    static random(): Promise<TxProvingResult>;
+}
+//# sourceMappingURL=proven_tx.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"proven_tx.d.ts","sourceRoot":"","sources":["../../src/tx/proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAkC,MAAM,+BAA+B,CAAC;AACvG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,qBAAa,eAAe;IAEjB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,cAAc,EAAE,cAAc;gBAF9B,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,cAAc,EAAE,cAAc;IAGvC,IAAI,IAAI,EAAE;IAYV,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;WAIhC,MAAM;CAOpB"}

package/dest/tx/proven_tx.js

@@ -0,0 +1,33 @@
+import { z } from 'zod';
+import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
+import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
+import { PrivateExecutionResult, collectSortedContractClassLogs } from './private_execution_result.js';
+import { Tx } from './tx.js';
+export class TxProvingResult {
+    privateExecutionResult;
+    publicInputs;
+    clientIvcProof;
+    constructor(privateExecutionResult, publicInputs, clientIvcProof){
+        this.privateExecutionResult = privateExecutionResult;
+        this.publicInputs = publicInputs;
+        this.clientIvcProof = clientIvcProof;
+    }
+    toTx() {
+        const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
+        const tx = new Tx(this.publicInputs, this.clientIvcProof, contractClassLogs, this.privateExecutionResult.publicFunctionCalldata);
+        return tx;
+    }
+    static get schema() {
+        return z.object({
+            privateExecutionResult: PrivateExecutionResult.schema,
+            publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
+            clientIvcProof: ClientIvcProof.schema
+        }).transform(TxProvingResult.from);
+    }
+    static from(fields) {
+        return new TxProvingResult(fields.privateExecutionResult, fields.publicInputs, fields.clientIvcProof);
+    }
+    static async random() {
+        return new TxProvingResult(await PrivateExecutionResult.random(), PrivateKernelTailCircuitPublicInputs.empty(), ClientIvcProof.empty());
+    }
+}

package/dest/tx/public_call_request_with_calldata.d.ts

@@ -0,0 +1,41 @@
+/// <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 { inspect } from 'util';
+import { FunctionSelector } from '../abi/function_selector.js';
+import { PublicCallRequest } from '../kernel/public_call_request.js';
+import { type ZodFor } from '../schemas/index.js';
+/**
+ * The call request of a public function, including the calldata.
+ */
+export declare class PublicCallRequestWithCalldata {
+    /**
+     * Request of the public call.
+     */
+    request: PublicCallRequest;
+    /**
+     * Function selector and arguments of the public call.
+     */
+    calldata: Fr[];
+    constructor(
+    /**
+     * Request of the public call.
+     */
+    request: PublicCallRequest, 
+    /**
+     * Function selector and arguments of the public call.
+     */
+    calldata: Fr[]);
+    get functionSelector(): FunctionSelector;
+    get args(): Fr[];
+    static get schema(): ZodFor<PublicCallRequestWithCalldata>;
+    static from(fields: Pick<PublicCallRequestWithCalldata, 'request' | 'calldata'>): PublicCallRequestWithCalldata;
+    toBuffer(): Buffer;
+    static fromBuffer(buffer: Buffer | BufferReader): PublicCallRequestWithCalldata;
+    static empty(): PublicCallRequestWithCalldata;
+    isEmpty(): boolean;
+    [inspect.custom](): string;
+}
+//# sourceMappingURL=public_call_request_with_calldata.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"public_call_request_with_calldata.d.ts","sourceRoot":"","sources":["../../src/tx/public_call_request_with_calldata.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAG3D;;GAEG;AACH,qBAAa,6BAA6B;IAEtC;;OAEG;IACI,OAAO,EAAE,iBAAiB;IACjC;;OAEG;IACI,QAAQ,EAAE,EAAE,EAAE;;IAPrB;;OAEG;IACI,OAAO,EAAE,iBAAiB;IACjC;;OAEG;IACI,QAAQ,EAAE,EAAE,EAAE;IAIvB,IAAI,gBAAgB,IAAI,gBAAgB,CAEvC;IAED,IAAI,IAAI,IAAI,EAAE,EAAE,CAEf;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,6BAA6B,CAAC,CAOzD;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,GAAG,UAAU,CAAC,GAAG,6BAA6B;IAI/G,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,MAAM,CAAC,KAAK;IAIZ,OAAO,IAAI,OAAO;IAIlB,CAAC,OAAO,CAAC,MAAM,CAAC;CAMjB"}

package/dest/tx/public_call_request_with_calldata.js

@@ -0,0 +1,57 @@
+import { Fr } from '@aztec/foundation/fields';
+import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { inspect } from 'util';
+import { z } from 'zod';
+import { FunctionSelector } from '../abi/function_selector.js';
+import { PublicCallRequest } from '../kernel/public_call_request.js';
+import { schemas } from '../schemas/index.js';
+import { Vector } from '../types/index.js';
+/**
+ * The call request of a public function, including the calldata.
+ */ export class PublicCallRequestWithCalldata {
+    request;
+    calldata;
+    constructor(/**
+     * Request of the public call.
+     */ request, /**
+     * Function selector and arguments of the public call.
+     */ calldata){
+        this.request = request;
+        this.calldata = calldata;
+    }
+    // Public functions get routed through the dispatch function, whose first argument is the target function selector.
+    get functionSelector() {
+        return FunctionSelector.fromField(this.calldata[0]);
+    }
+    get args() {
+        return this.calldata.slice(1);
+    }
+    static get schema() {
+        return z.object({
+            request: PublicCallRequest.schema,
+            calldata: z.array(schemas.Fr)
+        }).transform(PublicCallRequestWithCalldata.from);
+    }
+    static from(fields) {
+        return new PublicCallRequestWithCalldata(fields.request, fields.calldata);
+    }
+    toBuffer() {
+        return serializeToBuffer(this.request, new Vector(this.calldata));
+    }
+    static fromBuffer(buffer) {
+        const reader = BufferReader.asReader(buffer);
+        return new PublicCallRequestWithCalldata(PublicCallRequest.fromBuffer(reader), reader.readVector(Fr));
+    }
+    static empty() {
+        return new PublicCallRequestWithCalldata(PublicCallRequest.empty(), []);
+    }
+    isEmpty() {
+        return this.request.isEmpty() && this.calldata.length === 0;
+    }
+    [inspect.custom]() {
+        return `PublicCallRequestWithCalldata {
+      request: ${inspect(this.request)}
+      calldata: ${this.calldata}
+    }`;
+    }
+}

package/dest/tx/simulated_tx.d.ts

@@ -1,10 +1,7 @@
 import type { ZodFor } from '@aztec/foundation/schemas';
 import type { FieldsOf } from '@aztec/foundation/types';
-import { z } from 'zod';
 import type { GasUsed } from '../gas/gas_used.js';
-import { type PrivateKernelProverProfileResult } from '../kernel/private_kernel_prover_profile_result.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
-import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
 import { PrivateExecutionResult } from './private_execution_result.js';
 import { NestedProcessReturnValues, PublicSimulationOutput } from './public_simulation_output.js';
 import { Tx } from './tx.js';
@@ -15,52 +12,19 @@ export declare class PrivateSimulationResult {
     getPrivateReturnValues(): NestedProcessReturnValues;
     toSimulatedTx(): Tx;
 }
-export declare class TxSimulationResult extends PrivateSimulationResult {
+export declare class TxSimulationResult {
+    privateExecutionResult: PrivateExecutionResult;
+    publicInputs: PrivateKernelTailCircuitPublicInputs;
     publicOutput?: PublicSimulationOutput | undefined;
-    profileResult?: {
-        gateCounts: {
-            circuitName: string;
-            gateCount: number;
-        }[];
-    } | undefined;
-    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, publicOutput?: PublicSimulationOutput | undefined, profileResult?: {
-        gateCounts: {
-            circuitName: string;
-            gateCount: number;
-        }[];
-    } | undefined);
+    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, publicOutput?: PublicSimulationOutput | undefined);
     get gasUsed(): GasUsed;
     static get schema(): ZodFor<TxSimulationResult>;
     static from(fields: Omit<FieldsOf<TxSimulationResult>, 'gasUsed'>): TxSimulationResult;
-    getPublicReturnValues(): NestedProcessReturnValues[];
-    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult: PrivateSimulationResult, publicOutput?: PublicSimulationOutput, profileResult?: PrivateKernelProverProfileResult): TxSimulationResult;
+    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult: PrivateSimulationResult, publicOutput?: PublicSimulationOutput): TxSimulationResult;
     static random(): Promise<TxSimulationResult>;
-}
-export declare class TxProvingResult {
-    privateExecutionResult: PrivateExecutionResult;
-    publicInputs: PrivateKernelTailCircuitPublicInputs;
-    clientIvcProof: ClientIvcProof;
-    constructor(privateExecutionResult: PrivateExecutionResult, publicInputs: PrivateKernelTailCircuitPublicInputs, clientIvcProof: ClientIvcProof);
-    toTx(): Tx;
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        privateExecutionResult: ZodFor<PrivateExecutionResult>;
-        publicInputs: z.ZodType<PrivateKernelTailCircuitPublicInputs, any, string>;
-        clientIvcProof: z.ZodType<ClientIvcProof, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        publicInputs: PrivateKernelTailCircuitPublicInputs;
-        clientIvcProof: ClientIvcProof;
-        privateExecutionResult: PrivateExecutionResult;
-    }, {
-        publicInputs: string;
-        clientIvcProof: string;
-        privateExecutionResult?: any;
-    }>, TxProvingResult, {
-        publicInputs: string;
-        clientIvcProof: string;
-        privateExecutionResult?: any;
-    }>;
-    static from(fields: FieldsOf<TxProvingResult>): TxProvingResult;
-    static random(): Promise<TxProvingResult>;
+    getPrivateReturnValues(): NestedProcessReturnValues;
+    toSimulatedTx(): Tx;
+    getPublicReturnValues(): NestedProcessReturnValues[];
 }
 /**
  * Recursively accummulate the return values of a call result and its nested executions,

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,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACL,KAAK,gCAAgC,EAEtC,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAEL,sBAAsB,EAIvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,qBAAa,uBAAuB;IAEzB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;gBADlD,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC;IAG3D,sBAAsB;IAItB,aAAa,IAAI,EAAE;CAcpB;AAED,qBAAa,kBAAmB,SAAQ,uBAAuB;IAIpD,YAAY,CAAC;IACb,aAAa,CAAC;;;;;;gBAHrB,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAC3C,YAAY,CAAC,oCAAwB,EACrC,aAAa,CAAC;;;;;iBAAkC;IAKzD,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,qBAAqB;IAIrB,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB,EACrC,aAAa,CAAC,EAAE,gCAAgC;WAUrC,MAAM;CAOpB;AAED,qBAAa,eAAe;IAEjB,sBAAsB,EAAE,sBAAsB;IAC9C,YAAY,EAAE,oCAAoC;IAClD,cAAc,EAAE,cAAc;gBAF9B,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,cAAc,EAAE,cAAc;IAGvC,IAAI,IAAI,EAAE;IAeV,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;OAQhB;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC;WAIhC,MAAM;CAOpB;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,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,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,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAE7B,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;gBAFb,sBAAsB,EAAE,sBAAsB,EAC9C,YAAY,EAAE,oCAAoC,EAClD,YAAY,CAAC,oCAAwB;IAG9C,IAAI,OAAO,IAAI,OAAO,CASrB;IAED,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAQ9C;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAIjE,MAAM,CAAC,0CAA0C,CAC/C,uBAAuB,EAAE,uBAAuB,EAChD,YAAY,CAAC,EAAE,sBAAsB;WAS1B,MAAM;IAQnB,sBAAsB;IAItB,aAAa,IAAI,EAAE;IAInB,qBAAqB;CAGtB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,sBAAsB,GAAG,yBAAyB,CAWhH"}

package/dest/tx/simulated_tx.js

@@ -1,9 +1,8 @@
 import { z } from 'zod';
 import { Gas } from '../gas/gas.js';
-import { PrivateKernelProverProfileResultSchema } from '../kernel/private_kernel_prover_profile_result.js';
 import { PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { PrivateExecutionResult, collectEnqueuedPublicFunctionCalls, collectPublicTeardownFunctionCall, collectSortedContractClassLogs } from './private_execution_result.js';
+import { PrivateExecutionResult, collectSortedContractClassLogs } from './private_execution_result.js';
 import { NestedProcessReturnValues, PublicSimulationOutput } from './public_simulation_output.js';
 import { Tx } from './tx.js';
 export class PrivateSimulationResult {
@@ -18,17 +17,18 @@ export class PrivateSimulationResult {
     }
     toSimulatedTx() {
         const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
-        const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(this.privateExecutionResult);
-        const teardownPublicFunction = collectPublicTeardownFunctionCall(this.privateExecutionResult);
-        const tx = new Tx(this.publicInputs, ClientIvcProof.empty(), contractClassLogs, enqueuedPublicFunctions, teardownPublicFunction);
+        const tx = new Tx(this.publicInputs, ClientIvcProof.empty(), contractClassLogs, this.privateExecutionResult.publicFunctionCalldata);
         return tx;
     }
 }
-export class TxSimulationResult extends PrivateSimulationResult {
+export class TxSimulationResult {
+    privateExecutionResult;
+    publicInputs;
     publicOutput;
-    profileResult;
-    constructor(privateExecutionResult, publicInputs, publicOutput, profileResult){
-        super(privateExecutionResult, publicInputs), this.publicOutput = publicOutput, this.profileResult = profileResult;
+    constructor(privateExecutionResult, publicInputs, publicOutput){
+        this.privateExecutionResult = privateExecutionResult;
+        this.publicInputs = publicInputs;
+        this.publicOutput = publicOutput;
     }
     get gasUsed() {
         return this.publicOutput?.gasUsed ?? {
@@ -42,51 +42,26 @@ export class TxSimulationResult extends PrivateSimulationResult {
         return z.object({
             privateExecutionResult: PrivateExecutionResult.schema,
             publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
-            publicOutput: PublicSimulationOutput.schema.optional(),
-            profileResult: PrivateKernelProverProfileResultSchema.optional()
+            publicOutput: PublicSimulationOutput.schema.optional()
         }).transform(TxSimulationResult.from);
     }
     static from(fields) {
-        return new TxSimulationResult(fields.privateExecutionResult, fields.publicInputs, fields.publicOutput, fields.profileResult);
-    }
-    getPublicReturnValues() {
-        return this.publicOutput ? this.publicOutput.publicReturnValues : [];
+        return new TxSimulationResult(fields.privateExecutionResult, fields.publicInputs, fields.publicOutput);
     }
-    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, profileResult) {
-        return new TxSimulationResult(privateSimulationResult.privateExecutionResult, privateSimulationResult.publicInputs, publicOutput, profileResult);
+    static fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput) {
+        return new TxSimulationResult(privateSimulationResult.privateExecutionResult, privateSimulationResult.publicInputs, publicOutput);
     }
     static async random() {
         return new TxSimulationResult(await PrivateExecutionResult.random(), PrivateKernelTailCircuitPublicInputs.empty(), await PublicSimulationOutput.random());
     }
-}
-export class TxProvingResult {
-    privateExecutionResult;
-    publicInputs;
-    clientIvcProof;
-    constructor(privateExecutionResult, publicInputs, clientIvcProof){
-        this.privateExecutionResult = privateExecutionResult;
-        this.publicInputs = publicInputs;
-        this.clientIvcProof = clientIvcProof;
-    }
-    toTx() {
-        const contractClassLogs = collectSortedContractClassLogs(this.privateExecutionResult);
-        const enqueuedPublicFunctions = collectEnqueuedPublicFunctionCalls(this.privateExecutionResult);
-        const teardownPublicFunction = collectPublicTeardownFunctionCall(this.privateExecutionResult);
-        const tx = new Tx(this.publicInputs, this.clientIvcProof, contractClassLogs, enqueuedPublicFunctions, teardownPublicFunction);
-        return tx;
-    }
-    static get schema() {
-        return z.object({
-            privateExecutionResult: PrivateExecutionResult.schema,
-            publicInputs: PrivateKernelTailCircuitPublicInputs.schema,
-            clientIvcProof: ClientIvcProof.schema
-        }).transform(TxProvingResult.from);
+    getPrivateReturnValues() {
+        return new PrivateSimulationResult(this.privateExecutionResult, this.publicInputs).getPrivateReturnValues();
     }
-    static from(fields) {
-        return new TxProvingResult(fields.privateExecutionResult, fields.publicInputs, fields.clientIvcProof);
+    toSimulatedTx() {
+        return new PrivateSimulationResult(this.privateExecutionResult, this.publicInputs).toSimulatedTx();
     }
-    static async random() {
-        return new TxProvingResult(await PrivateExecutionResult.random(), PrivateKernelTailCircuitPublicInputs.empty(), ClientIvcProof.empty());
+    getPublicReturnValues() {
+        return this.publicOutput ? this.publicOutput.publicReturnValues : [];
     }
 }
 /**

package/dest/tx/tx.d.ts

@@ -1,6 +1,7 @@
 /// <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';
@@ -13,12 +14,14 @@ import { ContractClassLog } from '../logs/contract_class_log.js';
 import { Gossipable } from '../p2p/gossipable.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;
     /**
      * Output of the private kernel circuit for this tx.
      */
@@ -26,7 +29,6 @@ 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;
     /**
@@ -34,15 +36,12 @@ export declare class Tx extends Gossipable {
      */
     contractClassLogs: ContractClassLog[];
     /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
-     */
-    readonly enqueuedPublicFunctionCalls: PublicExecutionRequest[];
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
+     * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    readonly publicTeardownFunctionCall: PublicExecutionRequest;
+    publicFunctionCalldata: HashedValues[];
     static p2pTopic: string;
     private txHash;
+    private calldataMap;
     constructor(
     /**
      * Output of the private kernel circuit for this tx.
@@ -51,7 +50,6 @@ 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, 
     /**
@@ -59,19 +57,17 @@ export declare class Tx extends Gossipable {
      */
     contractClassLogs: ContractClassLog[], 
     /**
-     * Enqueued public functions from the private circuit to be run by the sequencer.
-     */
-    enqueuedPublicFunctionCalls: PublicExecutionRequest[], 
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
+     * An array of calldata for the enqueued public function calls and the teardown function call.
      */
-    publicTeardownFunctionCall: PublicExecutionRequest);
+    publicFunctionCalldata: HashedValues[]);
     p2pMessageIdentifier(): 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,7 +75,6 @@ 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.
@@ -118,6 +113,7 @@ export declare class Tx extends Gossipable {
      * @param hash - The hash to set.
      */
     setTxHash(hash: TxHash): void;
+    getCalldataMap(): Map<string, Fr[]>;
     /** Returns stats about this tx. */
     getStats(): Promise<TxStats>;
     getSize(): number;

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

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAyD,MAAM,6BAA6B,CAAC;AAClH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,EAAG,SAAQ,UAAU;IAM9B;;OAEG;aACa,IAAI,EAAE,oCAAoC;IAC1D;;;;OAIG;aACa,cAAc,EAAE,cAAc;IAC9C;;OAEG;IACI,iBAAiB,EAAE,gBAAgB,EAAE;IAC5C;;OAEG;aACa,2BAA2B,EAAE,sBAAsB,EAAE;IACrE;;OAEG;aACa,0BAA0B,EAAE,sBAAsB;IA1BpE,OAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC,OAAO,CAAC,MAAM,CAAqB;;IAGjC;;OAEG;IACa,IAAI,EAAE,oCAAoC;IAC1D;;;;OAIG;IACa,cAAc,EAAE,cAAc;IAC9C;;OAEG;IACI,iBAAiB,EAAE,gBAAgB,EAAE;IAC5C;;OAEG;IACa,2BAA2B,EAAE,sBAAsB,EAAE;IACrE;;OAEG;IACa,0BAA0B,EAAE,sBAAsB;IAWrD,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIxD,cAAc;IAId,uCAAuC,IAAI,sBAAsB,EAAE;IAKnE,oCAAoC,IAAI,sBAAsB,EAAE;IAKhE,iCAAiC,IAAI,sBAAsB,GAAG,SAAS;IAIvE,uBAAuB,IAAI,MAAM;IAQjC,cAAc,IAAI,WAAW;IAI7B;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,EAAE;IAWpD,MAAM,CAAC,aAAa,CAClB,IAAI,EAAE,oCAAoC,EAC1C,8BAA8B,CAAC,EAAE,sBAAsB;IAWzD;;;OAGG;IACH,QAAQ;IAUR,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC,CAU9B;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;IAUhC;;;;OAIG;IACU,aAAa,CAAC,UAAU,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIpF;;;;OAIG;IACG,yBAAyB,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWxG;;;;;OAKG;IACG,uBAAuB,CAAC,SAAS,EAAE,aAAa,EAAE,EAAE,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAc7G;;;OAGG;IACG,SAAS,CAAC,cAAc,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxD;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,mCAAmC;IAC7B,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBlC,OAAO;IAUP;;;OAGG;IACH,gCAAgC;IAShC;;;;OAIG;WACU,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvD;;;;OAIG;WACU,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIhE;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE;IAsBxB;;;;OAIG;WACU,MAAM,CAAC,WAAW,UAAQ;IAUvC;;;;;;;;;;;;;OAaG;IACU,kBAAkB;CAGhC;AAED,uEAAuE;AACvE,KAAK,OAAO,GAAG;IAAqB,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}