@walletmesh/aztec-rpc-wallet 0.4.0 → 0.5.0

package/src/client/aztec-router-provider.test.ts

@@ -1,5 +1,3 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { AztecRouterProvider } from './aztec-router-provider.js';
 import { AztecAddress, CompleteAddress } from '@aztec/aztec.js';
 // import { jsonStringify } from '@aztec/foundation/json-rpc'; // Unused
 import type {
@@ -8,6 +6,8 @@ import type {
   JSONRPCTransport,
   // JSONRPCMethodMap, // Unused
 } from '@walletmesh/jsonrpc';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { AztecRouterProvider } from './aztec-router-provider.js';
 
 // Define a minimal method map for testing purposes
 // import type { JSONRPCParams } from '@walletmesh/jsonrpc'; // Unused

package/src/client/aztec-router-provider.ts

@@ -1,5 +1,5 @@
-import { WalletRouterProvider } from '@walletmesh/router';
 import type { JSONRPCTransport } from '@walletmesh/jsonrpc';
+import { WalletRouterProvider } from '@walletmesh/router';
 import { registerAztecSerializers } from './register-serializers.js';
 
 /**

package/src/client/helpers.test.ts

@@ -1,7 +1,7 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ALL_AZTEC_METHODS, connectAztec } from './helpers.js';
-import { createAztecWallet, type AztecDappWallet } from './aztec-dapp-wallet.js';
 import type { WalletRouterProvider } from '@walletmesh/router'; // Removed SessionData
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { type AztecDappWallet, createAztecWallet } from './aztec-dapp-wallet.js';
+import { ALL_AZTEC_METHODS, connectAztec } from './helpers.js';
 
 // Mock the aztec-dapp-wallet module
 vi.mock('./aztec-dapp-wallet.js', () => ({

package/src/client/helpers.ts

@@ -1,8 +1,8 @@
+import { createLogger } from '@aztec/foundation/log';
 import type { AztecChainId } from '../types.js';
 import type { AztecDappWallet } from './aztec-dapp-wallet.js';
 import { createAztecWallet } from './aztec-dapp-wallet.js';
 import type { AztecRouterProvider } from './aztec-router-provider.js';
-import { createLogger } from '@aztec/foundation/log';
 
 const logger = createLogger('aztec-rpc-wallet:helpers');
 
@@ -88,4 +88,3 @@ export async function connectAztec(
 
   return { sessionId, wallet };
 }
-

package/src/client/register-serializers.ts

@@ -1,6 +1,6 @@
 import type { WalletRouterProvider } from '@walletmesh/router';
-import { AztecWalletSerializer } from '../wallet/serializers.js';
 import type { AztecWalletMethodMap } from '../types.js';
+import { AztecWalletSerializer } from '../wallet/serializers.js';
 
 /**
  * Registers the {@link AztecWalletSerializer} for all relevant Aztec JSON-RPC methods

package/src/contractArtifactCache.test.ts

@@ -1,5 +1,5 @@
-import { describe, expect, it, vi, beforeEach, type Mock } from 'vitest';
 import type { AztecAddress, ContractArtifact, Fr, Wallet } from '@aztec/aztec.js';
+import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest';
 import { ContractArtifactCache } from './contractArtifactCache.js';
 import { AztecWalletError } from './errors.js';
 

package/src/index.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import * as exports from './index.js';
 
 describe('index exports', () => {

package/src/index.ts

@@ -5,27 +5,12 @@
  * This package provides both wallet-side and dApp-side implementations for Aztec integration.
  */
 
-// Wallet-side exports
-/**
- * Creates an Aztec wallet node that can be used with WalletRouter.
- * This is the wallet-side implementation that handles JSON-RPC requests.
- * @see {@link createAztecWalletNode}
- */
-export { createAztecWalletNode } from './wallet/create-node.js';
-
-/**
- * Context interface provided to all handler functions in the wallet implementation.
- * @see {@link AztecHandlerContext}
- */
-export type { AztecHandlerContext } from './wallet/handlers/index.js';
-
 // Client-side exports
 /**
  * DApp-side wallet class that implements the aztec.js Wallet interface.
  * @see {@link AztecDappWallet}
  */
 export { AztecDappWallet, createAztecWallet } from './client/aztec-dapp-wallet.js';
-
 /**
  * Extended WalletRouterProvider with built-in Aztec serialization support.
  * Use this instead of the base WalletRouterProvider for automatic serialization
@@ -33,7 +18,6 @@ export { AztecDappWallet, createAztecWallet } from './client/aztec-dapp-wallet.j
  * @see {@link AztecRouterProvider}
  */
 export { AztecRouterProvider } from './client/aztec-router-provider.js';
-
 /**
  * Helper constants and functions for connecting to Aztec wallets.
  * - ALL_AZTEC_METHODS: Complete list of all available Aztec methods
@@ -43,13 +27,25 @@ export {
   ALL_AZTEC_METHODS,
   connectAztec,
 } from './client/helpers.js';
-
 /**
  * Helper function to register Aztec serializers with a WalletRouterProvider.
  * This enables proper serialization of Aztec types when using the router.
  * @see {@link registerAztecSerializers}
  */
 export { registerAztecSerializers } from './client/register-serializers.js';
+// Utilities
+/**
+ * Cache utility for managing contract artifacts in wallet implementations.
+ * @see {@link ContractArtifactCache}
+ */
+export { ContractArtifactCache } from './contractArtifactCache.js';
+// Error utilities
+/**
+ * Error handling utilities for Aztec wallet operations.
+ * - AztecWalletError: Custom error class for Aztec wallet errors
+ * - AztecWalletErrorMap: Map of error codes to error messages
+ */
+export { AztecWalletError, AztecWalletErrorMap } from './errors.js';
 
 // Shared types
 /**
@@ -63,21 +59,18 @@ export type {
   AztecWalletContext,
   AztecWalletMethodMap,
 } from './types.js';
-
-// Utilities
+// Wallet-side exports
 /**
- * Cache utility for managing contract artifacts in wallet implementations.
- * @see {@link ContractArtifactCache}
+ * Creates an Aztec wallet node that can be used with WalletRouter.
+ * This is the wallet-side implementation that handles JSON-RPC requests.
+ * @see {@link createAztecWalletNode}
  */
-export { ContractArtifactCache } from './contractArtifactCache.js';
-
-// Error utilities
+export { createAztecWalletNode } from './wallet/create-node.js';
 /**
- * Error handling utilities for Aztec wallet operations.
- * - AztecWalletError: Custom error class for Aztec wallet errors
- * - AztecWalletErrorMap: Map of error codes to error messages
+ * Context interface provided to all handler functions in the wallet implementation.
+ * @see {@link AztecHandlerContext}
  */
-export { AztecWalletError, AztecWalletErrorMap } from './errors.js';
+export type { AztecHandlerContext } from './wallet/handlers/index.js';
 
 // Re-export serializers
 /**

package/src/types.ts

@@ -1,15 +1,15 @@
 import type {
+  AccountWallet,
   AuthWitness,
   AztecAddress,
+  CompleteAddress,
   Fr,
+  L2Block,
   PXE,
+  Tx,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
-  L2Block,
-  CompleteAddress,
-  AccountWallet,
-  Tx,
 } from '@aztec/aztec.js';
 import type { IntentAction, IntentInnerHash } from '@aztec/aztec.js/utils';
 import type { ExecutionPayload } from '@aztec/entrypoints/payload';
@@ -25,25 +25,23 @@ import type { ExecutionPayload } from '@aztec/entrypoints/payload';
  *   methods, their parameters, and return types. This is central to the typed RPC system.
  */
 
-import type {
-  PrivateExecutionResult,
-  TxProfileResult,
-  TxProvingResult,
-  TxSimulationResult,
-  UtilitySimulationResult,
-} from '@aztec/stdlib/tx';
-
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-
+import type { ContractInstanceWithAddress, NodeInfo } from '@aztec/stdlib/contract';
+import type { GasFees } from '@aztec/stdlib/gas';
 import type {
   ContractClassMetadata,
   ContractMetadata,
   EventMetadataDefinition,
   PXEInfo,
 } from '@aztec/stdlib/interfaces/client';
-
-import type { GasFees } from '@aztec/stdlib/gas';
-import type { ContractInstanceWithAddress, NodeInfo } from '@aztec/stdlib/contract';
+import type {
+  PrivateExecutionResult,
+  SimulationOverrides,
+  TxProfileResult,
+  TxProvingResult,
+  TxSimulationResult,
+  UtilitySimulationResult,
+} from '@aztec/stdlib/tx';
 
 import type { WalletMethodMap } from '@walletmesh/router';
 import type { ContractArtifactCache } from './contractArtifactCache.js';
@@ -318,18 +316,20 @@ export interface AztecWalletMethodMap extends WalletMethodMap {
    * @param params - A tuple containing the simulation parameters.
    * @param params.0 txRequest - The {@link TxExecutionRequest} to simulate.
    * @param params.1 simulatePublic - Optional: Whether to simulate public parts. Defaults to `false`.
-   * @param params.2 msgSender - Optional: {@link AztecAddress} for simulation context.
-   * @param params.3 skipTxValidation - Optional: Flag to skip validation. Defaults to `false`.
-   * @param params.4 skipFeeEnforcement - Optional: Flag to skip fee enforcement. Defaults to `false`.
+   * @param params.2 skipTxValidation - Optional: Flag to skip validation. Defaults to `false`.
+   * @param params.3 skipFeeEnforcement - Optional: Flag to skip fee enforcement. Defaults to `false`.
+   * @param params.4 overrides - Optional: {@link SimulationOverrides} for simulation context (includes msgSender).
+   * @param params.5 scopes - Optional: Array of {@link AztecAddress} scopes for the simulation.
    * @returns result - The {@link TxSimulationResult}.
    */
   aztec_simulateTx: {
     params: [
       TxExecutionRequest,
       (boolean | undefined)?, // simulatePublic
-      (AztecAddress | undefined)?, // msgSender
       (boolean | undefined)?, // skipTxValidation
       (boolean | undefined)?, // skipFeeEnforcement
+      (SimulationOverrides | undefined)?, // overrides (includes msgSender)
+      (AztecAddress[] | undefined)?, // scopes
     ];
     result: TxSimulationResult;
   };

package/src/wallet/create-node.test.ts

@@ -1,9 +1,9 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createAztecWalletNode } from './create-node.js';
-import { JSONRPCNode } from '@walletmesh/jsonrpc';
 import type { AccountWallet, PXE } from '@aztec/aztec.js';
 import type { JSONRPCTransport } from '@walletmesh/jsonrpc';
+import { JSONRPCNode } from '@walletmesh/jsonrpc';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { ContractArtifactCache } from '../contractArtifactCache.js';
+import { createAztecWalletNode } from './create-node.js';
 import type { AztecHandlerContext } from './handlers/index.js';
 
 // Mock dependencies

package/src/wallet/create-node.ts

@@ -6,11 +6,10 @@
  */
 
 import type { AccountWallet, PXE } from '@aztec/aztec.js';
-import { JSONRPCNode, type JSONRPCTransport, type JSONRPCEventMap } from '@walletmesh/jsonrpc';
-
-import type { AztecWalletMethodMap } from '../types.js';
+import { type JSONRPCEventMap, JSONRPCNode, type JSONRPCTransport } from '@walletmesh/jsonrpc';
 import { ContractArtifactCache } from '../contractArtifactCache.js';
-import { createAztecHandlers, type AztecHandlerContext } from './handlers/index.js';
+import type { AztecWalletMethodMap } from '../types.js';
+import { type AztecHandlerContext, createAztecHandlers } from './handlers/index.js';
 import { registerAztecSerializers } from './serializers.js';
 
 /**

package/src/wallet/handlers/account.test.ts

@@ -1,17 +1,17 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createAccountHandlers } from './account.js';
 import type {
   AccountWallet,
-  PXE,
+  AuthWitness,
   AztecAddress,
   CompleteAddress,
-  AuthWitness,
   FunctionSelector,
   FunctionType,
+  PXE,
 } from '@aztec/aztec.js';
-import type { AztecHandlerContext } from './index.js';
-import type { ContractArtifactCache } from '../../contractArtifactCache.js';
 import { Fr } from '@aztec/aztec.js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { ContractArtifactCache } from '../../contractArtifactCache.js';
+import { createAccountHandlers } from './account.js';
+import type { AztecHandlerContext } from './index.js';
 
 // Mock dependencies
 const createMockWallet = () =>

package/src/wallet/handlers/account.ts

@@ -1,6 +1,6 @@
-import type { AztecHandlerContext } from './index.js';
-import type { AztecWalletMethodMap } from '../../types.js';
 import { createLogger } from '@aztec/foundation/log';
+import type { AztecWalletMethodMap } from '../../types.js';
+import type { AztecHandlerContext } from './index.js';
 
 const logger = createLogger('aztec-rpc-wallet:account');
 

package/src/wallet/handlers/contract-interaction.test.ts

@@ -1,10 +1,9 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { AztecAddress, FeeJuicePaymentMethod, Fr, TxHash, type TxReceipt } from '@aztec/aztec.js';
+import type { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { GasFees } from '@aztec/stdlib/gas';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { createContractInteractionHandlers } from './contract-interaction.js';
 import type { AztecHandlerContext } from './index.js';
-import { AztecAddress, Fr, type TxReceipt, TxHash } from '@aztec/aztec.js';
-import { GasFees } from '@aztec/stdlib/gas';
-import { FeeJuicePaymentMethod } from '@aztec/aztec.js';
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 
 // Mock the aztec.js module
 vi.mock('@aztec/aztec.js', async () => {
@@ -39,7 +38,7 @@ describe('createContractInteractionHandlers', () => {
     mockContext = {
       wallet: {
         getAddress: vi.fn().mockReturnValue(mockAddress),
-        getCurrentBaseFees: vi.fn().mockResolvedValue(new GasFees(new Fr(100n), new Fr(100n))),
+        getCurrentBaseFees: vi.fn().mockResolvedValue(new GasFees(100n, 100n)),
         createTxExecutionRequest: vi.fn().mockResolvedValue({}),
         simulateTx: vi.fn().mockResolvedValue({ privateExecutionResult: {} }),
         proveTx: vi.fn().mockResolvedValue({ toTx: vi.fn().mockReturnValue({}) }),
@@ -225,7 +224,7 @@ describe('createContractInteractionHandlers', () => {
       const callOrder: string[] = [];
       vi.mocked(mockContext.wallet.getCurrentBaseFees).mockImplementation(async () => {
         callOrder.push('getCurrentBaseFees');
-        return new GasFees(new Fr(100n), new Fr(100n));
+        return new GasFees(100n, 100n);
       });
       vi.mocked(mockDeployMethod.prove).mockImplementation(async () => {
         callOrder.push('prove');

package/src/wallet/handlers/contract-interaction.ts

@@ -1,11 +1,11 @@
-import type { AztecHandlerContext } from './index.js';
-import type { AztecWalletMethodMap } from '../../types.js';
-import { Contract, FeeJuicePaymentMethod, Fr, type DeployOptions, type TxHash } from '@aztec/aztec.js';
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { Contract, type DeployOptions, FeeJuicePaymentMethod, Fr, type TxHash } from '@aztec/aztec.js';
 import type { FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces';
-import { GasSettings } from '@aztec/stdlib/gas';
+import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { createLogger } from '@aztec/foundation/log';
+import { GasSettings } from '@aztec/stdlib/gas';
 import type { TxExecutionRequest, TxSimulationResult } from '@aztec/stdlib/tx';
+import type { AztecWalletMethodMap } from '../../types.js';
+import type { AztecHandlerContext } from './index.js';
 
 const logger = createLogger('aztec-rpc-wallet:contract-interaction:handler');
 
@@ -239,8 +239,8 @@ export function createContractInteractionHandlers() {
           contractAddressSalt,
           fee: await getFeeOptions(ctx),
         };
-        if (txOpts.nonce) {
-          opts.nonce = txOpts.nonce;
+        if (txOpts.txNonce) {
+          opts.txNonce = txOpts.txNonce;
         }
         if (txOpts.cancellable) {
           opts.cancellable = txOpts.cancellable;

package/src/wallet/handlers/contract.test.ts

@@ -1,12 +1,12 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createContractHandlers } from './contract.js';
-import type { AccountWallet, PXE, AztecAddress } from '@aztec/aztec.js';
+import type { AccountWallet, AztecAddress, PXE } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { ContractClassMetadata, ContractMetadata } from '@aztec/stdlib/interfaces/client';
-import type { AztecHandlerContext } from './index.js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContractArtifactCache } from '../../contractArtifactCache.js';
-import { Fr } from '@aztec/aztec.js';
+import { createContractHandlers } from './contract.js';
+import type { AztecHandlerContext } from './index.js';
 
 // Mock dependencies
 const createMockWallet = () =>

package/src/wallet/handlers/contract.ts

@@ -1,8 +1,8 @@
+import { createLogger } from '@aztec/foundation/log';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { AztecWalletMethodMap } from '../../types.js';
 import type { AztecHandlerContext } from './index.js';
-import { createLogger } from '@aztec/foundation/log';
 
 const logger = createLogger('aztec-rpc-wallet:contract');
 

package/src/wallet/handlers/event.test.ts

@@ -1,9 +1,9 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createEventHandlers } from './event.js';
-import type { AccountWallet, PXE, AztecAddress } from '@aztec/aztec.js';
+import type { AccountWallet, AztecAddress, PXE } from '@aztec/aztec.js';
 import type { EventMetadataDefinition } from '@aztec/stdlib/interfaces/client';
-import type { AztecHandlerContext } from './index.js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContractArtifactCache } from '../../contractArtifactCache.js';
+import { createEventHandlers } from './event.js';
+import type { AztecHandlerContext } from './index.js';
 
 // Mock dependencies
 const createMockWallet = () =>

package/src/wallet/handlers/event.ts

@@ -1,6 +1,6 @@
-import type { AztecHandlerContext } from './index.js';
-import type { AztecWalletMethodMap } from '../../types.js';
 import { createLogger } from '@aztec/foundation/log';
+import type { AztecWalletMethodMap } from '../../types.js';
+import type { AztecHandlerContext } from './index.js';
 
 const logger = createLogger('aztec-rpc-wallet:event');
 

package/src/wallet/handlers/index.ts

@@ -4,12 +4,12 @@ import type { ContractArtifactCache } from '../../contractArtifactCache.js';
 import type { AztecWalletMethodMap } from '../../types.js';
 
 import { createAccountHandlers } from './account.js';
-import { createTransactionHandlers } from './transaction.js';
 import { createContractHandlers } from './contract.js';
 import { createContractInteractionHandlers } from './contract-interaction.js';
 import { createEventHandlers } from './event.js';
 import { createNodeHandlers } from './node.js';
 import { createSenderHandlers } from './senders.js';
+import { createTransactionHandlers } from './transaction.js';
 
 /**
  * Defines the context object that is passed to all Aztec wallet JSON-RPC method handlers.

package/src/wallet/handlers/node.test.ts

@@ -1,13 +1,12 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createNodeHandlers } from './node.js';
-import type { AccountWallet, PXE } from '@aztec/aztec.js';
+import type { AccountWallet, L2Block, PXE } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js';
 import type { NodeInfo } from '@aztec/stdlib/contract';
 import type { GasFees } from '@aztec/stdlib/gas';
 import type { PXEInfo } from '@aztec/stdlib/interfaces/client';
-import type { L2Block } from '@aztec/aztec.js';
-import type { AztecHandlerContext } from './index.js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContractArtifactCache } from '../../contractArtifactCache.js';
-import { Fr } from '@aztec/aztec.js';
+import type { AztecHandlerContext } from './index.js';
+import { createNodeHandlers } from './node.js';
 
 // Mock dependencies
 const createMockWallet = () =>

package/src/wallet/handlers/node.ts

@@ -1,6 +1,6 @@
-import type { AztecHandlerContext } from './index.js';
-import type { AztecWalletMethodMap } from '../../types.js';
 import { createLogger } from '@aztec/foundation/log';
+import type { AztecWalletMethodMap } from '../../types.js';
+import type { AztecHandlerContext } from './index.js';
 
 const logger = createLogger('aztec-rpc-wallet:node');
 

package/src/wallet/handlers/senders.test.ts

@@ -1,8 +1,8 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createSenderHandlers } from './senders.js';
-import type { AccountWallet, PXE, AztecAddress } from '@aztec/aztec.js';
-import type { AztecHandlerContext } from './index.js';
+import type { AccountWallet, AztecAddress, PXE } from '@aztec/aztec.js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { ContractArtifactCache } from '../../contractArtifactCache.js';
+import type { AztecHandlerContext } from './index.js';
+import { createSenderHandlers } from './senders.js';
 
 // Mock dependencies
 const createMockWallet = () =>

package/src/wallet/handlers/senders.ts

@@ -1,6 +1,6 @@
-import type { AztecHandlerContext } from './index.js';
-import type { AztecWalletMethodMap } from '../../types.js';
 import { createLogger } from '@aztec/foundation/log';
+import type { AztecWalletMethodMap } from '../../types.js';
+import type { AztecHandlerContext } from './index.js';
 
 const logger = createLogger('aztec-rpc-wallet:senders');
 

package/src/wallet/handlers/transaction.test.ts

@@ -1,19 +1,27 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { createTransactionHandlers } from './transaction.js';
-import type { AccountWallet, PXE, AztecAddress, TxHash, AuthWitness } from '@aztec/aztec.js';
-import type { TxExecutionRequest, Tx, TxReceipt } from '@aztec/aztec.js';
-// import type { FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces'; // Unused
-// import type { ExecutionPayload } from '@aztec/entrypoints/payload'; // Unused
-import type { AztecHandlerContext } from './index.js';
-import type { ContractArtifactCache } from '../../contractArtifactCache.js';
+import type {
+  AccountWallet,
+  AuthWitness,
+  AztecAddress,
+  PXE,
+  Tx,
+  TxExecutionRequest,
+  TxHash,
+  TxReceipt,
+} from '@aztec/aztec.js';
 import { Fr } from '@aztec/aztec.js';
 import type {
   PrivateExecutionResult,
+  TxProfileResult,
   TxProvingResult,
   TxSimulationResult,
-  TxProfileResult,
   UtilitySimulationResult,
 } from '@aztec/stdlib/tx';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import type { ContractArtifactCache } from '../../contractArtifactCache.js';
+// import type { FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces'; // Unused
+// import type { ExecutionPayload } from '@aztec/entrypoints/payload'; // Unused
+import type { AztecHandlerContext } from './index.js';
+import { createTransactionHandlers } from './transaction.js';
 
 // Mock dependencies
 const createMockWallet = () =>
@@ -175,9 +183,10 @@ describe('Transaction Handlers', () => {
         txRequest: { exec: { calls: [] } },
       } as unknown as TxExecutionRequest;
       const simulatePublic = true;
-      const msgSender = '0x1234567890abcdef' as unknown as AztecAddress;
       const skipTxValidation = true;
       const skipFeeEnforcement = true;
+      const msgSender = '0x1234567890abcdef' as unknown as AztecAddress;
+      const overrides = { msgSender };
 
       const expectedSimulation = {
         txRequest,
@@ -190,17 +199,17 @@ describe('Transaction Handlers', () => {
       const result = await handlers.aztec_simulateTx(context, [
         txRequest,
         simulatePublic,
-        msgSender,
         skipTxValidation,
         skipFeeEnforcement,
+        overrides,
       ]);
 
       expect(mockWallet.simulateTx).toHaveBeenCalledWith(
         txRequest,
         simulatePublic,
-        msgSender,
         skipTxValidation,
         skipFeeEnforcement,
+        overrides,
       );
       expect(result).toBe(expectedSimulation);
     });
@@ -226,7 +235,7 @@ describe('Transaction Handlers', () => {
         undefined,
       ]);
 
-      expect(mockWallet.simulateTx).toHaveBeenCalledWith(txRequest, false, undefined, undefined, false);
+      expect(mockWallet.simulateTx).toHaveBeenCalledWith(txRequest, false, undefined, false, undefined);
       expect(result).toBe(expectedSimulation);
     });
 

package/src/wallet/handlers/transaction.ts

@@ -1,6 +1,6 @@
-import type { AztecHandlerContext } from './index.js';
-import type { AztecWalletMethodMap } from '../../types.js';
 import { createLogger } from '@aztec/foundation/log';
+import type { AztecWalletMethodMap } from '../../types.js';
+import type { AztecHandlerContext } from './index.js';
 
 const logger = createLogger('aztec-rpc-wallet:transaction');
 
@@ -139,9 +139,10 @@ export function createTransactionHandlers() {
      *                      Defined by {@link AztecWalletMethodMap.aztec_simulateTx.params}.
      * @param paramsTuple.0 - The {@link TxExecutionRequest} to simulate.
      * @param paramsTuple.1 - Optional: Boolean indicating whether to simulate public parts of the transaction. Defaults to `false`.
-     * @param paramsTuple.2 - Optional: The {@link AztecAddress} of the message sender for simulation context.
-     * @param paramsTuple.3 - Optional: Boolean flag to skip transaction validation during simulation.
-     * @param paramsTuple.4 - Optional: Boolean flag to skip fee enforcement during simulation.
+     * @param paramsTuple.2 - Optional: Boolean flag to skip transaction validation during simulation.
+     * @param paramsTuple.3 - Optional: Boolean flag to skip fee enforcement during simulation.
+     * @param paramsTuple.4 - Optional: {@link SimulationOverrides} for simulation context (includes msgSender).
+     * @param paramsTuple.5 - Optional: Array of {@link AztecAddress} scopes for the simulation.
      * @returns A promise that resolves to the {@link TxSimulationResult}.
      *          Type defined by {@link AztecWalletMethodMap.aztec_simulateTx.result}.
      * @throws {Error} If the `txRequest` parameter is missing or invalid.
@@ -153,9 +154,9 @@ export function createTransactionHandlers() {
       const [
         txRequest,
         simulatePublicInput, // simulatePublic is optional in PXE interface
-        msgSender,
         skipTxValidation,
         skipFeeEnforcementInput, // skipFeeEnforcement is optional in PXE interface
+        overrides, // SimulationOverrides which may contain msgSender
       ] = paramsTuple;
       // Handle optional params with defaults if necessary, matching PXE behavior
       const simulatePublic = simulatePublicInput === undefined ? false : simulatePublicInput;
@@ -166,12 +167,14 @@ export function createTransactionHandlers() {
         // txRequest is mandatory
         throw new Error('Invalid txRequest parameter received in tuple');
       }
+
+      // Call with the parameters that the underlying wallet expects
       return await ctx.wallet.simulateTx(
         txRequest,
         simulatePublic,
-        msgSender,
         skipTxValidation,
         skipFeeEnforcement,
+        overrides,
       );
     },