@toruslabs/ethereum-controllers 8.4.2 → 8.4.4

package/dist/ethereumControllers.umd.min.js.LICENSE.txt

@@ -33,7 +33,3 @@
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /*! scure-base - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-
-/*! scure-bip32 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) */
-
-/*! scure-bip39 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) */

package/dist/lib.cjs/AccountAbstraction/AccountAbstractionController.js

@@ -147,7 +147,7 @@ class AccountAbstractionController extends baseControllers.BaseController {
       calls: [{
         to: txParams.to,
         // Explicit conversation required to avoid value being passed as hex
-        value: BigInt(txParams.value),
+        value: txParams.value ? BigInt(txParams.value) : undefined,
         data: txParams.data
       }],
       maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
@@ -186,6 +186,42 @@ class AccountAbstractionController extends baseControllers.BaseController {
     });
     return txReceipt.receipt.transactionHash;
   }
+  async signTransaction(id, tx, address) {
+    var _txParams$chainId2;
+    if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) {
+      throw new Error("Invalid address");
+    }
+    const txParams = tx;
+    const userOpMeta = {
+      transactionParams: txParams,
+      chainId: (_txParams$chainId2 = txParams.chainId) !== null && _txParams$chainId2 !== void 0 ? _txParams$chainId2 : this.getProviderConfig().chainId,
+      createdAt: new Date(),
+      status: baseControllers.TransactionStatus.approved
+    };
+    this.updateUserOpMeta(id, userOpMeta);
+    const request = await this.bundlerClient.prepareUserOperation({
+      account: this.smartAccount,
+      calls: [{
+        to: txParams.to,
+        // Explicit conversation required to avoid value being passed as hex
+        value: txParams.value ? BigInt(txParams.value) : undefined,
+        data: txParams.data
+      }],
+      maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
+      maxPriorityFeePerGas: txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined,
+      callGasLimit: txParams.callGasLimit ? BigInt(txParams.callGasLimit) : undefined,
+      preVerificationGas: txParams.preVerificationGas ? BigInt(txParams.preVerificationGas) : undefined,
+      verificationGasLimit: txParams.verificationGasLimit ? BigInt(txParams.verificationGasLimit) : undefined,
+      paymasterVerificationGasLimit: txParams.paymasterVerificationGasLimit ? BigInt(txParams.paymasterVerificationGasLimit) : undefined,
+      paymasterPostOpGasLimit: txParams.paymasterPostOpGasLimit ? BigInt(txParams.paymasterPostOpGasLimit) : undefined
+    });
+    const signature = await this.smartAccount.signUserOperation(request);
+    this.updateUserOpMeta(id, {
+      signature,
+      status: baseControllers.TransactionStatus.signed
+    });
+    return signature;
+  }
   async estimateGas(txParams, address) {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) throw new Error("Invalid address");
     const calls = [{

package/dist/lib.cjs/Network/createEthereumMiddleware.js

@@ -290,11 +290,45 @@ function createRequestAccountsMiddleware({
     return undefined;
   });
 }
+/**
+ * Middleware to handle bundler/paymaster rpc method
+ */
+function createAAMiddleware({
+  bundlerUrl,
+  paymasterUrl
+}) {
+  // forward request to bundler/paymaster
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const middlewares = [];
+  const bundlerFetchMiddleware = baseControllers.createFetchMiddleware({
+    rpcTarget: bundlerUrl
+  });
+  // NOTE: bundler/paymaster rpc only accept number as request id, we might need to handle that here if client doesn't handle request id themselves
+  middlewares.push((request, response, next, end) => {
+    if (!constants.BUNDLER_METHOD_TYPES.includes(request.method)) {
+      return next();
+    }
+    bundlerFetchMiddleware(request, response, next, end);
+  });
+  if (paymasterUrl) {
+    const paymasterFetchMiddleware = baseControllers.createFetchMiddleware({
+      rpcTarget: paymasterUrl
+    });
+    middlewares.push((request, response, next, end) => {
+      if (!constants.PAYMASTER_METHOD_TYPES.includes(request.method)) {
+        return next();
+      }
+      paymasterFetchMiddleware(request, response, next, end);
+    });
+  }
+  return auth.mergeMiddleware(middlewares);
+}
 function createEthereumMiddleware(providerHandlers) {
   const {
     requestAccounts,
     getAccounts,
     getPrivateKey,
+    getPublicKey,
     processTransaction,
     processSignTransaction,
     processEstimateUserOperationGas,
@@ -307,16 +341,17 @@ function createEthereumMiddleware(providerHandlers) {
     processWalletSwitchChain,
     processAddEthereumChain,
     getProviderState,
+    aaConfig,
     version
   } = providerHandlers;
-  return auth.mergeMiddleware([auth.createScaffoldMiddleware({
+  const middlewares = [auth.createScaffoldMiddleware({
     version,
     [baseControllers.PROVIDER_JRPC_METHODS.GET_PROVIDER_STATE]: getProviderState
   }), createRequestAccountsMiddleware({
     requestAccounts
   }), createGetAccountsMiddleware({
     getAccounts
-  }), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createProcessTransactionMiddleware({
+  }), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.PRIVATE_KEY, getPrivateKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.ETH_PUBLIC_KEY, getPublicKey), baseControllers.createGenericJRPCMiddleware(constants.METHOD_TYPES.PUBLIC_KEY, getPublicKey), createProcessTransactionMiddleware({
     processTransaction
   }), createProcessSignTransactionMiddleware({
     processSignTransaction
@@ -338,9 +373,17 @@ function createEthereumMiddleware(providerHandlers) {
     processWalletSwitchChain
   }), createProcessAddEthereumChain({
     processAddEthereumChain
-  })]);
+  })];
+  if (aaConfig) {
+    middlewares.push(createAAMiddleware({
+      bundlerUrl: aaConfig.bundlerUrl,
+      paymasterUrl: aaConfig.paymasterUrl
+    }));
+  }
+  return auth.mergeMiddleware(middlewares);
 }
 
+exports.createAAMiddleware = createAAMiddleware;
 exports.createEthereumMiddleware = createEthereumMiddleware;
 exports.createGetAccountsMiddleware = createGetAccountsMiddleware;
 exports.createPendingNonceMiddleware = createPendingNonceMiddleware;

package/dist/lib.cjs/index.js

@@ -66,6 +66,7 @@ exports.validateAddress = utils.validateAddress;
 exports.validateSignMessageData = utils.validateSignMessageData;
 exports.validateSwitchChainData = utils.validateSwitchChainData;
 exports.validateTypedSignMessageDataV4 = utils.validateTypedSignMessageDataV4;
+exports.createAAMiddleware = createEthereumMiddleware.createAAMiddleware;
 exports.createEthereumMiddleware = createEthereumMiddleware.createEthereumMiddleware;
 exports.createGetAccountsMiddleware = createEthereumMiddleware.createGetAccountsMiddleware;
 exports.createPendingNonceMiddleware = createEthereumMiddleware.createPendingNonceMiddleware;
@@ -126,6 +127,7 @@ exports.BASE_CHAIN_ID = constants.BASE_CHAIN_ID;
 exports.BASE_TESTNET_CHAIN_ID = constants.BASE_TESTNET_CHAIN_ID;
 exports.BSC_MAINNET_CHAIN_ID = constants.BSC_MAINNET_CHAIN_ID;
 exports.BSC_TESTNET_CHAIN_ID = constants.BSC_TESTNET_CHAIN_ID;
+exports.BUNDLER_METHOD_TYPES = constants.BUNDLER_METHOD_TYPES;
 exports.CELO_MAINNET_CHAIN_ID = constants.CELO_MAINNET_CHAIN_ID;
 exports.CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP = constants.CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP;
 exports.COINGECKO_PLATFORMS_CHAIN_CODE_MAP = constants.COINGECKO_PLATFORMS_CHAIN_CODE_MAP;
@@ -149,6 +151,7 @@ exports.MM_TOKEN_API_SUPPORTED_CHAINS = constants.MM_TOKEN_API_SUPPORTED_CHAINS;
 exports.OLD_ERC721_LIST = constants.OLD_ERC721_LIST;
 exports.OPTIMISM_MAINNET_CHAIN_ID = constants.OPTIMISM_MAINNET_CHAIN_ID;
 exports.OPTIMISM_TESTNET_CHAIN_ID = constants.OPTIMISM_TESTNET_CHAIN_ID;
+exports.PAYMASTER_METHOD_TYPES = constants.PAYMASTER_METHOD_TYPES;
 exports.POLYGON_AMOY_CHAIN_ID = constants.POLYGON_AMOY_CHAIN_ID;
 exports.POLYGON_CHAIN_ID = constants.POLYGON_CHAIN_ID;
 exports.SEPOLIA_CHAIN_ID = constants.SEPOLIA_CHAIN_ID;

package/dist/lib.cjs/types/AccountAbstraction/AccountAbstractionController.d.ts

@@ -1,14 +1,15 @@
-import { BaseConfig, BaseController, BaseState, TransactionStatus } from "@toruslabs/base-controllers";
-import { JRPCMiddleware, JRPCRequest, JRPCResponse, SafeEventEmitterProvider } from "@web3auth/auth";
-import { WalletClient } from "viem";
-import { BundlerClient, SmartAccount } from "viem/account-abstraction";
-import { NetworkController } from "../Network/NetworkController";
-import { BundlerConfig, EthereumNetworkState, ISmartAccount, PaymasterConfig, SignTypedDataMessageV4, SmartAccountType, TransactionParams, UserOperationGas } from "../utils/interfaces";
+import { type BaseConfig, BaseController, type BaseState, TransactionStatus } from "@toruslabs/base-controllers";
+import { JRPCMiddleware, type JRPCRequest, type JRPCResponse, type SafeEventEmitterProvider } from "@web3auth/auth";
+import { type WalletClient } from "viem";
+import { type BundlerClient, type SmartAccount } from "viem/account-abstraction";
+import { type NetworkController } from "../Network/NetworkController";
+import type { BundlerConfig, EthereumNetworkState, ISmartAccount, PaymasterConfig, SignTypedDataMessageV4, SmartAccountType, TransactionParams, UserOperationGas } from "../utils/interfaces";
 export interface UserOperationMeta {
     transactionParams: TransactionParams;
     userOpHash?: string;
     status: TransactionStatus;
     chainId: string;
+    signature?: string;
     createdAt: Date;
     receipt?: {
         transactionHash: string;
@@ -50,6 +51,7 @@ export declare class AccountAbstractionController extends BaseController<Account
     get walletClient(): WalletClient | null;
     setupProvider(eoaProvider: SafeEventEmitterProvider, eoaAddress: string): Promise<void>;
     sendTransaction(id: string, tx: TransactionParams, address: string): Promise<string>;
+    signTransaction(id: string, tx: TransactionParams, address: string): Promise<string>;
     estimateGas(txParams: TransactionParams, address: string): Promise<UserOperationGas>;
     signMessage(message: string, address: string): Promise<string>;
     signPersonalMessage(message: string, address: string): Promise<string>;

package/dist/lib.cjs/types/Network/createEthereumMiddleware.d.ts

@@ -3,9 +3,14 @@ import { JRPCEngineEndCallback, JRPCEngineNextCallback, JRPCMiddleware, JRPCRequ
 import { AddChainMessageParams, BlockParams, EthereumTransactionMeta, TransactionParams, TransactionRPCMeta, TypedMessageParams, UserOperationGas } from "../utils/interfaces";
 export interface IProviderHandlers {
     version: string;
+    aaConfig?: {
+        bundlerUrl: string;
+        paymasterUrl?: string;
+    };
     requestAccounts?: (req: JRPCRequest<string[]>) => Promise<string[]>;
     getAccounts: (req: JRPCRequest<string[]>) => Promise<string[]>;
     getPrivateKey?: (req: JRPCRequest<unknown>) => Promise<string>;
+    getPublicKey?: (req: JRPCRequest<unknown>) => Promise<string>;
     processTransaction?: (txParams: TransactionParams, req: JRPCRequest<TransactionParams> & UserRequestApprovalParams) => Promise<string>;
     processSignTransaction?: (txParams: TransactionParams, req: JRPCRequest<TransactionParams> & UserRequestApprovalParams) => Promise<string>;
     processEthSignMessage?: (msgParams: MessageParams, req: JRPCRequest<unknown> & UserRequestApprovalParams) => Promise<string>;
@@ -68,4 +73,11 @@ export declare function createProcessAddEthereumChain({ processAddEthereumChain,
 export declare function createRequestAccountsMiddleware({ requestAccounts, }: {
     requestAccounts: IProviderHandlers["requestAccounts"];
 }): JRPCMiddleware<string[], unknown>;
+/**
+ * Middleware to handle bundler/paymaster rpc method
+ */
+export declare function createAAMiddleware({ bundlerUrl, paymasterUrl }: {
+    bundlerUrl: string;
+    paymasterUrl?: string;
+}): JRPCMiddleware<unknown, unknown>;
 export declare function createEthereumMiddleware(providerHandlers: IProviderHandlers): JRPCMiddleware<unknown, unknown>;

package/dist/lib.cjs/types/utils/constants.d.ts

@@ -32,6 +32,20 @@ export declare const METHOD_TYPES: {
     readonly ETH_TRANSACTION: "eth_sendTransaction";
     readonly ETH_SIGN_TRANSACTION: "eth_signTransaction";
     readonly ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas";
+    readonly ETH_GET_SUPPORTED_ENTRY_POINTS: "eth_supportedEntryPoints";
+    readonly ETH_GET_USER_OPERATION: "eth_getUserOperationByHash";
+    readonly ETH_GET_USER_OPERATION_RECEIPT: "eth_getUserOperationReceipt";
+    readonly ETH_SEND_USER_OPERATION: "eth_sendUserOperation";
+    readonly PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice";
+    readonly PIMLICO_GET_USER_OPERATION_STATUS: "pimlico_getUserOperationStatus";
+    readonly PIMLICO_SIMULATE_ASSET_CHANGES: "pimlico_simulateAssetChanges";
+    readonly BICONOMY_GET_GAS_FEE_VALUES: "biconomy_getGasFeeValues";
+    readonly BICONOMY_GET_USER_OPERATION_STATUS: "biconomy_getUserOperationStatus";
+    readonly ETH_GET_PAYMASTER_DATA: "pm_getPaymasterData";
+    readonly ETH_GET_PAYMASTER_STUB_DATA: "pm_getPaymasterStubData";
+    readonly ETH_SPONSOR_USER_OPERATION: "pm_sponsorUserOperation";
+    readonly ETH_GET_FEE_QUOTE_OR_DATA: "pm_getFeeQuoteOrData";
+    readonly PIMLICO_GET_TOKEN_QUOTES: "pimlico_getTokenQuotes";
     readonly ETH_REQUEST_ACCOUNTS: "eth_requestAccounts";
     readonly ETH_SEND_RAW_TRANSACTION: "eth_sendRawTransaction";
     readonly ETH_SIGN: "eth_sign";
@@ -46,9 +60,13 @@ export declare const METHOD_TYPES: {
     readonly ETH_GET_GAS_PRICE: "eth_gasPrice";
     readonly ETH_PRIVATE_KEY: "eth_privateKey";
     readonly PRIVATE_KEY: "private_key";
+    readonly ETH_PUBLIC_KEY: "eth_publicKey";
+    readonly PUBLIC_KEY: "public_key";
     readonly SWITCH_CHAIN: "wallet_switchEthereumChain";
     readonly ADD_CHAIN: "wallet_addEthereumChain";
 };
+export declare const BUNDLER_METHOD_TYPES: readonly ["eth_estimateUserOperationGas", "eth_supportedEntryPoints", "eth_getUserOperationByHash", "eth_getUserOperationReceipt", "eth_sendUserOperation", "pimlico_getUserOperationGasPrice", "pimlico_getUserOperationStatus", "pimlico_simulateAssetChanges", "biconomy_getGasFeeValues", "biconomy_getUserOperationStatus"];
+export declare const PAYMASTER_METHOD_TYPES: readonly ["pm_getPaymasterData", "pm_getPaymasterStubData", "pm_sponsorUserOperation", "pimlico_getTokenQuotes", "pm_getFeeQuoteOrData"];
 export declare const TRANSACTION_ENVELOPE_TYPES: {
     readonly LEGACY: "0x0";
     readonly ACCESS_LIST: "0x1";

package/dist/lib.cjs/utils/constants.js

@@ -231,7 +231,25 @@ const METHOD_TYPES = {
   GET_ACCOUNTS: "eth_accounts",
   ETH_TRANSACTION: "eth_sendTransaction",
   ETH_SIGN_TRANSACTION: "eth_signTransaction",
+  // start bundler methods
   ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas",
+  ETH_GET_SUPPORTED_ENTRY_POINTS: "eth_supportedEntryPoints",
+  ETH_GET_USER_OPERATION: "eth_getUserOperationByHash",
+  ETH_GET_USER_OPERATION_RECEIPT: "eth_getUserOperationReceipt",
+  ETH_SEND_USER_OPERATION: "eth_sendUserOperation",
+  PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice",
+  PIMLICO_GET_USER_OPERATION_STATUS: "pimlico_getUserOperationStatus",
+  PIMLICO_SIMULATE_ASSET_CHANGES: "pimlico_simulateAssetChanges",
+  BICONOMY_GET_GAS_FEE_VALUES: "biconomy_getGasFeeValues",
+  BICONOMY_GET_USER_OPERATION_STATUS: "biconomy_getUserOperationStatus",
+  // end bundler methods
+  // start paymaster methods
+  ETH_GET_PAYMASTER_DATA: "pm_getPaymasterData",
+  ETH_GET_PAYMASTER_STUB_DATA: "pm_getPaymasterStubData",
+  ETH_SPONSOR_USER_OPERATION: "pm_sponsorUserOperation",
+  ETH_GET_FEE_QUOTE_OR_DATA: "pm_getFeeQuoteOrData",
+  PIMLICO_GET_TOKEN_QUOTES: "pimlico_getTokenQuotes",
+  // end paymaster methods
   ETH_REQUEST_ACCOUNTS: "eth_requestAccounts",
   ETH_SEND_RAW_TRANSACTION: "eth_sendRawTransaction",
   ETH_SIGN: "eth_sign",
@@ -246,9 +264,13 @@ const METHOD_TYPES = {
   ETH_GET_GAS_PRICE: "eth_gasPrice",
   ETH_PRIVATE_KEY: "eth_privateKey",
   PRIVATE_KEY: "private_key",
+  ETH_PUBLIC_KEY: "eth_publicKey",
+  PUBLIC_KEY: "public_key",
   SWITCH_CHAIN: "wallet_switchEthereumChain",
   ADD_CHAIN: "wallet_addEthereumChain"
 };
+const BUNDLER_METHOD_TYPES = [METHOD_TYPES.ETH_ESTIMATE_USER_OPERATION_GAS, METHOD_TYPES.ETH_GET_SUPPORTED_ENTRY_POINTS, METHOD_TYPES.ETH_GET_USER_OPERATION, METHOD_TYPES.ETH_GET_USER_OPERATION_RECEIPT, METHOD_TYPES.ETH_SEND_USER_OPERATION, METHOD_TYPES.PIMLICO_GET_USER_OPERATION_GAS_PRICE, METHOD_TYPES.PIMLICO_GET_USER_OPERATION_STATUS, METHOD_TYPES.PIMLICO_SIMULATE_ASSET_CHANGES, METHOD_TYPES.BICONOMY_GET_GAS_FEE_VALUES, METHOD_TYPES.BICONOMY_GET_USER_OPERATION_STATUS];
+const PAYMASTER_METHOD_TYPES = [METHOD_TYPES.ETH_GET_PAYMASTER_DATA, METHOD_TYPES.ETH_GET_PAYMASTER_STUB_DATA, METHOD_TYPES.ETH_SPONSOR_USER_OPERATION, METHOD_TYPES.PIMLICO_GET_TOKEN_QUOTES, METHOD_TYPES.ETH_GET_FEE_QUOTE_OR_DATA];
 const TRANSACTION_ENVELOPE_TYPES = {
   LEGACY: "0x0",
   ACCESS_LIST: "0x1",
@@ -347,6 +369,7 @@ exports.BASE_CHAIN_ID = BASE_CHAIN_ID;
 exports.BASE_TESTNET_CHAIN_ID = BASE_TESTNET_CHAIN_ID;
 exports.BSC_MAINNET_CHAIN_ID = BSC_MAINNET_CHAIN_ID;
 exports.BSC_TESTNET_CHAIN_ID = BSC_TESTNET_CHAIN_ID;
+exports.BUNDLER_METHOD_TYPES = BUNDLER_METHOD_TYPES;
 exports.CELO_MAINNET_CHAIN_ID = CELO_MAINNET_CHAIN_ID;
 exports.CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP = CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP;
 exports.COINGECKO_PLATFORMS_CHAIN_CODE_MAP = COINGECKO_PLATFORMS_CHAIN_CODE_MAP;
@@ -370,6 +393,7 @@ exports.MM_TOKEN_API_SUPPORTED_CHAINS = MM_TOKEN_API_SUPPORTED_CHAINS;
 exports.OLD_ERC721_LIST = OLD_ERC721_LIST;
 exports.OPTIMISM_MAINNET_CHAIN_ID = OPTIMISM_MAINNET_CHAIN_ID;
 exports.OPTIMISM_TESTNET_CHAIN_ID = OPTIMISM_TESTNET_CHAIN_ID;
+exports.PAYMASTER_METHOD_TYPES = PAYMASTER_METHOD_TYPES;
 exports.POLYGON_AMOY_CHAIN_ID = POLYGON_AMOY_CHAIN_ID;
 exports.POLYGON_CHAIN_ID = POLYGON_CHAIN_ID;
 exports.SEPOLIA_CHAIN_ID = SEPOLIA_CHAIN_ID;

package/dist/lib.esm/AccountAbstraction/AccountAbstractionController.js

@@ -146,7 +146,7 @@ class AccountAbstractionController extends BaseController {
       calls: [{
         to: txParams.to,
         // Explicit conversation required to avoid value being passed as hex
-        value: BigInt(txParams.value),
+        value: txParams.value ? BigInt(txParams.value) : undefined,
         data: txParams.data
       }],
       maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
@@ -185,6 +185,42 @@ class AccountAbstractionController extends BaseController {
     });
     return txReceipt.receipt.transactionHash;
   }
+  async signTransaction(id, tx, address) {
+    var _txParams$chainId2;
+    if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) {
+      throw new Error("Invalid address");
+    }
+    const txParams = tx;
+    const userOpMeta = {
+      transactionParams: txParams,
+      chainId: (_txParams$chainId2 = txParams.chainId) !== null && _txParams$chainId2 !== void 0 ? _txParams$chainId2 : this.getProviderConfig().chainId,
+      createdAt: new Date(),
+      status: TransactionStatus.approved
+    };
+    this.updateUserOpMeta(id, userOpMeta);
+    const request = await this.bundlerClient.prepareUserOperation({
+      account: this.smartAccount,
+      calls: [{
+        to: txParams.to,
+        // Explicit conversation required to avoid value being passed as hex
+        value: txParams.value ? BigInt(txParams.value) : undefined,
+        data: txParams.data
+      }],
+      maxFeePerGas: txParams.maxFeePerGas ? BigInt(txParams.maxFeePerGas) : undefined,
+      maxPriorityFeePerGas: txParams.maxPriorityFeePerGas ? BigInt(txParams.maxPriorityFeePerGas) : undefined,
+      callGasLimit: txParams.callGasLimit ? BigInt(txParams.callGasLimit) : undefined,
+      preVerificationGas: txParams.preVerificationGas ? BigInt(txParams.preVerificationGas) : undefined,
+      verificationGasLimit: txParams.verificationGasLimit ? BigInt(txParams.verificationGasLimit) : undefined,
+      paymasterVerificationGasLimit: txParams.paymasterVerificationGasLimit ? BigInt(txParams.paymasterVerificationGasLimit) : undefined,
+      paymasterPostOpGasLimit: txParams.paymasterPostOpGasLimit ? BigInt(txParams.paymasterPostOpGasLimit) : undefined
+    });
+    const signature = await this.smartAccount.signUserOperation(request);
+    this.updateUserOpMeta(id, {
+      signature,
+      status: TransactionStatus.signed
+    });
+    return signature;
+  }
   async estimateGas(txParams, address) {
     if (address.toLowerCase() !== this.smartAccount.address.toLowerCase()) throw new Error("Invalid address");
     const calls = [{

package/dist/lib.esm/Network/createEthereumMiddleware.js

@@ -1,6 +1,6 @@
-import { PROVIDER_JRPC_METHODS, createGenericJRPCMiddleware } from '@toruslabs/base-controllers';
+import { PROVIDER_JRPC_METHODS, createFetchMiddleware, createGenericJRPCMiddleware } from '@toruslabs/base-controllers';
 import { createAsyncMiddleware, mergeMiddleware, createScaffoldMiddleware } from '@web3auth/auth';
-import { METHOD_TYPES, TRANSACTION_ENVELOPE_TYPES } from '../utils/constants.js';
+import { METHOD_TYPES, TRANSACTION_ENVELOPE_TYPES, BUNDLER_METHOD_TYPES, PAYMASTER_METHOD_TYPES } from '../utils/constants.js';
 
 function createGetAccountsMiddleware({
   getAccounts
@@ -288,11 +288,46 @@ function createRequestAccountsMiddleware({
     return undefined;
   });
 }
+
+/**
+ * Middleware to handle bundler/paymaster rpc method
+ */
+function createAAMiddleware({
+  bundlerUrl,
+  paymasterUrl
+}) {
+  // forward request to bundler/paymaster
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const middlewares = [];
+  const bundlerFetchMiddleware = createFetchMiddleware({
+    rpcTarget: bundlerUrl
+  });
+  // NOTE: bundler/paymaster rpc only accept number as request id, we might need to handle that here if client doesn't handle request id themselves
+  middlewares.push((request, response, next, end) => {
+    if (!BUNDLER_METHOD_TYPES.includes(request.method)) {
+      return next();
+    }
+    bundlerFetchMiddleware(request, response, next, end);
+  });
+  if (paymasterUrl) {
+    const paymasterFetchMiddleware = createFetchMiddleware({
+      rpcTarget: paymasterUrl
+    });
+    middlewares.push((request, response, next, end) => {
+      if (!PAYMASTER_METHOD_TYPES.includes(request.method)) {
+        return next();
+      }
+      paymasterFetchMiddleware(request, response, next, end);
+    });
+  }
+  return mergeMiddleware(middlewares);
+}
 function createEthereumMiddleware(providerHandlers) {
   const {
     requestAccounts,
     getAccounts,
     getPrivateKey,
+    getPublicKey,
     processTransaction,
     processSignTransaction,
     processEstimateUserOperationGas,
@@ -305,16 +340,17 @@ function createEthereumMiddleware(providerHandlers) {
     processWalletSwitchChain,
     processAddEthereumChain,
     getProviderState,
+    aaConfig,
     version
   } = providerHandlers;
-  return mergeMiddleware([createScaffoldMiddleware({
+  const middlewares = [createScaffoldMiddleware({
     version,
     [PROVIDER_JRPC_METHODS.GET_PROVIDER_STATE]: getProviderState
   }), createRequestAccountsMiddleware({
     requestAccounts
   }), createGetAccountsMiddleware({
     getAccounts
-  }), createGenericJRPCMiddleware(METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createProcessTransactionMiddleware({
+  }), createGenericJRPCMiddleware(METHOD_TYPES.ETH_PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(METHOD_TYPES.PRIVATE_KEY, getPrivateKey), createGenericJRPCMiddleware(METHOD_TYPES.ETH_PUBLIC_KEY, getPublicKey), createGenericJRPCMiddleware(METHOD_TYPES.PUBLIC_KEY, getPublicKey), createProcessTransactionMiddleware({
     processTransaction
   }), createProcessSignTransactionMiddleware({
     processSignTransaction
@@ -336,7 +372,14 @@ function createEthereumMiddleware(providerHandlers) {
     processWalletSwitchChain
   }), createProcessAddEthereumChain({
     processAddEthereumChain
-  })]);
+  })];
+  if (aaConfig) {
+    middlewares.push(createAAMiddleware({
+      bundlerUrl: aaConfig.bundlerUrl,
+      paymasterUrl: aaConfig.paymasterUrl
+    }));
+  }
+  return mergeMiddleware(middlewares);
 }
 
-export { createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSignTransactionMiddleware, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult };
+export { createAAMiddleware, createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSignTransactionMiddleware, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult };

package/dist/lib.esm/index.js

@@ -10,7 +10,7 @@ export { PersonalMessageController } from './Message/PersonalMessageController.j
 export { SwitchChainController } from './Message/SwitchChainController.js';
 export { TypedMessageController } from './Message/TypedMessageController.js';
 export { normalizeMessageData, validateAddChainData, validateAddress, validateSignMessageData, validateSwitchChainData, validateTypedSignMessageDataV4 } from './Message/utils.js';
-export { createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSignTransactionMiddleware, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult } from './Network/createEthereumMiddleware.js';
+export { createAAMiddleware, createEthereumMiddleware, createGetAccountsMiddleware, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessEstimateUserOperationGasMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSignTransactionMiddleware, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessageV4, createProcessWalletSwitchChain, createRequestAccountsMiddleware, formatTxMetaForRpcResult } from './Network/createEthereumMiddleware.js';
 export { createChainIdMiddleware, createJsonRpcClient, createProviderConfigMiddleware } from './Network/createJsonRpcClient.js';
 export { NetworkController } from './Network/NetworkController.js';
 export { NftHandler } from './Nfts/NftHandler.js';
@@ -27,7 +27,7 @@ export { generateHistoryEntry, replayHistory, snapshotFromTxMeta } from './Trans
 export { TransactionStateManager } from './Transaction/TransactionStateManager.js';
 export { determineTransactionType, ensureFieldIsString, ensureMutuallyExclusiveFieldsNotProvided, getFinalStates, isEIP1559Transaction, isLegacyTransaction, normalizeAndValidateTxParams, normalizeTxParameters, parseStandardTokenTransactionData, readAddressAsContract, transactionMatchesNetwork, validateFrom, validateRecipient, validateTxParameters } from './Transaction/TransactionUtils.js';
 export { erc1155Abi, erc20Abi, erc721Abi, singleBalanceCheckerAbi } from './utils/abis.js';
-export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, BASE_CHAIN_ID, BASE_TESTNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BSC_TESTNET_CHAIN_ID, CELO_MAINNET_CHAIN_ID, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ETH, ERC1155_INTERFACE_ID, ERC721_ENUMERABLE_INTERFACE_ID, ERC721_INTERFACE_ID, ERC721_METADATA_INTERFACE_ID, GAS_ESTIMATE_TYPES, LINEA_CHAIN_ID, LINEA_SEPOLIA_CHAIN_ID, LOCALHOST, MAINNET_CHAIN_ID, METHOD_TYPES, MM_NFT_API_SUPPORTED_CHAINS, MM_TOKEN_API_SUPPORTED_CHAINS, OLD_ERC721_LIST, OPTIMISM_MAINNET_CHAIN_ID, OPTIMISM_TESTNET_CHAIN_ID, POLYGON_AMOY_CHAIN_ID, POLYGON_CHAIN_ID, SEPOLIA_CHAIN_ID, SMART_ACCOUNT, SUPPORTED_NETWORKS, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, XDAI_CHAIN_ID } from './utils/constants.js';
+export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, BASE_CHAIN_ID, BASE_TESTNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BSC_TESTNET_CHAIN_ID, BUNDLER_METHOD_TYPES, CELO_MAINNET_CHAIN_ID, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ETH, ERC1155_INTERFACE_ID, ERC721_ENUMERABLE_INTERFACE_ID, ERC721_INTERFACE_ID, ERC721_METADATA_INTERFACE_ID, GAS_ESTIMATE_TYPES, LINEA_CHAIN_ID, LINEA_SEPOLIA_CHAIN_ID, LOCALHOST, MAINNET_CHAIN_ID, METHOD_TYPES, MM_NFT_API_SUPPORTED_CHAINS, MM_TOKEN_API_SUPPORTED_CHAINS, OLD_ERC721_LIST, OPTIMISM_MAINNET_CHAIN_ID, OPTIMISM_TESTNET_CHAIN_ID, PAYMASTER_METHOD_TYPES, POLYGON_AMOY_CHAIN_ID, POLYGON_CHAIN_ID, SEPOLIA_CHAIN_ID, SMART_ACCOUNT, SUPPORTED_NETWORKS, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, XDAI_CHAIN_ID } from './utils/constants.js';
 export { addCurrencies, conversionGTE, conversionGreaterThan, conversionLTE, conversionLessThan, conversionMax, conversionUtil, decGWEIToHexWEI, getBigNumber, hexWEIToDecGWEI, multiplyCurrencies, subtractCurrencies, toNegative } from './utils/conversionUtils.js';
 export { BNToHex, GAS_LIMITS, addEtherscanTransactions, bnLessThan, formatDate, formatPastTx, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId } from './utils/helpers.js';
 export { BiconomySmartAccount } from './AccountAbstraction/smartAccounts/BiconomySmartAccount.js';

package/dist/lib.esm/utils/constants.js

@@ -229,7 +229,25 @@ const METHOD_TYPES = {
   GET_ACCOUNTS: "eth_accounts",
   ETH_TRANSACTION: "eth_sendTransaction",
   ETH_SIGN_TRANSACTION: "eth_signTransaction",
+  // start bundler methods
   ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas",
+  ETH_GET_SUPPORTED_ENTRY_POINTS: "eth_supportedEntryPoints",
+  ETH_GET_USER_OPERATION: "eth_getUserOperationByHash",
+  ETH_GET_USER_OPERATION_RECEIPT: "eth_getUserOperationReceipt",
+  ETH_SEND_USER_OPERATION: "eth_sendUserOperation",
+  PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice",
+  PIMLICO_GET_USER_OPERATION_STATUS: "pimlico_getUserOperationStatus",
+  PIMLICO_SIMULATE_ASSET_CHANGES: "pimlico_simulateAssetChanges",
+  BICONOMY_GET_GAS_FEE_VALUES: "biconomy_getGasFeeValues",
+  BICONOMY_GET_USER_OPERATION_STATUS: "biconomy_getUserOperationStatus",
+  // end bundler methods
+  // start paymaster methods
+  ETH_GET_PAYMASTER_DATA: "pm_getPaymasterData",
+  ETH_GET_PAYMASTER_STUB_DATA: "pm_getPaymasterStubData",
+  ETH_SPONSOR_USER_OPERATION: "pm_sponsorUserOperation",
+  ETH_GET_FEE_QUOTE_OR_DATA: "pm_getFeeQuoteOrData",
+  PIMLICO_GET_TOKEN_QUOTES: "pimlico_getTokenQuotes",
+  // end paymaster methods
   ETH_REQUEST_ACCOUNTS: "eth_requestAccounts",
   ETH_SEND_RAW_TRANSACTION: "eth_sendRawTransaction",
   ETH_SIGN: "eth_sign",
@@ -244,9 +262,13 @@ const METHOD_TYPES = {
   ETH_GET_GAS_PRICE: "eth_gasPrice",
   ETH_PRIVATE_KEY: "eth_privateKey",
   PRIVATE_KEY: "private_key",
+  ETH_PUBLIC_KEY: "eth_publicKey",
+  PUBLIC_KEY: "public_key",
   SWITCH_CHAIN: "wallet_switchEthereumChain",
   ADD_CHAIN: "wallet_addEthereumChain"
 };
+const BUNDLER_METHOD_TYPES = [METHOD_TYPES.ETH_ESTIMATE_USER_OPERATION_GAS, METHOD_TYPES.ETH_GET_SUPPORTED_ENTRY_POINTS, METHOD_TYPES.ETH_GET_USER_OPERATION, METHOD_TYPES.ETH_GET_USER_OPERATION_RECEIPT, METHOD_TYPES.ETH_SEND_USER_OPERATION, METHOD_TYPES.PIMLICO_GET_USER_OPERATION_GAS_PRICE, METHOD_TYPES.PIMLICO_GET_USER_OPERATION_STATUS, METHOD_TYPES.PIMLICO_SIMULATE_ASSET_CHANGES, METHOD_TYPES.BICONOMY_GET_GAS_FEE_VALUES, METHOD_TYPES.BICONOMY_GET_USER_OPERATION_STATUS];
+const PAYMASTER_METHOD_TYPES = [METHOD_TYPES.ETH_GET_PAYMASTER_DATA, METHOD_TYPES.ETH_GET_PAYMASTER_STUB_DATA, METHOD_TYPES.ETH_SPONSOR_USER_OPERATION, METHOD_TYPES.PIMLICO_GET_TOKEN_QUOTES, METHOD_TYPES.ETH_GET_FEE_QUOTE_OR_DATA];
 const TRANSACTION_ENVELOPE_TYPES = {
   LEGACY: "0x0",
   ACCESS_LIST: "0x1",
@@ -338,4 +360,4 @@ const SMART_ACCOUNT = {
   METAMASK: "metamask"
 };
 
-export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, BASE_CHAIN_ID, BASE_TESTNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BSC_TESTNET_CHAIN_ID, CELO_MAINNET_CHAIN_ID, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ETH, ERC1155_INTERFACE_ID, ERC721_ENUMERABLE_INTERFACE_ID, ERC721_INTERFACE_ID, ERC721_METADATA_INTERFACE_ID, GAS_ESTIMATE_TYPES, LINEA_CHAIN_ID, LINEA_SEPOLIA_CHAIN_ID, LOCALHOST, MAINNET_CHAIN_ID, METHOD_TYPES, MM_NFT_API_SUPPORTED_CHAINS, MM_TOKEN_API_SUPPORTED_CHAINS, OLD_ERC721_LIST, OPTIMISM_MAINNET_CHAIN_ID, OPTIMISM_TESTNET_CHAIN_ID, POLYGON_AMOY_CHAIN_ID, POLYGON_CHAIN_ID, SEPOLIA_CHAIN_ID, SMART_ACCOUNT, SUPPORTED_NETWORKS, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, XDAI_CHAIN_ID };
+export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, BASE_CHAIN_ID, BASE_TESTNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BSC_TESTNET_CHAIN_ID, BUNDLER_METHOD_TYPES, CELO_MAINNET_CHAIN_ID, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ETH, ERC1155_INTERFACE_ID, ERC721_ENUMERABLE_INTERFACE_ID, ERC721_INTERFACE_ID, ERC721_METADATA_INTERFACE_ID, GAS_ESTIMATE_TYPES, LINEA_CHAIN_ID, LINEA_SEPOLIA_CHAIN_ID, LOCALHOST, MAINNET_CHAIN_ID, METHOD_TYPES, MM_NFT_API_SUPPORTED_CHAINS, MM_TOKEN_API_SUPPORTED_CHAINS, OLD_ERC721_LIST, OPTIMISM_MAINNET_CHAIN_ID, OPTIMISM_TESTNET_CHAIN_ID, PAYMASTER_METHOD_TYPES, POLYGON_AMOY_CHAIN_ID, POLYGON_CHAIN_ID, SEPOLIA_CHAIN_ID, SMART_ACCOUNT, SUPPORTED_NETWORKS, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, XDAI_CHAIN_ID };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "8.4.2",
+  "version": "8.4.4",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -20,21 +20,21 @@
   },
   "dependencies": {
     "@ethereumjs/util": "^9.1.0",
-    "@metamask/delegation-toolkit": "^0.10.2",
-    "@toruslabs/base-controllers": "^8.4.2",
+    "@metamask/delegation-toolkit": "^0.11.0",
+    "@toruslabs/base-controllers": "^8.4.4",
     "@toruslabs/http-helpers": "^8.1.1",
-    "@web3auth/auth": "^10.4.0",
+    "@web3auth/auth": "^10.4.1",
     "async-mutex": "^0.5.0",
     "bignumber.js": "^9.2.1",
-    "bn.js": "^5.2.1",
+    "bn.js": "^5.2.2",
     "deepmerge": "^4.3.1",
-    "ethers": "^6.13.5",
+    "ethers": "^6.14.0",
     "fast-json-patch": "^3.1.1",
     "fast-safe-stringify": "^2.1.1",
     "jsonschema": "^1.5.0",
     "loglevel": "^1.9.2",
-    "permissionless": "^0.2.42",
-    "viem": "^2.27.2"
+    "permissionless": "^0.2.46",
+    "viem": "^2.23.2"
   },
   "peerDependencies": {
     "@babel/runtime": "7.x"
@@ -63,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3b10ca0321c6cee1a575e2e63d9f21643d42d373",
+  "gitHead": "7040c38814fe30e35f1dcd9713de118ded2e3d4a",
   "devDependencies": {
     "@typechain/ethers-v6": "^0.5.1",
     "typechain": "^8.3.2"