Merge pull request #693 from bancorprotocol/hotfix/holding_calc

Fixed deficit calculation in holdings
bancorprotocol · Oct 3, 2022 · be27a82 · be27a82
2 parents 5f1ea3b + 38f1c6c
commit be27a82
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/services/observables/pools.ts b/src/services/observables/pools.ts
@@ -268,7 +268,6 @@ const buildPoolV3Object = (
     .minus(1)
     .times(100)
     .toString();
-
   return {
     ...apiPool,
     liquidity,
@@ -410,8 +409,22 @@ export const allpoolsV3$ = combineLatest([
   switchMapIgnoreThrow(
     async ([apiPoolsV3, allTokens, standardRewardPrograms]) => {
       const tokensMap = new Map(allTokens.map((t) => [t.address, t]));
+      const poolIds = apiPoolsV3.map((pool) => pool.poolDltId);
 
-      const latestProgramIds = await fetchLatestProgramIdsMulticall(apiPoolsV3);
+      const [
+        latestProgramIds,
+        masterVaultBalances,
+        extVaultBalances,
+        extVaultIsPaused,
+      ] = await Promise.all([
+        fetchLatestProgramIdsMulticall(apiPoolsV3),
+        fetchTokenBalanceMulticall(poolIds, bancorMasterVault),
+        fetchTokenBalanceMulticall(
+          poolIds,
+          ContractsApi.ExternalProtectionVault.contractAddress
+        ),
+        ContractsApi.ExternalProtectionVault.read.isPaused(),
+      ]);
 
       const pools = await Promise.all(
         apiPoolsV3.map(
@@ -421,7 +434,9 @@ export const allpoolsV3$ = combineLatest([
               pool,
               tokensMap.get(pool.poolDltId),
               latestProgramIds,
-              standardRewardPrograms
+              standardRewardPrograms,
+              masterVaultBalances,
+              !extVaultIsPaused ? extVaultBalances : undefined
             )
         )
       );