change format of project config's chains

Author: tanguyenvn

packages/modal/src/modalManager.ts

@@ -69,8 +69,8 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "light";
 
     // init config
-    super.initChainsConfig(projectConfig);
     super.initAccountAbstractionConfig(projectConfig);
+    super.initChainsConfig(projectConfig);
     super.initCachedConnectorAndChainId();
 
     // init login modal
@@ -129,20 +129,23 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       // TODO: we're using mock project config to test, remove this before production
       // projectConfig = {
       //   ...projectConfig,
-      //   chains: {
-      //     "0x1": {
+      //   chains: [
+      //     {
+      //       chainId: "0x1",
       //       enabled: true,
       //       config: getChainConfig("eip155", "0x1", this.options.clientId),
       //     },
-      //     "0x65": {
+      //     {
+      //       chainId: "0x65",
       //       enabled: true,
       //       config: getChainConfig("solana", "0x65", this.options.clientId),
       //     },
-      //     "0x67": {
+      //     {
+      //       chainId: "0x67",
       //       enabled: false,
       //       config: getChainConfig("solana", "0x67", this.options.clientId),
       //     },
-      //   },
+      //   ],
       //   walletUi: {
       //     confirmationModalEnabled: true,
       //     portfolioWidgetEnabled: true,
@@ -178,6 +181,13 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       //       ],
       //     },
       //   },
+      //   externalWalletLogin: {
+      //     enabled: true,
+      //     config: {
+      //       phantom: { enabled: false },
+      //       trust: { enabled: false },
+      //     },
+      //   },
       // };
     } catch (e) {
       log.error("Failed to fetch project configurations", e);

packages/no-modal/src/base/interfaces.ts

@@ -1,6 +1,6 @@
 import { type BUTTON_POSITION_TYPE } from "@toruslabs/base-controllers";
 import { type SmartAccountType } from "@toruslabs/ethereum-controllers";
-import { type LoginConfig, type WhiteLabelData } from "@web3auth/auth";
+import { type WhiteLabelData } from "@web3auth/auth";
 
 import { type ChainNamespaceType, type CustomChainConfig } from "./chain/IChainInterface";
 
@@ -9,21 +9,17 @@ export interface WhitelistResponse {
   signed_urls: Record<string, string>;
 }
 
-export type ChainConfigItem = {
+export type ChainsConfig = {
+  chainId: string;
   enabled: boolean;
   config: CustomChainConfig;
-};
+}[];
 
 export interface ExternalWalletsConfig {
   enabled: boolean;
   config: Record<string, { enabled: boolean }>;
 }
 
-export type LoginConfigItem = {
-  enabled: boolean;
-  config?: LoginConfig[keyof LoginConfig];
-};
-
 export const SMART_ACCOUNT_WALLET_SCOPE = {
   EMBEDDED_ONLY: "embeddedOnly",
   ALL: "all",
@@ -76,11 +72,11 @@ export interface ProjectConfig {
   // Project settings
   userDataIncludedInToken?: boolean; // TODO: implement this
   sessionTime?: number;
-  keyExportEnabled?: boolean; // TODO: implement this in WS
+  keyExportEnabled?: boolean;
   whitelist?: WhitelistResponse; // remain unchanged
   whitelabel?: WhiteLabelData; // remain unchanged
   // Chains
-  chains?: Record<string, ChainConfigItem>;
+  chains?: ChainsConfig;
   // Login config
   externalWalletLogin?: ExternalWalletsConfig;
   // Smart accounts

packages/no-modal/src/noModal.ts

@@ -107,8 +107,8 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     }
 
     // init config
-    this.initChainsConfig(projectConfig);
     this.initAccountAbstractionConfig(projectConfig);
+    this.initChainsConfig(projectConfig);
     this.initCachedConnectorAndChainId();
 
     // setup common JRPC provider
@@ -226,25 +226,41 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   protected initChainsConfig(projectConfig: ProjectConfig) {
-    const projectConfigChains = projectConfig.chains;
     // merge chains from project config with core options, core options chains will take precedence over project config chains
-    const mergedChains = { ...projectConfigChains };
-    (this.coreOptions.chains || []).forEach((chain) => {
-      const projectConfigChain = projectConfigChains?.[chain.chainId];
-      if (!projectConfigChain) mergedChains[chain.chainId] = { enabled: true, config: chain };
-      else {
-        mergedChains[chain.chainId] = { ...projectConfigChain, ...{ ...chain, enabled: true } };
-      }
-    });
-    this.coreOptions.chains = Object.values(mergedChains)
-      .filter((chain) => chain.enabled)
-      .map((chain) => chain.config);
+    const chainMap = new Map<string, CustomChainConfig>();
+    const enabledProjectConfigChains = projectConfig.chains?.filter((chain) => chain.enabled).map((chain) => chain.config) || [];
+    const allChains = [...enabledProjectConfigChains, ...(this.coreOptions.chains || [])];
+    for (const chain of allChains) {
+      const existingChain = chainMap.get(chain.chainId);
+      if (!existingChain) chainMap.set(chain.chainId, chain);
+      else chainMap.set(chain.chainId, { ...existingChain, ...chain });
+    }
+    this.coreOptions.chains = Array.from(chainMap.values());
 
     // validate chains and namespaces
-    if (!this.coreOptions.chains?.length) throw WalletInitializationError.invalidParams("Please provide chains");
+    if (this.coreOptions.chains.length === 0) {
+      log.error("Please provide chains");
+      throw WalletInitializationError.invalidParams("Please provide chains");
+    }
     for (const chain of this.coreOptions.chains) {
-      if (!chain.chainNamespace || !Object.values(CHAIN_NAMESPACES).includes(chain.chainNamespace))
-        throw WalletInitializationError.invalidParams("Please provide a valid chainNamespace in chains");
+      if (!chain.chainNamespace || !Object.values(CHAIN_NAMESPACES).includes(chain.chainNamespace)) {
+        log.error(`Please provide a valid chainNamespace in chains for chain ${chain.chainId}`);
+        throw WalletInitializationError.invalidParams(`Please provide a valid chainNamespace in chains for chain ${chain.chainId}`);
+      }
+    }
+
+    // if AA is enabled, filter out chains that are not AA-supported
+    if (this.coreOptions.accountAbstractionConfig) {
+      const aaSupportedChainIds = new Set(
+        this.coreOptions.accountAbstractionConfig?.chains
+          ?.filter((chain) => chain.chainId && chain.bundlerConfig?.url)
+          .map((chain) => chain.chainId) || []
+      );
+      this.coreOptions.chains = this.coreOptions.chains.filter((chain) => aaSupportedChainIds.has(chain.chainId));
+      if (this.coreOptions.chains.length === 0) {
+        log.error("Account Abstraction is enabled but no supported chains found");
+        throw WalletInitializationError.invalidParams("Account Abstraction is enabled but no supported chains found");
+      }
     }
   }