@sonarwatch/portfolio-plugins 0.12.34 → 0.12.36

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

@@ -0,0 +1,38 @@
+export type UserDeposit = {
+    userAddress: string;
+    mint: string;
+    lpAmount: string;
+    rewardDebt: string;
+};
+export type Pools = {
+    bridgeAddress: string;
+    swapAddress: string;
+    tokens: TokenPool[];
+};
+export type TokenPool = {
+    apr: string;
+    apr7d: string;
+    apr30d: string;
+    cctpAddress: string;
+    cctpFeeShare: string;
+    decimals: number;
+    feeShare: string;
+    lpRate: string;
+    name: string;
+    poolAddress: string;
+    poolInfo: PoolInfo;
+    symbol: string;
+    tokenAddress: string;
+};
+export type PoolInfo = {
+    aValue: string;
+    accRewardPerShareP: string;
+    dValue: string;
+    p: number;
+    tokenBalance: string;
+    totalLpAmount: string;
+    vUsdBalance: string;
+};
+export type PoolsRes = {
+    SOL: Pools;
+};

package/src/plugins/allbridge/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/src/plugins/allbridge/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/allbridge/types.ts"],"names":[],"mappings":""}

package/src/plugins/aptin/depositsFetcher.js

@@ -83,7 +83,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(coinType, amount, portfolio_core_1.NetworkId.aptos, tokenPrices[address] || undefined));
         borrowedYields.push([]);
     }
