From 41a2b19696518ac0722880f1ced636b712afcf46 Mon Sep 17 00:00:00 2001
From: Alvaro <farinalvaro@gmail.com>
Date: Fri, 20 Oct 2023 05:55:07 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20exactly:=20validate=20available?=
 =?UTF-8?q?=20pools=20(#1045)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/adaptors/exactly/index.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/adaptors/exactly/index.js b/src/adaptors/exactly/index.js
index e5998c8c07..0e5d47ca7a 100644
--- a/src/adaptors/exactly/index.js
+++ b/src/adaptors/exactly/index.js
@@ -174,7 +174,8 @@ const apy = async () =>
           }
 
           /** @type {Pool} */
-          const floating = {
+          const floating = Number.isFinite(apr) &&
+            Number.isFinite(borrowAPR) && {
             ...poolMetadata,
             pool: `${market}-${chain}`.toLowerCase(),
             apyBase: aprToApy(apr),
@@ -204,6 +205,15 @@ const apy = async () =>
                 fixSupplied = BigInt(supplied),
                 fixUnassignedEarnings = BigInt(unassignedEarnings);
 
+              if (fixSupplied + BigInt(previewFloatingAssetsAverages[i]) === 0n) return;
+
+              const { rate: minFixedRate } = await api2.abi.call({
+                target: interestRateModels[i],
+                abi: abis.minFixedRate,
+                params: [borrowed, supplied, previewFloatingAssetsAverages[i]],
+                block,
+                chain,
+              });
               const unassignedEarning =
                 fixUnassignedEarnings -
                 (fixUnassignedEarnings * BigInt(timestampNow - lastAccrual)) /
@@ -220,16 +230,6 @@ const apy = async () =>
                   : 0;
 
               const secsToMaturity = maturity - timestampNow;
-
-              const { rate: minFixedRate } = await api2.abi.call({
-                target: interestRateModels[i],
-                abi: abis.minFixedRate,
-                params: [borrowed, supplied, previewFloatingAssetsAverages[i]],
-                block,
-                chain,
-              });
-
-              const fixedBorrowAPR = previewFloatingAssetsAverages[i] + supplied > 0 ? minFixedRate / 1e16 : 0;
               const poolMeta = new Date(maturity * 1_000).toISOString().slice(0, 10);
 
               /** @type {Pool} */
@@ -238,7 +238,7 @@ const apy = async () =>
                 pool: `${market}-${chain}-${poolMeta}`.toLowerCase(),
                 poolMeta,
                 apyBase: aprToApy(fixedDepositAPR, secsToMaturity / 86_400),
-                apyBaseBorrow: aprToApy(fixedBorrowAPR, secsToMaturity / 86_400),
+                apyBaseBorrow: aprToApy(minFixedRate / 1e16, secsToMaturity / 86_400),
                 totalSupplyUsd:
                   (Number(
                     BigInt(supplied) +
@@ -254,7 +254,7 @@ const apy = async () =>
             })
           );
 
-          return [floating, ...fixed];
+          return [floating, ...fixed].filter(Boolean);
         })
       );
     })