@aztec/wallets 0.0.1-commit.e2b2873ed → 0.0.1-commit.e304674f1

package/dest/embedded/entrypoints/node.js

@@ -1,43 +1,51 @@
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
-import { createStore as createWalletStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { getPXEConfig } from '@aztec/pxe/config';
 import { createPXE } from '@aztec/pxe/server';
 import { BundleAccountContractsProvider } from '../account-contract-providers/bundle.js';
-import { EmbeddedWallet } from '../embedded_wallet.js';
+import { EmbeddedWallet, splitPxeOptions } from '../embedded_wallet.js';
 import { WalletDB } from '../wallet_db.js';
 export class NodeEmbeddedWallet extends EmbeddedWallet {
     static async create(nodeOrUrl, options = {}) {
         const rootLogger = options.logger ?? createLogger('embedded-wallet');
         const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
+        const l1Contracts = await aztecNode.getL1ContractAddresses();
+        // 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: options.pxeConfig?.proverEnabled ?? false,
-            ...options.pxeConfig
+            proverEnabled: mergedConfigOverrides.proverEnabled ?? false,
+            dataDirectory: `pxe_data_${l1Contracts.rollupAddress}`,
+            ...mergedConfigOverrides
         });
         if (options.ephemeral) {
             delete pxeConfig.dataDirectory;
         }
         const pxeOptions = {
-            ...options.pxeOptions,
+            ...mergedCreationOverrides,
             loggers: {
                 store: rootLogger.createChild('pxe:data'),
                 pxe: rootLogger.createChild('pxe:service'),
                 prover: rootLogger.createChild('pxe:prover'),
-                ...options.pxeOptions?.loggers
+                ...mergedCreationOverrides.loggers
             }
         };
         const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
-        const l1Contracts = await aztecNode.getL1ContractAddresses();
-        const rollupAddress = l1Contracts.rollupAddress;
-        const walletDBStore = options.ephemeral ? await openTmpStore('wallet_data', true, undefined, undefined, rootLogger.createChild('wallet:data').getBindings()) : await createWalletStore('wallet_data', 1, {
-            dataDirectory: pxeConfig.dataDirectory,
+        const walletDBStore = options.ephemeral ? await openTmpStore(`wallet_data_${l1Contracts.rollupAddress}`, true, undefined, undefined, rootLogger.createChild('wallet:data').getBindings()) : await createStore('wallet_data', 1, {
+            dataDirectory: `wallet_data_${l1Contracts.rollupAddress}`,
             dataStoreMapSizeKb: pxeConfig.dataStoreMapSizeKb,
-            l1Contracts: {
-                rollupAddress
-            }
+            l1Contracts
         }, rootLogger.createChild('wallet:data').getBindings());
         const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
-        return new NodeEmbeddedWallet(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger);
+        return new this(pxe, aztecNode, walletDB, new BundleAccountContractsProvider(), rootLogger);
     }
 }
 export { NodeEmbeddedWallet as EmbeddedWallet };

package/dest/testing.d.ts

@@ -9,4 +9,4 @@ interface WalletWithSchnorrAccounts {
 export declare function deployFundedSchnorrAccounts(wallet: WalletWithSchnorrAccounts, accountsData: InitialAccountData[], waitOptions?: WaitOpts): Promise<AccountManager[]>;
 export declare function registerInitialLocalNetworkAccountsInWallet(wallet: WalletWithSchnorrAccounts): Promise<AztecAddress[]>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELFVBQVUseUJBQXlCO0lBQ2pDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztDQUN0RztBQUVELHdCQUFzQiwyQkFBMkIsQ0FDL0MsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsRUFDbEMsV0FBVyxDQUFDLEVBQUUsUUFBUSw2QkFnQnZCO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxNQUFNLEVBQUUseUJBQXlCLEdBQ2hDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQU96QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Rlc3RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUdsRSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELFVBQVUseUJBQXlCO0lBQ2pDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsS0FBSyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FBQztDQUN0RztBQUVELHdCQUFzQiwyQkFBMkIsQ0FDL0MsTUFBTSxFQUFFLHlCQUF5QixFQUNqQyxZQUFZLEVBQUUsa0JBQWtCLEVBQUUsRUFDbEMsV0FBVyxDQUFDLEVBQUUsUUFBUSw2QkFnQnZCO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxNQUFNLEVBQUUseUJBQXlCLEdBQ2hDLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQU96QiJ9

package/dest/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,UAAU,yBAAyB;IACjC,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACtG;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,kBAAkB,EAAE,EAClC,WAAW,CAAC,EAAE,QAAQ,6BAgBvB;AAED,wBAAsB,2CAA2C,CAC/D,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAOzB"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAGlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,UAAU,yBAAyB;IACjC,oBAAoB,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACtG;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,yBAAyB,EACjC,YAAY,EAAE,kBAAkB,EAAE,EAClC,WAAW,CAAC,EAAE,QAAQ,6BAgBvB;AAED,wBAAsB,2CAA2C,CAC/D,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,YAAY,EAAE,CAAC,CAOzB"}

package/dest/testing.js

@@ -1,5 +1,5 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { NO_FROM } from '@aztec/aztec.js/account';
 export async function deployFundedSchnorrAccounts(wallet, accountsData, waitOptions) {
     const accountManagers = [];
     // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
@@ -8,7 +8,7 @@ export async function deployFundedSchnorrAccounts(wallet, accountsData, waitOpti
         const accountManager = await wallet.createSchnorrAccount(secret, salt, signingKey);
         const deployMethod = await accountManager.getDeployMethod();
         await deployMethod.send({
-            from: AztecAddress.ZERO,
+            from: NO_FROM,
             skipClassPublication: i !== 0,
             wait: waitOptions
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aztec/wallets",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/wallets",
-  "version": "0.0.1-commit.e2b2873ed",
+  "version": "0.0.1-commit.e304674f1",
   "type": "module",
   "exports": {
     "./embedded": {
@@ -27,14 +27,15 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.e2b2873ed",
-    "@aztec/aztec.js": "0.0.1-commit.e2b2873ed",
-    "@aztec/entrypoints": "0.0.1-commit.e2b2873ed",
-    "@aztec/foundation": "0.0.1-commit.e2b2873ed",
-    "@aztec/kv-store": "0.0.1-commit.e2b2873ed",
-    "@aztec/pxe": "0.0.1-commit.e2b2873ed",
-    "@aztec/stdlib": "0.0.1-commit.e2b2873ed",
-    "@aztec/wallet-sdk": "0.0.1-commit.e2b2873ed"
+    "@aztec/accounts": "0.0.1-commit.e304674f1",
+    "@aztec/aztec.js": "0.0.1-commit.e304674f1",
+    "@aztec/entrypoints": "0.0.1-commit.e304674f1",
+    "@aztec/foundation": "0.0.1-commit.e304674f1",
+    "@aztec/kv-store": "0.0.1-commit.e304674f1",
+    "@aztec/protocol-contracts": "0.0.1-commit.e304674f1",
+    "@aztec/pxe": "0.0.1-commit.e304674f1",
+    "@aztec/stdlib": "0.0.1-commit.e304674f1",
+    "@aztec/wallet-sdk": "0.0.1-commit.e304674f1"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
@@ -43,6 +44,15 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"
   },
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/embedded/entrypoints/browser.ts",
+      "./src/embedded/entrypoints/node.ts",
+      "./src/testing.ts"
+    ],
+    "name": "Wallets",
+    "tsconfig": "./tsconfig.json"
+  },
   "files": [
     "dest",
     "src",

package/src/embedded/account-contract-providers/bundle.ts

@@ -3,8 +3,9 @@ import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 import { StubAccountContractArtifact, createStubAccount } from '@aztec/accounts/stub';
 import type { Account, AccountContract } from '@aztec/aztec.js/account';
 import type { Fq } from '@aztec/foundation/curves/bn254';
+import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress } from '@aztec/stdlib/contract';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 import type { AccountContractsProvider } from './types.js';
 
@@ -32,4 +33,8 @@ export class BundleAccountContractsProvider implements AccountContractsProvider
   createStubAccount(address: CompleteAddress): Promise<Account> {
     return Promise.resolve(createStubAccount(address));
   }
+
+  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
+    return getCanonicalMultiCallEntrypoint();
+  }
 }

package/src/embedded/account-contract-providers/lazy.ts

@@ -1,7 +1,8 @@
 import type { Account, AccountContract } from '@aztec/aztec.js/account';
 import type { Fq } from '@aztec/foundation/curves/bn254';
+import { getCanonicalMultiCallEntrypoint } from '@aztec/protocol-contracts/multi-call-entrypoint/lazy';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress } from '@aztec/stdlib/contract';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 import type { AccountContractsProvider } from './types.js';
 
@@ -34,4 +35,8 @@ export class LazyAccountContractsProvider implements AccountContractsProvider {
     const { createStubAccount } = await import('@aztec/accounts/stub/lazy');
     return createStubAccount(address);
   }
+
+  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }> {
+    return getCanonicalMultiCallEntrypoint();
+  }
 }

