@defisaver/positions-sdk 1.0.21 → 1.0.22

package/cjs/aaveV3/index.d.ts

@@ -6,7 +6,7 @@ export declare const aaveV3CalculateDiscountRate: (debtBalance: string, discount
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };
-export declare function getAaveV3MarketData(web3: Web3, network: NetworkNumber, market: AaveMarketInfo, defaultWeb3: Web3, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
+export declare function getAaveV3MarketData(web3: Web3, network: NetworkNumber, market: AaveMarketInfo, defaultWeb3: Web3): Promise<AaveV3MarketData>;
 export declare const EMPTY_AAVE_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -29,5 +29,5 @@ export declare const EMPTY_AAVE_DATA: {
     suppliedCollateralUsd: string;
 };
 export declare const getAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: 'latest' | number) => Promise<AaveV3PositionData>;
+export declare const getAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3) => Promise<AaveV3PositionData>;

package/cjs/aaveV3/index.js

@@ -72,7 +72,7 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     return categoriesMapping;
 };
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
-function getAaveV3MarketData(web3, network, market, defaultWeb3, blockNumber = 'latest') {
+function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
         const isL2 = (0, utils_1.isLayer2Network)(network);
@@ -112,10 +112,10 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3, blockNumber = '
         const ghoContract = (0, contracts_1.GhoTokenContract)(web3, network);
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, multiRes] = yield Promise.all([
-            loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call({}, blockNumber),
-            loanInfoContract.methods.getAllEmodes(marketAddress).call({}, blockNumber),
-            loanInfoContract.methods.isBorrowAllowed(marketAddress).call({}, blockNumber),
-            isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : (0, multicall_1.multicall)(multicallCallsObject, web3, network, blockNumber),
+            loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
+            loanInfoContract.methods.getAllEmodes(marketAddress).call(),
+            loanInfoContract.methods.isBorrowAllowed(marketAddress).call(),
+            isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : (0, multicall_1.multicall)(multicallCallsObject, web3, network),
         ]);
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -361,7 +361,7 @@ const getAaveV3AccountBalances = (web3, network, block, addressMapping, address)
     return balances;
 });
 exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
-const getAaveV3AccountData = (web3, network, address, extractedState, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+const getAaveV3AccountData = (web3, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
     const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -395,7 +395,7 @@ const getAaveV3AccountData = (web3, network, address, extractedState, blockNumbe
         },
     ];
     const [multicallRes, { 0: stkAaveBalance }] = yield Promise.all([
-        (0, multicall_1.multicall)(multicallData, web3, network, blockNumber),
+        (0, multicall_1.multicall)(multicallData, web3, network),
         isL2 ? { 0: '0' } : (0, assets_1.getAssetsBalances)(['stkAAVE'], address, network, web3),
         { 0: '0' },
     ]);

package/cjs/liquityV2/index.d.ts

@@ -13,7 +13,16 @@ export declare const getDebtInFrontForInterestRateSingleMarketLiquityV2: (viewCo
 export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
 export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
 export declare const getDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, troveId: string) => Promise<string>;
-export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string) => Promise<string>;
+/**
+ * @param markets
+ * @param selectedMarket
+ * @param web3
+ * @param network
+ * @param viewContract
+ * @param interestRate
+ * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
+ */
+export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string, debtInFrontBeingMoved?: string) => Promise<string>;
 export declare const getLiquityV2TroveData: (web3: Web3, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;
     assetsData: LiquityV2AssetsData;

package/cjs/liquityV2/index.js

@@ -207,9 +207,19 @@ const getDebtInFrontLiquityV2 = (markets, selectedMarket, web3, network, viewCon
     return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 exports.getDebtInFrontLiquityV2 = getDebtInFrontLiquityV2;
-const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * @param markets
+ * @param selectedMarket
+ * @param web3
+ * @param network
+ * @param viewContract
+ * @param interestRate
+ * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
+ */
+const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate, debtInFrontBeingMoved = '0') => __awaiter(void 0, void 0, void 0, function* () {
     const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, web3, network);
-    const interestRateDebtInFront = new decimal_js_1.default(yield (0, exports.getDebtInFrontForInterestRateSingleMarketLiquityV2)(viewContract, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate));
+    const interestRateDebtInFront = new decimal_js_1.default(yield (0, exports.getDebtInFrontForInterestRateSingleMarketLiquityV2)(viewContract, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate))
+        .sub(debtInFrontBeingMoved);
     return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;

package/esm/aaveV3/index.d.ts

@@ -6,7 +6,7 @@ export declare const aaveV3CalculateDiscountRate: (debtBalance: string, discount
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };
-export declare function getAaveV3MarketData(web3: Web3, network: NetworkNumber, market: AaveMarketInfo, defaultWeb3: Web3, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
+export declare function getAaveV3MarketData(web3: Web3, network: NetworkNumber, market: AaveMarketInfo, defaultWeb3: Web3): Promise<AaveV3MarketData>;
 export declare const EMPTY_AAVE_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -29,5 +29,5 @@ export declare const EMPTY_AAVE_DATA: {
     suppliedCollateralUsd: string;
 };
 export declare const getAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: 'latest' | number) => Promise<AaveV3PositionData>;
+export declare const getAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, market: AaveMarketInfo, mainnetWeb3: Web3) => Promise<AaveV3PositionData>;

package/esm/aaveV3/index.js

@@ -63,7 +63,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     });
     return categoriesMapping;
 };
