@aztec/pxe 0.65.2 → 0.67.0

package/src/note_decryption_utils/produce_note_daos.ts

@@ -1,10 +1,9 @@
 import { type L1NotePayload, type PublicKey, type TxHash } from '@aztec/circuit-types';
 import { type Fr } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
-import { type AcirSimulator } from '@aztec/simulator';
+import { type AcirSimulator } from '@aztec/simulator/client';
 
 import { IncomingNoteDao } from '../database/incoming_note_dao.js';
-import { OutgoingNoteDao } from '../database/outgoing_note_dao.js';
 import { type PxeDatabase } from '../database/pxe_database.js';
 import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
 
@@ -17,7 +16,6 @@ import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
  * @param simulator - An instance of AcirSimulator.
  * @param db - An instance of PxeDatabase.
  * @param addressPoint - The public counterpart to the address secret, which is used in the decryption of incoming note logs.
- * @param ovpkM - The public counterpart to the secret key to be used in the decryption of outgoing note logs.
  * @param payload - An instance of l1NotePayload.
  * @param txHash - The hash of the transaction that created the note. Equivalent to the first nullifier of the transaction.
  * @param noteHashes - New note hashes in this transaction, one of which belongs to this note.
@@ -25,13 +23,12 @@ import { produceNoteDaosForKey } from './produce_note_daos_for_key.js';
  * @param excludedIndices - Indices that have been assigned a note in the same tx. Notes in a tx can have the same l1NotePayload, we need to find a different index for each replicate.
  * @param logger - An instance of Logger.
  * @param unencryptedLogs - Unencrypted logs for the transaction (used to complete partial notes).
