@web3auth/no-modal 10.0.0-beta.7 → 10.0.0-beta.8

package/dist/lib.cjs/connectors/metamask-connector/metamaskConnector.js

@@ -87,11 +87,12 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
     if (!chainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
     try {
       if (this.status !== constants.CONNECTOR_STATUS.CONNECTING) {
+        var _this$metamaskOptions;
         this.status = constants.CONNECTOR_STATUS.CONNECTING;
         this.emit(constants.CONNECTOR_EVENTS.CONNECTING, {
           connector: index.WALLET_CONNECTORS.METAMASK
         });
-        if (!this.metamaskSDK.isExtensionActive() && this.metamaskOptions.headless) {
+        if (!this.metamaskSDK.isExtensionActive() && (_this$metamaskOptions = this.metamaskOptions) !== null && _this$metamaskOptions !== void 0 && _this$metamaskOptions.headless) {
           // when metamask is not injected and headless is true, broadcast the uri to the login modal
           this.metamaskSDK.getProvider().on("display_uri", uri => {
             this.updateConnectorData({

package/dist/lib.cjs/index.js

@@ -34,7 +34,6 @@ var baseProvider = require('./providers/base-provider/baseProvider.js');
 var CommonJRPCProvider = require('./providers/base-provider/CommonJRPCProvider.js');
 var commonPrivateKeyProvider = require('./providers/base-provider/commonPrivateKeyProvider.js');
 var utils$2 = require('./providers/base-provider/utils.js');
-var EthereumSigningProvider = require('./providers/ethereum-mpc-provider/providers/signingProviders/EthereumSigningProvider.js');
 var constants$2 = require('./providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/constants.js');
 var formatter = require('./providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/formatter.js');
 var interfaces = require('./providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js');
@@ -159,6 +158,7 @@ exports.NFTCheckoutEmbed = embed.NFTCheckoutEmbed;
 exports.nftCheckoutPlugin = plugin.nftCheckoutPlugin;
 exports.walletServicesPlugin = plugin$1.walletServicesPlugin;
 exports.accountAbstractionProvider = AccountAbstractionProvider.accountAbstractionProvider;
+exports.toEoaProvider = AccountAbstractionProvider.toEoaProvider;
 Object.defineProperty(exports, "BiconomySmartAccount", {
 	enumerable: true,
 	get: function () { return ethereumControllers.BiconomySmartAccount; }
@@ -195,7 +195,6 @@ Object.defineProperty(exports, "EIP1193_EVENTS", {
 	get: function () { return utils$2.EIP1193_EVENTS; }
 });
 exports.createRandomId = utils$2.createRandomId;
-exports.EthereumSigningProvider = EthereumSigningProvider.EthereumSigningProvider;
 exports.EIP1559APIEndpoint = constants$2.EIP1559APIEndpoint;
 exports.GAS_ESTIMATE_TYPES = constants$2.GAS_ESTIMATE_TYPES;
 exports.LegacyGasAPIEndpoint = constants$2.LegacyGasAPIEndpoint;

package/dist/lib.cjs/noModal.js

@@ -33,6 +33,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     _defineProperty(this, "connectedConnectorName", null);
     _defineProperty(this, "status", constants.CONNECTOR_STATUS.NOT_READY);
     _defineProperty(this, "cachedConnector", null);
+    _defineProperty(this, "aaProvider", null);
     _defineProperty(this, "currentChainId", void 0);
     _defineProperty(this, "connectors", []);
     _defineProperty(this, "commonJRPCProvider", null);
@@ -61,6 +62,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     var _this$currentChain;
     return this.getConnector(this.connectedConnectorName, (_this$currentChain = this.currentChain) === null || _this$currentChain === void 0 ? void 0 : _this$currentChain.chainNamespace);
   }
+  get accountAbstractionProvider() {
+    return this.aaProvider;
+  }
   set provider(_) {
     throw new Error("Not implemented");
   }
@@ -274,15 +278,24 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     }
   }
   initAccountAbstractionConfig(projectConfig) {
+    var _this$coreOptions$acc2;
     const isAAEnabled = Boolean(this.coreOptions.accountAbstractionConfig || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts));
     if (!isAAEnabled) return;
-    // merge project config with core options, code config take precedence over project config
+    // merge smart account config from project config with core options, core options will take precedence over project config
     const _ref = (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts) || {},
       {
         walletScope
       } = _ref,
       configWithoutWalletScope = _objectWithoutProperties(_ref, _excluded);
-    this.coreOptions.accountAbstractionConfig = deepmerge(configWithoutWalletScope || {}, this.coreOptions.accountAbstractionConfig || {});
+    const aaChainMap = new Map();
+    const allAaChains = [...((configWithoutWalletScope === null || configWithoutWalletScope === void 0 ? void 0 : configWithoutWalletScope.chains) || []), ...(((_this$coreOptions$acc2 = this.coreOptions.accountAbstractionConfig) === null || _this$coreOptions$acc2 === void 0 ? void 0 : _this$coreOptions$acc2.chains) || [])];
+    for (const chain of allAaChains) {
+      const existingChain = aaChainMap.get(chain.chainId);
+      if (!existingChain) aaChainMap.set(chain.chainId, chain);else aaChainMap.set(chain.chainId, _objectSpread(_objectSpread({}, existingChain), chain));
+    }
+    this.coreOptions.accountAbstractionConfig = _objectSpread(_objectSpread({}, deepmerge(configWithoutWalletScope || {}, this.coreOptions.accountAbstractionConfig || {})), {}, {
+      chains: Array.from(aaChainMap.values())
+    });
     // determine if we should use AA with external wallet
     if (this.coreOptions.useAAWithExternalWallet === undefined) {
       this.coreOptions.useAAWithExternalWallet = walletScope === constants$1.SMART_ACCOUNT_WALLET_SCOPE.ALL;
@@ -417,28 +430,35 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         provider
       } = data;
       let finalProvider = provider.provider || provider;
-      // setup AA provider for external wallets on EVM chains, no need for app wallet as it uses WS provider which already supports AA
+      // setup AA provider if AA is enabled
       const {
         accountAbstractionConfig
       } = this.coreOptions;
-      const doesAASupportCurrentChain = ((_this$currentChain3 = this.currentChain) === null || _this$currentChain3 === void 0 ? void 0 : _this$currentChain3.chainNamespace) === baseControllers.CHAIN_NAMESPACES.EIP155 && (accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.some(chain => {
+      const isAaSupportedForCurrentChain = ((_this$currentChain3 = this.currentChain) === null || _this$currentChain3 === void 0 ? void 0 : _this$currentChain3.chainNamespace) === baseControllers.CHAIN_NAMESPACES.EIP155 && (accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.some(chain => {
         var _this$currentChain4;
         return chain.chainId === ((_this$currentChain4 = this.currentChain) === null || _this$currentChain4 === void 0 ? void 0 : _this$currentChain4.chainId);
       }));
-      const isExternalWalletAndAAEnabled = data.connector !== index$1.WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet;
-      if (isExternalWalletAndAAEnabled && doesAASupportCurrentChain) {
+      if (isAaSupportedForCurrentChain && (data.connector === index$1.WALLET_CONNECTORS.AUTH || this.coreOptions.useAAWithExternalWallet)) {
         var _accountAbstractionCo2;
-        const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
         const {
-          accountAbstractionProvider
+          accountAbstractionProvider,
+          toEoaProvider
         } = await Promise.resolve().then(function () { return require('./providers/account-abstraction-provider/index.js'); });
+        // for embedded wallets, we use ws-embed provider which is AA provider, need to derive EOA provider
+        const eoaProvider = data.connector === index$1.WALLET_CONNECTORS.AUTH ? await toEoaProvider(provider) : provider;
+        const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
         const aaProvider = await accountAbstractionProvider({
           accountAbstractionConfig,
-          provider,
+          provider: eoaProvider,
           chain: this.currentChain,
           chains: this.coreOptions.chains.filter(chain => aaChainIds.has(chain.chainId))
         });
-        finalProvider = aaProvider;
+        this.aaProvider = aaProvider;
+        // if external wallet is used and AA is enabled for external wallets, use AA provider
+        // for embedded wallets, we use ws-embed provider which already supports AA
+        if (data.connector !== index$1.WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
+          finalProvider = this.aaProvider;
+        }
       }
       this.commonJRPCProvider.updateProviderEngineProxy(finalProvider);
       this.connectedConnectorName = data.connector;

package/dist/lib.cjs/providers/account-abstraction-provider/index.js

@@ -6,6 +6,7 @@ var ethereumControllers = require('@toruslabs/ethereum-controllers');
 
 
 exports.accountAbstractionProvider = AccountAbstractionProvider.accountAbstractionProvider;
+exports.toEoaProvider = AccountAbstractionProvider.toEoaProvider;
 Object.defineProperty(exports, "BiconomySmartAccount", {
 	enumerable: true,
 	get: function () { return ethereumControllers.BiconomySmartAccount; }

package/dist/lib.cjs/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -145,7 +145,7 @@ class AccountAbstractionProvider extends baseProvider.BaseProvider {
       handlers: providerHandlers
     });
     engine.push(aaMiddleware);
-    const eoaMiddleware = ethRpcMiddlewares.eoaProviderAsMiddleware(eoaProvider);
+    const eoaMiddleware = ethRpcMiddlewares.providerAsMiddleware(eoaProvider);
     engine.push(eoaMiddleware);
     const provider = auth.providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
@@ -255,9 +255,20 @@ const accountAbstractionProvider = async ({
     smartAccountChainsConfig
   });
 };
+const toEoaProvider = async aaProvider => {
+  // derive EOA provider from AA provider
+  const engine = new auth.JRPCEngine();
+  const eoaMiddleware = await ethRpcMiddlewares.createEoaMiddleware({
+    aaProvider
+  });
+  engine.push(eoaMiddleware);
+  engine.push(ethRpcMiddlewares.providerAsMiddleware(aaProvider));
+  return auth.providerFromEngine(engine);
+};
 
 Object.defineProperty(exports, "SMART_ACCOUNT", {
     enumerable: true,
     get: function () { return ethereumControllers.SMART_ACCOUNT; }
 });
 exports.accountAbstractionProvider = accountAbstractionProvider;
+exports.toEoaProvider = toEoaProvider;

package/dist/lib.cjs/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var ethereumControllers = require('@toruslabs/ethereum-controllers');
 var auth = require('@web3auth/auth');
 
 async function createAaMiddleware({
@@ -8,7 +9,7 @@ async function createAaMiddleware({
   handlers
 }) {
   const [eoaAddress] = await eoaProvider.request({
-    method: "eth_accounts"
+    method: ethereumControllers.METHOD_TYPES.GET_ACCOUNTS
   });
   /**
    * Validates the keyholder address, and returns a normalized (i.e. lowercase)
@@ -155,7 +156,27 @@ async function createAaMiddleware({
     personal_sign: auth.createAsyncMiddleware(personalSign)
   });
 }
-function eoaProviderAsMiddleware(provider) {
+async function createEoaMiddleware({
+  aaProvider
+}) {
+  async function getAccounts(_req, res) {
+    const [, eoaAddress] = await aaProvider.request({
+      method: ethereumControllers.METHOD_TYPES.GET_ACCOUNTS
+    });
+    res.result = [eoaAddress];
+  }
+  async function requestAccounts(_req, res) {
+    const [, eoaAddress] = await aaProvider.request({
+      method: ethereumControllers.METHOD_TYPES.ETH_REQUEST_ACCOUNTS
+    });
+    res.result = [eoaAddress];
+  }
+  return auth.createScaffoldMiddleware({
+    eth_accounts: auth.createAsyncMiddleware(getAccounts),
+    eth_requestAccounts: auth.createAsyncMiddleware(requestAccounts)
+  });
+}
+function providerAsMiddleware(provider) {
   return async (req, res, _next, end) => {
     // send request to provider
     try {
@@ -169,4 +190,5 @@ function eoaProviderAsMiddleware(provider) {
 }
 
 exports.createAaMiddleware = createAaMiddleware;
-exports.eoaProviderAsMiddleware = eoaProviderAsMiddleware;
+exports.createEoaMiddleware = createEoaMiddleware;
+exports.providerAsMiddleware = providerAsMiddleware;

package/dist/lib.cjs/types/noModal.d.ts

@@ -1,11 +1,13 @@
 import { SafeEventEmitter } from "@web3auth/auth";
-import { ChainNamespaceType, CONNECTOR_STATUS_TYPE, CustomChainConfig, IConnector, IPlugin, IProvider, IWeb3Auth, IWeb3AuthCoreOptions, LoginParamMap, ProjectConfig, UserAuthInfo, UserInfo, WALLET_CONNECTOR_TYPE, Web3AuthNoModalEvents } from "./base";
+import { type ChainNamespaceType, type CONNECTOR_STATUS_TYPE, type CustomChainConfig, type IConnector, type IPlugin, type IProvider, type IWeb3Auth, type IWeb3AuthCoreOptions, type LoginParamMap, type ProjectConfig, type UserAuthInfo, type UserInfo, type WALLET_CONNECTOR_TYPE, type Web3AuthNoModalEvents } from "./base";
+import { type AccountAbstractionProvider } from "./providers/account-abstraction-provider";
 import { CommonJRPCProvider } from "./providers/base-provider";
 export declare class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> implements IWeb3Auth {
     readonly coreOptions: IWeb3AuthCoreOptions;
     connectedConnectorName: WALLET_CONNECTOR_TYPE | null;
     status: CONNECTOR_STATUS_TYPE;
     cachedConnector: string | null;
+    protected aaProvider: AccountAbstractionProvider | null;
     protected currentChainId: string;
     protected connectors: IConnector<unknown>[];
     protected commonJRPCProvider: CommonJRPCProvider | null;
@@ -16,6 +18,7 @@ export declare class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEve
     get connected(): boolean;
     get provider(): IProvider | null;
     get connectedConnector(): IConnector<unknown> | null;
+    get accountAbstractionProvider(): AccountAbstractionProvider | null;
     set provider(_: IProvider | null);
     init(options?: {
         signal?: AbortSignal;

package/dist/lib.cjs/types/providers/account-abstraction-provider/providers/AccountAbstractionProvider.d.ts

@@ -44,4 +44,5 @@ export declare const accountAbstractionProvider: ({ accountAbstractionConfig, ch
     chains: CustomChainConfig[];
     provider: IProvider;
 }) => Promise<AccountAbstractionProvider>;
-export { type AccountAbstractionMultiChainConfig, type BundlerConfig, type PaymasterConfig, SMART_ACCOUNT };
+export declare const toEoaProvider: (aaProvider: IProvider) => Promise<IProvider>;
+export { type AccountAbstractionMultiChainConfig, type AccountAbstractionProvider, type BundlerConfig, type PaymasterConfig, SMART_ACCOUNT };

package/dist/lib.cjs/types/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.d.ts

@@ -5,4 +5,7 @@ export declare function createAaMiddleware({ eoaProvider, handlers, }: {
     eoaProvider: IProvider;
     handlers: IEthProviderHandlers;
 }): Promise<JRPCMiddleware<unknown, unknown>>;
-export declare function eoaProviderAsMiddleware(provider: IProvider): JRPCMiddleware<unknown, unknown>;
+export declare function createEoaMiddleware({ aaProvider }: {
+    aaProvider: IProvider;
+}): Promise<JRPCMiddleware<unknown, unknown>>;
+export declare function providerAsMiddleware(provider: IProvider): JRPCMiddleware<unknown, unknown>;

package/dist/lib.cjs/types/providers/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./account-abstraction-provider";
 export * from "./base-provider";
-export * from "./ethereum-mpc-provider";
 export * from "./ethereum-provider";
 export * from "./solana-provider";

package/dist/lib.esm/connectors/metamask-connector/metamaskConnector.js

@@ -80,11 +80,12 @@ class MetaMaskConnector extends BaseEvmConnector {
     if (!chainConfig) throw WalletLoginError.connectionError("Chain config is not available");
     try {
       if (this.status !== CONNECTOR_STATUS.CONNECTING) {
+        var _this$metamaskOptions;
         this.status = CONNECTOR_STATUS.CONNECTING;
         this.emit(CONNECTOR_EVENTS.CONNECTING, {
           connector: WALLET_CONNECTORS.METAMASK
         });
-        if (!this.metamaskSDK.isExtensionActive() && this.metamaskOptions.headless) {
+        if (!this.metamaskSDK.isExtensionActive() && (_this$metamaskOptions = this.metamaskOptions) !== null && _this$metamaskOptions !== void 0 && _this$metamaskOptions.headless) {
           // when metamask is not injected and headless is true, broadcast the uri to the login modal
           this.metamaskSDK.getProvider().on("display_uri", uri => {
             this.updateConnectorData({

package/dist/lib.esm/index.js

@@ -30,13 +30,12 @@ export { NFTCheckoutEmbed } from './plugins/nft-checkout-plugin/embed.js';
 export { nftCheckoutPlugin } from './plugins/nft-checkout-plugin/plugin.js';
 export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
 export { walletServicesPlugin } from './plugins/wallet-services-plugin/plugin.js';
-export { accountAbstractionProvider } from './providers/account-abstraction-provider/providers/AccountAbstractionProvider.js';
+export { accountAbstractionProvider, toEoaProvider } from './providers/account-abstraction-provider/providers/AccountAbstractionProvider.js';
 export { BiconomySmartAccount, KernelSmartAccount, MetamaskSmartAccount, NexusSmartAccount, SMART_ACCOUNT, SafeSmartAccount, TrustSmartAccount } from '@toruslabs/ethereum-controllers';
 export { BaseProvider } from './providers/base-provider/baseProvider.js';
 export { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
 export { CommonPrivateKeyProvider } from './providers/base-provider/commonPrivateKeyProvider.js';
 export { EIP1193_EVENTS, createRandomId } from './providers/base-provider/utils.js';
-export { EthereumSigningProvider } from './providers/ethereum-mpc-provider/providers/signingProviders/EthereumSigningProvider.js';
 export { EIP1559APIEndpoint, GAS_ESTIMATE_TYPES, LegacyGasAPIEndpoint, TRANSACTION_ENVELOPE_TYPES, TRANSACTION_TYPES } from './providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/constants.js';
 export { TransactionFormatter } from './providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/formatter.js';
 export { SignTypedDataVersion } from './providers/ethereum-provider/providers/privateKeyProviders/TransactionFormatter/interfaces.js';

package/dist/lib.esm/noModal.js

@@ -28,6 +28,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
     _defineProperty(this, "connectedConnectorName", null);
     _defineProperty(this, "status", CONNECTOR_STATUS.NOT_READY);
     _defineProperty(this, "cachedConnector", null);
+    _defineProperty(this, "aaProvider", null);
     _defineProperty(this, "currentChainId", void 0);
     _defineProperty(this, "connectors", []);
     _defineProperty(this, "commonJRPCProvider", null);
@@ -56,6 +57,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
     var _this$currentChain;
     return this.getConnector(this.connectedConnectorName, (_this$currentChain = this.currentChain) === null || _this$currentChain === void 0 ? void 0 : _this$currentChain.chainNamespace);
   }
+  get accountAbstractionProvider() {
+    return this.aaProvider;
+  }
   set provider(_) {
     throw new Error("Not implemented");
   }
@@ -277,16 +281,25 @@ class Web3AuthNoModal extends SafeEventEmitter {
     }
   }
   initAccountAbstractionConfig(projectConfig) {
+    var _this$coreOptions$acc2;
     const isAAEnabled = Boolean(this.coreOptions.accountAbstractionConfig || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts));
     if (!isAAEnabled) return;
 
-    // merge project config with core options, code config take precedence over project config
+    // merge smart account config from project config with core options, core options will take precedence over project config
     const _ref = (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.smartAccounts) || {},
       {
         walletScope
       } = _ref,
       configWithoutWalletScope = _objectWithoutProperties(_ref, _excluded);
-    this.coreOptions.accountAbstractionConfig = deepmerge(configWithoutWalletScope || {}, this.coreOptions.accountAbstractionConfig || {});
+    const aaChainMap = new Map();
+    const allAaChains = [...((configWithoutWalletScope === null || configWithoutWalletScope === void 0 ? void 0 : configWithoutWalletScope.chains) || []), ...(((_this$coreOptions$acc2 = this.coreOptions.accountAbstractionConfig) === null || _this$coreOptions$acc2 === void 0 ? void 0 : _this$coreOptions$acc2.chains) || [])];
+    for (const chain of allAaChains) {
+      const existingChain = aaChainMap.get(chain.chainId);
+      if (!existingChain) aaChainMap.set(chain.chainId, chain);else aaChainMap.set(chain.chainId, _objectSpread(_objectSpread({}, existingChain), chain));
+    }
+    this.coreOptions.accountAbstractionConfig = _objectSpread(_objectSpread({}, deepmerge(configWithoutWalletScope || {}, this.coreOptions.accountAbstractionConfig || {})), {}, {
+      chains: Array.from(aaChainMap.values())
+    });
 
     // determine if we should use AA with external wallet
     if (this.coreOptions.useAAWithExternalWallet === undefined) {
@@ -427,28 +440,36 @@ class Web3AuthNoModal extends SafeEventEmitter {
       } = data;
       let finalProvider = provider.provider || provider;
 
-      // setup AA provider for external wallets on EVM chains, no need for app wallet as it uses WS provider which already supports AA
+      // setup AA provider if AA is enabled
       const {
         accountAbstractionConfig
       } = this.coreOptions;
-      const doesAASupportCurrentChain = ((_this$currentChain3 = this.currentChain) === null || _this$currentChain3 === void 0 ? void 0 : _this$currentChain3.chainNamespace) === CHAIN_NAMESPACES.EIP155 && (accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.some(chain => {
+      const isAaSupportedForCurrentChain = ((_this$currentChain3 = this.currentChain) === null || _this$currentChain3 === void 0 ? void 0 : _this$currentChain3.chainNamespace) === CHAIN_NAMESPACES.EIP155 && (accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.some(chain => {
         var _this$currentChain4;
         return chain.chainId === ((_this$currentChain4 = this.currentChain) === null || _this$currentChain4 === void 0 ? void 0 : _this$currentChain4.chainId);
       }));
-      const isExternalWalletAndAAEnabled = data.connector !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet;
-      if (isExternalWalletAndAAEnabled && doesAASupportCurrentChain) {
+      if (isAaSupportedForCurrentChain && (data.connector === WALLET_CONNECTORS.AUTH || this.coreOptions.useAAWithExternalWallet)) {
         var _accountAbstractionCo2;
-        const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
         const {
-          accountAbstractionProvider
+          accountAbstractionProvider,
+          toEoaProvider
         } = await import('./providers/account-abstraction-provider/index.js');
+        // for embedded wallets, we use ws-embed provider which is AA provider, need to derive EOA provider
+        const eoaProvider = data.connector === WALLET_CONNECTORS.AUTH ? await toEoaProvider(provider) : provider;
+        const aaChainIds = new Set((accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => chain.chainId)) || []);
         const aaProvider = await accountAbstractionProvider({
           accountAbstractionConfig,
-          provider,
+          provider: eoaProvider,
           chain: this.currentChain,
           chains: this.coreOptions.chains.filter(chain => aaChainIds.has(chain.chainId))
         });
-        finalProvider = aaProvider;
+        this.aaProvider = aaProvider;
+
+        // if external wallet is used and AA is enabled for external wallets, use AA provider
+        // for embedded wallets, we use ws-embed provider which already supports AA
+        if (data.connector !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
+          finalProvider = this.aaProvider;
+        }
       }
       this.commonJRPCProvider.updateProviderEngineProxy(finalProvider);
       this.connectedConnectorName = data.connector;

package/dist/lib.esm/providers/account-abstraction-provider/index.js

@@ -1,2 +1,2 @@
-export { accountAbstractionProvider } from './providers/AccountAbstractionProvider.js';
+export { accountAbstractionProvider, toEoaProvider } from './providers/AccountAbstractionProvider.js';
 export { BiconomySmartAccount, KernelSmartAccount, MetamaskSmartAccount, NexusSmartAccount, SMART_ACCOUNT, SafeSmartAccount, TrustSmartAccount } from '@toruslabs/ethereum-controllers';

package/dist/lib.esm/providers/account-abstraction-provider/providers/AccountAbstractionProvider.js

@@ -2,10 +2,10 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SMART_ACCOUNT, METHOD_TYPES } from '@toruslabs/ethereum-controllers';
 export { SMART_ACCOUNT } from '@toruslabs/ethereum-controllers';
-import { providerErrors, JRPCEngine, providerFromEngine } from '@web3auth/auth';
+import { JRPCEngine, providerFromEngine, providerErrors } from '@web3auth/auth';
 import { defineChain, createPublicClient, http, createWalletClient, custom } from 'viem';
 import { createPaymasterClient, createBundlerClient } from 'viem/account-abstraction';
-import { createAaMiddleware, eoaProviderAsMiddleware } from '../rpc/ethRpcMiddlewares.js';
+import { createEoaMiddleware, providerAsMiddleware, createAaMiddleware } from '../rpc/ethRpcMiddlewares.js';
 import { getProviderHandlers } from './utils.js';
 import { BaseProvider } from '../../base-provider/baseProvider.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
@@ -135,7 +135,7 @@ class AccountAbstractionProvider extends BaseProvider {
       handlers: providerHandlers
     });
     engine.push(aaMiddleware);
-    const eoaMiddleware = eoaProviderAsMiddleware(eoaProvider);
+    const eoaMiddleware = providerAsMiddleware(eoaProvider);
     engine.push(eoaMiddleware);
     const provider = providerFromEngine(engine);
     this.updateProviderEngineProxy(provider);
@@ -245,5 +245,15 @@ const accountAbstractionProvider = async ({
     smartAccountChainsConfig
   });
 };
+const toEoaProvider = async aaProvider => {
+  // derive EOA provider from AA provider
+  const engine = new JRPCEngine();
+  const eoaMiddleware = await createEoaMiddleware({
+    aaProvider
+  });
+  engine.push(eoaMiddleware);
+  engine.push(providerAsMiddleware(aaProvider));
+  return providerFromEngine(engine);
+};
 
-export { accountAbstractionProvider };
+export { accountAbstractionProvider, toEoaProvider };

package/dist/lib.esm/providers/account-abstraction-provider/rpc/ethRpcMiddlewares.js

@@ -1,4 +1,5 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
+import { METHOD_TYPES } from '@toruslabs/ethereum-controllers';
 import { createScaffoldMiddleware, createAsyncMiddleware, rpcErrors } from '@web3auth/auth';
 
 async function createAaMiddleware({
@@ -6,7 +7,7 @@ async function createAaMiddleware({
   handlers
 }) {
   const [eoaAddress] = await eoaProvider.request({
-    method: "eth_accounts"
+    method: METHOD_TYPES.GET_ACCOUNTS
   });
 
   /**
@@ -155,7 +156,27 @@ async function createAaMiddleware({
     personal_sign: createAsyncMiddleware(personalSign)
   });
 }
-function eoaProviderAsMiddleware(provider) {
+async function createEoaMiddleware({
+  aaProvider
+}) {
+  async function getAccounts(_req, res) {
+    const [, eoaAddress] = await aaProvider.request({
+      method: METHOD_TYPES.GET_ACCOUNTS
+    });
+    res.result = [eoaAddress];
+  }
+  async function requestAccounts(_req, res) {
+    const [, eoaAddress] = await aaProvider.request({
+      method: METHOD_TYPES.ETH_REQUEST_ACCOUNTS
+    });
+    res.result = [eoaAddress];
+  }
+  return createScaffoldMiddleware({
+    eth_accounts: createAsyncMiddleware(getAccounts),
+    eth_requestAccounts: createAsyncMiddleware(requestAccounts)
+  });
+}
+function providerAsMiddleware(provider) {
   return async (req, res, _next, end) => {
     // send request to provider
     try {
@@ -168,4 +189,4 @@ function eoaProviderAsMiddleware(provider) {
   };
 }
 
-export { createAaMiddleware, eoaProviderAsMiddleware };
+export { createAaMiddleware, createEoaMiddleware, providerAsMiddleware };