@sonarwatch/portfolio-plugins 0.16.4 → 0.16.12

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.16.12](https://github.com/sonarwatch/portfolio/compare/plugins-0.16.11...plugins-0.16.12) (2025-07-09)
+
+
+
+## [0.16.7](https://github.com/sonarwatch/portfolio/compare/plugins-0.16.6...plugins-0.16.7) (2025-07-08)
+
+
+
+## [0.16.6](https://github.com/sonarwatch/portfolio/compare/plugins-0.16.5...plugins-0.16.6) (2025-07-08)
+
+
+
+## [0.16.5](https://github.com/sonarwatch/portfolio/compare/plugins-0.16.4...plugins-0.16.5) (2025-07-08)
+
+
+### Features
+
+* **core:** add calcYieldSummary utility and FetcherResult types to enhance yield data calculations and integration ([9c26a0f](https://github.com/sonarwatch/portfolio/commit/9c26a0f618826a8dbec19ff7cf7685182aff27e5))
+* **plugins:** add netApy support across element builders and simplify yield calculations ([f0c97b7](https://github.com/sonarwatch/portfolio/commit/f0c97b74727e320370fcc6a298ff14eb7b74c256))
+* **plugins:** integrate calcYieldSummary in fetcher scripts to log yield summaries during execution ([2dfb42d](https://github.com/sonarwatch/portfolio/commit/2dfb42dae908883a9b8059bb7e813f1f3ab30931))
+
+
+
 ## [0.16.4](https://github.com/sonarwatch/portfolio/compare/plugins-0.16.3...plugins-0.16.4) (2025-07-04)
 
 

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.16.4",
+  "version": "0.16.12",
   "type": "commonjs",
   "types": "./src/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sonarwatch/portfolio.git"
+  },
   "peerDependencies": {
     "@sonarwatch/portfolio-core": "^0.16.0"
   },

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

@@ -1,2 +1,3 @@
 import { AirdropFetcher } from '../../AirdropFetcher';
-export declare const airdropFetcher: AirdropFetcher;
+export declare const airdropS3Fetcher: AirdropFetcher;
+export declare const s3Fetcher: import("../..").Fetcher;

package/src/plugins/drift/airdrops3Fetcher.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.airdropFetcher = void 0;
+exports.s3Fetcher = exports.airdropS3Fetcher = void 0;
 const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
@@ -52,7 +52,7 @@ const fetchAirdropExecutor = (owner) => __awaiter(void 0, void 0, void 0, functi
         .dividedBy(helpersAirdrop_1.driftFactor)
         .toNumber();
     const merkle = res.data.merkle_tree;
-    const isClaimed = res.data.claimed_amount !== 0;
+    const isClaimed = res.data.claimable_amount === 0;
     const claimStatus = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, merkle, constants_1.distributorS3Pid);
     const claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimStatus, constants_1.driftMint);
     return (0, AirdropFetcher_1.getAirdropRaw)({
@@ -68,9 +68,10 @@ const fetchAirdropExecutor = (owner) => __awaiter(void 0, void 0, void 0, functi
         ],
     });
 });
-exports.airdropFetcher = {
+exports.airdropS3Fetcher = {
     id: constants_1.airdropStaticsS3.id,
     networkId: portfolio_core_1.NetworkId.solana,
     executor: fetchAirdropExecutor,
 };
+exports.s3Fetcher = (0, AirdropFetcher_1.airdropFetcherToFetcher)(exports.airdropS3Fetcher, constants_1.platformId, constants_1.airdropStaticsS3.id, constants_1.airdropStaticsS3.claimEnd);
 //# sourceMappingURL=airdrops3Fetcher.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"airdrops3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/airdrops3Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,gEAAqC;AACrC,+DAAuD;AACvD,yDAI8B;AAE9B,2CAKqB;AACrB,qDAA+C;AAC/C,oFAAiF;AACjF,0FAAuF;AAEvF,MAAM,oBAAoB,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC3E,MAAM,GAAG,GAAqC,MAAM,eAAK,CAAC,GAAG,CAC3D,wBAAY,GAAG,KAAK,EACpB;QACE,OAAO,EAAE;YACP,MAAM,EAAE,0BAA0B;YAClC,OAAO,EAAE,2BAA2B;SACrC;QACD,OAAO,EAAE,IAAI;QACb,cAAc,CAAC,MAAM;YACnB,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;QAC1C,CAAC;KACF,CACF,CAAC;IAEF,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,4BAAgB;YACzB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;oBAClB,SAAS,EAAE,KAAK;iBACjB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,eAAe,GACnB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI;QACjC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU;QACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,eAAe,IAAI,CAAC,CAAC;SAC/C,SAAS,CAAC,4BAAW,CAAC;SACtB,QAAQ,EAAE,CAAC;IACd,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;IACpC,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,CAAC;IAEhD,MAAM,WAAW,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,MAAM,EAAE,4BAAgB,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,WAAW,EAAE,qBAAS,CAAC,CAAC;IAEzE,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,4BAAgB;QACzB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,SAAS;gBACT,MAAM;aACP;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,4BAAgB,CAAC,EAAE;IACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,oBAAoB;CAC/B,CAAC"}
+{"version":3,"file":"airdrops3Fetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/airdrops3Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,gEAAqC;AACrC,+DAAuD;AACvD,yDAK8B;AAE9B,2CAMqB;AACrB,qDAA+C;AAC/C,oFAAiF;AACjF,0FAAuF;AAEvF,MAAM,oBAAoB,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC3E,MAAM,GAAG,GAAqC,MAAM,eAAK,CAAC,GAAG,CAC3D,wBAAY,GAAG,KAAK,EACpB;QACE,OAAO,EAAE;YACP,MAAM,EAAE,0BAA0B;YAClC,OAAO,EAAE,2BAA2B;SACrC;QACD,OAAO,EAAE,IAAI;QACb,cAAc,CAAC,MAAM;YACnB,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;QAC1C,CAAC;KACF,CACF,CAAC;IAEF,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,4BAAgB;YACzB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;oBAClB,SAAS,EAAE,KAAK;iBACjB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,eAAe,GACnB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI;QACjC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU;QACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,eAAe,IAAI,CAAC,CAAC;SAC/C,SAAS,CAAC,4BAAW,CAAC;SACtB,QAAQ,EAAE,CAAC;IACd,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC;IACpC,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,CAAC;IAElD,MAAM,WAAW,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,MAAM,EAAE,4BAAgB,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,WAAW,EAAE,qBAAS,CAAC,CAAC;IAEzE,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,4BAAgB;QACzB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,SAAS;gBACT,MAAM;aACP;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,4BAAgB,CAAC,EAAE;IACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,oBAAoB;CAC/B,CAAC;AAEW,QAAA,SAAS,GAAG,IAAA,wCAAuB,EAC9C,wBAAgB,EAChB,sBAAU,EACV,4BAAgB,CAAC,EAAE,EACnB,4BAAgB,CAAC,QAAQ,CAC1B,CAAC"}

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

@@ -13,7 +13,7 @@ export declare const preMarketPriceKey = "premarketPrice";
 export declare const perpMarketsIndexesKey = "perp-markets-indexes";
 export declare const oracleToMintKey = "oracle-to-mint";
 export declare const airdropUrl = "https://airdrop.drift.trade/eligibility/";
-export declare const airdropS3Url = "https://airdrop-3.drift.trade/eligibility/";
+export declare const airdropS3Url = "https://airdrop-fuel-1.drift.trade/eligibility/";
 export declare const distributorS3Pid = "E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x";
 export declare const driftDecimals = 6;
 export declare const airdropStaticsS1: AirdropStatics;

package/src/plugins/drift/constants.js

@@ -13,7 +13,7 @@ exports.preMarketPriceKey = 'premarketPrice';
 exports.perpMarketsIndexesKey = 'perp-markets-indexes';
 exports.oracleToMintKey = 'oracle-to-mint';
 exports.airdropUrl = 'https://airdrop.drift.trade/eligibility/';
-exports.airdropS3Url = 'https://airdrop-3.drift.trade/eligibility/';
+exports.airdropS3Url = 'https://airdrop-fuel-1.drift.trade/eligibility/';
 exports.distributorS3Pid = 'E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x';
 exports.driftDecimals = 6;
 exports.airdropStaticsS1 = {

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAC3D,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAC/D,QAAA,eAAe,GAAG,0BAA0B,CAAC;AAC7C,QAAA,cAAc,GAAG,aAAa,CAAC;AAE/B,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AACrC,QAAA,qBAAqB,GAAG,sBAAsB,CAAC;AAC/C,QAAA,eAAe,GAAG,gBAAgB,CAAC;AAEnC,QAAA,UAAU,GAAG,0CAA0C,CAAC;AACxD,QAAA,YAAY,GAAG,4CAA4C,CAAC;AAC5D,QAAA,gBAAgB,GAAG,8CAA8C,CAAC;AAClE,QAAA,aAAa,GAAG,CAAC,CAAC;AAElB,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,0BAA0B;IACrC,KAAK,EAAE,qBAAa;IACpB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,oBAAY;IACzB,WAAW,EAAE,uBAAe;IAC5B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,qCAAqC;IAChD,KAAK,EAAE,qBAAa;IACpB,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,oBAAY;IACzB,WAAW,EAAE,uBAAe;IAC5B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAC3D,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAC/D,QAAA,eAAe,GAAG,0BAA0B,CAAC;AAC7C,QAAA,cAAc,GAAG,aAAa,CAAC;AAE/B,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AACrC,QAAA,qBAAqB,GAAG,sBAAsB,CAAC;AAC/C,QAAA,eAAe,GAAG,gBAAgB,CAAC;AAEnC,QAAA,UAAU,GAAG,0CAA0C,CAAC;AACxD,QAAA,YAAY,GAAG,iDAAiD,CAAC;AACjE,QAAA,gBAAgB,GAAG,8CAA8C,CAAC;AAClE,QAAA,aAAa,GAAG,CAAC,CAAC;AAElB,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,0BAA0B;IACrC,KAAK,EAAE,qBAAa;IACpB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,oBAAY;IACzB,WAAW,EAAE,uBAAe;IAC5B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC;AAEW,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,qCAAqC;IAChD,KAAK,EAAE,qBAAa;IACpB,IAAI,EAAE,IAAI;IACV,WAAW,EAAE,oBAAY;IACzB,WAAW,EAAE,uBAAe;IAC5B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC"}

package/src/plugins/drift/index.js

@@ -9,8 +9,16 @@ const perpMarketsJob_1 = __importDefault(require("./perpMarketsJob"));
 const depositsFetcher_1 = __importDefault(require("./depositsFetcher"));
 const premarketJob_1 = __importDefault(require("./premarketJob"));
 const airdropFetcher_1 = __importDefault(require("./airdropFetcher"));
+const airdrops3Fetcher_1 = require("./airdrops3Fetcher");
 const helpersAirdrop_1 = require("./helpersAirdrop");
 exports.jobs = [spotMarketsJob_1.default, premarketJob_1.default, perpMarketsJob_1.default];
-exports.fetchers = [depositsFetcher_1.default, airdropFetcher_1.default];
-exports.airdropFetchers = [helpersAirdrop_1.airdropFetcher];
+exports.fetchers = [
+    depositsFetcher_1.default,
+    airdropFetcher_1.default,
+    airdrops3Fetcher_1.s3Fetcher,
+];
+exports.airdropFetchers = [
+    helpersAirdrop_1.airdropFetcher,
+    airdrops3Fetcher_1.airdropS3Fetcher,
+];
 //# 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,sEAA8C;AAC9C,sEAA8C;AAC9C,wEAAgD;AAChD,kEAA0C;AAC1C,sEAAmD;AACnD,qDAAkD;AAErC,QAAA,IAAI,GAAU,CAAC,wBAAc,EAAE,sBAAY,EAAE,wBAAc,CAAC,CAAC;AAC7D,QAAA,QAAQ,GAAc,CAAC,yBAAe,EAAE,wBAAmB,CAAC,CAAC;AAC7D,QAAA,eAAe,GAAqB,CAAC,+BAAc,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/index.ts"],"names":[],"mappings":";;;;;;AAGA,sEAA8C;AAC9C,sEAA8C;AAC9C,wEAAgD;AAChD,kEAA0C;AAC1C,sEAAgD;AAChD,yDAAiE;AACjE,qDAAkD;AAErC,QAAA,IAAI,GAAU,CAAC,wBAAc,EAAE,sBAAY,EAAE,wBAAc,CAAC,CAAC;AAC7D,QAAA,QAAQ,GAAc;IACjC,yBAAe;IACf,wBAAgB;IAChB,4BAAS;CACV,CAAC;AACW,QAAA,eAAe,GAAqB;IAC/C,+BAAc;IACd,mCAAgB;CACjB,CAAC"}

package/src/plugins/drift-market-maker-vault/depositsFetcher.js

@@ -47,9 +47,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const element = elementRegistry.addElementMultiple({
             label: 'Deposit',
             platformId,
-            name: `${name}${vaultInfo.apy90d
-                ? ` ${new bignumber_js_1.default(vaultInfo.apy90d).shiftedBy(2).toFixed(2)}%`
-                : ''}`,
+            name,
             link: link !== null && link !== void 0 ? link : `https://app.drift.trade/vaults/${vaultInfo.pubkey.toString()}`,
             sourceRefs: [
                 {
@@ -58,6 +56,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 },
             ],
             ref: depositAccount.pubkey,
+            netApy: vaultInfo.apy90d ? vaultInfo.apy90d : undefined,
         });
         const pricePerShare = new bignumber_js_1.default(vaultInfo.totalTokens).dividedBy(vaultInfo.totalShares);
         const userSharesValue = depositAccount.vaultShares.multipliedBy(pricePerShare);

package/src/plugins/drift-market-maker-vault/depositsFetcher.js.map

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

package/src/plugins/fragmetric/airdropFetcher.js

@@ -15,23 +15,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.airdropFetcher = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const axios_1 = __importDefault(require("axios"));
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const clients_1 = require("../../utils/clients");
 const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
 const deriveClaimStatus_1 = require("../../utils/solana/jupiter/deriveClaimStatus");
 const constants_1 = require("./constants");
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    const eligibility = yield axios_1.default.get(`https://api.fragmetric.xyz/v1/public/airdrop/user-status/${owner}?token_symbol=${constants_1.fragMint}&version=1`);
+    if (!eligibility.data ||
+        (eligibility.data.claimableAmount === '0' &&
+            eligibility.data.claimedAmount === '0'))
+        return (0, AirdropFetcher_1.getAirdropRaw)({
+            statics: constants_1.airdropStatics,
+            items: [
+                {
+                    amount: 0,
+                    isClaimed: false,
+                    label: 'FRAG',
+                    address: constants_1.fragMint,
+                },
+            ],
+        });
     const client = (0, clients_1.getClientSolana)();
     const claimStatus = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, 'BDWeWshtozDsYrfL1UpHbRG7zeWKZ8fAV7cUCBuum61a', constants_1.distributorPid);
     const claimAccount = yield client.getAccountInfo(claimStatus);
     const claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimStatus, constants_1.fragMint);
-    const totalAmount = claims.reduce((acc, claim) => acc.plus(claim.amount), new bignumber_js_1.default(0));
     return (0, AirdropFetcher_1.getAirdropRaw)({
         statics: constants_1.airdropStatics,
         items: [
             {
-                amount: totalAmount.toNumber(),
-                isClaimed: !!claimAccount,
+                amount: (0, bignumber_js_1.default)(eligibility.data.claimableAmount)
+                    .plus(eligibility.data.claimedAmount)
+                    .shiftedBy(-9)
+                    .toNumber(),
+                isClaimed: eligibility.data.claimableAmount === '0',
                 label: 'FRAG',
                 address: constants_1.fragMint,
                 claims,

package/src/plugins/fragmetric/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,yDAI8B;AAC9B,iDAAsD;AACtD,0FAAuF;AACvF,oFAAiF;AACjF,2CAAuE;AAEvE,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,qCAAiB,EACnC,KAAK,EACL,8CAA8C,EAC9C,0BAAc,CACf,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,WAAW,EAAE,oBAAQ,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EACtC,IAAI,sBAAS,CAAC,CAAC,CAAC,CACjB,CAAC;IACF,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE;gBAC9B,SAAS,EAAE,CAAC,CAAC,YAAY;gBACzB,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,oBAAQ;gBACjB,MAAM;gBACN,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;aACvD;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,kDAA6C;AAC7C,yDAI8B;AAC9B,iDAAsD;AACtD,0FAAuF;AACvF,oFAAiF;AACjF,2CAAuE;AAGvE,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,WAAW,GAA6C,MAAM,eAAK,CAAC,GAAG,CAC3E,4DAA4D,KAAK,iBAAiB,oBAAQ,YAAY,CACvG,CAAC;IAEF,IACE,CAAC,WAAW,CAAC,IAAI;QACjB,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,KAAK,GAAG;YACvC,WAAW,CAAC,IAAI,CAAC,aAAa,KAAK,GAAG,CAAC;QAEzC,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,MAAM;oBACb,OAAO,EAAE,oBAAQ;iBAClB;aACF;SACF,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,qCAAiB,EACnC,KAAK,EACL,8CAA8C,EAC9C,0BAAc,CACf,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,WAAW,EAAE,oBAAQ,CAAC,CAAC;IAExE,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,IAAA,sBAAS,EAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC;qBAChD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;qBACpC,SAAS,CAAC,CAAC,CAAC,CAAC;qBACb,QAAQ,EAAE;gBACb,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,eAAe,KAAK,GAAG;gBACnD,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,oBAAQ;gBACjB,MAAM;gBACN,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;aACvD;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC"}

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

@@ -3,3 +3,9 @@ export type Receipt = {
     id: ID;
     amountDeposited: string;
 };
+export type AirdropApiResponse = {
+    claimableAmount: string;
+    claimableAt: string;
+    claimedAmount: string;
+    claimedAt: string;
+};

package/src/plugins/jupiter/exchange/constants.d.ts

@@ -11,5 +11,7 @@ export declare const limitV2ProgramId: PublicKey;
 export declare const dcaProgramId: PublicKey;
 export declare const lockProgramId: PublicKey;
 export declare const jlpPoolPk: PublicKey;
+export declare const USDC_CUSTODY_PUBLIC_KEY: PublicKey;
 export declare const custodiesKey = "custodies";
 export declare const perpPoolsKey = "perppools";
+export declare const perpBorrowAprCacheKey = "perpborrowapr";

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.perpPoolsKey = exports.custodiesKey = exports.jlpPoolPk = exports.lockProgramId = exports.dcaProgramId = exports.limitV2ProgramId = exports.limitV1ProgramId = exports.valueAverageProgramId = exports.perpsProgramId = exports.jupSOLMint = exports.jlpMint = exports.platformId = void 0;
+exports.perpBorrowAprCacheKey = exports.perpPoolsKey = exports.custodiesKey = exports.USDC_CUSTODY_PUBLIC_KEY = exports.jlpPoolPk = exports.lockProgramId = exports.dcaProgramId = exports.limitV2ProgramId = exports.limitV1ProgramId = exports.valueAverageProgramId = exports.perpsProgramId = exports.jupSOLMint = exports.jlpMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'jupiter-exchange';
 exports.jlpMint = '27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4';
@@ -12,6 +12,8 @@ exports.limitV2ProgramId = new web3_js_1.PublicKey('j1o2qRpjcyUwEvwtcfhEQefh773Z
 exports.dcaProgramId = new web3_js_1.PublicKey('DCA265Vj8a9CEuX1eb1LWRnDT7uK6q1xMipnNyatn23M');
 exports.lockProgramId = new web3_js_1.PublicKey('LocpQgucEQHbqNABEYvBvwoxCPsSbG91A1QaQhQQqjn');
 exports.jlpPoolPk = new web3_js_1.PublicKey('5BUwFW4nRbftYTDMbgxykoFWqWHPzahFSNAaaaJtVKsq');
+exports.USDC_CUSTODY_PUBLIC_KEY = new web3_js_1.PublicKey('G18jKKXQwBbrHeiK3C9MRXhkHsLHf7XgCSisykV46EZa');
 exports.custodiesKey = 'custodies';
 exports.perpPoolsKey = 'perppools';
+exports.perpBorrowAprCacheKey = 'perpborrowapr';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,kBAAkB,CAAC;AAChC,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,YAAY,GAAG,WAAW,CAAC;AAC3B,QAAA,YAAY,GAAG,WAAW,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,kBAAkB,CAAC;AAChC,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,mBAAS,CAC3C,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAI,mBAAS,CAClD,8CAA8C,CAC/C,CAAC;AAEW,QAAA,YAAY,GAAG,WAAW,CAAC;AAC3B,QAAA,YAAY,GAAG,WAAW,CAAC;AAC3B,QAAA,qBAAqB,GAAG,eAAe,CAAC"}

package/src/plugins/jupiter/exchange/perpetualBorrowFetcher.d.ts

@@ -0,0 +1,5 @@
+import { Fetcher } from '../../../Fetcher';
+import { MemoizedCache } from '../../../utils/misc/MemoizedCache';
+export declare const borrowAprMemo: MemoizedCache<number, number>;
+declare const fetcher: Fetcher;
+export default fetcher;

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

@@ -0,0 +1,70 @@
+"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 });
+exports.borrowAprMemo = void 0;
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
+const clients_1 = require("../../../utils/clients");
+const constants_1 = require("./constants");
+const structs_1 = require("./structs");
+const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
+const getParsedAccountInfo_1 = require("../../../utils/solana/getParsedAccountInfo");
+const solana_1 = require("../../../utils/solana");
+const MemoizedCache_1 = require("../../../utils/misc/MemoizedCache");
+exports.borrowAprMemo = new MemoizedCache_1.MemoizedCache(constants_1.perpBorrowAprCacheKey, {
+    prefix: constants_1.platformId,
+    networkId: portfolio_core_1.NetworkId.solana,
+});
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)({ commitment: 'processed' });
+    const [borrowPositionPubkey] = web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from('borrow_lend'),
+        constants_1.jlpPoolPk.toBuffer(),
+        new web3_js_1.PublicKey(owner).toBuffer(),
+        constants_1.USDC_CUSTODY_PUBLIC_KEY.toBuffer(),
+    ], constants_1.perpsProgramId);
+    const account = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.borrowPositionStruct, borrowPositionPubkey);
+    if (!account)
+        return [];
+    const borrowApr = yield exports.borrowAprMemo.getItem(cache);
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const element = elementRegistry.addElementBorrowlend({
+        label: 'Lending',
+        link: 'https://jup.ag/perps-loan',
+        ref: account.pubkey,
+        sourceRefs: [
+            {
+                name: 'Market',
+                address: constants_1.jlpPoolPk.toString(),
+            },
+        ],
+    });
+    element.addSuppliedAsset({
+        address: constants_1.jlpMint,
+        amount: account.lockedCollateral,
+    });
+    element.addBorrowedAsset({
+        address: solana_1.usdcSolanaMint,
+        amount: account.borrowSize.shiftedBy(-3),
+    });
+    if (borrowApr) {
+        element.addSuppliedYield([(0, portfolio_core_1.yieldFromApy)(0)]);
+        element.addBorrowedYield([(0, portfolio_core_1.yieldFromApr)(Number(borrowApr) / 100)]);
+    }
+    return elementRegistry.getElements(cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-perpetual-borrow`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=perpetualBorrowFetcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"perpetualBorrowFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/perpetualBorrowFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAKoC;AACpC,6CAA4C;AAG5C,oDAAyD;AACzD,2CAOqB;AACrB,uCAAiD;AACjD,mFAAgF;AAChF,qFAAkF;AAClF,kDAAuD;AACvD,qEAAkE;AAErD,QAAA,aAAa,GAAG,IAAI,6BAAa,CAAS,iCAAqB,EAAE;IAC5E,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAChC,KAAa,EACb,KAAY,EACiB,EAAE;IAC/B,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5D,MAAM,CAAC,oBAAoB,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAC7D;QACE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QAC1B,qBAAS,CAAC,QAAQ,EAAE;QACpB,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;QAC/B,mCAAuB,CAAC,QAAQ,EAAE;KACnC,EACD,0BAAc,CACf,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EACxC,MAAM,EACN,8BAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,MAAM,SAAS,GAAG,MAAM,qBAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAErD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,eAAe,CAAC,oBAAoB,CAAC;QACnD,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,2BAA2B;QACjC,GAAG,EAAE,OAAO,CAAC,MAAM;QACnB,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,qBAAS,CAAC,QAAQ,EAAE;aAC9B;SACF;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,gBAAgB,CAAC;QACvB,OAAO,EAAE,mBAAO;QAChB,MAAM,EAAE,OAAO,CAAC,gBAAgB;KACjC,CAAC,CAAC;IAEH,OAAO,CAAC,gBAAgB,CAAC;QACvB,OAAO,EAAE,uBAAc;QACvB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAA,6BAAY,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAA,6BAAY,EAAC,MAAM,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,mBAAmB;IACpC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/jupiter/exchange/perpetualBorrowJob.d.ts

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

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

@@ -0,0 +1,33 @@
+"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 axios_1 = __importDefault(require("axios"));
+const constants_1 = require("./constants");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const apiRes = yield axios_1.default.get('https://perps-api.jup.ag/v1');
+    if (apiRes.data.borrowApr) {
+        yield cache.setItem(constants_1.perpBorrowAprCacheKey, apiRes.data.borrowApr, {
+            prefix: constants_1.platformId,
+            networkId: portfolio_core_1.NetworkId.solana,
+        });
+    }
+});
+const job = {
+    id: `${constants_1.platformId}-perpetual-borrow-apr`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=perpetualBorrowJob.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"perpetualBorrowJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/perpetualBorrowJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA0B;AAG1B,2CAAgE;AAEhE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,GAAG,CAC5B,6BAA6B,CAC9B,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1B,MAAM,KAAK,CAAC,OAAO,CAAC,iCAAqB,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE;YAChE,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,uBAAuB;IACxC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/jupiter/exchange/structs.d.ts

@@ -292,3 +292,16 @@ export type Position = {
     bump: number;
 };
 export declare const positionStruct: BeetStruct<Position, Partial<Position>>;
+export type BorrowPosition = {
+    accountDiscriminator: number[];
+    owner: PublicKey;
+    pool: PublicKey;
+    custody: PublicKey;
+    openTime: BigNumber;
+    updateTime: BigNumber;
+    borrowSize: BigNumber;
+    cumulativeCompoundedInterestSnapshot: BigNumber;
+    lockedCollateral: BigNumber;
+    bump: number;
+};
+export declare const borrowPositionStruct: BeetStruct<BorrowPosition, Partial<BorrowPosition>>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.positionStruct = exports.Side = exports.custodyStruct = exports.jumpRateStateStruct = exports.fundingRateStateStruct = exports.assetsStruct = exports.permissionsStruct = exports.pricingParamsStruct = exports.oracleParamsStruct = exports.OracleType = exports.perpetualPoolStruct = exports.feesStruct = exports.poolAprStruct = exports.limitStruct = exports.positionRequestStruct = exports.RequestType = exports.RequestChange = exports.vestingEscrowStruct = exports.valueAverageStruct = exports.dcaStruct = exports.limitOrderV2Struct = exports.limitOrderStruct = void 0;
+exports.borrowPositionStruct = exports.positionStruct = exports.Side = exports.custodyStruct = exports.jumpRateStateStruct = exports.fundingRateStateStruct = exports.assetsStruct = exports.permissionsStruct = exports.pricingParamsStruct = exports.oracleParamsStruct = exports.OracleType = exports.perpetualPoolStruct = exports.feesStruct = exports.poolAprStruct = exports.limitStruct = exports.positionRequestStruct = exports.RequestType = exports.RequestChange = exports.vestingEscrowStruct = exports.valueAverageStruct = exports.dcaStruct = exports.limitOrderV2Struct = exports.limitOrderStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../../utils/solana");
@@ -278,4 +278,16 @@ exports.positionStruct = new beet_1.BeetStruct([
     ['lockedAmount', solana_1.u64],
     ['bump', beet_1.u8],
 ], (args) => args);
+exports.borrowPositionStruct = new beet_1.BeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['owner', beet_solana_1.publicKey],
+    ['pool', beet_solana_1.publicKey],
+    ['custody', beet_solana_1.publicKey],
+    ['openTime', solana_1.i64],
+    ['updateTime', solana_1.i64],
+    ['borrowSize', solana_1.u128],
+    ['cumulativeCompoundedInterestSnapshot', solana_1.u128],
+    ['lockedCollateral', solana_1.u64],
+    ['bump', beet_1.u8],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

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

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

package/src/plugins/jupiter/index.js

@@ -14,9 +14,12 @@ const voteFetcher_1 = __importDefault(require("./governance/voteFetcher"));
 const governance_1 = require("./governance");
 const launchpad_1 = require("./launchpad");
 const pricingJob_1 = __importDefault(require("./pricing/pricingJob"));
-exports.jobs = [custodiesJob_1.default, pricingJob_1.default];
+const perpetualBorrowFetcher_1 = __importDefault(require("./exchange/perpetualBorrowFetcher"));
+const perpetualBorrowJob_1 = __importDefault(require("./exchange/perpetualBorrowJob"));
+exports.jobs = [custodiesJob_1.default, pricingJob_1.default, perpetualBorrowJob_1.default];
 exports.fetchers = [
     perpetualFetcher_1.default,
+    perpetualBorrowFetcher_1.default,
     valueAverageFetcher_1.default,
     limitFetcher_1.default,
     dcaFetcher_1.default,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/index.ts"],"names":[],"mappings":";;;;;;AAEA,mFAA2D;AAC3D,yFAAiE;AACjE,2EAAmD;AACnD,uEAA+C;AAC/C,yEAAiD;AACjD,2EAAmD;AAEnD,2EAAmD;AAEnD,6CAOsB;AACtB,2CAA8D;AAC9D,sEAA8C;AAEjC,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,oBAAU,CAAC,CAAC;AACzC,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,6BAAmB;IACnB,sBAAY;IACZ,oBAAU;IACV,qBAAW;IACX,qBAAW;IACX,wBAAW;IACX,GAAG,uBAAW;CACf,CAAC;AACW,QAAA,eAAe,GAAqB;IAC/C,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,GAAG,8BAAkB;CACtB,CAAC;AAEW,QAAA,aAAa,GAAG;IAC3B,0BAAgB,CAAC,EAAE;IACnB,6BAAmB,CAAC,EAAE;IACtB,sBAAY,CAAC,EAAE;IACf,oBAAU,CAAC,EAAE;IACb,qBAAW,CAAC,EAAE;IACd,qBAAW,CAAC,EAAE;CACf,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/index.ts"],"names":[],"mappings":";;;;;;AAEA,mFAA2D;AAC3D,yFAAiE;AACjE,2EAAmD;AACnD,uEAA+C;AAC/C,yEAAiD;AACjD,2EAAmD;AAEnD,2EAAmD;AAEnD,6CAOsB;AACtB,2CAA8D;AAC9D,sEAA8C;AAC9C,+FAAuE;AACvE,uFAA+D;AAElD,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,oBAAU,EAAE,4BAAkB,CAAC,CAAC;AAC7D,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,gCAAsB;IACtB,6BAAmB;IACnB,sBAAY;IACZ,oBAAU;IACV,qBAAW;IACX,qBAAW;IACX,wBAAW;IACX,GAAG,uBAAW;CACf,CAAC;AACW,QAAA,eAAe,GAAqB;IAC/C,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,+BAAkB;IAClB,GAAG,8BAAkB;CACtB,CAAC;AAEW,QAAA,aAAa,GAAG;IAC3B,0BAAgB,CAAC,EAAE;IACnB,6BAAmB,CAAC,EAAE;IACtB,sBAAY,CAAC,EAAE;IACf,oBAAU,CAAC,EAAE;IACb,qBAAW,CAAC,EAAE;IACd,qBAAW,CAAC,EAAE;CACf,CAAC"}

package/src/plugins/raydium/ammV2ApiJob.js

@@ -20,6 +20,7 @@ const getLpTokenSource_1 = require("../../utils/misc/getLpTokenSource");
 const computeAndStoreLpPrice_1 = require("../../utils/misc/computeAndStoreLpPrice");
 const getLpUnderlyingTokenSource_1 = require("../../utils/misc/getLpUnderlyingTokenSource");
 const getSourceWeight_1 = __importDefault(require("../../utils/misc/getSourceWeight"));
+const helpers_1 = require("./helpers");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     let apiRes;
@@ -69,8 +70,6 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             lpSupply = new bignumber_js_1.default(poolInfo.lpAmount);
             if (lpSupply.isZero())
                 continue;
-            if ((0, bignumber_js_1.default)(poolInfo.tvl).isLessThan(computeAndStoreLpPrice_1.minimumLiquidity))
-                continue;
             mintA = poolInfo.mintA.address;
             mintB = poolInfo.mintB.address;
             lpMint = (_a = poolInfo.lpMint) === null || _a === void 0 ? void 0 : _a.address;
@@ -87,6 +86,8 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 tokenPriceById.get(mintA),
                 tokenPriceById.get(mintB),
             ];
+            if (!(0, helpers_1.hasAcceptedPairAndEnoughLiquidity)([mintA, mintB], [new bignumber_js_1.default(tokenAmountA), new bignumber_js_1.default(tokenAmountB)], [tokenPriceA, tokenPriceB]))
+                continue;
             if (lpMint && lpDecimals) {
                 tokenPriceSources.push(...(0, getLpTokenSource_1.getLpTokenSource)({
                     networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/raydium/ammV2ApiJob.js.map

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

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

@@ -21,3 +21,4 @@ export declare const getFeesAndRewardsBalance: (personalPositionInfo: ParsedAcco
     tokenFeeAmountB: BigNumber;
     rewards: BigNumber[];
 } | null;
+export declare function hasAcceptedPairAndEnoughLiquidity(mints: string[], amounts: BigNumber[], tokenPrices: (TokenPrice | undefined)[]): boolean;

package/src/plugins/raydium/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.getFeesAndRewardsBalance = exports.getTickArrayAddress = exports.getPendingAssetParams = exports.getFarmYield = exports.getStakePubKey = exports.getRaydiumTokenAmountsFromLiquidity = exports.raydiumTickToPriceX64 = void 0;
+exports.hasAcceptedPairAndEnoughLiquidity = exports.getFeesAndRewardsBalance = exports.getTickArrayAddress = exports.getPendingAssetParams = exports.getFarmYield = exports.getStakePubKey = exports.getRaydiumTokenAmountsFromLiquidity = exports.raydiumTickToPriceX64 = void 0;
 /* eslint-disable eqeqeq */
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable no-underscore-dangle */
@@ -15,6 +15,8 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const toBN_1 = require("../../utils/misc/toBN");
+const getLpUnderlyingTokenSource_1 = require("../../utils/misc/getLpUnderlyingTokenSource");
+const computeAndStoreLpPrice_1 = require("../../utils/misc/computeAndStoreLpPrice");
 const ZERO = new bn_js_1.default(0);
 const ONE = new bn_js_1.default(1);
 const Q64 = new bn_js_1.default(1).shln(64);
@@ -393,4 +395,23 @@ const getFeesAndRewardsBalance = (personalPositionInfo, poolStateInfo, tickArray
     };
 };
 exports.getFeesAndRewardsBalance = getFeesAndRewardsBalance;
+function hasAcceptedPairAndEnoughLiquidity(mints, amounts, tokenPrices) {
+    if (!getLpUnderlyingTokenSource_1.solanaAcceptedPairs)
+        return false;
+    const verifiedMints = mints.map((mint) => (getLpUnderlyingTokenSource_1.solanaAcceptedPairs === null || getLpUnderlyingTokenSource_1.solanaAcceptedPairs === void 0 ? void 0 : getLpUnderlyingTokenSource_1.solanaAcceptedPairs.includes(mint)) ? mint : undefined);
+    if (!verifiedMints.length)
+        return false;
+    const liquidity = verifiedMints.reduce((acc, mint, index) => {
+        if (!mint || !amounts[index] || amounts[index].isLessThanOrEqualTo(0))
+            return acc;
+        const tokenPrice = tokenPrices[index];
+        if (!tokenPrice)
+            return acc;
+        return acc.plus(amounts[index].times(tokenPrice.price));
+    }, new bignumber_js_1.default(0));
+    if (liquidity.isLessThan(computeAndStoreLpPrice_1.minimumLiquidity))
+        return false;
+    return true;
+}
+exports.hasAcceptedPairAndEnoughLiquidity = hasAcceptedPairAndEnoughLiquidity;
 //# sourceMappingURL=helpers.js.map

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

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

package/src/utils/elementbuilder/ElementBorrowlendBuilder.js

@@ -141,6 +141,39 @@ class ElementBorrowlendBuilder extends ElementBuilder_1.ElementBuilder {
         }
         if (!suppliedValue && !borrowedValue && !rewardValue)
             return null;
+        let netApy;
+        if (this.netApy)
+            netApy = this.netApy;
+        else if (value) {
+            const yieldItems = [];
+            suppliedAssets.forEach((asset, i) => {
+                if (asset.type === portfolio_core_1.PortfolioAssetType.token &&
+                    asset.data.yield &&
+                    asset.value) {
+                    yieldItems.push({
+                        apy: asset.data.yield.apy,
+                        value: asset.value,
+                    });
+                }
+                if (this.suppliedYields[i] &&
+                    this.suppliedYields[i][0].apy > 0 &&
+                    asset.value) {
+                    yieldItems.push({
+                        apy: this.suppliedYields[i][0].apy,
+                        value: asset.value,
+                    });
+                }
+            });
+            borrowedAssets.forEach((asset, i) => {
+                if (this.borrowedYields[i] && asset.value) {
+                    yieldItems.push({
+                        apy: this.borrowedYields[i][0].apy,
+                        value: asset.value,
+                    });
+                }
+            });
+            netApy = (0, portfolio_core_1.reduceYieldElements)(yieldItems);
+        }
         return {
             type: portfolio_core_1.PortfolioElementType.borrowlend,
             label: this.label,
@@ -167,6 +200,7 @@ class ElementBorrowlendBuilder extends ElementBuilder_1.ElementBuilder {
                 expireOn: (_b = this.fixedTerms) === null || _b === void 0 ? void 0 : _b.expireOn,
             },
             value: this.fixedTerms ? fixedTermsValue : value,
+            netApy,
             name: this.name,
             tags: this.tags,
         };

package/src/utils/elementbuilder/ElementBorrowlendBuilder.js.map

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

package/src/utils/elementbuilder/ElementBuilder.d.ts

@@ -13,9 +13,11 @@ export declare abstract class ElementBuilder {
     sourceRefs?: SourceRef[];
     ref?: string | PublicKey;
     link?: string;
+    netApy?: number;
     protected constructor(params: Params);
     addTag(tag: string): void;
     setName(name: string): void;
+    setNetApy(netApy?: number): void;
     abstract tokenAddresses(): string[];
     abstract get(networkId: NetworkIdType, platformId: string, tokenPrices: TokenPriceMap, tokenYields: TokenYieldMap): PortfolioElement | null;
 }

package/src/utils/elementbuilder/ElementBuilder.js

@@ -11,6 +11,7 @@ class ElementBuilder {
         this.sourceRefs = params.sourceRefs;
         this.ref = params.ref;
         this.link = params.link;
+        this.netApy = params.netApy;
     }
     addTag(tag) {
         if (!this.tags)
@@ -20,6 +21,9 @@ class ElementBuilder {
     setName(name) {
         this.name = name;
     }
+    setNetApy(netApy) {
+        this.netApy = netApy;
+    }
 }
 exports.ElementBuilder = ElementBuilder;
 //# sourceMappingURL=ElementBuilder.js.map

package/src/utils/elementbuilder/ElementBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementBuilder.ts"],"names":[],"mappings":";;;AAYA,MAAsB,cAAc;IAUlC,YAAsB,MAAc;QAClC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CAUF;AAtCD,wCAsCC"}
+{"version":3,"file":"ElementBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementBuilder.ts"],"names":[],"mappings":";;;AAYA,MAAsB,cAAc;IAWlC,YAAsB,MAAc;QAClC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,SAAS,CAAC,MAAe;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CAUF;AA5CD,wCA4CC"}

package/src/utils/elementbuilder/ElementLeverageBuilder.js

@@ -86,6 +86,7 @@ class ElementLeverageBuilder extends ElementBuilder_1.ElementBuilder {
             networkId,
             platformId: this.platformId || platformId,
             value,
+            netApy: this.netApy,
         };
     }
 }

package/src/utils/elementbuilder/ElementLeverageBuilder.js.map

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

package/src/utils/elementbuilder/ElementLiquidityBuilder.js

@@ -23,6 +23,32 @@ class ElementLiquidityBuilder extends ElementBuilder_1.ElementBuilder {
             .filter((a) => a !== null);
         if (liquidities.length === 0)
             return null;
+        const value = (0, portfolio_core_1.getUsdValueSum)(liquidities.map((asset) => asset.value));
+        let netApy;
+        if (this.netApy)
+            netApy = this.netApy;
+        else if (value) {
+            const yieldItems = [];
+            liquidities.forEach((liquidity, i) => {
+                if (liquidity.yields[i] && liquidity.value) {
+                    yieldItems.push({
+                        apy: liquidity.yields[i].apy,
+                        value: liquidity.value,
+                    });
+                }
+                liquidity.assets.forEach((asset) => {
+                    if (asset.type === portfolio_core_1.PortfolioAssetType.token &&
+                        asset.data.yield &&
+                        asset.value) {
+                        yieldItems.push({
+                            apy: asset.data.yield.apy,
+                            value: asset.value,
+                        });
+                    }
+                });
+            });
+            netApy = (0, portfolio_core_1.reduceYieldElements)(yieldItems);
+        }
         return {
             type: portfolio_core_1.PortfolioElementType.liquidity,
             label: this.label,
@@ -31,9 +57,10 @@ class ElementLiquidityBuilder extends ElementBuilder_1.ElementBuilder {
             data: {
                 liquidities,
             },
-            value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((asset) => asset.value)),
+            value,
             name: this.name,
             tags: this.tags,
+            netApy,
         };
     }
 }

package/src/utils/elementbuilder/ElementLiquidityBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAElD,yDAAsD;AAGtD,MAAa,uBAAwB,SAAQ,+BAAc;IAGzD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,MAAwB;QACnC,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,CAAC;IAEQ,GAAG,CACV,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAyB,CAAC;QAErD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1C,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,SAAS;YACpC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,IAAI,EAAE;gBACJ,WAAW;aACZ;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;CACF;AA3CD,0DA2CC"}
+{"version":3,"file":"ElementLiquidityBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementLiquidityBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAUoC;AACpC,qDAAkD;AAElD,yDAAsD;AAGtD,MAAa,uBAAwB,SAAQ,+BAAc;IAGzD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,YAAY,CAAC,MAAwB;QACnC,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxC,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,CAAC;IAEQ,GAAG,CACV,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW;aACjC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAyB,CAAC;QAErD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE1C,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAEtE,IAAI,MAAM,CAAC;QACX,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;aACjC,IAAI,KAAK,EAAE,CAAC;YACf,MAAM,UAAU,GAAmB,EAAE,CAAC;YAEtC,WAAW,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;gBACnC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;oBAC3C,UAAU,CAAC,IAAI,CAAC;wBACd,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;wBAC5B,KAAK,EAAE,SAAS,CAAC,KAAK;qBACvB,CAAC,CAAC;gBACL,CAAC;gBACD,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBACjC,IACE,KAAK,CAAC,IAAI,KAAK,mCAAkB,CAAC,KAAK;wBACvC,KAAK,CAAC,IAAI,CAAC,KAAK;wBAChB,KAAK,CAAC,KAAK,EACX,CAAC;wBACD,UAAU,CAAC,IAAI,CAAC;4BACd,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG;4BACzB,KAAK,EAAE,KAAK,CAAC,KAAK;yBACnB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,MAAM,GAAG,IAAA,oCAAmB,EAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,SAAS;YACpC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,IAAI,EAAE;gBACJ,WAAW;aACZ;YACD,KAAK;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AA3ED,0DA2EC"}

package/src/utils/elementbuilder/ElementMultipleBuilder.js

@@ -30,6 +30,24 @@ class ElementMultipleBuilder extends ElementBuilder_1.ElementBuilder {
             .filter((a) => a !== null);
         if (assets.length === 0)
             return null;
+        const value = (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value));
+        let netApy;
+        if (this.netApy)
+            netApy = this.netApy;
+        else if (value) {
+            const yieldItems = [];
+            assets.forEach((asset) => {
+                if (asset.type === portfolio_core_1.PortfolioAssetType.token &&
+                    asset.data.yield &&
+                    asset.value) {
+                    yieldItems.push({
+                        apy: asset.data.yield.apy,
+                        value: asset.value,
+                    });
+                }
+            });
+            netApy = (0, portfolio_core_1.reduceYieldElements)(yieldItems);
+        }
         return {
             type: portfolio_core_1.PortfolioElementType.multiple,
             label: this.label,
@@ -41,9 +59,10 @@ class ElementMultipleBuilder extends ElementBuilder_1.ElementBuilder {
                 sourceRefs: this.sourceRefs,
                 link: this.link,
             },
-            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value)),
+            value,
             name: this.name,
             tags: this.tags,
+            netApy,
         };
     }
 }

package/src/utils/elementbuilder/ElementMultipleBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ElementMultipleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementMultipleBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAOoC;AACpC,qDAAkD;AAClD,2DAAwD;AAQxD,+DAA4D;AAE5D,uEAAoE;AAEpE,MAAa,sBAAuB,SAAQ,+BAAc;IAGxD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,MAAiC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qCAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,MAAuC;QACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,iDAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,eAAe,CAAC,MAAmC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChE,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAqB,CAAC;QAEjD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAErC,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,IAAI,EAAE;gBACJ,MAAM;gBACN,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;IACJ,CAAC;CACF;AApDD,wDAoDC"}
+{"version":3,"file":"ElementMultipleBuilder.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/elementbuilder/ElementMultipleBuilder.ts"],"names":[],"mappings":";;;AAAA,+DAUoC;AACpC,qDAAkD;AAClD,2DAAwD;AAQxD,+DAA4D;AAE5D,uEAAoE;AAEpE,MAAa,sBAAuB,SAAQ,+BAAc;IAGxD,YAAY,MAAc;QACxB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,MAAiC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qCAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,MAAuC;QACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,iDAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,eAAe,CAAC,MAAmC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChE,CAAC;IAED,GAAG,CACD,SAAwB,EACxB,UAAkB,EAClB,WAA0B,EAC1B,WAA0B;;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;aACtD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAqB,CAAC;QAEjD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAErC,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAEjE,IAAI,MAAM,CAAC;QACX,IAAI,IAAI,CAAC,MAAM;YAAE,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;aACjC,IAAI,KAAK,EAAE,CAAC;YACf,MAAM,UAAU,GAAmB,EAAE,CAAC;YACtC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvB,IACE,KAAK,CAAC,IAAI,KAAK,mCAAkB,CAAC,KAAK;oBACvC,KAAK,CAAC,IAAI,CAAC,KAAK;oBAChB,KAAK,CAAC,KAAK,EACX,CAAC;oBACD,UAAU,CAAC,IAAI,CAAC;wBACd,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG;wBACzB,KAAK,EAAE,KAAK,CAAC,KAAK;qBACnB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,GAAG,IAAA,oCAAmB,EAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO;YACL,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;YACzC,IAAI,EAAE;gBACJ,MAAM;gBACN,GAAG,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB;YACD,KAAK;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM;SACP,CAAC;IACJ,CAAC;CACF;AA1ED,wDA0EC"}

package/src/utils/elementbuilder/ElementTradeBuilder.js

@@ -87,6 +87,7 @@ class ElementTradeBuilder extends ElementBuilder_1.ElementBuilder {
                 link: this.link,
             },
             value: (0, portfolio_core_1.getUsdValueSum)([(inputAsset === null || inputAsset === void 0 ? void 0 : inputAsset.value) || 0, (outputAsset === null || outputAsset === void 0 ? void 0 : outputAsset.value) || 0]),
+            netApy: this.netApy,
         };
     }
 }

package/src/utils/elementbuilder/ElementTradeBuilder.js.map

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

package/src/utils/elementbuilder/Params.d.ts

@@ -13,6 +13,7 @@ export type Params = {
     sourceRefs?: SourceRef[];
     ref?: string | PublicKey;
     link?: string;
+    netApy?: number;
 };
 export type LiquidityParams = {
     name?: string;

package/src/utils/misc/getLpUnderlyingTokenSource.d.ts

@@ -1,5 +1,6 @@
 import { NetworkIdType, TokenPrice, TokenPriceSource } from '@sonarwatch/portfolio-core';
 export declare const defaultAcceptedPairs: Map<NetworkIdType, string[]>;
+export declare const solanaAcceptedPairs: string[] | undefined;
 export type PoolUnderlying = {
     address: string;
     reserveAmount: number;

package/src/utils/misc/getLpUnderlyingTokenSource.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.getLpUnderlyingTokenSource = exports.defaultAcceptedPairs = void 0;
+exports.getLpUnderlyingTokenSource = exports.solanaAcceptedPairs = exports.defaultAcceptedPairs = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const getSourceWeight_1 = __importDefault(require("./getSourceWeight"));
 const constants_1 = require("../sui/constants");
@@ -47,6 +47,7 @@ exports.defaultAcceptedPairs = new Map([
         ].map((a) => (0, portfolio_core_1.formatTokenAddress)(a, portfolio_core_1.NetworkId.sui)),
     ],
 ]);
+exports.solanaAcceptedPairs = exports.defaultAcceptedPairs.get(portfolio_core_1.NetworkId.solana);
 function getLpUnderlyingTokenSource(params) {
     let { platformId, acceptedPairs, minReserveValue } = params;
     const { networkId, poolUnderlyings, sourceId, liquidityName, elementName } = params;

package/src/utils/misc/getLpUnderlyingTokenSource.js.map

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