@aztec/wallets 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df

package/dest/embedded/embedded_wallet.js

@@ -1,21 +1,48 @@
-import { SignerlessAccount } from '@aztec/aztec.js/account';
-import { AccountManager } from '@aztec/aztec.js/wallet';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
+import { ContractFunctionInteraction, NO_WAIT } from '@aztec/aztec.js/contracts';
+import { AccountManager, TxSimulationResultWithAppOffset } from '@aztec/aztec.js/wallet';
+import { DefaultEntrypoint } from '@aztec/entrypoints/default';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
 import { Fq, Fr } from '@aztec/foundation/curves/bn254';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
-import { BaseWallet } from '@aztec/wallet-sdk/base-wallet';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { GasSettings } from '@aztec/stdlib/gas';
+import { SimulationOverrides, TxStatus, collectOffchainEffects, mergeExecutionPayloads } from '@aztec/stdlib/tx';
+import { BaseWallet, getGasLimits } from '@aztec/wallet-sdk/base-wallet';
+/** Splits a unified EmbeddedWalletPXEOptions into PXEConfig overrides and PXECreationOptions. */ export function splitPxeOptions(pxe) {
+    if (!pxe) {
+        return {
+            config: {},
+            creation: {}
+        };
+    }
+    const { loggers, loggerActorLabel, proverOrOptions, store, simulator, hooks, preloadedContractsProvider, ...config } = pxe;
+    return {
+        config,
+        creation: {
+            loggers,
+            loggerActorLabel,
+            proverOrOptions,
+            store,
+            simulator,
+            hooks,
+            preloadedContractsProvider
+        }
+    };
+}
+const DEFAULT_ESTIMATED_GAS_PADDING = 0.1;
 export class EmbeddedWallet extends BaseWallet {
     walletDB;
     accountContracts;
+    estimatedGasPadding;
+    // Stub class ids, populated on wallet startup
+    // to avoid redundant work per simulation
+    stubClassIds;
     constructor(pxe, aztecNode, walletDB, accountContracts, log){
-        super(pxe, aztecNode, log), this.walletDB = walletDB, this.accountContracts = accountContracts;
+        super(pxe, aztecNode, log), this.walletDB = walletDB, this.accountContracts = accountContracts, this.estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING, this.stubClassIds = new Map();
     }
     async getAccountFromAddress(address) {
-        if (address.equals(AztecAddress.ZERO)) {
-            return new SignerlessAccount();
-        }
         const { secretKey, salt, signingKey, type } = await this.walletDB.retrieveAccount(address);
         const accountManager = await this.createAccountInternal(type, secretKey, salt, signingKey);
         const account = await accountManager.getAccount();
@@ -29,80 +56,232 @@ export class EmbeddedWallet extends BaseWallet {
     }
     async registerSender(address, alias) {
         await this.walletDB.storeSender(address, alias);
-        return this.pxe.registerSender(address);
+        await this.pxe.registerTaggingSecretSource({
+            kind: 'address-derived',
+            sender: address
+        });
+        return address;
     }
     async getAddressBook() {
-        const senders = await this.pxe.getSenders();
+        const sources = await this.pxe.getTaggingSecretSources({
+            kind: 'address-derived'
+        });
+        const senders = sources.map((source)=>source.sender);
         const storedSenders = await this.walletDB.listSenders();
         for (const storedSender of storedSenders){
             if (senders.findIndex((sender)=>sender.equals(storedSender.item)) === -1) {
-                await this.pxe.registerSender(storedSender.item);
+                await this.pxe.registerTaggingSecretSource({
+                    kind: 'address-derived',
+                    sender: storedSender.item
+                });
             }
         }
         return storedSenders;
     }
     /**
+   * Overrides the base sendTx to add a pre-simulation step before the actual send. The simulation
+   * estimates actual gas usage and captures call authorization requests to generate
+   * the necessary authwitnesses.
+   */ async sendTx(executionPayload, opts) {
+        // PXE has autoSync disabled by the embedded wallet entrypoints, so we sync once here to cover
+        // both the inner simulateTx (via simulateViaEntrypoint) and the proveTx that super.sendTx
+        await this.pxe.sync();
+        const feeOptions = await this.completeFeeOptions({
+            from: opts.from,
+            feePayer: executionPayload.feePayer,
+            gasSettings: opts.fee?.gasSettings,
+            forEstimation: true
+        });
+        // Simulate the transaction first to estimate gas and capture required
+        // private authwitnesses based on offchain effects.
+        const simulationResult = await this.simulateViaEntrypoint(executionPayload, {
+            from: opts.from,
+            feeOptions,
+            additionalScopes: opts.additionalScopes,
+            skipTxValidation: true,
+            sendMessagesAs: opts.sendMessagesAs
+        });
+        const offchainEffects = collectOffchainEffects(simulationResult.privateExecutionResult);
+        const authWitnesses = await Promise.all(offchainEffects.map(async (effect)=>{
+            try {
+                const authRequest = await CallAuthorizationRequest.fromFields(effect.data);
+                return this.createAuthWit(authRequest.onBehalfOf, {
+                    consumer: effect.contractAddress,
+                    innerHash: authRequest.innerHash
+                });
+            } catch  {
+                return undefined;
+            }
+        }));
+        for (const authwit of authWitnesses){
+            if (authwit) {
+                executionPayload.authWitnesses.push(authwit);
+            }
+        }
+        const maxTxGasLimits = await this.getMaxTxGasLimits();
+        const estimated = getGasLimits(simulationResult.gasUsed, maxTxGasLimits, this.estimatedGasPadding);
+        this.log.verbose(`Estimated gas limits for tx: DA=${estimated.gasLimits.daGas} L2=${estimated.gasLimits.l2Gas} teardownDA=${estimated.teardownGasLimits.daGas} teardownL2=${estimated.teardownGasLimits.l2Gas}`);
+        const gasSettings = GasSettings.from({
+            ...opts.fee?.gasSettings,
+            maxFeesPerGas: feeOptions.gasSettings.maxFeesPerGas,
+            maxPriorityFeesPerGas: feeOptions.gasSettings.maxPriorityFeesPerGas,
+            gasLimits: opts.fee?.gasSettings?.gasLimits ?? estimated.gasLimits,
+            teardownGasLimits: opts.fee?.gasSettings?.teardownGasLimits ?? estimated.teardownGasLimits
+        });
+        let wait = opts.wait;
+        if (wait !== NO_WAIT) {
+            const callerWaitOpts = typeof wait === 'object' ? wait : {};
+            wait = {
+                ...callerWaitOpts,
+                // Default to PROPOSED so the wait returns as soon as the tx lands in a proposed L2 block,
+                // rather than waiting until the end of the slot for the checkpoint to be published to L1.
+                // This is what makes MBPS (Multiple Blocks Per Slot) actually improve UX: with CHECKPOINTED
+                // we'd block until L1 inclusion regardless of how early in the slot the tx was sequenced.
+                // The tradeoff is a weaker guarantee — a proposed block only becomes canonical once it (or
+                // a later block in the same slot) is checkpointed, so a tx could be re-orged out if the
+                // proposer fails to publish to L1 (which should be rare, since they'd get slashed for it).
+                waitForStatus: callerWaitOpts.waitForStatus ?? TxStatus.PROPOSED
+            };
+        }
+        return super.sendTx(executionPayload, {
+            ...opts,
+            wait: wait,
+            fee: {
+                ...opts.fee,
+                gasSettings
+            }
+        });
+    }
+    /**
+   * Overrides the base simulateTx to drive PXE syncing explicitly. The PXE created by the embedded
+   * wallet has autoSync disabled (so we can share one sync across simulate+send in sendTx); for
+   * standalone simulations we still need a fresh anchor block, which we provide here.
+   */ async simulateTx(executionPayload, opts) {
+        await this.pxe.sync();
+        return super.simulateTx(executionPayload, opts);
+    }
+    async profileTx(executionPayload, opts) {
+        await this.pxe.sync();
+        return super.profileTx(executionPayload, opts);
+    }
+    async executeUtility(call, opts) {
+        await this.pxe.sync();
+        return super.executeUtility(call, opts);
+    }
+    async getPrivateEvents(eventDef, eventFilter) {
+        await this.pxe.sync();
+        return super.getPrivateEvents(eventDef, eventFilter);
+    }
+    /**
+   * Hashes and registers the stub class for every supported account type with PXE, populating
+   * stubClassIds. Called on wallet initialization.
+   */ async initStubClasses() {
+        const schnorrArtifact = await this.accountContracts.getStubAccountContractArtifact('schnorr');
+        const { id: schnorrClassId } = await getContractClassFromArtifact(schnorrArtifact);
+        await this.pxe.registerContractClass(schnorrArtifact);
+        // ecdsa stubs share the same class id
+        const ecdsaArtifact = await this.accountContracts.getStubAccountContractArtifact('ecdsasecp256r1');
+        const { id: ecdsaClassId } = await getContractClassFromArtifact(ecdsaArtifact);
+        await this.pxe.registerContractClass(ecdsaArtifact);
+        this.stubClassIds.set('schnorr', schnorrClassId);
+        this.stubClassIds.set('schnorr_initializerless', schnorrClassId);
+        this.stubClassIds.set('ecdsasecp256k1', ecdsaClassId);
+        this.stubClassIds.set('ecdsasecp256r1', ecdsaClassId);
+    }
+    /**
+   * Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
+   * Uses a type-specific stub artifact so that the stub's constructor selector matches the real account's constructor.
+   */ async buildAccountOverrides(addresses) {
+        const accounts = await this.getAccounts();
+        const contracts = {};
+        const filtered = accounts.filter((acc)=>addresses.some((addr)=>addr.equals(acc.item)));
+        for (const account of filtered){
+            const address = account.item;
+            const { type } = await this.walletDB.retrieveAccount(address);
+            const stubClassId = this.stubClassIds.get(type);
+            if (!stubClassId) {
+                throw new Error(`Stub class for account type '${type}' was not registered at wallet init. This is a bug — initStubClasses should cover every supported AccountType.`);
+            }
+            const originalAccount = await this.getAccountFromAddress(address);
+            const completeAddress = originalAccount.getCompleteAddress();
+            const contractInstance = await this.pxe.getContractInstance(completeAddress.address);
+            if (!contractInstance) {
+                throw new Error(`No contract instance found for address: ${completeAddress.address} during account override building. This is a bug!`);
+            }
+            contracts[address.toString()] = {
+                instance: {
+                    ...contractInstance,
+                    currentContractClassId: stubClassId
+                }
+            };
+        }
+        return contracts;
+    }
+    /**
    * Simulates calls via a stub account entrypoint, bypassing real account authorization.
    * This allows kernelless simulation with contract overrides, skipping expensive
    * private kernel circuit execution.
-   */ async simulateViaEntrypoint(executionPayload, from, feeOptions, _skipTxValidation, _skipFeeEnforcement, scopes) {
-        const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
+   */ async simulateViaEntrypoint(executionPayload, opts) {
+        const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
+        const scopes = this.scopesFrom(from, additionalScopes ?? [], sendMessagesAs);
         const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
-        const executionOptions = {
-            txNonce: Fr.random(),
-            cancellable: this.cancellableTransactions,
-            feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
-        };
         const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
             feeExecutionPayload,
             executionPayload
         ]) : executionPayload;
         const chainInfo = await this.getChainInfo();
-        const txRequest = await fromAccount.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
-        return this.pxe.simulateTx(txRequest, {
-            simulatePublic: true,
-            skipFeeEnforcement: true,
-            skipTxValidation: true,
-            overrides: {
-                contracts: {
-                    [from.toString()]: {
-                        instance,
-                        artifact
-                    }
-                }
-            },
-            scopes
+        const accountOverrides = await this.buildAccountOverrides(scopes);
+        const overrides = new SimulationOverrides({
+            contracts: accountOverrides
         });
-    }
-    async getFakeAccountDataFor(address) {
-        const originalAccount = await this.getAccountFromAddress(address);
-        if (originalAccount instanceof SignerlessAccount) {
-            throw new Error(`Cannot create fake account data for SignerlessAccount at address: ${address}`);
-        }
-        const originalAddress = originalAccount.getCompleteAddress();
-        const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
-        if (!contractInstance) {
-            throw new Error(`No contract instance found for address: ${originalAddress.address}`);
+        let txRequest;
+        if (from === NO_FROM) {
+            const entrypoint = new DefaultEntrypoint();
+            txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
+        } else {
+            const { type } = await this.walletDB.retrieveAccount(from);
+            const originalAccount = await this.getAccountFromAddress(from);
+            const completeAddress = originalAccount.getCompleteAddress();
+            const account = await this.accountContracts.createStubAccount(completeAddress, type);
+            const executionOptions = {
+                txNonce: Fr.random(),
+                cancellable: this.cancellableTransactions,
+                // If from is an address, feeOptions include the way the account contract should handle the fee payment
+                feePaymentMethodOptions: feeOptions.accountFeePaymentMethodOptions
+            };
+            txRequest = await account.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo, executionOptions);
         }
-        const stubAccount = await this.accountContracts.createStubAccount(originalAddress);
-        const stubArtifact = await this.accountContracts.getStubAccountContractArtifact();
-        const instance = await getContractInstanceFromInstantiationParams(stubArtifact, {
-            salt: Fr.random()
+        const result = await this.pxe.simulateTx(txRequest, {
+            simulatePublic: true,
+            skipFeeEnforcement,
+            skipTxValidation,
+            overrides,
+            scopes,
+            senderForTags: this.senderForTagsFrom(from, sendMessagesAs)
         });
-        return {
-            account: stubAccount,
-            instance,
-            artifact: stubArtifact
-        };
+        const appCallOffset = await this.computeAppCallOffset(from, feeOptions);
+        return TxSimulationResultWithAppOffset.fromResultAndOffset(result, appCallOffset);
     }
     async createAccountInternal(type, secret, salt, signingKey) {
         let contract;
+        let immutablesHash;
+        let publicKey;
         switch(type){
             case 'schnorr':
                 {
                     contract = await this.accountContracts.getSchnorrAccountContract(Fq.fromBuffer(signingKey));
                     break;
                 }
+            case 'schnorr_initializerless':
+                {
+                    contract = await this.accountContracts.getSchnorrInitializerlessAccountContract(Fq.fromBuffer(signingKey));
+                    publicKey = await new Schnorr().computePublicKey(Fq.fromBuffer(signingKey));
+                    immutablesHash = await poseidon2Hash([
+                        publicKey.x,
+                        publicKey.y
+                    ]);
+                    break;
+                }
             case 'ecdsasecp256k1':
                 {
                     contract = await this.accountContracts.getEcdsaKAccountContract(signingKey);
@@ -118,10 +297,30 @@ export class EmbeddedWallet extends BaseWallet {
                     throw new Error(`Unknown account type ${type}`);
                 }
         }
-        const accountManager = await AccountManager.create(this, secret, contract, salt);
+        const accountManager = await AccountManager.create(this, secret, contract, {
+            salt,
+            immutablesHash
+        });
         const instance = accountManager.getInstance();
-        const artifact = await accountManager.getAccountContract().getContractArtifact();
-        await this.registerContract(instance, artifact, accountManager.getSecretKey());
+        const existingInstance = await this.pxe.getContractInstance(instance.address);
+        if (!existingInstance) {
+            const existingArtifact = await this.pxe.getContractArtifact(instance.currentContractClassId);
+            const artifact = existingArtifact ?? await accountManager.getAccountContract().getContractArtifact();
+            await this.registerContract(instance, !existingArtifact ? await accountManager.getAccountContract().getContractArtifact() : undefined, accountManager.getSecretKey());
+            if (type === 'schnorr_initializerless') {
+                const constructor = artifact.functions.find((f)=>f.name === 'constructor');
+                if (!constructor) {
+                    throw new Error('Could not create SchnorrInitializerlessAccountContract: constructor ABI not found');
+                }
+                const storeCall = new ContractFunctionInteraction(this, instance.address, constructor, [
+                    publicKey.x,
+                    publicKey.y
+                ]);
+                await storeCall.simulate({
+                    from: instance.address
+                });
+            }
+        }
         return accountManager;
     }
     async createAndStoreAccount(alias, type, secret, salt, signingKey) {
@@ -136,8 +335,10 @@ export class EmbeddedWallet extends BaseWallet {
         return accountManager;
     }
     createSchnorrAccount(secret, salt, signingKey, alias) {
-        const sk = signingKey ?? deriveSigningKey(secret);
-        return this.createAndStoreAccount(alias ?? '', 'schnorr', secret, salt, sk.toBuffer());
+        return this.createAndStoreAccount(alias ?? '', 'schnorr', secret, salt, signingKey.toBuffer());
+    }
+    createSchnorrInitializerlessAccount(secret, salt, signingKey, alias) {
+        return this.createAndStoreAccount(alias ?? '', 'schnorr_initializerless', secret, salt, signingKey.toBuffer());
     }
     createECDSARAccount(secret, salt, signingKey, alias) {
         return this.createAndStoreAccount(alias ?? '', 'ecdsasecp256r1', secret, salt, signingKey);
@@ -148,7 +349,11 @@ export class EmbeddedWallet extends BaseWallet {
     setMinFeePadding(value) {
         this.minFeePadding = value ?? 0.5;
     }
-    stop() {
-        return this.pxe.stop();
+    setEstimatedGasPadding(value) {
+        this.estimatedGasPadding = value ?? DEFAULT_ESTIMATED_GAS_PADDING;
+    }
+    async stop() {
+        await this.pxe.stop();
+        await this.walletDB.close();
     }
 }

package/dest/embedded/entrypoints/browser.d.ts

@@ -1,9 +1,14 @@
+import { type AztecNode } from '@aztec/aztec.js/node';
+import { type Logger } from '@aztec/foundation/log';
+import { type PXE } from '@aztec/pxe/client/lazy';
+import type { AccountContractsProvider } from '../account-contract-providers/types.js';
 import { EmbeddedWallet, type EmbeddedWalletOptions } from '../embedded_wallet.js';
+import { WalletDB } from '../wallet_db.js';
 export declare class BrowserEmbeddedWallet extends EmbeddedWallet {
-    static create(nodeUrl: string, options?: EmbeddedWalletOptions): Promise<BrowserEmbeddedWallet>;
+    static create<T extends BrowserEmbeddedWallet = BrowserEmbeddedWallet>(this: new (pxe: PXE, aztecNode: AztecNode, walletDB: WalletDB, accountContracts: AccountContractsProvider, log?: Logger) => T, nodeOrUrl: string | AztecNode, options?: EmbeddedWalletOptions): Promise<T>;
 }
 export { BrowserEmbeddedWallet as EmbeddedWallet };
-export type { EmbeddedWalletOptions } from '../embedded_wallet.js';
+export type { EmbeddedWalletOptions, EmbeddedWalletPXEOptions } from '../embedded_wallet.js';
 export { WalletDB } from '../wallet_db.js';
 export type { AccountType } from '../wallet_db.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL2Jyb3dzZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsT0FBTyxFQUFFLGNBQWMsRUFBRSxLQUFLLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkYscUJBQWEscUJBQXNCLFNBQVEsY0FBYztJQUN2RCxPQUFhLE1BQU0sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE9BQU8sR0FBRSxxQkFBMEIsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FnQ3hHO0NBQ0Y7QUFFRCxPQUFPLEVBQUUscUJBQXFCLElBQUksY0FBYyxFQUFFLENBQUM7QUFDbkQsWUFBWSxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLFlBQVksRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL2Jyb3dzZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUF5QixNQUFNLHNCQUFzQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQXdELE1BQU0sd0JBQXdCLENBQUM7QUFPeEcsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUN2RixPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUsscUJBQXFCLEVBQW1CLE1BQU0sdUJBQXVCLENBQUM7QUFDcEcsT0FBTyxFQUE4QixRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV2RSxxQkFBYSxxQkFBc0IsU0FBUSxjQUFjO0lBQ3ZELE9BQWEsTUFBTSxDQUFDLENBQUMsU0FBUyxxQkFBcUIsR0FBRyxxQkFBcUIsRUFDekUsSUFBSSxFQUFFLEtBQ0osR0FBRyxFQUFFLEdBQUcsRUFDUixTQUFTLEVBQUUsU0FBUyxFQUNwQixRQUFRLEVBQUUsUUFBUSxFQUNsQixnQkFBZ0IsRUFBRSx3QkFBd0IsRUFDMUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxLQUNULENBQUMsRUFDTixTQUFTLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDN0IsT0FBTyxHQUFFLHFCQUEwQixHQUNsQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBNERaO0NBQ0Y7QUFFRCxPQUFPLEVBQUUscUJBQXFCLElBQUksY0FBYyxFQUFFLENBQUM7QUFDbkQsWUFBWSxFQUFFLHFCQUFxQixFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0YsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLFlBQVksRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyJ9

package/dest/embedded/entrypoints/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/browser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAGnF,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAgCxG;CACF;AAED,OAAO,EAAE,qBAAqB,IAAI,cAAc,EAAE,CAAC;AACnD,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,KAAK,GAAG,EAAwD,MAAM,wBAAwB,CAAC;AAOxG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAmB,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAA8B,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEvE,qBAAa,qBAAsB,SAAQ,cAAc;IACvD,OAAa,MAAM,CAAC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACzE,IAAI,EAAE,KACJ,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,wBAAwB,EAC1C,GAAG,CAAC,EAAE,MAAM,KACT,CAAC,EACN,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,CAAC,CAAC,CA4DZ;CACF;AAED,OAAO,EAAE,qBAAqB,IAAI,cAAc,EAAE,CAAC;AACnD,YAAY,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}

package/dest/embedded/entrypoints/browser.js

@@ -1,34 +1,71 @@
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
-import { createStore, openTmpStore } from '@aztec/kv-store/indexeddb';
-import { createPXE } from '@aztec/pxe/client/lazy';
+import { openTmpStore } from '@aztec/kv-store/sqlite-opfs';
+import { createPXE, openBrowserStore } from '@aztec/pxe/client/lazy';
 import { getPXEConfig } from '@aztec/pxe/config';
+import { getStandardAuthRegistry } from '@aztec/standard-contracts/auth-registry/lazy';
+import { getStandardHandshakeRegistry } from '@aztec/standard-contracts/handshake-registry/lazy';
+import { getStandardMultiCallEntrypoint } from '@aztec/standard-contracts/multi-call-entrypoint/lazy';
 import { LazyAccountContractsProvider } from '../account-contract-providers/lazy.js';
-import { EmbeddedWallet } from '../embedded_wallet.js';
-import { WalletDB } from '../wallet_db.js';
+import { EmbeddedWallet, splitPxeOptions } from '../embedded_wallet.js';
+import { WALLET_DATA_SCHEMA_VERSION, WalletDB } from '../wallet_db.js';
 export class BrowserEmbeddedWallet extends EmbeddedWallet {
-    static async create(nodeUrl, options = {}) {
+    static async create(nodeOrUrl, options = {}) {
         const rootLogger = options.logger ?? createLogger('embedded-wallet');
-        const aztecNode = createAztecNodeClient(nodeUrl);
-        const l1Contracts = await aztecNode.getL1ContractAddresses();
-        const rollupAddress = l1Contracts.rollupAddress;
-        const config = getPXEConfig();
-        if (!options.ephemeral) {
-            config.dataDirectory = `pxe-${rollupAddress}`;
+        const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
+        // Support both the new unified `pxe` option and the deprecated `pxeConfig`/`pxeOptions`.
+        const { config: pxeConfigFromPxe, creation: pxeCreationFromPxe } = splitPxeOptions(options.pxe);
+        const mergedConfigOverrides = {
+            ...options.pxeConfig,
+            ...pxeConfigFromPxe
+        };
+        const mergedCreationOverrides = {
+            ...options.pxeOptions,
+            ...pxeCreationFromPxe
+        };
+        const pxeConfig = Object.assign(getPXEConfig(), {
+            proverEnabled: mergedConfigOverrides.proverEnabled,
+            // Unused in the browser: sqlite-opfs keys stores by name, not directory.
+            dataDirectory: 'pxe_data',
+            autoSync: false,
+            ...mergedConfigOverrides
+        });
+        if (options.ephemeral) {
+            delete pxeConfig.dataDirectory;
         }
-        const pxe = await createPXE(aztecNode, config, {
+        const pxeOptions = {
+            ...mergedCreationOverrides,
+            preloadedContractsProvider: mergedCreationOverrides.preloadedContractsProvider ?? {
+                getPreloadedContracts: async ()=>[
+                        await getStandardMultiCallEntrypoint(),
+                        await getStandardAuthRegistry(),
+                        await getStandardHandshakeRegistry()
+                    ]
+            },
             loggers: {
                 store: rootLogger.createChild('pxe:data'),
                 pxe: rootLogger.createChild('pxe:service'),
-                prover: rootLogger.createChild('pxe:prover')
+                prover: rootLogger.createChild('pxe:prover'),
+                ...mergedCreationOverrides.loggers
             }
-        });
-        const walletDBStore = options.ephemeral ? await openTmpStore(true) : await createStore(`wallet-${rollupAddress}`, {
-            dataDirectory: 'wallet',
-            dataStoreMapSizeKb: 2e10
-        }, undefined, rootLogger.createChild('wallet:data'));
-        const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
-        return new BrowserEmbeddedWallet(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger);
+        };
+        const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
+        let walletDBStore = options.walletDb?.store;
+        if (!walletDBStore) {
+            if (options.ephemeral) {
+                walletDBStore = await openTmpStore(true);
+            } else {
+                const { l1ChainId, l1ContractAddresses } = await aztecNode.getNodeInfo();
+                walletDBStore = await openBrowserStore('wallet_data', WALLET_DATA_SCHEMA_VERSION, {
+                    l1ChainId,
+                    rollupAddress: l1ContractAddresses.rollupAddress
+                }, rootLogger.createChild('wallet:data'));
+            }
+        }
+        const walletDB = new WalletDB(walletDBStore, rootLogger.createChild('wallet:db').info);
+        const wallet = new this(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger);
+        await wallet.initStubClasses();
+        return wallet;
     }
 }
 export { BrowserEmbeddedWallet as EmbeddedWallet };

package/dest/embedded/entrypoints/node.d.ts

@@ -1,18 +1,14 @@
-import type { PXEConfig } from '@aztec/pxe/config';
-import { type PXECreationOptions } from '@aztec/pxe/server';
+import { type Logger } from '@aztec/foundation/log';
+import { type PXE } from '@aztec/pxe/server';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { AccountContractsProvider } from '../account-contract-providers/types.js';
 import { EmbeddedWallet, type EmbeddedWalletOptions } from '../embedded_wallet.js';
-export type NodeEmbeddedWalletOptions = EmbeddedWalletOptions & {
-    /** Override PXE configuration. */
-    pxeConfig?: Partial<PXEConfig>;
-    /** Advanced PXE creation options (custom store, prover, simulator). */
-    pxeOptions?: PXECreationOptions;
-};
+import { WalletDB } from '../wallet_db.js';
 export declare class NodeEmbeddedWallet extends EmbeddedWallet {
-    static create(nodeOrUrl: string | AztecNode, options?: NodeEmbeddedWalletOptions): Promise<NodeEmbeddedWallet>;
+    static create<T extends NodeEmbeddedWallet = NodeEmbeddedWallet>(this: new (pxe: PXE, aztecNode: AztecNode, walletDB: WalletDB, accountContracts: AccountContractsProvider, log?: Logger) => T, nodeOrUrl: string | AztecNode, options?: EmbeddedWalletOptions): Promise<T>;
 }
 export { NodeEmbeddedWallet as EmbeddedWallet };
-export type { EmbeddedWalletOptions } from '../embedded_wallet.js';
+export type { EmbeddedWalletOptions, EmbeddedWalletPXEOptions } from '../embedded_wallet.js';
 export { WalletDB } from '../wallet_db.js';
 export type { AccountType } from '../wallet_db.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFbkQsT0FBTyxFQUFFLEtBQUssa0JBQWtCLEVBQWEsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUsscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRixNQUFNLE1BQU0seUJBQXlCLEdBQUcscUJBQXFCLEdBQUc7SUFDOUQsa0NBQWtDO0lBQ2xDLFNBQVMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUMvQix1RUFBdUU7SUFDdkUsVUFBVSxDQUFDLEVBQUUsa0JBQWtCLENBQUM7Q0FDakMsQ0FBQztBQUVGLHFCQUFhLGtCQUFtQixTQUFRLGNBQWM7SUFDcEQsT0FBYSxNQUFNLENBQ2pCLFNBQVMsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUM3QixPQUFPLEdBQUUseUJBQThCLEdBQ3RDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQWtEN0I7Q0FDRjtBQUVELE9BQU8sRUFBRSxrQkFBa0IsSUFBSSxjQUFjLEVBQUUsQ0FBQztBQUNoRCxZQUFZLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsWUFBWSxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VtYmVkZGVkL2VudHJ5cG9pbnRzL25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBR2xFLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBaUQsTUFBTSxtQkFBbUIsQ0FBQztBQUk1RixPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQ3ZGLE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxxQkFBcUIsRUFBbUIsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRyxPQUFPLEVBQThCLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSXZFLHFCQUFhLGtCQUFtQixTQUFRLGNBQWM7SUFDcEQsT0FBYSxNQUFNLENBQUMsQ0FBQyxTQUFTLGtCQUFrQixHQUFHLGtCQUFrQixFQUNuRSxJQUFJLEVBQUUsS0FDSixHQUFHLEVBQUUsR0FBRyxFQUNSLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLGdCQUFnQixFQUFFLHdCQUF3QixFQUMxQyxHQUFHLENBQUMsRUFBRSxNQUFNLEtBQ1QsQ0FBQyxFQUNOLFNBQVMsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUM3QixPQUFPLEdBQUUscUJBQTBCLEdBQ2xDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FpRVo7Q0FDRjtBQUVELE9BQU8sRUFBRSxrQkFBa0IsSUFBSSxjQUFjLEVBQUUsQ0FBQztBQUNoRCxZQUFZLEVBQUUscUJBQXFCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM3RixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsWUFBWSxFQUFFLFdBQVcsRUFBRSxNQUFNLGlCQUFpQixDQUFDIn0=

package/dest/embedded/entrypoints/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/node.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,KAAK,kBAAkB,EAAa,MAAM,mBAAmB,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAGnF,MAAM,MAAM,yBAAyB,GAAG,qBAAqB,GAAG;IAC9D,kCAAkC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,uEAAuE;IACvE,UAAU,CAAC,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAa,MAAM,CACjB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAkD7B;CACF;AAED,OAAO,EAAE,kBAAkB,IAAI,cAAc,EAAE,CAAC;AAChD,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/embedded/entrypoints/node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,KAAK,GAAG,EAAiD,MAAM,mBAAmB,CAAC;AAI5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAmB,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAA8B,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIvE,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAa,MAAM,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,EACnE,IAAI,EAAE,KACJ,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,wBAAwB,EAC1C,GAAG,CAAC,EAAE,MAAM,KACT,CAAC,EACN,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,CAAC,CAAC,CAiEZ;CACF;AAED,OAAO,EAAE,kBAAkB,IAAI,cAAc,EAAE,CAAC;AAChD,YAAY,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}