@aztec/pxe 0.87.7 → 1.0.0-nightly.20250605

package/dest/storage/note_data_provider/note_data_provider.js

@@ -62,11 +62,11 @@ export class NoteDataProvider {
         this.#notesByRecipientAndScope.set(scopeString, this.#store.openMultiMap(`${scopeString}:notes_by_recipient`));
         return true;
     }
-    async addNotes(notes, scope = AztecAddress.ZERO) {
-        if (!await this.#scopes.hasAsync(scope.toString())) {
-            await this.addScope(scope);
-        }
+    addNotes(notes, scope = AztecAddress.ZERO) {
         return this.#store.transactionAsync(async ()=>{
+            if (!await this.#scopes.hasAsync(scope.toString())) {
+                await this.addScope(scope);
+            }
             for (const dao of notes){
                 // store notes by their index in the notes hash tree
                 // this provides the uniqueness we need to store individual notes
@@ -105,17 +105,17 @@ export class NoteDataProvider {
         });
     }
     async unnullifyNotesAfter(blockNumber, synchedBlockNumber) {
-        const nullifiersToUndo = [];
-        const currentBlockNumber = blockNumber + 1;
-        const maxBlockNumber = synchedBlockNumber ?? currentBlockNumber;
-        for(let i = currentBlockNumber; i <= maxBlockNumber; i++){
-            nullifiersToUndo.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
-        }
-        const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map((nullifier)=>this.#nullifiedNotesByNullifier.getAsync(nullifier)));
-        const notNullNoteIndexes = notesIndexesToReinsert.filter((noteIndex)=>noteIndex != undefined);
-        const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map((noteIndex)=>this.#nullifiedNotes.getAsync(noteIndex)));
-        const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
         await this.#store.transactionAsync(async ()=>{
+            const nullifiersToUndo = [];
+            const currentBlockNumber = blockNumber + 1;
+            const maxBlockNumber = synchedBlockNumber ?? currentBlockNumber;
+            for(let i = currentBlockNumber; i <= maxBlockNumber; i++){
+                nullifiersToUndo.push(...await toArray(this.#nullifiersByBlockNumber.getValuesAsync(i)));
+            }
+            const notesIndexesToReinsert = await Promise.all(nullifiersToUndo.map((nullifier)=>this.#nullifiedNotesByNullifier.getAsync(nullifier)));
+            const notNullNoteIndexes = notesIndexesToReinsert.filter((noteIndex)=>noteIndex != undefined);
+            const nullifiedNoteBuffers = await Promise.all(notNullNoteIndexes.map((noteIndex)=>this.#nullifiedNotes.getAsync(noteIndex)));
+            const noteDaos = nullifiedNoteBuffers.filter((buffer)=>buffer != undefined).map((buffer)=>NoteDao.fromBuffer(buffer));
             for (const dao of noteDaos){
                 const noteIndex = toBufferBE(dao.index, 32).toString('hex');
                 await this.#notes.set(noteIndex, dao.toBuffer());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.87.7",
+  "version": "1.0.0-nightly.20250605",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -58,19 +58,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.87.7",
-    "@aztec/bb.js": "0.87.7",
-    "@aztec/builder": "0.87.7",
-    "@aztec/constants": "0.87.7",
-    "@aztec/ethereum": "0.87.7",
-    "@aztec/foundation": "0.87.7",
-    "@aztec/key-store": "0.87.7",
-    "@aztec/kv-store": "0.87.7",
-    "@aztec/noir-protocol-circuits-types": "0.87.7",
-    "@aztec/noir-types": "0.87.7",
-    "@aztec/protocol-contracts": "0.87.7",
-    "@aztec/simulator": "0.87.7",
-    "@aztec/stdlib": "0.87.7",
+    "@aztec/bb-prover": "1.0.0-nightly.20250605",
+    "@aztec/bb.js": "1.0.0-nightly.20250605",
+    "@aztec/builder": "1.0.0-nightly.20250605",
+    "@aztec/constants": "1.0.0-nightly.20250605",
+    "@aztec/ethereum": "1.0.0-nightly.20250605",
+    "@aztec/foundation": "1.0.0-nightly.20250605",
+    "@aztec/key-store": "1.0.0-nightly.20250605",
+    "@aztec/kv-store": "1.0.0-nightly.20250605",
+    "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250605",
+    "@aztec/noir-types": "1.0.0-nightly.20250605",
+    "@aztec/protocol-contracts": "1.0.0-nightly.20250605",
+    "@aztec/simulator": "1.0.0-nightly.20250605",
+    "@aztec/stdlib": "1.0.0-nightly.20250605",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",
@@ -79,8 +79,8 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/merkle-tree": "0.87.7",
-    "@aztec/noir-test-contracts.js": "0.87.7",
+    "@aztec/merkle-tree": "1.0.0-nightly.20250605",
+    "@aztec/noir-test-contracts.js": "1.0.0-nightly.20250605",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",

package/src/contract_function_simulator/event_validation_request.ts

@@ -0,0 +1,53 @@
+import { Fr } from '@aztec/foundation/fields';
+import { FieldReader } from '@aztec/foundation/serialize';
+import { EventSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { TxHash } from '@aztec/stdlib/tx';
+
+// TODO(#14617): should we compute this from constants? This value is aztec-nr specific.
+const MAX_EVENT_SERIALIZED_LEN = 12;
+
+/**
+ * Intermediate struct used to perform batch event validation by PXE. The `validateEnqueuedNotesAndEvents` oracle
+ * expects for values of this type to be stored in a `CapsuleArray`.
+ */
+export class EventValidationRequest {
+  constructor(
+    public contractAddress: AztecAddress,
+    public eventTypeId: EventSelector,
+    public serializedEvent: Fr[],
+    public eventCommitment: Fr,
+    public txHash: TxHash,
+    public recipient: AztecAddress,
+    public logIndexInTx: number,
+    public txIndexInBlock: number,
+  ) {}
+
+  static fromFields(fields: Fr[] | FieldReader): EventValidationRequest {
+    const reader = FieldReader.asReader(fields);
+
+    const contractAddress = AztecAddress.fromField(reader.readField());
+    const eventTypeId = EventSelector.fromField(reader.readField());
+
+    const eventStorage = reader.readFieldArray(MAX_EVENT_SERIALIZED_LEN);
+    const eventLen = reader.readField().toNumber();
+    const serializedEvent = eventStorage.slice(0, eventLen);
+
+    const eventCommitment = reader.readField();
+    const txHash = TxHash.fromField(reader.readField());
+    const recipient = AztecAddress.fromField(reader.readField());
+    const logIndexInTx = reader.readField().toNumber();
+    const txIndexInBlock = reader.readField().toNumber();
+
+    return new EventValidationRequest(
+      contractAddress,
+      eventTypeId,
+      serializedEvent,
+      eventCommitment,
+      txHash,
+      recipient,
+      logIndexInTx,
+      txIndexInBlock,
+    );
+  }
+}

package/src/contract_function_simulator/execution_data_provider.ts

@@ -1,19 +1,14 @@
 import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import type { Fr, Point } from '@aztec/foundation/fields';
-import type {
-  EventSelector,
-  FunctionArtifact,
-  FunctionArtifactWithContractName,
-  FunctionSelector,
-} from '@aztec/stdlib/abi';
+import type { 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 } from '@aztec/stdlib/logs';
+import { IndexedTaggingSecret, PrivateLogWithTxData, PublicLogWithTxData } from '@aztec/stdlib/logs';
 import type { NoteStatus } from '@aztec/stdlib/note';
 import { type MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
-import type { BlockHeader, NodeStats, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, NodeStats } from '@aztec/stdlib/tx';
 
 import type { MessageLoadOracleInputs } from './oracle/message_load_oracle_inputs.js';
 import type { NoteData } from './oracle/typed_oracle.js';
@@ -265,8 +260,8 @@ export interface ExecutionDataProvider {
   ): Promise<void>;
 
   /**
-   * 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.
+   * Synchronizes the private 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
@@ -279,27 +274,19 @@ export interface ExecutionDataProvider {
   ): Promise<void>;
 
   /**
-   * Delivers the preimage and metadata of a committed note so that it can be later requested via the `getNotes`
-   * oracle.
+   * Validates all note and event validation requests enqueued via `enqueue_note_for_validation` and
+   * `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
+   * queryable via `get_notes` and `getPrivateEvents`.
    *
-   * @param contractAddress - The address of the contract that created the note (i.e. the siloing contract)
-   * @param storageSlot - The storage slot of the note - used for indexing in `getNotes`
-   * @param nonce - The nonce of the note used by the kernel to compute the unique note hash
-   * @param content - The note's content: this is the primary item to return in `getNotes`
-   * @param noteHash - The non-unique non-siloed note hash
-   * @param nullifier - The inner (non-siloed) note nullifier
-   * @param txHash - The transaction in which the note was added to the note hash tree
-   * @param recipient - The account that discovered the note
-   */
-  deliverNote(
+   * This automatically clears both validation request queues, so no further work needs to be done by the caller.
+   * @param contractAddress - The address of the contract that the logs are tagged for.
+   * @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
+   * @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
+   */
+  validateEnqueuedNotesAndEvents(
     contractAddress: AztecAddress,
-    storageSlot: Fr,
-    nonce: Fr,
-    content: Fr[],
-    noteHash: Fr,
-    nullifier: Fr,
-    txHash: TxHash,
-    recipient: AztecAddress,
+    noteValidationRequestsArrayBaseSlot: Fr,
+    eventValidationRequestsArrayBaseSlot: Fr,
   ): Promise<void>;
 
   /**
@@ -307,8 +294,20 @@ export interface ExecutionDataProvider {
    * Returns null if no such log exists, and throws if more than one exists.
    *
    * @param tag - The log tag to search for.
+   * @param contractAddress - The contract address to search for the log in.
+   * @returns The public log with transaction data if found, null otherwise.
+   * @throws If more than one log with that tag exists.
+   */
+  getPublicLogByTag(tag: Fr, contractAddress: AztecAddress): Promise<PublicLogWithTxData | null>;
+
+  /**
+   * Searches for a private log with the corresponding `siloedTag` and returns it along with contextual transaction
+   * information.
+   *
+   * @param siloedTag - The siloed log tag to search for.
+   * @returns The private log with transaction data if found, null otherwise.
    */
-  getLogByTag(tag: Fr): Promise<LogWithTxData | null>;
+  getPrivateLogByTag(siloedTag: Fr): Promise<PrivateLogWithTxData | null>;
 
   /**
    * Removes all of a contract's notes that have been nullified from the note database.
@@ -363,26 +362,6 @@ export interface ExecutionDataProvider {
    */
   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 msgContent - The content of the private event message.
-   * @param txHash - The hash of the transaction that emitted the log.
-   * @param logIndexInTx - The index of the log within the transaction.
-   * @param txIndexInBlock - The index of the transaction in which the log was emitted in the block.
-   */
-  storePrivateEventLog(
-    contractAddress: AztecAddress,
-    recipient: AztecAddress,
-    eventSelector: EventSelector,
-    msgContent: Fr[],
-    txHash: TxHash,
-    logIndexInTx: number,
-    txIndexInBlock: number,
-  ): Promise<void>;
-
   /**
    * Returns the execution statistics collected during the simulator run.
    * @returns The execution statistics.

package/src/contract_function_simulator/note_validation_request.ts

@@ -0,0 +1,52 @@
+import { Fr } from '@aztec/foundation/fields';
+import { FieldReader } from '@aztec/foundation/serialize';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { TxHash } from '@aztec/stdlib/tx';
+
+// TODO(#14617): should we compute this from constants? This value is aztec-nr specific.
+const MAX_NOTE_PACKED_LEN = 12;
+
+/**
+ * Intermediate struct used to perform batch note validation by PXE. The `validateEnqueuedNotesAndEvents` oracle
+ * expects for values of this type to be stored in a `CapsuleArray`.
+ */
+export class NoteValidationRequest {
+  constructor(
+    public contractAddress: AztecAddress,
+    public storageSlot: Fr,
+    public nonce: Fr,
+    public content: Fr[],
+    public noteHash: Fr,
+    public nullifier: Fr,
+    public txHash: TxHash,
+    public recipient: AztecAddress,
+  ) {}
+
+  static fromFields(fields: Fr[] | FieldReader): NoteValidationRequest {
+    const reader = FieldReader.asReader(fields);
+
+    const contractAddress = AztecAddress.fromField(reader.readField());
+    const storageSlot = reader.readField();
+    const nonce = reader.readField();
+
+    const contentStorage = reader.readFieldArray(MAX_NOTE_PACKED_LEN);
+    const contentLen = reader.readField().toNumber();
+    const content = contentStorage.slice(0, contentLen);
+
+    const noteHash = reader.readField();
+    const nullifier = reader.readField();
+    const txHash = TxHash.fromField(reader.readField());
+    const recipient = AztecAddress.fromField(reader.readField());
+
+    return new NoteValidationRequest(
+      contractAddress,
+      storageSlot,
+      nonce,
+      content,
+      noteHash,
+      nullifier,
+      txHash,
+      recipient,
+    );
+  }
+}

package/src/contract_function_simulator/oracle/oracle.ts

@@ -4,17 +4,20 @@ import {
   type ACVMField,
   arrayOfArraysToBoundedVecOfArrays,
   bufferToBoundedVec,
-  fromBoundedVec,
   fromUintArray,
   fromUintBoundedVec,
   toACVMField,
   toACVMFieldSingleOrArray,
 } from '@aztec/simulator/client';
-import { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import { FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { ContractClassLog, ContractClassLogFields, LogWithTxData } from '@aztec/stdlib/logs';
+import {
+  ContractClassLog,
+  ContractClassLogFields,
+  PrivateLogWithTxData,
+  PublicLogWithTxData,
+} from '@aztec/stdlib/logs';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { TxHash } from '@aztec/stdlib/tx';
 
 import type { TypedOracle } from './typed_oracle.js';
 
@@ -402,39 +405,35 @@ export class Oracle {
     return [];
   }
 
-  async deliverNote(
+  async validateEnqueuedNotesAndEvents(
     [contractAddress]: ACVMField[],
-    [storageSlot]: ACVMField[],
-    [nonce]: ACVMField[],
-    content: ACVMField[],
-    [contentLength]: ACVMField[],
-    [noteHash]: ACVMField[],
-    [nullifier]: ACVMField[],
-    [txHash]: ACVMField[],
-    [recipient]: ACVMField[],
+    [noteValidationRequestsArrayBaseSlot]: ACVMField[],
+    [eventValidationRequestsArrayBaseSlot]: ACVMField[],
   ): Promise<ACVMField[]> {
-    // TODO(#10728): try-catch this block and return false if we get an exception so that the contract can decide what
-    // to do if a note fails delivery (e.g. not increment the tagging index, or add it to some pending work list).
-    // Delivery might fail due to temporary issues, such as poor node connectivity.
-    await this.typedOracle.deliverNote(
+    await this.typedOracle.validateEnqueuedNotesAndEvents(
       AztecAddress.fromString(contractAddress),
-      Fr.fromString(storageSlot),
-      Fr.fromString(nonce),
-      fromBoundedVec(content, contentLength),
-      Fr.fromString(noteHash),
-      Fr.fromString(nullifier),
-      TxHash.fromString(txHash),
-      AztecAddress.fromString(recipient),
+      Fr.fromString(noteValidationRequestsArrayBaseSlot),
+      Fr.fromString(eventValidationRequestsArrayBaseSlot),
     );
 
-    return [toACVMField(true)];
+    return [];
+  }
+
+  async getPublicLogByTag([tag]: ACVMField[], [contractAddress]: ACVMField[]): Promise<(ACVMField | ACVMField[])[]> {
+    const log = await this.typedOracle.getPublicLogByTag(Fr.fromString(tag), AztecAddress.fromString(contractAddress));
+
+    if (log == null) {
+      return [toACVMField(0), ...PublicLogWithTxData.noirSerializationOfEmpty().map(toACVMFieldSingleOrArray)];
+    } else {
+      return [toACVMField(1), ...log.toNoirSerialization().map(toACVMFieldSingleOrArray)];
+    }
   }
 
-  async getLogByTag([tag]: ACVMField[]): Promise<(ACVMField | ACVMField[])[]> {
-    const log = await this.typedOracle.getLogByTag(Fr.fromString(tag));
+  async getPrivateLogByTag([siloedTag]: ACVMField[]): Promise<(ACVMField | ACVMField[])[]> {
+    const log = await this.typedOracle.getPrivateLogByTag(Fr.fromString(siloedTag));
 
     if (log == null) {
-      return [toACVMField(0), ...LogWithTxData.noirSerializationOfEmpty().map(toACVMFieldSingleOrArray)];
+      return [toACVMField(0), ...PrivateLogWithTxData.noirSerializationOfEmpty().map(toACVMFieldSingleOrArray)];
     } else {
       return [toACVMField(1), ...log.toNoirSerialization().map(toACVMFieldSingleOrArray)];
     }
@@ -516,26 +515,4 @@ export class Oracle {
     );
     return secret.toFields().map(toACVMField);
   }
-
-  async storePrivateEventLog(
-    [contractAddress]: ACVMField[],
-    [recipient]: ACVMField[],
-    [eventSelector]: ACVMField[],
-    msgContentBVecStorage: ACVMField[],
-    [msgContentLength]: ACVMField[],
-    [txHash]: ACVMField[],
-    [logIndexInTx]: ACVMField[],
-    [txIndexInBlock]: ACVMField[],
-  ) {
-    await this.typedOracle.storePrivateEventLog(
-      AztecAddress.fromField(Fr.fromString(contractAddress)),
-      AztecAddress.fromField(Fr.fromString(recipient)),
-      EventSelector.fromField(Fr.fromString(eventSelector)),
-      fromBoundedVec(msgContentBVecStorage, msgContentLength),
-      new TxHash(Fr.fromString(txHash)),
-      Fr.fromString(logIndexInTx).toNumber(),
-      Fr.fromString(txIndexInBlock).toNumber(),
-    );
-    return [];
-  }
 }

package/src/contract_function_simulator/oracle/typed_oracle.ts

@@ -1,13 +1,18 @@
 import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { Fr, Point } from '@aztec/foundation/fields';
-import type { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdlib/abi';
+import type { 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 {
+  ContractClassLog,
+  IndexedTaggingSecret,
+  PrivateLogWithTxData,
+  PublicLogWithTxData,
+} 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, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader } from '@aztec/stdlib/tx';
 
 import type { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
 
@@ -218,21 +223,20 @@ export abstract class TypedOracle {
     return Promise.reject(new OracleMethodNotAvailableError('fetchTaggedLogs'));
   }
 
-  deliverNote(
+  validateEnqueuedNotesAndEvents(
     _contractAddress: AztecAddress,
-    _storageSlot: Fr,
-    _nonce: Fr,
-    _content: Fr[],
-    _noteHash: Fr,
-    _nullifier: Fr,
-    _txHash: TxHash,
-    _recipient: AztecAddress,
+    _noteValidationRequestsArrayBaseSlot: Fr,
+    _eventValidationRequestsArrayBaseSlot: Fr,
   ): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('deliverNote'));
+    return Promise.reject(new OracleMethodNotAvailableError('validateEnqueuedNotesAndEvents'));
+  }
+
+  getPublicLogByTag(_tag: Fr, _contractAddress: AztecAddress): Promise<PublicLogWithTxData | null> {
+    throw new OracleMethodNotAvailableError('getPublicLogByTag');
   }
 
-  getLogByTag(_tag: Fr): Promise<LogWithTxData | null> {
-    throw new OracleMethodNotAvailableError('getLogByTag');
+  getPrivateLogByTag(_siloedTag: Fr): Promise<PrivateLogWithTxData | null> {
+    throw new OracleMethodNotAvailableError('getPrivateLogByTag');
   }
 
   storeCapsule(_contractAddress: AztecAddress, _key: Fr, _capsule: Fr[]): Promise<void> {
@@ -258,16 +262,4 @@ 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,
-    _txIndexInBlock: number,
-  ): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('storePrivateEventLog'));
-  }
 }

package/src/contract_function_simulator/oracle/utility_execution_oracle.ts

@@ -1,16 +1,15 @@
 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';
 import { siloNullifier } from '@aztec/stdlib/hash';
 import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
-import { IndexedTaggingSecret, LogWithTxData } from '@aztec/stdlib/logs';
+import { IndexedTaggingSecret, PrivateLogWithTxData, PublicLogWithTxData } 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, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, Capsule } from '@aztec/stdlib/tx';
 
 import type { ExecutionDataProvider } from '../execution_data_provider.js';
 import { pickNotes } from '../pick_notes.js';
@@ -280,35 +279,29 @@ export class UtilityExecutionOracle extends TypedOracle {
     await this.executionDataProvider.removeNullifiedNotes(this.contractAddress);
   }
 
-  public override async deliverNote(
+  public override async validateEnqueuedNotesAndEvents(
     contractAddress: AztecAddress,
-    storageSlot: Fr,
-    nonce: Fr,
-    content: Fr[],
-    noteHash: Fr,
-    nullifier: Fr,
-    txHash: TxHash,
-    recipient: AztecAddress,
+    noteValidationRequestsArrayBaseSlot: Fr,
+    eventValidationRequestsArrayBaseSlot: Fr,
   ) {
     // TODO(#10727): allow other contracts to deliver notes
     if (!this.contractAddress.equals(contractAddress)) {
-      throw new Error(`Got a note delivery request from ${contractAddress}, expected ${this.contractAddress}`);
+      throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
     }
 
-    await this.executionDataProvider.deliverNote(
+    await this.executionDataProvider.validateEnqueuedNotesAndEvents(
       contractAddress,
-      storageSlot,
-      nonce,
-      content,
-      noteHash,
-      nullifier,
-      txHash,
-      recipient,
+      noteValidationRequestsArrayBaseSlot,
+      eventValidationRequestsArrayBaseSlot,
     );
   }
 
-  public override getLogByTag(tag: Fr): Promise<LogWithTxData | null> {
-    return this.executionDataProvider.getLogByTag(tag);
+  public override getPublicLogByTag(tag: Fr, contractAddress: AztecAddress): Promise<PublicLogWithTxData | null> {
+    return this.executionDataProvider.getPublicLogByTag(tag, contractAddress);
+  }
+
+  public override getPrivateLogByTag(siloedTag: Fr): Promise<PrivateLogWithTxData | null> {
+    return this.executionDataProvider.getPrivateLogByTag(siloedTag);
   }
 
   public override storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void> {
@@ -361,24 +354,4 @@ export class UtilityExecutionOracle 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,
-    msgContent: Fr[],
-    txHash: TxHash,
-    logIndexInTx: number,
-    txIndexInBlock: number,
-  ): Promise<void> {
-    return this.executionDataProvider.storePrivateEventLog(
-      contractAddress,
-      recipient,
-      eventSelector,
-      msgContent,
-      txHash,
-      logIndexInTx,
-      txIndexInBlock,
-    );
-  }
 }