-    const { borrowedValue, healthRatio, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs);
+    const { borrowedValue, healthRatio, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({
+        suppliedAssets,
+        borrowedAssets,
+        rewardAssets,
+        suppliedLtvs,
+    });
     const element = {
         type: portfolio_core_1.PortfolioElementType.borrowlend,
         networkId: portfolio_core_1.NetworkId.aptos,

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

@@ -1 +1 @@
-{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aptin/depositsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,gEAAqC;AAGrC,2CAMqB;AAOrB,qGAA6E;AAC7E,iDAAqD;AACrD,6CAA4E;AAE5E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;IAEhC,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAkB,EAC5C,MAAM,EACN,KAAK,EACL,6BAAiB,CAClB,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAC9B,IACE,aAAa,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QACvC,aAAa,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QAEvC,OAAO,EAAE,CAAC;IAEZ,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,OAAO,CAAe,2BAAe,EAAE;QACtE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,KAAK;KAC3B,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,MAAM,eAAe,GACnB,aAAa,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QACrC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,IAAA,2BAAmB,EACvB,MAAM,EACN,aAAa,CAAC,eAAe,CAAC,MAAM,EACpC,aAAa,CAAC,YAAY,EAC1B,qBAAqB,EACrB,8BAAkB,CACnB,CAAC;IACR,MAAM,eAAe,GACnB,aAAa,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QACrC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,MAAM,IAAA,2BAAmB,EACvB,MAAM,EACN,aAAa,CAAC,eAAe,CAAC,MAAM,EACpC,aAAa,CAAC,YAAY,EAC1B,qBAAqB,EACrB,8BAAkB,CACnB,CAAC;IAER,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,eAAe;IACf,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,cAAc,CAC/C,CAAC,GAAG,aAAa,CAAC,YAAY,EAAE,GAAG,aAAa,CAAC,YAAY,CAAC,EAC9D,0BAAS,CAAC,KAAK,CAChB,CAAC;IACF,MAAM,WAAW,GAA+B,EAAE,CAAC;IACnD,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QAC5B,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,WAAW,CAAC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,CAAC,GAAG,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc;YAAE,SAAS;QAC9B,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG;YAAE,SAAS;QAE5C,MAAM,QAAQ,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAA,mCAAkB,EAAC,QAAQ,EAAE,0BAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,MAAM,CAAC;aAChD,GAAG,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;aACnB,QAAQ,EAAE,CAAC;QAEd,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,QAAQ,EACR,MAAM,EACN,0BAAS,CAAC,KAAK,EACf,WAAW,CAAC,OAAO,CAAC,IAAI,SAAS,CAClC,CACF,CAAC;QACF,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc;YAAE,SAAS;QAC9B,IAAI,cAAc,CAAC,MAAM,KAAK,GAAG;YAAE,SAAS;QAE5C,MAAM,QAAQ,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAA,mCAAkB,EAAC,QAAQ,EAAE,0BAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,MAAM,CAAC;aAChD,GAAG,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;aACnB,QAAQ,EAAE,CAAC;QAEd,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,QAAQ,EACR,MAAM,EACN,0BAAS,CAAC,KAAK,EACf,WAAW,CAAC,OAAO,CAAC,IAAI,SAAS,CAClC,CACF,CAAC;QACF,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GACrE,IAAA,wCAAuB,EACrB,cAAc,EACd,cAAc,EACd,YAAY,EACZ,YAAY,CACb,CAAC;IAEJ,MAAM,OAAO,GAAqB;QAChC,IAAI,EAAE,qCAAoB,CAAC,UAAU;QACrC,SAAS,EAAE,0BAAS,CAAC,KAAK;QAC1B,UAAU,EAAV,sBAAU;QACV,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,IAAI,EAAE;YACJ,cAAc;YACd,aAAa;YACb,cAAc;YACd,cAAc;YACd,aAAa;YACb,cAAc;YACd,WAAW;YACX,YAAY;YACZ,WAAW;YACX,KAAK;SACN;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,WAAW;IAC5B,SAAS,EAAE,0BAAS,CAAC,KAAK;IAC1B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"depositsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/aptin/depositsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/aries/depositsFetcher.js

@@ -107,7 +107,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             suppliedAssets.length === 0 &&
             rewardAssets.length === 0)
             continue;
-        const { borrowedValue, suppliedValue, value, rewardValue, healthRatio } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets, suppliedLtvs, borrowedWeights);
+        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,

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/banx/{calculateLoanRepayValue.d.ts → helpers.d.ts}

@@ -2,3 +2,4 @@ import BigNumber from 'bignumber.js';
 import { ParsedAccount } from '../../utils/solana';
 import { BondTradeTransactionV3 } from './types';
 export declare const calculateLoanRepayValue: (acc: ParsedAccount<BondTradeTransactionV3>) => BigNumber;
+export declare const calculateDebtValue: (acc: ParsedAccount<BondTradeTransactionV3>) => BigNumber;

package/src/plugins/banx/{calculateLoanRepayValue.js → helpers.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateLoanRepayValue = void 0;
+exports.calculateDebtValue = exports.calculateLoanRepayValue = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const BONDS = {
     PROGRAM_PUBKEY: '4tdmkuY6EStxbS6Y8s5ueznL3VPMSugrvQuDeAHGZhSt',
@@ -34,4 +34,31 @@ const calculateLoanRepayValue = (acc) => {
     return new bignumber_js_1.default(loanValue).plus(calculatedInterest);
 };
 exports.calculateLoanRepayValue = calculateLoanRepayValue;
-//# sourceMappingURL=calculateLoanRepayValue.js.map
+const getInterestRepaid = (acc) => {
+    const currentLoanValue = Number(acc.solAmount) + Number(acc.feeAmount);
+    return new bignumber_js_1.default(acc.redeemedAt !== '0'
+        ? calculateCurrentInterestSolPure({
+            loanValue: currentLoanValue,
+            startTime: acc.soldAt,
+            currentTime: Number(acc.redeemedAt),
+            rateBasePoints: acc.amountOfBonds,
+        })
+        : 0);
+};
+const calculateDebtValue = (acc) => {
+    const loanValue = Number(acc.solAmount);
+    const calculatedInterest = calculateCurrentInterestSolPure({
+        loanValue,
+        startTime: Number(acc.soldAt),
+        currentTime: Date.now() / 1000,
+        rateBasePoints: Number(acc.amountOfBonds) + BONDS.PROTOCOL_REPAY_FEE,
+    });
+    const repaid = getInterestRepaid(acc);
+    const principal = new bignumber_js_1.default(acc.solAmount);
+    return principal
+        .minus(repaid.toNumber())
+        .plus(calculatedInterest)
+        .plus(Number(acc.feeAmount));
+};
+exports.calculateDebtValue = calculateDebtValue;
+//# sourceMappingURL=helpers.js.map

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

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

package/src/plugins/banx/loansFetcher.js

@@ -22,7 +22,7 @@ const getAssetBatchDas_1 = require("../../utils/solana/das/getAssetBatchDas");
 const heliusAssetToAssetCollectible_1 = require("../../utils/solana/das/heliusAssetToAssetCollectible");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const constants_1 = require("./constants");
-const calculateLoanRepayValue_1 = require("./calculateLoanRepayValue");
+const helpers_1 = require("./helpers");
 const filters_1 = require("./filters");
 const collections = new Map();
 let collectionLastUpdate = 0;
@@ -35,6 +35,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     ]))
         .flat()
         .filter((acc) => acc.bondTradeTransactionState.perpetualActive ||
+        acc.bondTradeTransactionState.perpetualPartialRepaid ||
         acc.bondTradeTransactionState.perpetualRefinancedActive ||
         acc.bondTradeTransactionState.active);
     if (accounts.length === 0)
