From f95b7723dbbccb26ab136a96c197301c0a34cc0d Mon Sep 17 00:00:00 2001 From: wanwiset25 Date: Tue, 16 Jul 2024 12:39:31 +0400 Subject: [PATCH] change to frontend specific RPC env --- frontend/src/App.tsx | 8 +++++--- frontend/src/constants/urls.ts | 3 ++- .../management-login-page/ManagementLoggedInPage.tsx | 1 + .../pages/management-login-page/components/LoginError.tsx | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index fd79217..9707e9b 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -15,6 +15,7 @@ import { configureChains, createConfig, WagmiConfig } from "wagmi"; import { InjectedConnector } from "wagmi/connectors/injected"; import { Chain, Wallet, connectorsForWallets } from "@rainbow-me/rainbowkit"; import { ChainSetting } from "./main"; +import { rpcUrl } from "./constants/urls"; function App() { const chainSetting = useLoaderData() as ChainSetting @@ -31,8 +32,9 @@ function App() { symbol: chainSetting.denom, }, rpcUrls: { - public: { http: [chainSetting.rpcUrl] }, - default: { http: [chainSetting.rpcUrl] }, + public: { http: [rpcUrl] }, + default: { http: [rpcUrl] }, + private: { http: [chainSetting.rpcUrl] } }, } as const satisfies Chain; @@ -65,7 +67,7 @@ function App() { [ jsonRpcProvider({ rpc: (chain) => ({ - http: chainSetting.rpcUrl + http: rpcUrl }), }), ] diff --git a/frontend/src/constants/urls.ts b/frontend/src/constants/urls.ts index 97b2c10..29eb540 100644 --- a/frontend/src/constants/urls.ts +++ b/frontend/src/constants/urls.ts @@ -1 +1,2 @@ -export const baseUrl = `${import.meta.env.VITE_SUBNET_URL}`; \ No newline at end of file +export const baseUrl = `${import.meta.env.VITE_SUBNET_URL}`; +export const rpcUrl = `${import.meta.env.FRONTEND_SUBNET_RPC}`; \ No newline at end of file diff --git a/frontend/src/pages/management-login-page/ManagementLoggedInPage.tsx b/frontend/src/pages/management-login-page/ManagementLoggedInPage.tsx index 0b72203..15ff320 100644 --- a/frontend/src/pages/management-login-page/ManagementLoggedInPage.tsx +++ b/frontend/src/pages/management-login-page/ManagementLoggedInPage.tsx @@ -5,6 +5,7 @@ import InfoList from "@/components/info-list/InfoList"; import Loader from "@/components/loader/Loader"; import { formatHash } from "@/utils/formatter"; import { useAccount, useBalance, useNetwork } from "wagmi"; +import { rpcUrl } from "@/constants/urls"; export default function ManagementLoggedInPage() { const [isLoading, setIsLoading] = useState(true); diff --git a/frontend/src/pages/management-login-page/components/LoginError.tsx b/frontend/src/pages/management-login-page/components/LoginError.tsx index cf316e5..44f258b 100644 --- a/frontend/src/pages/management-login-page/components/LoginError.tsx +++ b/frontend/src/pages/management-login-page/components/LoginError.tsx @@ -11,6 +11,7 @@ import { ErrorTypes } from "@/pages/errors"; import type { InfoListInfo } from "@/types/info"; import { ChainSetting } from "@/main"; +import { rpcUrl } from "@/constants/urls"; interface LoginErrorProps { errorType: ErrorTypes; chainSetting: ChainSetting; @@ -44,7 +45,7 @@ export default function LoginError({ errorType, chainSetting }: LoginErrorProps)

Network name: {chainSetting.networkName}

- New RPC URL: {chainSetting.rpcUrl} + New RPC URL: {rpcUrl}

Chain ID: {chainSetting.networkId}