@aztec/pxe 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/private_kernel/private_kernel_oracle.js

@@ -1,4 +1,110 @@
+import { PUBLIC_DATA_TREE_HEIGHT, UPDATES_VALUE_SIZE, VK_TREE_HEIGHT } from '@aztec/constants';
+import { MembershipWitness } from '@aztec/foundation/trees';
+import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { computeSaltedInitializationHash } from '@aztec/stdlib/contract';
+import { DelayedPublicMutableValues, DelayedPublicMutableValuesWithHash } from '@aztec/stdlib/delayed-public-mutable';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import { UpdatedClassIdHints } from '@aztec/stdlib/kernel';
+import { AnchoredContractData } from '../contract_function_simulator/anchored_contract_data.js';
 /**
  * Provides functionality needed by the private kernel for interacting with our state trees.
- * This is either PrivateKernelOracleImpl, or a mocked test implementation.
- */ export { };
+ */ export class PrivateKernelOracle {
+    contractStore;
+    keyStore;
+    node;
+    blockHeader;
+    anchoredContractData;
+    constructor(contractStore, contractClassService, keyStore, node, blockHeader){
+        this.contractStore = contractStore;
+        this.keyStore = keyStore;
+        this.node = node;
+        this.blockHeader = blockHeader;
+        // Kernels never use contract overrides (those are confined to simulations, which skip proving), so this view is
+        // built without them.
+        this.anchoredContractData = new AnchoredContractData(contractStore, contractClassService, blockHeader);
+    }
+    /** Retrieves the preimage of a contract address from the registered contract instances db. */ async getContractAddressPreimage(address) {
+        const instance = await this.anchoredContractData.getContractInstance(address);
+        if (!instance) {
+            throw new Error(`Contract instance not found when getting address preimage. Contract address: ${address}.`);
+        }
+        // Local instance existence was checked above, so resolution below cannot come back empty.
+        const currentContractClassId = await this.anchoredContractData.getCurrentClassId(address);
+        if (!currentContractClassId) {
+            throw new Error(`Could not resolve the current class id for registered contract ${address}.`);
+        }
+        return {
+            saltedInitializationHash: await computeSaltedInitializationHash(instance),
+            ...instance,
+            currentContractClassId
+        };
+    }
+    /** Retrieves the preimage of a contract class id from the contract classes db. */ async getContractClassIdPreimage(contractClassId) {
+        const contractClass = await this.contractStore.getContractClassWithPreimage(contractClassId);
+        if (!contractClass) {
+            throw new Error(`Contract class not found when getting class id preimage. Class id: ${contractClassId}.`);
+        }
+        return {
+            artifactHash: contractClass.artifactHash,
+            privateFunctionsRoot: contractClass.privateFunctionsRoot,
+            publicBytecodeCommitment: contractClass.publicBytecodeCommitment
+        };
+    }
+    /** Returns a membership witness with the sibling path and leaf index in our private functions tree. */ async getFunctionMembershipWitness(contractClassId, selector) {
+        const membershipWitness = await this.contractStore.getFunctionMembershipWitness(contractClassId, selector);
+        if (!membershipWitness) {
+            throw new Error(`Membership witness not found for contract class id ${contractClassId} and selector ${selector}.`);
+        }
+        return membershipWitness;
+    }
+    /**
+   * Returns a membership witness with the sibling path and leaf index in our protocol VK indexed merkle tree.
+   * Used to validate the previous kernel's verification key.
+   */ getVkMembershipWitness(vk) {
+        const leafIndex = getVKIndex(vk);
+        return Promise.resolve(new MembershipWitness(VK_TREE_HEIGHT, BigInt(leafIndex), getVKSiblingPath(leafIndex)));
+    }
+    /** Returns a membership witness with the sibling path and leaf index in our note hash tree. */ async getNoteHashMembershipWitness(noteHash) {
+        return this.node.getNoteHashMembershipWitness(await this.blockHeader.hash(), noteHash);
+    }
+    /** Returns a membership witness with the sibling path and leaf index in our nullifier indexed merkle tree. */ async getNullifierMembershipWitness(nullifier) {
+        return this.node.getNullifierMembershipWitness(await this.blockHeader.hash(), nullifier);
+    }
+    /** Returns the root of our note hash merkle tree. */ getNoteHashTreeRoot() {
+        return this.blockHeader.state.partial.noteHashTree.root;
+    }
+    /**
+   * Retrieves the sk_m corresponding to the pk_m hash.
+   * @throws If the provided hash is not associated with any of the registered accounts.
+   * @param masterPublicKeyHash - The master public key hash to get secret key for.
+   * @returns A Promise that resolves to sk_m.
+   * @dev Used when feeding the sk_m to the kernel circuit for keys verification.
+   */ getMasterSecretKey(masterPublicKeyHash) {
+        return this.keyStore.getMasterSecretKey(masterPublicKeyHash);
+    }
+    /** Use debug data to get the function name corresponding to a selector. */ async getDebugFunctionName(contractAddress, selector) {
+        const classId = await this.anchoredContractData.getCurrentClassId(contractAddress);
+        return classId ? this.contractStore.getDebugFunctionName(classId, selector) : undefined;
+    }
+    /**
+   * Returns a membership witness and leaf index to our public data indexed merkle tree,
+   * along with an associated DelayedPublicMutable containing the class ID to update.
+   */ async getUpdatedClassIdHints(contractAddress) {
+        const { delayedPublicMutableSlot, delayedPublicMutableHashSlot } = await DelayedPublicMutableValuesWithHash.getContractUpdateSlots(contractAddress);
+        const hashLeafSlot = await computePublicDataTreeLeafSlot(ProtocolContractAddress.ContractInstanceRegistry, delayedPublicMutableHashSlot);
+        const blockHash = await this.blockHeader.hash();
+        const updatedClassIdWitness = await this.node.getPublicDataWitness(blockHash, hashLeafSlot);
+        if (!updatedClassIdWitness) {
+            throw new Error(`No public data tree witness found for ${hashLeafSlot}`);
+        }
+        // In an indexed merkle tree, getPublicDataWitness returns a leaf whose slot matches our query
+        // only if the slot has been written to. Otherwise, it returns the "low leaf" predecessor, whose
+        // slot will differ. Most contracts are never updated, so we can skip the readFromTree call
+        // (which triggers multiple RPC calls) and return empty values directly.
+        const readStorage = (storageSlot)=>this.node.getPublicStorageAt(blockHash, ProtocolContractAddress.ContractInstanceRegistry, storageSlot);
+        const slotExists = updatedClassIdWitness.leafPreimage.leaf.slot.equals(hashLeafSlot);
+        const delayedPublicMutableValues = slotExists ? await DelayedPublicMutableValues.readFromTree(delayedPublicMutableSlot, readStorage) : DelayedPublicMutableValues.empty(UPDATES_VALUE_SIZE);
+        return new UpdatedClassIdHints(new MembershipWitness(PUBLIC_DATA_TREE_HEIGHT, updatedClassIdWitness.index, updatedClassIdWitness.siblingPath.toTuple()), updatedClassIdWitness.leafPreimage, delayedPublicMutableValues);
+    }
+}

