@defisaver/positions-sdk 0.0.17 → 0.0.19

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

@@ -0,0 +1,205 @@
+/// <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, PayableTransactionObject, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type UserState = ContractEventLog<{
+    user: string;
+    collateral: string;
+    debt: string;
+    n1: string;
+    n2: string;
+    liquidation_discount: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+    5: string;
+}>;
+export type Borrow = ContractEventLog<{
+    user: string;
+    collateral_increase: string;
+    loan_increase: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type Repay = ContractEventLog<{
+    user: string;
+    collateral_decrease: string;
+    loan_decrease: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type RemoveCollateral = ContractEventLog<{
+    user: string;
+    collateral_decrease: string;
+    0: string;
+    1: string;
+}>;
+export type Liquidate = ContractEventLog<{
+    liquidator: string;
+    user: string;
+    collateral_received: string;
+    stablecoin_received: string;
+    debt: string;
+    0: string;
+    1: string;
+    2: string;
+    3: string;
+    4: string;
+}>;
+export type SetMonetaryPolicy = ContractEventLog<{
+    monetary_policy: string;
+    0: string;
+}>;
+export type SetBorrowingDiscounts = ContractEventLog<{
+    loan_discount: string;
+    liquidation_discount: string;
+    0: string;
+    1: string;
+}>;
+export type CollectFees = ContractEventLog<{
+    amount: string;
+    new_supply: string;
+    0: string;
+    1: string;
+}>;
+export interface CrvUSDsfrxETHController extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): CrvUSDsfrxETHController;
+    clone(): CrvUSDsfrxETHController;
+    methods: {
+        factory(): NonPayableTransactionObject<string>;
+        amm(): NonPayableTransactionObject<string>;
+        collateral_token(): NonPayableTransactionObject<string>;
+        debt(user: string): NonPayableTransactionObject<string>;
+        loan_exists(user: string): NonPayableTransactionObject<boolean>;
+        total_debt(): NonPayableTransactionObject<string>;
+        "max_borrowable(uint256,uint256)"(collateral: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
+        "max_borrowable(uint256,uint256,uint256)"(collateral: number | string | BN, N: number | string | BN, current_debt: number | string | BN): NonPayableTransactionObject<string>;
+        min_collateral(debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
+        calculate_debt_n1(collateral: number | string | BN, debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
+        create_loan(collateral: number | string | BN, debt: number | string | BN, N: number | string | BN): PayableTransactionObject<void>;
+        create_loan_extended(collateral: number | string | BN, debt: number | string | BN, N: number | string | BN, callbacker: string, callback_args: number | string | BN[]): PayableTransactionObject<void>;
+        "add_collateral(uint256)"(collateral: number | string | BN): PayableTransactionObject<void>;
+        "add_collateral(uint256,address)"(collateral: number | string | BN, _for: string): PayableTransactionObject<void>;
+        "remove_collateral(uint256)"(collateral: number | string | BN): NonPayableTransactionObject<void>;
+        "remove_collateral(uint256,bool)"(collateral: number | string | BN, use_eth: boolean): NonPayableTransactionObject<void>;
+        borrow_more(collateral: number | string | BN, debt: number | string | BN): PayableTransactionObject<void>;
+        "repay(uint256)"(_d_debt: number | string | BN): NonPayableTransactionObject<void>;
+        "repay(uint256,address)"(_d_debt: number | string | BN, _for: string): NonPayableTransactionObject<void>;
+        "repay(uint256,address,int256)"(_d_debt: number | string | BN, _for: string, max_active_band: number | string | BN): NonPayableTransactionObject<void>;
+        "repay(uint256,address,int256,bool)"(_d_debt: number | string | BN, _for: string, max_active_band: number | string | BN, use_eth: boolean): NonPayableTransactionObject<void>;
+        repay_extended(callbacker: string, callback_args: number | string | BN[]): NonPayableTransactionObject<void>;
+        "health_calculator(address,int256,int256,bool)"(user: string, d_collateral: number | string | BN, d_debt: number | string | BN, full: boolean): NonPayableTransactionObject<string>;
+        "health_calculator(address,int256,int256,bool,uint256)"(user: string, d_collateral: number | string | BN, d_debt: number | string | BN, full: boolean, N: number | string | BN): NonPayableTransactionObject<string>;
+        "liquidate(address,uint256)"(user: string, min_x: number | string | BN): NonPayableTransactionObject<void>;
+        "liquidate(address,uint256,bool)"(user: string, min_x: number | string | BN, use_eth: boolean): NonPayableTransactionObject<void>;
+        liquidate_extended(user: string, min_x: number | string | BN, frac: number | string | BN, use_eth: boolean, callbacker: string, callback_args: number | string | BN[]): NonPayableTransactionObject<void>;
+        "tokens_to_liquidate(address)"(user: string): NonPayableTransactionObject<string>;
+        "tokens_to_liquidate(address,uint256)"(user: string, frac: number | string | BN): NonPayableTransactionObject<string>;
+        "health(address)"(user: string): NonPayableTransactionObject<string>;
+        "health(address,bool)"(user: string, full: boolean): NonPayableTransactionObject<string>;
+        "users_to_liquidate()"(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            user: string;
+            x: string;
+            y: string;
+            debt: string;
+            health: string;
+        }[]>;
+        "users_to_liquidate(uint256)"(_from: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            user: string;
+            x: string;
+            y: string;
+            debt: string;
+            health: string;
+        }[]>;
+        "users_to_liquidate(uint256,uint256)"(_from: number | string | BN, _limit: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            user: string;
+            x: string;
+            y: string;
+            debt: string;
+            health: string;
+        }[]>;
+        amm_price(): NonPayableTransactionObject<string>;
+        user_prices(user: string): NonPayableTransactionObject<[string, string]>;
+        user_state(user: string): NonPayableTransactionObject<[string, string, string, string]>;
+        set_amm_fee(fee: number | string | BN): NonPayableTransactionObject<void>;
+        set_amm_admin_fee(fee: number | string | BN): NonPayableTransactionObject<void>;
+        set_monetary_policy(monetary_policy: string): NonPayableTransactionObject<void>;
+        set_borrowing_discounts(loan_discount: number | string | BN, liquidation_discount: number | string | BN): NonPayableTransactionObject<void>;
+        set_callback(cb: string): NonPayableTransactionObject<void>;
+        admin_fees(): NonPayableTransactionObject<string>;
+        collect_fees(): NonPayableTransactionObject<string>;
+        liquidation_discounts(arg0: string): NonPayableTransactionObject<string>;
+        loans(arg0: number | string | BN): NonPayableTransactionObject<string>;
+        loan_ix(arg0: string): NonPayableTransactionObject<string>;
+        n_loans(): NonPayableTransactionObject<string>;
+        minted(): NonPayableTransactionObject<string>;
+        redeemed(): NonPayableTransactionObject<string>;
+        monetary_policy(): NonPayableTransactionObject<string>;
+        liquidation_discount(): NonPayableTransactionObject<string>;
+        loan_discount(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        UserState(cb?: Callback<UserState>): EventEmitter;
+        UserState(options?: EventOptions, cb?: Callback<UserState>): EventEmitter;
+        Borrow(cb?: Callback<Borrow>): EventEmitter;
+        Borrow(options?: EventOptions, cb?: Callback<Borrow>): EventEmitter;
+        Repay(cb?: Callback<Repay>): EventEmitter;
+        Repay(options?: EventOptions, cb?: Callback<Repay>): EventEmitter;
+        RemoveCollateral(cb?: Callback<RemoveCollateral>): EventEmitter;
+        RemoveCollateral(options?: EventOptions, cb?: Callback<RemoveCollateral>): EventEmitter;
+        Liquidate(cb?: Callback<Liquidate>): EventEmitter;
+        Liquidate(options?: EventOptions, cb?: Callback<Liquidate>): EventEmitter;
+        SetMonetaryPolicy(cb?: Callback<SetMonetaryPolicy>): EventEmitter;
+        SetMonetaryPolicy(options?: EventOptions, cb?: Callback<SetMonetaryPolicy>): EventEmitter;
+        SetBorrowingDiscounts(cb?: Callback<SetBorrowingDiscounts>): EventEmitter;
+        SetBorrowingDiscounts(options?: EventOptions, cb?: Callback<SetBorrowingDiscounts>): EventEmitter;
+        CollectFees(cb?: Callback<CollectFees>): EventEmitter;
+        CollectFees(options?: EventOptions, cb?: Callback<CollectFees>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "UserState", cb: Callback<UserState>): void;
+    once(event: "UserState", options: EventOptions, cb: Callback<UserState>): void;
+    once(event: "Borrow", cb: Callback<Borrow>): void;
+    once(event: "Borrow", options: EventOptions, cb: Callback<Borrow>): void;
+    once(event: "Repay", cb: Callback<Repay>): void;
+    once(event: "Repay", options: EventOptions, cb: Callback<Repay>): void;
+    once(event: "RemoveCollateral", cb: Callback<RemoveCollateral>): void;
+    once(event: "RemoveCollateral", options: EventOptions, cb: Callback<RemoveCollateral>): void;
+    once(event: "Liquidate", cb: Callback<Liquidate>): void;
+    once(event: "Liquidate", options: EventOptions, cb: Callback<Liquidate>): void;
+    once(event: "SetMonetaryPolicy", cb: Callback<SetMonetaryPolicy>): void;
+    once(event: "SetMonetaryPolicy", options: EventOptions, cb: Callback<SetMonetaryPolicy>): void;
+    once(event: "SetBorrowingDiscounts", cb: Callback<SetBorrowingDiscounts>): void;
+    once(event: "SetBorrowingDiscounts", options: EventOptions, cb: Callback<SetBorrowingDiscounts>): void;
+    once(event: "CollectFees", cb: Callback<CollectFees>): void;
+    once(event: "CollectFees", options: EventOptions, cb: Callback<CollectFees>): void;
+}

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

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

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

@@ -56,6 +56,8 @@ export type { CrvUSDFactory } from "./CrvUSDFactory";
 export type { CrvUSDView } from "./CrvUSDView";
 export type { CrvUSDWBTCAmm } from "./CrvUSDWBTCAmm";
 export type { CrvUSDWBTCController } from "./CrvUSDWBTCController";
+export type { CrvUSDsfrxETHAmm } from "./CrvUSDsfrxETHAmm";
+export type { CrvUSDsfrxETHController } from "./CrvUSDsfrxETHController";
 export type { CrvUSDtBTCAmm } from "./CrvUSDtBTCAmm";
 export type { CrvUSDtBTCController } from "./CrvUSDtBTCController";
 export type { CrvUSDwstETHAmm } from "./CrvUSDwstETHAmm";

package/esm/types/curveUsd.d.ts

@@ -3,7 +3,8 @@ export declare enum CrvUSDVersions {
     'wstETH' = "wstETH",
     'WBTC' = "WBTC",
     'ETH' = "ETH",
-    'tBTC' = "tBTC"
+    'tBTC' = "tBTC",
+    'sfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",

package/esm/types/curveUsd.js

@@ -4,6 +4,7 @@ export var CrvUSDVersions;
     CrvUSDVersions["WBTC"] = "WBTC";
     CrvUSDVersions["ETH"] = "ETH";
     CrvUSDVersions["tBTC"] = "tBTC";
+    CrvUSDVersions["sfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (CrvUSDVersions = {}));
 export var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/esm/types/liquity.d.ts

@@ -25,4 +25,5 @@ export interface LiquityTroveInfo {
     totalLUSD: string;
     minCollateralRatio: number;
     priceForRecovery: string;
+    debtInFront: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -398,7 +398,7 @@ export const getAaveV3AccountBalances = async (web3: Web3, network: NetworkNumbe
   return balances;
 };
 
-export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any, customGetAggregatedDataFunction?: Function): Promise<AaveV3PositionData> => {
+export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any): Promise<AaveV3PositionData> => {
   const {
     selectedMarket: market, assetsData,
   } = extractedState;
@@ -509,13 +509,11 @@ export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, a
     };
   });
 
-  const aggregateFunction = customGetAggregatedDataFunction || aaveAnyGetAggregatedPositionData;
-
   payload.eModeCategory = +multicallRes[0][0];
   payload = {
     ...payload,
     usedAssets,
-    ...aggregateFunction({
+    ...aaveAnyGetAggregatedPositionData({
       ...extractedState, usedAssets, eModeCategory: payload.eModeCategory,
     }),
   };

package/src/compoundV3/index.ts

@@ -170,7 +170,6 @@ export const getCompoundV3AccountData = async (
     selectedMarket: CompoundMarketData,
     assetsData: CompoundV3AssetsData,
   }),
-  customGetAggregatedDataFunction?: Function,
 ): Promise<CompoundV3PositionData> => {
   if (!address) throw new Error('No address provided');
   const {
@@ -245,12 +244,10 @@ export const getCompoundV3AccountData = async (
     };
   });
 
-  const aggregateFunction = customGetAggregatedDataFunction || getCompoundV3AggregatedData;
-
   payload = {
     ...payload,
     usedAssets,
-    ...aggregateFunction({
+    ...getCompoundV3AggregatedData({
       usedAssets, assetsData, network, selectedMarket,
     }),
     isAllowed: data[1][0],

package/src/helpers/aaveHelpers/index.ts

@@ -131,5 +131,12 @@ export const aaveAnyGetAggregatedPositionData = ({
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+
+  payload.suppliedEth = new Dec(payload.suppliedUsd).div(assetsData.ETH.price).toString();
+  payload.borrowedEth = new Dec(payload.borrowedUsd).div(assetsData.ETH.price).toString();
+  payload.leftToBorrowEth = new Dec(payload.leftToBorrowUsd).div(assetsData.ETH.price).toString();
+  payload.borrowLimitEth = new Dec(payload.borrowLimitUsd).div(assetsData.ETH.price).toString();
+  payload.liquidationLimitEth = new Dec(payload.liquidationLimitUsd).div(assetsData.ETH.price).toString();
+
   return payload;
 };

package/src/liquity/index.ts

@@ -9,6 +9,7 @@ import {
 } from '../contracts';
 import { multicall } from '../multicall';
 import { LIQUITY_TROVE_STATUS_ENUM, LiquityTroveInfo } from '../types';
+import { ZERO_ADDRESS } from '../constants';
 
 export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
@@ -38,6 +39,14 @@ export const getLiquityAccountBalances = async (web3: Web3, network: NetworkNumb
   return balances;
 };
 
+const _getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000) => viewContract.methods.getDebtInFront(address, accumulatedSum, iterations).call();
+
+export const getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000): Promise<string> => {
+  const { debt, next } = await _getDebtInFront(viewContract, address, accumulatedSum, iterations);
+  if (next === ZERO_ADDRESS) return assetAmountInEth(debt, 'LUSD');
+  return getDebtInFront(viewContract, next, debt, iterations);
+};
+
 export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, address: string): Promise<LiquityTroveInfo> => {
   const viewContract = LiquityViewContract(web3, network);
   const collSurplusPoolContract = LiquityCollSurplusPoolContract(web3, network);
@@ -78,7 +87,10 @@ export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, ad
     },
   ];
 
-  const multiRes = await multicall(multicallData, web3, network);
+  const [multiRes, debtInFront] = await Promise.all([
+    multicall(multicallData, web3, network),
+    getDebtInFront(viewContract, address),
+  ]);
 
   const recoveryMode = multiRes[0][6];
   const totalETH = multiRes[4][0];
@@ -95,6 +107,7 @@ export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, ad
     assetPrice: assetAmountInEth(multiRes[3][0]),
     totalETH,
     totalLUSD,
+    debtInFront,
     minCollateralRatio: recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO,
     priceForRecovery: new Dec(recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
       .toString(),

package/src/morphoAaveV3/index.ts

@@ -447,7 +447,6 @@ export const getMorphoAaveV3AccountData = async (
   assetsData: MorphoAaveV3AssetsData,
   delegator: string,
   selectedMarket: MorphoAaveV3MarketInfo,
-  customGetAggregatedDataFunction?: Function,
 ): Promise<MorphoAaveV3PositionData> => {
   if (!address) {
     throw new Error('No address provided.');
@@ -591,11 +590,9 @@ export const getMorphoAaveV3AccountData = async (
     }
   });
 
-  const aggregateFunction = customGetAggregatedDataFunction || aaveAnyGetAggregatedPositionData;
-
   payload = {
     ...payload,
-    ...aggregateFunction({
+    ...aaveAnyGetAggregatedPositionData({
       usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket,
     }),
   };

package/src/types/aave.ts

@@ -222,11 +222,16 @@ export interface AaveV3IncentiveData {
 
 export interface AaveV3AggregatedPositionData {
   suppliedUsd: string,
+  suppliedEth: string,
   suppliedCollateralUsd: string,
   borrowedUsd: string,
+  borrowedEth: string,
   borrowLimitUsd: string,
+  borrowLimitEth: string,
   liquidationLimitUsd: string,
+  liquidationLimitEth: string,
   leftToBorrowUsd: string,
+  leftToBorrowEth: string,
   ratio: string,
   collRatio: string,
   netApy: string,