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

package/src/tx/tx.ts

@@ -10,6 +10,7 @@ import { z } from 'zod';
 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 { PublicCallRequest } from '../kernel/index.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';
@@ -17,7 +18,8 @@ import { Gossipable } from '../p2p/gossipable.js';
 import { TopicType, createTopicString } 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';
 
 /**
@@ -27,6 +29,7 @@ export class Tx extends Gossipable {
   static override p2pTopic: string;
   // For memoization
   private txHash: TxHash | undefined;
+  private calldataMap: Map<string, Fr[]> | undefined;
 
   constructor(
     /**
@@ -36,7 +39,6 @@ export 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.
-     *
      */
     public readonly clientIvcProof: ClientIvcProof,
     /**
@@ -44,13 +46,9 @@ export class Tx extends Gossipable {
      */
     public contractClassLogs: ContractClassLog[],
     /**
-     * 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.
      */
-    public readonly enqueuedPublicFunctionCalls: PublicExecutionRequest[],
-    /**
-     * Public function call to be run by the sequencer as part of teardown.
-     */
-    public readonly publicTeardownFunctionCall: PublicExecutionRequest,
+    public publicFunctionCalldata: HashedValues[],
   ) {
     super();
   }
@@ -66,29 +64,38 @@ export class Tx extends Gossipable {
   }
 
   hasPublicCalls() {
-    return this.data.numberOfPublicCallRequests() > 0;
+    return this.numberOfPublicCalls() > 0;
   }
 
