@defisaver/positions-sdk 0.0.16 → 0.0.18

package/cjs/aaveV3/index.d.ts

@@ -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, customGetAggregatedDataFunction?: Function) => 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

@@ -288,7 +288,7 @@ const getAaveV3AccountBalances = (web3, network, block, addressMapping, address)
     return balances;
 });
 exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
-const getAaveV3AccountData = (web3, network, address, extractedState, customGetAggregatedDataFunction) => __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, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -359,9 +359,8 @@ const getAaveV3AccountData = (web3, network, address, extractedState, customGetA
         usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new decimal_js_1.default(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: new decimal_js_1.default(tokenInfo.stableBorrowRate).div(1e25).toString(), discountedBorrowRate: new decimal_js_1.default(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString(), borrowedStable,
             borrowedVariable, borrowedUsdStable: new decimal_js_1.default(borrowedStable).mul(assetsData[asset].price).toString(), borrowedUsdVariable: new decimal_js_1.default(borrowedVariable).mul(assetsData[asset].price).toString(), borrowed, borrowedUsd: new decimal_js_1.default(new decimal_js_1.default(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(), isBorrowed, eModeCategory: assetsData[asset].eModeCategory, interestMode });
     }));
-    const aggregateFunction = customGetAggregatedDataFunction || aaveHelpers_1.aaveAnyGetAggregatedPositionData;
     payload.eModeCategory = +multicallRes[0][0];
-    payload = Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), aggregateFunction(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: payload.eModeCategory })));
+    payload = Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), (0, aaveHelpers_1.aaveAnyGetAggregatedPositionData)(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: payload.eModeCategory })));
     payload.eModeCategories = (0, exports.aaveV3EmodeCategoriesMapping)(extractedState, usedAssets);
     payload.isInIsolationMode = (0, aaveHelpers_1.aaveV3IsInIsolationMode)({ usedAssets, assetsData });
     payload.isInSiloedMode = (0, aaveHelpers_1.aaveV3IsInSiloedMode)({ usedAssets, assetsData });

package/cjs/helpers/compoundHelpers/index.js

@@ -42,8 +42,8 @@ const formatBaseData = (data, network, baseAssetPrice) => {
 };
 exports.formatBaseData = formatBaseData;
 const getIncentiveApys = (baseData, compPrice) => {
-    const incentiveSupplyApy = (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString();
-    const incentiveBorrowApy = (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString();
+    const incentiveSupplyApy = (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.priceInBaseAsset / +baseData.totalSupply).toString();
+    const incentiveBorrowApy = (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.priceInBaseAsset / +baseData.totalBorrow).toString();
     return {
         incentiveSupplyApy,
         incentiveBorrowApy,

package/cjs/morphoAaveV3/index.d.ts

@@ -3,5 +3,5 @@ import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/
 import { MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData } from '../types';
 export declare const getMorphoAaveV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3MarketData>;
 export declare const getMorphoAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo, customGetAggregatedDataFunction?: Function) => Promise<MorphoAaveV3PositionData>;
+export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo) => Promise<MorphoAaveV3PositionData>;
 export declare const getMorphoAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, delegator: string, market: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3PositionData>;

package/cjs/morphoAaveV3/index.js

@@ -316,7 +316,7 @@ const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapping, ad
     return balances;
 });
 exports.getMorphoAaveV3AccountBalances = getMorphoAaveV3AccountBalances;
-const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegator, selectedMarket, customGetAggregatedDataFunction) => __awaiter(void 0, void 0, void 0, function* () {
+const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegator, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     var _g;
     if (!address) {
         throw new Error('No address provided.');
@@ -421,8 +421,7 @@ const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegato
             };
         }
     });
-    const aggregateFunction = customGetAggregatedDataFunction || aaveHelpers_1.aaveAnyGetAggregatedPositionData;
-    payload = Object.assign(Object.assign({}, payload), aggregateFunction({
+    payload = Object.assign(Object.assign({}, payload), (0, aaveHelpers_1.aaveAnyGetAggregatedPositionData)({
         usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket,
     }));
     // Calculate borrow limits per asset

package/cjs/types/compound.d.ts

@@ -49,6 +49,7 @@ export interface CompoundV3AssetData extends CompoundAssetData {
     minDebt: string;
     liquidationRatio: string;
     supplyCap: string;
+    priceInBaseAsset: string;
 }
 export interface CompoundAssetsData<T> {
     [token: string]: T;

package/esm/aaveV3/index.d.ts

@@ -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, customGetAggregatedDataFunction?: Function) => 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

@@ -277,7 +277,7 @@ export const getAaveV3AccountBalances = (web3, network, block, addressMapping, a
     });
     return balances;
 });
