@aztec/pxe 0.82.3 → 0.83.0

package/dest/test/pxe_test_suite.js

@@ -89,7 +89,7 @@ export const pxeTestSuite = (testName, pxeSetup)=>{
         });
         it('successfully gets node info', async ()=>{
             const nodeInfo = await pxe.getNodeInfo();
-            expect(typeof nodeInfo.protocolVersion).toEqual('number');
+            expect(typeof nodeInfo.rollupVersion).toEqual('number');
             expect(typeof nodeInfo.l1ChainId).toEqual('number');
             expect(nodeInfo.l1ContractAddresses.rollupAddress.toString()).toMatch(/0x[a-fA-F0-9]+/);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.82.3",
+  "version": "0.83.0",
   "type": "module",
   "exports": {
     "./server": "./dest/entrypoints/server/index.js",
@@ -59,19 +59,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.82.3",
-    "@aztec/bb.js": "0.82.3",
-    "@aztec/builder": "0.82.3",
-    "@aztec/constants": "0.82.3",
-    "@aztec/ethereum": "0.82.3",
-    "@aztec/foundation": "0.82.3",
-    "@aztec/key-store": "0.82.3",
-    "@aztec/kv-store": "0.82.3",
-    "@aztec/noir-protocol-circuits-types": "0.82.3",
-    "@aztec/noir-types": "0.82.3",
-    "@aztec/protocol-contracts": "0.82.3",
-    "@aztec/simulator": "0.82.3",
-    "@aztec/stdlib": "0.82.3",
+    "@aztec/bb-prover": "0.83.0",
+    "@aztec/bb.js": "0.83.0",
+    "@aztec/builder": "0.83.0",
+    "@aztec/constants": "0.83.0",
+    "@aztec/ethereum": "0.83.0",
+    "@aztec/foundation": "0.83.0",
+    "@aztec/key-store": "0.83.0",
+    "@aztec/kv-store": "0.83.0",
+    "@aztec/noir-protocol-circuits-types": "0.83.0",
+    "@aztec/noir-types": "0.83.0",
+    "@aztec/protocol-contracts": "0.83.0",
+    "@aztec/simulator": "0.83.0",
+    "@aztec/stdlib": "0.83.0",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
@@ -81,7 +81,7 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/noir-contracts.js": "0.82.3",
+    "@aztec/noir-contracts.js": "0.83.0",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.omit": "^4.5.7",

package/src/config/package_info.ts

@@ -1,3 +1,3 @@
 export function getPackageInfo() {
-  return { version: '0.82.2', name: '@aztec/pxe' };
+  return { version: '0.83.0', name: '@aztec/pxe' };
 }

package/src/pxe_oracle_interface/pxe_oracle_interface.ts

@@ -1,22 +1,13 @@
-import { type L1_TO_L2_MSG_TREE_HEIGHT, MAX_NOTE_HASHES_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
+import type { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { timesParallel } from '@aztec/foundation/collection';
-import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr, Point } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { KeyStore } from '@aztec/key-store';
+import { type ExecutionDataProvider, MessageLoadOracleInputs } from '@aztec/simulator/client';
 import {
-  AcirSimulator,
-  type ExecutionDataProvider,
-  MessageLoadOracleInputs,
-  type SimulationProvider,
-} from '@aztec/simulator/client';
-import {
-  type FunctionArtifact,
+  EventSelector,
   type FunctionArtifactWithContractName,
-  FunctionCall,
   FunctionSelector,
-  FunctionType,
-  encodeArguments,
   getFunctionArtifact,
 } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -25,8 +16,14 @@ import type { CompleteAddress, ContractInstance } from '@aztec/stdlib/contract';
 import { computeUniqueNoteHash, siloNoteHash, siloNullifier } from '@aztec/stdlib/hash';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { KeyValidationRequest } from '@aztec/stdlib/kernel';
-import { computeAddressSecret, computeTaggingSecretPoint } from '@aztec/stdlib/keys';
-import { IndexedTaggingSecret, LogWithTxData, TxScopedL2Log, deriveEcdhSharedSecret } from '@aztec/stdlib/logs';
+import { computeAddressSecret, computeAppTaggingSecret } from '@aztec/stdlib/keys';
+import {
+  IndexedTaggingSecret,
+  LogWithTxData,
+  PendingTaggedLog,
+  TxScopedL2Log,
+  deriveEcdhSharedSecret,
+} from '@aztec/stdlib/logs';
 import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
 import { Note, type NoteStatus } from '@aztec/stdlib/note';
 import { MerkleTreeId, type NullifierMembershipWitness, PublicDataWitness } from '@aztec/stdlib/trees';
@@ -38,6 +35,7 @@ import type { CapsuleDataProvider } from '../storage/capsule_data_provider/capsu
 import type { ContractDataProvider } from '../storage/contract_data_provider/contract_data_provider.js';
 import { NoteDao } from '../storage/note_data_provider/note_dao.js';
 import type { NoteDataProvider } from '../storage/note_data_provider/note_data_provider.js';
+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 { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
@@ -49,13 +47,13 @@ export class PXEOracleInterface implements ExecutionDataProvider {
   constructor(
     private aztecNode: AztecNode,
     private keyStore: KeyStore,
-    private simulationProvider: SimulationProvider,
     private contractDataProvider: ContractDataProvider,
     private noteDataProvider: NoteDataProvider,
     private capsuleDataProvider: CapsuleDataProvider,
     private syncDataProvider: SyncDataProvider,
     private taggingDataProvider: TaggingDataProvider,
     private addressDataProvider: AddressDataProvider,
+    private privateEventDataProvider: PrivateEventDataProvider,
     private log = createLogger('pxe:pxe_oracle_interface'),
   ) {}
 
@@ -291,7 +289,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     await this.syncTaggedLogsAsSender(contractAddress, sender, recipient);
 
     const appTaggingSecret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
-    const [index] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
+    const [index] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([appTaggingSecret], sender);
 
     return new IndexedTaggingSecret(appTaggingSecret, index);
   }
@@ -317,17 +315,17 @@ export class PXEOracleInterface implements ExecutionDataProvider {
       contractAddress,
     });
 
-    const [index] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([secret]);
-    await this.taggingDataProvider.setTaggingSecretsIndexesAsSender([new IndexedTaggingSecret(secret, index + 1)]);
+    const [index] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([secret], sender);
+    await this.taggingDataProvider.setTaggingSecretsIndexesAsSender(
+      [new IndexedTaggingSecret(secret, index + 1)],
+      sender,
+    );
   }
 
   async #calculateAppTaggingSecret(contractAddress: AztecAddress, sender: AztecAddress, recipient: AztecAddress) {
     const senderCompleteAddress = await this.getCompleteAddress(sender);
     const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
-    const secretPoint = await computeTaggingSecretPoint(senderCompleteAddress, senderIvsk, recipient);
-    // Silo the secret so it can't be used to track other app's notes
-    const appSecret = poseidon2Hash([secretPoint.x, secretPoint.y, contractAddress]);
-    return appSecret;
+    return computeAppTaggingSecret(senderCompleteAddress, senderIvsk, recipient, contractAddress);
   }
 
   /**
@@ -353,12 +351,11 @@ export class PXEOracleInterface implements ExecutionDataProvider {
       ...(await this.keyStore.getAccounts()),
     ].filter((address, index, self) => index === self.findIndex(otherAddress => otherAddress.equals(address)));
     const appTaggingSecrets = await Promise.all(
-      senders.map(async contact => {
-        const sharedSecret = await computeTaggingSecretPoint(recipientCompleteAddress, recipientIvsk, contact);
-        return poseidon2Hash([sharedSecret.x, sharedSecret.y, contractAddress]);
-      }),
+      senders.map(contact =>
+        computeAppTaggingSecret(recipientCompleteAddress, recipientIvsk, contact, contractAddress),
+      ),
     );
-    const indexes = await this.taggingDataProvider.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
+    const indexes = await this.taggingDataProvider.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets, recipient);
     return appTaggingSecrets.map((secret, i) => new IndexedTaggingSecret(secret, indexes[i]));
   }
 
@@ -375,7 +372,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     recipient: AztecAddress,
   ): Promise<void> {
     const appTaggingSecret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
-    const [oldIndex] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([appTaggingSecret]);
+    const [oldIndex] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([appTaggingSecret], sender);
 
     // This algorithm works such that:
     // 1. If we find minimum consecutive empty logs in a window of logs we set the index to the index of the last log
@@ -413,9 +410,10 @@ export class PXEOracleInterface implements ExecutionDataProvider {
 
     const contractName = await this.contractDataProvider.getDebugContractName(contractAddress);
     if (currentIndex !== oldIndex) {
-      await this.taggingDataProvider.setTaggingSecretsIndexesAsSender([
-        new IndexedTaggingSecret(appTaggingSecret, currentIndex),
-      ]);
+      await this.taggingDataProvider.setTaggingSecretsIndexesAsSender(
+        [new IndexedTaggingSecret(appTaggingSecret, currentIndex)],
+        sender,
+      );
 
       this.log.debug(`Syncing logs for sender ${sender} at contract ${contractName}(${contractAddress})`, {
         sender,
@@ -430,20 +428,23 @@ export class PXEOracleInterface implements ExecutionDataProvider {
   }
 
   /**
-   * Synchronizes the logs tagged with scoped addresses 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 logs 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.
    */
   public async syncTaggedLogs(
     contractAddress: AztecAddress,
-    maxBlockNumber: number,
+    pendingTaggedLogArrayBaseSlot: Fr,
     scopes?: AztecAddress[],
-  ): Promise<Map<string, TxScopedL2Log[]>> {
+  ) {
     this.log.verbose('Searching for tagged logs', { contract: contractAddress });
 
+    const maxBlockNumber = await this.syncDataProvider.getBlockNumber();
+
     // Ideally this algorithm would be implemented in noir, exposing its building blocks as oracles.
     // However it is impossible at the moment due to the language not supporting nested slices.
     // This nesting is necessary because for a given set of tags we don't
@@ -451,14 +452,8 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     // length, since we don't really know the note they correspond to until we decrypt them.
 
     const recipients = scopes ? scopes : await this.keyStore.getAccounts();
-    // A map of logs going from recipient address to logs. Note that the logs might have been processed before
-    // due to us having a sliding window that "looks back" for logs as well. (We look back as there is no guarantee
-    // that a logs will be received ordered by a given tag index and that the tags won't be reused).
-    const logsMap = new Map<string, TxScopedL2Log[]>();
     const contractName = await this.contractDataProvider.getDebugContractName(contractAddress);
     for (const recipient of recipients) {
-      const logsForRecipient: TxScopedL2Log[] = [];
-
       // Get all the secrets for the recipient and sender pairs (#9365)
       const secrets = await this.#getIndexedTaggingSecretsForSenders(contractAddress, recipient);
 
@@ -497,7 +492,8 @@ export class PXEOracleInterface implements ExecutionDataProvider {
         // Fetch the logs for the tags and iterate over them
         const logsByTags = await this.aztecNode.getLogsByTags(tagsForTheWholeWindow);
 
-        logsByTags.forEach((logsByTag, logIndex) => {
+        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);
@@ -505,8 +501,16 @@ export class PXEOracleInterface implements ExecutionDataProvider {
               this.log.warn(`Discarded ${logsByTag.filter(l => l.isFromPublic).length} public logs with matching tags`);
             }
 
-            // The logs for the given tag exist so we store them for later processing
-            logsForRecipient.push(...filteredLogsByTag);
+            // 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);
+
+            // We store the logs in capsules (to later be obtained in Noir)
+            await this.#storePendingTaggedLogs(
+              contractAddress,
+              pendingTaggedLogArrayBaseSlot,
+              recipient,
+              filteredLogsByBlockNumber,
+            );
 
             // We retrieve the indexed tagging secret corresponding to the log as I need that to evaluate whether
             // a new largest index have been found.
@@ -538,7 +542,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
               );
             }
           }
-        });
+        }
 
         // Now based on the new largest indexes we found, we will construct a new secrets and windows set to fetch logs
         // for. Note that it's very unlikely that a new log from the current window would appear between the iterations
