chore: remove salt and requirement for additional api request

mrgnlabs · Nov 15, 2024 · e168cfc · e168cfc
1 parent 8e37c50
commit e168cfc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/apps/marginfi-v2-ui/src/middleware.ts b/apps/marginfi-v2-ui/src/middleware.ts
@@ -16,10 +16,7 @@ const allowedOrigins = [
 ];
 
 export async function middleware(req: NextRequest) {
-  const fullRpcProxy = await generateEndpoint(
-    process.env.NEXT_PUBLIC_MARGINFI_RPC_ENDPOINT_OVERRIDE ?? "",
-    process.env.RPC_PROXY_SALT ?? ""
-  );
+  const fullRpcProxy = await generateEndpoint(process.env.NEXT_PUBLIC_MARGINFI_RPC_ENDPOINT_OVERRIDE ?? "");
 
   if (req.nextUrl.toString() === fullRpcProxy) {
     const origin = req.headers.get("origin") ?? "";

diff --git a/apps/marginfi-v2-ui/src/pages/_app.tsx b/apps/marginfi-v2-ui/src/pages/_app.tsx
@@ -11,7 +11,7 @@ import { ToastContainer } from "react-toastify";
 import { Analytics } from "@vercel/analytics/react";
 import { registerMoonGateWallet } from "@moongate/moongate-adapter";
 
-import { cn, DEFAULT_MAX_CAP, Desktop, Mobile, init as initAnalytics } from "@mrgnlabs/mrgn-utils";
+import { cn, generateEndpoint, DEFAULT_MAX_CAP, Desktop, Mobile, init as initAnalytics } from "@mrgnlabs/mrgn-utils";
 import { ActionBoxProvider, ActionProvider, AuthDialog } from "@mrgnlabs/mrgn-ui";
 
 import config from "~/config";
@@ -76,20 +76,14 @@ export default function MrgnApp({ Component, pageProps, path }: AppProps & MrgnA
   const [ready, setReady] = React.useState(false);
   const [rpcEndpoint, setRpcEndpoint] = React.useState("");
 
-  const fetchRpcEndpoint = async () => {
-    const res = await fetch(`/api/endpoint?url=${config.rpcEndpoint}`);
-    const data = await res.json();
-    return data.url;
-  };
-
   React.useEffect(() => {
     const isFetchingData = isRefreshingMrgnlendStore;
     setIsFetchingData(isFetchingData);
   }, [isMrgnlendStoreInitialized, isRefreshingMrgnlendStore, setIsFetchingData]);
 
   React.useEffect(() => {
     const init = async () => {
-      const rpcEndpoint = await fetchRpcEndpoint();
+      const rpcEndpoint = await generateEndpoint(config.rpcEndpoint);
       setRpcEndpoint(rpcEndpoint);
       setReady(true);
       initAnalytics();

diff --git a/apps/marginfi-v2-ui/src/pages/api/endpoint.ts b/apps/marginfi-v2-ui/src/pages/api/endpoint.ts
diff --git a/packages/mrgn-utils/src/mrgnUtils.ts b/packages/mrgn-utils/src/mrgnUtils.ts
@@ -147,11 +147,11 @@ export function isBankOracleStale(bank: ExtendedBankInfo) {
   return isStale;
 }
 
-export async function generateEndpoint(endpoint: string, salt: string) {
+export async function generateEndpoint(endpoint: string) {
   const now = new Date();
   const midnight = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + 1));
   const timestamp = Math.floor(midnight.getTime() / 1000);
-  const msgUint8 = new TextEncoder().encode(`${endpoint}-${timestamp}-${salt}`);
+  const msgUint8 = new TextEncoder().encode(`${endpoint}-${timestamp}`);
   const hashBuffer = await crypto.subtle.digest("SHA-256", msgUint8);
   const hashArray = Array.from(new Uint8Array(hashBuffer));
   const hash = hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");