-  getNonRevertiblePublicExecutionRequests(): PublicExecutionRequest[] {
-    const numRevertible = this.data.numberOfRevertiblePublicCallRequests();
-    return this.enqueuedPublicFunctionCalls.slice(numRevertible);
+  numberOfPublicCalls() {
+    return this.data.numberOfPublicCallRequests();
   }
 
-  getRevertiblePublicExecutionRequests(): PublicExecutionRequest[] {
-    const numRevertible = this.data.numberOfRevertiblePublicCallRequests();
-    return this.enqueuedPublicFunctionCalls.slice(0, numRevertible);
+  getNonRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[] {
+    return this.data.getNonRevertiblePublicCallRequests().map(r => this.#combinePublicCallRequestWithCallData(r));
   }
 
-  getPublicTeardownExecutionRequest(): PublicExecutionRequest | undefined {
-    return this.publicTeardownFunctionCall.isEmpty() ? undefined : this.publicTeardownFunctionCall;
+  getRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[] {
+    return this.data.getRevertiblePublicCallRequests().map(r => this.#combinePublicCallRequestWithCallData(r));
   }
 
-  getTotalPublicArgsCount(): number {
-    let count = this.enqueuedPublicFunctionCalls.reduce((acc, execRequest) => acc + execRequest.args.length, 0);
-    if (!this.publicTeardownFunctionCall.isEmpty()) {
-      count += this.publicTeardownFunctionCall.args.length;
-    }
-    return count;
+  getTeardownPublicCallRequestWithCalldata(): PublicCallRequestWithCalldata | undefined {
+    const request = this.data.getTeardownPublicCallRequest();
+    return request ? this.#combinePublicCallRequestWithCallData(request) : undefined;
+  }
+
+  getPublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[] {
+    const teardown = this.data.getTeardownPublicCallRequest();
+    const callRequests = [
+      ...this.data.getNonRevertiblePublicCallRequests(),
+      ...this.data.getRevertiblePublicCallRequests(),
+      ...(teardown ? [teardown] : []),
+    ];
+    return callRequests.map(r => this.#combinePublicCallRequestWithCallData(r));
+  }
+
+  getTotalPublicCalldataCount(): number {
+    return this.publicFunctionCalldata.reduce((accum, cd) => accum + cd.values.length, 0);
   }
 
   getGasSettings(): GasSettings {
@@ -106,21 +113,7 @@ export class Tx extends Gossipable {
       reader.readObject(PrivateKernelTailCircuitPublicInputs),
       reader.readObject(ClientIvcProof),
       reader.readVectorUint8Prefix(ContractClassLog),
-      reader.readVectorUint8Prefix(PublicExecutionRequest),
-      reader.readObject(PublicExecutionRequest),
-    );
-  }
-
-  static newWithTxData(
-    data: PrivateKernelTailCircuitPublicInputs,
-    publicTeardownExecutionRequest?: PublicExecutionRequest,
-  ) {
-    return new Tx(
-      data,
-      ClientIvcProof.empty(),
-      [],
-      [],
-      publicTeardownExecutionRequest ? publicTeardownExecutionRequest : PublicExecutionRequest.empty(),
+      reader.readVectorUint8Prefix(HashedValues),
     );
   }
 
@@ -133,8 +126,7 @@ export class Tx extends Gossipable {
       this.data,
       this.clientIvcProof,
       serializeArrayOfBufferableToVector(this.contractClassLogs, 1),
-      serializeArrayOfBufferableToVector(this.enqueuedPublicFunctionCalls, 1),
-      this.publicTeardownFunctionCall,
+      serializeArrayOfBufferableToVector(this.publicFunctionCalldata, 1),
     ]);
   }
 
@@ -144,20 +136,13 @@ export class Tx extends Gossipable {
         data: PrivateKernelTailCircuitPublicInputs.schema,
         clientIvcProof: ClientIvcProof.schema,
         contractClassLogs: z.array(ContractClassLog.schema),
-        enqueuedPublicFunctionCalls: z.array(PublicExecutionRequest.schema),
-        publicTeardownFunctionCall: PublicExecutionRequest.schema,
+        publicFunctionCalldata: z.array(HashedValues.schema),
       })
       .transform(Tx.from);
   }
 
   static from(fields: FieldsOf<Tx>) {
-    return new Tx(
-      fields.data,
-      fields.clientIvcProof,
-      fields.contractClassLogs,
-      fields.enqueuedPublicFunctionCalls,
-      fields.publicTeardownFunctionCall,
-    );
+    return new Tx(fields.data, fields.clientIvcProof, fields.contractClassLogs, fields.publicFunctionCalldata);
   }
 
   /**
@@ -229,6 +214,16 @@ export class Tx extends Gossipable {
     this.txHash = hash;
   }
 
+  getCalldataMap(): Map<string, Fr[]> {
+    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. */
   async getStats(): Promise<TxStats> {
     return {
@@ -245,12 +240,7 @@ export class Tx extends Gossipable {
 
       feePaymentMethod:
         // needsSetup? then we pay through a fee payment contract
-        this.data.forPublic?.needsSetup
-          ? // if the first call is to `approve_public_authwit`, then it's a public payment
-            this.data.getNonRevertiblePublicCallRequests().at(-1)!.functionSelector.toField().toBigInt() === 0x43417bb1n
-            ? 'fpc_public'
-            : 'fpc_private'
-          : 'fee_juice',
+        this.data.forPublic?.needsSetup ? 'fpc' : 'fee_juice',
     };
   }
 
@@ -259,8 +249,7 @@ export class Tx extends Gossipable {
       this.data.getSize() +
       this.clientIvcProof.clientIvcProofBuffer.length +
       arraySerializedSizeOfNonEmpty(this.contractClassLogs) +
-      arraySerializedSizeOfNonEmpty(this.enqueuedPublicFunctionCalls) +
-      arraySerializedSizeOfNonEmpty([this.publicTeardownFunctionCall])
+      this.publicFunctionCalldata.reduce((accum, cd) => accum + cd.getSize(), 0)
     );
   }
 
@@ -304,17 +293,8 @@ export class Tx extends Gossipable {
     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,
-    );
+    const publicFunctionCalldata = tx.publicFunctionCalldata.map(cd => HashedValues.fromBuffer(cd.toBuffer()));
+    const clonedTx = new Tx(publicInputs, clientIvcProof, contractClassLogs, publicFunctionCalldata);
     if (tx.txHash) {
       clonedTx.setTxHash(TxHash.fromBuffer(tx.txHash.toBuffer()));
     }
@@ -332,8 +312,7 @@ export class Tx extends Gossipable {
       PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(),
       randomProof ? ClientIvcProof.random() : ClientIvcProof.empty(),
       [await ContractClassLog.random()],
-      [await PublicExecutionRequest.random()],
-      await PublicExecutionRequest.random(),
+      [HashedValues.random()],
     );
   }
 
@@ -354,6 +333,14 @@ export class Tx extends Gossipable {
   public async filterRevertedLogs() {
     this.contractClassLogs = await this.getSplitContractClassLogs(false);
   }
+
+  #combinePublicCallRequestWithCallData(request: PublicCallRequest) {
+    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);
+  }
 }
 
 /** Utility type for an entity that has a hash property for a txhash */

package/src/tx/tx_execution_request.ts