package/src/embedded/account-contract-providers/types.ts

@@ -1,7 +1,7 @@
 import type { Account, AccountContract } from '@aztec/aztec.js/account';
 import type { Fq } from '@aztec/foundation/curves/bn254';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress } from '@aztec/stdlib/contract';
+import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 /**
  * Provides account contract implementations and stub accounts for the EmbeddedWallet.
@@ -14,5 +14,6 @@ export interface AccountContractsProvider {
   getEcdsaRAccountContract(signingKey: Buffer): Promise<AccountContract>;
   getEcdsaKAccountContract(signingKey: Buffer): Promise<AccountContract>;
   getStubAccountContractArtifact(): Promise<ContractArtifact>;
+  getMulticallContract(): Promise<{ instance: ContractInstanceWithAddress; artifact: ContractArtifact }>;
   createStubAccount(address: CompleteAddress): Promise<Account>;
 }

package/src/embedded/embedded_wallet.ts

@@ -1,28 +1,73 @@
-import { type Account, SignerlessAccount } from '@aztec/aztec.js/account';
-import type { Aliased } from '@aztec/aztec.js/wallet';
+import { type Account, NO_FROM } from '@aztec/aztec.js/account';
+import { CallAuthorizationRequest } from '@aztec/aztec.js/authorization';
+import { type InteractionWaitOptions, type SendReturn, type WaitOpts, getGasLimits } from '@aztec/aztec.js/contracts';
+import type { Aliased, SendOptions } from '@aztec/aztec.js/wallet';
 import { AccountManager } from '@aztec/aztec.js/wallet';
 import type { DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
+import { DefaultEntrypoint } from '@aztec/entrypoints/default';
 import { Fq, Fr } from '@aztec/foundation/curves/bn254';
 import type { Logger } from '@aztec/foundation/log';
+import type { PXEConfig, PXECreationOptions } from '@aztec/pxe/client/lazy';
 import type { PXE } from '@aztec/pxe/server';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { GasSettings } from '@aztec/stdlib/gas';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { ExecutionPayload, type TxSimulationResult, mergeExecutionPayloads } from '@aztec/stdlib/tx';
-import { BaseWallet, type FeeOptions } from '@aztec/wallet-sdk/base-wallet';
+import {
+  type ContractOverrides,
+  ExecutionPayload,
+  SimulationOverrides,
+  type TxExecutionRequest,
+  type TxSimulationResult,
+  TxStatus,
+  collectOffchainEffects,
+  mergeExecutionPayloads,
+} from '@aztec/stdlib/tx';
+import { BaseWallet, type SimulateViaEntrypointOptions } from '@aztec/wallet-sdk/base-wallet';
 
 import type { AccountContractsProvider } from './account-contract-providers/types.js';
 import { type AccountType, WalletDB } from './wallet_db.js';
 
+/** Options for the PXE instance created by the EmbeddedWallet. */
+export type EmbeddedWalletPXEOptions = Partial<PXEConfig> & PXECreationOptions;
+
+/** Splits a unified EmbeddedWalletPXEOptions into PXEConfig overrides and PXECreationOptions. */
+export function splitPxeOptions(pxe?: EmbeddedWalletPXEOptions): {
+  config: Partial<PXEConfig>;
+  creation: PXECreationOptions;
+} {
+  if (!pxe) {
+    return { config: {}, creation: {} };
+  }
+  const { loggers, loggerActorLabel, proverOrOptions, store, simulator, ...config } = pxe;
+  return { config, creation: { loggers, loggerActorLabel, proverOrOptions, store, simulator } };
+}
+
 export type EmbeddedWalletOptions = {
   /** Parent logger. Child loggers are derived via createChild() for each subsystem. */
   logger?: Logger;
   /** Use ephemeral (in-memory) stores. Data will not persist across sessions. */
   ephemeral?: boolean;
+  /** PXE configuration and dependency overrides (custom store, prover, simulator). */
+  pxe?: EmbeddedWalletPXEOptions;
+  /**
+   * Override PXE configuration.
+   * @deprecated Use `pxe` instead.
+   */
+  pxeConfig?: Partial<PXEConfig>;
+  /**
+   * Advanced PXE creation options (custom store, prover, simulator).
+   * @deprecated Use `pxe` instead.
+   */
+  pxeOptions?: PXECreationOptions;
 };
 
