@sonarwatch/portfolio-plugins 0.14.132 → 0.14.133

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.14.133](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.132...plugins-0.14.133) (2025-02-27)
+
+
+
 ## [0.14.132](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.131...plugins-0.14.132) (2025-02-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.14.132",
+  "version": "0.14.133",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "peerDependencies": {

package/src/plugins/citrus/loansFetcher.js

@@ -17,20 +17,16 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const getAssetBatchDas_1 = require("../../utils/solana/das/getAssetBatchDas");
-const getSolanaDasEndpoint_1 = __importDefault(require("../../utils/clients/getSolanaDasEndpoint"));
-const heliusAssetToAssetCollectible_1 = require("../../utils/solana/das/heliusAssetToAssetCollectible");
 const filters_1 = require("./filters");
 const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
 const arrayToMap_1 = require("../../utils/misc/arrayToMap");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const collectionsMemo = new MemoizedCache_1.MemoizedCache(constants_1.collectionsCacheKey, {
     prefix: constants_1.cachePrefix,
     networkId: portfolio_core_1.NetworkId.solana,
 }, (arr) => (0, arrayToMap_1.arrayToMap)(arr || [], 'id'));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const dasUrl = (0, getSolanaDasEndpoint_1.default)();
     const [filterA, filterB] = (0, filters_1.getLoanFilters)(owner);
     const allAccounts = (yield Promise.all([
         (0, solana_1.getAutoParsedProgramAccounts)(connection, constants_1.citrusIdlItem, filterA),
@@ -40,47 +36,44 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     );
     if (accounts.length === 0)
         return [];
-    const [solTokenPrice, heliusAssets, collections] = yield Promise.all([
+    const [solTokenPrice, collections] = yield Promise.all([
         cache.getTokenPrice(portfolio_core_1.solanaNativeAddress, portfolio_core_1.NetworkId.solana),
-        (0, getAssetBatchDas_1.getAssetBatchDasAsMap)(dasUrl, accounts
-            .map((acc) => acc.mint)
-            .filter((mint) => mint && mint !== '11111111111111111111111111111111')),
         collectionsMemo.getItem(cache),
     ]);
-    if (!solTokenPrice || !collections)
-        return [];
-    const elements = [];
+    if (!collections)
+        throw new Error('Collections not cached');
+    if (!solTokenPrice)
+        throw new Error('Sol price not cached');
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
     accounts.forEach((acc) => {
         const collection = collections.get(acc.collectionConfig);
         if (!collection)
             return;
-        const borrowedAssets = [];
-        const suppliedAssets = [];
+        const element = elementRegistry.addElementBorrowlend({
+            label: 'Lending',
+            ref: acc.pubkey,
+        });
         let mintAsset = null;
         if (acc.mint && acc.mint !== '11111111111111111111111111111111') {
-            const heliusAsset = heliusAssets.get(acc.mint);
-            if (heliusAsset) {
-                const assetValue = new bignumber_js_1.default(collection.floor)
-                    .multipliedBy(solTokenPrice.price)
-                    .toNumber();
-                mintAsset = (0, heliusAssetToAssetCollectible_1.heliusAssetToAssetCollectible)(heliusAsset, {
-                    tags: [portfolio_core_1.collectibleFreezedTag],
-                    collection: {
-                        name: collection.name,
-                        floorPrice: assetValue,
-                    },
-                });
-            }
+            mintAsset = {
+                address: acc.mint,
+                collection: {
+                    name: collection.name,
+                    floorPrice: new bignumber_js_1.default(collection.floor).multipliedBy(solTokenPrice.price),
+                },
+                attributes: { tags: [portfolio_core_1.collectibleFreezedTag] },
+            };
         }
-        const solAsset = (0, tokenPriceToAssetToken_1.default)(portfolio_core_1.solanaNativeAddress, new bignumber_js_1.default(acc.ltvTerms ? acc.ltvTerms.maxOffer : acc.loanTerms.principal)
-            .dividedBy(Math.pow(10, portfolio_core_1.solanaNativeDecimals))
-            .toNumber(), portfolio_core_1.NetworkId.solana, solTokenPrice);
+        const solAsset = {
+            address: portfolio_core_1.solanaNativeAddress,
+            amount: new bignumber_js_1.default(acc.ltvTerms ? acc.ltvTerms.maxOffer : acc.loanTerms.principal),
+        };
         let name;
         if (acc.lender === owner.toString()) {
             // LENDER
-            suppliedAssets.push(solAsset);
+            element.addSuppliedAsset(solAsset);
             if (mintAsset)
-                borrowedAssets.push(mintAsset);
+                element.addBorrowedCollectibleAsset(mintAsset);
             if (acc.status.waitingForBorrower) {
                 name = `Lend Offer on ${collection.name}`;
             }
@@ -93,10 +86,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }
         else {
             // BORROWER
-            if (mintAsset) {
-                suppliedAssets.push(mintAsset);
-            }
-            borrowedAssets.push(solAsset);
+            element.addBorrowedAsset(solAsset);
+            if (mintAsset)
+                element.addSuppliedCollectibleAsset(mintAsset);
             if (acc.status.waitingForLender) {
                 name = `Borrow Offer`;
             }
@@ -107,39 +99,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 name = `Expired Loan`;
             }
         }
-        if (suppliedAssets.length > 0) {
-            const { borrowedValue, suppliedValue, rewardValue, value } = (0, portfolio_core_1.getElementNFTLendingValues)({
-                suppliedAssets,
-                borrowedAssets,
-                rewardAssets: [],
-                lender: acc.lender === owner.toString(),
-            });
-            elements.push({
-                networkId: portfolio_core_1.NetworkId.solana,
-                label: 'Lending',
-                platformId: constants_1.platformId,
-                type: portfolio_core_1.PortfolioElementType.borrowlend,
-                value,
-                name,
-                data: {
-                    borrowedAssets,
-                    borrowedValue,
-                    borrowedYields: [],
-                    suppliedAssets,
-                    suppliedValue,
-                    suppliedYields: [],
-                    rewardAssets: [],
-                    rewardValue,
-                    healthRatio: null,
-                    value,
-                    expireOn: acc.status.active || acc.status.onSale
-                        ? (Number(acc.startTime) + Number(acc.loanTerms.duration)) * 1000
-                        : undefined,
-                },
-            });
-        }
+        if (name)
+            element.setName(name);
+        element.setFixedTerms(acc.lender === owner.toString(), acc.status.active || acc.status.onSale
+            ? (Number(acc.startTime) + Number(acc.loanTerms.duration)) * 1000
+            : undefined);
     });
-    return elements;
+    return elementRegistry.getElements(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-loans`,

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":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AAErC,2CAKqB;AAErB,iDAAsD;AAEtD,+CAAkE;AAClE,uCAA2C;AAC3C,kEAA+D;AAC/D,4DAAyD;AACzD,gFAA6E;AAG7E,MAAM,eAAe,GAAG,IAAI,6BAAa,CAIvC,+BAAmB,EACnB;IACE,MAAM,EAAE,uBAAW;IACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,GAAG,IAAI,EAAE,EAAE,IAAI,CAAC,CACrC,CAAC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAA,wBAAc,EAAC,KAAK,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,CAClB,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,qCAA4B,EAAO,UAAU,EAAE,yBAAa,EAAE,OAAO,CAAC;QACtE,IAAA,qCAA4B,EAAO,UAAU,EAAE,yBAAa,EAAE,OAAO,CAAC;KACvE,CAAC,CACH,CAAC,IAAI,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB;KAC/C,CAAC;IAEF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrD,KAAK,CAAC,aAAa,CAAC,oCAAmB,EAAE,0BAAS,CAAC,MAAM,CAAC;QAC1D,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC;KAC/B,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAE5D,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACvB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACzD,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,OAAO,GAAG,eAAe,CAAC,oBAAoB,CAAC;YACnD,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,GAAG,CAAC,MAAM;SAChB,CAAC,CAAC;QAEH,IAAI,SAAS,GAA2C,IAAI,CAAC;QAC7D,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,kCAAkC,EAAE,CAAC;YAChE,SAAS,GAAG;gBACV,OAAO,EAAE,GAAG,CAAC,IAAI;gBACjB,UAAU,EAAE;oBACV,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,UAAU,EAAE,IAAI,sBAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,YAAY,CACtD,aAAa,CAAC,KAAK,CACpB;iBACF;gBACD,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,sCAAqB,CAAC,EAAE;aAC9C,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,oCAAmB;YAC5B,MAAM,EAAE,IAAI,sBAAS,CACnB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAC/D;SACF,CAAC;QAEF,IAAI,IAAI,CAAC;QACT,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpC,SAAS;YACT,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,SAAS;gBAAE,OAAO,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;YAE9D,IAAI,GAAG,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAClC,IAAI,GAAG,iBAAiB,UAAU,CAAC,IAAI,EAAE,CAAC;YAC5C,CAAC;iBAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClD,IAAI,GAAG,aAAa,CAAC;YACvB,CAAC;iBAAM,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBAChC,IAAI,GAAG,gBAAgB,CAAC;YAC1B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,WAAW;YACX,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,SAAS;gBAAE,OAAO,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;YAE9D,IAAI,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAChC,IAAI,GAAG,cAAc,CAAC;YACxB,CAAC;iBAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClD,IAAI,GAAG,aAAa,CAAC;YACvB,CAAC;iBAAM,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBAChC,IAAI,GAAG,cAAc,CAAC;YACxB,CAAC;QACH,CAAC;QAED,IAAI,IAAI;YAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhC,OAAO,CAAC,aAAa,CACnB,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,QAAQ,EAAE,EAC/B,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM;YACpC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI;YACjE,CAAC,CAAC,SAAS,CACd,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/debridge/dlmmVaultsFetcher.js

@@ -57,6 +57,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const vestingElement = registry.addElementMultiple({
         label: 'Vesting',
         link: 'https://debridge.foundation/lfg',
+        name: 'Alpha Vault',
     });
     for (const escrow of accounts) {
         const vault = vaults[escrow.dlmmVault.toString()];

package/src/plugins/debridge/dlmmVaultsFetcher.js.map

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

package/src/plugins/jupiter/exchange/valueAverageFetcher.js

@@ -51,7 +51,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             type: portfolio_core_1.PortfolioElementType.trade,
             networkId: portfolio_core_1.NetworkId.solana,
             platformId: constants_1.platformId,
-            label: 'DCA',
+            label: 'SmartDCA',
             data: {
                 assets: {
                     input: inputAsset,

package/src/plugins/jupiter/exchange/valueAverageFetcher.js.map

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

package/src/plugins/rain/banksFetcher.js

@@ -0,0 +1,47 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const structs_1 = require("./structs");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const accounts = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.bankStruct, constants_1.bankProgramId)
+        .addFilter('accountDiscriminator', [142, 49, 166, 242, 50, 66, 97, 188])
+        .addFilter('owner', new web3_js_1.PublicKey(owner))
+        .run();
+    if (!accounts.length)
+        return [];
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    accounts.forEach((account) => {
+        const element = elementRegistry.addElementMultiple({
+            label: 'Deposit',
+            name: 'Vault',
+            ref: account.pubkey,
+        });
+        element.addAsset({
+            address: account.mint,
+            amount: account.availableLiquidity,
+        });
+    });
+    return elementRegistry.getElements(cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-banks`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=banksFetcher.js.map

package/src/plugins/rain/banksFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"banksFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/banksFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,2CAAwD;AACxD,iDAAsD;AACtD,kEAA+D;AAC/D,gFAA6E;AAC7E,uCAAuC;AAEvC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAU,EAAE,yBAAa,CAAC;SACtE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;SACvE,SAAS,CAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SACxC,GAAG,EAAE,CAAC;IAET,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACjD,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,OAAO,CAAC,MAAM;SACpB,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,MAAM,EAAE,OAAO,CAAC,kBAAkB;SACnC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/rain/collectionsJob.js

@@ -8,17 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
-const helpers_1 = require("./helpers");
-const pick_1 = require("../../utils/misc/pick");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const collections = yield (0, helpers_1.getCollections)();
-    const filteredCollections = collections
-        .filter((c) => !c.isDefi)
-        .map((c) => (0, pick_1.pick)(c, ['collectionId', 'name', 'floorPrice']));
-    yield cache.setItem(constants_1.collectionsKey, filteredCollections, {
+    const getCollectionsRes = yield axios_1.default.get(`${constants_1.rainApiV3}collection/collections`);
+    if (!getCollectionsRes || !getCollectionsRes.data)
+        throw new Error('No collections');
+    const { collections } = getCollectionsRes.data;
+    yield cache.setItem(constants_1.collectionsKey, collections, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,
     });

package/src/plugins/rain/collectionsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectionsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/collectionsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAyD;AACzD,uCAA2C;AAC3C,gDAA6C;AAG7C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,GAAE,CAAC;IAC3C,MAAM,mBAAmB,GAAG,WAAW;SACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACxB,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,EAAE,YAAY,CAAC,CAAqB,CAC3E,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,mBAAmB,EAAE;QACvD,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"collectionsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/collectionsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAG7C,2CAAoE;AAGpE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,iBAAiB,GACrB,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,qBAAS,wBAAwB,CAAC,CAAC;IACxD,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,IAAI;QAC/C,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC;IAE/C,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,WAAW,EAAE;QAC/C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/rain/constants.d.ts

@@ -2,8 +2,13 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
+import { MemoizedCache } from '../../utils/misc/MemoizedCache';
+import { Collection } from './types';
 export declare const platformId = "rain";
 export declare const platform: Platform;
-export declare const programId: PublicKey;
-export declare const rainApi = "https://api-v2.rain.fi";
+export declare const nftLendingProgramId: PublicKey;
+export declare const defiLendingProgramId: PublicKey;
+export declare const bankProgramId: PublicKey;
+export declare const rainApiV3 = "https://api-v3.rain.fi/api/";
 export declare const collectionsKey = "collections";
+export declare const collectionsMemo: MemoizedCache<Collection[], Collection[]>;

package/src/plugins/rain/constants.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectionsKey = exports.rainApi = exports.programId = exports.platform = exports.platformId = void 0;
+exports.collectionsMemo = exports.collectionsKey = exports.rainApiV3 = exports.bankProgramId = exports.defiLendingProgramId = exports.nftLendingProgramId = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
 exports.platformId = 'rain';
 exports.platform = {
     id: exports.platformId,
@@ -11,7 +13,13 @@ exports.platform = {
     website: 'https://rain.fi/',
     twitter: 'https://twitter.com/RainFi_',
 };
-exports.programId = new web3_js_1.PublicKey('RainEraPU5yDoJmTrHdYynK9739GkEfDsE4ffqce2BR');
-exports.rainApi = 'https://api-v2.rain.fi';
+exports.nftLendingProgramId = new web3_js_1.PublicKey('rNfTQD84kwMbcRpWpLR92BVmxbuwrZc3o5HTauAZiXs');
+exports.defiLendingProgramId = new web3_js_1.PublicKey('rDeFiHPjHZRLiz4iBzMw3zv6unZs4VwdU6qQcVd3NSK');
+exports.bankProgramId = new web3_js_1.PublicKey('rain2M5b9GeFCk792swkwUu51ZihHJb3SUQ8uHxSRJf');
+exports.rainApiV3 = 'https://api-v3.rain.fi/api/';
 exports.collectionsKey = 'collections';
+exports.collectionsMemo = new MemoizedCache_1.MemoizedCache(exports.collectionsKey, {
+    prefix: exports.platformId,
+    networkId: portfolio_core_1.NetworkId.solana,
+});
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,SAAS,EAAE,sCAAsC;IAC9D,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,6BAA6B;CACvC,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,OAAO,GAAG,wBAAwB,CAAC;AACnC,QAAA,cAAc,GAAG,aAAa,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,+DAAiE;AACjE,kEAA+D;AAGlD,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,SAAS,EAAE,sCAAsC;IAC9D,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,6BAA6B;CACvC,CAAC;AAEW,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,6CAA6C,CAC9C,CAAC;AACW,QAAA,oBAAoB,GAAG,IAAI,mBAAS,CAC/C,6CAA6C,CAC9C,CAAC;AACW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,SAAS,GAAG,6BAA6B,CAAC;AAE1C,QAAA,cAAc,GAAG,aAAa,CAAC;AAE/B,QAAA,eAAe,GAAG,IAAI,6BAAa,CAAe,sBAAc,EAAE;IAC7E,MAAM,EAAE,kBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC"}

package/src/plugins/rain/defiBorrowsFetcher.d.ts

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

package/src/plugins/rain/defiBorrowsFetcher.js

@@ -0,0 +1,52 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const loans = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.defiLoanStruct, constants_1.defiLendingProgramId)
+        .addFilter('accountDiscriminator', [20, 195, 70, 117, 165, 227, 182, 1])
+        .addFilter('borrower', new web3_js_1.PublicKey(owner))
+        .run();
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    loans.forEach((loan) => {
+        if (loan.status !== structs_1.LoanStatus.Ongoing)
+            return;
+        const element = elementRegistry.addElementBorrowlend({
+            label: 'Lending',
+            ref: loan.pubkey,
+            link: `https://app.rain.fi/dashboard/loans?address=${loan.pubkey}`,
+        });
+        element.setFixedTerms(false, loan.expiredAt.multipliedBy(1000));
+        element.addSuppliedAsset({
+            address: loan.collateral,
+            amount: loan.collateralAmount,
+        });
+        element.addBorrowedAsset({
+            address: loan.principal,
+            amount: loan.borrowedAmount,
+        });
+    });
+    return elementRegistry.getElements(cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-defi-borrows`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=defiBorrowsFetcher.js.map

package/src/plugins/rain/defiBorrowsFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defiBorrowsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/defiBorrowsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,2CAA+D;AAC/D,iDAAsD;AACtD,gFAA6E;AAC7E,kEAA+D;AAC/D,uCAAuD;AAEvD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,KAAK,GAAG,MAAM,qBAAS,CAAC,KAAK,CACjC,MAAM,EACN,wBAAc,EACd,gCAAoB,CACrB;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;SACvE,SAAS,CAAC,UAAU,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC3C,GAAG,EAAE,CAAC;IAET,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,IAAI,CAAC,MAAM,KAAK,oBAAU,CAAC,OAAO;YAAE,OAAO;QAE/C,MAAM,OAAO,GAAG,eAAe,CAAC,oBAAoB,CAAC;YACnD,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,IAAI,CAAC,MAAM;YAChB,IAAI,EAAE,+CAA+C,IAAI,CAAC,MAAM,EAAE;SACnE,CAAC,CAAC;QAEH,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhE,OAAO,CAAC,gBAAgB,CAAC;YACvB,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,MAAM,EAAE,IAAI,CAAC,gBAAgB;SAC9B,CAAC,CAAC;QAEH,OAAO,CAAC,gBAAgB,CAAC;YACvB,OAAO,EAAE,IAAI,CAAC,SAAS;YACvB,MAAM,EAAE,IAAI,CAAC,cAAc;SAC5B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,eAAe;IAChC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/rain/index.js

@@ -5,10 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = exports.platforms = void 0;
 const constants_1 = require("./constants");
-const poolsFetcher_1 = __importDefault(require("./poolsFetcher"));
-const loansFetcher_1 = __importDefault(require("./loansFetcher"));
 const collectionsJob_1 = __importDefault(require("./collectionsJob"));
+const poolsFetcher_1 = __importDefault(require("./poolsFetcher"));
+const banksFetcher_1 = __importDefault(require("./banksFetcher"));
+const defiBorrowsFetcher_1 = __importDefault(require("./defiBorrowsFetcher"));
+const nftBorrowsFetcher_1 = __importDefault(require("./nftBorrowsFetcher"));
 exports.platforms = [constants_1.platform];
 exports.jobs = [collectionsJob_1.default];
-exports.fetchers = [poolsFetcher_1.default, loansFetcher_1.default];
+exports.fetchers = [
+    defiBorrowsFetcher_1.default,
+    nftBorrowsFetcher_1.default,
+    poolsFetcher_1.default,
+    banksFetcher_1.default,
+];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,kEAA0C;AAC1C,kEAA0C;AAC1C,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,wBAAc,CAAC,CAAC;AAC/B,QAAA,QAAQ,GAAc,CAAC,sBAAY,EAAE,sBAAY,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/rain/index.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAuC;AACvC,sEAA8C;AAC9C,kEAA0C;AAC1C,kEAA0C;AAC1C,8EAAsD;AACtD,4EAAoD;AAEvC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,wBAAc,CAAC,CAAC;AAC/B,QAAA,QAAQ,GAAc;IACjC,4BAAkB;IAClB,2BAAiB;IACjB,sBAAY;IACZ,sBAAY;CACb,CAAC"}

package/src/plugins/rain/nftBorrowsFetcher.d.ts

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

package/src/plugins/rain/nftBorrowsFetcher.js

@@ -0,0 +1,76 @@
+"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 });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const loans = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.nftLoanStruct, constants_1.nftLendingProgramId)
+        .addFilter('accountDiscriminator', [20, 195, 70, 117, 165, 227, 182, 1])
+        .addFilter('borrower', new web3_js_1.PublicKey(owner))
+        .run();
+    if (!loans.length)
+        return [];
+    const [collections, solTokenPrice] = yield Promise.all([
+        constants_1.collectionsMemo.getItem(cache),
+        cache.getTokenPrice(portfolio_core_1.solanaNativeAddress, portfolio_core_1.NetworkId.solana),
+    ]);
+    if (!collections.length)
+        throw new Error('Collections not cached');
+    if (!solTokenPrice)
+        throw new Error('Sol price not cached');
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    loans.forEach((loan) => {
+        if (loan.status !== structs_1.LoanStatus.Ongoing)
+            return;
+        const collection = collections.find((c) => c.collectionId === loan.collection);
+        if (!collection)
+            return;
+        const element = elementRegistry.addElementBorrowlend({
+            label: 'Lending',
+            ref: loan.pubkey,
+            link: `https://app.rain.fi/dashboard/loans?address=${loan.pubkey}`,
+        });
+        element.setFixedTerms(false, loan.expiredAt.multipliedBy(1000));
+        element.addSuppliedCollectibleAsset({
+            address: loan.collateral.toString(),
+            collection: {
+                name: collection.name,
+                floorPrice: new bignumber_js_1.default(collection.floorPrice)
+                    .shiftedBy(-solTokenPrice.decimals)
+                    .multipliedBy(solTokenPrice.price),
+                imageUri: collection.metadata.thumbnail,
+            },
+            attributes: { tags: [portfolio_core_1.collectibleFreezedTag] },
+        });
+        element.addBorrowedAsset({
+            address: loan.principal,
+            amount: loan.borrowedAmount,
+        });
+    });
+    return elementRegistry.getElements(cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-nft-borrows`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=nftBorrowsFetcher.js.map

package/src/plugins/rain/nftBorrowsFetcher.js.map

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