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

package/dest/tests/mocks.js

@@ -8,7 +8,6 @@ import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { SerializableContractInstance } from '../contract/contract_instance.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { GasSettings } from '../gas/gas_settings.js';
-import { computeVarArgsHash } from '../hash/hash.js';
 import { Nullifier } from '../kernel/nullifier.js';
 import { PrivateCircuitPublicInputs } from '../kernel/private_circuit_public_inputs.js';
 import { PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs } from '../kernel/private_kernel_tail_circuit_public_inputs.js';
@@ -20,7 +19,7 @@ import { BlockProposal } from '../p2p/block_proposal.js';
 import { ConsensusPayload } from '../p2p/consensus_payload.js';
 import { SignatureDomainSeparator, getHashedSignaturePayloadEthSignedMessage } from '../p2p/signature_utils.js';
 import { ClientIvcProof } from '../proofs/client_ivc_proof.js';
-import { CallContext, CountedPublicExecutionRequest, PrivateCallExecutionResult, PrivateExecutionResult, PublicExecutionRequest, Tx } from '../tx/index.js';
+import { HashedValues, PrivateCallExecutionResult, PrivateExecutionResult, Tx } from '../tx/index.js';
 import { PublicSimulationOutput } from '../tx/public_simulation_output.js';
 import { TxSimulationResult, accumulatePrivateReturnValues } from '../tx/simulated_tx.js';
 import { TxEffect } from '../tx/tx_effect.js';
@@ -33,35 +32,7 @@ export const randomExtendedNote = async ({ note = Note.random(), recipient = und
 export const randomUniqueNote = async ({ note = Note.random(), recipient = undefined, contractAddress = undefined, txHash = randomTxHash(), storageSlot = Fr.random(), nonce = Fr.random() } = {})=>{
     return new UniqueNote(note, recipient ?? await AztecAddress.random(), contractAddress ?? await AztecAddress.random(), storageSlot, txHash, nonce);
 };
-export const mockPrivateCallExecutionResult = async (seed = 1, numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, hasPublicTeardownCallRequest = false)=>{
-    const totalPublicCallRequests = numberOfNonRevertiblePublicCallRequests + numberOfRevertiblePublicCallRequests + (hasPublicTeardownCallRequest ? 1 : 0);
-    const isForPublic = totalPublicCallRequests > 0;
-    let enqueuedPublicFunctionCalls = [];
-    let publicTeardownFunctionCall = PublicExecutionRequest.empty();
-    if (isForPublic) {
-        const publicCallRequests = times(totalPublicCallRequests, (i)=>makePublicCallRequest(seed + 0x102 + i)).reverse(); // Reverse it so that they are sorted by counters in descending order.
-        const publicFunctionArgs = times(totalPublicCallRequests, (i)=>[
-                new Fr(seed + i * 100),
-                new Fr(seed + i * 101)
-            ]);
-        for(let i = 0; i < publicCallRequests.length; i++){
-            const r = publicCallRequests[i];
-            r.argsHash = await computeVarArgsHash(publicFunctionArgs[i]);
-            i++;
-        }
-        if (hasPublicTeardownCallRequest) {
-            const request = publicCallRequests.shift();
-            const args = publicFunctionArgs.shift();
-            publicTeardownFunctionCall = new PublicExecutionRequest(CallContext.fromFields(request.toFields()), args);
-        }
-        enqueuedPublicFunctionCalls = publicCallRequests.map((r, i)=>new PublicExecutionRequest(CallContext.fromFields(r.toFields()), publicFunctionArgs[i]));
-    }
-    return new PrivateCallExecutionResult(Buffer.from(''), Buffer.from(''), new Map(), PrivateCircuitPublicInputs.empty(), new Map(), [], new Map(), [], [], enqueuedPublicFunctionCalls.map((call, index)=>new CountedPublicExecutionRequest(call, index)), publicTeardownFunctionCall, []);
-};
-export const mockPrivateExecutionResult = async (seed = 1)=>{
-    return new PrivateExecutionResult(await mockPrivateCallExecutionResult(seed), Fr.zero());
-};
-export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, hasPublicTeardownCallRequest = false, feePayer, clientIvcProof = ClientIvcProof.empty() } = {})=>{
+export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, numberOfRevertiblePublicCallRequests = MAX_ENQUEUED_CALLS_PER_TX / 2, hasPublicTeardownCallRequest = false, publicCalldataSize = 2, feePayer, clientIvcProof = ClientIvcProof.empty() } = {})=>{
     const totalPublicCallRequests = numberOfNonRevertiblePublicCallRequests + numberOfRevertiblePublicCallRequests + (hasPublicTeardownCallRequest ? 1 : 0);
     const isForPublic = totalPublicCallRequests > 0;
     const data = PrivateKernelTailCircuitPublicInputs.empty();
@@ -70,8 +41,7 @@ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests
         maxFeesPerGas: new GasFees(10, 10)
     });
     data.feePayer = feePayer ?? await AztecAddress.random();
