Add rpc url setting

frontend/app/src/App.tsx

@@ -4,13 +4,13 @@ import { QueryClient, QueryClientProvider } from 'react-query';
 import { ChakraProvider } from '@chakra-ui/react';
 import { WalletProvider } from './wallet/walletContext';
 import { WalletInterface } from './interfaces';
-import { initTezos, setWalletProvider } from './contracts/client';
-import { APP_NAME, NETWORK, RPC_URL, RPC_PORT, CTEZ_ADDRESS } from './utils/globals';
+import { setWalletProvider } from './contracts/client';
+import { APP_NAME, NETWORK, CTEZ_ADDRESS } from './utils/globals';
 import { getBeaconInstance, isWalletConnected } from './wallet';
 import { AppRouter } from './router';
 import { initCTez } from './contracts/ctez';
 import { logger } from './utils/logger';
-import { getNodePort, getNodeURL } from './utils/settingUtils';
+import { initializeRpcUrl } from './utils/rpcManager';
 import ModalContainer from './components/modals/ModalContainer';
 import theme from './theme/theme';
 import ErrorBoundary from './components/ErrorBoundary';
@@ -28,25 +28,37 @@ const App: React.FC = () => {
       const walletData = await getBeaconInstance(APP_NAME, true, NETWORK);
       walletData?.wallet && setWalletProvider(walletData.wallet);
       walletData && setWallet(walletData);
+      return walletData; 
     }
+    return null;
   };
 
-  const nodeUrl = wallet.pkh ? getNodeURL(wallet.pkh) : RPC_URL;
-  const nodePort = wallet.pkh ? getNodePort(wallet.pkh) : RPC_PORT;
-
   useEffect(() => {
     const setup = async () => {
       try {
-        initTezos(nodeUrl ?? RPC_URL, nodePort ?? RPC_PORT);
-        await checkWalletConnection();
-        CTEZ_ADDRESS && (await initCTez(CTEZ_ADDRESS));
-        CFMM_ADDRESS && (await initCfmm(CFMM_ADDRESS));
+        const walletData = await checkWalletConnection();
+        const walletAddress = walletData?.pkh || wallet.pkh;
+        const nodeUrl = initializeRpcUrl(walletAddress);
+
+        if (nodeUrl && (nodeUrl.startsWith('http://') || nodeUrl.startsWith('https://'))) {
+
+          if (CTEZ_ADDRESS) {
+            await initCTez(CTEZ_ADDRESS);
+          }
+
+          if (CFMM_ADDRESS) {
+            await initCfmm(CFMM_ADDRESS);
+          }
+        } else {
+          logger.warn('Invalid RPC URL, skipping contract initialization:', nodeUrl);
+        }
       } catch (error: any) {
-        logger.error(error);
+        logger.error('Failed to initialize contracts:', error);
       }
     };
+
     setup();
-  }, [wallet.pkh, nodeUrl, nodePort]);
+  }, [wallet.pkh]);
 
   return (
     <Suspense fallback="Loading...">

frontend/app/src/api/contracts.ts

@@ -4,9 +4,10 @@ import { sub, format } from 'date-fns';
 import { getActualCtezStorage, getUserHalfDexLqtBalance } from '../contracts/ctez';
 import { getCtezFa12TotalSupply } from '../contracts/fa12';
 import { BaseStats, CTezStorage, CTezTzktStorage, OvenBalance, UserLQTData } from '../interfaces';
-import { CTEZ_CONTRACT_BIGMAP, RPC_URL } from '../utils/globals';
+import { getCurrentRpcUrl, isRpcInitialized } from '../utils/rpcManager';
 import { getOvenCtezOutstandingAndFeeIndex, getUpdatedDexFeeIndex } from '../utils/ovenUtils';
 import { getCTezTzktStorage, getLastBlockOfTheDay, getUserOvensAPI } from './tzkt';
+import { CTEZ_CONTRACT_BIGMAP } from '../utils/globals';
 
 export const getPrevCTezStorage = async (
   days = 7,
@@ -19,7 +20,11 @@ export const getPrevCTezStorage = async (
   return storage;
 };
 export const getCurrentBlock = async () => {
-  const response = await axios.get(`${RPC_URL}/chains/main/blocks/head`);
+  if (!isRpcInitialized()) {
+    throw new Error('RPC not initialized. Please wait for initialization to complete.');
+  }
+  const rpcUrl = getCurrentRpcUrl();
+  const response = await axios.get(`${rpcUrl}/chains/main/blocks/head`);
 
   return response.data.header.level;
 };

frontend/app/src/api/queries.ts

@@ -1,6 +1,7 @@
 import { AxiosError } from 'axios';
 import { useQueries, useQuery } from 'react-query';
 import { UseQueryResult } from 'react-query/types/react/types';
+import { getCurrentRpcUrl } from '../utils/rpcManager';
 import {
   getActualCtezStorage,
   getAllOvens,
@@ -48,8 +49,9 @@ export const useCtezBaseStats = (userAddress?: string) => {
 };
 
 export const useUserBalance = (userAddress?: string) => {
+  const rpcUrl = getCurrentRpcUrl();
   return useQuery<UserBalance | undefined, AxiosError, UserBalance | undefined>(
-    [`user-balance-${userAddress}`],
+    [`user-balance-${userAddress}-${rpcUrl}`],
     () => {
       if (userAddress) {
         return getUserBalance(userAddress);
@@ -181,8 +183,9 @@ export const useOvenDelegate = (ovenAddress?: string) => {
 };
 
 export const useUserLqtData = (userAddress?: string) => {
+  const rpcUrl = getCurrentRpcUrl();
   return useQuery<UserLQTData | undefined, AxiosError, UserLQTData | undefined>(
-    ['userLqtData', userAddress],
+    ['userLqtData', userAddress, rpcUrl],
     async () => {
       if (userAddress) {
         return getUserLQTData(userAddress);