@aztec/pxe 0.77.1 → 0.78.0

package/dest/{pxe_data_provider → pxe_oracle_interface}/index.js

@@ -14,32 +14,41 @@ import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
 import { Note } from '@aztec/stdlib/note';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import { TxHash } from '@aztec/stdlib/tx';
-import { ContractDataProvider } from '../contract_data_provider/index.js';
-import { NoteDao } from '../database/note_dao.js';
 import { getOrderedNoteItems } from '../note_decryption_utils/add_public_values_to_payload.js';
+import { NoteDao } from '../storage/note_data_provider/note_dao.js';
 import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndexesMap } from './tagging_utils.js';
 /**
  * A data layer that provides and stores information needed for simulating/proving a transaction.
- */ export class PXEDataProvider {
-    db;
-    keyStore;
+ */ export class PXEOracleInterface {
     aztecNode;
+    keyStore;
     simulationProvider;
     contractDataProvider;
+    noteDataProvider;
+    capsuleDataProvider;
+    syncDataProvider;
+    taggingDataProvider;
+    addressDataProvider;
+    authWitnessDataProvider;
     log;
-    constructor(db, keyStore, aztecNode, simulationProvider, contractDataProvider, log = createLogger('pxe:pxe_data_provider')){
-        this.db = db;
-        this.keyStore = keyStore;
+    constructor(aztecNode, keyStore, simulationProvider, contractDataProvider, noteDataProvider, capsuleDataProvider, syncDataProvider, taggingDataProvider, addressDataProvider, authWitnessDataProvider, log = createLogger('pxe:pxe_data_manager')){
         this.aztecNode = aztecNode;
+        this.keyStore = keyStore;
         this.simulationProvider = simulationProvider;
         this.contractDataProvider = contractDataProvider;
+        this.noteDataProvider = noteDataProvider;
+        this.capsuleDataProvider = capsuleDataProvider;
+        this.syncDataProvider = syncDataProvider;
+        this.taggingDataProvider = taggingDataProvider;
+        this.addressDataProvider = addressDataProvider;
+        this.authWitnessDataProvider = authWitnessDataProvider;
         this.log = log;
     }
     getKeyValidationRequest(pkMHash, contractAddress) {
         return this.keyStore.getKeyValidationRequest(pkMHash, contractAddress);
     }
     async getCompleteAddress(account) {
-        const completeAddress = await this.db.getCompleteAddress(account);
+        const completeAddress = await this.addressDataProvider.getCompleteAddress(account);
         if (!completeAddress) {
             throw new Error(`No public key registered for address ${account}.
         Register it by calling pxe.registerAccount(...).\nSee docs for context: https://docs.aztec.network/developers/reference/debugging/aztecnr-errors#simulation-error-no-public-key-registered-for-address-0x0-register-it-by-calling-pxeregisterrecipient-or-pxeregisteraccount`);
@@ -47,21 +56,18 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
         return completeAddress;
     }
     async getContractInstance(address) {
-        const instance = await this.db.getContractInstance(address);
+        const instance = await this.contractDataProvider.getContractInstance(address);
         if (!instance) {
             throw new Error(`No contract instance found for address ${address.toString()}`);
         }
         return instance;
     }
     async getAuthWitness(messageHash) {
-        const witness = await this.db.getAuthWitness(messageHash);
-        if (!witness) {
-            throw new Error(`Unknown auth witness for message hash ${messageHash.toString()}`);
-        }
+        const witness = await this.authWitnessDataProvider.getAuthWitness(messageHash);
         return witness;
     }
     async getNotes(contractAddress, storageSlot, status, scopes) {
-        const noteDaos = await this.db.getNotes({
+        const noteDaos = await this.noteDataProvider.getNotes({
             contractAddress,
             storageSlot,
             status,
@@ -176,7 +182,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
    *
    * @returns A Promise that resolves to a BlockHeader object.
    */ getBlockHeader() {
-        return this.db.getBlockHeader();
+        return this.syncDataProvider.getBlockHeader();
     }
     /**
    * Fetches the current block number.
@@ -205,7 +211,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
    * finally the index specified tag. We will then query the node with this tag for each address in the address book.
    * @returns The full list of the users contact addresses.
    */ getSenders() {
-        return this.db.getSenderAddresses();
+        return this.taggingDataProvider.getSenderAddresses();
     }
     /**
    * Returns the tagging secret for a given sender and recipient pair. For this to work, the ivsk_m of the sender must be known.
@@ -217,7 +223,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
    */ async getIndexedTaggingSecretAsSender(contractAddress, sender, recipient) {
         await this.syncTaggedLogsAsSender(contractAddress, sender, recipient);
         const appTaggingSecret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
-        const [index] = await this.db.getTaggingSecretsIndexesAsSender([
+        const [index] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([
             appTaggingSecret
         ]);
         return new IndexedTaggingSecret(appTaggingSecret, index);
@@ -237,10 +243,10 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
             contractName,
             contractAddress
         });
-        const [index] = await this.db.getTaggingSecretsIndexesAsSender([
+        const [index] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([
             secret
         ]);
-        await this.db.setTaggingSecretsIndexesAsSender([
+        await this.taggingDataProvider.setTaggingSecretsIndexesAsSender([
             new IndexedTaggingSecret(secret, index + 1)
         ]);
     }
@@ -270,7 +276,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
         // We implicitly add all PXE accounts as senders, this helps us decrypt tags on notes that we send to ourselves
         // (recipient = us, sender = us)
         const senders = [
-            ...await this.db.getSenderAddresses(),
+            ...await this.taggingDataProvider.getSenderAddresses(),
             ...await this.keyStore.getAccounts()
         ].filter((address, index, self)=>index === self.findIndex((otherAddress)=>otherAddress.equals(address)));
         const appTaggingSecrets = await Promise.all(senders.map(async (contact)=>{
@@ -281,7 +287,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
                 contractAddress
             ]);
         }));
-        const indexes = await this.db.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
+        const indexes = await this.taggingDataProvider.getTaggingSecretsIndexesAsRecipient(appTaggingSecrets);
         return appTaggingSecrets.map((secret, i)=>new IndexedTaggingSecret(secret, indexes[i]));
     }
     /**
@@ -292,7 +298,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
    * @param recipient - The address of the recipient.
    */ async syncTaggedLogsAsSender(contractAddress, sender, recipient) {
         const appTaggingSecret = await this.#calculateAppTaggingSecret(contractAddress, sender, recipient);
-        const [oldIndex] = await this.db.getTaggingSecretsIndexesAsSender([
+        const [oldIndex] = await this.taggingDataProvider.getTaggingSecretsIndexesAsSender([
             appTaggingSecret
         ]);
         // This algorithm works such that:
@@ -326,7 +332,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
         }while (numConsecutiveEmptyLogs < MIN_CONSECUTIVE_EMPTY_LOGS)
         const contractName = await this.contractDataProvider.getDebugContractName(contractAddress);
         if (currentIndex !== oldIndex) {
-            await this.db.setTaggingSecretsIndexesAsSender([
+            await this.taggingDataProvider.setTaggingSecretsIndexesAsSender([
                 new IndexedTaggingSecret(appTaggingSecret, currentIndex)
             ]);
             this.log.debug(`Syncing logs for sender ${sender} at contract ${contractName}(${contractAddress})`, {
@@ -446,7 +452,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
             // 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.db.setTaggingSecretsIndexesAsRecipient(Object.entries(newLargestIndexMapToStore).map(([appTaggingSecret, index])=>new IndexedTaggingSecret(Fr.fromHexString(appTaggingSecret), index)));
+            await this.taggingDataProvider.setTaggingSecretsIndexesAsRecipient(Object.entries(newLargestIndexMapToStore).map(([appTaggingSecret, index])=>new IndexedTaggingSecret(Fr.fromHexString(appTaggingSecret), index)));
         }
         return logsMap;
     }
@@ -472,7 +478,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
             if (!excludedIndices.has(scopedLog.txHash.toString())) {
                 excludedIndices.set(scopedLog.txHash.toString(), new Set());
             }
-            const note = await getOrderedNoteItems(this.db, payload);
+            const note = await getOrderedNoteItems(this.contractDataProvider, payload);
             const plaintext = [
                 payload.storageSlot,
                 payload.noteTypeId.toField(),
@@ -509,17 +515,78 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
         }
         return;
     }
-    // Called when notes are delivered, usually as a result to a call to the process_log contract function
     async deliverNote(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient) {
-        const noteDao = await this.produceNoteDao(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient);
-        await this.db.addNotes([
+        // We are going to store the new note in the NoteDataProvider, which will let us later return it via `getNotes`.
+        // There's two things we need to check before we do this however:
+        //  - we must make sure the note does actually exist in the note hash tree
+        //  - we need to check if the note has already been nullified
+        //
+        // Failing to do either of the above would result in circuits getting either non-existent notes and failing to
+        // produce inclusion proofs for them, or getting nullified notes and producing duplicate nullifiers, both of which
+        // are catastrophic failure modes.
+        //
+        // Note that adding a note and removing it is *not* equivalent to never adding it in the first place. A nullifier
+        // emitted in a block that comes after note creation might result in the note being de-nullified by a chain reorg,
+        // so we must store both the note hash and nullifier block information.
+        // We avoid making node queries at 'latest' since we don't want to process notes or nullifiers that only exist ahead
+        // 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();
+        // TODO (#12559): handle undefined syncedBlockNumber
+        // if (syncedBlockNumber === undefined) {
+        //  throw new Error(`Attempted to deliver a note with an unsynchronized PXE - this should never happen`);
+        //}
+        // 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.
+        const uniqueNoteHash = await computeUniqueNoteHash(nonce, await siloNoteHash(contractAddress, noteHash));
+        const siloedNullifier = await siloNullifier(contractAddress, nullifier);
+        // We store notes by their index in the global note hash tree, which has the convenient side effect of validating
+        // note existence in said tree.
+        const [uniqueNoteHashTreeIndex] = await this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NOTE_HASH_TREE, [
+            uniqueNoteHash
+        ]);
+        if (uniqueNoteHashTreeIndex === undefined) {
+            throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present on the tree at block ${syncedBlockNumber} (from tx ${txHash})`);
+        }
+        // TODO (#12550): findLeavesIndexes should probably return an InBlock, same as findNullifiersIndexesWithBlock. This
+        // would save us from having to then query the tx receipt in order to get the block hash and number. Note regardless
+        // that we're not validating that the note was indeed created in this tx (which would require inspecting the tx
+        // effects), so maybe what we really want is an InTx.
+        const txReceipt = await this.aztecNode.getTxReceipt(new TxHash(txHash));
+        if (txReceipt === undefined) {
+            throw new Error(`Failed to fetch tx receipt for tx hash ${txHash} when searching for note hashes`);
+        }
+        // TODO(#12549): does it make sense to store the recipient's address point instead of just its address?
+        const recipientAddressPoint = await recipient.toAddressPoint();
+        const noteDao = new NoteDao(new Note(content), contractAddress, storageSlot, nonce, noteHash, siloedNullifier, new TxHash(txHash), txReceipt.blockNumber, txReceipt.blockHash.toString(), uniqueNoteHashTreeIndex, recipientAddressPoint, NoteSelector.empty());
+        await this.noteDataProvider.addNotes([
             noteDao
         ], recipient);
         this.log.verbose('Added note', {
             contract: noteDao.contractAddress,
             slot: noteDao.storageSlot,
-            nullifier: noteDao.siloedNullifier.toString
+            noteHash: noteDao.noteHash,
+            nullifier: noteDao.siloedNullifier.toString()
         });
+        const [nullifierIndex] = await this.aztecNode.findNullifiersIndexesWithBlock(syncedBlockNumber, [
+            siloedNullifier
+        ]);
+        if (nullifierIndex !== undefined) {
+            const { data: _, ...blockHashAndNum } = nullifierIndex;
+            await this.noteDataProvider.removeNullifiedNotes([
+                {
+                    data: siloedNullifier,
+                    ...blockHashAndNum
+                }
+            ], recipientAddressPoint);
+            this.log.verbose(`Removed just-added note`, {
+                contract: contractAddress,
+                slot: storageSlot,
+                noteHash: noteHash,
+                nullifier: siloedNullifier.toString()
+            });
+        }
     }
     async getLogByTag(tag) {
         const logs = await this.aztecNode.getLogsByTags([
@@ -555,7 +622,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
             contract: contractAddress
         });
         for (const recipient of (await this.keyStore.getAccounts())){
-            const currentNotesForRecipient = await this.db.getNotes({
+            const currentNotesForRecipient = await this.noteDataProvider.getNotes({
                 contractAddress,
                 owner: recipient
             });
@@ -571,7 +638,7 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
                     };
                 }
             }).filter((nullifier)=>nullifier !== undefined);
-            const nullifiedNotes = await this.db.removeNullifiedNotes(foundNullifiers, await recipient.toAddressPoint());
+            const nullifiedNotes = await this.noteDataProvider.removeNullifiedNotes(foundNullifiers, await recipient.toAddressPoint());
             nullifiedNotes.forEach((noteDao)=>{
                 this.log.verbose(`Removed note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`, {
                     contract: noteDao.contractAddress,
@@ -581,32 +648,8 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
             });
         }
     }
-    async produceNoteDao(contractAddress, storageSlot, nonce, content, noteHash, nullifier, txHash, recipient) {
-        // We need to validate that the note does indeed exist in the world state to avoid adding notes that are then
-        // impossible to prove.
-        const receipt = await this.aztecNode.getTxReceipt(new TxHash(txHash));
-        if (receipt === undefined) {
-            throw new Error(`Failed to fetch tx receipt for tx hash ${txHash} when searching for note hashes`);
-        }
-        // Siloed and unique hashes are computed by us instead of relying on values sent by the contract to make sure
-        // we're not e.g. storing notes that belong to some other contract, which would constitute a security breach.
-        const uniqueNoteHash = await computeUniqueNoteHash(nonce, await siloNoteHash(contractAddress, noteHash));
-        const siloedNullifier = await siloNullifier(contractAddress, nullifier);
-        // We store notes by their index in the global note hash tree, which has the convenient side effect of validating
-        // note existence in said tree. Note that while this is technically a historical query, we perform it at the latest
-        // locally synced block number which *should* be recent enough to be available. We avoid querying at 'latest' since
-        // we want to avoid accidentally processing notes that only exist ahead in time of the locally synced state.
-        const syncedBlockNumber = await this.db.getBlockNumber();
-        const uniqueNoteHashTreeIndex = (await this.aztecNode.findLeavesIndexes(syncedBlockNumber, MerkleTreeId.NOTE_HASH_TREE, [
-            uniqueNoteHash
-        ]))[0];
-        if (uniqueNoteHashTreeIndex === undefined) {
-            throw new Error(`Note hash ${noteHash} (uniqued as ${uniqueNoteHash}) is not present on the tree at block ${syncedBlockNumber} (from tx ${txHash})`);
-        }
-        return new NoteDao(new Note(content), contractAddress, storageSlot, nonce, noteHash, siloedNullifier, new TxHash(txHash), receipt.blockNumber, receipt.blockHash.toString(), uniqueNoteHashTreeIndex, await recipient.toAddressPoint(), NoteSelector.empty());
-    }
     async callProcessLog(contractAddress, logPlaintext, txHash, noteHashes, firstNullifier, recipient, simulator) {
-        const artifact = await new ContractDataProvider(this.db).getFunctionArtifactByName(contractAddress, 'process_log');
+        const artifact = await this.contractDataProvider.getFunctionArtifactByName(contractAddress, 'process_log');
         if (!artifact) {
             throw new Error(`Mandatory implementation of "process_log" missing in noir contract ${contractAddress.toString()}.`);
         }
@@ -629,16 +672,16 @@ import { WINDOW_HALF_SIZE, getIndexedTaggingSecretsForTheWindow, getInitialIndex
         await (simulator ?? new AcirSimulator(this, this.simulationProvider)).runUnconstrained(execRequest, contractAddress, selector, []);
     }
     storeCapsule(contractAddress, slot, capsule) {
-        return this.db.storeCapsule(contractAddress, slot, capsule);
+        return this.capsuleDataProvider.storeCapsule(contractAddress, slot, capsule);
     }
     loadCapsule(contractAddress, slot) {
-        return this.db.loadCapsule(contractAddress, slot);
+        return this.capsuleDataProvider.loadCapsule(contractAddress, slot);
     }
     deleteCapsule(contractAddress, slot) {
-        return this.db.deleteCapsule(contractAddress, slot);
+        return this.capsuleDataProvider.deleteCapsule(contractAddress, slot);
     }
     copyCapsule(contractAddress, srcSlot, dstSlot, numEntries) {
-        return this.db.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries);
+        return this.capsuleDataProvider.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries);
     }
 }
 function toBoundedVec(array, maxLength) {

package/dest/pxe_oracle_interface/tagging_utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagging_utils.d.ts","sourceRoot":"","sources":["../../src/pxe_oracle_interface/tagging_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAG1D,eAAO,MAAM,gBAAgB,KAAK,CAAC;AAEnC,wBAAgB,oCAAoC,CAClD,iBAAiB,EAAE;IAAE,gBAAgB,EAAE,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,EAAE,GAC3F,oBAAoB,EAAE,CAQxB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAQ3G"}

package/dest/pxe_service/error_enriching.d.ts

@@ -1,12 +1,11 @@
 import type { Logger } from '@aztec/foundation/log';
 import { type SimulationError } from '@aztec/stdlib/errors';
-import { ContractDataProvider } from '../contract_data_provider/index.js';
-import type { PxeDatabase } from '../database/interfaces/pxe_database.js';
+import type { ContractDataProvider } from '../storage/contract_data_provider/contract_data_provider.js';
 /**
  * Adds contract and function names to a simulation error, if they
  * can be found in the PXE database
  * @param err - The error to enrich.
  */
-export declare function enrichSimulationError(err: SimulationError, db: PxeDatabase, logger: Logger): Promise<void>;
-export declare function enrichPublicSimulationError(err: SimulationError, contractDataProvider: ContractDataProvider, db: PxeDatabase, logger: Logger): Promise<void>;
+export declare function enrichSimulationError(err: SimulationError, contractDataProvider: ContractDataProvider, logger: Logger): Promise<void>;
+export declare function enrichPublicSimulationError(err: SimulationError, contractDataProvider: ContractDataProvider, logger: Logger): Promise<void>;
 //# sourceMappingURL=error_enriching.d.ts.map

package/dest/pxe_service/error_enriching.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error_enriching.d.ts","sourceRoot":"","sources":["../../src/pxe_service/error_enriching.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,sBAAsB,CAAC;AAEvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAE1E;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,iBAwChG;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,eAAe,EACpB,oBAAoB,EAAE,oBAAoB,EAC1C,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,MAAM,iBAyCf"}
+{"version":3,"file":"error_enriching.d.ts","sourceRoot":"","sources":["../../src/pxe_service/error_enriching.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,sBAAsB,CAAC;AAEvF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6DAA6D,CAAC;AAExG;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,eAAe,EACpB,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,EAAE,MAAM,iBAyCf;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,eAAe,EACpB,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,EAAE,MAAM,iBAyCf"}

package/dest/pxe_service/error_enriching.js

@@ -8,7 +8,7 @@ import { isNoirCallStackUnresolved } from '@aztec/stdlib/errors';
  * Adds contract and function names to a simulation error, if they
  * can be found in the PXE database
  * @param err - The error to enrich.
- */ export async function enrichSimulationError(err, db, logger) {
+ */ export async function enrichSimulationError(err, contractDataProvider, 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.
@@ -23,7 +23,7 @@ import { isNoirCallStackUnresolved } from '@aztec/stdlib/errors';
         ...mentionedFunctions.entries()
     ].map(async ([contractAddress, fnNames])=>{
         const parsedContractAddress = AztecAddress.fromString(contractAddress);
-        const contract = await db.getContract(parsedContractAddress);
+        const contract = await contractDataProvider.getContract(parsedContractAddress);
         if (contract) {
             err.enrichWithContractName(parsedContractAddress, contract.name);
             for (const fnName of fnNames){
@@ -39,7 +39,7 @@ import { isNoirCallStackUnresolved } from '@aztec/stdlib/errors';
         }
     }));
 }
-export async function enrichPublicSimulationError(err, contractDataProvider, db, logger) {
+export async function enrichPublicSimulationError(err, contractDataProvider, logger) {
     const callStack = err.getCallStack();
     const originalFailingFunction = callStack[callStack.length - 1];
     // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8985): Properly fix this.
@@ -64,6 +64,6 @@ export async function enrichPublicSimulationError(err, contractDataProvider, db,
                 logger.warn(`Could not resolve noir call stack for ${originalFailingFunction.contractAddress.toString()}:${originalFailingFunction.functionName?.toString() ?? ''}: ${err}`);
             }
         }
-        await enrichSimulationError(err, db, logger);
+        await enrichSimulationError(err, contractDataProvider, logger);
     }
 }

package/dest/pxe_service/pxe_service.d.ts

@@ -2,46 +2,50 @@ import { L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/constants';
 import { Fr, type Point } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
 import type { SiblingPath } from '@aztec/foundation/trees';
-import type { KeyStore } from '@aztec/key-store';
-import type { L2TipsStore } from '@aztec/kv-store/stores';
+import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { type ProtocolContractsProvider } from '@aztec/protocol-contracts';
 import { type SimulationProvider } from '@aztec/simulator/client';
 import { type AbiDecoded, type ContractArtifact } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { InBlock, L2Block } from '@aztec/stdlib/block';
-import type { CompleteAddress, ContractClassWithId, ContractInstanceWithAddress, NodeInfo, PartialAddress } from '@aztec/stdlib/contract';
+import { CompleteAddress, type ContractClassWithId, type ContractInstanceWithAddress, type NodeInfo, type PartialAddress } from '@aztec/stdlib/contract';
 import type { GasFees } from '@aztec/stdlib/gas';
 import type { AztecNode, EventMetadataDefinition, GetContractClassLogsResponse, GetPublicLogsResponse, PXE, PXEInfo, PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
 import type { LogFilter } from '@aztec/stdlib/logs';
 import { type NotesFilter, UniqueNote } from '@aztec/stdlib/note';
 import { PrivateExecutionResult, type Tx, type TxEffect, type TxExecutionRequest, type TxHash, TxProvingResult, type TxReceipt, TxSimulationResult } from '@aztec/stdlib/tx';
 import type { PXEServiceConfig } from '../config/index.js';
-import type { PxeDatabase } from '../database/index.js';
 /**
  * A Private eXecution Environment (PXE) implementation.
  */
 export declare class PXEService implements PXE {
     #private;
-    private keyStore;
     private node;
-    private db;
-    private proofCreator;
-    private protocolContractsProvider;
     private synchronizer;
+    private keyStore;
     private contractDataProvider;
-    private pxeDataProvider;
+    private noteDataProvider;
+    private capsuleDataProvider;
+    private syncDataProvider;
+    private taggingDataProvider;
+    private addressDataProvider;
+    private authWitnessDataProvider;
     private simulator;
-    private log;
     private packageVersion;
     private proverEnabled;
-    constructor(keyStore: KeyStore, node: AztecNode, db: PxeDatabase, tipsStore: L2TipsStore, proofCreator: PrivateKernelProver, simulationProvider: SimulationProvider, protocolContractsProvider: ProtocolContractsProvider, config: PXEServiceConfig, loggerOrSuffix?: string | Logger);
+    private proofCreator;
+    private protocolContractsProvider;
+    private log;
+    private constructor();
     /**
-     * Starts the PXE Service by beginning the synchronization process between the Aztec node and the database.
+     * Creates an instance of a PXE Service by instantiating all the necessary data providers and services.
+     * Also triggers the registration of the protocol contracts and makes sure the provided node
+     * can be contacted.
      *
-     * @returns A promise that resolves when the server has started successfully.
+     * @returns A promise that resolves PXE service is ready to be used.
      */
-    init(): Promise<void>;
+    static create(node: AztecNode, store: AztecAsyncKVStore, proofCreator: PrivateKernelProver, simulationProvider: SimulationProvider, protocolContractsProvider: ProtocolContractsProvider, config: PXEServiceConfig, loggerOrSuffix?: string | Logger): Promise<PXEService>;
     isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
     /** Returns an estimate of the db size in bytes. */
     estimateDbSize(): Promise<number>;

package/dest/pxe_service/pxe_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}