@sonarwatch/portfolio-plugins 0.8.80 → 0.8.82

package/src/plugins/compound/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/helpers.ts"],"names":[],"mappings":";;;AAEA,0FAA0F;AAC1F,6CAA6C;AAC7C,SAAgB,WAAW,CAAC,SAA2B;IACrD,QAAQ,SAAS,EAAE;QACjB,KAAK,KAAK;YACR,OAAO,EAAE,CAAC;YACV,MAAM;QACR,KAAK,UAAU;YACb,OAAO,CAAC,CAAC;QACX;YACE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACrC,OAAO,SAAS,CAAC;YACjB,MAAM;KACT;AACH,CAAC;AAZD,kCAYC"}

package/src/plugins/compound/index.js

@@ -8,10 +8,16 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
 const marketsJob_1 = __importDefault(require("./marketsJob"));
 const getPositionsV3Fetcher_1 = __importDefault(require("./getPositionsV3Fetcher"));
+const getMarketsV2Job_1 = __importDefault(require("./getMarketsV2Job"));
+const getPositionsV2Fetcher_1 = __importDefault(require("./getPositionsV2Fetcher"));
 exports.platforms = [constants_1.compoundPlatform];
-exports.jobs = [marketsJob_1.default];
+exports.jobs = [
+    marketsJob_1.default,
+    (0, getMarketsV2Job_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, constants_1.comptrollerV2Ethereum),
+];
 exports.fetchers = [
     (0, getPositionsV3Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum),
     (0, getPositionsV3Fetcher_1.default)(portfolio_core_1.NetworkId.polygon),
+    (0, getPositionsV2Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId),
 ];
 //# sourceMappingURL=index.js.map

package/src/plugins/compound/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,2CAA+C;AAC/C,8DAAsC;AACtC,oFAA4D;AAE/C,QAAA,SAAS,GAAe,CAAC,4BAAgB,CAAC,CAAC;AAC3C,QAAA,IAAI,GAAU,CAAC,oBAAU,CAAC,CAAC;AAC3B,QAAA,QAAQ,GAAc;IACjC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,CAAC;IACzC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,OAAO,CAAC;CACzC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/compound/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,2CAIqB;AACrB,8DAAsC;AACtC,oFAA4D;AAC5D,wEAAgD;AAChD,oFAA4D;AAE/C,QAAA,SAAS,GAAe,CAAC,4BAAgB,CAAC,CAAC;AAC3C,QAAA,IAAI,GAAU;IACzB,oBAAU;IACV,IAAA,yBAAe,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,iCAAqB,CAAC;CACvE,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,CAAC;IACzC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,OAAO,CAAC;IACxC,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,CAAC;CACtD,CAAC"}

package/src/plugins/compound/types.d.ts

@@ -11,3 +11,10 @@ export type MarketDetail = {
         decimals: number;
     }[];
 };
+export type MarketV2Detail = {
+    networkId: EvmNetworkIdType;
+    address: `0x${string}`;
+    name?: string;
+    exchangeRate: string;
+    underlyings: string[];
+};

package/src/plugins/flexlend/constants.js

@@ -8,6 +8,7 @@ exports.flexlendPlatform = {
     name: 'FlexLend',
     image: 'https://sonar.watch/img/platforms/flexlend.png',
     defiLlamaId: 'flexlend',
+    website: 'https://flexlend.fi/',
 };
 exports.flexProgramId = new web3_js_1.PublicKey('FL3X2pRsQ9zHENpZSKDRREtccwJuei8yg9fwDu9UN69Q');
 //# sourceMappingURL=constants.js.map

package/src/plugins/flexlend/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flexlend/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,UAAU;CACxB,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flexlend/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,gBAAgB,GAAa;IACxC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,gDAAgD;IACvD,WAAW,EAAE,UAAU;IACvB,OAAO,EAAE,sBAAsB;CAChC,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC"}

package/src/plugins/marginfi/fetcherExecutor.js

@@ -35,6 +35,8 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
     const suppliedAssets = [];
     const suppliedYields = [];
     const rewardAssets = [];