@@ -567,59 +571,45 @@ export class PXEOracleInterface implements ExecutionDataProvider {
         secretsAndWindows = newSecretsAndWindows;
       }
 
-      // We filter the logs by block number and store them in the map.
-      logsMap.set(
-        recipient.toString(),
-        logsForRecipient.filter(log => log.blockNumber <= maxBlockNumber),
-      );
-
       // At this point we have processed all the logs for the recipient so we store the new largest indexes in the db.
       await this.taggingDataProvider.setTaggingSecretsIndexesAsRecipient(
         Object.entries(newLargestIndexMapToStore).map(
           ([appTaggingSecret, index]) => new IndexedTaggingSecret(Fr.fromHexString(appTaggingSecret), index),
         ),
+        recipient,
       );
     }
-    return logsMap;
   }
 
-  /**
-   * Processes the tagged logs returned by syncTaggedLogs by decrypting them and storing them in the database.
-   * @param contractAddress - The address of the contract that the logs are tagged for.
-   * @param logs - The logs to process.
-   * @param recipient - The recipient of the logs.
-   */
-  public async processTaggedLogs(
+  async #storePendingTaggedLogs(
     contractAddress: AztecAddress,
-    logs: TxScopedL2Log[],
+    capsuleArrayBaseSlot: Fr,
     recipient: AztecAddress,
-    simulator?: AcirSimulator,
-  ): Promise<void> {
-    for (const scopedLog of logs) {
-      if (scopedLog.isFromPublic) {
-        throw new Error('Attempted to decrypt public log');
-      }
+    logs: TxScopedL2Log[],
+  ) {
+    // Build all pending tagged logs upfront with their tx effects
+    const pendingTaggedLogs = await Promise.all(
+      logs.map(async scopedLog => {
+        // TODO(#9789): get these effects along with the log
+        const txEffect = await this.aztecNode.getTxEffect(scopedLog.txHash);
+        if (!txEffect) {
+          throw new Error(`Could not find tx effect for tx hash ${scopedLog.txHash}`);
+        }
 
-      // Log processing requires the note hashes in the tx in which the note was created. We are now assuming that the
-      // note was included in the same block in which the log was delivered - note that partial notes will not work this
-      // way.
-      const txEffect = await this.aztecNode.getTxEffect(scopedLog.txHash);
-      if (!txEffect) {
-        throw new Error(`Could not find tx effect for tx hash ${scopedLog.txHash}`);
-      }
+        const pendingTaggedLog = new PendingTaggedLog(
+          scopedLog.log.toFields(),
+          scopedLog.txHash.hash,
+          txEffect.data.noteHashes,
+          txEffect.data.nullifiers[0],
+          recipient,
+          scopedLog.logIndexInTx,
+        );
 
-      // This will trigger calls to the deliverNote oracle
-      await this.callProcessLog(
-        contractAddress,
-        scopedLog.log.toFields(),
-        scopedLog.txHash,
-        txEffect.data.noteHashes,
-        txEffect.data.nullifiers[0],
-        recipient,
-        simulator,
-      );
-    }
-    return;
+        return pendingTaggedLog.toFields();
+      }),
+    );
+
+    return this.capsuleDataProvider.appendToCapsuleArray(contractAddress, capsuleArrayBaseSlot, pendingTaggedLogs);
   }
 
   public async deliverNote(
@@ -649,10 +639,7 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     // in time of the locally synced state.
     // Note that while this technically results in historical queries, we perform it at the latest locally synced block
     // number which *should* be recent enough to be available, even for non-archive nodes.
-    const syncedBlockNumber = (await this.syncDataProvider.getBlockNumber())!;
-    if (syncedBlockNumber === undefined) {
-      throw new Error(`Attempted to deliver a note with an unsynchronized PXE - this should never happen`);
-    }
+    const syncedBlockNumber = await this.syncDataProvider.getBlockNumber();
 
     // By computing siloed and unique note hashes ourselves we prevent contracts from interfering with the note storage
     // of other contracts, which would constitute a security breach.
@@ -688,9 +675,10 @@ export class PXEOracleInterface implements ExecutionDataProvider {
 
     await this.noteDataProvider.addNotes([noteDao], recipient);
     this.log.verbose('Added note', {
-      contract: noteDao.contractAddress,
-      slot: noteDao.storageSlot,
-      noteHash: noteDao.noteHash,
+      index: noteDao.index,
+      contract: noteDao.contractAddress.toString(),
+      slot: noteDao.storageSlot.toString(),
+      noteHash: noteDao.noteHash.toString(),
       nullifier: noteDao.siloedNullifier.toString(),
     });
 
@@ -778,50 +766,6 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     }
   }
 
