Merge branch 'main' into open-source

solana-foundation · Jul 12, 2024 · 2334406 · 2334406
2 parents 663a8e9 + 008f8a3
commit 2334406
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 57 deletions.
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "@mdx-js/react": "^3.0.1",
     "@shikijs/transformers": "^1.6.0",
     "@sindresorhus/slugify": "^2.2.1",
-    "@solana-foundation/solana-lib": "^2.36.1",
+    "@solana-foundation/solana-lib": "^2.36.3",
     "@typeform/embed": "^4.4.0",
     "bootstrap": "^5.3.3",
     "cheerio": "^1.0.0-rc.12",

diff --git a/src/hooks/useTransactionStats.js b/src/hooks/useTransactionStats.js
@@ -32,8 +32,7 @@ export const MAINNET_ENDPOINT = "https://explorer-api.mainnet-beta.solana.com";
  *
  * @type {string}
  */
-export const INTERNAL_MAINNET_ENDPOINT =
-  "https://api.vip.mainnet-beta.solana.com/";
+export const INTERNAL_MAINNET_ENDPOINT = "";
 
 // Test for AbortController support.
 const isAbortControllerSupported =
@@ -88,56 +87,58 @@ export const useTransactionStats = ({
         const rpcNodeURL = isDevelopment
           ? INTERNAL_MAINNET_ENDPOINT
           : MAINNET_ENDPOINT;
-        await Promise.all([
-          (async () => {
-            const recentPerformanceSamples = await makeRPCCall({
-              abortSignal,
-              method: "getRecentPerformanceSamples",
-              params: [60 * sampleHistoryHours],
-              rpcNodeURL,
-            });
-            // Calculate transactions per second for each sample.
-            const short = recentPerformanceSamples.result.reduce(
-              (shortResults, sample) => {
-                if (sample.numTransactions !== 0) {
-                  shortResults.push(
-                    sample.numTransactions / sample.samplePeriodSecs,
-                  );
-                }
-                return shortResults;
-              },
-              [],
-            );
-            // Use latest sample as average transactions per second.
-            const avgTps = Math.round(short[0]);
-            setAvgTps(avgTps);
-            setAvailableStats(true);
-          })(),
-          (async () => {
-            if (!getValidatorNodes) {
-              return;
-            }
-            const voteAccounts = await makeRPCCall({
-              abortSignal,
-              method: "getVoteAccounts",
-              rpcNodeURL,
-            });
-            setValidators(voteAccounts.result.current.length);
-            setAvailableStats(true);
-          })(),
-          (async () => {
-            if (!getTransactionCount) {
-              return;
-            }
-            const transactionCount = await makeRPCCall({
-              abortSignal,
-              method: "getTransactionCount",
-              rpcNodeURL,
-            });
-            setTotalTransactionCount(transactionCount.result);
-            setAvailableStats(true);
-          })(),
-        ]);
+        if (rpcNodeURL) {
+          await Promise.all([
+            (async () => {
+              const recentPerformanceSamples = await makeRPCCall({
+                abortSignal,
+                method: "getRecentPerformanceSamples",
+                params: [60 * sampleHistoryHours],
+                rpcNodeURL,
+              });
+              // Calculate transactions per second for each sample.
+              const short = recentPerformanceSamples.result.reduce(
+                (shortResults, sample) => {
+                  if (sample.numTransactions !== 0) {
+                    shortResults.push(
+                      sample.numTransactions / sample.samplePeriodSecs,
+                    );
+                  }
+                  return shortResults;
+                },
+                [],
+              );
+              // Use latest sample as average transactions per second.
+              const avgTps = Math.round(short[0]);
+              setAvgTps(avgTps);
+              setAvailableStats(true);
+            })(),
+            (async () => {
+              if (!getValidatorNodes) {
+                return;
+              }
+              const voteAccounts = await makeRPCCall({
+                abortSignal,
+                method: "getVoteAccounts",
+                rpcNodeURL,
+              });
+              setValidators(voteAccounts.result.current.length);
+              setAvailableStats(true);
+            })(),
+            (async () => {
+              if (!getTransactionCount) {
+                return;
+              }
+              const transactionCount = await makeRPCCall({
+                abortSignal,
+                method: "getTransactionCount",
+                rpcNodeURL,
+              });
+              setTotalTransactionCount(transactionCount.result);
+              setAvailableStats(true);
+            })(),
+          ]);
+        }
       } catch (error) {
         if (error.name === "AbortError" || error.name === "TypeError") {
           return;

diff --git a/yarn.lock b/yarn.lock
@@ -1591,10 +1591,10 @@
   dependencies:
     escape-string-regexp "^5.0.0"
 
-"@solana-foundation/solana-lib@^2.36.1":
-  version "2.36.1"
-  resolved "https://registry.yarnpkg.com/@solana-foundation/solana-lib/-/solana-lib-2.36.1.tgz#75860a2ba6ef3cd68dff7fe047b56a468fff2bea"
-  integrity sha512-9zl+yr//ky7HLquo2UqAfr3sB+uLCUfNp9pYZzo7mMFEEs2H8Sygt4ZXM9pwi4LmiVN8vtDh1QeuOpPlhYEA1A==
+"@solana-foundation/solana-lib@^2.36.3":
+  version "2.36.3"
+  resolved "https://registry.yarnpkg.com/@solana-foundation/solana-lib/-/solana-lib-2.36.3.tgz#088395b5bf76f30c3dfe725344f6ed3e8f3b1bfb"
+  integrity sha512-9G09+Ipe8KsCUyE1XcqdFTRtmso03nmi4Wsor2buMtnkSiKeyTyVw5gqreecKP0lt0EcIkLXgihDPmkINMjIOw==
   dependencies:
     "@radix-ui/react-tooltip" "^1.0.6"
     "@types/react-slick" "^0.23.13"