@aztec/simulator 0.82.3 → 0.83.1-alpha-testnet.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.82.3",
+  "version": "0.83.1-alpha-testnet.0",
   "type": "module",
   "exports": {
     "./server": "./dest/server.js",
@@ -60,16 +60,16 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.82.3",
-    "@aztec/foundation": "0.82.3",
-    "@aztec/noir-acvm_js": "0.82.3",
-    "@aztec/noir-noirc_abi": "0.82.3",
-    "@aztec/noir-protocol-circuits-types": "0.82.3",
-    "@aztec/noir-types": "0.82.3",
-    "@aztec/protocol-contracts": "0.82.3",
-    "@aztec/stdlib": "0.82.3",
-    "@aztec/telemetry-client": "0.82.3",
-    "@aztec/world-state": "0.82.3",
+    "@aztec/constants": "0.83.1-alpha-testnet.0",
+    "@aztec/foundation": "0.83.1-alpha-testnet.0",
+    "@aztec/noir-acvm_js": "0.83.1-alpha-testnet.0",
+    "@aztec/noir-noirc_abi": "0.83.1-alpha-testnet.0",
+    "@aztec/noir-protocol-circuits-types": "0.83.1-alpha-testnet.0",
+    "@aztec/noir-types": "0.83.1-alpha-testnet.0",
+    "@aztec/protocol-contracts": "0.83.1-alpha-testnet.0",
+    "@aztec/stdlib": "0.83.1-alpha-testnet.0",
+    "@aztec/telemetry-client": "0.83.1-alpha-testnet.0",
+    "@aztec/world-state": "0.83.1-alpha-testnet.0",
     "levelup": "^5.1.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.merge": "^4.6.2",
@@ -77,9 +77,9 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/kv-store": "0.82.3",
-    "@aztec/merkle-tree": "0.82.3",
-    "@aztec/noir-contracts.js": "0.82.3",
+    "@aztec/kv-store": "0.83.1-alpha-testnet.0",
+    "@aztec/merkle-tree": "0.83.1-alpha-testnet.0",
+    "@aztec/noir-contracts.js": "0.83.1-alpha-testnet.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/levelup": "^5.1.3",

package/src/private/acvm/oracle/oracle.ts

@@ -1,8 +1,9 @@
 import { Fr, Point } from '@aztec/foundation/fields';
-import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { ContractClassLog, LogWithTxData } from '@aztec/stdlib/logs';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { TxHash } from '@aztec/stdlib/tx';
 
 import type { ACVMField } from '../acvm_types.js';
 import { fromBoundedVec, fromUintArray, fromUintBoundedVec } from '../deserialize.js';
@@ -371,8 +372,8 @@ export class Oracle {
     return [];
   }
 
-  async syncNotes(): Promise<ACVMField[]> {
-    await this.typedOracle.syncNotes();
+  async syncNotes([pendingTaggedLogArrayBaseSlot]: ACVMField[]): Promise<ACVMField[]> {
+    await this.typedOracle.syncNotes(Fr.fromString(pendingTaggedLogArrayBaseSlot));
     return [];
   }
 
@@ -490,4 +491,24 @@ export class Oracle {
     );
     return secret.toFields().map(toACVMField);
   }
+
+  async storePrivateEventLog(
+    [contractAddress]: ACVMField[],
+    [recipient]: ACVMField[],
+    [eventSelector]: ACVMField[],
+    logContentBVecStorage: ACVMField[],
+    [logContentLength]: ACVMField[],
+    [txHash]: ACVMField[],
+    [logIndexInTx]: ACVMField[],
+  ) {
+    await this.typedOracle.storePrivateEventLog(
+      AztecAddress.fromField(Fr.fromString(contractAddress)),
+      AztecAddress.fromField(Fr.fromString(recipient)),
+      EventSelector.fromField(Fr.fromString(eventSelector)),
+      fromBoundedVec(logContentBVecStorage, logContentLength),
+      new TxHash(Fr.fromString(txHash)),
+      Fr.fromString(logIndexInTx).toNumber(),
+    );
+    return [];
+  }
 }

package/src/private/acvm/oracle/typed_oracle.ts

