@defisaver/positions-sdk 0.0.201-fluid-dev-9 → 0.0.201-fluid-dev-11

package/esm/staking/staking.d.ts

@@ -1,12 +1,7 @@
 import Web3 from 'web3';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
-export declare const getStETHApy: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getCbETHApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getREthApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getSsrApy: () => Promise<string>;
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => "0" | Promise<any> | undefined;
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;

package/esm/staking/staking.js

@@ -13,7 +13,7 @@ import { NetworkNumber } from '../types/common';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
 import { multicall } from '../multicall';
 import { aprToApy } from '../moneymarket';
-export const getStETHApy = (web3, fromBlock = 17900000, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+const getStETHApy = (web3, fromBlock = 17900000, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const tokenRebasedEvents = yield LidoContract(web3, NetworkNumber.Eth).getPastEvents('TokenRebased', { fromBlock, toBlock: blockNumber });
         tokenRebasedEvents.sort((a, b) => b.blockNumber - a.blockNumber); // sort from highest to lowest block number
@@ -34,7 +34,7 @@ export const getStETHApy = (web3, fromBlock = 17900000, blockNumber = 'latest')
         return aprToApy(data.data.smaApr);
     }
 });
-export const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
         currentBlock = yield web3.eth.getBlockNumber();
@@ -51,7 +51,7 @@ export const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, v
         .toString();
     return aprToApy(apr);
 });
-export const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
         currentBlock = yield web3.eth.getBlockNumber();
@@ -68,7 +68,7 @@ export const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, vo
         .toString();
     return aprToApy(apr);
 });
-export const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     const potContract = PotContract(web3, NetworkNumber.Eth);
     return new Dec(yield potContract.methods.dsr().call())
         .div(new Dec(1e27))
@@ -77,7 +77,7 @@ export const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, voi
         .mul(100)
         .toString();
 });
-export const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
+const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch('https://fe.defisaver.com/api/sky/data');
     const data = yield res.json();
     return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