@@ -78,6 +79,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const bondOffer = bondOffersMap.get(acc.bondOffer);
         if (!fbondTokenMint || !bondOffer || !bondOffer.hadoMarket)
             return;
+        if (!fbondTokenMint.fraktBondState.perpetualActive &&
+            !fbondTokenMint.fraktBondState.active)
+            return;
         const collection = collections.get(bondOffer.hadoMarket);
         if (!collection)
             return;
@@ -98,7 +102,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                         ? {
                             name: collection.collectionName,
                             floorPrice: new bignumber_js_1.default(collection.collectionFloor)
-                                .dividedBy(Math.pow(10, tokenPrice.decimals))
+                                .dividedBy(Math.pow(10, 9))
                                 .multipliedBy(solTokenPrice.price)
                                 .toNumber(),
                         }
@@ -106,13 +110,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 });
             }
         }
-        const solAsset = (0, tokenPriceToAssetToken_1.default)(tokenPrice.address, (0, calculateLoanRepayValue_1.calculateLoanRepayValue)(acc)
-            .dividedBy(Math.pow(10, tokenPrice.decimals))
-            .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice);
         const name = `Active Loan`;
         if (acc.user === owner.toString()) {
             // LENDER
-            suppliedAssets.push(solAsset);
+            suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, (0, helpers_1.calculateLoanRepayValue)(acc)
+                .dividedBy(Math.pow(10, tokenPrice.decimals))
+                .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
             if (mintAsset)
                 borrowedAssets.push(mintAsset);
         }
@@ -120,10 +123,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             // BORROWER
             if (mintAsset)
                 suppliedAssets.push(mintAsset);
