[skip ci]

Author: just-mitch

yarn-project/circuits.js/src/structs/kernel/public_accumulated_data.ts

@@ -54,7 +54,10 @@ export class PublicAccumulatedData {
     /**
      * All the public data update requests made in this transaction.
      */
-    public publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>,
+    public readonly publicDataUpdateRequests: Tuple<
+      PublicDataUpdateRequest,
+      typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
+    >,
     /**
      * Current public call stack.
      */

yarn-project/simulator/src/public/abstract_phase_manager.ts

@@ -61,7 +61,6 @@ import {
   type PublicExecutor,
   accumulateReturnValues,
   collectPublicDataReads,
-  collectPublicDataUpdateRequests,
   isPublicExecutionResult,
 } from '@aztec/simulator';
 import { type MerkleTreeOperations } from '@aztec/world-state';
@@ -511,9 +510,6 @@ export abstract class AbstractPhaseManager {
     publicInputs: PublicKernelCircuitPublicInputs,
     execResult: PublicExecutionResult,
   ) {
-    const { publicDataUpdateRequests } = PhaseIsRevertible[this.phase]
-      ? publicInputs.end
-      : publicInputs.endNonRevertibleData;
     const { publicDataReads } = publicInputs.validationRequests;
 
     // Convert ContractStorage* objects to PublicData* objects and sort them in execution order.
@@ -522,13 +518,9 @@ export abstract class AbstractPhaseManager {
 
     const simPublicDataReads = collectPublicDataReads(execResult);
 
-    const simPublicDataUpdateRequests = collectPublicDataUpdateRequests(execResult);
-
     // We only want to reorder the items from the public inputs of the
     // most recently processed top/enqueued call.
 
-    const effectSet = PhaseIsRevertible[this.phase] ? 'end' : 'endNonRevertibleData';
-
     const numReadsInKernel = arrayNonEmptyLength(publicDataReads, f => f.isEmpty());
     const numReadsBeforeThisEnqueuedCall = numReadsInKernel - simPublicDataReads.length;
     publicInputs.validationRequests.publicDataReads = padArrayEnd(
@@ -540,18 +532,6 @@ export abstract class AbstractPhaseManager {
       PublicDataRead.empty(),
       MAX_PUBLIC_DATA_READS_PER_TX,
     );
-
-    const numUpdatesInKernel = arrayNonEmptyLength(publicDataUpdateRequests, f => f.isEmpty());
-    const numUpdatesBeforeThisEnqueuedCall = numUpdatesInKernel - simPublicDataUpdateRequests.length;
-
-    publicInputs[effectSet].publicDataUpdateRequests = padArrayEnd(
-      [
-        ...publicInputs[effectSet].publicDataUpdateRequests.slice(0, numUpdatesBeforeThisEnqueuedCall),
-        ...simPublicDataUpdateRequests,
-      ],
-      PublicDataUpdateRequest.empty(),
-      MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    );
   }
 }
 

yarn-project/simulator/src/public/public_processor.test.ts

@@ -973,13 +973,13 @@ describe('public_processor', () => {
       const txEffect = toTxEffect(processed[0], GasFees.default());
       expect(arrayNonEmptyLength(txEffect.publicDataWrites, PublicDataWrite.isEmpty)).toEqual(3);
       expect(txEffect.publicDataWrites[0]).toEqual(
-        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotC), fr(0x201)),
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotB), fr(0x152)),
       );
       expect(txEffect.publicDataWrites[1]).toEqual(
-        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotA), fr(0x103)),
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotA), fr(0x102)),
       );
       expect(txEffect.publicDataWrites[2]).toEqual(
-        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotB), fr(0x152)),
+        new PublicDataWrite(computePublicDataTreeLeafSlot(baseContractAddress, contractSlotC), fr(0x201)),
       );
       expect(txEffect.encryptedLogs.getTotalLogCount()).toBe(0);
       expect(txEffect.unencryptedLogs.getTotalLogCount()).toBe(0);