-export function getAaveV3MarketData(web3, network, market, defaultWeb3, blockNumber = 'latest') {
+export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
         const isL2 = isLayer2Network(network);
@@ -103,10 +103,10 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3, blockNum
         const ghoContract = GhoTokenContract(web3, network);
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, multiRes] = yield Promise.all([
-            loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call({}, blockNumber),
-            loanInfoContract.methods.getAllEmodes(marketAddress).call({}, blockNumber),
-            loanInfoContract.methods.isBorrowAllowed(marketAddress).call({}, blockNumber),
-            isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : multicall(multicallCallsObject, web3, network, blockNumber),
+            loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
+            loanInfoContract.methods.getAllEmodes(marketAddress).call(),
+            loanInfoContract.methods.isBorrowAllowed(marketAddress).call(),
+            isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : multicall(multicallCallsObject, web3, network),
         ]);
         isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -350,7 +350,7 @@ export const getAaveV3AccountBalances = (web3, network, block, addressMapping, a
     });
     return balances;
 });
-export const getAaveV3AccountData = (web3, network, address, extractedState, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+export const getAaveV3AccountData = (web3, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
     const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
     let payload = Object.assign(Object.assign({}, EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -384,7 +384,7 @@ export const getAaveV3AccountData = (web3, network, address, extractedState, blo
         },
     ];
     const [multicallRes, { 0: stkAaveBalance }] = yield Promise.all([
-        multicall(multicallData, web3, network, blockNumber),
+        multicall(multicallData, web3, network),
         isL2 ? { 0: '0' } : getAssetsBalances(['stkAAVE'], address, network, web3),
         { 0: '0' },
     ]);

package/esm/liquityV2/index.d.ts

@@ -13,7 +13,16 @@ export declare const getDebtInFrontForInterestRateSingleMarketLiquityV2: (viewCo
 export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
 export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
 export declare const getDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, troveId: string) => Promise<string>;
-export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string) => Promise<string>;
+/**
+ * @param markets
+ * @param selectedMarket
+ * @param web3
+ * @param network
+ * @param viewContract
+ * @param interestRate
+ * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
+ */
+export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string, debtInFrontBeingMoved?: string) => Promise<string>;
 export declare const getLiquityV2TroveData: (web3: Web3, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;
     assetsData: LiquityV2AssetsData;

package/esm/liquityV2/index.js

@@ -194,9 +194,19 @@ export const getDebtInFrontLiquityV2 = (markets, selectedMarket, web3, network,
     const interestRateDebtInFront = yield getDebtInFrontForSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, troveId);
     return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
-export const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * @param markets
+ * @param selectedMarket
+ * @param web3
+ * @param network
+ * @param viewContract
+ * @param interestRate
+ * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
+ */
+export const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate, debtInFrontBeingMoved = '0') => __awaiter(void 0, void 0, void 0, function* () {
     const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, web3, network);
-    const interestRateDebtInFront = new Dec(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate));
+    const interestRateDebtInFront = new Dec(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate))
+        .sub(debtInFrontBeingMoved);
     return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 export const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, troveId, allMarketsData, }) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

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

package/src/aaveV3/index.ts

@@ -97,7 +97,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState: any, usedAssets: Aa
   return categoriesMapping;
 };
 
-export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, market: AaveMarketInfo, defaultWeb3: Web3, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3MarketData> {
+export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, market: AaveMarketInfo, defaultWeb3: Web3): Promise<AaveV3MarketData> {
   const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
 
   const isL2 = isLayer2Network(network);
@@ -142,10 +142,10 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
 
   // eslint-disable-next-line prefer-const
   let [loanInfo, eModesInfo, isBorrowAllowed, multiRes] = await Promise.all([
-    loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call({}, blockNumber),
-    loanInfoContract.methods.getAllEmodes(marketAddress).call({}, blockNumber),
-    loanInfoContract.methods.isBorrowAllowed(marketAddress).call({}, blockNumber), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
-    isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : multicall(multicallCallsObject, web3, network, blockNumber),
+    loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
+    loanInfoContract.methods.getAllEmodes(marketAddress).call(),
+    loanInfoContract.methods.isBorrowAllowed(marketAddress).call(), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
+    isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : multicall(multicallCallsObject, web3, network),
   ]);
   isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
 
@@ -469,7 +469,7 @@ export const getAaveV3AccountBalances = async (web3: Web3, network: NetworkNumbe
   return balances;
 };
 
-export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3PositionData> => {
+export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, address: EthAddress, extractedState: any): Promise<AaveV3PositionData> => {
   const {
     selectedMarket: market, assetsData, eModeCategoriesData,
   } = extractedState;
@@ -515,7 +515,7 @@ export const getAaveV3AccountData = async (web3: Web3, network: NetworkNumber, a
   ];
 
   const [multicallRes, { 0: stkAaveBalance }] = await Promise.all([
-    multicall(multicallData, web3, network, blockNumber),
+    multicall(multicallData, web3, network),
     isL2 ? { 0: '0' } : getAssetsBalances(['stkAAVE'], address, network, web3),
     { 0: '0' },
   ]);

package/src/liquityV2/index.ts

@@ -223,9 +223,19 @@ export const getDebtInFrontLiquityV2 = async (markets: Record<LiquityV2Versions,
   return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 };
 
-export const getDebtInFrontForInterestRateLiquityV2 = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string) => {
+/**
+ * @param markets
+ * @param selectedMarket
+ * @param web3
+ * @param network
+ * @param viewContract
+ * @param interestRate
+ * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
+ */
+export const getDebtInFrontForInterestRateLiquityV2 = async (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string, debtInFrontBeingMoved: string = '0') => {
   const allMarketsUnbackedDebts = await getAllMarketsUnbackedDebts(markets, web3, network);
-  const interestRateDebtInFront = new Dec(await getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate));
+  const interestRateDebtInFront = new Dec(await getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, LiquityV2Markets(network)[selectedMarket].marketAddress, interestRate))
+    .sub(debtInFrontBeingMoved);
 
   return calculateDebtInFrontLiquityV2(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 };