-    let enqueuedPublicFunctionCalls = [];
-    let publicTeardownFunctionCall = PublicExecutionRequest.empty();
+    const publicFunctionCalldata = [];
     if (!isForPublic) {
         data.forRollup.end.nullifiers[0] = firstNullifier.value;
     } else {
@@ -79,34 +49,29 @@ export const mockTx = async (seed = 1, { numberOfNonRevertiblePublicCallRequests
         data.forPublic = PartialPrivateTailPublicInputsForPublic.empty();
         const revertibleBuilder = new PrivateToPublicAccumulatedDataBuilder();
         const nonRevertibleBuilder = new PrivateToPublicAccumulatedDataBuilder();
-        const publicCallRequests = times(totalPublicCallRequests, (i)=>makePublicCallRequest(seed + 0x102 + i)).reverse(); // Reverse it so that they are sorted by counters in descending order.
-        const publicFunctionArgs = times(totalPublicCallRequests, (i)=>[
-                new Fr(seed + i * 100),
-                new Fr(seed + i * 101)
-            ]);
+        const publicCallRequests = times(totalPublicCallRequests, (i)=>makePublicCallRequest(seed + 0x102 + i));
+        const calldata = times(totalPublicCallRequests, (i)=>times(publicCalldataSize, (j)=>new Fr(seed + (i * 13 + j))));
         for(let i = 0; i < publicCallRequests.length; i++){
-            const r = publicCallRequests[i];
-            r.argsHash = await computeVarArgsHash(publicFunctionArgs[i]);
+            const hashedCalldata = await HashedValues.fromCalldata(calldata[i]);
+            publicFunctionCalldata.push(hashedCalldata);
+            publicCallRequests[i].calldataHash = hashedCalldata.hash;
         }
         if (hasPublicTeardownCallRequest) {
-            const request = publicCallRequests.shift();
-            data.forPublic.publicTeardownCallRequest = request;
-            const args = publicFunctionArgs.shift();
-            publicTeardownFunctionCall = new PublicExecutionRequest(CallContext.fromFields(request.toFields()), args);
+            data.forPublic.publicTeardownCallRequest = publicCallRequests.pop();
         }
-        enqueuedPublicFunctionCalls = publicCallRequests.map((r, i)=>new PublicExecutionRequest(CallContext.fromFields(r.toFields()), publicFunctionArgs[i]));
         data.forPublic.nonRevertibleAccumulatedData = nonRevertibleBuilder.pushNullifier(firstNullifier.value).withPublicCallRequests(publicCallRequests.slice(numberOfRevertiblePublicCallRequests)).build();
         data.forPublic.revertibleAccumulatedData = revertibleBuilder.withPublicCallRequests(publicCallRequests.slice(0, numberOfRevertiblePublicCallRequests)).build();
     }
-    const tx = new Tx(data, clientIvcProof, [], enqueuedPublicFunctionCalls, publicTeardownFunctionCall);
-    return tx;
+    return new Tx(data, clientIvcProof, [], publicFunctionCalldata);
 };
 export const mockTxForRollup = (seed = 1)=>mockTx(seed, {
         numberOfNonRevertiblePublicCallRequests: 0,
         numberOfRevertiblePublicCallRequests: 0
     });
+const emptyPrivateCallExecutionResult = ()=>new PrivateCallExecutionResult(Buffer.from(''), Buffer.from(''), new Map(), PrivateCircuitPublicInputs.empty(), new Map(), [], new Map(), [], [], []);
+const emptyPrivateExecutionResult = ()=>new PrivateExecutionResult(emptyPrivateCallExecutionResult(), Fr.zero(), []);
 export const mockSimulatedTx = async (seed = 1)=>{
-    const privateExecutionResult = await mockPrivateExecutionResult(seed);
+    const privateExecutionResult = emptyPrivateExecutionResult();
     const tx = await mockTx(seed);
     const output = new PublicSimulationOutput(undefined, makeCombinedConstantData(), await TxEffect.random(), [
         accumulatePrivateReturnValues(privateExecutionResult)

package/dest/trees/nullifier_membership_witness.d.ts

@@ -108,5 +108,9 @@ export declare class NullifierMembershipWitness {
      * @returns A field array representation of a nullifier witness.
      */
     toFields(): Fr[];
+    /**
+     * Returns a representation of the nullifier membership witness as expected by intrinsic Noir deserialization.
+     */
+    toNoirRepresentation(): (string | string[])[];
 }
 //# sourceMappingURL=nullifier_membership_witness.d.ts.map

package/dest/trees/nullifier_membership_witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;;IAXtE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAGxE,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,CAAC,MAAM;IAQb;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;CAGxB"}
+{"version":3,"file":"nullifier_membership_witness.d.ts","sourceRoot":"","sources":["../../src/trees/nullifier_membership_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,0BAA0B;IAEnC;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;aACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;;IAXtE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;OAEG;IACa,YAAY,EAAE,qBAAqB;IACnD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,qBAAqB,CAAC;IAGxE,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAUhB;IAED,MAAM,CAAC,MAAM;IAQb;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAIvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;CAQrD"}

package/dest/trees/nullifier_membership_witness.js

@@ -44,4 +44,14 @@ import { NullifierLeafPreimage } from './nullifier_leaf.js';
             ...this.siblingPath.toFields()
         ];
     }
+    /**
+   * Returns a representation of the nullifier membership witness as expected by intrinsic Noir deserialization.
+   */ toNoirRepresentation() {
+        // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+        return [
+            new Fr(this.index).toString(),
+            ...this.leafPreimage.toFields().map((fr)=>fr.toString()),
+            this.siblingPath.toFields().map((fr)=>fr.toString())
+        ];
+    }
 }

package/dest/trees/public_data_witness.d.ts

@@ -71,11 +71,7 @@ export declare class PublicDataWitness {
             data: number[];
         }, {
             type: "Buffer";
-            data: number[]; /**
-             * Deserializes an PublicDataWitness object from a buffer.
-             * @param buf - Buffer or BufferReader to deserialize.
-             * @returns An instance of PublicDataWitness.
-             */
+            data: number[];
         }>, Buffer, {
             type: "Buffer";
             data: number[];
@@ -120,6 +116,10 @@ export declare class PublicDataWitness {
      * @returns A field array representation of a public data witness.
      */
     toFields(): Fr[];
+    /**
+     * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
+     */
+    toNoirRepresentation(): (string | string[])[];
     toBuffer(): Buffer;
     /**
      * Returns a string representation of the TxEffect object.

package/dest/trees/public_data_witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_data_witness.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;GAKG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;aACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;;IAZxE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;IAG1E,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BA4CjB;;;;eAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAxCF;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAWvB,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,MAAM;IAQb;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAUnE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}
+{"version":3,"file":"public_data_witness.d.ts","sourceRoot":"","sources":["../../src/trees/public_data_witness.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;GAKG;AACH,qBAAa,iBAAiB;IAE1B;;OAEG;aACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;aACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;aACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;;IAZxE;;OAEG;IACa,KAAK,EAAE,MAAM;IAC7B;;;OAGG;IACa,YAAY,EAAE,0BAA0B;IACxD;;OAEG;IACa,WAAW,EAAE,WAAW,CAAC,OAAO,uBAAuB,CAAC;IAG1E,MAAM,KAAK,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAQhB;IAED;;;OAGG;IACI,QAAQ,IAAI,EAAE,EAAE;IAWvB;;OAEG;IACI,oBAAoB,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE;IAYpD,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,MAAM;IAQb;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,iBAAiB;IAUnE;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM;CAG9B"}

package/dest/trees/public_data_witness.js

@@ -48,6 +48,19 @@ import { PublicDataTreeLeafPreimage } from './public_data_leaf.js';
             ...this.siblingPath.toFields()
         ];
     }
+    /**
+   * Returns a representation of the public data witness as expected by intrinsic Noir deserialization.
+   */ toNoirRepresentation() {
+        // TODO(#12874): remove the stupid as string conversion by modifying ForeignCallOutput type in acvm.js
+        return [
+            new Fr(this.index).toString(),
+            new Fr(this.leafPreimage.slot).toString(),
+            new Fr(this.leafPreimage.value).toString(),
+            new Fr(this.leafPreimage.nextSlot).toString(),
+            new Fr(this.leafPreimage.nextIndex).toString(),
+            this.siblingPath.toFields().map((fr)=>fr.toString())
+        ];
+    }
     toBuffer() {
         return serializeToBuffer([
             this.index,

package/dest/tx/call_context.d.ts

@@ -59,8 +59,8 @@ export declare class CallContext {
     }, "strip", z.ZodTypeAny, {
         contractAddress: AztecAddress;
         msgSender: AztecAddress;
-        functionSelector: FunctionSelector;
         isStaticCall: boolean;
+        functionSelector: FunctionSelector;
     }, {
         isStaticCall: boolean;
         contractAddress?: any;

package/dest/tx/hashed_values.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
+import type { FieldsOf } from '@aztec/foundation/types';
 import { type ZodFor } from '../schemas/schemas.js';
 /**
  * A container for storing a list of values and their hash.
@@ -15,12 +16,23 @@ export declare class HashedValues {
      * The hash of the raw values
      */
     readonly hash: Fr;
-    private constructor();
+    constructor(
+    /**
+     *  Raw values.
+     */
+    values: Fr[], 
+    /**
+     * The hash of the raw values
+     */
+    hash: Fr);
+    getSize(): number;
     static get schema(): ZodFor<HashedValues>;
-    toJSON(): Fr[];
-    static random(): Promise<HashedValues>;
-    static fromValues(values: Fr[]): Promise<HashedValues>;
+    static from(fields: FieldsOf<HashedValues>): HashedValues;
+    static getFields(fields: FieldsOf<HashedValues>): readonly [Fr[], Fr];
+    static random(): HashedValues;
     toBuffer(): Buffer;
     static fromBuffer(buffer: Buffer | BufferReader): HashedValues;
+    static fromArgs(args: Fr[]): Promise<HashedValues>;
+    static fromCalldata(calldata: Fr[]): Promise<HashedValues>;
 }
 //# sourceMappingURL=hashed_values.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"hashed_values.d.ts","sourceRoot":"","sources":["../../src/tx/hashed_values.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAK9E,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAY;IAErB;;OAEG;aACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;aACa,IAAI,EAAE,EAAE;IAR1B,OAAO;IAWP,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAExC;IAED,MAAM;IAIN,MAAM,CAAC,MAAM;WAIA,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE;IAIpC,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;CAI/D"}
+{"version":3,"file":"hashed_values.d.ts","sourceRoot":"","sources":["../../src/tx/hashed_values.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,uBAAuB,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAY;IAErB;;OAEG;aACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;aACa,IAAI,EAAE,EAAE;;IAPxB;;OAEG;IACa,MAAM,EAAE,EAAE,EAAE;IAC5B;;OAEG;IACa,IAAI,EAAE,EAAE;IAG1B,OAAO;IAIP,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,CAOxC;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,YAAY;IAIzD,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC;IAI/C,MAAM,CAAC,MAAM;IAIb,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;WAMjD,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE;WAKnB,YAAY,CAAC,QAAQ,EAAE,EAAE,EAAE;CAGzC"}

package/dest/tx/hashed_values.js

@@ -1,7 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { z } from 'zod';
-import { computeVarArgsHash } from '../hash/index.js';
+import { computeCalldataHash, computeVarArgsHash } from '../hash/index.js';
 import { schemas } from '../schemas/schemas.js';
 import { Vector } from '../types/index.js';
 /**
@@ -17,20 +17,29 @@ import { Vector } from '../types/index.js';
         this.values = values;
         this.hash = hash;
     }
+    getSize() {
+        return this.values.length + 1 /* hash */ ;
+    }
     static get schema() {
-        return z.array(schemas.Fr).transform(HashedValues.fromValues);
+        return z.object({
+            values: z.array(schemas.Fr),
+            hash: schemas.Fr
+        }).transform(HashedValues.from);
+    }
+    static from(fields) {
+        return new HashedValues(...HashedValues.getFields(fields));
     }
-    toJSON() {
-        return this.values;
+    static getFields(fields) {
+        return [
+            fields.values,
+            fields.hash
+        ];
     }
     static random() {
-        return HashedValues.fromValues([
+        return new HashedValues([
             Fr.random(),
             Fr.random()
-        ]);
-    }
-    static async fromValues(values) {
-        return new HashedValues(values, await computeVarArgsHash(values));
+        ], Fr.random());
     }
     toBuffer() {
         return serializeToBuffer(new Vector(this.values), this.hash);
@@ -39,4 +48,12 @@ import { Vector } from '../types/index.js';
         const reader = BufferReader.asReader(buffer);
         return new HashedValues(reader.readVector(Fr), Fr.fromBuffer(reader));
     }
+    // Computes the hash of input arguments or return values for private functions, or for authwit creation.
+    static async fromArgs(args) {
+        return new HashedValues(args, await computeVarArgsHash(args));
+    }
+    // Computes the hash of calldata for public functions.
+    static async fromCalldata(calldata) {
+        return new HashedValues(calldata, await computeCalldataHash(calldata));
+    }
 }

package/dest/tx/index.d.ts

@@ -11,11 +11,13 @@ export * from './tx_constant_data.js';
 export * from './tx_context.js';
 export * from './tx_request.js';
 export * from './private_execution_result.js';
-export * from './public_execution_request.js';
+export * from './public_call_request_with_calldata.js';
 export * from './tx_hash.js';
 export * from './tx_receipt.js';
 export * from './tx.js';
 export * from './processed_tx.js';
+export * from './proven_tx.js';
+export * from './profiled_tx.js';
 export * from './simulated_tx.js';
 export * from './tx_effect.js';
 export * from './public_simulation_output.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tx/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tx/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wCAAwC,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC"}

package/dest/tx/index.js

@@ -11,11 +11,13 @@ export * from './tx_constant_data.js';
 export * from './tx_context.js';
 export * from './tx_request.js';
 export * from './private_execution_result.js';
-export * from './public_execution_request.js';
+export * from './public_call_request_with_calldata.js';
 export * from './tx_hash.js';
 export * from './tx_receipt.js';
 export * from './tx.js';
 export * from './processed_tx.js';
+export * from './proven_tx.js';
+export * from './profiled_tx.js';
 export * from './simulated_tx.js';
 export * from './tx_effect.js';
 export * from './public_simulation_output.js';

package/dest/tx/private_execution_result.d.ts

@@ -9,7 +9,7 @@ import type { IsEmpty } from '../kernel/utils/interfaces.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
 import { Note } from '../note/note.js';
 import { type ZodFor } from '../schemas/index.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
 /**
  * The contents of a new note.
  */
@@ -79,25 +79,24 @@ export declare class CountedContractClassLog implements IsEmpty {
     }): CountedContractClassLog;
     isEmpty(): boolean;
 }
-export declare class CountedPublicExecutionRequest {
-    request: PublicExecutionRequest;
-    counter: number;
-    constructor(request: PublicExecutionRequest, counter: number);
-    static get schema(): ZodFor<CountedPublicExecutionRequest>;
-    static from(fields: FieldsOf<CountedPublicExecutionRequest>): CountedPublicExecutionRequest;
-    isEmpty(): boolean;
-    static random(): Promise<CountedPublicExecutionRequest>;
-}
 export declare class PrivateExecutionResult {
     entrypoint: PrivateCallExecutionResult;
     /** The first non revertible nullifier, or zero if there was none. */
     firstNullifier: Fr;
+    /** An array of calldata for the enqueued public function calls and the teardown function call. */
+    publicFunctionCalldata: HashedValues[];
     constructor(entrypoint: PrivateCallExecutionResult, 
     /** The first non revertible nullifier, or zero if there was none. */
-    firstNullifier: Fr);
+    firstNullifier: Fr, 
+    /** An array of calldata for the enqueued public function calls and the teardown function call. */
+    publicFunctionCalldata: HashedValues[]);
     static get schema(): ZodFor<PrivateExecutionResult>;
     static from(fields: FieldsOf<PrivateExecutionResult>): PrivateExecutionResult;
     static random(nested?: number): Promise<PrivateExecutionResult>;
+    /**
+     * The block number that this execution was simulated with.
+     */
+    getSimulationBlockNumber(): number;
 }
 /**
  * The result of executing a call to a private function.
@@ -121,10 +120,6 @@ export declare class PrivateCallExecutionResult {
     returnValues: Fr[];
     /** The nested executions. */
     nestedExecutions: PrivateCallExecutionResult[];
-    /** Enqueued public function execution requests to be picked up by the sequencer. */
-    enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[];
-    /** Public function execution requested for teardown */
-    publicTeardownFunctionCall: PublicExecutionRequest;
     /**
      * Contract class logs emitted during execution of this function call.
      * Note: These are preimages to `contractClassLogsHashes`.
@@ -149,10 +144,6 @@ export declare class PrivateCallExecutionResult {
     returnValues: Fr[], 
     /** The nested executions. */
     nestedExecutions: PrivateCallExecutionResult[], 
-    /** Enqueued public function execution requests to be picked up by the sequencer. */
-    enqueuedPublicFunctionCalls: CountedPublicExecutionRequest[], 
-    /** Public function execution requested for teardown */
-    publicTeardownFunctionCall: PublicExecutionRequest, 
     /**
      * Contract class logs emitted during execution of this function call.
      * Note: These are preimages to `contractClassLogsHashes`.
@@ -170,13 +161,6 @@ export declare function collectNoteHashNullifierCounterMap(execResult: PrivateEx
  * @returns All contract class logs.
  */
 export declare function collectSortedContractClassLogs(execResult: PrivateExecutionResult): ContractClassLog[];
-/**
- * Collect all enqueued public function calls across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All enqueued public function calls.
- */
-export declare function collectEnqueuedPublicFunctionCalls(execResult: PrivateExecutionResult): PublicExecutionRequest[];
-export declare function collectPublicTeardownFunctionCall(execResult: PrivateExecutionResult): PublicExecutionRequest;
 export declare function getFinalMinRevertibleSideEffectCounter(execResult: PrivateExecutionResult): number;
 export declare function collectNested<T>(executionStack: PrivateCallExecutionResult[], extractExecutionItems: (execution: PrivateCallExecutionResult) => T[]): T[];
 //# sourceMappingURL=private_execution_result.d.ts.map

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

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

package/dest/tx/private_execution_result.js

@@ -8,7 +8,7 @@ import { sortByCounter } from '../kernel/utils/order_and_comparison.js';
 import { ContractClassLog } from '../logs/contract_class_log.js';
 import { Note } from '../note/note.js';
 import { mapSchema, schemas } from '../schemas/index.js';
-import { PublicExecutionRequest } from './public_execution_request.js';
+import { HashedValues } from './hashed_values.js';
 /**
  * The contents of a new note.
  */ export class NoteAndSlot {
@@ -54,47 +54,35 @@ export class CountedContractClassLog {
         return this.log.isEmpty() && !this.counter;
     }
 }
-export class CountedPublicExecutionRequest {
-    request;
-    counter;
-    constructor(request, counter){
-        this.request = request;
-        this.counter = counter;
-    }
-    static get schema() {
-        return z.object({
-            request: PublicExecutionRequest.schema,
-            counter: schemas.Integer
-        }).transform(CountedPublicExecutionRequest.from);
-    }
-    static from(fields) {
-        return new CountedPublicExecutionRequest(fields.request, fields.counter);
-    }
-    isEmpty() {
-        return this.request.isEmpty() && !this.counter;
-    }
-    static async random() {
-        return new CountedPublicExecutionRequest(await PublicExecutionRequest.random(), 0);
-    }
-}
 export class PrivateExecutionResult {
     entrypoint;
     firstNullifier;
-    constructor(entrypoint, /** The first non revertible nullifier, or zero if there was none. */ firstNullifier){
+    publicFunctionCalldata;
+    constructor(entrypoint, /** The first non revertible nullifier, or zero if there was none. */ firstNullifier, /** An array of calldata for the enqueued public function calls and the teardown function call. */ publicFunctionCalldata){
         this.entrypoint = entrypoint;
         this.firstNullifier = firstNullifier;
+        this.publicFunctionCalldata = publicFunctionCalldata;
     }
     static get schema() {
         return z.object({
             entrypoint: PrivateCallExecutionResult.schema,
-            firstNullifier: schemas.Fr
+            firstNullifier: schemas.Fr,
+            publicFunctionCalldata: z.array(HashedValues.schema)
         }).transform(PrivateExecutionResult.from);
     }
     static from(fields) {
-        return new PrivateExecutionResult(fields.entrypoint, fields.firstNullifier);
+        return new PrivateExecutionResult(fields.entrypoint, fields.firstNullifier, fields.publicFunctionCalldata);
     }
     static async random(nested = 1) {
-        return new PrivateExecutionResult(await PrivateCallExecutionResult.random(nested), Fr.random());
+        return new PrivateExecutionResult(await PrivateCallExecutionResult.random(nested), Fr.random(), [
+            HashedValues.random(),
+            HashedValues.random()
+        ]);
+    }
+    /**
+   * The block number that this execution was simulated with.
+   */ getSimulationBlockNumber() {
+        return this.entrypoint.publicInputs.historicalHeader.globalVariables.blockNumber.toNumber();
     }
 }
 /**
@@ -109,12 +97,10 @@ export class PrivateExecutionResult {
     noteHashNullifierCounterMap;
     returnValues;
     nestedExecutions;
-    enqueuedPublicFunctionCalls;
-    publicTeardownFunctionCall;
     contractClassLogs;
     constructor(// Needed for prover
     /** The ACIR bytecode. */ acir, /** The verification key. */ vk, /** The partial witness. */ partialWitness, // Needed for the verifier (kernel)
-    /** The call stack item. */ publicInputs, /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */ noteHashLeafIndexMap, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The nested executions. */ nestedExecutions, /** Enqueued public function execution requests to be picked up by the sequencer. */ enqueuedPublicFunctionCalls, /** Public function execution requested for teardown */ publicTeardownFunctionCall, /**
+    /** The call stack item. */ publicInputs, /** Mapping of note hash to its index in the note hash tree. Used for building hints for note hash read requests. */ noteHashLeafIndexMap, /** The notes created in the executed function. */ newNotes, /** Mapping of note hash counter to the counter of its nullifier. */ noteHashNullifierCounterMap, /** The raw return values of the executed function. */ returnValues, /** The nested executions. */ nestedExecutions, /**
      * Contract class logs emitted during execution of this function call.
      * Note: These are preimages to `contractClassLogsHashes`.
      */ contractClassLogs){
@@ -127,8 +113,6 @@ export class PrivateExecutionResult {
         this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
         this.returnValues = returnValues;
         this.nestedExecutions = nestedExecutions;
-        this.enqueuedPublicFunctionCalls = enqueuedPublicFunctionCalls;
-        this.publicTeardownFunctionCall = publicTeardownFunctionCall;
         this.contractClassLogs = contractClassLogs;
     }
     static get schema() {
@@ -142,13 +126,11 @@ export class PrivateExecutionResult {
             noteHashNullifierCounterMap: mapSchema(z.coerce.number(), z.number()),
             returnValues: z.array(schemas.Fr),
             nestedExecutions: z.array(z.lazy(()=>PrivateCallExecutionResult.schema)),
-            enqueuedPublicFunctionCalls: z.array(CountedPublicExecutionRequest.schema),
-            publicTeardownFunctionCall: PublicExecutionRequest.schema,
             contractClassLogs: z.array(CountedContractClassLog.schema)
         }).transform(PrivateCallExecutionResult.from);
     }
     static from(fields) {
-        return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.noteHashLeafIndexMap, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.nestedExecutions, fields.enqueuedPublicFunctionCalls, fields.publicTeardownFunctionCall, fields.contractClassLogs);
+        return new PrivateCallExecutionResult(fields.acir, fields.vk, fields.partialWitness, fields.publicInputs, fields.noteHashLeafIndexMap, fields.newNotes, fields.noteHashNullifierCounterMap, fields.returnValues, fields.nestedExecutions, fields.contractClassLogs);
     }
     static async random(nested = 1) {
         return new PrivateCallExecutionResult(randomBytes(4), randomBytes(4), new Map([
@@ -171,8 +153,6 @@ export class PrivateExecutionResult {
         ]), [
             Fr.random()
         ], await timesParallel(nested, ()=>PrivateCallExecutionResult.random(0)), [
-            await CountedPublicExecutionRequest.random()
-        ], await PublicExecutionRequest.random(), [
             new CountedContractClassLog(await ContractClassLog.random(), randomInt(10))
         ]);
     }
@@ -214,38 +194,6 @@ export function collectNoteHashNullifierCounterMap(execResult) {
     const sortedLogs = sortByCounter(allLogs);
     return sortedLogs.map((l)=>l.log);
 }
-function collectEnqueuedCountedPublicExecutionRequests(execResult) {
-    return [
-        ...execResult.enqueuedPublicFunctionCalls,
-        ...execResult.nestedExecutions.flatMap(collectEnqueuedCountedPublicExecutionRequests)
-    ];
-}
-/**
- * Collect all enqueued public function calls across all nested executions.
- * @param execResult - The topmost execution result.
- * @returns All enqueued public function calls.
- */ export function collectEnqueuedPublicFunctionCalls(execResult) {
-    const countedRequests = collectEnqueuedCountedPublicExecutionRequests(execResult.entrypoint);
-    // without the reverse sort, the logs will be in a queue like fashion which is wrong
-    // as the kernel processes it like a stack, popping items off and pushing them to output
-    return sortByCounter(countedRequests, false).map((r)=>r.request);
-}
-export function collectPublicTeardownFunctionCall(execResult) {
-    const collectPublicTeardownFunctionCallRecursive = (callResult)=>{
-        return [
-            callResult.publicTeardownFunctionCall,
-            ...callResult.nestedExecutions.flatMap(collectPublicTeardownFunctionCallRecursive)
-        ].filter((call)=>!call.isEmpty());
-    };
-    const teardownCalls = collectPublicTeardownFunctionCallRecursive(execResult.entrypoint);
-    if (teardownCalls.length === 1) {
-        return teardownCalls[0];
-    }
-    if (teardownCalls.length > 1) {
-        throw new Error('Multiple public teardown calls detected');
-    }
-    return PublicExecutionRequest.empty();
-}
 export function getFinalMinRevertibleSideEffectCounter(execResult) {
     const collectFinalMinRevertibleSideEffectCounterRecursive = (callResult)=>{
         return callResult.nestedExecutions.reduce((counter, exec)=>{

package/dest/tx/profiled_tx.d.ts

@@ -0,0 +1,9 @@
+import type { ZodFor } from '@aztec/foundation/schemas';
+import { type PrivateExecutionStep } from '../kernel/private_kernel_prover_output.js';
+export declare class TxProfileResult {
+    executionSteps: PrivateExecutionStep[];
+    constructor(executionSteps: PrivateExecutionStep[]);
+    static get schema(): ZodFor<TxProfileResult>;
+    static random(): TxProfileResult;
+}
+//# sourceMappingURL=profiled_tx.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"profiled_tx.d.ts","sourceRoot":"","sources":["../../src/tx/profiled_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,EAAE,KAAK,oBAAoB,EAA8B,MAAM,2CAA2C,CAAC;AAElH,qBAAa,eAAe;IACP,cAAc,EAAE,oBAAoB,EAAE;gBAAtC,cAAc,EAAE,oBAAoB,EAAE;IAEzD,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAM3C;IAED,MAAM,CAAC,MAAM,IAAI,eAAe;CASjC"}