package/dest/pxe.d.ts

@@ -1,26 +1,159 @@
-import { Fr } from '@aztec/foundation/fields';
+import type { PrivateEventFilter } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { Point } from '@aztec/foundation/curves/grumpkin';
 import { type Logger } from '@aztec/foundation/log';
+import type { AccountPrivacyKeys, AccountPrivacySecretKeys } from '@aztec/key-store';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { type ProtocolContractsProvider } from '@aztec/protocol-contracts';
 import type { CircuitSimulator } from '@aztec/simulator/client';
 import { type ContractArtifact, EventSelector, FunctionCall } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { L2BlockHash } from '@aztec/stdlib/block';
-import { CompleteAddress, type ContractClassWithId, type ContractInstanceWithAddress, type PartialAddress } from '@aztec/stdlib/contract';
-import type { AztecNode, PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
-import type { NotesFilter } from '@aztec/stdlib/note';
-import { NoteDao } from '@aztec/stdlib/note';
-import { SimulationOverrides, TxExecutionRequest, TxHash, TxProfileResult, TxProvingResult, TxSimulationResult, UtilitySimulationResult } from '@aztec/stdlib/tx';
+import { CompleteAddress, type ContractInstancePreimage, type ContractInstancePreimageWithAddress, type ContractInstanceWithAddress, type PartialAddress } from '@aztec/stdlib/contract';
+import type { AztecNode, AztecNodeDebug, PrivateKernelProver } from '@aztec/stdlib/interfaces/client';
+import { BlockHeader, type InTx, SimulationOverrides, TxExecutionRequest, TxProfileResult, TxProvingResult, TxSimulationResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
 import type { PXEConfig } from './config/index.js';
-export type PrivateEvent = {
+import { PXEDebugUtils } from './debug/pxe_debug_utils.js';
+import type { ExecutionHooks } from './hooks/index.js';
+export type PackedPrivateEvent = InTx & {
     packedEvent: Fr[];
-    blockNumber: number;
-    blockHash: L2BlockHash;
-    txHash: TxHash;
-    recipient: AztecAddress;
     eventSelector: EventSelector;
 };
+/** Options for PXE.proveTx. */
+export type ProveTxOpts = {
+    /** Addresses whose private state and keys are accessible during private execution. */
+    scopes: AztecAddress[];
+    /** Sender address used to derive discovery tags for private messages (notes, events, logs) this tx emits. */
+    senderForTags?: AztecAddress;
+};
+/** Options for PXE.profileTx. */
+export type ProfileTxOpts = {
+    /** The profiling mode to use. */
+    profileMode: 'full' | 'execution-steps' | 'gates';
+    /** If true, proof generation is skipped during profiling. Defaults to true. */
+    skipProofGeneration?: boolean;
+    /** Addresses whose private state and keys are accessible during private execution. */
+    scopes: AztecAddress[];
+    /** Sender address used to derive discovery tags for private messages (notes, events, logs) this tx emits. */
+    senderForTags?: AztecAddress;
+};
+/** Options for PXE.simulateTx. */
+export type SimulateTxOpts = {
+    /** Whether to simulate the public part of the transaction. */
+    simulatePublic: boolean;
+    /** If false, this function throws if the transaction is unable to be included in a block at the current state. */
+    skipTxValidation?: boolean;
+    /** If false, fees are enforced. */
+    skipFeeEnforcement?: boolean;
+    /** If true, kernel logic is emulated in TS for simulation */
+    skipKernels?: boolean;
+    /**
+     * Pre-simulation overrides applied to the ephemeral fork and contract DB. Bundles publicStorage
+     * writes (no skipKernels required) and per-address (instance, artifact?) overrides used by both
+     * AVM-side public dispatch and PXE-side ACIR private dispatch (requires skipKernels: true).
+     */
+    overrides?: SimulationOverrides;
+    /** Addresses whose private state and keys are accessible during private execution */
+    scopes: AztecAddress[];
+    /** Sender address used to derive discovery tags for private messages (notes, events, logs) this tx emits. */
+    senderForTags?: AztecAddress;
+};
+/** Options for PXE.executeUtility. */
+export type ExecuteUtilityOpts = {
+    /** The authentication witnesses required for the function call. */
+    authwits?: AuthWitness[];
+    /** The accounts whose notes we can access in this call */
+    scopes: AztecAddress[];
+};
+/**
+ * Supplies the set of "nice to have" contracts that every PXE preloads regardless of which wallet
+ * drives it. Today this is just the standard multi-call entrypoint: the SDK's self-paid account
+ * deploy flow ({@link DeployAccountMethod} with `from = NO_FROM`) routes its payload through it, so a
+ * PXE that did not register it would fail contract sync with an opaque "no contract instance" error.
+ *
+ * Returning a list keeps this extensible: a wallet may supply its own provider that preloads
+ * additional contracts. Injected the same way as {@link ProtocolContractsProvider} so the PXE never
+ * statically imports the bundled artifacts, keeping the bundle/lazy split intact.
+ */
+export type PreloadedContractsProvider = {
+    /** Returns the contract instances and artifacts the PXE should preload on startup. */
+    getPreloadedContracts: () => Promise<Array<{
+        instance: ContractInstanceWithAddress;
+        artifact: ContractArtifact;
+    }>>;
+};
+/** Args for PXE.create. */
+export type PXECreateArgs = {
+    /** The Aztec node to connect to. */
+    node: AztecNode;
+    /**
+     * Optional debug API client. When provided, public function signatures are registered with the node so that
+     * node-side public-execution stack traces can be named. Skipped when the node does not expose the debug API.
+     */
+    nodeDebug?: AztecNodeDebug;
+    /** The key-value store for persisting PXE state. */
+    store: AztecAsyncKVStore;
+    /** The prover for generating private kernel proofs. */
+    proofCreator: PrivateKernelProver;
+    /** The circuit simulator for executing ACIR circuits. */
+    simulator: CircuitSimulator;
+    /** Provider for protocol contract artifacts and instances. */
+    protocolContractsProvider: ProtocolContractsProvider;
+    /**
+     * Contracts to preload on startup. Injected by the entrypoint with the bundle-or-lazy flavor that
+     * matches the runtime (bundle for node/eager browser, lazy for code-split browser), so the PXE
+     * never statically imports a standard-contract artifact and the bundle/lazy split stays intact.
+     */
+    preloadedContractsProvider: PreloadedContractsProvider;
+    /** PXE configuration options. */
+    config: PXEConfig;
+    /** Optional logger instance or string suffix for the logger name. */
+    loggerOrSuffix?: string | Logger;
+    /** Optional hooks to observe and influence contract execution. */
+    hooks?: ExecutionHooks;
+};
+/** A source from which PXE derives the tagging secrets it scans for to discover incoming private logs. */
+export type TaggingSecretSource = 
+/**
+ * Derives a shared secret via ECDH from an external `sender` address against every account registered in this PXE
+ * (present and future), so registering one sender applies it to all of them. The address is not secret, so unlike
+ * `arbitrary-secret` it can be reused freely across recipients.
+ */
+{
+    kind: 'address-derived';
+    sender: AztecAddress;
+}
+/**
+ * A shared secret point provided directly, scoped to a single recipient. It bypasses ECDH, so it must not be
+ * reused across recipients (each would then be able to find the others' tags).
+ */
+ | {
+    kind: 'arbitrary-secret';
+    recipient: AztecAddress;
+    secret: Point;
+}
+/**
+ * A handshake known by the x-coordinate of its ephemeral public key (the value a recipient learns while authorizing
+ * an interactive handshake, which emits no discoverable announcement). The ephemeral key's y-coordinate is always
+ * positive by protocol construction, so the x-coordinate alone identifies it.
+ */
+ | {
+    kind: 'handshake';
+    recipient: AztecAddress;
+    ephPk: Fr;
+};
+/**
+ * The registered form of a {@link TaggingSecretSource}.
+ */
+export type RegisteredTaggingSecretSource = Exclude<TaggingSecretSource, {
+    kind: 'handshake';
+}>
+/** A handshake's resolved shared secret, derived at registration from the handshake's ephemeral key. */
+ | {
+    kind: 'handshake';
+    recipient: AztecAddress;
+    secret: Point;
+};
 /**
  * Private eXecution Environment (PXE) is a library used by wallets to simulate private phase of transactions and to
  * manage private state of users.
@@ -28,21 +161,35 @@ export type PrivateEvent = {
 export declare class PXE {
     #private;
     private node;
-    private synchronizer;
+    private nodeDebug;
+    private db;
+    private blockStateSynchronizer;
     private keyStore;
-    private contractDataProvider;
-    private noteDataProvider;
-    private capsuleDataProvider;
-    private syncDataProvider;
-    private taggingDataProvider;
-    private addressDataProvider;
-    private privateEventDataProvider;
+    private contractStore;
+    private noteStore;
+    private capsuleStore;
+    private factStore;
+    private anchorBlockStore;
+    private senderTaggingStore;
+    private taggingSecretSourcesStore;
+    private recipientTaggingStore;
+    private addressStore;
+    private privateEventStore;
+    private contractSyncService;
+    private contractClassService;
+    private txResolver;
+    private l2TipsStore;
     private simulator;
     private proverEnabled;
+    private autoSync;
     private proofCreator;
     private protocolContractsProvider;
+    private preloadedContractsProvider;
     private log;
     private jobQueue;
+    private jobCoordinator;
+    debug: PXEDebugUtils;
+    private hooks;
     private constructor();
     /**
      * Creates an instance of a PXE by instantiating all the necessary data providers and services.
@@ -51,73 +198,84 @@ export declare class PXE {
      *
      * @returns A promise that resolves PXE is ready to be used.
      */
-    static create(node: AztecNode, store: AztecAsyncKVStore, proofCreator: PrivateKernelProver, simulator: CircuitSimulator, protocolContractsProvider: ProtocolContractsProvider, config: PXEConfig, loggerOrSuffix?: string | Logger): Promise<PXE>;
-    getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
-    /**
-     * Returns the contract class metadata given a contract class id.
-     * The metadata consists of its contract class, whether it has been publicly registered, and its artifact.
-     * @remark - it queries the node to check whether the contract class with the given id has been publicly registered.
-     * @param id - Identifier of the class.
-     * @param includeArtifact - Identifier of the class.
-     * @returns - It returns the contract class metadata, with the artifact field being optional, and will only be returned if true is passed in
-     * for `includeArtifact`
-     * TODO(@spalladino): The PXE actually holds artifacts and not classes, what should we return? Also,
-     * should the pxe query the node for contract public info, and merge it with its own definitions?
-     * TODO(@spalladino): This method is strictly needed to decide whether to publicly register a class or not
-     * during a public deployment. We probably want a nicer and more general API for this, but it'll have to
-     * do for the time being.
-     */
-    getContractClassMetadata(id: Fr, includeArtifact?: boolean): Promise<{
-        contractClass: ContractClassWithId | undefined;
-        isContractClassPubliclyRegistered: boolean;
-        artifact: ContractArtifact | undefined;
-    }>;
-    /**
-     * Returns the contract metadata given an address.
-     * The metadata consists of its contract instance, which includes the contract class identifier,
-     * initialization hash, deployment salt, and public keys hash; whether the contract instance has been initialized;
-     * and whether the contract instance with the given address has been publicly deployed.
-     * @remark - it queries the node to check whether the contract instance has been initialized / publicly deployed through a node.
-     * This query is not dependent on the PXE.
-     * @param address - The address that the contract instance resides at.
-     * @returns - It returns the contract metadata
-     * TODO(@spalladino): Should we return the public keys in plain as well here?
-     */
-    getContractMetadata(address: AztecAddress): Promise<{
-        contractInstance: ContractInstanceWithAddress | undefined;
-        isContractInitialized: boolean;
-        isContractPublished: boolean;
-    }>;
-    /**
-     * Registers a user account in PXE given its master encryption private key.
-     * Once a new account is registered, the PXE will trial-decrypt all published notes on
-     * the chain and store those that correspond to the registered account. Will do nothing if the
-     * account is already registered.
-     *
-     * @param secretKey - Secret key of the corresponding user master public key.
+    static create({ node, nodeDebug, store, proofCreator, simulator, protocolContractsProvider, preloadedContractsProvider, config, loggerOrSuffix, hooks }: PXECreateArgs): Promise<PXE>;
+    /**
+     * Triggers a sync of PXE state with the node, regardless of the `autoSync` config flag. Use this to
+     * batch syncs across composite flows when `autoSync` is disabled (e.g. one sync per simulate+send
+     * instead of one per inner PXE call). Serialized through the job queue.
+     */
+    sync(): Promise<void>;
+    /**
+     * Returns the block header up to which the PXE has synced.
+     * @returns The synced block header
+     */
+    getSyncedBlockHeader(): Promise<BlockHeader>;
+    /**
+     * Returns the address preimage of the contract instance at a given address, if it's registered in the PXE.
+     * @param address - The contract address.
+     * @returns The contract instance address preimage if found, undefined otherwise.
+     */
+    getContractInstance(address: AztecAddress): Promise<ContractInstancePreimageWithAddress | undefined>;
+    /**
+     * Returns the contract artifact for a given contract class id, if it's registered in the PXE.
+     * @param id - Identifier of the contract class.
+     * @returns The contract artifact if found, undefined otherwise.
+     */
+    getContractArtifact(id: Fr): Promise<ContractArtifact | undefined>;
+    /**
+     * Registers a user account in PXE.
+     *
+     * PXE holds the account's four privacy secret keys but only the *public* message-signing and fallback keys: their
+     * secret keys are withheld, since PXE is not trusted to hold them.
+     *
+     * Does nothing if the account is already registered.
+     *
+     * The four privacy secret keys can be retrieved later with {@link getAccountSecretKeys}.
+     *
+     * @param keys - The account's privacy keys: four secret keys plus the message-signing and fallback public keys.
      * @param partialAddress - The partial address of the account contract corresponding to the account being registered.
      * @returns The complete address of the account.
      */
-    registerAccount(secretKey: Fr, partialAddress: PartialAddress): Promise<CompleteAddress>;
+    registerAccount(keys: AccountPrivacyKeys, partialAddress: PartialAddress): Promise<CompleteAddress>;
     /**
-     * Registers a user contact in PXE.
+     * Retrieves the four privacy secret keys PXE holds for a registered account (nullifier-hiding, incoming-viewing,
+     * outgoing-viewing, tagging).
+     *
+     * These do NOT grant control over an account's assets, e.g. they are insufficient to impersonate the account or to
+     * spend notes, but they _do_ guard the account's privacy. Parties that have knowledge of these keys can decrypt all
+     * messages sent to the account, discover all of their on-chain activity, including notes, events, etc.
      *
-     * Once a new contact is registered, the PXE will be able to receive notes tagged from this contact.
-     * Will do nothing if the account is already registered.
+     * Security is paramount when handling these keys, which should itself be a very rare occurrence. Other than exporting
+     * and then importing an account into a separate PXE/wallet, there is typically no need for a wallet to ever access
+     * these keys. Applications should NEVER be given access to them.
      *
-     * @param address - Address of the user to add to the address book
-     * @returns The address address of the account.
+     * @throws If the account is not registered.
      */
-    registerSender(address: AztecAddress): Promise<AztecAddress>;
+    getAccountSecretKeys(account: AztecAddress): Promise<AccountPrivacySecretKeys>;
     /**
-     * Retrieves the addresses stored as senders on this PXE.
-     * @returns An array of the senders on this PXE.
+     * Registers a source from which this PXE derives the tagging secrets it scans for to discover incoming private logs.
+     * See {@link TaggingSecretSource} for the meaning of each variant. Does nothing if the source is already registered.
+     *
+     * After a new source is added we clear the cache tracking which contracts have finished syncing, so every contract
+     * re-syncs against the new source's logs (whose notes/events could belong to any contract). Already-discovered
+     * notes/events are not discarded.
      */
-    getSenders(): Promise<AztecAddress[]>;
+    registerTaggingSecretSource(source: TaggingSecretSource): Promise<void>;
     /**
-     * Removes a sender in the address book.
+     * Removes a previously registered tagging secret source, identified by its registered form (see
+     * {@link getTaggingSecretSources}). Does nothing if it was not registered.
      */
-    removeSender(address: AztecAddress): Promise<void>;
+    removeTaggingSecretSource(source: RegisteredTaggingSecretSource): Promise<void>;
+    /**
+     * Retrieves the tagging secret sources registered in this PXE, in their registered form. Without a filter it
+     * returns every source; pass `{ kind }` to narrow to a single variant. See {@link RegisteredTaggingSecretSource}.
+     */
+    getTaggingSecretSources<K extends RegisteredTaggingSecretSource['kind']>(filter: {
+        kind: K;
+    }): Promise<Extract<RegisteredTaggingSecretSource, {
+        kind: K;
+    }>[]>;
+    getTaggingSecretSources(): Promise<RegisteredTaggingSecretSource[]>;
     /**
      * Retrieves the user accounts registered on this PXE.
      * @returns An array of the accounts registered on this PXE.
@@ -130,64 +288,38 @@ export declare class PXE {
      */
     registerContractClass(artifact: ContractArtifact): Promise<void>;
     /**
-     * Adds deployed contracts to the PXE. Deployed contract information is used to access the
-     * contract code when simulating local transactions. This is automatically called by aztec.js when
-     * deploying a contract. Dapps that wish to interact with contracts already deployed should register
-     * these contracts in their users' PXE through this method.
+     * Registers a deployed contract instance so its private state can be synced and its functions simulated. The
+     * artifact for the class the instance runs must be registered separately via {@link registerContractClass}, before
+     * or after this call; registration performs no validation, so a missing or mismatched artifact only surfaces when
+     * the contract is later simulated. This is automatically called by aztec.js when deploying a contract.
      *
-     * @param contract - A contract instance to register, with an optional artifact which can be omitted if the contract class has already been registered.
-     */
-    registerContract(contract: {
-        instance: ContractInstanceWithAddress;
-        artifact?: ContractArtifact;
-    }): Promise<void>;
-    /**
-     * Updates a deployed contract in the PXE. This is used to update the contract artifact when
-     * an update has happened, so the new code can be used in the simulation of local transactions.
-     * This is called by aztec.js when instantiating a contract in a given address with a mismatching artifact.
-     * @param contractAddress - The address of the contract to update.
-     * @param artifact - The updated artifact for the contract.
-     * @throws If the artifact's contract class is not found in the PXE or if the contract class is different from
-     * the current one (current one from the point of view of the node to which the PXE is connected).
+     * @param instance - The address preimage of the contract instance to register. The address is derived from it.
+     * @returns The address of the registered instance.
      */
-    updateContract(contractAddress: AztecAddress, artifact: ContractArtifact): Promise<void>;
+    registerContract(instance: ContractInstancePreimage): Promise<AztecAddress>;
     /**
      * Retrieves the addresses of contracts added to this PXE.
      * @returns An array of contracts addresses registered on this PXE.
      */
     getContracts(): Promise<AztecAddress[]>;
-    /**
-     * A debugging utility to get notes based on the provided filter.
-     *
-     * Note that this should not be used in production code because the structure of notes is considered to be
-     * an implementation detail of contracts. This is only meant to be used for debugging purposes. If you need to obtain
-     * note-related information in production code, please implement a custom utility function on your contract and call
-     * that function instead (e.g. `get_balance(owner: AztecAddress) -> u128` utility function on a Token contract).
-     *
-     * @param filter - The filter to apply to the notes.
-     * @returns The requested notes.
-     */
-    getNotes(filter: NotesFilter): Promise<NoteDao[]>;
     /**
      * Proves the private portion of a simulated transaction, ready to send to the network
      * (where validators prove the public portion).
      *
      * @param txRequest - An authenticated tx request ready for proving
+     * @param scopes - Addresses whose private state and keys are accessible during private execution.
      * @returns A result containing the proof and public inputs of the tail circuit.
      * @throws If contract code not found, or public simulation reverts.
      * Also throws if simulatePublic is true and public simulation reverts.
      */
-    proveTx(txRequest: TxExecutionRequest): Promise<TxProvingResult>;
+    proveTx(txRequest: TxExecutionRequest, { scopes, senderForTags }: ProveTxOpts): Promise<TxProvingResult>;
     /**
      * Profiles a transaction, reporting gate counts (unless disabled) and returns an execution trace.
-     *
-     * @param txRequest - An authenticated tx request ready for simulation
-     * @param msgSender - (Optional) The message sender to use for the simulation.
-     * @param skipTxValidation - (Optional) If false, this function throws if the transaction is unable to be included in a block at the current state.
+     * @param txRequest - An authenticated tx request ready for simulation.
      * @returns A trace of the program execution with gate counts.
      * @throws If the code for the functions executed in this transaction have not been made available via `addContracts`.
      */
-    profileTx(txRequest: TxExecutionRequest, profileMode: 'full' | 'execution-steps' | 'gates', skipProofGeneration?: boolean): Promise<TxProfileResult>;
+    profileTx(txRequest: TxExecutionRequest, { profileMode, skipProofGeneration, scopes, senderForTags }: ProfileTxOpts): Promise<TxProfileResult>;
     /**
      * Simulates a transaction based on the provided preauthenticated execution request.
      * This will run a local simulation of private execution (and optionally of public as well), run the
@@ -199,42 +331,36 @@ export declare class PXE {
      * In that case, the transaction returned is only potentially ready to be sent to the network for execution.
      *
      *
-     * @param txRequest - An authenticated tx request ready for simulation
-     * @param simulatePublic - Whether to simulate the public part of the transaction.
-     * @param skipTxValidation - (Optional) If false, this function throws if the transaction is unable to be included in a block at the current state.
-     * @param skipFeeEnforcement - (Optional) If false, fees are enforced.
-     * @param overrides - (Optional) State overrides for the simulation, such as msgSender, contract instances and artifacts.
-     * @param scopes - (Optional) The accounts whose notes we can access in this call. Currently optional and will default to all.
+     * @param txRequest - An authenticated tx request ready for simulation.
      * @returns A simulated transaction result object that includes public and private return values.
      * @throws If the code for the functions executed in this transaction have not been made available via `addContracts`.
      * Also throws if simulatePublic is true and public simulation reverts.
      *
      * TODO(#7456) Prevent msgSender being defined here for the first call
      */
-    simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean, skipTxValidation?: boolean, skipFeeEnforcement?: boolean, overrides?: SimulationOverrides, scopes?: AztecAddress[]): Promise<TxSimulationResult>;
+    simulateTx(txRequest: TxExecutionRequest, { simulatePublic, skipTxValidation, skipFeeEnforcement, skipKernels, overrides, scopes, senderForTags }: SimulateTxOpts): Promise<TxSimulationResult>;
     /**
-     * Simulate the execution of a contract utility function.
-     *
+     * Executes a contract utility function.
      * @param call - The function call containing the function details, arguments, and target contract address.
-     * @param authwits - (Optional) The authentication witnesses required for the function call.
-     * @param scopes - (Optional) The accounts whose notes we can access in this call. Currently optional and will
-     * default to all.
-     * @returns The result of the utility function call, structured based on the function ABI.
      */
-    simulateUtility(call: FunctionCall, authwits?: AuthWitness[], scopes?: AztecAddress[]): Promise<UtilitySimulationResult>;
+    executeUtility(call: FunctionCall, { authwits, scopes }?: ExecuteUtilityOpts): Promise<UtilityExecutionResult>;
     /**
      * Returns the private events given search parameters.
-     * @param contractAddress - The address of the contract to get events from.
      * @param eventSelector - Event selector to search for.
-     * @param from - The block number to search from.
-     * @param numBlocks - The amount of blocks to search.
-     * @param recipients - The addresses that decrypted the logs.
+     * @param filter
+     *  contractAddress - The address of the contract to get events from. Required.
+     *  scopes - One or more event scope addresses to filter by. Required.
+     *  fromBlock - The block number to search from (inclusive). Optional. If provided, it must be >= 0.
+     *    Defaults to 0.
+     *    If toBlock is defined but fromBlock is not, fromBlock defaults to toBlock - 1.
+     *  toBlock - The block number to search up to (exclusive). Optional. If provided, it must be > 0.
+     *    Defaults to the latest known block to PXE + 1.
      * @returns - The packed events with block and tx metadata.
      */
-    getPrivateEvents(contractAddress: AztecAddress, eventSelector: EventSelector, from: number, numBlocks: number, recipients: AztecAddress[]): Promise<PrivateEvent[]>;
+    getPrivateEvents(eventSelector: EventSelector, filter: PrivateEventFilter): Promise<PackedPrivateEvent[]>;
     /**
-     * Stops the PXE's job queue.
+     * Stops the PXE's job queue and closes the backing store.
      */
     stop(): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHhlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcHhlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFJbEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsS0FBSyx5QkFBeUIsRUFBeUIsTUFBTSwyQkFBMkIsQ0FBQztBQUNsRyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2hFLE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUNyQixhQUFhLEVBQ2IsWUFBWSxFQUtiLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdkQsT0FBTyxFQUNMLGVBQWUsRUFDZixLQUFLLG1CQUFtQixFQUN4QixLQUFLLDJCQUEyQixFQUNoQyxLQUFLLGNBQWMsRUFHcEIsTUFBTSx3QkFBd0IsQ0FBQztBQUdoQyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQU10RixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN0RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0MsT0FBTyxFQU1MLG1CQUFtQixFQUduQixrQkFBa0IsRUFDbEIsTUFBTSxFQUNOLGVBQWUsRUFDZixlQUFlLEVBQ2Ysa0JBQWtCLEVBQ2xCLHVCQUF1QixFQUN4QixN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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe.d.ts","sourceRoot":"","sources":["../src/pxe.ts"],"names":[],"mappings":"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"}