- * @returns An object containing the incoming, outgoing, and deferred notes.
+ * @returns An object containing the incoming notes.
  */
 export async function produceNoteDaos(
   simulator: AcirSimulator,
   db: PxeDatabase,
   addressPoint: PublicKey | undefined,
-  ovpkM: PublicKey | undefined,
   payload: L1NotePayload,
   txHash: TxHash,
   l2BlockNumber: number,
@@ -40,16 +37,12 @@ export async function produceNoteDaos(
   dataStartIndexForTx: number,
   excludedIndices: Set<number>,
   logger: Logger,
-): Promise<{
-  incomingNote: IncomingNoteDao | undefined;
-  outgoingNote: OutgoingNoteDao | undefined;
-}> {
-  if (!addressPoint && !ovpkM) {
-    throw new Error('Both addressPoint and ovpkM are undefined. Cannot create note.');
+): Promise<{ incomingNote: IncomingNoteDao | undefined }> {
+  if (!addressPoint) {
+    throw new Error('addressPoint is undefined. Cannot create note.');
   }
 
   let incomingNote: IncomingNoteDao | undefined;
-  let outgoingNote: OutgoingNoteDao | undefined;
 
   if (addressPoint) {
     incomingNote = await produceNoteDaosForKey(
@@ -68,43 +61,7 @@ export async function produceNoteDaos(
     );
   }
 
-  if (ovpkM) {
-    if (incomingNote) {
-      // Incoming note is defined meaning that this PXE has both the incoming and outgoing keys. We can skip computing
-      // note hash and note index since we already have them in the incoming note.
-      outgoingNote = new OutgoingNoteDao(
-        incomingNote.note,
-        incomingNote.contractAddress,
-        incomingNote.storageSlot,
-        incomingNote.noteTypeId,
-        incomingNote.txHash,
-        incomingNote.l2BlockNumber,
-        incomingNote.l2BlockHash,
-        incomingNote.nonce,
-        incomingNote.noteHash,
-        incomingNote.index,
-        ovpkM,
-      );
-    } else {
-      outgoingNote = await produceNoteDaosForKey(
-        simulator,
-        db,
-        ovpkM,
-        payload,
-        txHash,
-        l2BlockNumber,
-        l2BlockHash,
-        noteHashes,
-        dataStartIndexForTx,
-        excludedIndices,
-        logger,
-        OutgoingNoteDao.fromPayloadAndNoteInfo,
-      );
-    }
-  }
-
   return {
     incomingNote,
-    outgoingNote,
   };
 }

package/src/note_decryption_utils/produce_note_daos_for_key.ts

@@ -1,7 +1,7 @@
 import { type L1NotePayload, type Note, type TxHash } from '@aztec/circuit-types';
 import { type Fr, type PublicKey } from '@aztec/circuits.js';
 import { type Logger } from '@aztec/foundation/log';
-import { type AcirSimulator } from '@aztec/simulator';
+import { type AcirSimulator } from '@aztec/simulator/client';
 
 import { type PxeDatabase } from '../database/pxe_database.js';
 import { getOrderedNoteItems } from './add_public_values_to_payload.js';

package/src/pxe_service/error_enriching.ts

@@ -1,7 +1,7 @@
 import { type SimulationError, isNoirCallStackUnresolved } from '@aztec/circuit-types';
 import { AztecAddress, Fr, FunctionSelector, PUBLIC_DISPATCH_SELECTOR } from '@aztec/circuits.js';
-import { type DebugLogger } from '@aztec/foundation/log';
-import { resolveAssertionMessageFromRevertData, resolveOpcodeLocations } from '@aztec/simulator';
+import { type Logger } from '@aztec/foundation/log';
+import { resolveAssertionMessageFromRevertData, resolveOpcodeLocations } from '@aztec/simulator/errors';
 
 import { type ContractDataOracle, type PxeDatabase } from '../index.js';
 
@@ -10,27 +10,27 @@ import { type ContractDataOracle, type PxeDatabase } from '../index.js';
  * can be found in the PXE database
  * @param err - The error to enrich.
  */
-export async function enrichSimulationError(err: SimulationError, db: PxeDatabase, logger: DebugLogger) {
-  // Maps contract addresses to the set of functions selectors that were in error.
+export async function enrichSimulationError(err: SimulationError, db: PxeDatabase, logger: Logger) {
+  // Maps contract addresses to the set of function names that were in error.
   // Map and Set do reference equality for their keys instead of value equality, so we store the string
   // representation to get e.g. different contract address objects with the same address value to match.
   const mentionedFunctions: Map<string, Set<string>> = new Map();
 
-  err.getCallStack().forEach(({ contractAddress, functionSelector }) => {
+  err.getCallStack().forEach(({ contractAddress, functionName }) => {
     if (!mentionedFunctions.has(contractAddress.toString())) {
       mentionedFunctions.set(contractAddress.toString(), new Set());
     }
-    mentionedFunctions.get(contractAddress.toString())!.add(functionSelector.toString());
+    mentionedFunctions.get(contractAddress.toString())!.add(functionName?.toString() ?? '');
   });
 
   await Promise.all(
-    [...mentionedFunctions.entries()].map(async ([contractAddress, selectors]) => {
+    [...mentionedFunctions.entries()].map(async ([contractAddress, fnNames]) => {
       const parsedContractAddress = AztecAddress.fromString(contractAddress);
       const contract = await db.getContract(parsedContractAddress);
       if (contract) {
         err.enrichWithContractName(parsedContractAddress, contract.name);
-        selectors.forEach(selector => {
-          const functionArtifact = contract.functions.find(f => FunctionSelector.fromString(selector).equals(f));
+        fnNames.forEach(fnName => {
+          const functionArtifact = contract.functions.find(f => fnName === f.name);
           if (functionArtifact) {
             err.enrichWithFunctionName(
               parsedContractAddress,
@@ -39,7 +39,7 @@ export async function enrichSimulationError(err: SimulationError, db: PxeDatabas
             );
           } else {
             logger.warn(
-              `Could not function artifact in contract ${contract.name} for selector ${selector} when enriching error callstack`,
+              `Could not function artifact in contract ${contract.name} for function '${fnName}' when enriching error callstack`,
             );
           }
         });
@@ -56,7 +56,7 @@ export async function enrichPublicSimulationError(
   err: SimulationError,
   contractDataOracle: ContractDataOracle,
   db: PxeDatabase,
-  logger: DebugLogger,
+  logger: Logger,
 ) {
   const callStack = err.getCallStack();
   const originalFailingFunction = callStack[callStack.length - 1];
@@ -89,7 +89,9 @@ export async function enrichPublicSimulationError(
         err.setNoirCallStack(parsedCallStack);
       } catch (err) {
         logger.warn(
-          `Could not resolve noir call stack for ${originalFailingFunction.contractAddress.toString()}:${originalFailingFunction.functionSelector.toString()}: ${err}`,
+          `Could not resolve noir call stack for ${originalFailingFunction.contractAddress.toString()}:${
+            originalFailingFunction.functionName?.toString() ?? ''
+          }: ${err}`,
         );
       }
     }

package/src/pxe_service/index.ts

@@ -1,4 +1,3 @@
 export * from './pxe_service.js';
-export * from './create_pxe_service.js';
 export { enrichPublicSimulationError } from './error_enriching.js';
 export { pxeTestSuite } from './test/pxe_test_suite.js';