@defisaver/positions-sdk 0.0.199 → 0.0.201-fluid-dev

package/cjs/fluid/index.js

@@ -0,0 +1,163 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const types_1 = require("../types");
+const contracts_1 = require("../contracts");
+const utils_1 = require("../services/utils");
+const fluidHelpers_1 = require("../helpers/fluidHelpers");
+exports.EMPTY_USED_ASSET = {
+    isSupplied: false,
+    isBorrowed: false,
+    supplied: '0',
+    suppliedUsd: '0',
+    borrowed: '0',
+    borrowedUsd: '0',
+    symbol: '',
+    collateral: false,
+};
+const parseVaultType = (vaultType) => {
+    switch (vaultType) {
+        case 10000: return types_1.FluidVaultType.T1;
+        case 20000: return types_1.FluidVaultType.T2;
+        case 30000: return types_1.FluidVaultType.T3;
+        case 40000: return types_1.FluidVaultType.T4;
+        default: return types_1.FluidVaultType.Unknown;
+    }
+};
+const parseMarketData = (data) => {
+    const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0);
+    const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0);
+    const collAssetData = {
+        symbol: collAsset.symbol,
+        address: collAsset.address,
+        price: (0, utils_1.getEthAmountForDecimals)(data.priceOfSupplyToken0InUSD, 8),
+        totalSupply: data.totalSupplyVault,
+        totalBorrow: data.totalBorrowVault,
+        canBeSupplied: true,
+        canBeBorrowed: false,
+        supplyRate: new decimal_js_1.default(data.supplyRateVault).div(100).toString(),
+        borrowRate: '0',
+    };
+    const debtAssetData = {
+        symbol: debtAsset.symbol,
+        address: debtAsset.address,
+        price: (0, utils_1.getEthAmountForDecimals)(data.priceOfBorrowToken0InUSD, 8),
+        totalSupply: data.totalSupplyVault,
+        totalBorrow: data.totalBorrowVault,
+        canBeSupplied: false,
+        canBeBorrowed: true,
+        supplyRate: '0',
+        borrowRate: new decimal_js_1.default(data.borrowRateVault).div(100).toString(),
+    };
+    const assetsData = {
+        [collAsset.symbol]: collAssetData,
+        [debtAsset.symbol]: debtAssetData,
+    };
+    const marketData = {
+        vaultId: +data.vaultId,
+        isSmartColl: data.isSmartColl,
+        isSmartDebt: data.isSmartDebt,
+        marketAddress: data.vault,
+        vaultType: parseVaultType(+data.vaultType),
+        oracle: data.oracle,
+        liquidationPenaltyPercent: new decimal_js_1.default(data.liquidationPenalty).div(100).toString(),
+        collFactor: new decimal_js_1.default(data.collateralFactor).div(10000).toString(),
+        liquidationRatio: new decimal_js_1.default(data.liquidationThreshold).div(100).toString(),
+        collAsset0: collAsset.symbol,
+        debtAsset0: debtAsset.symbol,
+        totalPositions: data.totalPositions,
+        totalSupplyVault: (0, utils_1.getEthAmountForDecimals)(data.totalSupplyVault, collAsset.decimals),
+        totalBorrowVault: (0, utils_1.getEthAmountForDecimals)(data.totalBorrowVault, debtAsset.decimals),
+        withdrawalLimit: (0, utils_1.getEthAmountForDecimals)(data.withdrawalLimit, collAsset.decimals),
+        withdrawableUntilLimit: (0, utils_1.getEthAmountForDecimals)(data.withdrawableUntilLimit, collAsset.decimals),
+        withdrawable: (0, utils_1.getEthAmountForDecimals)(data.withdrawable, collAsset.decimals),
+        borrowLimit: (0, utils_1.getEthAmountForDecimals)(data.borrowLimit, debtAsset.decimals),
+        borrowableUntilLimit: (0, utils_1.getEthAmountForDecimals)(data.borrowableUntilLimit, debtAsset.decimals),
+        borrowable: (0, utils_1.getEthAmountForDecimals)(data.borrowable, debtAsset.decimals),
+        borrowLimitUtilization: (0, utils_1.getEthAmountForDecimals)(data.borrowLimitUtilization, debtAsset.decimals),
+        maxBorrowLimit: (0, utils_1.getEthAmountForDecimals)(data.maxBorrowLimit, debtAsset.decimals),
+        baseBorrowLimit: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowLimit, debtAsset.decimals),
+        minimumBorrowing: (0, utils_1.getEthAmountForDecimals)(data.minimumBorrowing, debtAsset.decimals),
+    };
+    return {
+        assetsData,
+        marketData,
+    };
+};
+exports.EMPTY_FLUID_DATA = {
+    usedAssets: {},
+    suppliedUsd: '0',
+    borrowedUsd: '0',
+    borrowLimitUsd: '0',
+    leftToBorrowUsd: '0',
+    ratio: '0',
+    minRatio: '0',
+    netApy: '0',
+    incentiveUsd: '0',
+    totalInterestUsd: '0',
+    isSubscribedToAutomation: false,
+    automationResubscribeRequired: false,
+    lastUpdated: Date.now(),
+};
+const parseUserData = (userPositionData, vaultData) => {
+    const { assetsData, marketData, } = vaultData;
+    const payload = Object.assign(Object.assign({ owner: userPositionData.owner, vaultId: marketData.vaultId }, exports.EMPTY_FLUID_DATA), { lastUpdated: Date.now() });
+    const collAsset = (0, tokens_1.getAssetInfo)(marketData.collAsset0);
+    const debtAsset = (0, tokens_1.getAssetInfo)(marketData.debtAsset0);
+    const supplied = (0, utils_1.getEthAmountForDecimals)(userPositionData.supply, collAsset.decimals);
+    const borrowed = (0, utils_1.getEthAmountForDecimals)(userPositionData.borrow, debtAsset.decimals);
+    const collUsedAsset = Object.assign(Object.assign({}, exports.EMPTY_USED_ASSET), { symbol: collAsset.symbol, collateral: true, supplied, suppliedUsd: new decimal_js_1.default(supplied).mul(assetsData[collAsset.symbol].price).toString(), isSupplied: new decimal_js_1.default(supplied).gt(0) });
+    const debtUsedAsset = Object.assign(Object.assign({}, exports.EMPTY_USED_ASSET), { symbol: debtAsset.symbol, collateral: false, borrowed, borrowedUsd: new decimal_js_1.default(borrowed).mul(assetsData[debtAsset.symbol].price).toString(), isBorrowed: new decimal_js_1.default(borrowed).gt(0) });
+    const usedAssets = {
+        [collAsset.symbol]: collUsedAsset,
+        [debtAsset.symbol]: debtUsedAsset,
+    };
+    return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), (0, fluidHelpers_1.getFluidAggregatedData)({
+        usedAssets,
+        assetsData,
+        marketData,
+    }));
+};
+const getFluidMarketData = (web3, network, market) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const data = yield view.methods.getVaultData(market.marketAddress).call();
+    return parseMarketData(data);
+});
+exports.getFluidMarketData = getFluidMarketData;
+const getFluidVaultIdsForUser = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    return view.methods.getUserNftIds(user).call();
+});
+exports.getFluidVaultIdsForUser = getFluidVaultIdsForUser;
+const getFluidPosition = (web3, network, vaultId, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const data = yield view.methods.getPositionByNftId(vaultId).call();
+    const userPositionData = data[0];
+    return parseUserData(userPositionData, extractedState);
+});
+exports.getFluidPosition = getFluidPosition;
+const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const data = yield view.methods.getPositionByNftId(vaultId).call();
+    const marketData = parseMarketData(data.vault);
+    const userData = parseUserData(data.position, marketData);
+    return {
+        userData,
+        marketData,
+    };
+});
+exports.getFluidPositionWithMarket = getFluidPositionWithMarket;

