@defisaver/positions-sdk 1.0.26-dev-portfolio-6 → 1.0.26-dev-portfolio-8

package/cjs/portfolio/index.js

@@ -184,7 +184,7 @@ function getPortfolioDataSlower(provider, network, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const crvUsdMarkets = Object.values((0, markets_1.CrvUsdMarkets)(network)).filter((market) => market.chainIds.includes(network));
         const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
-        const liquityV2Markets = [types_1.LiquityV2Versions.LiquityV2Eth, types_1.LiquityV2Versions.LiquityV2REth, types_1.LiquityV2Versions.LiquityV2WstEth].map((version) => (0, markets_1.LiquityV2Markets)(network)[version]).filter((market) => market.chainIds.includes(network));
+        const liquityV2Markets = Object.values((0, markets_1.LiquityV2Markets)(network)).filter((market) => market.chainIds.includes(network));
         const client = (0, viem_1.getViemProvider)(provider, network, {
             batch: {
                 multicall: {
@@ -230,7 +230,7 @@ function getPortfolioDataSlower(provider, network, addresses) {
             ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
                 if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                    positions[address.toLowerCase()].crvUsd[market.value] = accData;
+                    positions[address.toLowerCase()].crvUsd[market.value] = Object.assign(Object.assign({}, accData), { borrowRate: crvUsdMarketsData[market.value].borrowRate });
                 }
             }))).flat(),
             ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {

package/cjs/types/curveUsd.d.ts

@@ -107,4 +107,6 @@ export interface CrvUSDUserData {
     borrowed: string;
     safetyRatio: string;
     userBands: UserBandData[];
+    loanExists: boolean;
+    borrowRate?: string;
 }

package/esm/portfolio/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
 import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBlueMarketData } from '../morphoBlue';
-import { AaveVersions, CompoundVersions, LiquityV2Versions, } from '../types';
+import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
 import { _getSparkAccountData, _getSparkMarketsData } from '../spark';
 import { _getEulerV2AccountData, _getEulerV2MarketsData } from '../eulerV2';
@@ -177,7 +177,7 @@ export function getPortfolioDataSlower(provider, network, addresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
         const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
-        const liquityV2Markets = [LiquityV2Versions.LiquityV2Eth, LiquityV2Versions.LiquityV2REth, LiquityV2Versions.LiquityV2WstEth].map((version) => LiquityV2Markets(network)[version]).filter((market) => market.chainIds.includes(network));
+        const liquityV2Markets = Object.values(LiquityV2Markets(network)).filter((market) => market.chainIds.includes(network));
         const client = getViemProvider(provider, network, {
             batch: {
                 multicall: {
@@ -223,7 +223,7 @@ export function getPortfolioDataSlower(provider, network, addresses) {
             ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 const accData = yield _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
                 if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-                    positions[address.toLowerCase()].crvUsd[market.value] = accData;
+                    positions[address.toLowerCase()].crvUsd[market.value] = Object.assign(Object.assign({}, accData), { borrowRate: crvUsdMarketsData[market.value].borrowRate });
                 }
             }))).flat(),
             ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {

package/esm/types/curveUsd.d.ts

@@ -107,4 +107,6 @@ export interface CrvUSDUserData {
     borrowed: string;
     safetyRatio: string;
     userBands: UserBandData[];
+    loanExists: boolean;
+    borrowRate?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.26-dev-portfolio-6",
+  "version": "1.0.26-dev-portfolio-8",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/portfolio/index.ts

@@ -182,7 +182,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
 export async function getPortfolioDataSlower(provider: EthereumProvider, network: NetworkNumber, addresses: EthAddress[]): Promise<PortfolioPositionsDataSlower> {
   const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
   const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
-  const liquityV2Markets = [LiquityV2Versions.LiquityV2Eth, LiquityV2Versions.LiquityV2REth, LiquityV2Versions.LiquityV2WstEth].map((version) => LiquityV2Markets(network)[version]).filter((market) => market.chainIds.includes(network));
+  const liquityV2Markets = Object.values(LiquityV2Markets(network)).filter((market) => market.chainIds.includes(network));
 
   const client = getViemProvider(provider, network, {
     batch: {
@@ -233,7 +233,7 @@ export async function getPortfolioDataSlower(provider: EthereumProvider, network
     ...crvUsdMarkets.map((market) => addresses.map(async (address) => {
       const accData = await _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
       if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-        positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = accData;
+        positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { ...accData, borrowRate: crvUsdMarketsData[market.value].borrowRate };
       }
     })).flat(),
     ...llamaLendMarkets.map((market) => addresses.map(async (address) => {

package/src/types/curveUsd.ts

@@ -117,4 +117,6 @@ export interface CrvUSDUserData {
   borrowed: string,
   safetyRatio: string,
   userBands: UserBandData[],
+  loanExists: boolean,
+  borrowRate?: string,
 }