@aztec/stdlib 0.87.7 → 1.0.0-nightly.20250605

package/dest/avm/avm_circuit_public_inputs.js

@@ -7,12 +7,12 @@ import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';
 import { inspect } from 'util';
 import { z } from 'zod';
 import { AztecAddress } from '../aztec-address/index.js';
-import { Gas, GasSettings } from '../gas/index.js';
+import { Gas, GasFees, GasSettings } from '../gas/index.js';
 import { PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths } from '../kernel/private_to_avm_accumulated_data.js';
-import { PublicCallRequest } from '../kernel/public_call_request.js';
+import { PublicCallRequest, PublicCallRequestArrayLengths } from '../kernel/public_call_request.js';
 import { GlobalVariables } from '../tx/global_variables.js';
 import { TreeSnapshots } from '../tx/tree_snapshots.js';
-import { AvmAccumulatedData } from './avm_accumulated_data.js';
+import { AvmAccumulatedData, AvmAccumulatedDataArrayLengths } from './avm_accumulated_data.js';
 import { serializeWithMessagePack } from './message_pack.js';
 // Note: the {from,to}{Buffer,Fields,String} methods are needed by AvmProofData and PublicBaseRollupInputs.
 // At some point it might be worth writing Zod schemas for all dependent types and get rid of that.