+const DEFAULT_ESTIMATED_GAS_PADDING = 0.1;
+
 export class EmbeddedWallet extends BaseWallet {
+  protected estimatedGasPadding = DEFAULT_ESTIMATED_GAS_PADDING;
+
   constructor(
     pxe: PXE,
     aztecNode: AztecNode,
@@ -34,10 +79,6 @@ export class EmbeddedWallet extends BaseWallet {
   }
 
   protected async getAccountFromAddress(address: AztecAddress): Promise<Account> {
-    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();
@@ -69,6 +110,114 @@ export class EmbeddedWallet extends BaseWallet {
     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.
+   */
+  public override async sendTx<W extends InteractionWaitOptions = undefined>(
+    executionPayload: ExecutionPayload,
+    opts: SendOptions<W>,
+  ): Promise<SendReturn<W>> {
+    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,
+      scopes: this.scopesFrom(opts.from, opts.additionalScopes),
+      skipTxValidation: true,
+    });
+
+    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 estimated = getGasLimits(simulationResult, 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,
+    });
+    const waitOpts: WaitOpts = typeof opts.wait === 'object' ? opts.wait : {};
+
+    if (!waitOpts?.waitForStatus) {
+      // 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).
+      waitOpts!.waitForStatus = TxStatus.PROPOSED;
+    }
+    return super.sendTx(executionPayload, {
+      ...opts,
+      fee: { ...opts.fee, gasSettings },
+    });
+  }
+
+  /**
+   * Builds contract overrides for all provided addresses by replacing their account contracts with stub implementations.
+   */
+  protected async buildAccountOverrides(addresses: AztecAddress[]): Promise<ContractOverrides> {
+    const accounts = await this.getAccounts();
+    const contracts: ContractOverrides = {};
+
+    const stubArtifact = await this.accountContracts.getStubAccountContractArtifact();
+
+    const filtered = accounts.filter(acc => addresses.some(addr => addr.equals(acc.item)));
+
+    for (const account of filtered) {
+      const address = account.item;
+      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!`,
+        );
+      }
+
+      const stubInstance = await getContractInstanceFromInstantiationParams(stubArtifact, {
+        salt: Fr.random(),
+      });
+
+      contracts[address.toString()] = {
+        instance: stubInstance,
+        artifact: stubArtifact,
+      };
+    }
+
+    return contracts;
+  }
+
   /**
    * Simulates calls via a stub account entrypoint, bypassing real account authorization.
    * This allows kernelless simulation with contract overrides, skipping expensive
@@ -76,63 +225,50 @@ export class EmbeddedWallet extends BaseWallet {
    */
   protected override async simulateViaEntrypoint(
     executionPayload: ExecutionPayload,
-    from: AztecAddress,
-    feeOptions: FeeOptions,
-    _skipTxValidation?: boolean,
-    _skipFeeEnforcement?: boolean,
-    scopes?: AztecAddress[],
+    opts: SimulateViaEntrypointOptions,
   ): Promise<TxSimulationResult> {
-    const { account: fromAccount, instance, artifact } = await this.getFakeAccountDataFor(from);
+    const { from, feeOptions, scopes, skipTxValidation, skipFeeEnforcement } = opts;
 
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
-    const executionOptions: DefaultAccountEntrypointOptions = {
-      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,
-    );
+
+    const accountOverrides = await this.buildAccountOverrides(this.scopesFrom(from, opts.additionalScopes));
+    const overrides = new SimulationOverrides(accountOverrides);
+
+    let txRequest: TxExecutionRequest;
+    if (from === NO_FROM) {
+      const entrypoint = new DefaultEntrypoint();
+      txRequest = await entrypoint.createTxExecutionRequest(finalExecutionPayload, feeOptions.gasSettings, chainInfo);
+    } else {
+      const originalAccount = await this.getAccountFromAddress(from);
+      const completeAddress = originalAccount.getCompleteAddress();
+      const account = await this.accountContracts.createStubAccount(completeAddress);
+      const executionOptions: DefaultAccountEntrypointOptions = {
+        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,
+      );
+    }
+
     return this.pxe.simulateTx(txRequest, {
       simulatePublic: true,
-      skipFeeEnforcement: true,
-      skipTxValidation: true,
-      overrides: {
-        contracts: { [from.toString()]: { instance, artifact } },
-      },
+      skipFeeEnforcement,
+      skipTxValidation,
+      overrides,
       scopes,
     });
   }
 
-  private async getFakeAccountDataFor(address: AztecAddress) {
-    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 as Account).getCompleteAddress();
-    const contractInstance = await this.pxe.getContractInstance(originalAddress.address);
-    if (!contractInstance) {
-      throw new Error(`No contract instance found for address: ${originalAddress.address}`);
-    }
-    const stubAccount = await this.accountContracts.createStubAccount(originalAddress);
-    const stubArtifact = await this.accountContracts.getStubAccountContractArtifact();
-    const instance = await getContractInstanceFromInstantiationParams(stubArtifact, {
-      salt: Fr.random(),
-    });
-    return {
-      account: stubAccount,
-      instance,
-      artifact: stubArtifact,
-    };
-  }
-
   protected async createAccountInternal(
     type: AccountType,
     secret: Fr,
@@ -161,10 +297,15 @@ export class EmbeddedWallet extends BaseWallet {
     const accountManager = await AccountManager.create(this, secret, contract, salt);
 
     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);
+      await this.registerContract(
+        instance,
+        !existingArtifact ? await accountManager.getAccountContract().getContractArtifact() : undefined,
+        accountManager.getSecretKey(),
+      );
+    }
     return accountManager;
   }
 
@@ -197,6 +338,10 @@ export class EmbeddedWallet extends BaseWallet {
     this.minFeePadding = value ?? 0.5;
   }
 
+  setEstimatedGasPadding(value?: number) {
+    this.estimatedGasPadding = value ?? DEFAULT_ESTIMATED_GAS_PADDING;
+  }
+
   stop() {
     return this.pxe.stop();
   }

package/src/embedded/entrypoints/browser.ts

@@ -1,50 +1,77 @@
-import { createAztecNodeClient } from '@aztec/aztec.js/node';
-import { createLogger } from '@aztec/foundation/log';
+import { type AztecNode, createAztecNodeClient } from '@aztec/aztec.js/node';
+import { type Logger, createLogger } from '@aztec/foundation/log';
 import { createStore, openTmpStore } from '@aztec/kv-store/indexeddb';
-import { createPXE } from '@aztec/pxe/client/lazy';
-import { getPXEConfig } from '@aztec/pxe/config';
+import { type PXE, type PXECreationOptions, createPXE } from '@aztec/pxe/client/lazy';
+import { type PXEConfig, getPXEConfig } from '@aztec/pxe/config';
 
 import { LazyAccountContractsProvider } from '../account-contract-providers/lazy.js';
-import { EmbeddedWallet, type EmbeddedWalletOptions } from '../embedded_wallet.js';
+import type { AccountContractsProvider } from '../account-contract-providers/types.js';
+import { EmbeddedWallet, type EmbeddedWalletOptions, splitPxeOptions } from '../embedded_wallet.js';
 import { WalletDB } from '../wallet_db.js';
 
 export class BrowserEmbeddedWallet extends EmbeddedWallet {
-  static async create(nodeUrl: string, options: EmbeddedWalletOptions = {}): Promise<BrowserEmbeddedWallet> {
+  static async 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> {
     const rootLogger = options.logger ?? createLogger('embedded-wallet');
 
-    const aztecNode = createAztecNodeClient(nodeUrl);
-
+    const aztecNode = typeof nodeOrUrl === 'string' ? createAztecNodeClient(nodeOrUrl) : nodeOrUrl;
     const l1Contracts = await aztecNode.getL1ContractAddresses();
-    const rollupAddress = l1Contracts.rollupAddress;
 
-    const config = getPXEConfig();
-    if (!options.ephemeral) {
-      config.dataDirectory = `pxe-${rollupAddress}`;
+    // 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: PXECreationOptions = { ...options.pxeOptions, ...pxeCreationFromPxe };
+
+    const pxeConfig: PXEConfig = Object.assign(getPXEConfig(), {
+      proverEnabled: mergedConfigOverrides.proverEnabled ?? false,
+      dataDirectory: `pxe_data_${l1Contracts.rollupAddress}`,
+      ...mergedConfigOverrides,
+    });
+
+    if (options.ephemeral) {
+      delete pxeConfig.dataDirectory;
     }
 
-    const pxe = await createPXE(aztecNode, config, {
+    const pxeOptions: PXECreationOptions = {
+      ...mergedCreationOverrides,
       loggers: {
         store: rootLogger.createChild('pxe:data'),
         pxe: rootLogger.createChild('pxe:service'),
         prover: rootLogger.createChild('pxe:prover'),
+        ...mergedCreationOverrides.loggers,
       },
-    });
+    };
+
+    const pxe = await createPXE(aztecNode, pxeConfig, pxeOptions);
 
     const walletDBStore = options.ephemeral
       ? await openTmpStore(true)
       : await createStore(
-          `wallet-${rollupAddress}`,
-          { dataDirectory: 'wallet', dataStoreMapSizeKb: 2e10 },
-          undefined,
+          'wallet_data',
+          {
+            dataDirectory: `wallet_data_${l1Contracts.rollupAddress}`,
+            dataStoreMapSizeKb: pxeConfig.dataStoreMapSizeKb,
+            l1Contracts,
+          },
+          1,
           rootLogger.createChild('wallet:data'),
         );
     const walletDB = WalletDB.init(walletDBStore, rootLogger.createChild('wallet:db').info);
 
-    return new BrowserEmbeddedWallet(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger);
+    return new this(pxe, aztecNode, walletDB, new LazyAccountContractsProvider(), rootLogger) as 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';