-export const getAaveV3AccountData = (web3, network, address, extractedState, customGetAggregatedDataFunction) => __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, } = extractedState;
     let payload = Object.assign(Object.assign({}, EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -348,9 +348,8 @@ export const getAaveV3AccountData = (web3, network, address, extractedState, cus
         usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(), discountedBorrowRate: new Dec(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString(), borrowedStable,
             borrowedVariable, borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(), borrowedUsdVariable: new Dec(borrowedVariable).mul(assetsData[asset].price).toString(), borrowed, borrowedUsd: new Dec(new Dec(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(), isBorrowed, eModeCategory: assetsData[asset].eModeCategory, interestMode });
     }));
-    const aggregateFunction = customGetAggregatedDataFunction || aaveAnyGetAggregatedPositionData;
     payload.eModeCategory = +multicallRes[0][0];
-    payload = Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), aggregateFunction(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: payload.eModeCategory })));
+    payload = Object.assign(Object.assign(Object.assign({}, payload), { usedAssets }), aaveAnyGetAggregatedPositionData(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: payload.eModeCategory })));
     payload.eModeCategories = aaveV3EmodeCategoriesMapping(extractedState, usedAssets);
     payload.isInIsolationMode = aaveV3IsInIsolationMode({ usedAssets, assetsData });
     payload.isInSiloedMode = aaveV3IsInSiloedMode({ usedAssets, assetsData });

package/esm/helpers/compoundHelpers/index.js

@@ -34,8 +34,8 @@ export const formatBaseData = (data, network, baseAssetPrice) => {
         totalBorrow, marketLiquidity: new Dec(totalSupply).minus(totalBorrow).toString(), symbol: wethToEth(assetInfo.symbol), priceInBaseAsset: getEthAmountForDecimals(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: getEthAmountForDecimals(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: getEthAmountForDecimals(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: getEthAmountForDecimals(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
 export const getIncentiveApys = (baseData, compPrice) => {
-    const incentiveSupplyApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString();
-    const incentiveBorrowApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString();
+    const incentiveSupplyApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.priceInBaseAsset / +baseData.totalSupply).toString();
+    const incentiveBorrowApy = aprToApy((100 * SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.priceInBaseAsset / +baseData.totalBorrow).toString();
     return {
         incentiveSupplyApy,
         incentiveBorrowApy,

package/esm/morphoAaveV3/index.d.ts

@@ -3,5 +3,5 @@ import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/
 import { MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData } from '../types';
 export declare const getMorphoAaveV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3MarketData>;
 export declare const getMorphoAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo, customGetAggregatedDataFunction?: Function) => Promise<MorphoAaveV3PositionData>;
+export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo) => Promise<MorphoAaveV3PositionData>;
 export declare const getMorphoAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, delegator: string, market: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3PositionData>;

package/esm/morphoAaveV3/index.js

@@ -308,7 +308,7 @@ export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapp
     });
     return balances;
 });
-export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegator, selectedMarket, customGetAggregatedDataFunction) => __awaiter(void 0, void 0, void 0, function* () {
+export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegator, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     var _g;
     if (!address) {
         throw new Error('No address provided.');
@@ -413,8 +413,7 @@ export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, d
             };
         }
     });
-    const aggregateFunction = customGetAggregatedDataFunction || aaveAnyGetAggregatedPositionData;
-    payload = Object.assign(Object.assign({}, payload), aggregateFunction({
+    payload = Object.assign(Object.assign({}, payload), aaveAnyGetAggregatedPositionData({
         usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket,
     }));
     // Calculate borrow limits per asset

package/esm/types/compound.d.ts

@@ -49,6 +49,7 @@ export interface CompoundV3AssetData extends CompoundAssetData {
     minDebt: string;
     liquidationRatio: string;
     supplyCap: string;
+    priceInBaseAsset: string;
 }
 export interface CompoundAssetsData<T> {
     [token: string]: T;

package/package.json

@@ -1,40 +1,40 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.16",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
-    "lint": "eslint src/ --fix",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "build-test": "npm run build && mocha tests/*"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.5.3",
-    "decimal.js": "^10.4.3",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "@ethersproject/bignumber": "^5.7.0"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "mocha": "^10.2.0",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.18",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
+    "lint": "eslint src/ --fix",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "build-test": "npm run build && mocha tests/*"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.5.3",
+    "decimal.js": "^10.4.3",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "@ethersproject/bignumber": "^5.7.0"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "mocha": "^10.2.0",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}