@@ -21,7 +21,9 @@ export class AvmCircuitPublicInputs {
     startTreeSnapshots;
     startGasUsed;
     gasSettings;
+    effectiveGasFees;
     feePayer;
+    publicCallRequestArrayLengths;
     publicSetupCallRequests;
     publicAppLogicCallRequests;
     publicTeardownCallRequest;
@@ -31,19 +33,22 @@ export class AvmCircuitPublicInputs {
     previousRevertibleAccumulatedData;
     endTreeSnapshots;
     endGasUsed;
+    accumulatedDataArrayLengths;
     accumulatedData;
     transactionFee;
     reverted;
     constructor(///////////////////////////////////
     // Inputs.
-    globalVariables, startTreeSnapshots, startGasUsed, gasSettings, feePayer, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, ///////////////////////////////////
+    globalVariables, startTreeSnapshots, startGasUsed, gasSettings, effectiveGasFees, feePayer, publicCallRequestArrayLengths, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, ///////////////////////////////////
     // Outputs.
-    endTreeSnapshots, endGasUsed, accumulatedData, transactionFee, reverted){
+    endTreeSnapshots, endGasUsed, accumulatedDataArrayLengths, accumulatedData, transactionFee, reverted){
         this.globalVariables = globalVariables;
         this.startTreeSnapshots = startTreeSnapshots;
         this.startGasUsed = startGasUsed;
         this.gasSettings = gasSettings;
+        this.effectiveGasFees = effectiveGasFees;
         this.feePayer = feePayer;
+        this.publicCallRequestArrayLengths = publicCallRequestArrayLengths;
         this.publicSetupCallRequests = publicSetupCallRequests;
         this.publicAppLogicCallRequests = publicAppLogicCallRequests;
         this.publicTeardownCallRequest = publicTeardownCallRequest;
@@ -53,6 +58,7 @@ export class AvmCircuitPublicInputs {
         this.previousRevertibleAccumulatedData = previousRevertibleAccumulatedData;
         this.endTreeSnapshots = endTreeSnapshots;
         this.endGasUsed = endGasUsed;
+        this.accumulatedDataArrayLengths = accumulatedDataArrayLengths;
         this.accumulatedData = accumulatedData;
         this.transactionFee = transactionFee;
         this.reverted = reverted;
@@ -63,7 +69,9 @@ export class AvmCircuitPublicInputs {
             startTreeSnapshots: TreeSnapshots.schema,
             startGasUsed: Gas.schema,
             gasSettings: GasSettings.schema,
+            effectiveGasFees: GasFees.schema,
             feePayer: AztecAddress.schema,
+            publicCallRequestArrayLengths: PublicCallRequestArrayLengths.schema,
             publicSetupCallRequests: PublicCallRequest.schema.array().max(MAX_ENQUEUED_CALLS_PER_TX),
             publicAppLogicCallRequests: PublicCallRequest.schema.array().max(MAX_ENQUEUED_CALLS_PER_TX),
             publicTeardownCallRequest: PublicCallRequest.schema,
@@ -73,17 +81,18 @@ export class AvmCircuitPublicInputs {
             previousRevertibleAccumulatedData: PrivateToAvmAccumulatedData.schema,
             endTreeSnapshots: TreeSnapshots.schema,
             endGasUsed: Gas.schema,
+            accumulatedDataArrayLengths: AvmAccumulatedDataArrayLengths.schema,
             accumulatedData: AvmAccumulatedData.schema,
             transactionFee: schemas.Fr,
             reverted: z.boolean()
-        }).transform(({ globalVariables, startTreeSnapshots, startGasUsed, gasSettings, feePayer, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, endTreeSnapshots, endGasUsed, accumulatedData, transactionFee, reverted })=>new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasSettings, feePayer, assertLength(publicSetupCallRequests, MAX_ENQUEUED_CALLS_PER_TX), assertLength(publicAppLogicCallRequests, MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, endTreeSnapshots, endGasUsed, accumulatedData, transactionFee, reverted));
+        }).transform(({ globalVariables, startTreeSnapshots, startGasUsed, gasSettings, effectiveGasFees, feePayer, publicCallRequestArrayLengths, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, endTreeSnapshots, endGasUsed, accumulatedDataArrayLengths, accumulatedData, transactionFee, reverted })=>new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasSettings, effectiveGasFees, feePayer, publicCallRequestArrayLengths, assertLength(publicSetupCallRequests, MAX_ENQUEUED_CALLS_PER_TX), assertLength(publicAppLogicCallRequests, MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, endTreeSnapshots, endGasUsed, accumulatedDataArrayLengths, accumulatedData, transactionFee, reverted));
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
-        return new AvmCircuitPublicInputs(reader.readObject(GlobalVariables), reader.readObject(TreeSnapshots), reader.readObject(Gas), reader.readObject(GasSettings), reader.readObject(AztecAddress), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), reader.readObject(PublicCallRequest), reader.readObject(PrivateToAvmAccumulatedDataArrayLengths), reader.readObject(PrivateToAvmAccumulatedDataArrayLengths), reader.readObject(PrivateToAvmAccumulatedData), reader.readObject(PrivateToAvmAccumulatedData), reader.readObject(TreeSnapshots), reader.readObject(Gas), reader.readObject(AvmAccumulatedData), reader.readObject(Fr), reader.readBoolean());
+        return new AvmCircuitPublicInputs(reader.readObject(GlobalVariables), reader.readObject(TreeSnapshots), reader.readObject(Gas), reader.readObject(GasSettings), reader.readObject(GasFees), reader.readObject(AztecAddress), reader.readObject(PublicCallRequestArrayLengths), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), reader.readObject(PublicCallRequest), reader.readObject(PrivateToAvmAccumulatedDataArrayLengths), reader.readObject(PrivateToAvmAccumulatedDataArrayLengths), reader.readObject(PrivateToAvmAccumulatedData), reader.readObject(PrivateToAvmAccumulatedData), reader.readObject(TreeSnapshots), reader.readObject(Gas), reader.readObject(AvmAccumulatedDataArrayLengths), reader.readObject(AvmAccumulatedData), reader.readObject(Fr), reader.readBoolean());
     }
     toBuffer() {
-        return serializeToBuffer(this.globalVariables, this.startTreeSnapshots, this.startGasUsed, this.gasSettings, this.feePayer, this.publicSetupCallRequests, this.publicAppLogicCallRequests, this.publicTeardownCallRequest, this.previousNonRevertibleAccumulatedDataArrayLengths, this.previousRevertibleAccumulatedDataArrayLengths, this.previousNonRevertibleAccumulatedData, this.previousRevertibleAccumulatedData, this.endTreeSnapshots, this.endGasUsed, this.accumulatedData, this.transactionFee, this.reverted);
+        return serializeToBuffer(this.globalVariables, this.startTreeSnapshots, this.startGasUsed, this.gasSettings, this.effectiveGasFees, this.feePayer, this.publicCallRequestArrayLengths, this.publicSetupCallRequests, this.publicAppLogicCallRequests, this.publicTeardownCallRequest, this.previousNonRevertibleAccumulatedDataArrayLengths, this.previousRevertibleAccumulatedDataArrayLengths, this.previousNonRevertibleAccumulatedData, this.previousRevertibleAccumulatedData, this.endTreeSnapshots, this.endGasUsed, this.accumulatedDataArrayLengths, this.accumulatedData, this.transactionFee, this.reverted);
     }
     static fromString(str) {
         return AvmCircuitPublicInputs.fromBuffer(hexToBuffer(str));
@@ -93,7 +102,7 @@ export class AvmCircuitPublicInputs {
     }
     static fromFields(fields) {
         const reader = FieldReader.asReader(fields);
-        return new AvmCircuitPublicInputs(GlobalVariables.fromFields(reader), TreeSnapshots.fromFields(reader), Gas.fromFields(reader), GasSettings.fromFields(reader), AztecAddress.fromFields(reader), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), PublicCallRequest.fromFields(reader), PrivateToAvmAccumulatedDataArrayLengths.fromFields(reader), PrivateToAvmAccumulatedDataArrayLengths.fromFields(reader), PrivateToAvmAccumulatedData.fromFields(reader), PrivateToAvmAccumulatedData.fromFields(reader), TreeSnapshots.fromFields(reader), Gas.fromFields(reader), AvmAccumulatedData.fromFields(reader), reader.readField(), reader.readBoolean());
+        return new AvmCircuitPublicInputs(GlobalVariables.fromFields(reader), TreeSnapshots.fromFields(reader), Gas.fromFields(reader), GasSettings.fromFields(reader), GasFees.fromFields(reader), AztecAddress.fromFields(reader), PublicCallRequestArrayLengths.fromFields(reader), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), reader.readArray(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest), PublicCallRequest.fromFields(reader), PrivateToAvmAccumulatedDataArrayLengths.fromFields(reader), PrivateToAvmAccumulatedDataArrayLengths.fromFields(reader), PrivateToAvmAccumulatedData.fromFields(reader), PrivateToAvmAccumulatedData.fromFields(reader), TreeSnapshots.fromFields(reader), Gas.fromFields(reader), AvmAccumulatedDataArrayLengths.fromFields(reader), AvmAccumulatedData.fromFields(reader), reader.readField(), reader.readBoolean());
     }
     toFields() {
         return [
@@ -101,7 +110,9 @@ export class AvmCircuitPublicInputs {
             ...this.startTreeSnapshots.toFields(),
             ...this.startGasUsed.toFields(),
             ...this.gasSettings.toFields(),
+            ...this.effectiveGasFees.toFields(),
             this.feePayer,
+            ...this.publicCallRequestArrayLengths.toFields(),
             ...this.publicSetupCallRequests.map((request)=>request.toFields()),
             ...this.publicAppLogicCallRequests.map((request)=>request.toFields()),
             ...this.publicTeardownCallRequest.toFields(),
@@ -111,13 +122,14 @@ export class AvmCircuitPublicInputs {
             ...this.previousRevertibleAccumulatedData.toFields(),
             ...this.endTreeSnapshots.toFields(),
             ...this.endGasUsed.toFields(),
+            ...this.accumulatedDataArrayLengths.toFields(),
             ...this.accumulatedData.toFields(),
             this.transactionFee,
             this.reverted
         ];
     }
     static empty() {
-        return new AvmCircuitPublicInputs(GlobalVariables.empty(), TreeSnapshots.empty(), Gas.empty(), GasSettings.empty(), AztecAddress.zero(), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty), PublicCallRequest.empty(), PrivateToAvmAccumulatedDataArrayLengths.empty(), PrivateToAvmAccumulatedDataArrayLengths.empty(), PrivateToAvmAccumulatedData.empty(), PrivateToAvmAccumulatedData.empty(), TreeSnapshots.empty(), Gas.empty(), AvmAccumulatedData.empty(), Fr.zero(), false);
+        return new AvmCircuitPublicInputs(GlobalVariables.empty(), TreeSnapshots.empty(), Gas.empty(), GasSettings.empty(), GasFees.empty(), AztecAddress.zero(), PublicCallRequestArrayLengths.empty(), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty), makeTuple(MAX_ENQUEUED_CALLS_PER_TX, PublicCallRequest.empty), PublicCallRequest.empty(), PrivateToAvmAccumulatedDataArrayLengths.empty(), PrivateToAvmAccumulatedDataArrayLengths.empty(), PrivateToAvmAccumulatedData.empty(), PrivateToAvmAccumulatedData.empty(), TreeSnapshots.empty(), Gas.empty(), AvmAccumulatedDataArrayLengths.empty(), AvmAccumulatedData.empty(), Fr.zero(), false);
     }
     serializeWithMessagePack() {
         return serializeWithMessagePack(this);
@@ -128,7 +140,9 @@ export class AvmCircuitPublicInputs {
       startTreeSnapshots: ${inspect(this.startTreeSnapshots)},
       startGasUsed: ${inspect(this.startGasUsed)},
       gasSettings: ${inspect(this.gasSettings)},
+      effectiveGasFees: ${inspect(this.effectiveGasFees)},
       feePayer: ${inspect(this.feePayer)},
+      publicCallRequestArrayLengths: ${inspect(this.publicCallRequestArrayLengths)},
       publicSetupCallRequests: [${this.publicSetupCallRequests.filter((x)=>!x.isEmpty()).map((h)=>inspect(h)).join(', ')}]},
       publicAppLogicCallRequests: [${this.publicAppLogicCallRequests.filter((x)=>!x.isEmpty()).map((h)=>inspect(h)).join(', ')}]},
       publicTeardownCallRequest: ${inspect(this.publicTeardownCallRequest)},
@@ -138,6 +152,7 @@ export class AvmCircuitPublicInputs {
       previousRevertibleAccumulatedData: ${inspect(this.previousRevertibleAccumulatedData)},
       endTreeSnapshots: ${inspect(this.endTreeSnapshots)},
       endGasUsed: ${inspect(this.endGasUsed)},
+      accumulatedDataArrayLengths: ${inspect(this.accumulatedDataArrayLengths)},
       accumulatedData: ${inspect(this.accumulatedData)},
       transactionFee: ${inspect(this.transactionFee)},
       reverted: ${this.reverted},