@aztec/pxe 0.87.7 → 1.0.0-nightly.20250604

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.87.7",
+  "version": "1.0.0-nightly.20250604",
   "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.20250604",
+    "@aztec/bb.js": "1.0.0-nightly.20250604",
+    "@aztec/builder": "1.0.0-nightly.20250604",
+    "@aztec/constants": "1.0.0-nightly.20250604",
+    "@aztec/ethereum": "1.0.0-nightly.20250604",
+    "@aztec/foundation": "1.0.0-nightly.20250604",
+    "@aztec/key-store": "1.0.0-nightly.20250604",
+    "@aztec/kv-store": "1.0.0-nightly.20250604",
+    "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250604",
+    "@aztec/noir-types": "1.0.0-nightly.20250604",
+    "@aztec/protocol-contracts": "1.0.0-nightly.20250604",
+    "@aztec/simulator": "1.0.0-nightly.20250604",
+    "@aztec/stdlib": "1.0.0-nightly.20250604",
     "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.20250604",
+    "@aztec/noir-test-contracts.js": "1.0.0-nightly.20250604",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",

package/src/contract_function_simulator/execution_data_provider.ts

@@ -10,7 +10,7 @@ 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';
@@ -265,8 +265,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,36 +279,32 @@ 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.
-   *
-   * @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(
-    contractAddress: AztecAddress,
-    storageSlot: Fr,
-    nonce: Fr,
-    content: Fr[],
-    noteHash: Fr,
-    nullifier: Fr,
-    txHash: TxHash,
-    recipient: AztecAddress,
-  ): Promise<void>;
+   * Validates a capsule array of `NoteValidationRequests`, storing the notes in the database so that they can be later
+   * queried via `getNotes`.
+   * @param contractAddress - The contract that the notes belong to.
+   * @param noteValidationRequestArrayBaseSlot - The capsule array base slot.
+   */
+  validateEnqueuedNotes(contractAddress: AztecAddress, noteValidationRequestArrayBaseSlot: Fr): Promise<void>;
 
   /**
    * Searches for a log with the corresponding `tag` and returns it along with contextual transaction information.
    * 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.

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 `validateEnqueuedNotes` 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

@@ -12,7 +12,12 @@ import {
 } from '@aztec/simulator/client';
 import { EventSelector, 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';
 
@@ -402,39 +407,33 @@ export class Oracle {
     return [];
   }
 
-  async deliverNote(
+  async validateEnqueuedNotes(
     [contractAddress]: ACVMField[],
-    [storageSlot]: ACVMField[],
-    [nonce]: ACVMField[],
-    content: ACVMField[],
-    [contentLength]: ACVMField[],
-    [noteHash]: ACVMField[],
-    [nullifier]: ACVMField[],
-    [txHash]: ACVMField[],
-    [recipient]: ACVMField[],
+    [noteValidationRequestsArrayBaseSlot]: 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.validateEnqueuedNotes(
       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),
     );
 
-    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)];
     }

package/src/contract_function_simulator/oracle/typed_oracle.ts

@@ -4,7 +4,12 @@ import type { EventSelector, FunctionSelector, NoteSelector } from '@aztec/stdli
 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';
@@ -218,21 +223,16 @@ export abstract class TypedOracle {
     return Promise.reject(new OracleMethodNotAvailableError('fetchTaggedLogs'));
   }
 
-  deliverNote(
-    _contractAddress: AztecAddress,
-    _storageSlot: Fr,
-    _nonce: Fr,
-    _content: Fr[],
-    _noteHash: Fr,
-    _nullifier: Fr,
-    _txHash: TxHash,
-    _recipient: AztecAddress,
-  ): Promise<void> {
-    return Promise.reject(new OracleMethodNotAvailableError('deliverNote'));
+  validateEnqueuedNotes(_contractAddress: AztecAddress, _noteValidationRequestsArrayBaseSlot: Fr): Promise<void> {
+    return Promise.reject(new OracleMethodNotAvailableError('validateEnqueuedNotes'));
+  }
+
+  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> {

package/src/contract_function_simulator/oracle/utility_execution_oracle.ts

@@ -7,7 +7,7 @@ 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';
@@ -280,35 +280,21 @@ export class UtilityExecutionOracle extends TypedOracle {
     await this.executionDataProvider.removeNullifiedNotes(this.contractAddress);
   }
 
-  public override async deliverNote(
-    contractAddress: AztecAddress,
-    storageSlot: Fr,
-    nonce: Fr,
-    content: Fr[],
-    noteHash: Fr,
-    nullifier: Fr,
-    txHash: TxHash,
-    recipient: AztecAddress,
-  ) {
+  public override async validateEnqueuedNotes(contractAddress: AztecAddress, noteValidationRequestsArrayBaseSlot: 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(
-      contractAddress,
-      storageSlot,
-      nonce,
-      content,
-      noteHash,
-      nullifier,
-      txHash,
-      recipient,
-    );
+    await this.executionDataProvider.validateEnqueuedNotes(contractAddress, noteValidationRequestsArrayBaseSlot);
+  }
+
+  public override getPublicLogByTag(tag: Fr, contractAddress: AztecAddress): Promise<PublicLogWithTxData | null> {
+    return this.executionDataProvider.getPublicLogByTag(tag, contractAddress);
   }
 
-  public override getLogByTag(tag: Fr): Promise<LogWithTxData | null> {
-    return this.executionDataProvider.getLogByTag(tag);
+  public override getPrivateLogByTag(siloedTag: Fr): Promise<PrivateLogWithTxData | null> {
+    return this.executionDataProvider.getPrivateLogByTag(siloedTag);
   }
 
   public override storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void> {

package/src/contract_function_simulator/pxe_oracle_interface.ts

@@ -18,9 +18,10 @@ import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
 import { computeAddressSecret, computeAppTaggingSecret } from '@aztec/stdlib/keys';
 import {
   IndexedTaggingSecret,
-  LogWithTxData,
   PendingTaggedLog,
+  PrivateLogWithTxData,
   PublicLog,
+  PublicLogWithTxData,
   TxScopedL2Log,
   deriveEcdhSharedSecret,
 } from '@aztec/stdlib/logs';
@@ -40,6 +41,7 @@ import type { NoteDataProvider } from '../storage/note_data_provider/note_data_p
 import type { PrivateEventDataProvider } from '../storage/private_event_data_provider/private_event_data_provider.js';
 import type { SyncDataProvider } from '../storage/sync_data_provider/sync_data_provider.js';
 import type { TaggingDataProvider } from '../storage/tagging_data_provider/tagging_data_provider.js';
+import { NoteValidationRequest } from './note_validation_request.js';
 import type { ProxiedNode } from './proxied_node.js';
 import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
 
@@ -384,7 +386,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
       });
 
       // We fetch the logs for the tags
-      const possibleLogs = await this.aztecNode.getLogsByTags(currentTags);
+      const possibleLogs = await this.#getPrivateLogsByTags(currentTags);
 
       // We find the index of the last log in the window that is not empty
       const indexOfLastLog = possibleLogs.findLastIndex(possibleLog => possibleLog.length !== 0);
@@ -421,8 +423,8 @@ export class PXEOracleInterface implements ExecutionDataProvider {
   }
 
   /**
-   * 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 logs capsule array in which
    * found logs will be stored.
@@ -482,20 +484,14 @@ export class PXEOracleInterface implements ExecutionDataProvider {
         // a new set of secrets and windows to fetch logs for.
         const newLargestIndexMapForIteration: { [k: string]: number } = {};
 
-        // Fetch the logs for the tags and iterate over them
-        const logsByTags = await this.aztecNode.getLogsByTags(tagsForTheWholeWindow);
+        // Fetch the private logs for the tags and iterate over them
+        const logsByTags = await this.#getPrivateLogsByTags(tagsForTheWholeWindow);
 
         for (let logIndex = 0; logIndex < logsByTags.length; logIndex++) {
           const logsByTag = logsByTags[logIndex];
           if (logsByTag.length > 0) {
-            // Discard public logs
-            const filteredLogsByTag = logsByTag.filter(l => !l.isFromPublic);
-            if (filteredLogsByTag.length < logsByTag.length) {
-              this.log.warn(`Discarded ${logsByTag.filter(l => l.isFromPublic).length} public logs with matching tags`);
-            }
-
             // We filter out the logs that are newer than the historical block number of the tx currently being constructed
-            const filteredLogsByBlockNumber = filteredLogsByTag.filter(l => l.blockNumber <= maxBlockNumber);
+            const filteredLogsByBlockNumber = logsByTag.filter(l => l.blockNumber <= maxBlockNumber);
 
             // We store the logs in capsules (to later be obtained in Noir)
             await this.#storePendingTaggedLogs(
@@ -510,7 +506,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
             const secretCorrespondingToLog = secretsForTheWholeWindow[logIndex];
             const initialIndex = initialIndexesMap[secretCorrespondingToLog.appTaggingSecret.toString()];
 
-            this.log.debug(`Found ${filteredLogsByTag.length} logs as recipient ${recipient}`, {
+            this.log.debug(`Found ${logsByTags.length} logs as recipient ${recipient}`, {
               recipient,
               secret: secretCorrespondingToLog.appTaggingSecret,
               contractName,
@@ -606,7 +602,36 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     return this.capsuleDataProvider.appendToCapsuleArray(contractAddress, capsuleArrayBaseSlot, pendingTaggedLogs);
   }
 
-  public async deliverNote(
+  public async validateEnqueuedNotes(
+    contractAddress: AztecAddress,
+    noteValidationRequestsArrayBaseSlot: Fr,
+  ): Promise<void> {
+    // We read all note validation requests and process them all concurrently. This makes the process much faster as we
+    // don't need to wait for the network round-trip.
+    const noteValidationRequests = (
+      await this.capsuleDataProvider.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot)
+    ).map(NoteValidationRequest.fromFields);
+
+    await Promise.all(
+      noteValidationRequests.map(request =>
+        this.deliverNote(
+          request.contractAddress,
+          request.storageSlot,
+          request.nonce,
+          request.content,
+          request.noteHash,
+          request.nullifier,
+          request.txHash,
+          request.recipient,
+        ),
+      ),
+    );
+
+    // Requests are cleared once we're done.
+    await this.capsuleDataProvider.resetCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, []);
+  }
+
+  async deliverNote(
     contractAddress: AztecAddress,
     storageSlot: Fr,
     nonce: Fr,
@@ -690,18 +715,18 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     }
   }
 
-  public async getLogByTag(tag: Fr): Promise<LogWithTxData | null> {
-    const logs = await this.aztecNode.getLogsByTags([tag]);
+  public async getPublicLogByTag(tag: Fr, contractAddress: AztecAddress): Promise<PublicLogWithTxData | null> {
+    const logs = await this.#getPublicLogsByTagsFromContract([tag], contractAddress);
     const logsForTag = logs[0];
 
-    this.log.debug(`Got ${logsForTag.length} logs for tag ${tag}`);
+    this.log.debug(`Got ${logsForTag.length} public logs for tag ${tag}`);
 
     if (logsForTag.length == 0) {
       return null;
     } else if (logsForTag.length > 1) {
       // TODO(#11627): handle this case
       throw new Error(
-        `Got ${logsForTag.length} logs for tag ${tag}. getLogByTag currently only supports a single log per tag`,
+        `Got ${logsForTag.length} logs for tag ${tag} and contract ${contractAddress.toString()}. getPublicLogByTag currently only supports a single log per tag`,
       );
     }
 
@@ -715,11 +740,45 @@ export class PXEOracleInterface implements ExecutionDataProvider {
       throw new Error(`Unexpected: failed to retrieve tx effects for tx ${scopedLog.txHash} which is known to exist`);
     }
 
-    const logContent = (scopedLog.isFromPublic ? [(scopedLog.log as PublicLog).contractAddress.toField()] : []).concat(
-      scopedLog.log.getEmittedFields(),
+    return new PublicLogWithTxData(
+      scopedLog.log.getEmittedFieldsWithoutTag(),
+      scopedLog.txHash,
+      txEffect.data.noteHashes,
+      txEffect.data.nullifiers[0],
     );
+  }
+
+  public async getPrivateLogByTag(siloedTag: Fr): Promise<PrivateLogWithTxData | null> {
+    const logs = await this.#getPrivateLogsByTags([siloedTag]);
+    const logsForTag = logs[0];
+
+    this.log.debug(`Got ${logsForTag.length} private logs for tag ${siloedTag}`);
+
+    if (logsForTag.length == 0) {
+      return null;
+    } else if (logsForTag.length > 1) {
+      // TODO(#11627): handle this case
+      throw new Error(
+        `Got ${logsForTag.length} logs for tag ${siloedTag}. getPrivateLogByTag currently only supports a single log per tag`,
+      );
+    }
+
+    const scopedLog = logsForTag[0];
 
-    return new LogWithTxData(logContent, scopedLog.txHash, txEffect.data.noteHashes, txEffect.data.nullifiers[0]);
+    // getLogsByTag doesn't have all of the information that we need (notably note hashes and the first nullifier), so
+    // we need to make a second call to the node for `getTxEffect`.
+    // TODO(#9789): bundle this information in the `getLogsByTag` call.
+    const txEffect = await this.aztecNode.getTxEffect(scopedLog.txHash);
+    if (txEffect == undefined) {
+      throw new Error(`Unexpected: failed to retrieve tx effects for tx ${scopedLog.txHash} which is known to exist`);
+    }
+
+    return new PrivateLogWithTxData(
+      scopedLog.log.getEmittedFieldsWithoutTag(),
+      scopedLog.txHash,
+      txEffect.data.noteHashes,
+      txEffect.data.nullifiers[0],
+    );
   }
 
   public async removeNullifiedNotes(contractAddress: AztecAddress) {
@@ -823,6 +882,23 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     );
   }
 
+  // TODO(#12656): Make this a public function on the AztecNode interface and remove the original getLogsByTags. This
+  // was not done yet as we were unsure about the API and we didn't want to introduce a breaking change.
+  async #getPrivateLogsByTags(tags: Fr[]): Promise<TxScopedL2Log[][]> {
+    const allLogs = await this.aztecNode.getLogsByTags(tags);
+    return allLogs.map(logs => logs.filter(log => !log.isFromPublic));
+  }
+
+  // TODO(#12656): Make this a public function on the AztecNode interface and remove the original getLogsByTags. This
+  // was not done yet as we were unsure about the API and we didn't want to introduce a breaking change.
+  async #getPublicLogsByTagsFromContract(tags: Fr[], contractAddress: AztecAddress): Promise<TxScopedL2Log[][]> {
+    const allLogs = await this.aztecNode.getLogsByTags(tags);
+    const allPublicLogs = allLogs.map(logs => logs.filter(log => log.isFromPublic));
+    return allPublicLogs.map(logs =>
+      logs.filter(log => (log.log as PublicLog).contractAddress.equals(contractAddress)),
+    );
+  }
+
   getStats(): ExecutionStats {
     const nodeRPCCalls =
       typeof (this.aztecNode as ProxiedNode).getStats === 'function' ? (this.aztecNode as ProxiedNode).getStats() : {};