@sonarwatch/portfolio-plugins 0.15.30 → 0.15.32

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

@@ -1,3 +1,3 @@
 import { ParsedAccount, TokenAccount } from '../../utils/solana';
 import { Cache } from '../../Cache';
-export declare const getPicassoPositions: (tokenAccounts: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;
+export declare const getPicassoPositions: (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;

package/src/plugins/picasso/getPicassoPositions.js

@@ -17,8 +17,7 @@ const solana_1 = require("../../utils/solana");
 const constants_1 = require("./constants");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const structs_1 = require("./structs");
-const getPicassoPositions = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = tokenAccounts.filter((x) => x.amount.isEqualTo(1));
+const getPicassoPositions = (potentialTokens, cache) => __awaiter(void 0, void 0, void 0, function* () {
     if (!potentialTokens.length)
         return [];
     const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('vault_params', 'utf-8'), address.mint.toBuffer()], constants_1.restakingProgramId)[0]);

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

@@ -1 +1 @@
-{"version":3,"file":"getPicassoPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/getPicassoPositions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,+DAAuD;AACvD,iDAAsD;AACtD,+CAI4B;AAC5B,2CAA6D;AAC7D,gFAA6E;AAE7E,uCAAwC;AAEjC,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,KAAY,EACZ,EAAE;IACF,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3E,IAAI,CAAC,eAAe,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvC,MAAM,uBAAuB,GAAG,eAAe,CAAC,GAAG,CACjD,CAAC,OAAO,EAAE,EAAE,CACV,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAC/D,8BAAkB,CACnB,CAAC,CAAC,CAAC,CACP,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,IAAA,sCAA6B,EAChD,UAAU,EACV,qBAAW,EACX,uBAAuB,CACxB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,KAAK,CAAC,SAAS;gBACxB,MAAM,EAAE,KAAK,CAAC,WAAW;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AA3CW,QAAA,mBAAmB,uBA2C9B"}
+{"version":3,"file":"getPicassoPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/getPicassoPositions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,+DAAuD;AACvD,iDAAsD;AACtD,+CAI4B;AAC5B,2CAA6D;AAC7D,gFAA6E;AAE7E,uCAAwC;AAEjC,MAAM,mBAAmB,GAAG,CACjC,eAA8C,EAC9C,KAAY,EACZ,EAAE;IACF,IAAI,CAAC,eAAe,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvC,MAAM,uBAAuB,GAAG,eAAe,CAAC,GAAG,CACjD,CAAC,OAAO,EAAE,EAAE,CACV,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAC/D,8BAAkB,CACnB,CAAC,CAAC,CAAC,CACP,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,IAAA,sCAA6B,EAChD,UAAU,EACV,qBAAW,EACX,uBAAuB,CACxB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,KAAK,CAAC,SAAS;gBACxB,MAAM,EAAE,KAAK,CAAC,WAAW;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAzCW,QAAA,mBAAmB,uBAyC9B"}

package/src/plugins/picasso/positionsFetcher.js

@@ -14,7 +14,7 @@ const constants_1 = require("./constants");
 const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
 const getPicassoPositions_1 = require("./getPicassoPositions");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
     return (0, getPicassoPositions_1.getPicassoPositions)(potentialTokens, cache);
 });
 const fetcher = {

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

@@ -1 +1 @@
-{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,wFAAqF;AACrF,+DAA4D;AAE5D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE7D,OAAO,IAAA,yCAAmB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,wFAAyF;AACzF,+DAA4D;AAE5D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,IAAA,yCAAmB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/pumpswap/marketsJob.js

@@ -102,7 +102,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_1.platformId}-markets`,
     executor,
-    labels: ['slow'],
+    labels: [portfolio_core_1.NetworkId.solana, 'slow'],
 };
 exports.default = job;
 //# sourceMappingURL=marketsJob.js.map

package/src/plugins/pumpswap/marketsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"marketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pumpswap/marketsJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marketsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/pumpswap/marketsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAyE;AAGzE,2CAAoD;AACpD,iDAAsD;AACtD,uCAAyC;AACzC,kEAA+D;AAC/D,+CAG4B;AAC5B,8EAA2E;AAC3E,0FAAuF;AACvF,mEAA2C;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,sBAAY,EAAE,qBAAS,CAAC;SACvE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SACxE,GAAG,EAAE,CAAC;IAET,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAElD,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;IAElB,MAAM,kBAAkB,GAAG,GAAG,CAAC;IAE/B,MAAM,YAAY,GAAuB,EAAE,CAAC;IAC5C,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,IAAI,kBAAkB,EAAE,CAAC;QAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,CAAC,CAAC;QAExE,MAAM,CAAC,WAAW,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,GACxD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,KAAK,CAAC,mBAAmB,CACvB,YAAY;iBACT,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;gBAC3B,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE;aAC7B,CAAC;iBACD,IAAI,EAAE,EACT,0BAAS,CAAC,MAAM,CACjB;YACD,IAAA,sCAA6B,EAC3B,UAAU,EACV,2BAAkB,EAClB,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAC7D;YACD,IAAA,sCAA6B,EAC3B,UAAU,EACV,2BAAkB,EAClB,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAC9D;SACF,CAAC,CAAC;QAEL,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtD,OAAO,CAAC,GAAG,CACT,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC1B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAChE,OAAO,CACL,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ;oBACpB,IAAA,qDAAyB,EACvB,KAAK,EACL,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAC3B,0BAAS,CAAC,MAAM,CACjB,CACF,CAAC;YACJ,CAAC,CAAC,CACH;YACD,OAAO,CAAC,GAAG,CACT,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC1B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACjE,OAAO,CACL,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ;oBACpB,IAAA,qDAAyB,EACvB,KAAK,EACL,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC5B,0BAAS,CAAC,MAAM,CACjB,CACF,CAAC;YACJ,CAAC,CAAC,CACH;SACF,CAAC,CAAC;QAEH,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAEhD,IAAI,CAAC,gBAAgB,IAAI,CAAC,iBAAiB;gBAAE,OAAO;YACpD,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEtE,MAAM,SAAS,GAAG,CAAC,CAAC;YACpB,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YACzC,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,SAAS,IAAI,CAAC,gBAAgB,IAAI,CAAC,iBAAiB;gBAAE,OAAO;YAElE,MAAM,SAAS,GAAG,IAAA,yCAAmB,EAAC;gBACpC,SAAS,EAAE;oBACT,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAClC,QAAQ,EAAE,SAAS;oBACnB,SAAS,EAAE,MAAM,CAAC,SAAS;iBAC5B;gBACD,UAAU,EAAV,sBAAU;gBACV,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAClC,SAAS,EAAE,0BAAS,CAAC,MAAM;gBAC3B,kBAAkB,EAAE;oBAClB;wBACE,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;wBACpC,QAAQ,EAAE,gBAAgB;wBAC1B,gBAAgB,EAAE,gBAAgB,CAAC,MAAM;wBACzC,UAAU,EAAE,cAAc;qBAC3B;oBACD;wBACE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE;wBACrC,QAAQ,EAAE,iBAAiB;wBAC3B,gBAAgB,EAAE,iBAAiB,CAAC,MAAM;wBAC1C,UAAU,EAAE,eAAe;qBAC5B;iBACF;gBACD,gBAAgB,EAAE,IAAI;gBACtB,IAAI,EAAE,sCAAsC,MAAM,CAAC,MAAM,EAAE;gBAC3D,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;aAClE,CAAC,CAAC;YAEH,YAAY,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,KAAK,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;AACjD,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,MAAM,EAAE,CAAC,0BAAS,CAAC,MAAM,EAAE,MAAM,CAAC;CACnC,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -1,6 +1,3 @@
 import { Fetcher } from '../../Fetcher';
-import { Cache } from '../../Cache';
-import { ParsedAccount, TokenAccount } from '../../utils/solana';
-export declare const getRaydiumClmmPositions: (tokenAccounts: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;
 declare const fetcher: Fetcher;
 export default fetcher;

package/src/plugins/raydium/clmmFetcher.js

@@ -9,106 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRaydiumClmmPositions = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
-const solana_1 = require("../../utils/solana");
-const clients_1 = require("../../utils/clients");
-const clmms_1 = require("./structs/clmms");
-const helpers_1 = require("./helpers");
-const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
-const getRaydiumClmmPositions = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = tokenAccounts.filter((x) => x.amount.isEqualTo(1));
-    if (!potentialTokens.length)
-        return [];
-    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
-    if (positionsProgramAddress.length === 0)
-        return [];
-    const client = (0, clients_1.getClientSolana)();
-    const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
-    if (!personalPositionsInfo || personalPositionsInfo.length === 0)
-        return [];
-    const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
-    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 [];
-        const poolStateInfo = poolStatesInfo[index];
-        if (!poolStateInfo)
-            return [];
-        return (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.tickArrayStatetruct, [
-            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickLowerIndex, poolStateInfo.tickSpacing),
-            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickUpperIndex, poolStateInfo.tickSpacing),
-        ]);
-    }));
-    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
-    for (let index = 0; index < personalPositionsInfo.length; index++) {
-        const personalPositionInfo = personalPositionsInfo[index];
-        if (!personalPositionInfo)
-            continue;
-        const poolStateInfo = poolStatesInfo.find((p) => p && personalPositionInfo.poolId.toString() === p.pubkey.toString());
-        if (!poolStateInfo)
-            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,
-            liquidity: personalPositionInfo.liquidity,
-            tickCurrentIndex: poolStateInfo.tickCurrent,
-            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',
-                    address: personalPositionInfo.poolId.toString(),
-                },
-                {
-                    name: 'NFT Mint',
-                    address: personalPositionInfo.nftMint.toString(),
-                },
-            ],
-        });
-        const feesAndRewardsBalances = (0, helpers_1.getFeesAndRewardsBalance)(personalPositionInfo, poolStateInfo, tickArrays[index]);
-        if (feesAndRewardsBalances) {
-            liquidity.addRewardAsset({
-                address: poolStateInfo.tokenMint0,
-                amount: feesAndRewardsBalances.tokenFeeAmountA,
-            });
-            liquidity.addRewardAsset({
-                address: poolStateInfo.tokenMint1,
-                amount: feesAndRewardsBalances.tokenFeeAmountB,
-            });
-            feesAndRewardsBalances.rewards.forEach((rewardBalance, i) => {
-                if (rewardBalance.isZero() ||
-                    poolStateInfo.rewardInfos[i].tokenMint.toString() ===
-                        '11111111111111111111111111111111')
-                    return;
-                liquidity.addRewardAsset({
-                    address: poolStateInfo.rewardInfos[i].tokenMint,
-                    amount: rewardBalance,
-                });
-            });
-        }
-    }
-    return elementRegistry.getElements(cache);
-});
-exports.getRaydiumClmmPositions = getRaydiumClmmPositions;
+const getClmmPositions_1 = require("./getClmmPositions");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
-    return (0, exports.getRaydiumClmmPositions)(potentialTokens, cache);
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
+    return (0, getClmmPositions_1.getClmmPositions)(potentialTokens, cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-clmm`,

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

@@ -1 +1 @@
-{"version":3,"file":"clmmFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAC5C,2CAA0E;AAG1E,wFAAqF;AACrF,+CAI4B;AAC5B,iDAAsD;AACtD,2CAIyB;AAEzB,uCAA0E;AAC1E,gFAA6E;AAEtE,MAAM,uBAAuB,GAAG,CACrC,aAA4C,EAC5C,KAAY,EACZ,EAAE;IACF,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3E,IAAI,CAAC,eAAe,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvC,MAAM,uBAAuB,GAAG,eAAe,CAAC,GAAG,CACjD,CAAC,OAAO,EAAE,EAAE,CACV,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAClD,0BAAc,CACf,CAAC,CAAC,CAAC,CACP,CAAC;IAEF,IAAI,uBAAuB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,qBAAqB,GAAG,MAAM,IAAA,sCAA6B,EAC/D,MAAM,EACN,mCAA2B,EAC3B,uBAAuB,CACxB,CAAC;IACF,IAAI,CAAC,qBAAqB,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5E,MAAM,QAAQ,GAAgB,qBAAqB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CACvE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAChC,CAAC;IAEF,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrD,IAAA,sCAA6B,EAAC,MAAM,EAAE,uBAAe,EAAE,QAAQ,CAAC;QAChE,KAAK,CAAC,QAAQ,CACZ,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,EACjC,EAAE,MAAM,EAAE,2BAAe,EAAE,SAAS,EAAE,0BAAS,CAAC,MAAM,EAAE,CACzD;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,qBAAqB,CAAC,GAAG,CAAC,CAAC,oBAAoB,EAAE,KAAK,EAAE,EAAE;QACxD,IAAI,CAAC,oBAAoB;YAAE,OAAO,EAAE,CAAC;QACrC,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,CAAC,aAAa;YAAE,OAAO,EAAE,CAAC;QAE9B,OAAO,IAAA,sCAA6B,EAAC,MAAM,EAAE,2BAAmB,EAAE;YAChE,IAAA,6BAAmB,EACjB,0BAAc,CAAC,QAAQ,EAAE,EACzB,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC/B,oBAAoB,CAAC,cAAc,EACnC,aAAa,CAAC,WAAW,CAC1B;YACD,IAAA,6BAAmB,EACjB,0BAAc,CAAC,QAAQ,EAAE,EACzB,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC/B,oBAAoB,CAAC,cAAc,EACnC,aAAa,CAAC,WAAW,CAC1B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,qBAAqB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAClE,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,oBAAoB;YAAE,SAAS;QAEpC,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAC3E,CAAC;QACF,IAAI,CAAC,aAAa;YAAE,SAAS;QAE7B,MAAM,OAAO,GAAG,eAAe,CAAC,+BAA+B,CAAC;YAC9D,IAAI,EAAE,yDAAyD;SAChE,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,MAAK,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAC7D,CAAC;QAEF,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;YACrC,QAAQ,EAAE,aAAa,CAAC,UAAU;YAClC,QAAQ,EAAE,aAAa,CAAC,UAAU;YAClC,SAAS,EAAE,oBAAoB,CAAC,SAAS;YACzC,gBAAgB,EAAE,aAAa,CAAC,WAAW;YAC3C,cAAc,EAAE,oBAAoB,CAAC,cAAc;YACnD,cAAc,EAAE,oBAAoB,CAAC,cAAc;YACnD,GAAG,EAAE,oBAAoB,CAAC,MAAM;YAChC,aAAa,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,KAAK,EAAE,MAAM;YAC7C,OAAO,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO;YAC3B,gBAAgB,EAAE,aAAa,CAAC,YAAY;YAC5C,aAAa,EAAE,aAAa,CAAC,SAAS;YACtC,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE;iBAChD;gBACD;oBACE,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,oBAAoB,CAAC,OAAO,CAAC,QAAQ,EAAE;iBACjD;aACF;SACF,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,IAAA,kCAAwB,EACrD,oBAAoB,EACpB,aAAa,EACb,UAAU,CAAC,KAAK,CAAC,CAClB,CAAC;QAEF,IAAI,sBAAsB,EAAE,CAAC;YAC3B,SAAS,CAAC,cAAc,CAAC;gBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;gBACjC,MAAM,EAAE,sBAAsB,CAAC,eAAe;aAC/C,CAAC,CAAC;YAEH,SAAS,CAAC,cAAc,CAAC;gBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;gBACjC,MAAM,EAAE,sBAAsB,CAAC,eAAe;aAC/C,CAAC,CAAC;YAEH,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,EAAE;gBAC1D,IACE,aAAa,CAAC,MAAM,EAAE;oBACtB,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE;wBAC/C,kCAAkC;oBAEpC,OAAO;gBAET,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC/C,MAAM,EAAE,aAAa;iBACtB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AA3IW,QAAA,uBAAuB,2BA2IlC;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE7D,OAAO,IAAA,+BAAuB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACzD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"clmmFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,wFAAyF;AACzF,yDAAsD;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,IAAA,mCAAgB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -0,0 +1,3 @@
+import { ParsedAccount, TokenAccount } from '../../utils/solana';
+import { Cache } from '../../Cache';
+export declare const getClmmPositions: (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;

package/src/plugins/raydium/getClmmPositions.js

@@ -0,0 +1,107 @@
+"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.getClmmPositions = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const clients_1 = require("../../utils/clients");
+const solana_1 = require("../../utils/solana");
+const clmms_1 = require("./structs/clmms");
+const constants_1 = require("./constants");
+const helpers_1 = require("./helpers");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const getClmmPositions = (potentialTokens, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!potentialTokens.length)
+        return [];
+    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
+    if (positionsProgramAddress.length === 0)
+        return [];
+    const client = (0, clients_1.getClientSolana)();
+    const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
+    if (!personalPositionsInfo || personalPositionsInfo.length === 0)
+        return [];
+    const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
+    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 [];
+        const poolStateInfo = poolStatesInfo[index];
+        if (!poolStateInfo)
+            return [];
+        return (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.tickArrayStatetruct, [
+            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickLowerIndex, poolStateInfo.tickSpacing),
+            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickUpperIndex, poolStateInfo.tickSpacing),
+        ]);
+    }));
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    for (let index = 0; index < personalPositionsInfo.length; index++) {
+        const personalPositionInfo = personalPositionsInfo[index];
+        if (!personalPositionInfo)
+            continue;
+        const poolStateInfo = poolStatesInfo.find((p) => p && personalPositionInfo.poolId.toString() === p.pubkey.toString());
+        if (!poolStateInfo)
+            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,
+            liquidity: personalPositionInfo.liquidity,
+            tickCurrentIndex: poolStateInfo.tickCurrent,
+            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',
+                    address: personalPositionInfo.poolId.toString(),
+                },
+                {
+                    name: 'NFT Mint',
+                    address: personalPositionInfo.nftMint.toString(),
+                },
+            ],
+        });
+        const feesAndRewardsBalances = (0, helpers_1.getFeesAndRewardsBalance)(personalPositionInfo, poolStateInfo, tickArrays[index]);
+        if (feesAndRewardsBalances) {
+            liquidity.addRewardAsset({
+                address: poolStateInfo.tokenMint0,
+                amount: feesAndRewardsBalances.tokenFeeAmountA,
+            });
+            liquidity.addRewardAsset({
+                address: poolStateInfo.tokenMint1,
+                amount: feesAndRewardsBalances.tokenFeeAmountB,
+            });
+            feesAndRewardsBalances.rewards.forEach((rewardBalance, i) => {
+                if (rewardBalance.isZero() ||
+                    poolStateInfo.rewardInfos[i].tokenMint.toString() ===
+                        '11111111111111111111111111111111')
+                    return;
+                liquidity.addRewardAsset({
+                    address: poolStateInfo.rewardInfos[i].tokenMint,
+                    amount: rewardBalance,
+                });
+            });
+        }
+    }
+    return elementRegistry.getElements(cache);
+});
+exports.getClmmPositions = getClmmPositions;
+//# sourceMappingURL=getClmmPositions.js.map

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

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