@@ -153,7 +153,7 @@ export class TxExecutionRequest {
       FunctionSelector.random(),
       Fr.random(),
       TxContext.empty(),
-      [await HashedValues.random()],
+      [HashedValues.random()],
       [AuthWitness.random()],
       [
         new Capsule(await AztecAddress.random(), Fr.random(), [Fr.random(), Fr.random()]),

package/dest/tx/public_execution_request.d.ts

@@ -1,45 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-import { inspect } from 'util';
-import { PublicCallRequest } from '../kernel/public_call_request.js';
-import { type ZodFor } from '../schemas/index.js';
-import { CallContext } from './call_context.js';
-/**
- * The execution request of a public function.
- */
-export declare class PublicExecutionRequest {
-    /**
-     * Context of the public call.
-     */
-    callContext: CallContext;
-    /**
-     * Function arguments.
-     */
-    args: Fr[];
-    constructor(
-    /**
-     * Context of the public call.
-     */
-    callContext: CallContext, 
-    /**
-     * Function arguments.
-     */
-    args: Fr[]);
-    getSize(): number;
-    toBuffer(): Buffer;
-    static get schema(): ZodFor<PublicExecutionRequest>;
-    static fromBuffer(buffer: Buffer | BufferReader): PublicExecutionRequest;
-    static from(fields: FieldsOf<PublicExecutionRequest>): PublicExecutionRequest;
-    static getFields(fields: FieldsOf<PublicExecutionRequest>): readonly [CallContext, Fr[]];
-    static empty(): PublicExecutionRequest;
-    static random(): Promise<PublicExecutionRequest>;
-    isEmpty(): boolean;
-    isForCallRequest(callRequest: PublicCallRequest): Promise<boolean>;
-    toCallRequest(): Promise<PublicCallRequest>;
-    [inspect.custom](): string;
-}
-//# sourceMappingURL=public_execution_request.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"public_execution_request.d.ts","sourceRoot":"","sources":["../../src/tx/public_execution_request.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;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAI/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;GAEG;AACH,qBAAa,sBAAsB;IAE/B;;OAEG;IACI,WAAW,EAAE,WAAW;IAC/B;;OAEG;IACI,IAAI,EAAE,EAAE,EAAE;;IAPjB;;OAEG;IACI,WAAW,EAAE,WAAW;IAC/B;;OAEG;IACI,IAAI,EAAE,EAAE,EAAE;IAGnB,OAAO;IAIP,QAAQ;IAIR,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAOlD;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,GAAG,sBAAsB;IAI7E,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC;IAIzD,MAAM,CAAC,KAAK;WAIC,MAAM;IAInB,OAAO,IAAI,OAAO;IAIZ,gBAAgB,CAAC,WAAW,EAAE,iBAAiB;IAU/C,aAAa,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAUjD,CAAC,OAAO,CAAC,MAAM,CAAC;CAMjB"}

package/dest/tx/public_execution_request.js

@@ -1,72 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import { inspect } from 'util';
-import { z } from 'zod';
-import { computeVarArgsHash } from '../hash/index.js';
-import { PublicCallRequest } from '../kernel/public_call_request.js';
-import { schemas } from '../schemas/index.js';
-import { Vector } from '../types/index.js';
-import { CallContext } from './call_context.js';
-/**
- * The execution request of a public function.
- */ export class PublicExecutionRequest {
-    callContext;
-    args;
-    constructor(/**
-     * Context of the public call.
-     */ callContext, /**
-     * Function arguments.
-     */ args){
-        this.callContext = callContext;
-        this.args = args;
-    }
-    getSize() {
-        return this.isEmpty() ? 0 : this.toBuffer().length;
-    }
-    toBuffer() {
-        return serializeToBuffer(this.callContext, new Vector(this.args));
-    }
-    static get schema() {
-        return z.object({
-            callContext: CallContext.schema,
-            args: z.array(schemas.Fr)
-        }).transform(PublicExecutionRequest.from);
-    }
-    static fromBuffer(buffer) {
-        const reader = BufferReader.asReader(buffer);
-        return new PublicExecutionRequest(CallContext.fromBuffer(reader), reader.readVector(Fr));
-    }
-    static from(fields) {
-        return new PublicExecutionRequest(...PublicExecutionRequest.getFields(fields));
-    }
-    static getFields(fields) {
-        return [
-            fields.callContext,
-            fields.args
-        ];
-    }
-    static empty() {
-        return new PublicExecutionRequest(CallContext.empty(), []);
-    }
-    static async random() {
-        return new PublicExecutionRequest(await CallContext.random(), [
-            Fr.random(),
-            Fr.random()
-        ]);
-    }
-    isEmpty() {
-        return this.callContext.isEmpty() && this.args.length === 0;
-    }
-    async isForCallRequest(callRequest) {
-        return this.callContext.msgSender.equals(callRequest.msgSender) && this.callContext.contractAddress.equals(callRequest.contractAddress) && this.callContext.functionSelector.equals(callRequest.functionSelector) && this.callContext.isStaticCall == callRequest.isStaticCall && (await computeVarArgsHash(this.args)).equals(callRequest.argsHash);
-    }
-    async toCallRequest() {
-        return new PublicCallRequest(this.callContext.msgSender, this.callContext.contractAddress, this.callContext.functionSelector, this.callContext.isStaticCall, await computeVarArgsHash(this.args));
-    }
-    [inspect.custom]() {
-        return `PublicExecutionRequest {
-      callContext: ${inspect(this.callContext)}
-      args: ${this.args}
-    }`;
-    }
-}

package/src/tx/public_execution_request.ts

@@ -1,97 +0,0 @@
-import { Fr } from '@aztec/foundation/fields';
-import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
-import type { FieldsOf } from '@aztec/foundation/types';
-
-import { inspect } from 'util';
-import { z } from 'zod';
-
-import { computeVarArgsHash } from '../hash/index.js';
-import { PublicCallRequest } from '../kernel/public_call_request.js';
-import { type ZodFor, schemas } from '../schemas/index.js';
-import { Vector } from '../types/index.js';
-import { CallContext } from './call_context.js';
-
-/**
- * The execution request of a public function.
- */
-export class PublicExecutionRequest {
-  constructor(
-    /**
-     * Context of the public call.
-     */
-    public callContext: CallContext,
-    /**
-     * Function arguments.
-     */
-    public args: Fr[],
-  ) {}
-
-  getSize() {
-    return this.isEmpty() ? 0 : this.toBuffer().length;
-  }
-
-  toBuffer() {
-    return serializeToBuffer(this.callContext, new Vector(this.args));
-  }
-
-  static get schema(): ZodFor<PublicExecutionRequest> {
-    return z
-      .object({
-        callContext: CallContext.schema,
-        args: z.array(schemas.Fr),
-      })
-      .transform(PublicExecutionRequest.from);
-  }
-
-  static fromBuffer(buffer: Buffer | BufferReader) {
-    const reader = BufferReader.asReader(buffer);
-    return new PublicExecutionRequest(CallContext.fromBuffer(reader), reader.readVector(Fr));
-  }
-
-  static from(fields: FieldsOf<PublicExecutionRequest>): PublicExecutionRequest {
-    return new PublicExecutionRequest(...PublicExecutionRequest.getFields(fields));
-  }
-
-  static getFields(fields: FieldsOf<PublicExecutionRequest>) {
-    return [fields.callContext, fields.args] as const;
-  }
-
-  static empty() {
-    return new PublicExecutionRequest(CallContext.empty(), []);
-  }
-
-  static async random() {
-    return new PublicExecutionRequest(await CallContext.random(), [Fr.random(), Fr.random()]);
-  }
-
-  isEmpty(): boolean {
-    return this.callContext.isEmpty() && this.args.length === 0;
-  }
-
-  async isForCallRequest(callRequest: PublicCallRequest) {
-    return (
-      this.callContext.msgSender.equals(callRequest.msgSender) &&
-      this.callContext.contractAddress.equals(callRequest.contractAddress) &&
-      this.callContext.functionSelector.equals(callRequest.functionSelector) &&
-      this.callContext.isStaticCall == callRequest.isStaticCall &&
-      (await computeVarArgsHash(this.args)).equals(callRequest.argsHash)
-    );
-  }
-
-  async toCallRequest(): Promise<PublicCallRequest> {
-    return new PublicCallRequest(
-      this.callContext.msgSender,
-      this.callContext.contractAddress,
-      this.callContext.functionSelector,
-      this.callContext.isStaticCall,
-      await computeVarArgsHash(this.args),
-    );
-  }
-
-  [inspect.custom]() {
-    return `PublicExecutionRequest {
-      callContext: ${inspect(this.callContext)}
-      args: ${this.args}
-    }`;
-  }
-}