@sonarwatch/portfolio-plugins 0.11.188 → 0.11.190

package/src/plugins/aries/depositsFetcher.js

@@ -13,116 +13,122 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const helpers_1 = require("./helpers");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
+const aptos_1 = require("../../utils/aptos");
+const clients_1 = require("../../utils/clients");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const profileRes = yield axios_1.default
-        .get(`${constants_1.apiUrl}profile.find?input={"owner":"${owner}"}`, { timeout: 1000 })
-        .catch(() => null);
-    if (!profileRes || !profileRes.data)
+    var _a;
+    const client = (0, clients_1.getClientAptos)();
+    // Get deposit and borrow amounts for each profile
+    const profilesSummary = yield (0, aptos_1.getAccountResource)(client, owner, constants_1.profilesSummaryType);
+    if (!profilesSummary)
         return [];
+    const profilesAddresses = profilesSummary.profile_signers.data.map((d) => d.value.account);
+    if (profilesAddresses.length === 0)
+        return [];
+    const profiless = yield Promise.all(profilesAddresses.map((pAddress) => (0, aptos_1.getAccountResource)(client, pAddress, constants_1.profileType)));
+    const amountss = yield Promise.all(profiless.map((p) => (0, helpers_1.getProfileAmounts)(p, client)));
+    // Get TokenPrices
+    const tokenAddresses = [];
+    amountss.forEach((amounts) => {
+        amounts.deposits.forEach((deposit) => {
+            tokenAddresses.push(deposit.address);
+        });
+        amounts.borrows.forEach((borrow) => {
+            tokenAddresses.push(borrow.address);
+        });
+    });
+    const tokenPrices = yield cache.getTokenPricesAsMap(tokenAddresses, portfolio_core_1.NetworkId.aptos);
+    // Get Reserves
     const reserves = yield cache.getItem(constants_1.reservesKey, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.aptos,
     });
