@sonarwatch/portfolio-plugins 0.14.151 → 0.14.152

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.airdropConfigs = exports.lfgDisProgram = exports.lfgApiBaseUrl = exports.jupDecimals = exports.jupMint = exports.lockerPubkey = exports.voteProgramId = exports.platform = exports.platformId = void 0;
+exports.airdropConfigs = exports.lfgDisProgram = exports.lfgApiBaseUrl = exports.jupApiToken = exports.jupDecimals = exports.jupMint = exports.lockerPubkey = exports.voteProgramId = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../../kamino/constants");
 exports.platformId = 'jupiter-launchpad';
@@ -17,6 +17,7 @@ exports.voteProgramId = new web3_js_1.PublicKey('voTpe3tHQ7AjQHMapgSue2HJFAh2cGs
 exports.lockerPubkey = new web3_js_1.PublicKey('CVMdMd79no569tjc5Sq7kzz8isbfCcFyBS5TLGsrZ5dN');
 exports.jupMint = 'JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN';
 exports.jupDecimals = 6;
+exports.jupApiToken = process.env['PORTFOLIO_JUP_API_PARAM'];
 exports.lfgApiBaseUrl = 'https://worker.jup.ag/jup-claim-proof';
 exports.lfgDisProgram = 'DiSLRwcSFvtwvMWSs7ubBMvYRaYNYupa76ZSuYLe6D7j';
 exports.airdropConfigs = [
@@ -26,7 +27,7 @@ exports.airdropConfigs = [
         distributorProgram: 'meRjbQXFNf5En86FXT2YPz1dQzLj4Yb3xK8u1MVgqpb',
         label: 'JUP',
         platformId: exports.platformId,
-        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN/${owner}`,
+        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN/${owner}?${exports.jupApiToken !== null && exports.jupApiToken !== void 0 ? exports.jupApiToken : ''}`,
         statics: {
             claimStart: 1706659200000,
             claimEnd: 1722430800000,
@@ -44,7 +45,7 @@ exports.airdropConfigs = [
         distributorProgram: exports.lfgDisProgram,
         label: 'ZEUS',
         platformId: exports.platformId,
-        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/ZEUS1aR7aX8DFFJf5QjWj2ftDDdNTroMNGo8YoQm3Gq/${owner}`,
+        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/ZEUS1aR7aX8DFFJf5QjWj2ftDDdNTroMNGo8YoQm3Gq/${owner}?${exports.jupApiToken !== null && exports.jupApiToken !== void 0 ? exports.jupApiToken : ''}`,
         statics: {
             claimStart: 1712235600000,
             claimEnd: 1713445200000,
@@ -61,7 +62,7 @@ exports.airdropConfigs = [
         distributorProgram: exports.lfgDisProgram,
         label: 'TNSR',
         platformId: exports.platformId,
-        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6/${owner}`,
+        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6/${owner}?${exports.jupApiToken !== null && exports.jupApiToken !== void 0 ? exports.jupApiToken : ''}`,
         statics: {
             claimStart: 1712534400000,
             claimEnd: 1728086400000,
@@ -78,7 +79,7 @@ exports.airdropConfigs = [
         distributorProgram: exports.lfgDisProgram,
         label: 'SHARKY',
         platformId: exports.platformId,
-        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/SHARKSYJjqaNyxVfrpnBN9pjgkhwDhatnMyicWPnr1s/${owner}`,
+        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/SHARKSYJjqaNyxVfrpnBN9pjgkhwDhatnMyicWPnr1s/${owner}?${exports.jupApiToken !== null && exports.jupApiToken !== void 0 ? exports.jupApiToken : ''}`,
         statics: {
             claimStart: 1713225600000,
             claimEnd: 1714435200000,
@@ -95,7 +96,7 @@ exports.airdropConfigs = [
         distributorProgram: exports.lfgDisProgram,
         label: 'UPT',
         platformId: exports.platformId,
-        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/UPTx1d24aBWuRgwxVnFmX4gNraj3QGFzL3QqBgxtWQG/${owner}`,
+        getApiPath: (owner) => `${exports.lfgApiBaseUrl}/UPTx1d24aBWuRgwxVnFmX4gNraj3QGFzL3QqBgxtWQG/${owner}?${exports.jupApiToken !== null && exports.jupApiToken !== void 0 ? exports.jupApiToken : ''}`,
         statics: {
             claimStart: 1717077600000,
             claimEnd: 1719878400000,
@@ -130,7 +131,7 @@ exports.airdropConfigs = [
         distributorProgram: 'DiS3nNjFVMieMgmiQFm6wgJL7nevk4NrhXKLbtEH1Z2R',
         label: 'JUP',
         platformId: exports.platformId,
-        getApiPath: (owner) => `https://jupuary-api.jup.ag/claim-proof-2025/${owner}`,
+        getApiPath: (owner) => `https://jupuary-api.jup.ag/claim-proof-2025/${owner}?${exports.jupApiToken !== null && exports.jupApiToken !== void 0 ? exports.jupApiToken : ''}`,
         statics: {
             claimStart: 1737547200000,
             claimEnd: 1745323200000,

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG5C,sDAAwE;AAE3D,QAAA,UAAU,GAAG,mBAAmB,CAAC;AAC9C,MAAM,aAAa,GAAG,gDAAgD,CAAC;AAC1D,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,qBAAqB;IAC9B,OAAO,EAAE,qCAAqC;IAC9C,WAAW,EAAE,2CAA2C;CACzD,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,OAAO,GAAG,6CAA6C,CAAC;AACxD,QAAA,WAAW,GAAG,CAAC,CAAC;AAEhB,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AACrD,QAAA,aAAa,GAAG,uCAAuC,CAAC;AACxD,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAE/D,QAAA,cAAc,GAAoB;IAC7C;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,6CAA6C;QACjE,KAAK,EAAE,KAAK;QACZ,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,mBAAW,aAAX,mBAAW,cAAX,mBAAW,GAAI,EACjB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,qBAAqB;YACzB,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,SAAS;YACtB,WAAW,EAAE,iBAAiB;YAC9B,SAAS,EAAE,wBAAwB;YACnC,KAAK,EAAE,aAAa;SACrB;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,MAAM;QACb,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,mBAAW,aAAX,mBAAW,cAAX,mBAAW,GAAI,EACjB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,UAAU;YACd,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,0BAA0B;YACvC,SAAS,EAAE,yBAAyB;YACpC,KAAK,EACH,0EAA0E;SAC7E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,MAAM;QACb,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,mBAAW,aAAX,mBAAW,cAAX,mBAAW,GAAI,EACjB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,YAAY;YAChB,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,2BAA2B;YACxC,SAAS,EAAE,2BAA2B;YACtC,KAAK,EACH,4EAA4E;SAC/E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,QAAQ;QACf,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,mBAAW,aAAX,mBAAW,cAAX,mBAAW,GAAI,EACjB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,YAAY;YAChB,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,oBAAoB;YACjC,SAAS,EAAE,2BAA2B;YACtC,KAAK,EACH,4EAA4E;SAC/E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,qBAAa;QACjC,KAAK,EAAE,KAAK;QACZ,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,GAAG,qBAAa,gDAAgD,KAAK,IACnE,mBAAW,aAAX,mBAAW,cAAX,mBAAW,GAAI,EACjB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,YAAY;YAChB,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,qBAAqB;YAClC,SAAS,EAAE,2BAA2B;YACtC,KAAK,EACH,4EAA4E;SAC/E;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,6CAA6C;QACjE,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,sBAAgB;QAC5B,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,+CAA+C,KAAK,EAAE;QACxD,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,WAAW;YACf,WAAW,EAAE,QAAQ;YACrB,WAAW,EAAE,6BAA6B;YAC1C,SAAS,EAAE,6CAA6C;YACxD,KAAK,EACH,4EAA4E;YAC9E,IAAI,EAAE,IAAI;SACX;KACF;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,kBAAkB,EAAE,8CAA8C;QAClE,KAAK,EAAE,KAAK;QACZ,UAAU,EAAV,kBAAU;QACV,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAC5B,+CAA+C,KAAK,IAClD,mBAAW,aAAX,mBAAW,cAAX,mBAAW,GAAI,EACjB,EAAE;QACJ,OAAO,EAAE;YACP,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,aAAa;YACvB,EAAE,EAAE,iCAAiC;YACrC,WAAW,EAAE,SAAS;YACtB,WAAW,EAAE,iBAAiB;YAC9B,SAAS,EAAE,yBAAyB;YACpC,KAAK,EAAE,aAAa;YACpB,IAAI,EAAE,cAAc;SACrB;KACF;CACF,CAAC"}

package/src/plugins/jupiter/pricingJob.js

@@ -22,6 +22,7 @@ const getMultipleDecimalsAsMap_1 = require("../../utils/solana/getMultipleDecima
 const clients_1 = require("../../utils/clients");
 const constants_3 = require("../sanctum/constants");
 const solana_1 = require("../../utils/solana");
+const constants_4 = require("./launchpad/constants");
 const mints = [
     'xLfNTYy76B8Tiix3hA51Jyvc1kMSFV4sPdR7szTZsRu', // xLifinity
     'DdFPRnccQqLD4zCHrBqdY95D6hvw6PLWp9DEXj1fLCL9', // Wrapped USDC (Allbridge from Ethereum)
@@ -53,7 +54,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const [solSources, verifiedTokens] = yield Promise.all([
         (0, helpers_1.getJupiterPrices)([new web3_js_1.PublicKey(vsToken)], new web3_js_1.PublicKey(solana_1.usdcSolanaMint)),
-        axios_1.default.get('https://tokens.jup.ag/tokens?tags=verified'),
+        axios_1.default.get(`https://tokens.jup.ag/tokens?tags=verified&${constants_4.jupApiToken !== null && constants_4.jupApiToken !== void 0 ? constants_4.jupApiToken : ''}`),
     ]);
     const solPrice = solSources.get(vsToken);
     if (!solPrice)

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

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

package/src/plugins/orca/getWhirlpoolPositions.js

@@ -77,13 +77,6 @@ function getOrcaNftFetcher(platformId, programId) {
                 continue;
             const element = elementRegistry.addElementConcentratedLiquidity({
                 link: 'https://www.orca.so/portfolio',
-                ref: positionInfo.pubkey.toString(),
-                sourceRefs: [
-                    {
-                        name: 'Pool',
-                        address: whirlpoolInfo.pubkey.toString(),
-                    },
-                ],
             });
             const liquidity = element.setLiquidity({
                 addressA: whirlpoolInfo.tokenMintA,
@@ -97,6 +90,13 @@ function getOrcaNftFetcher(platformId, programId) {
                 feeRate: (Number(whirlpoolInfo.feeRate) / 10000) *
                     (1 - whirlpoolInfo.protocolFeeRate / 10000),
                 swapVolume24h: (_a = allWhirlpoolsStats.find((p) => (p === null || p === void 0 ? void 0 : p.address) === positionInfo.whirlpool.toString())) === null || _a === void 0 ? void 0 : _a.stats['24h'].volume,
+                ref: positionInfo.pubkey.toString(),
+                sourceRefs: [
+                    {
+                        name: 'Pool',
+                        address: whirlpoolInfo.pubkey.toString(),
+                    },
+                ],
             });
             const feesAndRewards = (0, helpers_fees_1.calcFeesAndRewards)(whirlpoolInfo, positionInfo, tickArrays);
             if (feesAndRewards) {

package/src/plugins/orca/getWhirlpoolPositions.js.map

@@ -1 +1 @@
-{"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAC5C,2CAIqB;AACrB,iDAAsD;AACtD,+CAG4B;AAE5B,mDAAgE;AAEhE,iDAAwE;AACxE,gFAA6E;AAGhE,QAAA,qBAAqB,GAAG,iBAAiB,CACpD,sBAAc,EACd,4BAAgB,CACjB,CAAC;AAEF,SAAgB,iBAAiB,CAC/B,UAAkB,EAClB,SAAoB;IAEpB,OAAO,CACL,KAAY,EACZ,IAAiC,EACJ,EAAE;;QAC/B,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,uBAAuB,GAAgB,EAAE,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEhD,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEnE,MAAM,CAAC,cAAc,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACvD,YAAY,EACZ,SAAS,CACV,CAAC;YACF,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QACH,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEpD,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,MAAM,EACN,0BAAc,EACd,uBAAuB,CACxB,CAAC;QACF,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAE5D,MAAM,kBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,IAAI,GAAG;gBAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChE,KAAK,CAAC,QAAQ,CAA2B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBACvE,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B,CAAC;YACF,KAAK,CAAC,QAAQ,CACZ,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EACvD;gBACE,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B,CACF;SACF,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA0C,IAAI,GAAG,EAAE,CAAC;QACtE,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAClC,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;gBACpD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEvC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QAEzE,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC1E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAC1D,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,YAAY;gBAAE,SAAS;YAE5B,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,aAAa;gBAAE,SAAS;YAE7B,IACE,CAAC,aAAa,CAAC,UAAU;gBACzB,CAAC,aAAa,CAAC,UAAU;gBACzB,CAAC,aAAa,CAAC,gBAAgB;gBAE/B,SAAS;YAEX,MAAM,OAAO,GAAG,eAAe,CAAC,+BAA+B,CAAC;gBAC9D,IAAI,EAAE,+BAA+B;gBACrC,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACnC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE;qBACzC;iBACF;aACF,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;gBACrC,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,cAAc,EAAE,YAAY,CAAC,cAAc;gBAC3C,cAAc,EAAE,YAAY,CAAC,cAAc;gBAC3C,gBAAgB,EAAE,aAAa,CAAC,SAAS;gBACzC,aAAa,EAAE,aAAa,CAAC,SAAS;gBACtC,OAAO,EACL,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;oBACvC,CAAC,CAAC,GAAG,aAAa,CAAC,eAAe,GAAG,KAAK,CAAC;gBAC7C,aAAa,EAAE,MAAA,kBAAkB,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,MAAK,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,CACxD,0CAAE,KAAK,CAAC,KAAK,EAAE,MAAM;aACvB,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,IAAA,iCAAkB,EACvC,aAAa,EACb,YAAY,EACZ,UAAU,CACX,CAAC;YAEF,IAAI,cAAc,EAAE,CAAC;gBACnB,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;oBACjC,MAAM,EAAE,cAAc,CAAC,QAAQ;iBAChC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;oBACjC,MAAM,EAAE,cAAc,CAAC,QAAQ;iBAChC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1C,MAAM,EAAE,cAAc,CAAC,WAAW;iBACnC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1C,MAAM,EAAE,cAAc,CAAC,WAAW;iBACnC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1C,MAAM,EAAE,cAAc,CAAC,WAAW;iBACnC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAA,CAAC;AACJ,CAAC;AA9ID,8CA8IC"}
+{"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":"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"}

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

@@ -7,4 +7,6 @@ export type WhirlpoolStat = {
         };
     };
     tvlUsdc: string;
+    apr?: string;
+    feeRate?: number;
 };

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

@@ -1,7 +1,6 @@
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
-import { IdlItem } from '@solanafm/explorer-kit-idls';
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "picasso";
 export declare const platform: Platform;
@@ -9,4 +8,3 @@ export declare const unstakingNftsCacheKey = "unstaking-nfts";
 export declare const unstakingNftsCachePrefix = "picasso";
 export declare const restakingProgramId: PublicKey;
 export declare const unstakingOwner = "BoNnRkatYrN7ckA9oAU4e7cHYfwKPgLEuzkKg4LWaHeH";
-export declare const restakingIdlItem: IdlItem;

package/src/plugins/picasso/constants.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.restakingIdlItem = exports.unstakingOwner = exports.restakingProgramId = exports.unstakingNftsCachePrefix = exports.unstakingNftsCacheKey = exports.platform = exports.platformId = void 0;
+exports.unstakingOwner = exports.restakingProgramId = exports.unstakingNftsCachePrefix = exports.unstakingNftsCacheKey = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const idl_1 = require("./idl");
 exports.platformId = 'picasso';
 exports.platform = {
     id: exports.platformId,
@@ -23,9 +22,4 @@ exports.unstakingNftsCacheKey = `unstaking-nfts`;
 exports.unstakingNftsCachePrefix = `${exports.platformId}`;
 exports.restakingProgramId = new web3_js_1.PublicKey('8n3FHwYxFgQCQc2FNFkwDUf9mcqupxXcCvgfHbApMLv3');
 exports.unstakingOwner = 'BoNnRkatYrN7ckA9oAU4e7cHYfwKPgLEuzkKg4LWaHeH';
-exports.restakingIdlItem = {
-    programId: exports.restakingProgramId.toString(),
-    idl: idl_1.restakingIdl,
-    idlType: 'anchor',
-};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/constants.ts"],"names":[],"mappings":";;;AAEA,6CAA4C;AAC5C,+BAAqC;AAExB,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EACH,6EAA6E;IAC/E,OAAO,EAAE,6CAA6C;IACtD,OAAO,EAAE,+BAA+B;IACxC,4EAA4E;IAC5E,OAAO,EAAE,uCAAuC;IAChD,QAAQ,EAAE,6BAA6B;IACvC,MAAM,EAAE,iCAAiC;IACzC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE,qCAAqC;IAC7C,MAAM,EAAE,CAAC,8CAA8C,CAAC;IACxD,WAAW,EACT,iIAAiI;CACpI,CAAC;AAEW,QAAA,qBAAqB,GAAG,gBAAgB,CAAC;AACzC,QAAA,wBAAwB,GAAG,GAAG,kBAAU,EAAE,CAAC;AAE3C,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAC7C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,8CAA8C,CAAC;AAEhE,QAAA,gBAAgB,GAAG;IAC9B,SAAS,EAAE,0BAAkB,CAAC,QAAQ,EAAE;IACxC,GAAG,EAAE,kBAAY;IACjB,OAAO,EAAE,QAAQ;CACP,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/constants.ts"],"names":[],"mappings":";;;AACA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EACH,6EAA6E;IAC/E,OAAO,EAAE,6CAA6C;IACtD,OAAO,EAAE,+BAA+B;IACxC,4EAA4E;IAC5E,OAAO,EAAE,uCAAuC;IAChD,QAAQ,EAAE,6BAA6B;IACvC,MAAM,EAAE,iCAAiC;IACzC,aAAa,EAAE,+BAA+B;IAC9C,MAAM,EAAE,qCAAqC;IAC7C,MAAM,EAAE,CAAC,8CAA8C,CAAC;IACxD,WAAW,EACT,iIAAiI;CACpI,CAAC;AAEW,QAAA,qBAAqB,GAAG,gBAAgB,CAAC;AACzC,QAAA,wBAAwB,GAAG,GAAG,kBAAU,EAAE,CAAC;AAE3C,QAAA,kBAAkB,GAAG,IAAI,mBAAS,CAC7C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,8CAA8C,CAAC"}

package/src/plugins/picasso/helpers.js

@@ -20,6 +20,7 @@ const constants_1 = require("./constants");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
+const structs_1 = require("./structs");
 const getPositionPublicKey = (ei) => {
     const [vaultParamsPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('vault_params', 'utf-8'), ei.toBuffer()], constants_1.restakingProgramId);
     return vaultParamsPDA;
@@ -30,22 +31,24 @@ exports.isPicassoPosition = isPicassoPosition;
 function getPicassoElementsFromNFTs(cache, nfts) {
     return __awaiter(this, void 0, void 0, function* () {
         const connection = (0, clients_1.getClientSolana)();
-        const vaults = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.restakingIdlItem, nfts.map((asset) => (0, exports.getPositionPublicKey)(new web3_js_1.PublicKey(asset.data.address))));
+        const vaults = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.vaultStruct, nfts.map((asset) => (0, exports.getPositionPublicKey)(new web3_js_1.PublicKey(asset.data.address))));
         const heliusAssetsPositions = nfts.filter((item, i) => vaults[i]);
         if (heliusAssetsPositions.length === 0)
             return [];
         const tokenMints = [
-            ...new Set(heliusAssetsPositions.map((item, i) => { var _a; return (_a = vaults[i]) === null || _a === void 0 ? void 0 : _a.stakeMint; }).flat()),
+            ...new Set(heliusAssetsPositions
+                .map((item, i) => { var _a; return (_a = vaults[i]) === null || _a === void 0 ? void 0 : _a.stakeMint.toString(); })
+                .flat()),
         ].filter((s) => s !== null);
         const tokenPrices = yield cache.getTokenPricesAsMap(tokenMints, portfolio_core_1.NetworkId.solana);
         const assets = [];
         heliusAssetsPositions.forEach((item, i) => {
             const vault = vaults[i];
             if (vault) {
-                const tokenPrice = tokenPrices.get(vault.stakeMint);
+                const tokenPrice = tokenPrices.get(vault.stakeMint.toString());
                 if (!tokenPrice)
                     return;
-                assets.push((0, tokenPriceToAssetToken_1.default)(vault.stakeMint, new bignumber_js_1.default(vault.stakeAmount)
+                assets.push((0, tokenPriceToAssetToken_1.default)(vault.stakeMint.toString(), new bignumber_js_1.default(vault.stakeAmount)
                     .dividedBy(Math.pow(10, tokenPrice.decimals))
                     .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
             }

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

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

package/src/plugins/picasso/structs.d.ts

@@ -0,0 +1,39 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { PublicKey } from '@solana/web3.js';
+import BigNumber from 'bignumber.js';
+import { BeetStruct, DataEnumKeyAsKind, FixableBeetStruct, COption } from '@metaplex-foundation/beet';
+type ServiceRecord = {
+    GuestChain: {
+        validator: PublicKey;
+    };
+};
+type Service = DataEnumKeyAsKind<ServiceRecord>;
+export type WithdrawalRequestParams = {
+    timestampInSec: BigNumber;
+    owner: PublicKey;
+    tokenAccount: PublicKey;
+};
+export declare const withdrawalRequestParamsStruct: BeetStruct<WithdrawalRequestParams, Partial<WithdrawalRequestParams>>;
+export type Vault = {
+    accountDiscriminator: number[];
+    stakeTimestampSec: BigNumber;
+    service: COption<Service>;
+    stakeAmount: BigNumber;
+    stakeMint: PublicKey;
+    lastReceivedRewardsHeight: BigNumber;
+    withdrawalRequest: COption<WithdrawalRequestParams>;
+};
+export declare const vaultStruct: FixableBeetStruct<Vault, Partial<Vault>>;
+export type StakingParams = {
+    accountDiscriminator: number[];
+    admin: PublicKey;
+    whitelistedTokens: PublicKey[];
+    guestChainProgramId?: PublicKey;
+    rewardsTokenMint: PublicKey;
+    stakingCap: BigNumber;
+    totalDepositedAmount: BigNumber;
+    newAdminProposal?: PublicKey;
+};
+export declare const stakingParamsStruct: BeetStruct<StakingParams, Partial<StakingParams>>;
+export {};

package/src/plugins/picasso/structs.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stakingParamsStruct = exports.vaultStruct = exports.withdrawalRequestParamsStruct = void 0;
+const beet_1 = require("@metaplex-foundation/beet");
+const beet_solana_1 = require("@metaplex-foundation/beet-solana");
+const solana_1 = require("../../utils/solana");
+const serviceStruct = (0, beet_1.dataEnum)([
+    [
+        'GuestChain',
+        new beet_1.FixableBeetArgsStruct([['validator', beet_solana_1.publicKey]], 'ServiceRecord["GuestChain"]'),
+    ],
+]);
+exports.withdrawalRequestParamsStruct = new beet_1.BeetStruct([
+    ['timestampInSec', solana_1.u64],
+    ['owner', beet_solana_1.publicKey],
+    ['tokenAccount', beet_solana_1.publicKey],
+], (args) => args);
+exports.vaultStruct = new beet_1.FixableBeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['stakeTimestampSec', solana_1.i64],
+    ['service', (0, beet_1.coption)(serviceStruct)],
+    ['stakeAmount', solana_1.u64],
+    ['stakeMint', beet_solana_1.publicKey],
+    ['lastReceivedRewardsHeight', solana_1.u64],
+    ['withdrawalRequest', (0, beet_1.coption)(exports.withdrawalRequestParamsStruct)],
+], (args) => args);
+exports.stakingParamsStruct = new beet_1.BeetStruct([
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['admin', beet_solana_1.publicKey],
+    ['whitelistedTokens', (0, beet_1.uniformFixedSizeArray)(beet_solana_1.publicKey, 10)], // Adjust size if needed
+    ['guestChainProgramId', beet_solana_1.publicKey],
+    ['rewardsTokenMint', beet_solana_1.publicKey],
+    ['stakingCap', solana_1.u128],
+    ['totalDepositedAmount', solana_1.u128],
+    ['newAdminProposal', beet_solana_1.publicKey],
+], (args) => args);
+//# sourceMappingURL=structs.js.map

package/src/plugins/picasso/structs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/structs.ts"],"names":[],"mappings":";;;AAEA,oDAWmC;AACnC,kEAA6D;AAC7D,+CAAoD;AASpD,MAAM,aAAa,GAAG,IAAA,eAAQ,EAAgB;IAC5C;QACE,YAAY;QACZ,IAAI,4BAAqB,CACvB,CAAC,CAAC,WAAW,EAAE,uBAAS,CAAC,CAAC,EAC1B,6BAA6B,CAC9B;KACF;CACF,CAAyB,CAAC;AAQd,QAAA,6BAA6B,GACxC,IAAI,iBAAU,CACZ;IACE,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,cAAc,EAAE,uBAAS,CAAC;CAC5B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAA+B,CAC1C,CAAC;AAaS,QAAA,WAAW,GAAG,IAAI,wBAAiB,CAC9C;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,mBAAmB,EAAE,YAAG,CAAC;IAC1B,CAAC,SAAS,EAAE,IAAA,cAAO,EAAC,aAAa,CAAC,CAAC;IACnC,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,WAAW,EAAE,uBAAS,CAAC;IACxB,CAAC,2BAA2B,EAAE,YAAG,CAAC;IAClC,CAAC,mBAAmB,EAAE,IAAA,cAAO,EAAC,qCAA6B,CAAC,CAAC;CAC9D,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAa,CACxB,CAAC;AAaW,QAAA,mBAAmB,GAAG,IAAI,iBAAU,CAC/C;IACE,CAAC,sBAAsB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,mBAAmB,EAAE,IAAA,4BAAqB,EAAC,uBAAS,EAAE,EAAE,CAAC,CAAC,EAAE,wBAAwB;IACrF,CAAC,qBAAqB,EAAE,uBAAS,CAAC;IAClC,CAAC,kBAAkB,EAAE,uBAAS,CAAC;IAC/B,CAAC,YAAY,EAAE,aAAI,CAAC;IACpB,CAAC,sBAAsB,EAAE,aAAI,CAAC;IAC9B,CAAC,kBAAkB,EAAE,uBAAS,CAAC;CAChC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAqB,CAChC,CAAC"}

package/src/plugins/picasso/unstakingNftsJob.js

@@ -21,6 +21,7 @@ const heliusAssetToAssetCollectible_1 = require("../../utils/solana/das/heliusAs
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const helpers_1 = require("./helpers");
+const structs_1 = require("./structs");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const dasEndpoint = (0, getSolanaDasEndpoint_1.default)();
@@ -45,7 +46,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         nfts.push(nft);
     }
     const connection = (0, clients_1.getClientSolana)();
-    const vaults = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.restakingIdlItem, nfts.map((asset) => (0, helpers_1.getPositionPublicKey)(new web3_js_1.PublicKey(asset.data.address)))).then((vs) => vs.filter((v) => v !== null));
+    const vaults = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.vaultStruct, nfts.map((asset) => (0, helpers_1.getPositionPublicKey)(new web3_js_1.PublicKey(asset.data.address)))).then((vs) => vs.filter((v) => v !== null));
     yield cache.setItem(constants_1.unstakingNftsCacheKey, vaults, {
         prefix: constants_1.unstakingNftsCachePrefix,
         networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/picasso/unstakingNftsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"unstakingNftsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/unstakingNftsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAGoC;AACpC,6CAA4C;AAG5C,2CAMqB;AACrB,oGAA4E;AAE5E,oFAAiF;AACjF,wGAAqG;AACrG,iDAAsD;AACtD,+CAAuE;AAEvE,uCAAoE;AAEpE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,WAAW,GAAG,IAAA,8BAAoB,GAAE,CAAC;IAC3C,MAAM,cAAc,GAAmB;QACrC,sBAAsB,EAAE,IAAI;QAC5B,yBAAyB,EAAE,IAAI;QAC/B,eAAe,EAAE,KAAK;QACtB,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,KAAK;QACrB,YAAY,EAAE,IAAI;KACnB,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAmB,EACtC,WAAW,EACX,0BAAc,EACd,cAAc,CACf,CAAC;IAEF,MAAM,IAAI,GAAgC,EAAE,CAAC;IAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAA,6DAA6B,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,IAAI,MAAA,GAAG,CAAC,UAAU,CAAC,IAAI,0CAAE,QAAQ,CAAC,YAAY,CAAC;YAAE,SAAS;QAC1D,IAAI,CAAC,IAAA,2BAAiB,EAAC,GAAG,CAAC;YAAE,SAAS;QACtC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,IAAA,0CAAiC,EACpD,UAAU,EACV,4BAAgB,EAChB,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,8BAAoB,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAC7E,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAE7C,MAAM,KAAK,CAAC,OAAO,CAAC,iCAAqB,EAAE,MAAM,EAAE;QACjD,MAAM,EAAE,oCAAwB;QAChC,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,iBAAiB;IAClC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"unstakingNftsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/unstakingNftsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAGoC;AACpC,6CAA4C;AAG5C,2CAKqB;AACrB,oGAA4E;AAE5E,oFAAiF;AACjF,wGAAqG;AACrG,iDAAsD;AACtD,+CAAmE;AACnE,uCAAoE;AACpE,uCAAwC;AAExC,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,WAAW,GAAG,IAAA,8BAAoB,GAAE,CAAC;IAC3C,MAAM,cAAc,GAAmB;QACrC,sBAAsB,EAAE,IAAI;QAC5B,yBAAyB,EAAE,IAAI;QAC/B,eAAe,EAAE,KAAK;QACtB,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,KAAK;QACrB,YAAY,EAAE,IAAI;KACnB,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,yCAAmB,EACtC,WAAW,EACX,0BAAc,EACd,cAAc,CACf,CAAC;IAEF,MAAM,IAAI,GAAgC,EAAE,CAAC;IAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,GAAG,GAAG,IAAA,6DAA6B,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,IAAI,MAAA,GAAG,CAAC,UAAU,CAAC,IAAI,0CAAE,QAAQ,CAAC,YAAY,CAAC;YAAE,SAAS;QAC1D,IAAI,CAAC,IAAA,2BAAiB,EAAC,GAAG,CAAC;YAAE,SAAS;QACtC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,IAAA,sCAA6B,EAChD,UAAU,EACV,qBAAW,EACX,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,8BAAoB,EAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAC7E,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;IAE7C,MAAM,KAAK,CAAC,OAAO,CAAC,iCAAqB,EAAE,MAAM,EAAE;QACjD,MAAM,EAAE,oCAAwB;QAChC,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,iBAAiB;IAClC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/picasso/unstakingPositionsFetcher.js

@@ -27,16 +27,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const allVaults = yield allVaultsMemo.getItem(cache);
     if (!allVaults)
         throw new Error('Vaults not cached');
-    const myVaults = allVaults.filter((v) => { var _a; return ((_a = v.withdrawalRequest) === null || _a === void 0 ? void 0 : _a.owner) === owner; });
+    const myVaults = allVaults.filter((v) => { var _a; return ((_a = v.withdrawalRequest) === null || _a === void 0 ? void 0 : _a.owner.toString()) === owner; });
     if (myVaults.length === 0)
         return [];
     const tokenMints = [
-        ...new Set(myVaults.map((vault) => vault.stakeMint).flat()),
+        ...new Set(myVaults.map((vault) => vault.stakeMint.toString()).flat()),
     ];
     const tokenPrices = yield cache.getTokenPricesAsMap(tokenMints, portfolio_core_1.NetworkId.solana);
     const assets = [];
     myVaults.forEach((vault) => {
-        const tokenPrice = tokenPrices.get(vault.stakeMint);
+        const tokenPrice = tokenPrices.get(vault.stakeMint.toString());
         if (!tokenPrice || !vault.withdrawalRequest)
             return;
         const unlockingAt = new Date(new bignumber_js_1.default(vault.withdrawalRequest.timestampInSec)
@@ -44,7 +44,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             .times(1000)
             .toNumber());
         const isClaimable = unlockingAt.getTime() < Date.now();
-        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(vault.stakeMint, new bignumber_js_1.default(vault.stakeAmount)
+        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(vault.stakeMint.toString(), new bignumber_js_1.default(vault.stakeAmount)
             .dividedBy(Math.pow(10, tokenPrice.decimals))
             .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice, undefined, {
             isClaimable,

package/src/plugins/picasso/unstakingPositionsFetcher.js.map

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

package/src/plugins/raydium/ammV2ApiJob.js

@@ -63,6 +63,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         let tokenPriceA;
         let tokenPriceB;
         const tokenPriceSources = [];
+        const poolStats = [];
         for (let id = 0; id < subPools.data.length; id++) {
             poolInfo = subPools.data[id];
             lpSupply = new bignumber_js_1.default(poolInfo.lpAmount);
@@ -145,7 +146,30 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                     });
                 }
             }
+            poolStats.push({
+                key: poolInfo.id,
+                value: {
+                    address: poolInfo.id,
+                    stats: {
+                        '24h': {
+                            volume: poolInfo.day.volume.toString(),
+                            fees: poolInfo.day.volumeFee.toString(),
+                        },
+                    },
+                    tvlUsdc: poolInfo.tvl.toString(),
+                    apr: poolInfo.day.apr.toString(),
+                    feeRate: poolInfo.config
+                        ? Number(poolInfo.feeRate) *
+                            100 *
+                            (1 - poolInfo.config.protocolFeeRate / 1000000)
+                        : undefined,
+                },
+            });
         }
+        yield cache.setItems(poolStats, {
+            prefix: constants_2.poolStatsPrefix,
+            networkId: portfolio_core_1.NetworkId.solana,
+        });
         yield cache.setTokenPriceSources(tokenPriceSources);
         page += 1;
     } while (subPools.hasNextPage && computeAndStoreLpPrice_1.minimumLiquidity.isLessThan(lastLiquidity));

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/constants.d.ts

@@ -5,6 +5,7 @@ import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "raydium";
 export declare const rayMint = "4k3Dyjzvzp8eMZWUXbBCjEvwSkkk59S5iCNLY3QrkX6R";
 export declare const platform: Platform;
+export declare const poolStatsPrefix = "raydium-pool-stats";
 export declare const apiV3 = "https://api-v3.raydium.io/";
 export declare const AMM_PROGRAM_ID_V3: PublicKey;
 export declare const AMM_PROGRAM_ID_V4: PublicKey;

package/src/plugins/raydium/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rayDecimals = exports.positionsIdentifier = exports.cpmmProgramId = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.AMM_PROGRAM_ID_V3 = exports.apiV3 = exports.platform = exports.rayMint = exports.platformId = void 0;
+exports.rayDecimals = exports.positionsIdentifier = exports.cpmmProgramId = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.AMM_PROGRAM_ID_V3 = exports.apiV3 = exports.poolStatsPrefix = exports.platform = exports.rayMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'raydium';
 exports.rayMint = '4k3Dyjzvzp8eMZWUXbBCjEvwSkkk59S5iCNLY3QrkX6R';
@@ -17,6 +17,7 @@ exports.platform = {
     tokens: [exports.rayMint],
     description: 'Raydium is an automated market maker (AMM) built on the Solana blockchain which enables lightning-fast trades, permissionless pool creation, and new features for earning yield',
 };
+exports.poolStatsPrefix = 'raydium-pool-stats';
 exports.apiV3 = 'https://api-v3.raydium.io/';
 exports.AMM_PROGRAM_ID_V3 = new web3_js_1.PublicKey('EhhTKczWMGQt46ynNeRX1WfeagwwJd7ufHvCDjRxjo5Q');
 exports.AMM_PROGRAM_ID_V4 = new web3_js_1.PublicKey('675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8');

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EACH,6EAA6E;IAC/E,WAAW,EAAE,SAAS;IACtB,OAAO,EAAE,qBAAqB;IAC9B,aAAa,EAAE,kCAAkC;IACjD,OAAO,EAAE,oCAAoC;IAC7C,QAAQ,EAAE,8BAA8B;IACxC,MAAM,EAAE,+BAA+B;IACvC,MAAM,EAAE,CAAC,eAAO,CAAC;IACjB,WAAW,EACT,iLAAiL;CACpL,CAAC;AAEW,QAAA,KAAK,GAAG,4BAA4B,CAAC;AAErC,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,gCAAgC,CAAC;AAEvD,QAAA,WAAW,GAAG,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AACzD,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,SAAS;IACf,KAAK,EACH,6EAA6E;IAC/E,WAAW,EAAE,SAAS;IACtB,OAAO,EAAE,qBAAqB;IAC9B,aAAa,EAAE,kCAAkC;IACjD,OAAO,EAAE,oCAAoC;IAC7C,QAAQ,EAAE,8BAA8B;IACxC,MAAM,EAAE,+BAA+B;IACvC,MAAM,EAAE,CAAC,eAAO,CAAC;IACjB,WAAW,EACT,iLAAiL;CACpL,CAAC;AAEW,QAAA,eAAe,GAAG,oBAAoB,CAAC;AACvC,QAAA,KAAK,GAAG,4BAA4B,CAAC;AAErC,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,gCAAgC,CAAC;AAEvD,QAAA,WAAW,GAAG,CAAC,CAAC"}

package/src/plugins/raydium/getRaydiumCLMMPositions.js

@@ -34,7 +34,10 @@ function getRaydiumCLMMPositions(cache, nfts) {
         if (!personalPositionsInfo || personalPositionsInfo.length === 0)
             return [];
         const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
-        const poolStatesInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, poolsIds);
+        const [poolStatesInfo, poolsStats] = yield Promise.all([
+            (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, poolsIds),
+            cache.getItems(poolsIds.map((p) => p.toString()), { prefix: constants_1.poolStatsPrefix, networkId: portfolio_core_1.NetworkId.solana }),
+        ]);
         const tickArrays = yield Promise.all(personalPositionsInfo.map((personalPositionInfo, index) => {
             if (!personalPositionInfo)
                 return [];
@@ -54,13 +57,10 @@ function getRaydiumCLMMPositions(cache, nfts) {
             const personalPositionInfo = personalPositionsInfo[index];
             if (!personalPositionInfo)
                 continue;
-            if (!poolStateInfo.tokenMint0 ||
-                !poolStateInfo.tokenMint1 ||
-                !poolStateInfo.tickCurrent)
-                continue;
             const element = elementRegistry.addElementConcentratedLiquidity({
                 link: 'https://raydium.io/portfolio/?position_tab=concentrated',
             });
+            const poolStats = poolsStats.find((p) => (p === null || p === void 0 ? void 0 : p.address) === personalPositionInfo.poolId.toString());
             const liquidity = element.setLiquidity({
                 addressA: poolStateInfo.tokenMint0,
                 addressB: poolStateInfo.tokenMint1,
@@ -69,6 +69,10 @@ function getRaydiumCLMMPositions(cache, nfts) {
                 tickLowerIndex: personalPositionInfo.tickLowerIndex,
                 tickUpperIndex: personalPositionInfo.tickUpperIndex,
                 ref: personalPositionInfo.pubkey,
+                swapVolume24h: poolStats === null || poolStats === void 0 ? void 0 : poolStats.stats['24h'].volume,
+                feeRate: poolStats === null || poolStats === void 0 ? void 0 : poolStats.feeRate,
+                currentSqrtPrice: poolStateInfo.sqrtPriceX64,
+                poolLiquidity: poolStateInfo.liquidity,
                 sourceRefs: [
                     {
                         name: 'Pool',

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

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