package/cjs/helpers/fluidHelpers/index.d.ts

@@ -0,0 +1,6 @@
+import { FluidAggregatedVaultData, FluidAssetsData, FluidUsedAssets, InnerFluidMarketData } from '../../types';
+export declare const getFluidAggregatedData: ({ usedAssets, assetsData, marketData, }: {
+    usedAssets: FluidUsedAssets;
+    marketData: InnerFluidMarketData;
+    assetsData: FluidAssetsData;
+}) => FluidAggregatedVaultData;

package/cjs/helpers/fluidHelpers/index.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFluidAggregatedData = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const moneymarket_1 = require("../../moneymarket");
+const staking_1 = require("../../staking");
+const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }) => {
+    const payload = {};
+    payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
+    payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
+    payload.netApy = netApy;
+    payload.incentiveUsd = incentiveUsd;
+    payload.totalInterestUsd = totalInterestUsd;
+    const collFactor = marketData.collFactor;
+    const liqRatio = marketData.liquidationRatio;
+    payload.borrowLimitUsd = new decimal_js_1.default(payload.suppliedUsd).mul(collFactor).toString();
+    payload.liquidationLimitUsd = new decimal_js_1.default(payload.suppliedUsd).mul(liqRatio).div(100).toString();
+    const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+    payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+    payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
+    payload.leveragedType = leveragedType;
+    if (leveragedType !== '') {
+        payload.leveragedAsset = leveragedAsset;
+        let assetPrice = assetsData[leveragedAsset].price;
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        }
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    }
+    return payload;
+};
+exports.getFluidAggregatedData = getFluidAggregatedData;

