fixed solana

Author: CoNETProject

src/App.tsx

@@ -4,7 +4,8 @@ import { HashRouter as Router, Route, Routes } from "react-router-dom";
 import { Home, Region } from "./pages";
 import { useDaemonContext } from "./providers/DaemonProvider";
 import { createOrGetWallet, getCurrentPassportInfo, tryToRequireFreePassport } from "./services/wallets";
-import { getAllNodes, startMiningV2 } from "./services/mining";
+import { getAllNodes } from "./services/mining"; 
+import {checkCurrentRate} from "./services/passportPurchase";
 import { CoNET_Data, setCoNET_Data } from "./utils/globals";
 import { listenProfileVer } from "./services/listeners";
 import Vip from './pages/Vip';
@@ -25,8 +26,11 @@ import Transfer from './pages/Transfer';
 global.Buffer = require('buffer').Buffer;
 
 function App() {
-  const { setProfiles, setMiningData, allRegions, setClosestRegion, setaAllNodes, setServerIpAddress, setServerPort, _vpnTimeUsedInMin, setActivePassportUpdated, setActivePassport } = useDaemonContext();
-
+  const { setProfiles, setMiningData, allRegions, setClosestRegion, setaAllNodes, setServerIpAddress, setServerPort, _vpnTimeUsedInMin, setActivePassportUpdated, setActivePassport, setRandomSolanaRPC, randomSolanaRPC } = useDaemonContext();
+  const setSOlanaRPC = (allNodes: nodes_info[]) => {
+	const randomIndex = Math.floor(Math.random() * (allNodes.length - 1))
+	setRandomSolanaRPC(allNodes[randomIndex])
+  }
   useEffect(() => {
     const handlePassport = async () => {
       await tryToRequireFreePassport();
@@ -75,16 +79,16 @@ function App() {
 
       const profiles = await createOrGetWallet(secretPhrase);
       setProfiles(profiles);
-      listenProfileVer(setProfiles, setActivePassport, handlePassport);
-
+      listenProfileVer(setProfiles, setActivePassport, handlePassport, setMiningData);
+	  checkCurrentRate(setMiningData);
       getAllNodes(allRegions, setClosestRegion, (allNodes: nodes_info[]) => {
-        setaAllNodes(allNodes)
-
+        setSOlanaRPC(allNodes)
+		const randomIndex = Math.floor(Math.random() * (allNodes.length - 1))
+		setRandomSolanaRPC(allNodes[randomIndex])
         if (!CoNET_Data || !CoNET_Data?.profiles) {
           return
         }
-
-        startMiningV2(CoNET_Data?.profiles?.[0], allRegions, setMiningData);
+        
       });
 
       handlePassport();

src/components/AccountList/index.tsx

@@ -23,7 +23,7 @@ interface AccountListProps {
 
 export default function AccountList({ showMainWallet = true, simplifiedView = false, spInUsd = 0, solInUsd = 0 }: AccountListProps) {
   const [openAccountList, setOpenAccountList] = useState<string[]>([]);
-  const { profiles, activePassport, setProfiles } = useDaemonContext();
+  const { profiles, activePassport, setProfiles, randomSolanaRPC, getAllNodes } = useDaemonContext();
 
   const [mainAccountAddressCopied, setMainAccountAddressCopied] = useState(false);
   const [solanaAccountAddressCopied, setSolanaAccountAddressCopied] = useState(false);
@@ -61,7 +61,19 @@ export default function AccountList({ showMainWallet = true, simplifiedView = fa
     setIsRefreshingSolanaBalances(true);
 
     try {
-      await refreshSolanaBalances(profiles?.[1]);
+		let _randomSolanaRPC = randomSolanaRPC
+		if (!_randomSolanaRPC) {
+			const nodes = getAllNodes
+			const index = Math.floor(Math.random() * (nodes.length - 1))
+			await refreshSolanaBalances(profiles?.[1], nodes[index]);
+
+		} else {
+			await refreshSolanaBalances(profiles?.[1], _randomSolanaRPC);
+		}
+
+			
+		
+      
 
       storeSystemData();
 

src/pages/Home/index.tsx

@@ -90,7 +90,7 @@ const RenderButton = ({ errorMessage, handleTogglePower, isConnectionLoading, po
 
 
 const Home = () => {
-  const { power, setPower, profiles, sRegion, setSRegion, setAllRegions, allRegions, setIsRandom, getAllNodes, closestRegion, _vpnTimeUsedInMin } = useDaemonContext();
+  const { power, setPower, profiles, sRegion, setSRegion, setAllRegions, allRegions, setIsRandom, getAllNodes, closestRegion, _vpnTimeUsedInMin, randomSolanaRPC, setRandomSolanaRPC } = useDaemonContext();
   const [isInitialLoading, setIsInitialLoading] = useState<boolean>(true);
   const [isConnectionLoading, setIsConnectionLoading] = useState<boolean>(false)
   const [initPercentage, setInitPercentage] = useState<number>(0);

src/providers/DaemonProvider.tsx

@@ -38,6 +38,8 @@ type DaemonContext = {
   setPurchasingPlan: (val: string) => void
   purchasingPlanPaymentTime: string
   setPurchasingPlanPaymentTime: (val: string) => void
+  randomSolanaRPC: nodes_info|null
+  setRandomSolanaRPC: (val: nodes_info) => void;
 };
 
 type DaemonProps = {
@@ -82,6 +84,8 @@ const defaultContextValue: DaemonContext = {
   setPurchasingPlan: () => { },
   purchasingPlanPaymentTime: "monthly",
   setPurchasingPlanPaymentTime: () => { },
+  setRandomSolanaRPC: () => { },
+  randomSolanaRPC: null
 };
 
 const Daemon = createContext<DaemonContext>(defaultContextValue);
@@ -111,6 +115,7 @@ export function DaemonProvider({ children }: DaemonProps) {
   const [activePassport, setActivePassport] = useState<any>(null);
   const [purchasingPlan, setPurchasingPlan] = useState<string>("premium");
   const [purchasingPlanPaymentTime, setPurchasingPlanPaymentTime] = useState<string>("monthly");
+  const [randomSolanaRPC, setRandomSolanaRPC] = useState<nodes_info|null>(null);
 
   useEffect(() => {
     {
@@ -121,7 +126,7 @@ export function DaemonProvider({ children }: DaemonProps) {
 
 
   return (
-    <Daemon.Provider value={{ power, setPower, sRegion, setSRegion, allRegions, setAllRegions, closestRegion, setClosestRegion, isRandom, setIsRandom, miningData, setMiningData, profiles, setProfiles, isMiningUp, setIsMiningUp, getAllNodes, setaAllNodes, serverIpAddress, setServerIpAddress, serverPort, setServerPort, serverPac, setServerPac, _vpnTimeUsedInMin, isPassportInfoPopupOpen, setIsPassportInfoPopupOpen, activePassportUpdated, setActivePassportUpdated, activePassport, setActivePassport, isSelectPassportPopupOpen, setIsSelectPassportPopupOpen, purchasingPlan, setPurchasingPlan, purchasingPlanPaymentTime, setPurchasingPlanPaymentTime }}>
+    <Daemon.Provider value={{ power, setPower, sRegion, setSRegion, allRegions, setAllRegions, closestRegion, setClosestRegion, isRandom, setIsRandom, miningData, setMiningData, profiles, setProfiles, isMiningUp, setIsMiningUp, getAllNodes, setaAllNodes, serverIpAddress, setServerIpAddress, serverPort, setServerPort, serverPac, setServerPac, _vpnTimeUsedInMin, isPassportInfoPopupOpen, setIsPassportInfoPopupOpen, activePassportUpdated, setActivePassportUpdated, activePassport, setActivePassport, isSelectPassportPopupOpen, setIsSelectPassportPopupOpen, purchasingPlan, setPurchasingPlan, purchasingPlanPaymentTime, setPurchasingPlanPaymentTime, setRandomSolanaRPC, randomSolanaRPC}}>
       {children}
     </Daemon.Provider>
   );

src/services/listeners.ts

@@ -14,6 +14,7 @@ import {
 } from "../utils/globals";
 import contracts from "../utils/contracts";
 import { initProfileTokens } from "../utils/utils";
+import {checkCurrentRate} from '../services/passportPurchase'
 import {
   getPassportsInfoForProfile,
   getVpnTimeUsed,
@@ -28,6 +29,7 @@ const listenProfileVer = async (
   _setProfiles: (profiles: profile[]) => void,
   _setActivePassport: (profiles: freePassport) => void,
   _updateCurrentPassport: () => Promise<void>,
+  setMiningData: (response: nodeResponse) => void
 ) => {
   epoch = await conetProvider.getBlockNumber();
 
@@ -49,7 +51,8 @@ const listenProfileVer = async (
         runningList.push(getProfileAssets(profiles[0], profiles[1]));
 
         await Promise.all(runningList);
-
+		//	get rate update
+		checkCurrentRate (setMiningData);
         await getVpnTimeUsed();
 
         await getPassportsInfoForProfile(profiles[0]);
@@ -84,15 +87,13 @@ const getProfileAssets = async (profile: profile, solanaProfile: profile) => {
       profile.tokens = initProfileTokens();
     }
 
-    const [cCNTP, conet, conetDepin, conet_eth, eth, sol, sp] =
+    const [cCNTP, conet, conetDepin, conet_eth, eth] =
       await Promise.all([
         scanCCNTP(key),
         scanCONETHolesky(key),
         scanCONETDepin(key),
         scanConetETH(key),
-        scanETH(key),
-        scanSolanaSol(solanaKey),
-        scanSolanaSp(solanaKey),
+        scanETH(key)
       ]);
 
     if (profile.tokens?.cCNTP) {
@@ -177,34 +178,6 @@ const getProfileAssets = async (profile: profile, solanaProfile: profile) => {
       };
     }
 
-    if (solanaProfile.tokens?.sol) {
-      solanaProfile.tokens.sol.balance =
-        sol === false ? solanaProfile.tokens.sol.balance : sol?.toFixed(6);
-    } else {
-      solanaProfile.tokens.sol = {
-        balance: sol === false ? "" : sol?.toFixed(6),
-        network: "Solana Mainnet",
-        decimal: 18,
-        contract: "",
-        name: "sol",
-      };
-    }
-
-    if (solanaProfile.tokens?.sp) {
-      solanaProfile.tokens.sp.balance =
-        sp === false
-          ? solanaProfile.tokens.sp.balance
-          : parseFloat(sp).toFixed(6);
-    } else {
-      solanaProfile.tokens.sp = {
-        balance: sp === false ? "" : parseFloat(sp).toFixed(6),
-        network: "Solana Mainnet",
-        decimal: 18,
-        contract: "",
-        name: "sp",
-      };
-    }
-
     const temp = CoNET_Data;
 
     if (!temp) {
@@ -250,7 +223,7 @@ const scanETH = async (walletAddr: string) => {
   return await scan_natural_balance(walletAddr, ethProvider);
 };
 
-const scanSolanaSol = async (walletAddr: string) => {
+const scanSolanaSol = async (walletAddr: string, randomSolanaRPC: string) => {
   try {
     // Validate wallet address format
     if (!PublicKey.isOnCurve(walletAddr)) {
@@ -264,7 +237,7 @@ const scanSolanaSol = async (walletAddr: string) => {
       params: [walletAddr],
     };
 
-    const response = await fetch(solanaRpc, {
+    const response = await fetch(randomSolanaRPC, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -288,8 +261,8 @@ const scanSolanaSol = async (walletAddr: string) => {
   }
 };
 
-const scanSolanaSp = async (walletAddr: string) => {
-  return await scan_spl_balance(walletAddr, contracts.PassportSolana.address);
+const scanSolanaSp = async (walletAddr: string, solanaRPC_url: string) => {
+  return await scan_spl_balance(walletAddr, contracts.PassportSolana.address, solanaRPC_url);
 };
 
 const scan_erc20_balance: (
@@ -324,7 +297,7 @@ const scan_natural_balance = async (walletAddr: string, provider: any) => {
   }
 };
 
-const scan_spl_balance = async (walletAddr: string, tokenAddress: string) => {
+const scan_spl_balance = async (walletAddr: string, tokenAddress: string, solanaRPC_url: string ) => {
   try {
     const TOKEN_PROGRAM_ID = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"; // Solana SPL Token Program ID
 
@@ -339,7 +312,7 @@ const scan_spl_balance = async (walletAddr: string, tokenAddress: string) => {
       ],
     };
 
-    const response = await fetch(solanaRpc, {
+    const response = await fetch(solanaRPC_url, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",