+    const suppliedLtvs = [];
+    const borrowedWeights = [];
     const balancesAddresses = lendingAccountBalances.map((lendingAccountBalance) => lendingAccountBalance.bankPk.toString());
     const banksInfo = yield cache.getItems(balancesAddresses, {
         prefix: constants_1.prefix,
@@ -69,35 +71,41 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
         if (!tokenPrice)
             continue;
         if (!accountBalanceInfo.assetShares.value.isZero()) {
+            suppliedLtvs.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.assetWeightMaint)
+                .decimalPlaces(2)
+                .toNumber());
             const suppliedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.assetShares)
                 .times(bankInfo.dividedAssetShareValue)
                 .toNumber();
             suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), suppliedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice));
+            const bankLendingYields = [
+                {
+                    apr: lendingApr,
+                    apy: (0, portfolio_core_1.aprToApy)(lendingApr),
+                },
+            ];
+            suppliedYields.push(bankLendingYields);
         }
         if (!accountBalanceInfo.liabilityShares.value.isZero()) {
+            borrowedWeights.push((0, helpers_1.wrappedI80F48toBigNumber)(bankInfo.config.liabilityWeightMaint)
+                .decimalPlaces(2)
+                .toNumber());
             const borrowedQuantity = (0, helpers_1.wrappedI80F48toBigNumber)(accountBalanceInfo.liabilityShares)
                 .times(bankInfo.dividedLiabilityShareValue)
                 .toNumber();
             borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(bankInfo.mint.toString(), borrowedQuantity, portfolio_core_1.NetworkId.solana, tokenPrice));
+            const bankBorrowedYields = [
+                {
+                    apr: borrowingApr,
+                    apy: (0, portfolio_core_1.aprToApy)(borrowingApr),
+                },
+            ];
+            borrowedYields.push(bankBorrowedYields);
         }
-        const bankLendingYields = [
-            {
-                apr: lendingApr,
-                apy: (0, portfolio_core_1.aprToApy)(lendingApr),
-            },
-        ];
-        const bankBorrowedYields = [
-            {
-                apr: borrowingApr,
-                apy: (0, portfolio_core_1.aprToApy)(borrowingApr),
-            },
-        ];
-        suppliedYields.push(bankLendingYields);
-        borrowedYields.push(bankBorrowedYields);
     }
     if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
         return [];