@@ -101,48 +101,50 @@ const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`);
+    if (!res.ok)
+        throw new Error(`Failed to fetch APY for ${asset}`);
     const data = yield res.json();
     // if our server returns apr, transform it into apy
     if (['weETH'].includes(asset)) {
         return aprToApy(data.apy);
     }
-    return data.apy;
+    return String(data.apy);
 });
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
-export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
+export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
-            return getStETHApy(web3, fromBlock, blockNumber);
+            return yield getStETHApy(web3, fromBlock, blockNumber);
         if (asset === 'cbETH')
-            return getCbETHApy(web3, blockNumber);
+            return yield getCbETHApy(web3, blockNumber);
         if (asset === 'rETH')
-            return getREthApy(web3, blockNumber);
+            return yield getREthApy(web3, blockNumber);
         if (asset === 'sDAI')
-            return getDsrApy(web3);
+            return yield getDsrApy(web3);
         if (asset === 'sUSDe')
-            return getApyFromDfsApi('sUSDe');
+            return yield getApyFromDfsApi('sUSDe');
         if (asset === 'weETH')
-            return getApyFromDfsApi('weETH');
+            return yield getApyFromDfsApi('weETH');
         if (asset === 'ezETH')
-            return getApyFromDfsApi('ezETH');
+            return yield getApyFromDfsApi('ezETH');
         if (asset === 'osETH')
-            return getApyFromDfsApi('osETH');
+            return yield getApyFromDfsApi('osETH');
         if (asset === 'ETHx')
-            return getApyFromDfsApi('ETHx');
+            return yield getApyFromDfsApi('ETHx');
         if (asset === 'rsETH' || asset === 'wrsETH')
-            return getApyFromDfsApi('rsETH');
+            return yield getApyFromDfsApi('rsETH');
         if (asset === 'pufETH')
-            return getApyFromDfsApi('pufETH');
+            return yield getApyFromDfsApi('pufETH');
         if (asset === 'wsuperOETHb')
-            return getSuperOETHApy();
+            return yield getSuperOETHApy();
         if (asset === 'sUSDS')
-            return getSsrApy();
+            return yield getSsrApy();
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);
-        return '0';
     }
-};
+    return '0';
+});
 export const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;
     if (+interest === 0)

package/esm/types/contracts/generated/LiquityV2StabilityPool.d.ts

@@ -0,0 +1,223 @@
+/// <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 ActivePoolAddressChanged = ContractEventLog<{
+    _newActivePoolAddress: string;
+    0: string;
+}>;
+export type B_Updated = ContractEventLog<{
+    _B: string;
+    _epoch: string;
+    _scale: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type BoldTokenAddressChanged = ContractEventLog<{
+    _newBoldTokenAddress: string;
+    0: string;
+}>;
+export type DefaultPoolAddressChanged = ContractEventLog<{
+    _newDefaultPoolAddress: string;
+    0: string;
+}>;
+export type DepositOperation = ContractEventLog<{
+    _depositor: string;
+    _operation: string;
+    _depositLossSinceLastOperation: string;
+    _depositChange: string;
+    _yieldGainSinceLastOperation: string;
+    _yieldGainClaimed: string;
+    _ethGainSinceLastOperation: string;
+    _ethGainClaimed: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+    6: string;
+    7: string;
+}>;
+export type DepositUpdated = ContractEventLog<{
+    _depositor: string;
+    _newDeposit: string;
+    _stashedColl: string;
+    _snapshotP: string;
+    _snapshotS: string;
+    _snapshotB: string;
+    _snapshotScale: string;
+    _snapshotEpoch: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+    6: string;
+    7: string;
+}>;
+export type EpochUpdated = ContractEventLog<{
+    _currentEpoch: string;
+    0: string;
+}>;
+export type EtherSent = ContractEventLog<{
+    _to: string;
+    _amount: string;
+    0: string;
+    1: string;
+}>;
+export type P_Updated = ContractEventLog<{
+    _P: string;
+    0: string;
+}>;
+export type PriceFeedAddressChanged = ContractEventLog<{
+    _newPriceFeedAddress: string;
+    0: string;
+}>;
+export type S_Updated = ContractEventLog<{
+    _S: string;
+    _epoch: string;
+    _scale: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type ScaleUpdated = ContractEventLog<{
+    _currentScale: string;
+    0: string;
+}>;
+export type StabilityPoolBoldBalanceUpdated = ContractEventLog<{
+    _newBalance: string;
+    0: string;
+}>;
+export type StabilityPoolCollBalanceUpdated = ContractEventLog<{
+    _newBalance: string;
+    0: string;
+}>;
+export type TroveManagerAddressChanged = ContractEventLog<{
+    _newTroveManagerAddress: string;
+    0: string;
+}>;
+export interface LiquityV2StabilityPool extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): LiquityV2StabilityPool;
+    clone(): LiquityV2StabilityPool;
+    methods: {
+        NAME(): NonPayableTransactionObject<string>;
+        P(): NonPayableTransactionObject<string>;
+        SCALE_FACTOR(): NonPayableTransactionObject<string>;
+        activePool(): NonPayableTransactionObject<string>;
+        boldToken(): NonPayableTransactionObject<string>;
+        claimAllCollGains(): NonPayableTransactionObject<void>;
+        collToken(): NonPayableTransactionObject<string>;
+        currentEpoch(): NonPayableTransactionObject<string>;
+        currentScale(): NonPayableTransactionObject<string>;
+        depositSnapshots(arg0: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            S: string;
+            P: string;
+            B: string;
+            scale: string;
+            epoch: string;
+        }>;
+        deposits(arg0: string): NonPayableTransactionObject<string>;
+        epochToScaleToB(arg0: number | string | BN, arg1: number | string | BN): NonPayableTransactionObject<string>;
+        epochToScaleToS(arg0: number | string | BN, arg1: number | string | BN): NonPayableTransactionObject<string>;
+        getCollBalance(): NonPayableTransactionObject<string>;
+        getCompoundedBoldDeposit(_depositor: string): NonPayableTransactionObject<string>;
+        getDepositorCollGain(_depositor: string): NonPayableTransactionObject<string>;
+        getDepositorYieldGain(_depositor: string): NonPayableTransactionObject<string>;
+        getDepositorYieldGainWithPending(_depositor: string): NonPayableTransactionObject<string>;
+        getEntireSystemColl(): NonPayableTransactionObject<string>;
+        getEntireSystemDebt(): NonPayableTransactionObject<string>;
+        getTotalBoldDeposits(): NonPayableTransactionObject<string>;
+        getYieldGainsOwed(): NonPayableTransactionObject<string>;
+        getYieldGainsPending(): NonPayableTransactionObject<string>;
+        lastBoldLossError_Offset(): NonPayableTransactionObject<string>;
+        lastBoldLossError_TotalDeposits(): NonPayableTransactionObject<string>;
+        lastCollError_Offset(): NonPayableTransactionObject<string>;
+        lastYieldError(): NonPayableTransactionObject<string>;
+        offset(_debtToOffset: number | string | BN, _collToAdd: number | string | BN): NonPayableTransactionObject<void>;
+        provideToSP(_topUp: number | string | BN, _doClaim: boolean): NonPayableTransactionObject<void>;
+        stashedColl(arg0: string): NonPayableTransactionObject<string>;
+        triggerBoldRewards(_boldYield: number | string | BN): NonPayableTransactionObject<void>;
+        troveManager(): NonPayableTransactionObject<string>;
+        withdrawFromSP(_amount: number | string | BN, _doClaim: boolean): NonPayableTransactionObject<void>;
+    };
+    events: {
+        ActivePoolAddressChanged(cb?: Callback<ActivePoolAddressChanged>): EventEmitter;
+        ActivePoolAddressChanged(options?: EventOptions, cb?: Callback<ActivePoolAddressChanged>): EventEmitter;
+        B_Updated(cb?: Callback<B_Updated>): EventEmitter;
+        B_Updated(options?: EventOptions, cb?: Callback<B_Updated>): EventEmitter;
+        BoldTokenAddressChanged(cb?: Callback<BoldTokenAddressChanged>): EventEmitter;
+        BoldTokenAddressChanged(options?: EventOptions, cb?: Callback<BoldTokenAddressChanged>): EventEmitter;
+        DefaultPoolAddressChanged(cb?: Callback<DefaultPoolAddressChanged>): EventEmitter;
+        DefaultPoolAddressChanged(options?: EventOptions, cb?: Callback<DefaultPoolAddressChanged>): EventEmitter;
+        DepositOperation(cb?: Callback<DepositOperation>): EventEmitter;
+        DepositOperation(options?: EventOptions, cb?: Callback<DepositOperation>): EventEmitter;
+        DepositUpdated(cb?: Callback<DepositUpdated>): EventEmitter;
+        DepositUpdated(options?: EventOptions, cb?: Callback<DepositUpdated>): EventEmitter;
+        EpochUpdated(cb?: Callback<EpochUpdated>): EventEmitter;
+        EpochUpdated(options?: EventOptions, cb?: Callback<EpochUpdated>): EventEmitter;
+        EtherSent(cb?: Callback<EtherSent>): EventEmitter;
+        EtherSent(options?: EventOptions, cb?: Callback<EtherSent>): EventEmitter;
+        P_Updated(cb?: Callback<P_Updated>): EventEmitter;
+        P_Updated(options?: EventOptions, cb?: Callback<P_Updated>): EventEmitter;
+        PriceFeedAddressChanged(cb?: Callback<PriceFeedAddressChanged>): EventEmitter;
+        PriceFeedAddressChanged(options?: EventOptions, cb?: Callback<PriceFeedAddressChanged>): EventEmitter;
+        S_Updated(cb?: Callback<S_Updated>): EventEmitter;
+        S_Updated(options?: EventOptions, cb?: Callback<S_Updated>): EventEmitter;
+        ScaleUpdated(cb?: Callback<ScaleUpdated>): EventEmitter;
+        ScaleUpdated(options?: EventOptions, cb?: Callback<ScaleUpdated>): EventEmitter;
+        StabilityPoolBoldBalanceUpdated(cb?: Callback<StabilityPoolBoldBalanceUpdated>): EventEmitter;
+        StabilityPoolBoldBalanceUpdated(options?: EventOptions, cb?: Callback<StabilityPoolBoldBalanceUpdated>): EventEmitter;
+        StabilityPoolCollBalanceUpdated(cb?: Callback<StabilityPoolCollBalanceUpdated>): EventEmitter;
+        StabilityPoolCollBalanceUpdated(options?: EventOptions, cb?: Callback<StabilityPoolCollBalanceUpdated>): EventEmitter;
+        TroveManagerAddressChanged(cb?: Callback<TroveManagerAddressChanged>): EventEmitter;
+        TroveManagerAddressChanged(options?: EventOptions, cb?: Callback<TroveManagerAddressChanged>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "ActivePoolAddressChanged", cb: Callback<ActivePoolAddressChanged>): void;
+    once(event: "ActivePoolAddressChanged", options: EventOptions, cb: Callback<ActivePoolAddressChanged>): void;
+    once(event: "B_Updated", cb: Callback<B_Updated>): void;
+    once(event: "B_Updated", options: EventOptions, cb: Callback<B_Updated>): void;
+    once(event: "BoldTokenAddressChanged", cb: Callback<BoldTokenAddressChanged>): void;
+    once(event: "BoldTokenAddressChanged", options: EventOptions, cb: Callback<BoldTokenAddressChanged>): void;
+    once(event: "DefaultPoolAddressChanged", cb: Callback<DefaultPoolAddressChanged>): void;
+    once(event: "DefaultPoolAddressChanged", options: EventOptions, cb: Callback<DefaultPoolAddressChanged>): void;
+    once(event: "DepositOperation", cb: Callback<DepositOperation>): void;
+    once(event: "DepositOperation", options: EventOptions, cb: Callback<DepositOperation>): void;
+    once(event: "DepositUpdated", cb: Callback<DepositUpdated>): void;
+    once(event: "DepositUpdated", options: EventOptions, cb: Callback<DepositUpdated>): void;
+    once(event: "EpochUpdated", cb: Callback<EpochUpdated>): void;
+    once(event: "EpochUpdated", options: EventOptions, cb: Callback<EpochUpdated>): void;
+    once(event: "EtherSent", cb: Callback<EtherSent>): void;
+    once(event: "EtherSent", options: EventOptions, cb: Callback<EtherSent>): void;
+    once(event: "P_Updated", cb: Callback<P_Updated>): void;
+    once(event: "P_Updated", options: EventOptions, cb: Callback<P_Updated>): void;
+    once(event: "PriceFeedAddressChanged", cb: Callback<PriceFeedAddressChanged>): void;
+    once(event: "PriceFeedAddressChanged", options: EventOptions, cb: Callback<PriceFeedAddressChanged>): void;
+    once(event: "S_Updated", cb: Callback<S_Updated>): void;
+    once(event: "S_Updated", options: EventOptions, cb: Callback<S_Updated>): void;
+    once(event: "ScaleUpdated", cb: Callback<ScaleUpdated>): void;
+    once(event: "ScaleUpdated", options: EventOptions, cb: Callback<ScaleUpdated>): void;
+    once(event: "StabilityPoolBoldBalanceUpdated", cb: Callback<StabilityPoolBoldBalanceUpdated>): void;
+    once(event: "StabilityPoolBoldBalanceUpdated", options: EventOptions, cb: Callback<StabilityPoolBoldBalanceUpdated>): void;
+    once(event: "StabilityPoolCollBalanceUpdated", cb: Callback<StabilityPoolCollBalanceUpdated>): void;
+    once(event: "StabilityPoolCollBalanceUpdated", options: EventOptions, cb: Callback<StabilityPoolCollBalanceUpdated>): void;
+    once(event: "TroveManagerAddressChanged", cb: Callback<TroveManagerAddressChanged>): void;
+    once(event: "TroveManagerAddressChanged", options: EventOptions, cb: Callback<TroveManagerAddressChanged>): void;
+}

package/esm/types/contracts/generated/LiquityV2StabilityPool.js

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export {};

package/esm/types/contracts/generated/LiquityV2View.d.ts

@@ -9,6 +9,74 @@ export interface EventOptions {
     fromBlock?: BlockType;
     topics?: string[];
 }
+export declare namespace IBorrowerOperations {
+    type InterestBatchManagerStruct = [number | string | BN, number | string | BN, number | string | BN] | {
+        minInterestRate: number | string | BN;
+        maxInterestRate: number | string | BN;
+        minInterestRateChangePeriod: number | string | BN;
+    };
+    type InterestBatchManagerStructOutputArray = [string, string, string];
+    type InterestBatchManagerStructOutputStruct = {
+        minInterestRate: string;
+        maxInterestRate: string;
+        minInterestRateChangePeriod: string;
+    };
+    type InterestBatchManagerStructOutput = InterestBatchManagerStructOutputArray & InterestBatchManagerStructOutputStruct;
+}
+export declare namespace ITroveManager {
+    type LatestBatchDataStruct = [
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        entireDebtWithoutRedistribution: number | string | BN;
+        entireCollWithoutRedistribution: number | string | BN;
+        accruedInterest: number | string | BN;
+        recordedDebt: number | string | BN;
+        annualInterestRate: number | string | BN;
+        weightedRecordedDebt: number | string | BN;
+        annualManagementFee: number | string | BN;
+        accruedManagementFee: number | string | BN;
+        weightedRecordedBatchManagementFee: number | string | BN;
+        lastDebtUpdateTime: number | string | BN;
+        lastInterestRateAdjTime: number | string | BN;
+    };
+    type LatestBatchDataStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type LatestBatchDataStructOutputStruct = {
+        entireDebtWithoutRedistribution: string;
+        entireCollWithoutRedistribution: string;
+        accruedInterest: string;
+        recordedDebt: string;
+        annualInterestRate: string;
+        weightedRecordedDebt: string;
+        annualManagementFee: string;
+        accruedManagementFee: string;
+        weightedRecordedBatchManagementFee: string;
+        lastDebtUpdateTime: string;
+        lastInterestRateAdjTime: string;
+    };
+    type LatestBatchDataStructOutput = LatestBatchDataStructOutputArray & LatestBatchDataStructOutputStruct;
+}
 export declare namespace LiquityV2View {
     type MarketDataStruct = [
         string,
@@ -30,7 +98,8 @@ export declare namespace LiquityV2View {
         string,
         string,
         number | string | BN,
-        boolean
+        boolean,
+        number | string | BN
     ] | {
         market: string;
         CCR: number | string | BN;
@@ -52,6 +121,7 @@ export declare namespace LiquityV2View {
         priceFeed: string;
         collPrice: number | string | BN;
         isShutDown: boolean;
+        boldDepositInSp: number | string | BN;
     };
     type MarketDataStructOutputArray = [
         string,
@@ -73,7 +143,8 @@ export declare namespace LiquityV2View {
         string,
         string,
         string,
-        boolean
+        boolean,
+        string
     ];
     type MarketDataStructOutputStruct = {
         market: string;
@@ -96,6 +167,7 @@ export declare namespace LiquityV2View {
         priceFeed: string;
         collPrice: string;
         isShutDown: boolean;
+        boldDepositInSp: string;
     };
     type MarketDataStructOutput = MarketDataStructOutputArray & MarketDataStructOutputStruct;
     type TroveDataStruct = [
@@ -109,6 +181,7 @@ export declare namespace LiquityV2View {
         number | string | BN,
         number | string | BN,
         string,
+        number | string | BN,
         number | string | BN
     ] | {
         troveId: number | string | BN;
@@ -122,6 +195,7 @@ export declare namespace LiquityV2View {
         annualInterestRate: number | string | BN;
         interestBatchManager: string;
         batchDebtShares: number | string | BN;
+        lastInterestRateAdjTime: number | string | BN;
     };
     type TroveDataStructOutputArray = [
         string,
@@ -134,6 +208,7 @@ export declare namespace LiquityV2View {
         string,
         string,
         string,
+        string,
         string
     ];
     type TroveDataStructOutputStruct = {
@@ -148,6 +223,7 @@ export declare namespace LiquityV2View {
         annualInterestRate: string;
         interestBatchManager: string;
         batchDebtShares: string;
+        lastInterestRateAdjTime: string;
     };
     type TroveDataStructOutput = TroveDataStructOutputArray & TroveDataStructOutputStruct;
     type ExistingTroveStruct = [number | string | BN, boolean] | {
@@ -161,6 +237,64 @@ export declare namespace LiquityV2View {
     };
     type ExistingTroveStructOutput = ExistingTroveStructOutputArray & ExistingTroveStructOutputStruct;
 }
+export declare namespace IMultiTroveGetter {
+    type CombinedTroveDataStruct = [
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        id: number | string | BN;
+        debt: number | string | BN;
+        coll: number | string | BN;
+        stake: number | string | BN;
+        annualInterestRate: number | string | BN;
+        lastDebtUpdateTime: number | string | BN;
+        lastInterestRateAdjTime: number | string | BN;
+        interestBatchManager: string;
+        batchDebtShares: number | string | BN;
+        batchCollShares: number | string | BN;
+        snapshotETH: number | string | BN;
+        snapshotBoldDebt: number | string | BN;
+    };
+    type CombinedTroveDataStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type CombinedTroveDataStructOutputStruct = {
+        id: string;
+        debt: string;
+        coll: string;
+        stake: string;
+        annualInterestRate: string;
+        lastDebtUpdateTime: string;
+        lastInterestRateAdjTime: string;
+        interestBatchManager: string;
+        batchDebtShares: string;
+        batchCollShares: string;
+        snapshotETH: string;
+        snapshotBoldDebt: string;
+    };
+    type CombinedTroveDataStructOutput = CombinedTroveDataStructOutputArray & CombinedTroveDataStructOutputStruct;
+}
 export interface LiquityV2View extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): LiquityV2View;
     clone(): LiquityV2View;
@@ -181,6 +315,13 @@ export interface LiquityV2View extends BaseContract {
             diff: string;
             latestRandomSeed: string;
         }>;
+        getBatchManagerInfo(_market: string, _manager: string): NonPayableTransactionObject<[
+            IBorrowerOperations.InterestBatchManagerStructOutput,
+            ITroveManager.LatestBatchDataStructOutput
+        ] & {
+            managerData: IBorrowerOperations.InterestBatchManagerStructOutput;
+            batchData: ITroveManager.LatestBatchDataStructOutput;
+        }>;
         getDebtInFront(_market: string, _troveId: number | string | BN, _acc: number | string | BN, _iterations: number | string | BN): NonPayableTransactionObject<[
             string,
             string
@@ -213,6 +354,7 @@ export interface LiquityV2View extends BaseContract {
             nextId: string;
         }>;
         getMarketData(_market: string): NonPayableTransactionObject<LiquityV2View.MarketDataStructOutput>;
+        getMultipleSortedTroves(_market: string, _startIdx: number | string | BN, _count: number | string | BN): NonPayableTransactionObject<IMultiTroveGetter.CombinedTroveDataStructOutput[]>;
         getNumOfTrovesInFrontOfTrove(_market: string, _troveId: number | string | BN, _iterations: number | string | BN): NonPayableTransactionObject<[
             string,
             string

package/esm/types/contracts/generated/index.d.ts

@@ -38,6 +38,7 @@ export type { LendingPoolAddressesProvider } from "./LendingPoolAddressesProvide
 export type { Lido } from "./Lido";
 export type { LiquityActivePool } from "./LiquityActivePool";
 export type { LiquityV2CollSurplusPool } from "./LiquityV2CollSurplusPool";
+export type { LiquityV2StabilityPool } from "./LiquityV2StabilityPool";
 export type { LiquityV2TroveNFT } from "./LiquityV2TroveNFT";
 export type { LiquityV2View } from "./LiquityV2View";
 export type { LiquityView } from "./LiquityView";

package/esm/types/liquityV2.d.ts

@@ -108,4 +108,5 @@ export interface LiquityV2TroveData {
     leveragedAsset: string;
     liquidationPrice: string;
     debtInFront: string;
+    lastInterestRateAdjTime: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.201-fluid-dev-9",
+  "version": "0.0.201-fluid-dev-11",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -40,6 +40,7 @@
     "eslint": "^8.49.0",
     "eslint-plugin-import": "^2.31.0",
     "mocha": "^10.2.0",
+    "nock": "^14.0.0",
     "ts-node": "^10.9.2",
     "typechain": "^8.3.1",
     "typechain-target-web3-v1-3mihai3": "^6.0.2",

package/src/aaveV2/index.ts

@@ -4,7 +4,7 @@ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { calculateNetApy, getStETHApy } from '../staking';
+import { calculateNetApy, getStakingApy } from '../staking';
 import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
 import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
@@ -60,7 +60,7 @@ export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, s
 
   const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
   if (stEthMarket) {
-    stEthMarket.incentiveSupplyApy = await getStETHApy(mainnetWeb3);
+    stEthMarket.incentiveSupplyApy = await getStakingApy('stETH', mainnetWeb3);
     stEthMarket.incentiveSupplyToken = 'stETH';
   }