Merge pull request #2083 from Web3Auth/feat/infura-default-rpc

chaitanyapotti · web-flow · commit 44c1ee9ccfc6 · 2025-03-05T17:32:55.000+08:00
use new default web3auth rpc url
diff --git a/demo/vue-app-new/package-lock.json b/demo/vue-app-new/package-lock.json
diff --git a/demo/vue-app-new/src/MainView.vue b/demo/vue-app-new/src/MainView.vue
@@ -9,7 +9,7 @@ import {
   TrustSmartAccount,
   // SimpleSmartAccount,
 } from "@web3auth/account-abstraction-provider";
-import { CHAIN_NAMESPACES, ChainNamespaceType, IAdapter, IBaseProvider, IProvider, storageAvailable, WALLET_ADAPTERS } from "@web3auth/base";
+import { CHAIN_NAMESPACES, getChainConfig, IAdapter, IBaseProvider, IProvider, storageAvailable, WALLET_ADAPTERS } from "@web3auth/base";
 import { CommonPrivateKeyProvider } from "@web3auth/base-provider";
 import { CoinbaseAdapter } from "@web3auth/coinbase-adapter";
 import { getInjectedAdapters as getInjectedEvmAdapters } from "@web3auth/default-evm-adapter";
@@ -36,16 +36,20 @@ const formData = formDataStore;
 
 const externalAdapters = ref<IAdapter<unknown>[]>([]);
 
-const chainOptions = computed(() =>
-  chainConfigs[formData.chainNamespace as ChainNamespaceType].map((x) => ({
-    name: `${x.chainId} ${x.tickerName}`,
-    value: x.chainId,
-  }))
-);
+const getChainById = (chainId: string) => {
+  const chain = getChainConfig(formData.chainNamespace, chainId, clientIds[formData.network]);
+  if (!chain) {
+    throw new Error(`Chain config not found for chainId: ${chainId}`);
+  }
+  if (formData.chainNamespace === CHAIN_NAMESPACES.SOLANA && chainId === "0x65") {
+    chain.rpcTarget = import.meta.env.VITE_APP_SOLANA_MAINNET_RPC || chain.rpcTarget;
+  }
+  return chain;
+};
 
 // Populate the private key provider based on the chain selected
 const privateKeyProvider = computed((): IBaseProvider<string> => {
-  const chainConfig = chainConfigs[formData.chainNamespace as ChainNamespaceType].find((x) => x.chainId === formData.chain)!;
+  const chainConfig = getChainById(formData.chain)!;
 
   switch (formData.chainNamespace) {
     case CHAIN_NAMESPACES.EIP155:
@@ -75,7 +79,7 @@ const accountAbstractionProvider = computed((): IBaseProvider<IProvider> | undef
   const { useAccountAbstractionProvider } = formData;
   if (!showAAProviderSettings.value || !useAccountAbstractionProvider) return undefined;
 
-  const chainConfig = chainConfigs[formData.chainNamespace as ChainNamespaceType].find((x) => x.chainId === formData.chain)!;
+  const chainConfig = getChainById(formData.chain)!;
   // setup aa provider
   let smartAccountInit: ISmartAccount;
   switch (formData.smartAccountType) {
@@ -199,7 +203,7 @@ onBeforeMount(() => {
       }
     } catch (error) {}
   }
-  if (!chainOptions.value.find((option) => option.value === formData.chain)) formData.chain = chainOptions.value[0]?.value;
+  if (!chainConfigs[formData.chainNamespace].find((chainId) => chainId === formData.chain)) formData.chain = chainConfigs[formData.chainNamespace][0];
 });
 
 watch(formData, () => {
diff --git a/demo/vue-app-new/src/components/AppSettings.vue b/demo/vue-app-new/src/components/AppSettings.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { Button, Card, Select, Tab, Tabs, Tag, TextField, Toggle } from "@toruslabs/vue-components";
-import { ADAPTER_STATUS, CHAIN_NAMESPACES, ChainNamespaceType, log } from "@web3auth/base";
+import { ADAPTER_STATUS, CHAIN_NAMESPACES, ChainNamespaceType, log, getChainConfig } from "@web3auth/base";
 import { useWeb3Auth } from "@web3auth/modal-vue-composables";
 import { computed, InputHTMLAttributes, ref } from "vue";
 
 import {
   chainConfigs,
   chainNamespaceOptions,
+  clientIds,
   confirmationStrategyOptions,
   languageOptions,
   loginProviderOptions,
@@ -20,10 +21,16 @@ const formData = formDataStore;
 const { status, isConnected, isInitialized, connect } = useWeb3Auth();
 
 const chainOptions = computed(() =>
-  chainConfigs[formData.chainNamespace as ChainNamespaceType].map((x) => ({
-    name: `${x.chainId} ${x.tickerName}`,
-    value: x.chainId,
-  }))
+  chainConfigs[formData.chainNamespace].map((chainId) => {
+    const chainConfig = getChainConfig(formData.chainNamespace, chainId, clientIds[formData.network]);
+    if (!chainConfig) {
+      throw new Error(`Chain config not found for chainId: ${chainId}`);
+    }
+    return {
+      name: `${chainId} ${chainConfig.displayName}`,
+      value: chainId,
+    };
+  })
 );
 
 const adapterOptions = computed(() =>
@@ -83,7 +90,7 @@ const isActiveTab = (index: number) => activeTab.value === index;
 
 const onChainNamespaceChange = (value: string) => {
   log.info("onChainNamespaceChange", value);
-  formData.chain = chainConfigs[value as ChainNamespaceType][0].chainId;
+  formData.chain = chainConfigs[value as ChainNamespaceType][0];
   formData.adapters = [];
 };
 </script>
diff --git a/demo/vue-app-new/src/config.ts b/demo/vue-app-new/src/config.ts
@@ -1,5 +1,5 @@
 import { LANGUAGE_TYPE, LANGUAGES, LOGIN_PROVIDER, LOGIN_PROVIDER_TYPE, WhiteLabelData } from "@web3auth/auth";
-import { CHAIN_NAMESPACES, ChainNamespaceType, CustomChainConfig, WEB3AUTH_NETWORK, WEB3AUTH_NETWORK_TYPE } from "@web3auth/base";
+import { CHAIN_NAMESPACES, ChainNamespaceType, WEB3AUTH_NETWORK, WEB3AUTH_NETWORK_TYPE } from "@web3auth/base";
 import { SignTypedDataMessageV4 } from "@web3auth/ethereum-provider";
 import { CONFIRMATION_STRATEGY, CONFIRMATION_STRATEGY_TYPE } from "@web3auth/wallet-services-plugin";
 
@@ -9,89 +9,9 @@ export const networkOptions = Object.values(WEB3AUTH_NETWORK).map((x) => ({ name
 
 export const chainNamespaceOptions = Object.values(CHAIN_NAMESPACES).map((x) => ({ name: x, value: x }));
 
-export const chainConfigs: Record<ChainNamespaceType, CustomChainConfig[]> = {
-  [CHAIN_NAMESPACES.EIP155]: [
-    {
-      chainNamespace: CHAIN_NAMESPACES.EIP155,
-      rpcTarget: "https://rpc.ankr.com/eth",
-      blockExplorerUrl: "https://etherscan.io",
-      logo: "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-      chainId: "0x1",
-      ticker: "ETH",
-      tickerName: "Ethereum",
-    },
-    {
-      chainNamespace: CHAIN_NAMESPACES.EIP155,
-      rpcTarget: "https://rpc.ankr.com/eth_sepolia",
-      blockExplorerUrl: "https://sepolia.etherscan.io",
-      logo: "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-      chainId: "0xaa36a7",
-      ticker: "ETH",
-      tickerName: "Sepolia Testnet",
-    },
-    {
-      chainNamespace: CHAIN_NAMESPACES.EIP155,
-      rpcTarget: "https://mainnet.base.org",
-      blockExplorerUrl: "https://base.blockscout.com",
-      chainId: "0x2105",
-      displayName: "Base Mainnet",
-      ticker: "ETH",
-      tickerName: "Base Ethereum",
-      logo: "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-    },
-    {
-      chainNamespace: CHAIN_NAMESPACES.EIP155,
-      rpcTarget: "https://sepolia.base.org",
-      blockExplorerUrl: "https://sepolia-explorer.base.org",
-      chainId: "0x14A34",
-      displayName: "Base Sepolia",
-      ticker: "ETH",
-      tickerName: "Base Sepolia Testnet",
-      logo: "https://cryptologos.cc/logos/ethereum-eth-logo.png",
-    },
-    {
-      chainNamespace: CHAIN_NAMESPACES.EIP155,
-      rpcTarget: "https://data-seed-prebsc-2-s3.binance.org:8545",
-      blockExplorerUrl: "https://testnet.bscscan.com",
-      logo: "https://cryptologos.cc/logos/binance-coin-bnb-logo.png",
-      chainId: "0x61",
-      displayName: "Binance SmartChain Testnet",
-      ticker: "BNB",
-      tickerName: "BNB",
-    },
-    {
-      chainNamespace: CHAIN_NAMESPACES.EIP155,
-      chainId: "0x13882",
-      rpcTarget: "https://rpc.ankr.com/polygon_amoy",
-      displayName: "Polygon Amoy Testnet",
-      blockExplorerUrl: "https://amoy.polygonscan.com/",
-      ticker: "POL",
-      tickerName: "Polygon Ecosystem Token",
-    },
-  ],
-  [CHAIN_NAMESPACES.SOLANA]: [
-    // Ref: https://namespaces.chainagnostic.org/solana/caip10
-    {
-      chainNamespace: CHAIN_NAMESPACES.SOLANA,
-      rpcTarget: "https://api.devnet.solana.com",
-      blockExplorerUrl: "https://solscan.io",
-      logo: "https://cryptologos.cc/logos/solana-sol-logo.png",
-      chainId: "0x67",
-      ticker: "SOL",
-      tickerName: "Solana",
-      displayName: "Solana Devnet",
-    },
-    {
-      chainNamespace: CHAIN_NAMESPACES.SOLANA,
-      rpcTarget: import.meta.env.VITE_SOLANA_MAINNET_RPC,
-      blockExplorerUrl: "https://explorer.solana.com",
-      logo: "https://cryptologos.cc/logos/solana-sol-logo.png",
-      chainId: "0x65",
-      ticker: "SOL",
-      tickerName: "Solana",
-      displayName: "Solana Mainnet",
-    },
-  ],
+export const chainConfigs: Record<ChainNamespaceType, string[]> = {
+  [CHAIN_NAMESPACES.EIP155]: ["0x1", "0xaa36a7", "0x2105", "0x61", "0x13882"],
+  [CHAIN_NAMESPACES.SOLANA]: ["0x67", "0x65"],
   [CHAIN_NAMESPACES.CASPER]: [],
   [CHAIN_NAMESPACES.XRPL]: [],
   [CHAIN_NAMESPACES.OTHER]: [],
diff --git a/packages/adapters/base-evm-adapter/src/baseEvmAdapter.ts b/packages/adapters/base-evm-adapter/src/baseEvmAdapter.ts
@@ -16,7 +16,7 @@ import {
 
 export abstract class BaseEvmAdapter<T> extends BaseAdapter<T> {
   async init(_?: AdapterInitOptions): Promise<void> {
-    if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, 1);
+    if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, 1, this.clientId);
   }
 
   async authenticateUser(): Promise<UserAuthInfo> {
diff --git a/packages/adapters/base-solana-adapter/src/baseSolanaAdapter.ts b/packages/adapters/base-solana-adapter/src/baseSolanaAdapter.ts
@@ -17,7 +17,7 @@ import bs58 from "bs58";
 
 export abstract class BaseSolanaAdapter<T> extends BaseAdapter<T> {
   async init(_?: AdapterInitOptions): Promise<void> {
-    if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.SOLANA, 1);
+    if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.SOLANA, 1, this.clientId);
   }
 
   async authenticateUser(): Promise<UserAuthInfo> {
diff --git a/packages/adapters/default-evm-adapter/src/index.ts b/packages/adapters/default-evm-adapter/src/index.ts
@@ -9,7 +9,7 @@ export const getDefaultExternalAdapters = (params: { options: IWeb3AuthCoreOptio
   if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace))
     throw WalletInitializationError.invalidParams(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
   const finalChainConfig = {
-    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId) as CustomChainConfig),
+    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId, clientId) as CustomChainConfig),
     ...(chainConfig || {}),
   };
 
diff --git a/packages/adapters/default-evm-adapter/src/injectedAdapters.ts b/packages/adapters/default-evm-adapter/src/injectedAdapters.ts
@@ -18,7 +18,7 @@ export const getInjectedAdapters = (params: { options: IWeb3AuthCoreOptions }):
   if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace))
     throw WalletInitializationError.invalidParams(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
   const finalChainConfig = {
-    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId) as CustomChainConfig),
+    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId, clientId) as CustomChainConfig),
     ...(chainConfig || {}),
   };
   // EIP-6963: multiple injected provider discovery
diff --git a/packages/adapters/default-solana-adapter/src/index.ts b/packages/adapters/default-solana-adapter/src/index.ts
@@ -9,7 +9,7 @@ export const getDefaultExternalAdapters = (params: { options: IWeb3AuthCoreOptio
   if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace))
     throw WalletInitializationError.invalidParams(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
   const finalChainConfig = {
-    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId) as CustomChainConfig),
+    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId, clientId) as CustomChainConfig),
     ...(chainConfig || {}),
   };
 
diff --git a/packages/adapters/default-solana-adapter/src/injectedAdapters.ts b/packages/adapters/default-solana-adapter/src/injectedAdapters.ts
@@ -20,7 +20,7 @@ export const getInjectedAdapters = (params: { options: IWeb3AuthCoreOptions }):
   if (!Object.values(CHAIN_NAMESPACES).includes(chainConfig.chainNamespace))
     throw WalletInitializationError.invalidParams(`Invalid chainNamespace: ${chainConfig.chainNamespace}`);
   const finalChainConfig = {
-    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId) as CustomChainConfig),
+    ...(getChainConfig(chainConfig.chainNamespace, chainConfig?.chainId, clientId) as CustomChainConfig),
     ...(chainConfig || {}),
   };
 
diff --git a/packages/adapters/wallet-connect-v2-adapter/src/WalletConnectV2Provider.ts b/packages/adapters/wallet-connect-v2-adapter/src/WalletConnectV2Provider.ts
@@ -25,20 +25,37 @@ export interface WalletConnectV2ProviderState extends BaseProviderState {
 export class WalletConnectV2Provider extends BaseProvider<BaseProviderConfig, WalletConnectV2ProviderState, ISignClient> {
   private connector: ISignClient | null = null;
 
-  constructor({ config, state, connector }: { config: WalletConnectV2ProviderConfig; state?: BaseProviderState; connector?: ISignClient }) {
+  private clientId: string;
+
+  constructor({
+    clientId,
+    config,
+    state,
+    connector,
+  }: {
+    config: WalletConnectV2ProviderConfig;
+    clientId: string;
+    state?: BaseProviderState;
+    connector?: ISignClient;
+  }) {
     super({
       config: { chainConfig: config.chainConfig, skipLookupNetwork: !!config.skipLookupNetwork },
       state: { ...(state || {}), chainId: "loading", accounts: [] },
     });
     this.connector = connector || null;
+    this.clientId = clientId;
   }
 
   public static getProviderInstance = async (params: {
+    clientId: string;
     connector: ISignClient;
     chainConfig: CustomChainConfig;
     skipLookupNetwork: boolean;
   }): Promise<WalletConnectV2Provider> => {
-    const providerFactory = new WalletConnectV2Provider({ config: { chainConfig: params.chainConfig, skipLookupNetwork: params.skipLookupNetwork } });
+    const providerFactory = new WalletConnectV2Provider({
+      clientId: params.clientId,
+      config: { chainConfig: params.chainConfig, skipLookupNetwork: params.skipLookupNetwork },
+    });
     await providerFactory.setupProvider(params.connector);
     return providerFactory;
   };
@@ -220,7 +237,7 @@ export class WalletConnectV2Provider extends BaseProvider<BaseProviderConfig, Wa
 
         // Check if chainId changed and trigger event
         if (connectedHexChainId && this.state.chainId !== connectedHexChainId) {
-          const maybeConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, connectedHexChainId);
+          const maybeConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, connectedHexChainId, this.clientId);
           // Handle rpcUrl update
           this.configure({
             chainConfig: { ...maybeConfig, chainId: connectedHexChainId, chainNamespace: CHAIN_NAMESPACES.EIP155 },
diff --git a/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts b/packages/adapters/wallet-connect-v2-adapter/src/walletConnectV2adapter.ts
@@ -100,6 +100,7 @@ class WalletConnectV2Adapter extends BaseAdapter<void> {
     const { adapterSettings } = this.adapterOptions;
     this.connector = await Client.init(adapterSettings?.walletConnectInitOptions);
     this.wcProvider = new WalletConnectV2Provider({
+      clientId: this.clientId,
       config: { chainConfig: this.chainConfig as CustomChainConfig },
       connector: this.connector,
     });
@@ -355,6 +356,7 @@ class WalletConnectV2Adapter extends BaseAdapter<void> {
     this.subscribeEvents();
     if (this.adapterOptions.adapterSettings?.qrcodeModal) {
       this.wcProvider = new WalletConnectV2Provider({
+        clientId: this.clientId,
         config: {
           chainConfig: this.chainConfig as CustomChainConfig,
           skipLookupNetwork: true,
diff --git a/packages/base/src/adapter/IAdapter.ts b/packages/base/src/adapter/IAdapter.ts
@@ -192,7 +192,7 @@ export abstract class BaseAdapter<T> extends SafeEventEmitter<AdapterEvents> imp
       this.currentChainNamespace = customChainConfig.chainNamespace;
       // chainId is optional in this function.
       // we go with mainnet chainId by default.
-      const defaultChainConfig = getChainConfig(customChainConfig.chainNamespace, customChainConfig.chainId);
+      const defaultChainConfig = getChainConfig(customChainConfig.chainNamespace, customChainConfig.chainId, this.clientId);
       // NOTE: It is being forced casted to CustomChainConfig to handle OTHER Chainnamespace
       // where chainConfig is not required.
       const finalChainConfig = { ...(defaultChainConfig || {}), ...customChainConfig } as CustomChainConfig;
diff --git a/packages/base/src/chain/config.ts b/packages/base/src/chain/config.ts
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import {`
`16`	`16`
`17`	`17`	`export abstract class BaseEvmAdapter<T> extends BaseAdapter<T> {`
`18`	`18`	`async init(_?: AdapterInitOptions): Promise<void> {`
`19`		`- if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, 1);`
	`19`	`+ if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.EIP155, 1, this.clientId);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`async authenticateUser(): Promise<UserAuthInfo> {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import bs58 from "bs58";`
`17`	`17`
`18`	`18`	`export abstract class BaseSolanaAdapter<T> extends BaseAdapter<T> {`
`19`	`19`	`async init(_?: AdapterInitOptions): Promise<void> {`
`20`		`- if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.SOLANA, 1);`
	`20`	`+ if (!this.chainConfig) this.chainConfig = getChainConfig(CHAIN_NAMESPACES.SOLANA, 1, this.clientId);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`async authenticateUser(): Promise<UserAuthInfo> {`