fix account abstraction provider

Author: tanguyenvn

packages/no-modal/src/noModal.ts

@@ -349,7 +349,12 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
         this.coreOptions.useAAWithExternalWallet
       ) {
         const { accountAbstractionProvider } = await import("@/core/account-abstraction-provider");
-        const aaProvider = await accountAbstractionProvider({ accountAbstractionConfig, chainConfig: this.currentChain, provider });
+        const aaProvider = await accountAbstractionProvider({
+          accountAbstractionConfig,
+          provider,
+          getCurrentChain: this.getCurrentChain.bind(this),
+          getChain: this.getChain.bind(this),
+        });
         finalProvider = aaProvider;
         // TODO: when switching chains to Solana or other chains, we need to switch to the non-AA provider
       }

packages/no-modal/src/providers/account-abstraction-provider/providers/AccountAbstractionProvider.ts

@@ -60,13 +60,9 @@ class AccountAbstractionProvider extends BaseProvider<AccountAbstractionProvider
     return this._publicClient;
   }
 
-  public static getProviderInstance = async (params: {
-    eoaProvider: IProvider;
-    smartAccountInit: ISmartAccount;
-    chainConfig: CustomChainConfig;
-    bundlerConfig: BundlerConfig;
-    paymasterConfig?: PaymasterConfig;
-  }): Promise<AccountAbstractionProvider> => {
+  public static getProviderInstance = async (
+    params: AccountAbstractionProviderConfig & { eoaProvider: IProvider }
+  ): Promise<AccountAbstractionProvider> => {
     const providerFactory = new AccountAbstractionProvider({ config: params });
     await providerFactory.setupProvider(params.eoaProvider);
     providerFactory.update({ eoaProvider: params.eoaProvider });
@@ -173,11 +169,13 @@ class AccountAbstractionProvider extends BaseProvider<AccountAbstractionProvider
 
 export const accountAbstractionProvider = async ({
   accountAbstractionConfig,
-  chainConfig,
+  getCurrentChain,
+  getChain,
   provider,
 }: {
   accountAbstractionConfig: AccountAbstractionConfig;
-  chainConfig: CustomChainConfig;
+  getCurrentChain: () => CustomChainConfig;
+  getChain: (chainId: string) => CustomChainConfig | undefined;
   provider: IProvider;
 }) => {
   let smartAccountInit: ISmartAccount;
@@ -214,7 +212,8 @@ export const accountAbstractionProvider = async ({
   return AccountAbstractionProvider.getProviderInstance({
     eoaProvider: provider,
     smartAccountInit,
-    chainConfig,
+    getCurrentChain,
+    getChain,
     bundlerConfig,
     paymasterConfig,
   });