package/cjs/helpers/index.d.ts

@@ -6,4 +6,6 @@ export * as makerHelpers from './makerHelpers';
 export * as chickenBondsHelpers from './chickenBondsHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
+export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';
+export * as fluidHelpers from './fluidHelpers';

package/cjs/helpers/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eulerV2Helpers = exports.llamaLendHelpers = exports.morphoBlueHelpers = exports.chickenBondsHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
+exports.fluidHelpers = exports.eulerV2Helpers = exports.liquityV2Helpers = exports.llamaLendHelpers = exports.morphoBlueHelpers = exports.chickenBondsHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
 exports.aaveHelpers = __importStar(require("./aaveHelpers"));
 exports.compoundHelpers = __importStar(require("./compoundHelpers"));
 exports.sparkHelpers = __importStar(require("./sparkHelpers"));
@@ -32,4 +32,6 @@ exports.makerHelpers = __importStar(require("./makerHelpers"));
 exports.chickenBondsHelpers = __importStar(require("./chickenBondsHelpers"));
 exports.morphoBlueHelpers = __importStar(require("./morphoBlueHelpers"));
 exports.llamaLendHelpers = __importStar(require("./llamaLendHelpers"));
+exports.liquityV2Helpers = __importStar(require("./liquityV2Helpers"));
 exports.eulerV2Helpers = __importStar(require("./eulerHelpers"));
+exports.fluidHelpers = __importStar(require("./fluidHelpers"));

package/cjs/helpers/liquityV2Helpers/index.d.ts

@@ -0,0 +1,12 @@
+import { LiquityV2AggregatedTroveData, LiquityV2AssetsData, LiquityV2UsedAssets } from '../../types';
+export declare const calculateNetApyLiquityV2: (usedAssets: LiquityV2UsedAssets, assetsData: LiquityV2AssetsData, interestRate: string) => {
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
+};
+export declare const getLiquityV2AggregatedPositionData: ({ usedAssets, assetsData, minCollRatio, interestRate, }: {
+    usedAssets: LiquityV2UsedAssets;
+    assetsData: LiquityV2AssetsData;
+    minCollRatio: string;
+    interestRate: string;
+}) => LiquityV2AggregatedTroveData;