-    const ratesByCoin = new Map();
-    if (reserves) {
-        reserves.forEach((reserveData) => {
-            ratesByCoin.set(reserveData.key, reserveData.rate);
-        });
-    }
-    const { profiles } = profileRes.data.result.data;
-    const mintsSet = new Set();
-    for (const accountName in profiles) {
-        if (profiles[accountName]) {
-            for (const coin in profiles[accountName].deposits) {
-                if (profiles[accountName].deposits[coin]) {
-                    mintsSet.add(coin);
-                }
-            }
-            for (const coin in profiles[accountName].borrows) {
-                if (profiles[accountName].borrows[coin]) {
-                    mintsSet.add(coin);
-                }
-            }
-        }
-    }
-    const mints = Array.from(mintsSet);
-    const tokenPrices = yield cache.getTokenPrices(mints, portfolio_core_1.NetworkId.aptos);
-    const tokenById = new Map();
-    tokenPrices.forEach((tokenPrice, index) => {
-        if (tokenPrice) {
-            tokenById.set(mints[index], tokenPrice);
-        }
+    if (!reserves)
+        return [];
+    const reservesByAddress = new Map();
+    reserves.forEach((reserveData) => {
+        reservesByAddress.set(reserveData.key, reserveData);
     });
     const elements = [];
-    for (const accountName in profiles) {
-        if (profiles[accountName]) {
-            const borrowedAssets = [];
-            const borrowedYields = [];
-            const suppliedAssets = [];
-            const suppliedYields = [];
-            const rewardAssets = [];
-            const profile = profiles[accountName];
-            const name = (0, helpers_1.getName)(accountName);
-            for (const coin in profile.deposits) {
-                if (profile.deposits[coin]) {
-                    const deposit = profile.deposits[coin];
-                    const amount = new bignumber_js_1.default(deposit.collateral_coins);
-                    if (amount.isZero())
-                        continue;
-                    const tokenPrice = tokenById.get(coin);
-                    if (!tokenPrice)
-                        continue;
-                    suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(coin, amount.dividedBy(Math.pow(10, tokenPrice.decimals)).toNumber(), portfolio_core_1.NetworkId.aptos, tokenPrice));
-                    const rates = ratesByCoin.get(coin);
-                    if (rates)
-                        suppliedYields.push([rates.depositYield]);
-                }
-            }
-            for (const coin in profile.borrows) {
-                if (profile.borrows[coin]) {
-                    const borrow = profile.borrows[coin];
-                    const amount = new bignumber_js_1.default(borrow.borrowed_coins);
-                    if (amount.isZero())
-                        continue;
-                    const tokenPrice = tokenById.get(coin);
-                    if (!tokenPrice)
-                        continue;
-                    borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(coin, amount.dividedBy(Math.pow(10, tokenPrice.decimals)).toNumber(), portfolio_core_1.NetworkId.aptos, tokenPrice));
-                    const rates = ratesByCoin.get(coin);
-                    if (rates)
-                        borrowedYields.push([rates.borrowYield]);
-                }
-            }
-            if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
+    for (let i = 0; i < profiless.length; i++) {
+        const profile = profiless[i];
+        if (!profile)
+            continue;
+        const amounts = amountss[i];
+        const profileKey = (_a = profilesSummary.profile_signers.data.at(i)) === null || _a === void 0 ? void 0 : _a.key;
+        const name = profileKey ? (0, helpers_1.getName)(profileKey) : undefined;
+        const borrowedAssets = [];
+        const borrowedYields = [];
+        const suppliedAssets = [];
+        const suppliedYields = [];
+        const rewardAssets = [];
+        const suppliedLtvs = [];
+        const borrowedWeights = [];
+        for (let j = 0; j < amounts.deposits.length; j++) {
+            const deposit = amounts.deposits[j];
+            const { address, amount: amountStr } = deposit;
+            const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(address));
+            if (!tokenPrice)
                 continue;
-            const { borrowedValue, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
-            elements.push({
-                type: portfolio_core_1.PortfolioElementType.borrowlend,
-                networkId: portfolio_core_1.NetworkId.aptos,
-                platformId: constants_1.platformId,
-                label: 'Lending',
-                value,
-                name,
-                data: {
-                    borrowedAssets,
-                    borrowedValue,
-                    borrowedYields,
-                    suppliedAssets,
-                    suppliedValue,
-                    suppliedYields,
-                    collateralRatio: null,
-                    healthRatio: 1 - new bignumber_js_1.default(profile.riskFactor).toNumber(),
-                    rewardAssets,
-                    rewardValue,
-                    value,
-                },
-            });
+            const reserve = reservesByAddress.get(address);
+            if (!reserve)
+                continue;
+            suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(address, new bignumber_js_1.default(amountStr)
+                .dividedBy(Math.pow(10, tokenPrice.decimals))
+                .times(new bignumber_js_1.default(reserve.value.total_borrowed)
+                .plus(reserve.value.total_cash_available)
+                .minus(reserve.value.reserve_amount)
+                .div(reserve.value.total_lp_supply))
+                .toNumber(), portfolio_core_1.NetworkId.aptos, tokenPrice));
+            suppliedLtvs.push(Number(reserve.value.reserve_config.liquidation_threshold) / 100);
+            suppliedYields.push([reserve.rate.depositYield]);
+        }
+        for (let j = 0; j < amounts.borrows.length; j++) {
+            const borrow = amounts.borrows[j];
+            const { address, amount: amountStr } = borrow;
+            const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(address));
+            if (!tokenPrice)
+                continue;
+            const reserve = reservesByAddress.get(address);
+            if (!reserve)
+                continue;
+            borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(address, new bignumber_js_1.default(amountStr)
+                .times(new bignumber_js_1.default(reserve.value.total_borrowed).div(reserve.value.total_borrowed_share))
+                .dividedBy(Math.pow(10, (constants_1.wadsDecimal + tokenPrice.decimals)))
+                .toNumber(), portfolio_core_1.NetworkId.aptos, tokenPrice));
+            borrowedYields.push([reserve.rate.borrowYield]);
+            borrowedWeights.push(Number(reserve.value.reserve_config.borrow_factor) / 100);
         }
