@defisaver/positions-sdk 0.0.198 → 0.0.199-dev-2

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/helpers/morphoBlueHelpers/index.js

@@ -115,73 +115,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) =>
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/index.d.ts

@@ -8,6 +8,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 +21,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, };

package/cjs/index.js

@@ -26,7 +26,7 @@ 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.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 aaveV3 = __importStar(require("./aaveV3"));
 exports.aaveV3 = aaveV3;
@@ -46,6 +46,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,184 @@
+"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 getTransferredTroves = (web3, network, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () {
+    const nftContract = (0, contracts_1.createContractWrapper)(web3, network, 'LiquityV2TroveNFT', troveNFTAddress);
+    const currentBlock = yield web3.eth.getBlockNumber();
+    const events = yield nftContract.getPastEvents(TransferEventSig, Object.assign({ filter: { to: account } }, (0, utils_1.addToObjectIf)(limitBlocksForEventFetching, { fromBlock: currentBlock - 1000 })));
+    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, 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

@@ -14,10 +14,8 @@ exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI',
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];
-exports.aaveV3AssetsDefaultMarketArb = [
-    'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB', 'weETH', 'GHO',
-];
-exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC'];
+exports.aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH'];
+exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.aaveV3AssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,

package/cjs/markets/index.d.ts

@@ -4,4 +4,5 @@ export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
+export { LiquityV2Markets } from './liquityV2';
 export { EulerV2Markets } from './euler';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EulerV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.EulerV2Markets = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -26,5 +26,7 @@ Object.defineProperty(exports, "MorphoBlueMarkets", { enumerable: true, get: fun
 Object.defineProperty(exports, "findMorphoBlueMarket", { enumerable: true, get: function () { return morphoBlue_1.findMorphoBlueMarket; } });
 var llamaLend_1 = require("./llamaLend");
 Object.defineProperty(exports, "LlamaLendMarkets", { enumerable: true, get: function () { return llamaLend_1.LlamaLendMarkets; } });
+var liquityV2_1 = require("./liquityV2");
+Object.defineProperty(exports, "LiquityV2Markets", { enumerable: true, get: function () { return liquityV2_1.LiquityV2Markets; } });
 var euler_1 = require("./euler");
 Object.defineProperty(exports, "EulerV2Markets", { enumerable: true, get: function () { return euler_1.EulerV2Markets; } });

package/cjs/markets/liquityV2/index.d.ts

@@ -0,0 +1,10 @@
+import { NetworkNumber } from '../../types/common';
+import { LiquityV2MarketInfo } from '../../types/liquityV2';
+export declare const LIQUITY_V2_ETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
+export declare const LIQUITY_V2_WSTETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
+export declare const LIQUITY_V2_RETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
+export declare const LiquityV2Markets: (networkId: NetworkNumber) => {
+    readonly liquityv2eth: LiquityV2MarketInfo;
+    readonly liquityv2wsteth: LiquityV2MarketInfo;
+    readonly liquityv2reth: LiquityV2MarketInfo;
+};

package/cjs/markets/liquityV2/index.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LiquityV2Markets = exports.LIQUITY_V2_RETH_MARKET = exports.LIQUITY_V2_WSTETH_MARKET = exports.LIQUITY_V2_ETH_MARKET = void 0;
+const common_1 = require("../../types/common");
+const liquityV2_1 = require("../../types/liquityV2");
+const LIQUITY_V2_ETH_MARKET = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Eth],
+    label: 'Liquity V2 ETH',
+    shortLabel: 'ETH',
+    value: liquityV2_1.LiquityV2Versions.LiquityV2Eth,
+    url: 'eth',
+    debtToken: 'BOLD',
+    collateralToken: 'ETH',
+    marketAddress: '0xc3fe668b43439525f70fe860f89882f0be312504',
+    protocolName: 'liquity-v2',
+});
+exports.LIQUITY_V2_ETH_MARKET = LIQUITY_V2_ETH_MARKET;
+const LIQUITY_V2_WSTETH_MARKET = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Eth],
+    label: 'Liquity V2 wstETH',
+    shortLabel: 'wstETH',
+    value: liquityV2_1.LiquityV2Versions.LiquityV2WstEth,
+    url: 'wsteth',
+    debtToken: 'BOLD',
+    collateralToken: 'wstETH',
+    marketAddress: '0x9b27787ff66aa3cea8dbc47772328459a1fa05ac',
+    protocolName: 'liquity-v2',
+});
+exports.LIQUITY_V2_WSTETH_MARKET = LIQUITY_V2_WSTETH_MARKET;
+const LIQUITY_V2_RETH_MARKET = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Eth],
+    label: 'Liquity V2 rETH',
+    shortLabel: 'rETH',
+    value: liquityV2_1.LiquityV2Versions.LiquityV2REth,
+    url: 'reth',
+    debtToken: 'BOLD',
+    collateralToken: 'rETH',
+    marketAddress: '0xde524be191de806011e98c8d36d50d7a88391a3e',
+    protocolName: 'liquity-v2',
+});
+exports.LIQUITY_V2_RETH_MARKET = LIQUITY_V2_RETH_MARKET;
+const LiquityV2Markets = (networkId) => ({
+    [liquityV2_1.LiquityV2Versions.LiquityV2Eth]: (0, exports.LIQUITY_V2_ETH_MARKET)(networkId),
+    [liquityV2_1.LiquityV2Versions.LiquityV2WstEth]: (0, exports.LIQUITY_V2_WSTETH_MARKET)(networkId),
+    [liquityV2_1.LiquityV2Versions.LiquityV2REth]: (0, exports.LIQUITY_V2_RETH_MARKET)(networkId),
+});
+exports.LiquityV2Markets = LiquityV2Markets;