-            borrowedAssets.push(solAsset);
+            borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, (0, helpers_1.calculateDebtValue)(acc)
+                .dividedBy(Math.pow(10, tokenPrice.decimals))
+                .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
         }
         if (suppliedAssets.length > 0) {
-            const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, []);
+            const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({
+                suppliedAssets,
+                borrowedAssets,
+                rewardAssets: [],
+            });
             elements.push({
                 networkId: portfolio_core_1.NetworkId.solana,
                 label: 'Lending',

package/src/plugins/banx/loansFetcher.js.map

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

package/src/plugins/banx/offersFetcher.js

@@ -64,7 +64,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             .dividedBy(Math.pow(10, tokenPrice.decimals))
             .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
         const name = `${Number(acc.buyOrdersQuantity) > 1 ? `${acc.buyOrdersQuantity} ` : ''}Lend Offer${Number(acc.buyOrdersQuantity) > 1 ? 's' : ''} on ${collection.collectionName}`;
-        const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, []);
+        const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({
+            suppliedAssets,
+            borrowedAssets,
+            rewardAssets: [],
+        });
         if (suppliedValue && suppliedValue > 0)
             elements.push({
                 networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/banx/offersFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"offersFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/banx/offersFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"offersFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/banx/offersFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,gEAAqC;AAGrC,iDAAsD;AACtD,+CAI4B;AAC5B,qGAA6E;AAC7E,2CAOqB;AAGrB,MAAM,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;AACvD,IAAI,oBAAoB,GAAG,CAAC,CAAC;AAE7B,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,CACf,MAAM,IAAA,qCAA4B,EAAc,UAAU,EAAE,uBAAW,EAAE;QACvE;YACE,QAAQ,EAAE,6BAAiB;SAC5B;QACD;YACE,MAAM,EAAE;gBACN,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,GAAG;aACZ;SACF;KACF,CAAC,CACH,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,KAAK,GAAG,CAAC,CAAC;IACjD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,CAAC,uBAAc,EAAE,oCAAmB,CAAC,EACrC,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,IAAI,oBAAoB,GAAG,qCAAyB,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QAClE,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,OAAO,CACxC,+BAAmB,EACnB;YACE,MAAM,EAAE,uBAAW;YACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CACF,CAAC;QACF,IAAI,cAAc,EAAE,CAAC;YACnB,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC5B,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;QACL,CAAC;QACD,oBAAoB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACvB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,UAAU;YACxD,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,uBAAc,CAAC;YACjC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,oCAAmB,CAAC,CAAC;QAEzC,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,IAAI,sBAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC;aACtC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aACpC,QAAQ,EAAE,EACb,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,GACX,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,EACpE,aAAa,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OACvD,UAAU,CAAC,cACb,EAAE,CAAC;QAEH,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,GAC9D,IAAA,wCAAuB,EAAC;YACtB,cAAc;YACd,cAAc;YACd,YAAY,EAAE,EAAE;SACjB,CAAC,CAAC;QAEL,IAAI,aAAa,IAAI,aAAa,GAAG,CAAC;YACpC,QAAQ,CAAC,IAAI,CAAC;gBACZ,SAAS,EAAE,0BAAS,CAAC,MAAM;gBAC3B,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAV,sBAAU;gBACV,IAAI,EAAE,qCAAoB,CAAC,UAAU;gBACrC,KAAK,EAAE,aAAa;gBACpB,IAAI;gBACJ,IAAI,EAAE;oBACJ,cAAc;oBACd,aAAa;oBACb,cAAc,EAAE,EAAE;oBAClB,cAAc;oBACd,aAAa;oBACb,cAAc,EAAE,EAAE;oBAClB,YAAY,EAAE,EAAE;oBAChB,WAAW;oBACX,WAAW;oBACX,KAAK,EAAE,aAAa;iBACrB;aACF,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/bucket/collateralFetcher.js

@@ -57,7 +57,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             .toNumber();
         borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(constants_1.buckId, borrowedQuantity, portfolio_core_1.NetworkId.sui, buckPrice));
         suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(collateral.tokenId, suppliedQuantity, portfolio_core_1.NetworkId.sui, tokenPrice));
-        const { borrowedValue, healthRatio, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, healthRatio, suppliedValue, value, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({ suppliedAssets, borrowedAssets, rewardAssets });
         const element = {
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.sui,

package/src/plugins/bucket/collateralFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bucket/collateralFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collateralFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bucket/collateralFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAOoC;AACpC,gEAAqC;AAGrC,2CAA8D;AAC9D,iDAAmD;AAEnD,qGAA6E;AAC7E,iFAA8E;AAE9E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,kBAAM,EAAE,0BAAS,CAAC,GAAG,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAuB,EAAE,CAAC;IAExC,KAAK,MAAM,UAAU,IAAI,uBAAW,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG;YACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,KAAK;aACb;SACF,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,IAAA,6CAAqB,EAC9C,MAAM,EACN,KAAK,CACN,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,IAAI;YAAE,SAAS;QAEjC,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAC1C,UAAU,CAAC,OAAO,EAClB,0BAAS,CAAC,GAAG,CACd,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,cAAc,GAClB,MAAA,YAAY,CAAC,IAAI,CAAC,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAC9D,IAAI,CAAC,cAAc;YAAE,SAAS;QAC9B,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,iBAAiB,CAAC;aACrE,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aACpC,QAAQ,EAAE,CAAC;QACd,IAAI,gBAAgB,KAAK,CAAC;YAAE,SAAS;QACrC,MAAM,gBAAgB,GAAG,IAAI,sBAAS,CAAC,cAAc,CAAC,WAAW,CAAC;aAC/D,SAAS,CAAC,SAAA,EAAE,EAAI,SAAS,CAAC,QAAQ,CAAA,CAAC;aACnC,QAAQ,EAAE,CAAC;QAEd,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EAAC,kBAAM,EAAE,gBAAgB,EAAE,0BAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAC3E,CAAC;QAEF,cAAc,CAAC,IAAI,CACjB,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,gBAAgB,EAChB,0BAAS,CAAC,GAAG,EACb,UAAU,CACX,CACF,CAAC;QAEF,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,GACrE,IAAA,wCAAuB,EAAC,EAAE,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,CAAC;QAE5E,MAAM,OAAO,GAAqB;YAChC,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,SAAS;YAChB,KAAK;YACL,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,WAAW;gBACX,YAAY;gBACZ,WAAW;gBACX,KAAK;aACN;SACF,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/citrus/loansFetcher.js

@@ -92,10 +92,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 name = `Lend Offer on ${collection.name}`;
             }
             else if (acc.status.active || acc.status.onSale) {
-                name = `Active Loan on ${collection.name}`;
+                name = `Active Loan`;
             }
             else if (acc.status.defaulted) {
-                name = `Defaulted Loan on ${collection.name}`;
+                name = `Defaulted Loan`;
             }
         }
         else {
@@ -105,17 +105,21 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             }
             borrowedAssets.push(solAsset);
             if (acc.status.waitingForLender) {
-                name = `Borrow Offer on ${collection.name}`;
+                name = `Borrow Offer`;
             }
             else if (acc.status.active || acc.status.onSale) {
-                name = `Active Loan on ${collection.name}`;
+                name = `Active Loan`;
             }
             else if (acc.status.defaulted) {
-                name = `Expired Loan on ${collection.name}`;
+                name = `Expired Loan`;
             }
         }
         if (suppliedAssets.length > 0) {
-            const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, []);
+            const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({
+                suppliedAssets,
+                borrowedAssets,
+                rewardAssets: [],
+            });
             elements.push({
                 networkId: portfolio_core_1.NetworkId.solana,
                 label: 'Lending',
@@ -134,6 +138,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                     rewardValue,
                     healthRatio,
                     value: suppliedValue,
+                    expireOn: acc.status.active || acc.status.onSale
+                        ? Number(acc.startTime) + Number(acc.loanTerms.duration)
+                        : undefined,
                 },
             });
         }

