Merge pull request #71 from OilerNetwork/fossil-req-server-side

Move fossil job status call to the server side

.env.example

@@ -2,12 +2,14 @@ NEXT_PUBLIC_VAULT_ADDRESSES=""
 NEXT_PUBLIC_ENVIRONMENT=""
 NEXT_PUBLIC_RPC_URL_MAINNET=""
 NEXT_PUBLIC_RPC_URL_SEPOLIA=""
-NEXT_PUBLIC_RPC_URL_DEVNET=""
-NEXT_PUBLIC_RPC_URL_JUNO_DEVNET=""
-JUNO_DOCKER_HOST=$NEXT_PUBLIC_RPC_URL_JUNO_DEVNET
 NEXT_PUBLIC_FOSSIL_API_URL=""
 NEXT_PUBLIC_WS_URL=""
 FOSSIL_API_KEY=""
 FOSSIL_DB_URL=""
 PORT=
 NEXT_PUBLIC_FOSSIL_USE_MOCK_PRICING_DATA=true
+
+# ⬇️⬇️⬇️ MANDATORY FOR DEVELOPMENT ENVIRONMENT - NOT NEEDED IN PRODUCTION
+JUNO_DOCKER_HOST=
+NEXT_PUBLIC_RPC_URL_DEVNET=""
+NEXT_PUBLIC_RPC_URL_JUNO_DEVNET=""

.github/workflows/deploy_pitchlake_ui.yaml

@@ -14,12 +14,9 @@ env:
   NODE_ENV: production
   PORT: ${{vars.PORT}}
   NEXT_PUBLIC_VAULT_ADDRESSES: ${{vars.VAULT_ADDRESSES}}
-  NEXT_PUBLIC_API_URL: ${{vars.API_URL}}
   NEXT_PUBLIC_ENVIRONMENT: ${{vars.ENVIRONMENT}}
   NEXT_PUBLIC_RPC_URL_MAINNET: ${{secrets.RPC_URL_MAINNET}}
   NEXT_PUBLIC_RPC_URL_SEPOLIA: ${{secrets.RPC_URL_SEPOLIA}}
-  NEXT_PUBLIC_RPC_URL_DEVNET: ${{secrets.RPC_URL_DEVNET}}
-  NEXT_PUBLIC_RPC_URL_JUNO_DEVNET: ${{vars.RPC_URL_JUNO_DEVNET}}
   NEXT_PUBLIC_WS_URL: ${{vars.WS_URL}}
   FOSSIL_API_KEY: ${{secrets.FOSSIL_API_KEY}}
   FOSSIL_DB_URL: ${{secrets.FOSSIL_DB_URL}}
@@ -73,12 +70,9 @@ jobs:
             --platform=linux/amd64 \
             --build-arg PORT=${{ env.PORT }} \
             --build-arg NEXT_PUBLIC_VAULT_ADDRESSES=${{ env.NEXT_PUBLIC_VAULT_ADDRESSES }} \
-            --build-arg NEXT_PUBLIC_API_URL=${{ env.NEXT_PUBLIC_API_URL }} \
             --build-arg NEXT_PUBLIC_ENVIRONMENT=${{ env.NEXT_PUBLIC_ENVIRONMENT }} \
             --build-arg NEXT_PUBLIC_RPC_URL_MAINNET=${{ env.NEXT_PUBLIC_RPC_URL_MAINNET }} \
             --build-arg NEXT_PUBLIC_RPC_URL_SEPOLIA=${{ env.NEXT_PUBLIC_RPC_URL_SEPOLIA }} \
-            --build-arg NEXT_PUBLIC_RPC_URL_DEVNET=${{ env.NEXT_PUBLIC_RPC_URL_DEVNET }} \
-            --build-arg NEXT_PUBLIC_RPC_URL_JUNO_DEVNET=${{ env.NEXT_PUBLIC_RPC_URL_JUNO_DEVNET }} \
             --build-arg NEXT_PUBLIC_WS_URL=${{ env.NEXT_PUBLIC_WS_URL }} \
             --build-arg FOSSIL_API_KEY=${{ env.FOSSIL_API_KEY }} \
             --build-arg FOSSIL_DB_URL=${{ env.FOSSIL_DB_URL }} \

Dockerfile

@@ -2,23 +2,18 @@
 FROM node:20-alpine AS builder
 
 ARG NEXT_PUBLIC_VAULT_ADDRESSES
-ARG NEXT_PUBLIC_API_URL
 ARG NEXT_PUBLIC_ENVIRONMENT
 ARG NEXT_PUBLIC_RPC_URL_MAINNET
 ARG NEXT_PUBLIC_RPC_URL_SEPOLIA
-ARG NEXT_PUBLIC_RPC_URL_DEVNET
-ARG NEXT_PUBLIC_RPC_URL_JUNO_DEVNET
 ARG NEXT_PUBLIC_WS_URL
 ARG FOSSIL_API_KEY
 ARG FOSSIL_DB_URL
 ARG NEXT_PUBLIC_FOSSIL_API_URL
+
 ENV NEXT_PUBLIC_VAULT_ADDRESSES=${NEXT_PUBLIC_VAULT_ADDRESSES}
-ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
 ENV NEXT_PUBLIC_ENVIRONMENT=${NEXT_PUBLIC_ENVIRONMENT}
 ENV NEXT_PUBLIC_RPC_URL_MAINNET=${NEXT_PUBLIC_RPC_URL_MAINNET}
 ENV NEXT_PUBLIC_RPC_URL_SEPOLIA=${NEXT_PUBLIC_RPC_URL_SEPOLIA}
-ENV NEXT_PUBLIC_RPC_URL_DEVNET=${NEXT_PUBLIC_RPC_URL_DEVNET}
-ENV NEXT_PUBLIC_RPC_URL_JUNO_DEVNET=${NEXT_PUBLIC_RPC_URL_JUNO_DEVNET}
 ENV NEXT_PUBLIC_WS_URL=${NEXT_PUBLIC_WS_URL}
 ENV FOSSIL_API_KEY=${FOSSIL_API_KEY}
 ENV FOSSIL_DB_URL=${FOSSIL_DB_URL}

docker-compose.yml

@@ -11,16 +11,15 @@ services:
       - NODE_ENV=production
       - PORT= ${PORT}
       - NEXT_PUBLIC_VAULT_ADDRESS=${NEXT_PUBLIC_VAULT_ADDRESS}
-      - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
       - NEXT_PUBLIC_ENVIRONMENT=${NEXT_PUBLIC_ENVIRONMENT}
       - NEXT_PUBLIC_RPC_URL_MAINNET=${NEXT_PUBLIC_RPC_URL_MAINNET}
       - NEXT_PUBLIC_RPC_URL_SEPOLIA=${NEXT_PUBLIC_RPC_URL_SEPOLIA}
-      - NEXT_PUBLIC_RPC_URL_DEVNET=${NEXT_PUBLIC_RPC_URL_DEVNET}
-      - NEXT_PUBLIC_RPC_URL_JUNO_DEVNET=${NEXT_PUBLIC_RPC_URL_JUNO_DEVNET}
       - NEXT_PUBLIC_WS_URL=${NEXT_PUBLIC_WS_URL}
       - FOSSIL_API_KEY=${FOSSIL_API_KEY}
       - FOSSIL_DB_URL=${FOSSIL_DB_URL}
       - NEXT_PUBLIC_FOSSIL_API_URL=${NEXT_PUBLIC_FOSSIL_API_URL}
       - NEXT_PUBLIC_WS_URL=${NEXT_PUBLIC_WS_URL}
-      # ⬇️⬇️⬇️ This env var is used only in the devenv. Doesn't need to be set in prod
+      # ⬇️⬇️⬇️ MANDATORY FOR DEVELOPMENT ENVIRONMENT - NOT NEEDED IN PRODUCTION
       - JUNO_DOCKER_HOST=http://juno_plugin:6060