package/cjs/helpers/liquityV2Helpers/index.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLiquityV2AggregatedPositionData = exports.calculateNetApyLiquityV2 = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const moneymarket_1 = require("../../moneymarket");
+const staking_1 = require("../../staking");
+const calculateNetApyLiquityV2 = (usedAssets, assetsData, interestRate) => {
+    const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
+        const acc = Object.assign({}, _acc);
+        const assetData = assetsData[usedAsset.symbol];
+        if (usedAsset.suppliedUsd) {
+            const amount = usedAsset.suppliedUsd;
+            acc.suppliedUsd = new decimal_js_1.default(acc.suppliedUsd).add(amount).toString();
+            if (assetData.incentiveSupplyApy) {
+                const incentiveInterest = (0, staking_1.calculateInterestEarned)(amount, assetData.incentiveSupplyApy, 'year', true);
+                acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+            }
+        }
+        if (usedAsset.borrowedUsd) {
+            const amount = usedAsset.borrowedUsd;
+            acc.borrowedUsd = new decimal_js_1.default(acc.borrowedUsd).add(amount).toString();
+            const rate = interestRate;
+            const borrowInterest = (0, staking_1.calculateInterestEarned)(amount, rate, 'year', true);
+            acc.borrowInterest = new decimal_js_1.default(acc.borrowInterest).sub(borrowInterest.toString()).toString();
+        }
+        return acc;
+    }, {
+        borrowInterest: '0', supplyInterest: '0', incentiveUsd: '0', borrowedUsd: '0', suppliedUsd: '0',
+    });
+    const { borrowedUsd, suppliedUsd, borrowInterest, supplyInterest, incentiveUsd, } = sumValues;
+    const totalInterestUsd = new decimal_js_1.default(borrowInterest).add(supplyInterest).add(incentiveUsd).toString();
+    const balance = new decimal_js_1.default(suppliedUsd).sub(borrowedUsd);
+    const netApy = new decimal_js_1.default(totalInterestUsd).div(balance).times(100).toString();
+    return { netApy, totalInterestUsd, incentiveUsd };
+};
+exports.calculateNetApyLiquityV2 = calculateNetApyLiquityV2;
+const getLiquityV2AggregatedPositionData = ({ usedAssets, assetsData, minCollRatio, interestRate, }) => {
+    const payload = {};
+    payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, (usedAsset) => usedAsset, ({ suppliedUsd }) => suppliedUsd);
+    payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, (usedAsset) => usedAsset, ({ borrowedUsd }) => borrowedUsd);
+    payload.borrowLimitUsd = new decimal_js_1.default(payload.suppliedUsd).div(minCollRatio).mul(100).toString();
+    const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+    payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+    payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    const { netApy, incentiveUsd, totalInterestUsd } = (0, exports.calculateNetApyLiquityV2)(usedAssets, assetsData, interestRate);
+    payload.netApy = netApy;
+    payload.incentiveUsd = incentiveUsd;
+    payload.totalInterestUsd = totalInterestUsd;
+    const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
+    payload.leveragedType = leveragedType;
+    payload.leveragedAsset = leveragedAsset;
+    payload.liquidationPrice = '';
+    if (leveragedType !== '') {
+        const assetPrice = assetsData[leveragedAsset].price;
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.borrowLimitUsd);
+    }
+    return payload;
+};
+exports.getLiquityV2AggregatedPositionData = getLiquityV2AggregatedPositionData;

package/cjs/index.d.ts

@@ -1,4 +1,5 @@
 import './setup';
+import * as fluid from './fluid';
 import * as aaveV3 from './aaveV3';
 import * as morphoAaveV3 from './morphoAaveV3';
 import * as aaveV2 from './aaveV2';
@@ -8,6 +9,7 @@ import * as compoundV2 from './compoundV2';
 import * as spark from './spark';
 import * as curveUsd from './curveUsd';
 import * as liquity from './liquity';
+import * as liquityV2 from './liquityV2';
 import * as maker from './maker';
 import * as staking from './staking';
 import * as multicall from './multicall';
@@ -20,4 +22,4 @@ import * as morphoBlue from './morphoBlue';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 export * from './types';
-export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, };
+export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, };

package/cjs/index.js

@@ -26,8 +26,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.multicall = exports.staking = exports.exchange = exports.chickenBonds = exports.maker = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.morphoAaveV3 = exports.morphoAaveV2 = exports.aaveV3 = exports.aaveV2 = void 0;
+exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.multicall = exports.staking = exports.exchange = exports.chickenBonds = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.morphoAaveV3 = exports.morphoAaveV2 = exports.aaveV3 = exports.aaveV2 = void 0;
 require("./setup");