-  async callProcessLog(
-    contractAddress: AztecAddress,
-    logCiphertext: Fr[],
-    txHash: TxHash,
-    noteHashes: Fr[],
-    firstNullifier: Fr,
-    recipient: AztecAddress,
-    simulator?: AcirSimulator,
-  ) {
-    const artifact: FunctionArtifact | undefined = await this.contractDataProvider.getFunctionArtifactByName(
-      contractAddress,
-      'process_log',
-    );
-    if (!artifact) {
-      throw new Error(
-        `Mandatory implementation of "process_log" missing in noir contract ${contractAddress.toString()}.`,
-      );
-    }
-
-    const selector = await FunctionSelector.fromNameAndParameters(artifact);
-    const execRequest: FunctionCall = {
-      name: artifact.name,
-      to: contractAddress,
-      selector,
-      type: FunctionType.UNCONSTRAINED,
-      isStatic: artifact.isStatic,
-      args: encodeArguments(artifact, [
-        toBoundedVec(logCiphertext, PRIVATE_LOG_SIZE_IN_FIELDS),
-        txHash.toString(),
-        toBoundedVec(noteHashes, MAX_NOTE_HASHES_PER_TX),
-        firstNullifier,
-        recipient,
-      ]),
-      returnTypes: artifact.returnTypes,
-    };
-
-    await (simulator ?? new AcirSimulator(this, this.simulationProvider)).runUnconstrained(
-      execRequest,
-      contractAddress,
-      selector,
-      [], // empty scope as this call should not require access to private information
-    );
-  }
-
   storeCapsule(contractAddress: AztecAddress, slot: Fr, capsule: Fr[]): Promise<void> {
     return this.capsuleDataProvider.storeCapsule(contractAddress, slot, capsule);
   }