+        if (borrowedAssets.length === 0 &&
+            suppliedAssets.length === 0 &&
+            rewardAssets.length === 0)
+            continue;
+        const { borrowedValue, suppliedValue, value, rewardValue, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
+        elements.push({
+            type: portfolio_core_1.PortfolioElementType.borrowlend,
+            networkId: portfolio_core_1.NetworkId.aptos,
+            platformId: constants_1.platformId,
+            label: 'Lending',
+            value,
+            name,
+            data: {
+                borrowedAssets,
+                borrowedValue,
+                borrowedYields,
+                suppliedAssets,
+                suppliedValue,
+                suppliedYields,
+                collateralRatio: null,
+                healthRatio,
+                rewardAssets,
+                rewardValue,
+                value,
+            },
+        });
     }
     return elements;
 });

package/src/plugins/aries/depositsFetcher.js.map

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

package/src/plugins/aries/helpers.d.ts

@@ -1,5 +1,24 @@
 import BigNumber from 'bignumber.js';
-import { Reserve } from './types';
+import { Profile, Reserve } from './types';
+import { AptosClient } from '../../utils/clients/types';
 export declare function getName(accountName: string): string;
 export declare function getBorrowApr(utilization: BigNumber, borrowedAmount: BigNumber, availableAmount: BigNumber, reserveData: Reserve): number;
 export declare function getDepositApr(utilization: BigNumber, borrowApr: number, reserveData: Reserve): number;
+export declare function getProfileAmounts(profile: Profile | null, client: AptosClient): Promise<{
+    deposits: {
+        address: string;
+        amount: string;
+    }[];
+    borrows: {
+        address: string;
+        amount: string;
+    }[];
+}>;
+export declare function getProfileBorrows(profile: Profile | null, client: AptosClient): Promise<{
+    address: string;
+    amount: string;
+}[]>;
+export declare function getProfileDeposits(profile: Profile | null, client: AptosClient): Promise<{
+    address: string;
+    amount: string;
+}[]>;

package/src/plugins/aries/helpers.js

@@ -1,14 +1,39 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDepositApr = exports.getBorrowApr = exports.getName = void 0;
+exports.getProfileDeposits = exports.getProfileBorrows = exports.getProfileAmounts = exports.getDepositApr = exports.getBorrowApr = exports.getName = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const aptos_1 = require("../../utils/aptos");
+const constants_1 = require("./constants");
 function getName(accountName) {
-    return accountName.replace('profile', '');
+    if (accountName.startsWith('profile'))
+        return accountName.slice(7);
+    return accountName;
 }
 exports.getName = getName;
