@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/avm/avm_circuit_public_inputs.d.ts.map

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

package/dest/avm/avm_circuit_public_inputs.js

@@ -7,21 +7,26 @@ 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 { ProtocolContracts } from '../tx/protocol_contracts.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.
 export class AvmCircuitPublicInputs {
     globalVariables;
+    protocolContracts;
     startTreeSnapshots;
     startGasUsed;
     gasSettings;
+    effectiveGasFees;
     feePayer;
+    proverId;
+    publicCallRequestArrayLengths;
     publicSetupCallRequests;
     publicAppLogicCallRequests;
     publicTeardownCallRequest;
@@ -31,15 +36,24 @@ export class AvmCircuitPublicInputs {
     previousRevertibleAccumulatedData;
     endTreeSnapshots;
     endGasUsed;
+    accumulatedDataArrayLengths;
     accumulatedData;
     transactionFee;
     reverted;
-    constructor(globalVariables, startTreeSnapshots, startGasUsed, gasSettings, feePayer, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, endTreeSnapshots, endGasUsed, accumulatedData, transactionFee, reverted){
+    constructor(///////////////////////////////////
+    // Inputs.
+    globalVariables, protocolContracts, startTreeSnapshots, startGasUsed, gasSettings, effectiveGasFees, feePayer, proverId, publicCallRequestArrayLengths, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, ///////////////////////////////////
+    // Outputs.
+    endTreeSnapshots, endGasUsed, accumulatedDataArrayLengths, accumulatedData, transactionFee, reverted){
         this.globalVariables = globalVariables;
+        this.protocolContracts = protocolContracts;
         this.startTreeSnapshots = startTreeSnapshots;
         this.startGasUsed = startGasUsed;
         this.gasSettings = gasSettings;
+        this.effectiveGasFees = effectiveGasFees;
         this.feePayer = feePayer;
+        this.proverId = proverId;
+        this.publicCallRequestArrayLengths = publicCallRequestArrayLengths;
         this.publicSetupCallRequests = publicSetupCallRequests;
         this.publicAppLogicCallRequests = publicAppLogicCallRequests;
         this.publicTeardownCallRequest = publicTeardownCallRequest;
@@ -49,6 +63,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;
@@ -56,10 +71,14 @@ export class AvmCircuitPublicInputs {
     static get schema() {
         return z.object({
             globalVariables: GlobalVariables.schema,
+            protocolContracts: ProtocolContracts.schema,
             startTreeSnapshots: TreeSnapshots.schema,
             startGasUsed: Gas.schema,
             gasSettings: GasSettings.schema,
+            effectiveGasFees: GasFees.schema,
             feePayer: AztecAddress.schema,
+            proverId: Fr.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,
@@ -69,17 +88,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, protocolContracts, startTreeSnapshots, startGasUsed, gasSettings, effectiveGasFees, feePayer, proverId, publicCallRequestArrayLengths, publicSetupCallRequests, publicAppLogicCallRequests, publicTeardownCallRequest, previousNonRevertibleAccumulatedDataArrayLengths, previousRevertibleAccumulatedDataArrayLengths, previousNonRevertibleAccumulatedData, previousRevertibleAccumulatedData, endTreeSnapshots, endGasUsed, accumulatedDataArrayLengths, accumulatedData, transactionFee, reverted })=>new AvmCircuitPublicInputs(globalVariables, protocolContracts, startTreeSnapshots, startGasUsed, gasSettings, effectiveGasFees, feePayer, proverId, 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(ProtocolContracts), reader.readObject(TreeSnapshots), reader.readObject(Gas), reader.readObject(GasSettings), reader.readObject(GasFees), reader.readObject(AztecAddress), reader.readObject(Fr), 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.protocolContracts, this.startTreeSnapshots, this.startGasUsed, this.gasSettings, this.effectiveGasFees, this.feePayer, this.proverId, 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));
@@ -89,10 +109,36 @@ 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), ProtocolContracts.fromFields(reader), TreeSnapshots.fromFields(reader), Gas.fromFields(reader), GasSettings.fromFields(reader), GasFees.fromFields(reader), AztecAddress.fromFields(reader), reader.readField(), 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 [
+            ...this.globalVariables.toFields(),
+            ...this.protocolContracts.toFields(),
+            ...this.startTreeSnapshots.toFields(),
+            ...this.startGasUsed.toFields(),
+            ...this.gasSettings.toFields(),
+            ...this.effectiveGasFees.toFields(),
+            this.feePayer,
+            this.proverId,
+            ...this.publicCallRequestArrayLengths.toFields(),
+            ...this.publicSetupCallRequests.map((request)=>request.toFields()),
+            ...this.publicAppLogicCallRequests.map((request)=>request.toFields()),
+            ...this.publicTeardownCallRequest.toFields(),
+            ...this.previousNonRevertibleAccumulatedDataArrayLengths.toFields(),
+            ...this.previousRevertibleAccumulatedDataArrayLengths.toFields(),
+            ...this.previousNonRevertibleAccumulatedData.toFields(),
+            ...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(), ProtocolContracts.empty(), TreeSnapshots.empty(), Gas.empty(), GasSettings.empty(), GasFees.empty(), AztecAddress.zero(), Fr.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);
@@ -100,10 +146,14 @@ export class AvmCircuitPublicInputs {
     [inspect.custom]() {
         return `AvmCircuitPublicInputs {
       globalVariables: ${inspect(this.globalVariables)},
+      protocolContracts: ${inspect(this.protocolContracts)},
       startTreeSnapshots: ${inspect(this.startTreeSnapshots)},
       startGasUsed: ${inspect(this.startGasUsed)},
       gasSettings: ${inspect(this.gasSettings)},
+      effectiveGasFees: ${inspect(this.effectiveGasFees)},
       feePayer: ${inspect(this.feePayer)},
+      proverId: ${inspect(this.proverId)},
+      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)},
@@ -113,6 +163,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},