package/cjs/moneymarket/moneymarketCommonService.js

@@ -27,7 +27,7 @@ const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimit
 exports.calcLeverageLiqPrice = calcLeverageLiqPrice;
 const calculateBorrowingAssetLimit = (assetBorrowedUsd, borrowLimitUsd) => new decimal_js_1.default(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
 exports.calculateBorrowingAssetLimit = calculateBorrowingAssetLimit;
-exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
+exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD', 'BOLD'];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;
     let supplyStable = 0;

package/cjs/types/contracts/generated/LiquityV2CollSurplusPool.d.ts

@@ -0,0 +1,64 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type BorrowerOperationsAddressChanged = ContractEventLog<{
+    _newBorrowerOperationsAddress: string;
+    0: string;
+}>;
+export type CollBalanceUpdated = ContractEventLog<{
+    _account: string;
+    _newBalance: string;
+    0: string;
+    1: string;
+}>;
+export type CollSent = ContractEventLog<{
+    _to: string;
+    _amount: string;
+    0: string;
+    1: string;
+}>;
+export type TroveManagerAddressChanged = ContractEventLog<{
+    _newTroveManagerAddress: string;
+    0: string;
+}>;
+export interface LiquityV2CollSurplusPool extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): LiquityV2CollSurplusPool;
+    clone(): LiquityV2CollSurplusPool;
+    methods: {
+        NAME(): NonPayableTransactionObject<string>;
+        accountSurplus(_account: string, _amount: number | string | BN): NonPayableTransactionObject<void>;
+        borrowerOperationsAddress(): NonPayableTransactionObject<string>;
+        claimColl(_account: string): NonPayableTransactionObject<void>;
+        collToken(): NonPayableTransactionObject<string>;
+        getCollBalance(): NonPayableTransactionObject<string>;
+        getCollateral(_account: string): NonPayableTransactionObject<string>;
+        troveManagerAddress(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        BorrowerOperationsAddressChanged(cb?: Callback<BorrowerOperationsAddressChanged>): EventEmitter;
+        BorrowerOperationsAddressChanged(options?: EventOptions, cb?: Callback<BorrowerOperationsAddressChanged>): EventEmitter;
+        CollBalanceUpdated(cb?: Callback<CollBalanceUpdated>): EventEmitter;
+        CollBalanceUpdated(options?: EventOptions, cb?: Callback<CollBalanceUpdated>): EventEmitter;
+        CollSent(cb?: Callback<CollSent>): EventEmitter;
+        CollSent(options?: EventOptions, cb?: Callback<CollSent>): EventEmitter;
+        TroveManagerAddressChanged(cb?: Callback<TroveManagerAddressChanged>): EventEmitter;
+        TroveManagerAddressChanged(options?: EventOptions, cb?: Callback<TroveManagerAddressChanged>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "BorrowerOperationsAddressChanged", cb: Callback<BorrowerOperationsAddressChanged>): void;
+    once(event: "BorrowerOperationsAddressChanged", options: EventOptions, cb: Callback<BorrowerOperationsAddressChanged>): void;
+    once(event: "CollBalanceUpdated", cb: Callback<CollBalanceUpdated>): void;
+    once(event: "CollBalanceUpdated", options: EventOptions, cb: Callback<CollBalanceUpdated>): void;
+    once(event: "CollSent", cb: Callback<CollSent>): void;
+    once(event: "CollSent", options: EventOptions, cb: Callback<CollSent>): void;
+    once(event: "TroveManagerAddressChanged", cb: Callback<TroveManagerAddressChanged>): void;
+    once(event: "TroveManagerAddressChanged", options: EventOptions, cb: Callback<TroveManagerAddressChanged>): void;
+}

package/cjs/types/contracts/generated/LiquityV2CollSurplusPool.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });