Merge pull request #1480 from mars-protocol/develop

v2.9.3

Author: Patricie29

src/api/prices/getPythPrices.ts

@@ -10,12 +10,12 @@ export default async function fetchPythPrices(priceFeedIds: string[], assets: As
   const pricesUrl = new URL(`${pythEndpoints.api}/latest_price_feeds`)
   const fallbackUrl = new URL(`${pythEndpoints.fallbackApi}/latest_price_feeds`)
 
-  try {
-    priceFeedIds.forEach((id) => {
-      pricesUrl.searchParams.append('ids[]', id)
-      fallbackUrl.searchParams.append('ids[]', id)
-    })
+  priceFeedIds.forEach((id) => {
+    pricesUrl.searchParams.append('ids[]', id)
+    fallbackUrl.searchParams.append('ids[]', id)
+  })
 
+  try {
     const pythResponse: PythPriceData[] = await cacheFn(
       async () => {
         try {
@@ -24,11 +24,18 @@ export default async function fetchPythPrices(priceFeedIds: string[], assets: As
           )
         } catch (error) {
           console.warn('Primary Pyth API failed, falling back to fallback API', error)
+        }
 
+        try {
           return await fetchWithTimeout(fallbackUrl.toString(), FETCH_TIMEOUT).then((res) =>
             res.json(),
           )
+        } catch (error) {
+          console.error('Fallback Pyth API also failed', error)
+          setApiError(fallbackUrl.toString(), error)
         }
+
+        return [] as PythPriceData[]
       },
       pythPriceCache,
       `pythPrices/${priceFeedIds.flat().join('-')}`,
@@ -49,6 +56,6 @@ export default async function fetchPythPrices(priceFeedIds: string[], assets: As
     return mappedPriceData
   } catch (ex) {
     setApiError(pricesUrl.toString(), ex)
-    throw ex
+    return []
   }
 }