@@ -1,13 +1,13 @@
 import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { Fr, Point } from '@aztec/foundation/fields';
-import type { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import type { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
 import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
 import type { ContractClassLog, IndexedTaggingSecret, LogWithTxData } from '@aztec/stdlib/logs';
 import type { Note, NoteStatus } from '@aztec/stdlib/note';
 import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
-import type { BlockHeader } from '@aztec/stdlib/tx';
+import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
 
 import type { MessageLoadOracleInputs } from '../../../common/message_load_oracle_inputs.js';
 
@@ -214,7 +214,7 @@ export abstract class TypedOracle {
     return Promise.reject(new OracleMethodNotAvailableError('incrementAppTaggingSecretIndexAsSender'));
   }
 
-  syncNotes(): Promise<void> {
+  syncNotes(_pendingTaggedLogArrayBaseSlot: Fr): Promise<void> {
     return Promise.reject(new OracleMethodNotAvailableError('syncNotes'));
   }
 
@@ -258,4 +258,15 @@ export abstract class TypedOracle {
   getSharedSecret(_address: AztecAddress, _ephPk: Point): Promise<Point> {
     return Promise.reject(new OracleMethodNotAvailableError('getSharedSecret'));
   }
+
+  storePrivateEventLog(
+    _contractAddress: AztecAddress,
+    _recipient: AztecAddress,
+    _eventSelector: EventSelector,
+    _logContent: Fr[],
+    _txHash: TxHash,
+    _logIndexInTx: number,
+  ): Promise<void> {
+    return Promise.reject(new OracleMethodNotAvailableError('storePrivateEventLog'));
+  }
 }

package/src/private/execution_data_provider.ts

@@ -1,13 +1,18 @@
 import type { Fr, Point } from '@aztec/foundation/fields';
-import type { FunctionArtifact, FunctionArtifactWithContractName, FunctionSelector } from '@aztec/stdlib/abi';
+import type {
+  EventSelector,
+  FunctionArtifact,
+  FunctionArtifactWithContractName,
+  FunctionSelector,
+} from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { L2Block } from '@aztec/stdlib/block';
 import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
 import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
-import { IndexedTaggingSecret, LogWithTxData, TxScopedL2Log } from '@aztec/stdlib/logs';
+import { IndexedTaggingSecret, LogWithTxData } from '@aztec/stdlib/logs';
 import type { NoteStatus } from '@aztec/stdlib/note';
 import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
-import type { BlockHeader } from '@aztec/stdlib/tx';
+import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
 
 import type { CommitmentsDBInterface } from '../common/db_interfaces.js';
 import type { NoteData } from './acvm/index.js';
@@ -221,25 +226,18 @@ export interface ExecutionDataProvider extends CommitmentsDBInterface {
   ): Promise<void>;
 
   /**
-   * Synchronizes the logs tagged with the recipient's address and all the senders in the address book.
-   * Returns the unsynched logs and updates the indexes of the secrets used to tag them until there are no more logs to sync.
-   * @param contractAddress - The address of the contract that the logs are tagged for
-   * @param recipient - The address of the recipient
-   * @returns A list of encrypted logs tagged with the recipient's address
+   * Synchronizes the logs tagged with scoped addresses and all the senders in the address book. Stores the found logs
+   * in CapsuleArray ready for a later retrieval in Aztec.nr.
+   * @param contractAddress - The address of the contract that the logs are tagged for.
+   * @param pendingTaggedLogArrayBaseSlot - The base slot of the pending tagged log capsule array in which found logs will be stored.
+   * @param scopes - The scoped addresses to sync logs for. If not provided, all accounts in the address book will be
+   * synced.
    */
   syncTaggedLogs(
     contractAddress: AztecAddress,
-    maxBlockNumber: number,
+    pendingTaggedLogArrayBaseSlot: Fr,
     scopes?: AztecAddress[],
-  ): Promise<Map<string, TxScopedL2Log[]>>;
-
-  /**
-   * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
-   * @param contractAddress - The address of the contract that emitted the logs.
-   * @param logs - The logs to process.
-   * @param recipient - The recipient of the logs.
-   */
-  processTaggedLogs(contractAddress: AztecAddress, logs: TxScopedL2Log[], recipient: AztecAddress): Promise<void>;
+  ): Promise<void>;
 
   /**
    * Delivers the preimage and metadata of a committed note so that it can be later requested via the `getNotes`
@@ -325,4 +323,22 @@ export interface ExecutionDataProvider extends CommitmentsDBInterface {
    * @returns The secret for the given address.
    */
   getSharedSecret(address: AztecAddress, ephPk: Point): Promise<Point>;
+
+  /**
+   * Stores an event log in the database.
+   * @param contractAddress - The address of the contract that emitted the log.
+   * @param recipient - The address of the recipient.
+   * @param eventSelector - The event selector of the event.
+   * @param logContent - The content of the private event log.
+   * @param txHash - The hash of the transaction that emitted the log.
+   * @param logIndexInTx - The index of the log within the transaction.
+   */
+  storePrivateEventLog(
+    contractAddress: AztecAddress,
+    recipient: AztecAddress,
+    eventSelector: EventSelector,
+    logContent: Fr[],
+    txHash: TxHash,
+    logIndexInTx: number,
+  ): Promise<void>;
 }

package/src/private/private_execution_oracle.ts

@@ -500,19 +500,8 @@ export class PrivateExecutionOracle extends UnconstrainedExecutionOracle {
     await this.executionDataProvider.incrementAppTaggingSecretIndexAsSender(this.contractAddress, sender, recipient);
   }
 
-  public override async syncNotes() {
-    const taggedLogsByRecipient = await this.executionDataProvider.syncTaggedLogs(
-      this.contractAddress,
-      this.historicalHeader.globalVariables.blockNumber.toNumber(),
-      this.scopes,
-    );
-    for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()) {
-      await this.executionDataProvider.processTaggedLogs(
-        this.contractAddress,
-        taggedLogs,
-        AztecAddress.fromString(recipient),
-      );
-    }
+  public override async syncNotes(pendingTaggedLogArrayBaseSlot: Fr) {
+    await this.executionDataProvider.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
 
     await this.executionDataProvider.removeNullifiedNotes(this.contractAddress);
   }

package/src/private/unconstrained_execution_oracle.ts

@@ -1,6 +1,7 @@
 import { Aes128 } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { applyStringFormatting, createLogger } from '@aztec/foundation/log';
+import type { EventSelector } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
@@ -9,7 +10,7 @@ import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
 import { IndexedTaggingSecret, LogWithTxData } from '@aztec/stdlib/logs';
 import type { NoteStatus } from '@aztec/stdlib/note';
 import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
-import type { BlockHeader, Capsule } from '@aztec/stdlib/tx';
+import type { BlockHeader, Capsule, TxHash } from '@aztec/stdlib/tx';
 
 import { type NoteData, TypedOracle } from './acvm/index.js';
 import type { ExecutionDataProvider } from './execution_data_provider.js';
@@ -277,20 +278,8 @@ export class UnconstrainedExecutionOracle extends TypedOracle {
     return await this.executionDataProvider.getIndexedTaggingSecretAsSender(this.contractAddress, sender, recipient);
   }
 
-  public override async syncNotes() {
-    const taggedLogsByRecipient = await this.executionDataProvider.syncTaggedLogs(
-      this.contractAddress,
-      await this.executionDataProvider.getBlockNumber(),
-      this.scopes,
-    );
-
-    for (const [recipient, taggedLogs] of taggedLogsByRecipient.entries()) {
-      await this.executionDataProvider.processTaggedLogs(
-        this.contractAddress,
-        taggedLogs,
-        AztecAddress.fromString(recipient),
-      );
-    }
+  public override async syncNotes(pendingTaggedLogArrayBaseSlot: Fr) {
+    await this.executionDataProvider.syncTaggedLogs(this.contractAddress, pendingTaggedLogArrayBaseSlot, this.scopes);
 
     await this.executionDataProvider.removeNullifiedNotes(this.contractAddress);
   }
@@ -376,4 +365,22 @@ export class UnconstrainedExecutionOracle extends TypedOracle {
   public override getSharedSecret(address: AztecAddress, ephPk: Point): Promise<Point> {
     return this.executionDataProvider.getSharedSecret(address, ephPk);
   }
+
+  public override storePrivateEventLog(
+    contractAddress: AztecAddress,
+    recipient: AztecAddress,
+    eventSelector: EventSelector,
+    logContent: Fr[],
+    txHash: TxHash,
+    logIndexInTx: number,
+  ): Promise<void> {
+    return this.executionDataProvider.storePrivateEventLog(
+      contractAddress,
+      recipient,
+      eventSelector,
+      logContent,
+      txHash,
+      logIndexInTx,
+    );
+  }
 }

package/src/public/avm/avm_context.ts

@@ -1,11 +1,11 @@
 import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
+import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import type { AvmExecutionEnvironment } from './avm_execution_environment.js';
 import { type Gas, gasToGasLeft } from './avm_gas.js';
 import { AvmMachineState } from './avm_machine_state.js';
 import type { AvmSimulator } from './avm_simulator.js';
-import type { AvmPersistableStateManager } from './journal/journal.js';
 
 /**
  * An execution context includes the information necessary to initiate AVM
@@ -20,7 +20,7 @@ export class AvmContext {
    * @returns new AvmContext instance
    */
   constructor(
-    public persistableState: AvmPersistableStateManager,
+    public persistableState: PublicPersistableStateManager,
     public environment: AvmExecutionEnvironment,
     public machineState: AvmMachineState,
   ) {}

package/src/public/avm/avm_simulator.ts

@@ -7,6 +7,7 @@ import type { GlobalVariables } from '@aztec/stdlib/tx';
 import { strict as assert } from 'assert';
 
 import { SideEffectLimitReachedError } from '../side_effect_errors.js';
+import type { PublicPersistableStateManager } from '../state_manager/state_manager.js';
 import { AvmContext } from './avm_context.js';
 import { AvmContractCallResult } from './avm_contract_call_result.js';
 import { AvmExecutionEnvironment } from './avm_execution_environment.js';
@@ -19,7 +20,6 @@ import {
   revertReasonFromExceptionalHalt,
   revertReasonFromExplicitRevert,
 } from './errors.js';
-import type { AvmPersistableStateManager } from './journal/journal.js';
 import type { Instruction } from './opcodes/instruction.js';
 import {
   INSTRUCTION_SET,
@@ -75,7 +75,7 @@ export class AvmSimulator {
   }
 
   public static async create(
-    stateManager: AvmPersistableStateManager,
+    stateManager: PublicPersistableStateManager,
     address: AztecAddress,
     sender: AztecAddress,
     transactionFee: Fr,

package/src/public/avm/fixtures/avm_simulation_tester.ts

@@ -16,8 +16,8 @@ import {
   initExecutionEnvironment,
   resolveContractAssertionMessage,
 } from '../../avm/fixtures/index.js';
-import { AvmPersistableStateManager } from '../../avm/journal/journal.js';
 import { PublicContractsDB, PublicTreesDB } from '../../public_db_sources.js';
+import { PublicPersistableStateManager } from '../../state_manager/state_manager.js';
 import { AvmSimulator } from '../avm_simulator.js';
 import { BaseAvmSimulationTester } from './base_avm_simulation_tester.js';
 import { SimpleContractDataSource } from './simple_contract_data_source.js';
@@ -34,7 +34,7 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
   constructor(
     contractDataSource: SimpleContractDataSource,
     merkleTrees: MerkleTreeWriteOperations,
-    private stateManager: AvmPersistableStateManager,
+    private stateManager: PublicPersistableStateManager,
   ) {
     super(contractDataSource, merkleTrees);
   }
@@ -47,7 +47,7 @@ export class AvmSimulationTester extends BaseAvmSimulationTester {
     const trace = new SideEffectTrace();
     const firstNullifier = new Fr(420000);
 
-    const stateManager = AvmPersistableStateManager.create(
+    const stateManager = PublicPersistableStateManager.create(
       treesDB,
       contractsDB,
       trace,

package/src/public/avm/fixtures/index.ts

@@ -30,15 +30,15 @@ import merge from 'lodash.merge';
 import { resolveAssertionMessageFromRevertData, traverseCauseChain } from '../../../common/index.js';
 import type { PublicContractsDB, PublicTreesDB } from '../../public_db_sources.js';
 import type { PublicSideEffectTraceInterface } from '../../side_effect_trace_interface.js';
+import { NullifierManager } from '../../state_manager/nullifiers.js';
+import { PublicStorage } from '../../state_manager/public_storage.js';
+import { PublicPersistableStateManager } from '../../state_manager/state_manager.js';
 import { AvmContext } from '../avm_context.js';
 import { AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
 import { Field, Uint8, Uint32, Uint64 } from '../avm_memory_types.js';
 import { AvmSimulator } from '../avm_simulator.js';
 import type { AvmRevertReason } from '../errors.js';
-import { AvmPersistableStateManager } from '../journal/journal.js';
-import { NullifierManager } from '../journal/nullifiers.js';
-import { PublicStorage } from '../journal/public_storage.js';
 
 export const PUBLIC_DISPATCH_FN_NAME = 'public_dispatch';
 export const DEFAULT_BLOCK_NUMBER = 42;
@@ -47,7 +47,7 @@ export const DEFAULT_BLOCK_NUMBER = 42;
  * Create a new AVM context with default values.
  */
 export function initContext(overrides?: {
-  persistableState?: AvmPersistableStateManager;
+  persistableState?: PublicPersistableStateManager;
   env?: AvmExecutionEnvironment;
   machineState?: AvmMachineState;
 }): AvmContext {
@@ -70,9 +70,9 @@ export function initPersistableStateManager(overrides?: {
   doMerkleOperations?: boolean;
   firstNullifier?: Fr;
   blockNumber?: number;
-}): AvmPersistableStateManager {
+}): PublicPersistableStateManager {
   const treesDB = overrides?.treesDB || mock<PublicTreesDB>();
-  return new AvmPersistableStateManager(
+  return new PublicPersistableStateManager(
     treesDB,
     overrides?.contractsDB || mock<PublicContractsDB>(),
     overrides?.trace || mock<PublicSideEffectTraceInterface>(),

package/src/public/avm/index.ts

@@ -1,3 +1,2 @@
 export * from './avm_simulator.js';
-export * from './journal/index.js';
 export * from './fixtures/simple_contract_data_source.js';

package/src/public/avm/opcodes/accrued_substate.ts

@@ -1,7 +1,7 @@
+import { NullifierCollisionError } from '../../state_manager/nullifiers.js';
 import type { AvmContext } from '../avm_context.js';
 import { TypeTag, Uint1 } from '../avm_memory_types.js';
 import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js';
-import { NullifierCollisionError } from '../journal/nullifiers.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
 import { Addressing } from './addressing_mode.js';
 import { Instruction } from './instruction.js';

package/src/public/avm/serialization/instruction_serialization.ts

@@ -93,10 +93,8 @@ export const MAX_OPCODE_VALUE = Math.max(
     .filter(k => !isNaN(k)),
 );
 
-// Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.
-// See vm/avm_trace/deserialization.cpp)
-// Note that cpp code introduced an additional enum value TAG to express the instruction tag. In TS,
-// this one is parsed as UINT8.
+// Possible types for an instruction's operand in its wire format.
+// The counterpart cpp file is: vm2/simulation/lib/serialization.hpp.
 export enum OperandType {
   UINT8,
   UINT16,
@@ -186,7 +184,7 @@ export function deserialize(cursor: BufferCursor | Buffer, operands: OperandType
     if (operands[i] === OperandType.TAG) {
       // We parsed a single byte (readUInt8()) and therefore value is of number type (not bigint)
       // We need to cast to number because checkIsValidTag expects a number.
-      TaggedMemory.checkIsValidTag(Number(argValues[i]) ?? 0);
+      TaggedMemory.checkIsValidTag(Number(argValues[i] ?? 0));
     }
   }
 

package/src/public/avm/test_utils.ts

@@ -4,7 +4,7 @@ import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/st
 import type { jest } from '@jest/globals';
 import { mock } from 'jest-mock-extended';
 
-import type { PublicContractsDB, PublicTreesDB } from '../../public/public_db_sources.js';
+import type { PublicContractsDB, PublicTreesDB } from '../public_db_sources.js';
 import type { PublicSideEffectTraceInterface } from '../side_effect_trace_interface.js';
 
 export function mockTraceFork(trace: PublicSideEffectTraceInterface, nestedTrace?: PublicSideEffectTraceInterface) {

package/src/public/hinting_db_sources.ts

@@ -12,6 +12,8 @@ import {
   AvmGetLeafValueHint,
   AvmGetPreviousValueIndexHint,
   AvmGetSiblingPathHint,
+  AvmSequentialInsertHintNullifierTree,
+  AvmSequentialInsertHintPublicDataTree,
 } from '@aztec/stdlib/avm';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
@@ -21,7 +23,9 @@ import {
   MerkleTreeId,
   type MerkleTreeLeafType,
   NullifierLeaf,
+  NullifierLeafPreimage,
   PublicDataTreeLeaf,
+  PublicDataTreeLeafPreimage,
   type SequentialInsertionResult,
   getTreeName,
 } from '@aztec/stdlib/trees';
@@ -144,24 +148,12 @@ export class HintingPublicTreesDB extends PublicTreesDB {
       switch (treeId) {
         case MerkleTreeId.PUBLIC_DATA_TREE:
           this.hints.getLeafPreimageHintsPublicDataTree.push(
-            new AvmGetLeafPreimageHintPublicDataTree(
-              key,
-              index,
-              preimage.asLeaf() as PublicDataTreeLeaf,
-              preimage.getNextIndex(),
-              new Fr(preimage.getNextKey()),
-            ),
+            new AvmGetLeafPreimageHintPublicDataTree(key, index, preimage as PublicDataTreeLeafPreimage),
           );
           break;
         case MerkleTreeId.NULLIFIER_TREE:
           this.hints.getLeafPreimageHintsNullifierTree.push(
-            new AvmGetLeafPreimageHintNullifierTree(
-              key,
-              index,
-              preimage.asLeaf() as NullifierLeaf,
-              preimage.getNextIndex(),
-              new Fr(preimage.getNextKey()),
-            ),
+            new AvmGetLeafPreimageHintNullifierTree(key, index, preimage as NullifierLeafPreimage),
           );
           break;
         default:
@@ -192,11 +184,17 @@ export class HintingPublicTreesDB extends PublicTreesDB {
   }
 
   // State modification.
+  // FIXME(fcarreiro): This is a horrible interface (in the merkle ops). It's receiving the leaves as buffers,
+  // from a leaf class that is NOT the one that will be used to write. Make this type safe.
   public override async sequentialInsert<TreeHeight extends number, ID extends IndexedTreeId>(
     treeId: ID,
     leaves: Buffer[],
   ): Promise<SequentialInsertionResult<TreeHeight>> {
-    HintingPublicTreesDB.log.debug('sequentialInsert not hinted yet!');
+    // Use appendLeaf for NoteHashTree and L1ToL2MessageTree.
+    assert(treeId == MerkleTreeId.PUBLIC_DATA_TREE || treeId == MerkleTreeId.NULLIFIER_TREE);
+    // We only support 1 leaf at a time for now. Can easily be extended.
+    assert(leaves.length === 1, 'sequentialInsert supports only one leaf at a time!');
+
     const beforeState = await this.getHintKey(treeId);
 
     const result = await super.sequentialInsert<TreeHeight, ID>(treeId, leaves);
@@ -208,6 +206,52 @@ export class HintingPublicTreesDB extends PublicTreesDB {
       }, ${afterState.nextAvailableLeafIndex}.`,
     );
 
+    switch (treeId) {
+      case MerkleTreeId.PUBLIC_DATA_TREE:
+        this.hints.sequentialInsertHintsPublicDataTree.push(
+          new AvmSequentialInsertHintPublicDataTree(
+            beforeState,
+            afterState,
+            treeId,
+            PublicDataTreeLeaf.fromBuffer(leaves[0]),
+            {
+              leaf: result.lowLeavesWitnessData[0].leafPreimage as PublicDataTreeLeafPreimage,
+              index: result.lowLeavesWitnessData[0].index,
+              path: result.lowLeavesWitnessData[0].siblingPath.toFields(),
+            },
+            {
+              leaf: result.insertionWitnessData[0].leafPreimage as PublicDataTreeLeafPreimage,
+              index: result.insertionWitnessData[0].index,
+              path: result.insertionWitnessData[0].siblingPath.toFields(),
+            },
+          ),
+        );
+        break;
+      case MerkleTreeId.NULLIFIER_TREE:
+        this.hints.sequentialInsertHintsNullifierTree.push(
+          new AvmSequentialInsertHintNullifierTree(
+            beforeState,
+            afterState,
+            treeId,
+            NullifierLeaf.fromBuffer(leaves[0]),
+            {
+              leaf: result.lowLeavesWitnessData[0].leafPreimage as NullifierLeafPreimage,
+              index: result.lowLeavesWitnessData[0].index,
+              path: result.lowLeavesWitnessData[0].siblingPath.toFields(),
+            },
+            {
+              leaf: result.insertionWitnessData[0].leafPreimage as NullifierLeafPreimage,
+              index: result.insertionWitnessData[0].index,
+              path: result.insertionWitnessData[0].siblingPath.toFields(),
+            },
+          ),
+        );
+        break;
+      default:
+        throw new Error('sequentialInsert only supported for PublicDataTree and NullifierTree!');
+        break;
+    }
+
     return result;
   }
 

package/src/public/public_db_sources.ts

@@ -418,7 +418,7 @@ export class PublicTreesDB extends ForwardMerkleTree implements PublicStateDBInt
       lowLeafResult.index,
     )) as PublicDataTreeLeafPreimage;
 
-    return lowLeafResult.alreadyPresent ? preimage.value : Fr.ZERO;
+    return lowLeafResult.alreadyPresent ? preimage.leaf.value : Fr.ZERO;
   }
 
   /**

package/src/public/public_processor/public_processor.ts

@@ -131,7 +131,8 @@ export class PublicProcessor implements Traceable {
   /**
    * Run each tx through the public circuit and the public kernel circuit if needed.
    * @param txs - Txs to process.
-   * @param processedTxHandler - Handler for processed txs in the context of block building or proving.
+   * @param limits - Limits for processing the txs.
+   * @param validator - Pre-process validator and nullifier cache to use for processing the txs.
    * @returns The list of processed txs with their circuit simulation outputs.
    */
   public async process(
@@ -142,14 +143,13 @@ export class PublicProcessor implements Traceable {
       maxBlockGas?: Gas;
       deadline?: Date;
     } = {},
-    validators: {
+    validator: {
       preprocessValidator?: TxValidator<Tx>;
-      postprocessValidator?: TxValidator<ProcessedTx>;
       nullifierCache?: { addNullifiers: (nullifiers: Buffer[]) => void };
     } = {},
   ): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]> {
     const { maxTransactions, maxBlockSize, deadline, maxBlockGas } = limits;
-    const { preprocessValidator, postprocessValidator, nullifierCache } = validators;
+    const { preprocessValidator, nullifierCache } = validator;
     const result: ProcessedTx[] = [];
     const failed: FailedTx[] = [];
     const timer = new Timer();
@@ -242,26 +242,6 @@ export class PublicProcessor implements Traceable {
           continue;
         }
 
-        // Re-validate the transaction
-        if (postprocessValidator) {
-          // Only accept processed transactions that are not double-spends,
-          // public functions emitting nullifiers would pass earlier check but fail here.
-          // Note that we're checking all nullifiers generated in the private execution twice,
-          // we could store the ones already checked and skip them here as an optimization.
-          // TODO(palla/txs): Can we get into this case? AVM validates this. We should be able to remove it.
-          const result = await postprocessValidator.validateTx(processedTx);
-          if (result.result !== 'valid') {
-            const reason = result.reason.join(', ');
-            this.log.error(`Rejecting tx ${processedTx.hash} after processing: ${reason}.`);
-            failed.push({ tx, error: new Error(`Tx failed post-process validation: ${reason}`) });
-            // Need to revert the checkpoint here and don't go any further
-            await checkpoint.revert();
-            continue;
-          } else {
-            this.log.trace(`Tx ${txHash.toString()} is valid post processing.`);
-          }
-        }
-
         if (!tx.hasPublicCalls()) {
           // If there are no public calls, perform all tree insertions for side effects from private
           // When there are public calls, the PublicTxSimulator & AVM handle tree insertions.