chore: remove old public circuit public inputs (#11594)

AztecProtocol · Jan 29, 2025 · e996275 · e996275
1 parent 3d40260
commit e996275
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 536 deletions.
diff --git a/yarn-project/bb-prover/src/bb/execute.ts b/yarn-project/bb-prover/src/bb/execute.ts
@@ -518,7 +518,7 @@ export async function generateAvmProof(
   try {
     // Write the inputs to the working directory.
 
-    await fs.writeFile(publicInputsPath, input.output.toBuffer());
+    await fs.writeFile(publicInputsPath, input.publicInputs.toBuffer());
     if (!filePresent(publicInputsPath)) {
       return { status: BB_RESULT.FAILURE, reason: `Could not write publicInputs at ${publicInputsPath}` };
     }

diff --git a/yarn-project/bb-prover/src/test/test_avm.ts b/yarn-project/bb-prover/src/test/test_avm.ts
diff --git a/yarn-project/circuit-types/src/test/factories.ts b/yarn-project/circuit-types/src/test/factories.ts
@@ -12,7 +12,6 @@ import {
   GlobalVariables,
   MAX_NULLIFIERS_PER_TX,
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-  PublicCircuitPublicInputs,
   PublicDataWrite,
   PublicLog,
   RevertCode,
@@ -113,13 +112,7 @@ export async function makeBloatedProcessedTx({
       seed + 0x2000,
     );
 
-    const avmCircuitInputs = new AvmCircuitInputs(
-      '',
-      [],
-      PublicCircuitPublicInputs.empty(),
-      AvmExecutionHints.empty(),
-      avmOutput,
-    );
+    const avmCircuitInputs = new AvmCircuitInputs('', [], AvmExecutionHints.empty(), avmOutput);
 
     const gasUsed = {
       totalGas: Gas.empty(),

diff --git a/yarn-project/circuit-types/src/tx/processed_tx.ts b/yarn-project/circuit-types/src/tx/processed_tx.ts
@@ -134,11 +134,11 @@ export async function makeProcessedTxFromTxWithPublicCalls(
   revertCode: RevertCode,
   revertReason: SimulationError | undefined,
 ): Promise<ProcessedTx> {
-  const avmOutput = avmProvingRequest.inputs.output;
+  const avmPublicInputs = avmProvingRequest.inputs.publicInputs;
 
-  const constants = CombinedConstantData.combine(tx.data.constants, avmOutput.globalVariables);
+  const constants = CombinedConstantData.combine(tx.data.constants, avmPublicInputs.globalVariables);
 
-  const publicDataWrites = avmOutput.accumulatedData.publicDataWrites.filter(w => !w.isEmpty());
+  const publicDataWrites = avmPublicInputs.accumulatedData.publicDataWrites.filter(w => !w.isEmpty());
 
   const privateLogs = [
     ...tx.data.forPublic!.nonRevertibleAccumulatedData.privateLogs,
@@ -150,15 +150,15 @@ export async function makeProcessedTxFromTxWithPublicCalls(
   const txEffect = new TxEffect(
     revertCode,
     await tx.getTxHash(),
-    avmOutput.transactionFee,
-    avmOutput.accumulatedData.noteHashes.filter(h => !h.isZero()),
-    avmOutput.accumulatedData.nullifiers.filter(h => !h.isZero()),
-    avmOutput.accumulatedData.l2ToL1Msgs
+    avmPublicInputs.transactionFee,
+    avmPublicInputs.accumulatedData.noteHashes.filter(h => !h.isZero()),
+    avmPublicInputs.accumulatedData.nullifiers.filter(h => !h.isZero()),
+    avmPublicInputs.accumulatedData.l2ToL1Msgs
       .map(message => siloL2ToL1Message(message, constants.txContext.version, constants.txContext.chainId))
       .filter(h => !h.isZero()),
     publicDataWrites,
     privateLogs,
-    avmOutput.accumulatedData.publicLogs.filter(l => !l.isEmpty()),
+    avmPublicInputs.accumulatedData.publicLogs.filter(l => !l.isEmpty()),
     new Fr(contractClassLogPreimagesLength),
     tx.contractClassLogs,
   );

diff --git a/yarn-project/circuits.js/src/structs/avm/avm.ts b/yarn-project/circuits.js/src/structs/avm/avm.ts
@@ -11,7 +11,6 @@ import { Encoder, addExtension } from 'msgpackr';
 
 import { type ContractClassIdPreimage } from '../../contract/contract_class_id.js';
 import { PublicKeys } from '../../types/public_keys.js';
-import { PublicCircuitPublicInputs } from '../public_circuit_public_inputs.js';
 import { Vector } from '../shared.js';
 import { NullifierLeafPreimage } from '../trees/nullifier_leaf.js';
 import { AvmCircuitPublicInputs } from './avm_circuit_public_inputs.js';
@@ -847,9 +846,8 @@ export class AvmCircuitInputs {
   constructor(
     public readonly functionName: string, // only informational
     public readonly calldata: Fr[],
-    public readonly publicInputs: PublicCircuitPublicInputs,
     public readonly avmHints: AvmExecutionHints,
-    public output: AvmCircuitPublicInputs, // This should replace the above `publicInputs` eventually.
+    public publicInputs: AvmCircuitPublicInputs, // This should replace the above `publicInputs` eventually.
   ) {}
 
   /**
@@ -863,9 +861,8 @@ export class AvmCircuitInputs {
       functionNameBuffer,
       this.calldata.length,
       this.calldata,
-      this.publicInputs.toBuffer(),
       this.avmHints.toBuffer(),
-      this.output,
+      this.publicInputs,
     );
   }
 
@@ -878,13 +875,7 @@ export class AvmCircuitInputs {
   }
 
   static empty(): AvmCircuitInputs {
-    return new AvmCircuitInputs(
-      '',
-      [],
-      PublicCircuitPublicInputs.empty(),
-      AvmExecutionHints.empty(),
-      AvmCircuitPublicInputs.empty(),
-    );
+    return new AvmCircuitInputs('', [], AvmExecutionHints.empty(), AvmCircuitPublicInputs.empty());
   }
 
   /**
@@ -902,7 +893,7 @@ export class AvmCircuitInputs {
    * @returns An array of fields.
    */
   static getFields(fields: FieldsOf<AvmCircuitInputs>) {
-    return [fields.functionName, fields.calldata, fields.publicInputs, fields.avmHints, fields.output] as const;
+    return [fields.functionName, fields.calldata, fields.avmHints, fields.publicInputs] as const;
   }
 
   /**
@@ -915,7 +906,6 @@ export class AvmCircuitInputs {
     return new AvmCircuitInputs(
       /*functionName=*/ reader.readBuffer().toString(),
       /*calldata=*/ reader.readVector(Fr),
-      PublicCircuitPublicInputs.fromBuffer(reader),
       AvmExecutionHints.fromBuffer(reader),
       AvmCircuitPublicInputs.fromBuffer(reader),
     );
@@ -956,10 +946,10 @@ export class AvmCircuitInputs {
       contractInstances: [] as any[],
       contractClasses: [] as any[],
       initialTreeRoots: {
-        publicDataTree: this.output.startTreeSnapshots.publicDataTree.root,
-        nullifierTree: this.output.startTreeSnapshots.nullifierTree.root,
-        noteHashTree: this.output.startTreeSnapshots.noteHashTree.root,
-        l1ToL2MessageTree: this.output.startTreeSnapshots.l1ToL2MessageTree.root,
+        publicDataTree: this.publicInputs.startTreeSnapshots.publicDataTree.root,
+        nullifierTree: this.publicInputs.startTreeSnapshots.nullifierTree.root,
+        noteHashTree: this.publicInputs.startTreeSnapshots.noteHashTree.root,
+        l1ToL2MessageTree: this.publicInputs.startTreeSnapshots.l1ToL2MessageTree.root,
       },
     };
     const inputs = {

diff --git a/yarn-project/circuits.js/src/structs/index.ts b/yarn-project/circuits.js/src/structs/index.ts
@@ -57,7 +57,6 @@ export * from './private_validation_requests.js';
 export * from './proof.js';
 export * from './public_call_request.js';
 export * from './public_call_stack_item_compressed.js';
-export * from './public_circuit_public_inputs.js';
 export * from './public_data_hint.js';
 export * from './public_data_read.js';
 export * from './public_data_update_request.js';