+const fluid = __importStar(require("./fluid"));
+exports.fluid = fluid;
 const aaveV3 = __importStar(require("./aaveV3"));
 exports.aaveV3 = aaveV3;
 const morphoAaveV3 = __importStar(require("./morphoAaveV3"));
@@ -46,6 +48,8 @@ const curveUsd = __importStar(require("./curveUsd"));
 exports.curveUsd = curveUsd;
 const liquity = __importStar(require("./liquity"));
 exports.liquity = liquity;
+const liquityV2 = __importStar(require("./liquityV2"));
+exports.liquityV2 = liquityV2;
 const maker = __importStar(require("./maker"));
 exports.maker = maker;
 const staking = __importStar(require("./staking"));

package/cjs/liquityV2/index.d.ts

@@ -0,0 +1,18 @@
+import Web3 from 'web3';
+import { EthAddress, NetworkNumber } from '../types/common';
+import { InnerLiquityV2MarketData, LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData } from '../types';
+export declare const getLiquityV2MarketData: (web3: Web3, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, mainnetWeb3: Web3) => Promise<LiquityV2MarketData>;
+export declare const getLiquityV2UserTroveIds: (web3: Web3, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress) => Promise<{
+    troves: {
+        troveId: string;
+    }[];
+    nextFreeTroveIndex: string;
+}>;
+export declare const getDebtInFrontLiquityV2: (viewContract: any, marketAddress: EthAddress, troveId: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
+export declare const getLiquityV2TroveData: (web3: Web3, network: NetworkNumber, { selectedMarket, assetsData, marketData, troveId, }: {
+    selectedMarket: LiquityV2MarketInfo;
+    assetsData: LiquityV2AssetsData;
+    marketData: InnerLiquityV2MarketData;
+    troveId: string;
+}) => Promise<LiquityV2TroveData>;
+export declare const getLiquityV2ClaimableCollateral: (collSurplusPoolAddress: EthAddress, account: EthAddress, web3: Web3, network: NetworkNumber) => Promise<string>;

package/cjs/liquityV2/index.js

@@ -0,0 +1,194 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports.getDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const contracts_1 = require("../contracts");
+const types_1 = require("../types");
+const staking_1 = require("../staking");
+const liquityV2Helpers_1 = require("../helpers/liquityV2Helpers");
+const utils_1 = require("../services/utils");
+const constants_1 = require("../constants");
+const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
+    const { marketAddress, debtToken, collateralToken } = selectedMarket;
+    const data = yield viewContract.methods.getMarketData(marketAddress).call();
+    const hintHelperAddress = data.hintHelpers;
+    const troveNFTAddress = data.troveNFT;
+    const borrowerOperationsAddress = data.borrowerOperations;
+    const troveManagerAddress = data.troveManager;
+    const stabilityPoolAddress = data.stabilityPool;
+    const collSurplusPoolAddress = data.collSurplusPool;
+    const activePoolAddress = data.activePool;
+    const minCollRatio = new decimal_js_1.default(data.MCR).div(1e16).toString();
+    const criticalCollRatio = new decimal_js_1.default(data.CCR).div(1e18).toString();
+    const totalMarketBorrow = (0, tokens_1.assetAmountInEth)(data.entireSystemDebt);
+    const totalMarketSupply = (0, tokens_1.assetAmountInEth)(data.entireSystemColl);
+    const collPrice = (0, tokens_1.assetAmountInEth)(data.collPrice);
+    const totalCollRatio = new decimal_js_1.default(totalMarketSupply).mul(collPrice).div(totalMarketBorrow).toString();
+    const leftToBorrowGlobal = new decimal_js_1.default(totalMarketSupply).mul(collPrice).div(criticalCollRatio).sub(totalMarketBorrow)
+        .toString();
+    const minCollAmountForCurrentBorrow = new decimal_js_1.default(totalMarketBorrow).mul(criticalCollRatio).div(collPrice).toString();
+    const leftToWithdrawGlobal = new decimal_js_1.default(totalMarketSupply).sub(minCollAmountForCurrentBorrow).toString();
+    const assetsData = {};
+    assetsData[debtToken] = {
+        symbol: debtToken,
+        address: (0, tokens_1.getAssetInfo)(debtToken, network).address,
+        price: '1',
+        totalSupply: '0',
+        totalBorrow: totalMarketBorrow,
+        canBeSupplied: false,
+        canBeBorrowed: true,
+        leftToBorrowGlobal,
+        leftToWithdrawGlobal: '0',
+    };
+    assetsData[collateralToken] = {
+        symbol: collateralToken,
+        address: (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(collateralToken), network).address,
+        price: collPrice,
+        totalSupply: totalMarketSupply,
+        totalBorrow: '0',
+        canBeSupplied: true,
+        canBeBorrowed: false,
+        leftToBorrowGlobal: '0',
+        leftToWithdrawGlobal,
+    };
+    if (staking_1.STAKING_ASSETS.includes(collateralToken)) {
+        assetsData[collateralToken].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralToken, mainnetWeb3);
+        assetsData[collateralToken].incentiveSupplyToken = collateralToken;
+    }
+    return {
+        assetsData,
+        marketData: {
+            minCollRatio,
+            totalCollRatio: new decimal_js_1.default(totalCollRatio).mul(100).toString(),
+            criticalCollRatio: new decimal_js_1.default(criticalCollRatio).mul(100).toString(),
+            isUnderCollateralized: new decimal_js_1.default(totalCollRatio).lt(criticalCollRatio),
+            hintHelperAddress,
+            troveNFTAddress,
+            borrowerOperationsAddress,
+            troveManagerAddress,
+            stabilityPoolAddress,
+            collSurplusPoolAddress,
+            activePoolAddress,
+        },
+    };
+});
+exports.getLiquityV2MarketData = getLiquityV2MarketData;
+const _getUserTroves = (viewContract, account, marketAddress, startIndex = 0, endIndex = 100) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getUserTroves(account, marketAddress, startIndex, endIndex).call(); });
+const getUserTroves = (viewContract, account, marketAddress, startIndex = 0, endIndex = 100, troves = []) => __awaiter(void 0, void 0, void 0, function* () {
+    const result = yield _getUserTroves(viewContract, account, marketAddress, startIndex, endIndex);
+    const newStartIndex = endIndex + 1;
+    const nextFreeTroveIndex = result.nextFreeTroveIndex;
+    const existingTroves = [...troves, ...result.troves];
+    if (nextFreeTroveIndex !== '-1')
+        return { troves: existingTroves.filter((trove) => trove.ownedByUser), nextFreeTroveIndex };
+    return getUserTroves(viewContract, account, marketAddress, newStartIndex, newStartIndex + 100, existingTroves);
+});
+const TransferEventSig = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef';
+const nftContractCreationBlockMapping = {
+    ETH: 21686215,
+    wstETH: 21686238,
+    rETH: 21686257,
+};
+const getTransferredTroves = (web3, network, troveNFTAddress, limitBlocksForEventFetching, collAsset, account) => __awaiter(void 0, void 0, void 0, function* () {
+    const nftContract = (0, contracts_1.createContractWrapper)(web3, network, 'LiquityV2TroveNFT', troveNFTAddress);
+    // @ts-ignore
+    const nftContractCreationBlock = nftContractCreationBlockMapping[collAsset];
+    const currentBlock = yield web3.eth.getBlockNumber();
+    const events = yield nftContract.getPastEvents(TransferEventSig, {
+        filter: { to: account },
+        fromBlock: limitBlocksForEventFetching ? (currentBlock - 1000) : nftContractCreationBlock,
+    });
+    const userTransferredTroves = events.filter((event) => !(0, utils_1.compareAddresses)(event.returnValues.from, constants_1.ZERO_ADDRESS) && (0, utils_1.compareAddresses)(event.returnValues.to, account));
+    // check if the last know transfer address is the user
+    userTransferredTroves.forEach((event, index) => {
+        const otherTransfers = events.filter((e) => event.blockNumber < e.blockNumber && e.returnValues.tokenId === event.returnValues.tokenId);
+        // @ts-ignore
+        userTransferredTroves[index].invalid = !!otherTransfers.length;
+    });
+    // @ts-ignore
+    return userTransferredTroves.filter((event) => !event.invalid).map((event) => ({ troveId: event.returnValues.tokenId }));
+});
+const getLiquityV2UserTroveIds = (web3, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () {
+    const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
+    const [{ troves: userTroves, nextFreeTroveIndex }, userTransferredTroves] = yield Promise.all([
+        getUserTroves(viewContract, account, selectedMarket.marketAddress),
+        getTransferredTroves(web3, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.collateralToken, account),
+    ]);
+    const troves = [...userTroves.map(({ troveId }) => ({ troveId })), ...userTransferredTroves];
+    const filteredTroves = troves.filter((value, index, self) => index === self.findIndex((t) => (t.troveId === value.troveId)));
+    return { troves: filteredTroves, nextFreeTroveIndex };
+});
+exports.getLiquityV2UserTroveIds = getLiquityV2UserTroveIds;
+const _getDebtInFront = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call(); });
+const getDebtInFrontLiquityV2 = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
+    const { debt, next } = yield _getDebtInFront(viewContract, marketAddress, troveId, accumulatedSum, iterations);
+    if (next === '0')
+        return (0, tokens_1.assetAmountInEth)(debt);
+    return (0, exports.getDebtInFrontLiquityV2)(viewContract, marketAddress, next, debt, iterations);
+});
+exports.getDebtInFrontLiquityV2 = getDebtInFrontLiquityV2;
+const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, marketData, troveId, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
+    const { minCollRatio } = marketData;
+    const { collateralToken, marketAddress, debtToken } = selectedMarket;
+    const [data, debtInFront] = yield Promise.all([
+        viewContract.methods.getTroveInfo(marketAddress, troveId).call(),
+        (0, exports.getDebtInFrontLiquityV2)(viewContract, marketAddress, troveId),
+    ]);
+    const usedAssets = {};
+    const debtAssetData = assetsData[debtToken];
+    const borrowed = (0, tokens_1.assetAmountInEth)(data.debtAmount);
+    usedAssets[debtToken] = {
+        symbol: debtToken,
+        supplied: '0',
+        suppliedUsd: '0',
+        borrowed,
+        borrowedUsd: new decimal_js_1.default(borrowed).mul(debtAssetData.price).toString(),
+        isBorrowed: true,
+        isSupplied: false,
+    };
+    const collAssetData = assetsData[collateralToken];
+    const suppliedColl = (0, tokens_1.assetAmountInEth)(data.collAmount);
+    usedAssets[collateralToken] = {
+        symbol: collateralToken,
+        supplied: suppliedColl,
+        suppliedUsd: new decimal_js_1.default(suppliedColl).mul(collAssetData.price).toString(),
+        borrowed: '0',
+        borrowedUsd: '0',
+        isBorrowed: false,
+        isSupplied: true,
+        collateral: true,
+    };
+    const collRatio = new decimal_js_1.default(data.TCRatio).div(1e16).toString();
+    const interestRate = new decimal_js_1.default(data.annualInterestRate).div(1e16).toString();
+    const interestBatchManager = data.interestBatchManager;
+    const payload = Object.assign(Object.assign({ usedAssets,
+        troveId,
+        interestRate,
+        interestBatchManager,
+        debtInFront, troveStatus: types_1.LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
+        usedAssets, assetsData, minCollRatio, interestRate,
+    })), { collRatio });
+    return payload;
+});
+exports.getLiquityV2TroveData = getLiquityV2TroveData;
+const getLiquityV2ClaimableCollateral = (collSurplusPoolAddress, account, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const collSurplusPoolContract = (0, contracts_1.createContractWrapper)(web3, network, 'LiquityV2CollSurplusPool', collSurplusPoolAddress);
+    const claimableCollateral = yield collSurplusPoolContract.methods.getCollateral(account).call();
+    return claimableCollateral;
+});
+exports.getLiquityV2ClaimableCollateral = getLiquityV2ClaimableCollateral;

package/cjs/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 exports.morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
 exports.morphoAaveV3AssetEthMarket = ['ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT'];
-exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH'];
+exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC'];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];