@@ -847,8 +791,34 @@ export class PXEOracleInterface implements ExecutionDataProvider {
     const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
     return deriveEcdhSharedSecret(addressSecret, ephPk);
   }
-}
 
-function toBoundedVec(array: Fr[], maxLength: number) {
-  return { storage: array.concat(Array(maxLength - array.length).fill(new Fr(0))), len: array.length };
+  async storePrivateEventLog(
+    contractAddress: AztecAddress,
+    recipient: AztecAddress,
+    eventSelector: EventSelector,
+    logContent: Fr[],
+    txHash: TxHash,
+    logIndexInTx: number,
+  ): Promise<void> {
+    const txReceipt = await this.aztecNode.getTxReceipt(txHash);
+    const blockNumber = txReceipt.blockNumber;
+    if (blockNumber === undefined) {
+      throw new Error(`Block number is undefined for tx ${txHash} in storePrivateEventLog`);
+    }
+    const historicalBlockNumber = await this.syncDataProvider.getBlockNumber();
+    if (blockNumber > historicalBlockNumber) {
+      throw new Error(
+        `Attempting to store private event log from a block newer than the historical block of the simulation. Log block number: ${blockNumber}, historical block number: ${historicalBlockNumber}`,
+      );
+    }
+    return this.privateEventDataProvider.storePrivateEventLog(
+      contractAddress,
+      recipient,
+      eventSelector,
+      logContent,
+      txHash,
+      logIndexInTx,
+      blockNumber,
+    );
+  }
 }