+function hex2a(hex) {
+    let hexx = hex;
+    if (hex.startsWith('0x'))
+        hexx = hexx.slice(2);
+    let str = '';
+    for (let i = 0; i < hexx.length; i += 2)
+        str += String.fromCharCode(parseInt(hexx.substring(i, i + 2), 16));
+    return str;
+}
+function getTokenAddress(vec) {
+    return `${vec.account_address}::${hex2a(vec.module_name)}::${hex2a(vec.struct_name)}`;
+}
 function getBorrowApr(utilization, borrowedAmount, availableAmount, reserveData) {
     const interestRateConfig = reserveData.value.interest_rate_config;
     const optimalUtilization = interestRateConfig.optimal_utilization / 100;
@@ -43,4 +68,71 @@ function getDepositApr(utilization, borrowApr, reserveData) {
         .toNumber();
 }
 exports.getDepositApr = getDepositApr;
+function getProfileAmounts(profile, client) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const [deposits, borrows] = yield Promise.all([
+            getProfileDeposits(profile, client),
+            getProfileBorrows(profile, client),
+        ]);
+        return {
+            deposits,
+            borrows,
+        };
+    });
+}
+exports.getProfileAmounts = getProfileAmounts;
+function getProfileBorrows(profile, client) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const head = profile === null || profile === void 0 ? void 0 : profile.borrowed_reserves.head.vec.at(0);
+        const handle = profile === null || profile === void 0 ? void 0 : profile.borrowed_reserves.inner.inner.handle;
+        if (!head || !handle)
+            return [];
+        let nextVec = head;
+        let profileItem;
+        const amounts = [];
+        while (nextVec) {
+            profileItem = yield (0, aptos_1.getTableItem)(client, handle, {
+                key_type: '0x1::type_info::TypeInfo',
+                value_type: `${constants_1.packageId}::iterable_table::IterableValue<0x1::type_info::TypeInfo, ${constants_1.packageId}::profile::Loan>`,
+                key: nextVec,
+            });
+            if (profileItem) {
+                amounts.push({
+                    address: getTokenAddress(nextVec),
+                    amount: profileItem.val.borrowed_share.val,
+                });
+            }
+            nextVec = profileItem === null || profileItem === void 0 ? void 0 : profileItem.next.vec.at(0);
+        }
+        return amounts;
+    });
+}
+exports.getProfileBorrows = getProfileBorrows;
+function getProfileDeposits(profile, client) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const head = profile === null || profile === void 0 ? void 0 : profile.deposited_reserves.head.vec.at(0);
+        const handle = profile === null || profile === void 0 ? void 0 : profile.deposited_reserves.inner.inner.handle;
+        if (!head || !handle)
+            return [];
+        let nextVec = head;
+        let profileItem;
+        const amounts = [];
+        while (nextVec) {
+            profileItem = yield (0, aptos_1.getTableItem)(client, handle, {
+                key_type: '0x1::type_info::TypeInfo',
+                value_type: `${constants_1.packageId}::iterable_table::IterableValue<0x1::type_info::TypeInfo, ${constants_1.packageId}::profile::Deposit>`,
+                key: nextVec,
+            });
+            if (profileItem) {
+                amounts.push({
+                    address: getTokenAddress(nextVec),
+                    amount: profileItem.val.collateral_amount,
+                });
+            }
+            nextVec = profileItem === null || profileItem === void 0 ? void 0 : profileItem.next.vec.at(0);
+        }
+        return amounts;
+    });
+}
+exports.getProfileDeposits = getProfileDeposits;
 //# sourceMappingURL=helpers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aries/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAGrC,SAAgB,OAAO,CAAC,WAAmB;IACzC,OAAO,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC;AAFD,0BAEC;AAED,SAAgB,YAAY,CAC1B,WAAsB,EACtB,cAAyB,EACzB,eAA0B,EAC1B,WAAoB;IAEpB,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC;IAClE,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACxE,MAAM,WAAW,GAAG,kBAAkB,CAAC,mBAAmB,GAAG,GAAG,CAAC;IACjE,MAAM,OAAO,GAAG,kBAAkB,CAAC,eAAe,GAAG,GAAG,CAAC;IACzD,MAAM,OAAO,GAAG,kBAAkB,CAAC,eAAe,GAAG,GAAG,CAAC;IAEzD,IAAI,cAAc,CAAC,MAAM,EAAE;QAAE,OAAO,OAAO,CAAC;IAC5C,IAAI,eAAe,CAAC,MAAM,EAAE;QAAE,OAAO,OAAO,CAAC;IAE7C,IAAI,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC/C,MAAM,gBAAgB,GAAG,WAAW,CAAC;QACrC,MAAM,cAAc,GAAG,kBAAkB,CAAC;QAC1C,OAAO,gBAAgB;aACpB,SAAS,CAAC,cAAc,CAAC;aACzB,KAAK,CAAC,WAAW,CAAC;aAClB,QAAQ,EAAE,CAAC;IAChB,CAAC;IACD,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC9D,OAAO,gBAAgB;SACpB,SAAS,CAAC,cAAc,CAAC;SACzB,KAAK,CAAC,OAAO,CAAC;SACd,IAAI,CAAC,WAAW,CAAC;SACjB,QAAQ,EAAE,CAAC;AAChB,CAAC;AA9BD,oCA8BC;AAED,SAAgB,aAAa,CAC3B,WAAsB,EACtB,SAAiB,EACjB,WAAoB;IAEpB,OAAO,IAAA,sBAAS,EAAC,SAAS,CAAC;SACxB,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC;SAC3E,KAAK,CAAC,WAAW,CAAC;SAClB,QAAQ,EAAE,CAAC;AAChB,CAAC;AATD,sCASC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aries/helpers.ts"],"names":[],"mappings":"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"}