package/src/plugins/citrus/loansFetcher.js.map

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

package/src/plugins/clone/depositsFetcher.js

@@ -57,7 +57,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
-        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({ suppliedAssets, borrowedAssets, rewardAssets });
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -100,7 +100,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
     }
     if (suppliedAssets.length !== 0 && borrowedAssets.length !== 0) {
-        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({ suppliedAssets, borrowedAssets, rewardAssets });
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,

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

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

package/src/plugins/compound/getPositionsV2Fetcher.js

@@ -93,7 +93,7 @@ function getPositionsV2Fetcher(networkId, platformId) {
         }
         if (borrowedAssets.length === 0 && suppliedAssets.length === 0)
             return [];
-        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({ suppliedAssets, borrowedAssets, rewardAssets });
         return [
             {
                 type: portfolio_core_1.PortfolioElementType.borrowlend,

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

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

package/src/plugins/compound/getPositionsV3Fetcher.js

@@ -120,7 +120,11 @@ function getPositionsV3Fetcher(networkId) {
                 suppliedAssets.length === 0 &&
                 rewardAssets.length === 0)
                 continue;
-            const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+            const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({
+                suppliedAssets,
+                borrowedAssets,
+                rewardAssets,
+            });
             elements.push({
                 type: portfolio_core_1.PortfolioElementType.borrowlend,
                 networkId,

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

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

package/src/plugins/drift/depositsFetcher.d.ts

@@ -0,0 +1,3 @@
+import { Fetcher } from '../../Fetcher';
+declare const fetcher: Fetcher;
+export default fetcher;

package/src/plugins/drift/{deposits.js → depositsFetcher.js}

@@ -133,15 +133,15 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                     .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
                 borrowedYields.push([
                     {
-                        apr: spotMarket.borrowApr,
-                        apy: (0, portfolio_core_1.aprToApy)(spotMarket.borrowApr),
+                        apr: -spotMarket.borrowApr,
+                        apy: -(0, portfolio_core_1.aprToApy)(spotMarket.borrowApr),
                     },
                 ]);
             }
         }
         if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
             continue;
-        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
+        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({ suppliedAssets, borrowedAssets, rewardAssets });
         elements.push({
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             networkId: portfolio_core_1.NetworkId.solana,
@@ -171,4 +171,4 @@ const fetcher = {
     executor,
 };
 exports.default = fetcher;
-//# sourceMappingURL=deposits.js.map
+//# sourceMappingURL=depositsFetcher.js.map

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

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

package/src/plugins/drift/index.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.airdropFetcher = exports.fetchers = exports.jobs = exports.platforms = void 0;
 const constants_1 = require("./constants");
 const spotMarketsJob_1 = __importDefault(require("./spotMarketsJob"));
-const deposits_1 = __importDefault(require("./deposits"));
+const depositsFetcher_1 = __importDefault(require("./depositsFetcher"));
 const premarketJob_1 = __importDefault(require("./premarketJob"));
 const airdropFetcher_1 = __importDefault(require("./airdropFetcher"));
 exports.platforms = [constants_1.platform];
 exports.jobs = [spotMarketsJob_1.default, premarketJob_1.default];
-exports.fetchers = [deposits_1.default, airdropFetcher_1.default];
+exports.fetchers = [depositsFetcher_1.default, airdropFetcher_1.default];
 var helpersAirdrop_1 = require("./helpersAirdrop");
 Object.defineProperty(exports, "airdropFetcher", { enumerable: true, get: function () { return helpersAirdrop_1.airdropFetcher; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,sEAA8C;AAC9C,0DAA8C;AAC9C,kEAA0C;AAC1C,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,wBAAc,EAAE,sBAAY,CAAC,CAAC;AAC7C,QAAA,QAAQ,GAAc,CAAC,kBAAoB,EAAE,wBAAc,CAAC,CAAC;AAC1E,mDAAkD;AAAzC,gHAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,sEAA8C;AAC9C,wEAAgD;AAChD,kEAA0C;AAC1C,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,wBAAc,EAAE,sBAAY,CAAC,CAAC;AAC7C,QAAA,QAAQ,GAAc,CAAC,yBAAe,EAAE,wBAAc,CAAC,CAAC;AACrE,mDAAkD;AAAzC,gHAAA,cAAc,OAAA"}