+      - NEXT_PUBLIC_RPC_URL_DEVNET=${NEXT_PUBLIC_RPC_URL_DEVNET}
+      - NEXT_PUBLIC_RPC_URL_JUNO_DEVNET=${NEXT_PUBLIC_RPC_URL_JUNO_DEVNET}

src/app/api/getHistoricalRoundParams/route.ts

@@ -31,6 +31,9 @@ export async function GET(request: Request) {
   const fromRound = searchParams.get("fromRound");
   const toRound = searchParams.get("toRound");
   // In the devenv, server side calls to the node need to use the docker host
+  // This logic does not apply to prod. JUNO_DOCKER_HOST does not need to be set in prod
+  // TODO: To get rid of this workaround and remove JUNO_DOCKER_HOST from the env, we need to
+  // all the calls to the node need to be either on the clients side, or on the server side.
   let nodeUrl =
     searchParams.get("nodeUrl") === process.env.NEXT_PUBLIC_RPC_URL_JUNO_DEVNET
       ? process.env.JUNO_DOCKER_HOST

src/app/api/getJobStatus/route.ts

@@ -0,0 +1,19 @@
+import { NextResponse } from 'next/server';
+
+export async function GET(request: Request) {
+  const { searchParams } = new URL(request.url);
+  const jobId = searchParams.get('jobId');
+
+  if (!jobId) {
+    return NextResponse.json({ error: 'Missing jobId parameter' }, { status: 400 });
+  }
+
+  try {
+    const response = await fetch(`${process.env.NEXT_PUBLIC_FOSSIL_API_URL}/job_status/${jobId}`);
+    const data = await response.json();
+    return NextResponse.json(data);
+  } catch (error) {
+    console.error('Error fetching job status:', error);
+    return NextResponse.json({ error: 'Failed to fetch job status' }, { status: 500 });
+  }
+} 

src/components/Vault/Vault.tsx

@@ -21,9 +21,9 @@ export const Vault = () => {
   }
 
   return (
-    <div className="px-6 py-4 bg-faded-black-alt flex-grow flex-box overflow-auto">
+    <div className="px-6 py-4 pt-[120px] bg-faded-black-alt flex-grow flex-box overflow-auto">
       <div className="flex flex-row-reverse text-primary">
-        <div className="flex flex-row rounded-md border-[1px] border-greyscale-800 ">
+        <div className="flex flex-row rounded-md border-[1px] border-greyscale-800 h-[55px]">
           <div
             onClick={() => {
               setIsProviderView(true);
@@ -50,7 +50,7 @@ export const Vault = () => {
               setIsProviderView(false);
               //setIsEditOpen(false);
             }}
-            className={`flex flex-row items-center m-[1px] hover:cursor-pointer p-4 rounded-md text-[14px] h-[44px] justify-center w-[115px] ${
+            className={`flex flex-row items-center justify-center m-[1px] hover:cursor-pointer px-4 py-1 rounded-md text-[14px] w-[115px] ${
               !isProviderView ? "bg-primary-900" : ""
             }`}
           >

src/hooks/fossil/useFossilStatus.ts

@@ -38,10 +38,7 @@ const useFossilStatus = () => {
     try {
 
       const jobId = createJobId(targetTimestamp, roundDuration);
-      const response = await fetch(
-        `${process.env.NEXT_PUBLIC_FOSSIL_API_URL}/job_status/${jobId}`
-      );
-
+      const response = await fetch(`/api/getJobStatus?jobId=${jobId}`);
       if (!response.ok) throw new Error("Network response was not ok");
 
       const data = await response.json();

src/hooks/stateTransition/useRoundState.ts

@@ -36,6 +36,7 @@ const getRoundState = ({
     if (
       fossilError ||
       fossilStatus === null ||
+      fossilStatus.error ||
       fossilStatus.status === "Failed"
     )
       return "FossilReady";