package/src/plugins/aries/reservesJob.js

@@ -19,7 +19,7 @@ const constants_1 = require("./constants");
 const helpers_1 = require("./helpers");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const reservesRes = yield axios_1.default
-        .get(`${constants_1.apiUrl}reserve.current`)
+        .get(constants_1.reserveApiUrl)
         .catch(() => null);
     if (!reservesRes)
         return;

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

@@ -1 +1 @@
-{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aries/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,gEAAqC;AACrC,+DAKoC;AAGpC,2CAA8D;AAE9D,uCAAwD;AAExD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,WAAW,GAA0C,MAAM,eAAK;SACnE,GAAG,CAAC,GAAG,kBAAM,iBAAiB,CAAC;SAC/B,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,WAAW;QAAE,OAAO;IACzB,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,KAAK,GAAqB,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAsB,EAAE,CAAC;IAC/C,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACzD,MAAM,eAAe,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,CAC1C,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CACrC,CAAC;QAEF,MAAM,SAAS,GAAG,IAAA,sBAAY,EAC5B,WAAW,EACX,cAAc,EACd,eAAe,EACf,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAElE,MAAM,IAAI,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE;YACzC,eAAe,EAAE,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;YAChE,UAAU,EAAV,sBAAU;YACV,YAAY,EAAE,OAAO,CAAC,GAAG;YACzB,gBAAgB,EAAE,WAAW,CAAC,QAAQ,EAAE;YACxC,YAAY,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,IAAA,yBAAQ,EAAC,UAAU,CAAC,EAAE;YAC5D,WAAW,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAA,yBAAQ,EAAC,SAAS,CAAC,EAAE;SAC1D,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjB,gBAAgB,CAAC,IAAI,iCAAM,OAAO,KAAE,IAAI,IAAG,CAAC;QAE5C,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE;YACpC,MAAM,EAAE,sCAAqB;YAC7B,SAAS,EAAE,0BAAS,CAAC,KAAK;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,uBAAW,EAAE,gBAAgB,EAAE;QAC3C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CACH,CAAC;IAEF,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"reservesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aries/reservesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,gEAAqC;AACrC,+DAKoC;AAGpC,2CAAqE;AAErE,uCAAwD;AAExD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,WAAW,GAA0C,MAAM,eAAK;SACnE,GAAG,CAAC,yBAAa,CAAC;SAClB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,WAAW;QAAE,OAAO;IACzB,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,KAAK,GAAqB,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAsB,EAAE,CAAC;IAC/C,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACzD,MAAM,eAAe,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,CAC1C,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CACrC,CAAC;QAEF,MAAM,SAAS,GAAG,IAAA,sBAAY,EAC5B,WAAW,EACX,cAAc,EACd,eAAe,EACf,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAElE,MAAM,IAAI,GAAG;YACX,QAAQ,EAAE,OAAO,CAAC,GAAG;YACrB,cAAc,EAAE,cAAc,CAAC,QAAQ,EAAE;YACzC,eAAe,EAAE,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;YAChE,UAAU,EAAV,sBAAU;YACV,YAAY,EAAE,OAAO,CAAC,GAAG;YACzB,gBAAgB,EAAE,WAAW,CAAC,QAAQ,EAAE;YACxC,YAAY,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,IAAA,yBAAQ,EAAC,UAAU,CAAC,EAAE;YAC5D,WAAW,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAA,yBAAQ,EAAC,SAAS,CAAC,EAAE;SAC1D,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjB,gBAAgB,CAAC,IAAI,iCAAM,OAAO,KAAE,IAAI,IAAG,CAAC;QAE5C,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE;YACpC,MAAM,EAAE,sCAAqB;YAC7B,SAAS,EAAE,0BAAS,CAAC,KAAK;SAC3B,CAAC,CACH,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,uBAAW,EAAE,gBAAgB,EAAE;QAC3C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CACH,CAAC;IAEF,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -1,41 +1,64 @@
 import { BorrowLendRate } from '@sonarwatch/portfolio-core';
-export type ProfileResponse = {
-    result: {
-        data: ProfileData;
+export type ProfilesSummary = {
+    profile_signers: {
+        data: [
+            {
+                key: string;
+                value: {
+                    account: string;
+                };
+            }
+        ];
     };
 };
-export type ProfileData = {
-    profiles: {
-        [accountName: string]: {
-            id: string;
-            meta: {
-                module: string;
-                owner: string;
-                version: number;
-                timestamp: string;
-            };
-            profileAddress: string;
-            deposits: {
-                [coin: string]: {
-                    collateral_amount: string;
-                    collateral_coins: string;
-                    collateral_value: string;
-                };
-            };
-            borrows: {
-                [coin: string]: {
-                    borrowed_amount: string;
-                    borrowed_coins: string;
-                    borrowed_value: string;
-                };
-            };
-            equity: string;
-            collateralValue: string;
-            loanValue: string;
-            riskFactor: string;
+export type Profile = {
+    borrow_farms: ProfileSub;
+    borrowed_reserves: ProfileSub;
+    deposit_farms: ProfileSub;
+    deposited_reserves: ProfileSub;
+};
+export type ProfileVec = {
+    account_address: string;
+    module_name: string;
+    struct_name: string;
+};
+export type ProfileSub = {
+    head: {
+        vec: ProfileVec[];
+    };
+    inner: {
+        inner: {
+            handle: string;
+        };
+        length: string;
+    };
+    tail: {
+        vec: ProfileVec[];
+    };
+};
+export type ProfileDepositItem = {
+    next: {
+        vec: [ProfileVec] | [];
+    };
+    prev: {
+        vec: [ProfileVec] | [];
+    };
+    val: {
+        collateral_amount: string;
+    };
+};
+export type ProfileBorrowItem = {
+    next: {
+        vec: [ProfileVec] | [];
+    };
+    prev: {
+        vec: [ProfileVec] | [];
+    };
+    val: {
+        borrowed_share: {
+            val: string;
         };
     };
-    total_equity: string;
 };
 export type ReserveResponse = {
     result: {

package/src/plugins/jupiter/pricingJob.js

@@ -22,6 +22,21 @@ const mints = [
     'BANXbTpN8U2cU41FjPxe2Ti37PiT5cCxLUKDQZuJeMMR', // Banx
     '4LLbsb5ReP3yEtYzmXewyGjcir5uXtKFURtaEUVC2AHs', // Parcl
     'SHARKSYJjqaNyxVfrpnBN9pjgkhwDhatnMyicWPnr1s', // Shark
+    'DdFPRnccQqLD4zCHrBqdY95D6hvw6PLWp9DEXj1fLCL9', // Wrapped USDC (Allbridge from Ethereum)
+    'eqKJTf1Do4MDPyKisMYqVaUFpkEFAs3riGF3ceDH2Ca', // Wrapped USDC (Allbridge from Polygon)
+    '8Yv9Jz4z7BUHP68dz8E8m3tMe6NKgpMUKn8KVqrPA6Fr', // Wrapped USDC (Allbridge from Avalanche)
+    'FHfba3ov5P3RjaiLVgh8FTv4oirxQDoVXuoUUDvHuXax', // USDC (Wormhole from Avalanche)
+    'Kz1csQA91WUGcQ2TB3o5kdGmWmMGp8eJcDEyHzNDVCX', // USDT (Wormhole from Avalanche)
+    '9EaLkQrbjmbbuZG9Wdpo8qfNUEjHATJFSycEmw6f1rGX', // pSOL (Parrot SOL)
+    '7dHbWXmci3dT8UFYWYZweBLXgycu7Y3iL6trKn1Y7ARj', // stSOL
+    'Bn113WT6rbdgwrm12UJtnmNqGqZjY4it2WoUQuQopFVn', // Wrapped USDT (Allbridge from Ethereum)
+    'FwEHs3kJEdMa2qZHv7SgzCiFXUQPEycEXksfBkwmS8gj', // Wrapped USDT (Allbridge from Avalanche)
+    '8XSsNvaKU9FDhYWAv7Yc7qSNwuJSzVrXBNEk7AFiWF69', // Wrapped USDC (Allbridge from BSC)
+    'E77cpQ4VncGmcAXX16LHFFzNBEBb2U7Ar7LBmZNfCgwL', // Wrapped USDT (Allbridge from BSC)
+    'EjmyN6qEC1Tf1JxiG1ae7UTJhUxSwk1TCWNWqxWV4J6o', // DAI (Portal from Ethereum)
+    '5RpUwQ8wtdPCZHhu6MERp2RGrpobsbZ6MH5dDHkUjs2', // BUSD Token (Wormhole from BSC)
+    'FCqfQSujuPxy6V42UvafBhsysWtEq1vhjfMN1PUbgaxA', // USD Coin (Wormhole from BSC)
+    '8qJSyQprMC57TWKaYEmetUR3UUiTP2M3hXdcvFhkZdmv', // Tether USD (Wormhole from BSC)
 ];
 const vsToken = portfolio_core_1.solanaNativeWrappedAddress;
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {

package/src/plugins/jupiter/pricingJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,oDAAkD;AAClD,uCAA6C;AAC7C,mDAA2D;AAC3D,0FAAuF;AACvF,iDAAsD;AAEtD,MAAM,KAAK,GAAG;IACZ,8CAA8C,EAAE,uBAAuB;IACvE,6CAA6C,EAAE,YAAY;IAC3D,8CAA8C,EAAE,OAAO;IACvD,8CAA8C,EAAE,QAAQ;IACxD,6CAA6C,EAAE,QAAQ;CACxD,CAAC;AACF,MAAM,OAAO,GAAG,2CAA0B,CAAC;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,CAAC,aAAa;QAAE,OAAO;IAE3B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAwB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACxE,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,MAAM,GAAqB;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ;YACR,EAAE,EAAE,aAAa;YACjB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,EAAE,aAAa,CAAC,KAAK,GAAG,KAAK;YAClC,UAAU,EAAE,gCAAoB,CAAC,EAAE;YACnC,MAAM,EAAE,GAAG;SACZ,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,KAAK,EAAE,WAAW;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,oDAAkD;AAClD,uCAA6C;AAC7C,mDAA2D;AAC3D,0FAAuF;AACvF,iDAAsD;AAEtD,MAAM,KAAK,GAAG;IACZ,8CAA8C,EAAE,uBAAuB;IACvE,6CAA6C,EAAE,YAAY;IAC3D,8CAA8C,EAAE,OAAO;IACvD,8CAA8C,EAAE,QAAQ;IACxD,6CAA6C,EAAE,QAAQ;IACvD,8CAA8C,EAAE,yCAAyC;IACzF,6CAA6C,EAAE,wCAAwC;IACvF,8CAA8C,EAAE,0CAA0C;IAC1F,8CAA8C,EAAE,iCAAiC;IACjF,6CAA6C,EAAE,iCAAiC;IAChF,8CAA8C,EAAE,oBAAoB;IACpE,8CAA8C,EAAE,QAAQ;IACxD,8CAA8C,EAAE,yCAAyC;IACzF,8CAA8C,EAAE,0CAA0C;IAC1F,8CAA8C,EAAE,oCAAoC;IACpF,8CAA8C,EAAE,oCAAoC;IACpF,8CAA8C,EAAE,6BAA6B;IAC7E,6CAA6C,EAAE,iCAAiC;IAChF,8CAA8C,EAAE,+BAA+B;IAC/E,8CAA8C,EAAE,iCAAiC;CAClF,CAAC;AACF,MAAM,OAAO,GAAG,2CAA0B,CAAC;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,CAAC,aAAa;QAAE,OAAO;IAE3B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAwB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACxE,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,MAAM,GAAqB;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ;YACR,EAAE,EAAE,aAAa;YACjB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,EAAE,aAAa,CAAC,KAAK,GAAG,KAAK;YAClC,UAAU,EAAE,gCAAoB,CAAC,EAAE;YACnC,MAAM,EAAE,GAAG;SACZ,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,KAAK,EAAE,WAAW;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/meteora/farmsFetcher.js

@@ -17,27 +17,36 @@ const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const struct_1 = require("./struct");
-const getTokensPricesMap_1 = __importDefault(require("../../utils/misc/getTokensPricesMap"));
 const tokenPriceToAssetTokens_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetTokens"));
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helpers_1 = require("./helpers");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const farmsInfo = yield cache.getItem(constants_1.farmsKey, {
+    const farms = yield cache.getItem(constants_1.farmsKey, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,
     });
-    if (!farmsInfo)
+    if (!farms)
         return [];
-    const farmById = new Map();
+    const farmsById = new Map();
     const farmsMint = [];
-    farmsInfo.forEach((farm) => {
-        farmById.set(farm.pubkey, farm);
+    farms.forEach((farm) => {
+        farmsById.set(farm.pubkey, farm);
         farmsMint.push(farm.pubkey);
     });
     const farmingAccountsAddresses = (0, helpers_1.getStakingAccounts)(owner, farmsMint);
     const farmingAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.farmAccountStruct, farmingAccountsAddresses);
-    const tokenPriceById = yield (0, getTokensPricesMap_1.default)(farmsInfo.map((f) => [f.stakingMint, f.rewardAMint, f.rewardBMint]).flat(), portfolio_core_1.NetworkId.solana, cache);
+    const neededMints = farmingAccounts
+        .map((fA, i) => {
+        if (!fA)
+            return [];
+        const farm = farms.at(i);
+        if (!farm)
+            return [];
+        return [farm.stakingMint, farm.rewardAMint, farm.rewardBMint];
+    })
+        .flat();
+    const tokenPrices = yield cache.getTokenPricesAsMap(neededMints, portfolio_core_1.NetworkId.solana);
     const liquidities = [];
     for (const farmingAccount of farmingAccounts) {
         if (!farmingAccount)
@@ -45,14 +54,14 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const rewardAssets = [];
         const assets = [];
         const { balanceStaked, rewardAPerTokenPending, rewardBPerTokenPending } = farmingAccount;
-        const farmInfo = farmById.get(farmingAccount.pool.toString());
+        const farmInfo = farmsById.get(farmingAccount.pool.toString());
         if (!farmInfo)
             continue;
         const { stakingMint, rewardAMint, rewardBMint } = farmInfo;
         const [poolTokenPrice, rewardATokenPrice, rewardBTokenPrice] = [
-            tokenPriceById.get(stakingMint),
-            tokenPriceById.get(rewardAMint),
-            tokenPriceById.get(rewardBMint),
+            tokenPrices.get(stakingMint),
+            tokenPrices.get(rewardAMint),
+            tokenPrices.get(rewardBMint),
         ];
         if (!poolTokenPrice)
             continue;