package/src/plugins/streamflow/stakingFetcher.js

@@ -39,6 +39,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             continue;
         if (stakeEntry.amount.isZero())
             continue;
+        if (!stakeEntry.unstakeTs.isZero())
+            continue;
         const element = registry.addElementMultiple({
             label: 'Staked',
             link: `https://app.streamflow.finance/staking/solana/mainnet/${stakeEntry.stakePool.toString()}`,

package/src/plugins/streamflow/stakingFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,2CAAmD;AACnD,iDAAsD;AACtD,uCAA6C;AAC7C,kEAA+D;AAE/D,gFAA6E;AAC7E,kEAA+D;AAE/D,MAAM,cAAc,GAAG,IAAI,6BAAa,CAAkB,YAAY,EAAE;IACtE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAE7E,MAAM,kBAAkB,GAAG,MAAM,qBAAS,CAAC,KAAK,CAC9C,MAAM,EACN,0BAAgB,EAChB,oBAAQ,CACT;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;SACrE,SAAS,CAAC,WAAW,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC5C,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC3D,CAAC;QACF,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS;QAEzC,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,yDAAyD,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YAChG,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjC,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,SAAS,CAAC,IAAI;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,UAAU,EAAE;gBACV,WAAW,EAAE,UAAU,CAAC,SAAS;qBAC9B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;qBACzB,KAAK,CAAC,IAAI,CAAC;qBACX,QAAQ,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,2CAAmD;AACnD,iDAAsD;AACtD,uCAA6C;AAC7C,kEAA+D;AAE/D,gFAA6E;AAC7E,kEAA+D;AAE/D,MAAM,cAAc,GAAG,IAAI,6BAAa,CAAkB,YAAY,EAAE;IACtE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAE7E,MAAM,kBAAkB,GAAG,MAAM,qBAAS,CAAC,KAAK,CAC9C,MAAM,EACN,0BAAgB,EAChB,oBAAQ,CACT;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;SACrE,SAAS,CAAC,WAAW,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC5C,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC3D,CAAC;QACF,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS;QAEzC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE;YAAE,SAAS;QAE7C,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,yDAAyD,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YAChG,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjC,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,SAAS,CAAC,IAAI;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,UAAU,EAAE;gBACV,WAAW,EAAE,UAAU,CAAC,SAAS;qBAC9B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;qBACzB,KAAK,CAAC,IAAI,CAAC;qBACX,QAAQ,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/tokens/fetchers/solana-native.js

@@ -8,25 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
 const clients_1 = require("../../../utils/clients");
-const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const solFactor = Math.pow(10, portfolio_core_1.solanaNetwork.native.decimals);
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const amount = yield client.getBalance(new web3_js_1.PublicKey(owner));
-    if (amount === 0)
+    const ownerPubKey = new web3_js_1.PublicKey(owner);
+    const amountLamports = yield client.getBalance(ownerPubKey);
+    if (amountLamports === 0)
         return [];
-    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, portfolio_core_1.walletTokensPlatformId);
-    const element = elementRegistry.addElementMultiple({
+    const amount = amountLamports / solFactor;
+    const solTokenPrice = yield cache.getTokenPrice(portfolio_core_1.solanaNetwork.native.address, portfolio_core_1.NetworkId.solana);
+    const asset = (0, tokenPriceToAssetToken_1.default)(portfolio_core_1.solanaNetwork.native.address, amount, portfolio_core_1.NetworkId.solana, solTokenPrice);
+    const element = {
+        type: portfolio_core_1.PortfolioElementType.multiple,
+        networkId: portfolio_core_1.NetworkId.solana,
+        platformId: portfolio_core_1.walletTokensPlatformId,
         label: 'Wallet',
-    });
-    element.addAsset({
-        address: portfolio_core_1.solanaNetwork.native.address,
-        amount,
-    });
-    return elementRegistry.getElements(cache);
+        value: asset.value,
+        data: {
+            assets: [asset],
+        },
+    };
+    return [element];
 });
 const fetcher = {
     id: `${portfolio_core_1.walletTokensPlatformId}-solana-native`,

package/src/plugins/tokens/fetchers/solana-native.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-native.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-native.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,oDAAyD;AACzD,mFAAgF;AAEhF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,eAAe,GAAG,IAAI,iCAAe,CACzC,0BAAS,CAAC,MAAM,EAChB,uCAAsB,CACvB,CAAC;IAEF,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,8BAAa,CAAC,MAAM,CAAC,OAAO;QACrC,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,gBAAgB;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"solana-native.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-native.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAMoC;AACpC,6CAA4C;AAG5C,oDAAyD;AACzD,wGAAgF;AAEhF,MAAM,SAAS,GAAG,SAAA,EAAE,EAAI,8BAAa,CAAC,MAAM,CAAC,QAAQ,CAAA,CAAC;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;IAEzC,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC5D,IAAI,cAAc,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IAC1C,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAC7C,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,8BAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,CAAC;IACF,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,UAAU,EAAE,uCAAsB;QAClC,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE;YACJ,MAAM,EAAE,CAAC,KAAK,CAAC;SAChB;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,gBAAgB;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/tokens/fetchers/solana-nfts-underlyings.d.ts

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

package/src/plugins/tokens/fetchers/solana-nfts-underlyings.js

@@ -0,0 +1,44 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("../../orca/constants");
+const constants_2 = require("../../cropper/constants");
+const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccountsByOwner");
+const getClmmPositions_1 = require("../../raydium/getClmmPositions");
+const getWhirlpoolPositions_1 = require("../../orca/getWhirlpoolPositions");
+const getHeliumPositions_1 = require("../../helium/getHeliumPositions");
+const getPicassoPositions_1 = require("../../picasso/getPicassoPositions");
+const nftsUnderlyingsMap = new Map([
+    ['raydium', getClmmPositions_1.getClmmPositions],
+    ['orca', (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_1.platformId)],
+    ['cropper', (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_2.platformId, constants_2.clmmPid)],
+    ['helium', getHeliumPositions_1.getHeliumPositions],
+    ['picasso', getPicassoPositions_1.getPicassoPositions],
+]);
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const tokenAccounts = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner)).filter((x) => x.amount.isEqualTo(1));
+    const results = [];
+    for (const nftsUnderlyingsMapElement of nftsUnderlyingsMap) {
+        results.push(nftsUnderlyingsMapElement[1](tokenAccounts, cache));
+    }
+    const result = yield Promise.allSettled(results);
+    return result
+        .map((res) => (res.status === 'rejected' ? [] : res.value))
+        .flat();
+});
+const fetcher = {
+    id: `${portfolio_core_1.walletTokensPlatformId}-solana-nfts-underlyings`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=solana-nfts-underlyings.js.map

package/src/plugins/tokens/fetchers/solana-nfts-underlyings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solana-nfts-underlyings.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-nfts-underlyings.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AAMpC,oDAAoE;AACpE,uDAGiC;AACjC,2FAAwF;AACxF,qEAAkE;AAClE,4EAAoE;AACpE,wEAAqE;AACrE,2EAAwE;AAExE,MAAM,kBAAkB,GAA4B,IAAI,GAAG,CAAC;IAC1D,CAAC,SAAS,EAAE,mCAAgB,CAAC;IAC7B,CAAC,MAAM,EAAE,IAAA,wCAAgB,EAAC,sBAAc,CAAC,CAAC;IAC1C,CAAC,SAAS,EAAE,IAAA,wCAAgB,EAAC,sBAAiB,EAAE,mBAAO,CAAC,CAAC;IACzD,CAAC,QAAQ,EAAE,uCAAkB,CAAC;IAC9B,CAAC,SAAS,EAAE,yCAAmB,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,CAAC,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACxE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CACtB,CAAC;IAEF,MAAM,OAAO,GAAkC,EAAE,CAAC;IAClD,KAAK,MAAM,yBAAyB,IAAI,kBAAkB,EAAE,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEjD,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC1D,IAAI,EAAE,CAAC;AACZ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,0BAA0B;IACvD,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/tokens/fetchers/solana-simple.js

@@ -8,13 +8,53 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccountsByOwner");
-const solana_1 = require("./solana");
+const web3_js_1 = require("@solana/web3.js");
+const clients_1 = require("../../../utils/clients");
+const solana_1 = require("../../../utils/solana");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const zeroDecimalMints_1 = require("../../../utils/solana/zeroDecimalMints");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const tokenAccounts = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
-    return (0, solana_1.getSolanaTokens)(true)(tokenAccounts, cache);
+    const client = yield (0, clients_1.getClientSolana)();
+    const promises = [
+        client.getParsedTokenAccountsByOwner(new web3_js_1.PublicKey(owner), {
+            programId: solana_1.solanaTokenPidPk,
+        }),
+        client.getParsedTokenAccountsByOwner(new web3_js_1.PublicKey(owner), {
+            programId: solana_1.solanaToken2022PidPk,
+        }),
+    ];
+    const res = yield Promise.all(promises);
+    const accounts = [...res[0].value, ...res[1].value].filter((acc) => acc.account.data.parsed.info.tokenAmount.uiAmount !== 0 &&
+        (acc.account.data.parsed.info.tokenAmount.decimals !== 0 ||
+            zeroDecimalMints_1.zeroDecimalMints.has(acc.account.data.parsed.info.mint)));
+    const tokenPrices = yield cache.getTokenPricesAsMap(accounts.map((a) => a.account.data.parsed.info.mint), portfolio_core_1.NetworkId.solana);
+    const tokenAssets = [];
+    accounts.forEach((acc) => {
+        const { mint, tokenAmount } = acc.account.data.parsed.info;
+        const { uiAmount: amount } = tokenAmount;
+        const tokenPrice = tokenPrices.get(mint);
+        if (tokenPrice && tokenPrice.platformId !== portfolio_core_1.walletTokensPlatformId)
+            return;
+        tokenAssets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(mint, amount, portfolio_core_1.NetworkId.solana, tokenPrice)), { ref: acc.pubkey.toString(), link: tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.link, sourceRefs: tokenPrice === null || tokenPrice === void 0 ? void 0 : tokenPrice.sourceRefs }));
+    });
+    if (tokenAssets.length === 0)
+        return [];
+    const element = {
+        type: portfolio_core_1.PortfolioElementType.multiple,
+        networkId: portfolio_core_1.NetworkId.solana,
+        platformId: portfolio_core_1.walletTokensPlatformId,
+        label: 'Wallet',
+        value: (0, portfolio_core_1.getUsdValueSum)(tokenAssets.map((a) => a.value)),
+        data: {
+            assets: tokenAssets,
+        },
+    };
+    return [element];
 });
 const fetcher = {
     id: `${portfolio_core_1.walletTokensPlatformId}-solana-simple`,

package/src/plugins/tokens/fetchers/solana-simple.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-simple.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-simple.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA+E;AAI/E,2FAAwF;AACxF,qCAA2C;AAE3C,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE3D,OAAO,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,gBAAgB;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"solana-simple.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-simple.ts"],"names":[],"mappings":"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"}

package/src/plugins/tokens/fetchers/solana.d.ts

@@ -1,7 +1,3 @@
-import { PortfolioElement } from '@sonarwatch/portfolio-core';
 import { Fetcher } from '../../../Fetcher';
-import { Cache } from '../../../Cache';
-import { ParsedAccount, TokenAccount } from '../../../utils/solana';
-export declare const getSolanaTokens: (simple?: boolean) => (tokenAccounts: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<PortfolioElement[]>;
 declare const fetcher: Fetcher;
 export default fetcher;