-    const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+    const { borrowedValue, collateralRatio, healthRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
     const element = {
         type: portfolio_core_1.PortfolioElementType.borrowlend,
         networkId: portfolio_core_1.NetworkId.solana,
@@ -112,6 +120,7 @@ const fetcherExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, func
             suppliedValue,
             suppliedYields,
             collateralRatio,
+            healthRatio,
             rewardAssets,
             value,
         },

package/src/plugins/marginfi/fetcherExecutor.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetcherExecutor.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/marginfi/fetcherExecutor.ts"],"names":[],"mappings":"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"}

package/src/plugins/pancakeswap/getFarmsV2Fetcher.d.ts

@@ -1,3 +1,3 @@
 import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
-import { FetcherExecutor } from '../../Fetcher';
-export default function getFarmsV2Fetcher(masterChef: string, networkId: EvmNetworkIdType): FetcherExecutor;
+import { Fetcher } from '../../Fetcher';
+export default function getFarmsV2Fetcher(networkId: EvmNetworkIdType, version: string, masterChef: string): Fetcher;

package/src/plugins/pancakeswap/getFarmsV2Fetcher.js

@@ -19,8 +19,8 @@ const constants_2 = require("../uniswap-v2/constants");
 const abis_1 = require("./abis");
 const clients_1 = require("../../utils/clients");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-function getFarmsV2Fetcher(masterChef, networkId) {
-    return (owner, cache) => __awaiter(this, void 0, void 0, function* () {
+function getFarmsV2Fetcher(networkId, version, masterChef) {
+    const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
         const client = (0, clients_1.getEvmClient)(networkId);
         const pairsV2 = yield cache.getItem(constants_2.pairsV2Key, {
             networkId,
@@ -105,7 +105,7 @@ function getFarmsV2Fetcher(masterChef, networkId) {
                 networkId,
                 platformId: constants_1.platformId,
                 label: 'Farming',
-                name: 'V2',
+                name: version,
                 type: portfolio_core_1.PortfolioElementType.liquidity,
                 data: {
                     liquidities,
@@ -114,6 +114,11 @@ function getFarmsV2Fetcher(masterChef, networkId) {
             },
         ];
     });
+    return {
+        executor,
+        id: `${constants_1.platformId}-${networkId}-farms-${version}`,
+        networkId,
+    };
 }
 exports.default = getFarmsV2Fetcher;
 //# sourceMappingURL=getFarmsV2Fetcher.js.map

package/src/plugins/pancakeswap/getFarmsV2Fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFarmsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getFarmsV2Fetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getFarmsV2Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getFarmsV2Fetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/pancakeswap/getStakersBalancesFetcher.d.ts

@@ -1,4 +1,4 @@
 import { EvmNetworkIdType } from '@sonarwatch/portfolio-core';
-import { FetcherExecutor } from '../../Fetcher';
+import { Fetcher } from '../../Fetcher';
 import { StakerInfo } from './types';
-export default function getStakersBalancesFetcher(stakersInfos: StakerInfo[], networkId: EvmNetworkIdType, platformId: string): FetcherExecutor;
+export default function getStakersBalancesFetcher(networkId: EvmNetworkIdType, platformId: string, stakersInfos: StakerInfo[]): Fetcher;

package/src/plugins/pancakeswap/getStakersBalancesFetcher.js

@@ -17,9 +17,9 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const clients_1 = require("../../utils/clients");
 const abis_1 = require("./abis");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-function getStakersBalancesFetcher(stakersInfos, networkId, platformId) {
+function getStakersBalancesFetcher(networkId, platformId, stakersInfos) {
     const client = (0, clients_1.getEvmClient)(networkId);
-    return (owner, cache) => __awaiter(this, void 0, void 0, function* () {
+    const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
         const address = owner;
         const stakerBalanceContracts = [];
         for (const stakerInfo of stakersInfos) {
@@ -69,6 +69,11 @@ function getStakersBalancesFetcher(stakersInfos, networkId, platformId) {
             },
         ];
     });
+    return {
+        executor,
+        id: `${platformId}-${networkId}-stakers`,
+        networkId,
+    };
 }
 exports.default = getStakersBalancesFetcher;
 //# sourceMappingURL=getStakersBalancesFetcher.js.map

package/src/plugins/pancakeswap/getStakersBalancesFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"getStakersBalancesFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getStakersBalancesFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getStakersBalancesFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/getStakersBalancesFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/pancakeswap/index.js

@@ -11,63 +11,33 @@ const getPoolsJob_1 = __importDefault(require("../uniswap-v2/getPoolsJob"));
 const getPositionsV2Fetcher_1 = __importDefault(require("../uniswap-v2/getPositionsV2Fetcher"));
 const getStakersBalancesFetcher_1 = __importDefault(require("./getStakersBalancesFetcher"));
 const stakerCakeFetcher_1 = __importDefault(require("./stakerCakeFetcher"));
-const getFarmsV2Fetcher_1 = __importDefault(require("./getFarmsV2Fetcher"));
 const getPositionsV3Fetcher_1 = require("../uniswap/getPositionsV3Fetcher");
+const getFarmsV2Fetcher_1 = __importDefault(require("./getFarmsV2Fetcher"));
 exports.platforms = [constants_1.pancakeswapPlatform];
 exports.jobs = [
     // Aptos
     aptosLpJob_1.default,
     // Ethereum
-    {
-        id: `${constants_1.platformId}-v2-${portfolio_core_1.NetworkId.ethereum}`,
-        executor: (0, getPoolsJob_1.default)(constants_1.theGraphUrlEthV2, constants_1.platformId, portfolio_core_1.NetworkId.ethereum),
-    },
+    (0, getPoolsJob_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, 'V1', constants_1.theGraphUrlEthV2),
     // BNB
-    {
-        id: `${constants_1.platformId}-v2-${portfolio_core_1.NetworkId.bnb}`,
-        executor: (0, getPoolsJob_1.default)(constants_1.factoryV2Bnb, constants_1.platformId, portfolio_core_1.NetworkId.bnb),
-    },
+    (0, getPoolsJob_1.default)(portfolio_core_1.NetworkId.bnb, constants_1.platformId, 'V1', constants_1.factoryV2Bnb),
 ];
 exports.fetchers = [
     // V3 (all EVMs)
-    ...constants_1.networksConfigs.map((config) => (0, getPositionsV3Fetcher_1.getPositionsV3Fetcher)(config, constants_1.platformId)),
+    ...constants_1.networksConfigs.map((config) => (0, getPositionsV3Fetcher_1.getPositionsV3Fetcher)(config, constants_1.platformId, 'V3')),
     // V2 Ethereum
-    {
-        id: `${constants_1.platformId}-poolsV2-${portfolio_core_1.NetworkId.ethereum}`,
-        executor: (0, getPositionsV2Fetcher_1.default)(constants_1.platformId, portfolio_core_1.NetworkId.ethereum),
-        networkId: portfolio_core_1.NetworkId.ethereum,
-    },
-    {
-        id: `${constants_1.platformId}-farmsV2-${portfolio_core_1.NetworkId.ethereum}`,
-        executor: (0, getFarmsV2Fetcher_1.default)(constants_1.masterChefV2Ethereum, portfolio_core_1.NetworkId.ethereum),
-        networkId: portfolio_core_1.NetworkId.ethereum,
-    },
-    {
-        id: `${constants_1.platformId}-stakers-${portfolio_core_1.NetworkId.ethereum}`,
-        executor: (0, getStakersBalancesFetcher_1.default)(constants_1.stakersEthereum, portfolio_core_1.NetworkId.ethereum, constants_1.platformId),
-        networkId: portfolio_core_1.NetworkId.ethereum,
-    },
+    (0, getPositionsV2Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, 'V2'),
+    (0, getFarmsV2Fetcher_1.default)(portfolio_core_1.NetworkId.ethereum, 'V2', constants_1.masterChefV2Ethereum),
+    (0, getStakersBalancesFetcher_1.default)(portfolio_core_1.NetworkId.ethereum, constants_1.platformId, constants_1.stakersEthereum),
     // V2 BNB
-    {
-        id: `${constants_1.platformId}-poolsV2-${portfolio_core_1.NetworkId.bnb}`,
-        executor: (0, getPositionsV2Fetcher_1.default)(constants_1.platformId, portfolio_core_1.NetworkId.bnb),
-        networkId: portfolio_core_1.NetworkId.bnb,
-    },
+    (0, getPositionsV2Fetcher_1.default)(portfolio_core_1.NetworkId.bnb, constants_1.platformId, 'V2'),
     // {
     //   id: `${platformId}-farmsV1-${NetworkId.bnb}`,
     //   executor: getFarmsV2FetcherGenerator(masterChefBnb, NetworkId.bnb),
     //   networkId: NetworkId.bnb,
     // },
-    {
-        id: `${constants_1.platformId}-farmsV2-${portfolio_core_1.NetworkId.bnb}`,
-        executor: (0, getFarmsV2Fetcher_1.default)(constants_1.masterChefV2Bnb, portfolio_core_1.NetworkId.bnb),
-        networkId: portfolio_core_1.NetworkId.bnb,
-    },
-    {
-        id: `${constants_1.platformId}-stakers-${portfolio_core_1.NetworkId.bnb}`,
-        executor: (0, getStakersBalancesFetcher_1.default)(constants_1.stakersBnb, portfolio_core_1.NetworkId.bnb, constants_1.platformId),
-        networkId: portfolio_core_1.NetworkId.bnb,
-    },
+    (0, getFarmsV2Fetcher_1.default)(portfolio_core_1.NetworkId.bnb, 'V2', constants_1.masterChefV2Bnb),
+    (0, getStakersBalancesFetcher_1.default)(portfolio_core_1.NetworkId.bnb, constants_1.platformId, constants_1.stakersBnb),
     stakerCakeFetcher_1.default,
 ];
 //# sourceMappingURL=index.js.map

package/src/plugins/pancakeswap/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,8DAAoC;AACpC,2CAUqB;AACrB,4EAAoD;AACpD,gGAAwE;AACxE,4FAAoE;AACpE,4EAAoD;AACpD,4EAAoD;AACpD,4EAAyE;AAE5D,QAAA,SAAS,GAAe,CAAC,+BAAmB,CAAC,CAAC;AAC9C,QAAA,IAAI,GAAU;IACzB,QAAQ;IACR,oBAAQ;IACR,WAAW;IACX;QACE,EAAE,EAAE,GAAG,sBAAU,OAAO,0BAAS,CAAC,QAAQ,EAAE;QAC5C,QAAQ,EAAE,IAAA,qBAAW,EAAC,4BAAgB,EAAE,sBAAU,EAAE,0BAAS,CAAC,QAAQ,CAAC;KACxE;IACD,MAAM;IACN;QACE,EAAE,EAAE,GAAG,sBAAU,OAAO,0BAAS,CAAC,GAAG,EAAE;QACvC,QAAQ,EAAE,IAAA,qBAAW,EAAC,wBAAY,EAAE,sBAAU,EAAE,0BAAS,CAAC,GAAG,CAAC;KAC/D;CACF,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,gBAAgB;IAChB,GAAG,2BAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,6CAAqB,EAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC7E,cAAc;IACd;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,QAAQ,EAAE;QACjD,QAAQ,EAAE,IAAA,+BAAqB,EAAC,sBAAU,EAAE,0BAAS,CAAC,QAAQ,CAAC;QAC/D,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,QAAQ,EAAE;QACjD,QAAQ,EAAE,IAAA,2BAAiB,EAAC,gCAAoB,EAAE,0BAAS,CAAC,QAAQ,CAAC;QACrE,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,QAAQ,EAAE;QACjD,QAAQ,EAAE,IAAA,mCAAyB,EACjC,2BAAe,EACf,0BAAS,CAAC,QAAQ,EAClB,sBAAU,CACX;QACD,SAAS,EAAE,0BAAS,CAAC,QAAQ;KAC9B;IAED,SAAS;IACT;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,GAAG,EAAE;QAC5C,QAAQ,EAAE,IAAA,+BAAqB,EAAC,sBAAU,EAAE,0BAAS,CAAC,GAAG,CAAC;QAC1D,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB;IACD,IAAI;IACJ,kDAAkD;IAClD,wEAAwE;IACxE,8BAA8B;IAC9B,KAAK;IACL;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,GAAG,EAAE;QAC5C,QAAQ,EAAE,IAAA,2BAAiB,EAAC,2BAAe,EAAE,0BAAS,CAAC,GAAG,CAAC;QAC3D,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB;IACD;QACE,EAAE,EAAE,GAAG,sBAAU,YAAY,0BAAS,CAAC,GAAG,EAAE;QAC5C,QAAQ,EAAE,IAAA,mCAAyB,EAAC,sBAAU,EAAE,0BAAS,CAAC,GAAG,EAAE,sBAAU,CAAC;QAC1E,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB;IACD,2BAAiB;CAClB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pancakeswap/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAiE;AAGjE,8DAAoC;AACpC,2CAUqB;AACrB,4EAAoD;AACpD,gGAAwE;AACxE,4FAAoE;AACpE,4EAAoD;AACpD,4EAAyE;AACzE,4EAAoD;AAEvC,QAAA,SAAS,GAAe,CAAC,+BAAmB,CAAC,CAAC;AAC9C,QAAA,IAAI,GAAU;IACzB,QAAQ;IACR,oBAAQ;IACR,WAAW;IACX,IAAA,qBAAW,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,IAAI,EAAE,4BAAgB,CAAC;IACnE,MAAM;IACN,IAAA,qBAAW,EAAC,0BAAS,CAAC,GAAG,EAAE,sBAAU,EAAE,IAAI,EAAE,wBAAY,CAAC;CAC3D,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,gBAAgB;IAChB,GAAG,2BAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,IAAA,6CAAqB,EAAC,MAAM,EAAE,sBAAU,EAAE,IAAI,CAAC,CAChD;IACD,cAAc;IACd,IAAA,+BAAqB,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,IAAI,CAAC;IAC3D,IAAA,2BAAiB,EAAC,0BAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,gCAAoB,CAAC;IACjE,IAAA,mCAAyB,EAAC,0BAAS,CAAC,QAAQ,EAAE,sBAAU,EAAE,2BAAe,CAAC;IAE1E,SAAS;IACT,IAAA,+BAAqB,EAAC,0BAAS,CAAC,GAAG,EAAE,sBAAU,EAAE,IAAI,CAAC;IACtD,IAAI;IACJ,kDAAkD;IAClD,wEAAwE;IACxE,8BAA8B;IAC9B,KAAK;IACL,IAAA,2BAAiB,EAAC,0BAAS,CAAC,GAAG,EAAE,IAAI,EAAE,2BAAe,CAAC;IACvD,IAAA,mCAAyB,EAAC,0BAAS,CAAC,GAAG,EAAE,sBAAU,EAAE,sBAAU,CAAC;IAChE,2BAAiB;CAClB,CAAC"}

package/src/plugins/solend/obligationsFetcher.js

@@ -106,6 +106,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const suppliedAssets = [];
         const suppliedYields = [];
         const rewardAssets = [];
+        const suppliedLtvs = [];
+        const borrowedWeights = [];
         for (let j = 0; j < market.reserves.length; j += 1) {
             const { address: reserveAddress } = market.reserves[j];
             const reserveInfo = reserveByAddress.get(reserveAddress);
@@ -136,6 +138,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                         .div(Math.pow(10, decimals))
                         .times(reserveDepositAmount / collateralSupply)
                         .toNumber();
+                    suppliedLtvs.push(reserve.config.liquidationThreshold / 100);
                     const apy = +reserveInfo.rates.supplyInterest / 100;
                     const cSuppliedYields = [
                         {
@@ -156,6 +159,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                         .div(borrow.cumulativeBorrowRateWads)
                         .dividedBy(new bignumber_js_1.default(Math.pow(10, (constants_1.wadsDecimal + decimals))))
                         .toNumber();
+                    borrowedWeights.push(new bignumber_js_1.default(reserve.config.addedBorrowWeightBPS)
+                        .dividedBy(Math.pow(10, 20))
+                        .plus(1)
+                        .toNumber());
                     const apy = +reserveInfo.rates.borrowInterest / 100;
                     const cBorrowedYields = [
                         {
@@ -170,7 +177,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
-        const { borrowedValue, collateralRatio, suppliedValue, value } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, collateralRatio, suppliedValue, value, healthRatio, } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -186,6 +193,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 suppliedValue,
                 suppliedYields,
                 collateralRatio,
+                healthRatio,
                 rewardAssets,
                 value,
             },

package/src/plugins/solend/obligationsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/obligationsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"obligationsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/obligationsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/solend/reservesJob.js

@@ -16,7 +16,6 @@ const axios_1 = __importDefault(require("axios"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
-const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const markets = yield cache.getAllItems({
         prefix: constants_1.marketsPrefix,
@@ -46,8 +45,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             });
             const { reserve } = reserveInfo;
             const { liquidity, collateral } = reserve;
-            const { mintPubkey, mintDecimals } = liquidity;
+            const { mintPubkey } = liquidity;
             const decimals = liquidity.mintDecimals;
+            const cTokenExchangeRate = new bignumber_js_1.default(reserve.cTokenExchangeRate);
             const tokenAddress = reserveInfo.reserve.collateral.mintPubkey;
             const borrowApy = +reserveInfo.rates.borrowInterest / 100;
             const depositApy = +reserveInfo.rates.supplyInterest / 100;
@@ -57,28 +57,23 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             const reserveAvailableAmount = new bignumber_js_1.default(liquidity.availableAmount)
                 .dividedBy(Math.pow(10, decimals))
                 .toNumber();
-            const collateralTotalSupply = new bignumber_js_1.default(collateral.mintTotalSupply.toString())
-                .dividedBy(new bignumber_js_1.default(Math.pow(10, mintDecimals)))
-                .toNumber();
             const depositedAmount = borrowedAmount + reserveAvailableAmount;
             // Compute the price of the cToken https://solend.fi/ctokens
             const mintTokenPrice = tokenPriceById.get(mintPubkey);
             const cPrice = mintTokenPrice
-                ? mintTokenPrice.price * (depositedAmount / collateralTotalSupply)
+                ? cTokenExchangeRate.multipliedBy(mintTokenPrice.price).toNumber()
                 : undefined;
             if (cPrice) {
-                const cDecimals = yield (0, getDecimalsForToken_1.getDecimalsForToken)(cache, collateral.mintPubkey.toString(), portfolio_core_1.NetworkId.solana);
-                if (cDecimals)
-                    promises.push(cache.setTokenPriceSource({
-                        address: collateral.mintPubkey.toString(),
-                        decimals: cDecimals,
-                        id: constants_1.platformId,
-                        networkId: portfolio_core_1.NetworkId.solana,
-                        platformId: constants_1.platformId,
-                        price: cPrice,
-                        timestamp: Date.now(),
-                        weight: 1,
-                    }));
+                promises.push(cache.setTokenPriceSource({
+                    address: collateral.mintPubkey.toString(),
+                    decimals,
+                    id: constants_1.platformId,
+                    networkId: portfolio_core_1.NetworkId.solana,
+                    platformId: constants_1.platformId,
+                    price: cPrice,
+                    timestamp: Date.now(),
+                    weight: 1,
+                }));
             }
             if (borrowedAmount <= 10 && depositedAmount <= 10)
                 continue;

package/src/plugins/solend/reservesJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/reservesJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solend/reservesJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/solend/types.d.ts

@@ -78,7 +78,9 @@ export interface ReserveData {
         protocolLiquidationFee: number;
         protocolTakeRate: number;
         borrowedAmountWads: string;
+        addedBorrowWeightBPS: string;
     };
+    cTokenExchangeRate: string;
 }
 export interface RatesInfo {
     supplyInterest: string;

package/src/plugins/uniswap/getPositionsV3Fetcher.d.ts

@@ -1,3 +1,3 @@
 import { Fetcher } from '../../Fetcher';
 import { UniswapNetworkConfig } from './types';
-export declare function getPositionsV3Fetcher(config: UniswapNetworkConfig, platformId: string): Fetcher;
+export declare function getPositionsV3Fetcher(config: UniswapNetworkConfig, platformId: string, version: string): Fetcher;

package/src/plugins/uniswap/getPositionsV3Fetcher.js

@@ -21,7 +21,7 @@ const clients_1 = require("../../utils/clients");
 const abis_2 = require("./abis");
 const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-function getPositionsV3Fetcher(config, platformId) {
+function getPositionsV3Fetcher(config, platformId, version) {
     const { networkId } = config;
     const executor = (owner, cache) => __awaiter(this, void 0, void 0, function* () {
         const client = (0, clients_1.getEvmClient)(networkId);
@@ -301,8 +301,7 @@ function getPositionsV3Fetcher(config, platformId) {
                 networkId,
                 platformId,
                 label: 'LiquidityPool',
-                tags: ['Concentrated'],
-                name: 'V3',
+                name: version,
                 value: totalLiquidityValue,
                 data: {
                     liquidities: assets,

package/src/plugins/uniswap/getPositionsV3Fetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/uniswap/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getPositionsV3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/uniswap/getPositionsV3Fetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/uniswap/index.js

@@ -5,7 +5,7 @@ const constants_1 = require("./constants");
 const getPositionsV3Fetcher_1 = require("./getPositionsV3Fetcher");
 exports.jobs = [];
 exports.fetchers = [
-    ...constants_1.uniswapNetworksConfigs.map((config) => (0, getPositionsV3Fetcher_1.getPositionsV3Fetcher)(config, constants_1.platformId)),
+    ...constants_1.uniswapNetworksConfigs.map((config) => (0, getPositionsV3Fetcher_1.getPositionsV3Fetcher)(config, constants_1.platformId, 'V3')),
 ];
 exports.platforms = [constants_1.uniswapPlatform];
 //# sourceMappingURL=index.js.map