@sonarwatch/portfolio-plugins 0.12.27 → 0.12.28

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.12.28](https://github.com/sonarwatch/portfolio/compare/plugins-0.12.27...plugins-0.12.28) (2024-06-14)
+
+
+
 ## [0.12.27](https://github.com/sonarwatch/portfolio/compare/plugins-0.12.26...plugins-0.12.27) (2024-06-14)
 
 

package/package.json

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

package/src/plugins/bluefin/positionFetcher.js

@@ -75,7 +75,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const oiOpen = new bignumber_js_1.default((_v = (_u = (_t = (_s = position.data) === null || _s === void 0 ? void 0 : _s.content) === null || _t === void 0 ? void 0 : _t.fields) === null || _u === void 0 ? void 0 : _u.value) === null || _v === void 0 ? void 0 : _v.fields.oiOpen);
         const leverage = oiOpen.dividedBy(margin);
         const oraclePrice = new bignumber_js_1.default(perp.priceOracle).dividedBy(Math.pow(10, 9));
-        const positionSizeUsd = qPos.multipliedBy(oraclePrice);
+        const collatUsd = margin.dividedBy(Math.pow(10, 9));
         const avgEntryPrice = qPos.isGreaterThan(0)
             ? oiOpen.dividedBy(qPos).dividedBy(Math.pow(10, 9))
             : new bignumber_js_1.default(0);
@@ -86,10 +86,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         else {
             pnl = qPos.multipliedBy(avgEntryPrice.minus(oraclePrice));
         }
-        if (positionSizeUsd.isPositive())
-            suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, positionSizeUsd.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
-        if (positionSizeUsd.times(leverage).isPositive())
-            borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, positionSizeUsd.times(leverage).toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
+        if (collatUsd.isPositive())
+            suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, collatUsd.toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
+        if (collatUsd.times(leverage).isPositive())
+            borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, collatUsd.times(leverage).toNumber(), portfolio_core_1.NetworkId.sui, tokenPrice));
         const pnlAsset = {
             type: portfolio_core_1.PortfolioAssetType.generic,
             networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/bluefin/positionFetcher.js.map

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

package/src/plugins/flash/perpetualFetcher.js

@@ -18,7 +18,6 @@ const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
-const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
 const helpers_1 = require("../../utils/solana/pyth/helpers");
 const constants_2 = require("../tokens/constants");
 const filters_1 = require("./filters");
@@ -44,8 +43,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         oraclesPubkeys.push(new web3_js_1.PublicKey(market.collateralCustodyAccount.oracle.oracleAccount));
         MarketById.set(market.pubkey, market);
     });
-    const oracleAccounts = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(client, oraclesPubkeys);
-    const pythPricesByAccount = (0, helpers_1.getPythPricesDatasMap)(oraclesPubkeys, oracleAccounts);
+    const pythPricesByAccount = yield (0, helpers_1.getPythPricesAsMap)(client, oraclesPubkeys);
     const tokensDetailsById = new Map();
     const tokensDetails = yield cache.getItems(marketsInfos
         .map((acc) => [
@@ -75,19 +73,16 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const rewardAssets = [];
         const { collateralUsd, sizeUsd, entryPrice: oraclePrice } = position;
         const openingPrice = oraclePrice.price.multipliedBy(Math.pow(10, oraclePrice.exponent));
-        const targetPriceData = pythPricesByAccount.get(targetCustody.oracle.oracleAccount);
-        const collateralCustodyPriceData = pythPricesByAccount.get(collateralCustody.oracle.oracleAccount);
-        if (!targetPriceData ||
-            !targetPriceData.price ||
-            !collateralCustodyPriceData ||
-            !collateralCustodyPriceData.price)
+        const targetPrice = pythPricesByAccount.get(targetCustody.oracle.oracleAccount);
+        const collateralCustodyPrice = pythPricesByAccount.get(collateralCustody.oracle.oracleAccount);
+        if (!targetPrice || !collateralCustodyPrice)
             continue;
-        const currentPrice = new bignumber_js_1.default(targetPriceData.price);
+        const currentPrice = new bignumber_js_1.default(targetPrice);
         const leverage = sizeUsd.dividedBy(collateralUsd);
         const targetDetails = tokensDetailsById.get(targetCustody.mint);
         const targetName = targetDetails ? targetDetails.symbol : '';
         const collatAmount = collateralUsd
-            .dividedBy(collateralCustodyPriceData.price)
+            .dividedBy(collateralCustodyPrice)
             .dividedBy(usdFactor);
         const collatValue = collateralUsd.dividedBy(usdFactor).toNumber();
         const targetAmount = collatAmount.times(leverage);
@@ -105,7 +100,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             data: {
                 amount: collatAmount.toNumber(),
                 address: collateralCustody.mint,
-                price: collateralCustodyPriceData.price,
+                price: collateralCustodyPrice,
             },
         });
         borrowedAssets.push({
@@ -116,7 +111,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             data: {
                 amount: targetAmount.toNumber(),
                 address: targetCustody.mint,
-                price: targetPriceData.price,
+                price: targetPrice,
             },
         });
         rewardAssets.push({

package/src/plugins/flash/perpetualFetcher.js.map

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

package/src/plugins/flash/poolJob.js

@@ -19,7 +19,7 @@ const constants_2 = require("../tokens/constants");
 const constants_3 = require("../jupiter/exchange/constants");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const poolsAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.flpStruct, constants_1.poolsPkeys);
+    const poolsAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.flPoolStruct, constants_1.poolsPkeys);
     const custodiesInfo = yield cache.getItem(constants_3.custodiesKey, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/flash/poolJob.js.map

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

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

@@ -211,7 +211,7 @@ export type TokenRatios = {
     max: BigNumber;
 };
 export declare const tokenRatiosStruct: BeetStruct<TokenRatios, Partial<TokenRatios>>;
-export type PoolBis = {
+export type FLPool = {
     buffer: Buffer;
     name: number[];
     permissions: Permissions;
@@ -232,4 +232,4 @@ export type PoolBis = {
     flpTokenAccountBump: number;
     vpVolumeFactor: number;
 };
-export declare const flpStruct: FixableBeetStruct<PoolBis, Partial<PoolBis>>;
+export declare const flPoolStruct: FixableBeetStruct<FLPool, Partial<FLPool>>;

package/src/plugins/flash/structs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flpStruct = exports.tokenRatiosStruct = exports.positionStruct = exports.marketStruct = exports.positionStatsStruct = exports.oraclePriceStruct = exports.marketPermissionsStruct = exports.flpStakeStruct = exports.stakeStatsStruct = exports.custodyStruct = exports.permissionsStruct = exports.feesStatsStruct = exports.borrowRateStateStruct = exports.assetsStruct = exports.borrowRateParamsStruct = exports.feesStruct = exports.ratioFeesStruct = exports.FeesMode = exports.pricingParamsStruct = exports.oracleParamsStruct = void 0;
+exports.flPoolStruct = exports.tokenRatiosStruct = exports.positionStruct = exports.marketStruct = exports.positionStatsStruct = exports.oraclePriceStruct = exports.marketPermissionsStruct = exports.flpStakeStruct = exports.stakeStatsStruct = exports.custodyStruct = exports.permissionsStruct = exports.feesStatsStruct = exports.borrowRateStateStruct = exports.assetsStruct = exports.borrowRateParamsStruct = exports.feesStruct = exports.ratioFeesStruct = exports.FeesMode = exports.pricingParamsStruct = exports.oracleParamsStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -195,7 +195,7 @@ exports.tokenRatiosStruct = new beet_1.BeetStruct([
     ['min', solana_1.u64],
     ['max', solana_1.u64],
 ], (args) => args);
-exports.flpStruct = new beet_1.FixableBeetStruct([
+exports.flPoolStruct = new beet_1.FixableBeetStruct([
     ['buffer', (0, solana_1.blob)(8)],
     ['name', (0, beet_1.array)(beet_1.u8)],
     ['permissions', exports.permissionsStruct],

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

@@ -1 +1 @@
-{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/structs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/structs.ts"],"names":[],"mappings":";;;AAAA,oDAOmC;AAGnC,kEAA6D;AAC7D,+CAA0D;AAY7C,QAAA,kBAAkB,GAAG,IAAI,iBAAU,CAC9C;IACE,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,qBAAqB,EAAE,uBAAS,CAAC;IAClC,CAAC,YAAY,EAAE,SAAE,CAAC;IAClB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,gBAAgB,EAAE,YAAG,CAAC;CACxB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC;AAgBW,QAAA,mBAAmB,GAAG,IAAI,iBAAU,CAC/C;IACE,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,sBAAsB,EAAE,YAAG,CAAC;IAC7B,CAAC,mBAAmB,EAAE,YAAG,CAAC;CAC3B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAqB,CAChC,CAAC;AAEF,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,yCAAK,CAAA;IACL,2CAAM,CAAA;AACR,CAAC,EAHW,QAAQ,wBAAR,QAAQ,QAGnB;AAQY,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,QAAQ,EAAE,YAAG,CAAC;CAChB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC;AAeW,QAAA,UAAU,GAAG,IAAI,iBAAU,CACtC;IACE,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,uBAAe,CAAC;IAC3B,CAAC,SAAS,EAAE,uBAAe,CAAC;IAC5B,CAAC,cAAc,EAAE,uBAAe,CAAC;IACjC,CAAC,eAAe,EAAE,uBAAe,CAAC;IAClC,CAAC,cAAc,EAAE,uBAAe,CAAC;IACjC,CAAC,iBAAiB,EAAE,uBAAe,CAAC;IACpC,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,kBAAkB,EAAE,YAAG,CAAC;CAC1B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAY,CACvB,CAAC;AASW,QAAA,sBAAsB,GAAG,IAAI,iBAAU,CAClD;IACE,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,oBAAoB,EAAE,YAAG,CAAC;CAC5B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAwB,CACnC,CAAC;AAQW,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,QAAQ,EAAE,YAAG,CAAC;CAChB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AAQW,QAAA,qBAAqB,GAAG,IAAI,iBAAU,CACjD;IACE,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,mBAAmB,EAAE,aAAI,CAAC;IAC3B,CAAC,YAAY,EAAE,YAAG,CAAC;CACpB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAuB,CAClC,CAAC;AAUW,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,SAAS,EAAE,aAAI,CAAC;IACjB,CAAC,aAAa,EAAE,aAAI,CAAC;IACrB,CAAC,MAAM,EAAE,aAAI,CAAC;IACd,CAAC,mBAAmB,EAAE,YAAG,CAAC;IAC1B,CAAC,aAAa,EAAE,YAAG,CAAC;CACrB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC;AAkBW,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,WAAW,EAAE,WAAI,CAAC;IACnB,CAAC,mBAAmB,EAAE,WAAI,CAAC;IAC3B,CAAC,sBAAsB,EAAE,WAAI,CAAC;IAC9B,CAAC,mBAAmB,EAAE,WAAI,CAAC;IAC3B,CAAC,oBAAoB,EAAE,WAAI,CAAC;IAC5B,CAAC,2BAA2B,EAAE,WAAI,CAAC;IACnC,CAAC,iBAAiB,EAAE,WAAI,CAAC;IACzB,CAAC,kBAAkB,EAAE,WAAI,CAAC;IAC1B,CAAC,iBAAiB,EAAE,WAAI,CAAC;IACzB,CAAC,sBAAsB,EAAE,WAAI,CAAC;IAC9B,CAAC,qBAAqB,EAAE,WAAI,CAAC;IAC7B,CAAC,mBAAmB,EAAE,WAAI,CAAC;IAC3B,CAAC,sBAAsB,EAAE,WAAI,CAAC;CAC/B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC;AA0BW,QAAA,aAAa,GAAG,IAAI,iBAAU,CACzC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,UAAU,EAAE,SAAE,CAAC;IAChB,CAAC,UAAU,EAAE,WAAI,CAAC;IAClB,CAAC,iBAAiB,EAAE,WAAI,CAAC;IACzB,CAAC,WAAW,EAAE,WAAI,CAAC;IACnB,CAAC,mBAAmB,EAAE,WAAI,CAAC;IAC3B,CAAC,QAAQ,EAAE,0BAAkB,CAAC;IAC9B,CAAC,SAAS,EAAE,2BAAmB,CAAC;IAChC,CAAC,aAAa,EAAE,yBAAiB,CAAC;IAClC,CAAC,MAAM,EAAE,kBAAU,CAAC;IACpB,CAAC,YAAY,EAAE,8BAAsB,CAAC;IACtC,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,QAAQ,EAAE,oBAAY,CAAC;IACxB,CAAC,WAAW,EAAE,uBAAe,CAAC;IAC9B,CAAC,iBAAiB,EAAE,6BAAqB,CAAC;IAC1C,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,kBAAkB,EAAE,SAAE,CAAC;IACxB,CAAC,SAAS,EAAE,IAAA,aAAI,EAAC,EAAE,CAAC,CAAC;CACtB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAe,CAC1B,CAAC;AASW,QAAA,gBAAgB,GAAG,IAAI,iBAAU,CAC5C;IACE,CAAC,mBAAmB,EAAE,YAAG,CAAC;IAC1B,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,mBAAmB,EAAE,YAAG,CAAC;CAC3B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAkB,CAC7B,CAAC;AAcW,QAAA,cAAc,GAAG,IAAI,iBAAU,CAC1C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,YAAY,EAAE,wBAAgB,CAAC;IAChC,CAAC,gBAAgB,EAAE,aAAI,CAAC;IACxB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,eAAe,EAAE,WAAI,CAAC;IACvB,CAAC,MAAM,EAAE,SAAE,CAAC;CACb,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAgB,CAC3B,CAAC;AASW,QAAA,uBAAuB,GAAG,IAAI,iBAAU,CACnD;IACE,CAAC,mBAAmB,EAAE,WAAI,CAAC;IAC3B,CAAC,oBAAoB,EAAE,WAAI,CAAC;IAC5B,CAAC,2BAA2B,EAAE,WAAI,CAAC;IACnC,CAAC,iBAAiB,EAAE,WAAI,CAAC;CAC1B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAyB,CACpC,CAAC;AAOW,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,UAAU,EAAE,UAAG,CAAC;CAClB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC;AAmBW,QAAA,mBAAmB,GAAG,IAAI,iBAAU,CAC/C;IACE,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,mBAAmB,EAAE,yBAAiB,CAAC;IACxC,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,2BAA2B,EAAE,aAAI,CAAC;IACnC,CAAC,cAAc,EAAE,SAAE,CAAC;IACpB,CAAC,gBAAgB,EAAE,SAAE,CAAC;IACtB,CAAC,oBAAoB,EAAE,SAAE,CAAC;CAC3B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAqB,CAChC,CAAC;AAkBW,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,mBAAmB,EAAE,uBAAS,CAAC;IAChC,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,aAAa,EAAE,WAAI,CAAC;IACrB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,aAAa,EAAE,+BAAuB,CAAC;IACxC,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,oBAAoB,EAAE,2BAAmB,CAAC;IAC3C,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,MAAM,EAAE,IAAA,aAAI,EAAC,EAAE,CAAC,CAAC;CACnB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AA2BW,QAAA,cAAc,GAAG,IAAI,iBAAU,CAC1C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,UAAU,EAAE,YAAG,CAAC;IACjB,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,YAAY,EAAE,yBAAiB,CAAC;IACjC,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,kBAAkB,EAAE,YAAG,CAAC;IACzB,CAAC,2BAA2B,EAAE,aAAI,CAAC;IACnC,CAAC,iBAAiB,EAAE,yBAAiB,CAAC;IACtC,CAAC,eAAe,EAAE,yBAAiB,CAAC;IACpC,CAAC,cAAc,EAAE,SAAE,CAAC;IACpB,CAAC,gBAAgB,EAAE,SAAE,CAAC;IACtB,CAAC,oBAAoB,EAAE,SAAE,CAAC;IAC1B,CAAC,MAAM,EAAE,SAAE,CAAC;CACb,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAgB,CAC3B,CAAC;AAQW,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,KAAK,EAAE,YAAG,CAAC;IACZ,CAAC,KAAK,EAAE,YAAG,CAAC;CACb,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC;AAwBW,QAAA,YAAY,GAAG,IAAI,wBAAiB,CAC/C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,MAAM,EAAE,IAAA,YAAK,EAAC,SAAE,CAAC,CAAC;IACnB,CAAC,aAAa,EAAE,yBAAiB,CAAC;IAClC,CAAC,eAAe,EAAE,YAAG,CAAC;IACtB,CAAC,SAAS,EAAE,uBAAS,CAAC;IACtB,CAAC,iBAAiB,EAAE,uBAAS,CAAC;IAC9B,CAAC,iBAAiB,EAAE,uBAAS,CAAC;IAC9B,CAAC,eAAe,EAAE,uBAAS,CAAC;IAC5B,CAAC,WAAW,EAAE,IAAA,YAAK,EAAC,uBAAS,CAAC,CAAC;IAC/B,CAAC,QAAQ,EAAE,IAAA,YAAK,EAAC,yBAAiB,CAAC,CAAC;IACpC,CAAC,SAAS,EAAE,IAAA,YAAK,EAAC,uBAAS,CAAC,CAAC;IAC7B,CAAC,WAAW,EAAE,aAAI,CAAC;IACnB,CAAC,QAAQ,EAAE,aAAI,CAAC;IAChB,CAAC,aAAa,EAAE,wBAAgB,CAAC;IACjC,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,aAAa,EAAE,SAAE,CAAC;IACnB,CAAC,qBAAqB,EAAE,SAAE,CAAC;IAC3B,CAAC,gBAAgB,EAAE,SAAE,CAAC;CACvB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC"}

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

@@ -9,3 +9,4 @@ export declare const dcaProgramId: PublicKey;
 export declare const jlpPool: PublicKey;
 export declare const jlpToken: PublicKey;
 export declare const custodiesKey = "custodies";
+export declare const perpPoolsKey = "perppools";

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.custodiesKey = exports.jlpToken = exports.jlpPool = exports.dcaProgramId = exports.limitProgramId = exports.valueAverageProgramId = exports.perpsProgramId = exports.platform = exports.platformId = void 0;
+exports.perpPoolsKey = exports.custodiesKey = exports.jlpToken = exports.jlpPool = exports.dcaProgramId = exports.limitProgramId = exports.valueAverageProgramId = exports.perpsProgramId = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'jupiter-exchange';
 exports.platform = {
@@ -18,4 +18,5 @@ exports.dcaProgramId = new web3_js_1.PublicKey('DCA265Vj8a9CEuX1eb1LWRnDT7uK6q1x
 exports.jlpPool = new web3_js_1.PublicKey('5BUwFW4nRbftYTDMbgxykoFWqWHPzahFSNAaaaJtVKsq');
 exports.jlpToken = new web3_js_1.PublicKey('27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4');
 exports.custodiesKey = 'custodies';
+exports.perpPoolsKey = 'perppools';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAI/B,QAAA,UAAU,GAAG,kBAAkB,CAAC;AAChC,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,qCAAqC;CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AACW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,OAAO,GAAG,IAAI,mBAAS,CAClC,8CAA8C,CAC/C,CAAC;AACW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,WAAW,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAI/B,QAAA,UAAU,GAAG,kBAAkB,CAAC;AAChC,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,+CAA+C;IACtD,WAAW,EAAE,gBAAgB;IAC7B,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,qCAAqC;CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,qBAAqB,GAAG,IAAI,mBAAS,CAChD,6CAA6C,CAC9C,CAAC;AACW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,OAAO,GAAG,IAAI,mBAAS,CAClC,8CAA8C,CAC/C,CAAC;AACW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AACW,QAAA,YAAY,GAAG,WAAW,CAAC;AAC3B,QAAA,YAAY,GAAG,WAAW,CAAC"}

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

@@ -17,11 +17,18 @@ const constants_1 = require("./constants");
 const structs_1 = require("./structs");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const custodiesAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.custodyStruct, constants_1.perpsProgramId, (0, filters_1.dataStructSizeFilter)(structs_1.custodyStruct));
-    if (custodiesAccounts.length === 0)
+    const custodiesAccs = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.custodyStruct, constants_1.perpsProgramId, (0, filters_1.dataStructSizeFilter)(structs_1.custodyStruct));
+    if (custodiesAccs.length === 0)
         return;
-    const accounts = custodiesAccounts.map((acc) => (Object.assign({ pubkey: acc.pubkey.toString() }, acc)));
-    yield cache.setItem(constants_1.custodiesKey, accounts, {
+    const custodyAccsInfo = custodiesAccs.map((acc) => (Object.assign({ pubkey: acc.pubkey.toString() }, acc)));
+    const pools = (yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.perpetualPoolStruct, custodiesAccs.map((acc) => acc.pool)))
+        .map((acc) => (acc === null ? [] : [acc]))
+        .flat(1);
+    yield cache.setItem(constants_1.custodiesKey, custodyAccsInfo, {
+        prefix: constants_1.platformId,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+    yield cache.setItem(constants_1.perpPoolsKey, pools, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,
     });

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

@@ -1 +1 @@
-{"version":3,"file":"custodiesJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/custodiesJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,oDAAyD;AACzD,kDAAiE;AACjE,2DAAqE;AACrE,2CAAuE;AACvE,uCAAmD;AAEnD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,iBAAiB,GAAG,MAAM,IAAA,iCAAwB,EACtD,MAAM,EACN,uBAAa,EACb,0BAAc,EACd,IAAA,8BAAoB,EAAC,uBAAa,CAAC,CACpC,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAE3C,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iBAC9C,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,IACzB,GAAe,EACnB,CAAC,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,wBAAY,EAAE,QAAQ,EAAE;QAC1C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"custodiesJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/custodiesJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,oDAAyD;AACzD,kDAG+B;AAC/B,2DAAqE;AACrE,2CAKqB;AACrB,uCAAwE;AAExE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,uBAAa,EACb,0BAAc,EACd,IAAA,8BAAoB,EAAC,uBAAa,CAAC,CACpC,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACvC,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iBACjD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,IACzB,GAAe,EACnB,CAAC,CAAC;IAEJ,MAAM,KAAK,GAAG,CACZ,MAAM,IAAA,sCAA6B,EACjC,MAAM,EACN,6BAAmB,EACnB,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CACrC,CACF;SACE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SACzC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEX,MAAM,KAAK,CAAC,OAAO,CAAC,wBAAY,EAAE,eAAe,EAAE;QACjD,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,MAAM,KAAK,CAAC,OAAO,CAAC,wBAAY,EAAE,KAAK,EAAE;QACvC,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -18,7 +18,6 @@ const web3_js_1 = require("@solana/web3.js");
 const clients_1 = require("../../../utils/clients");
 const solana_1 = require("../../../utils/solana");
 const filters_1 = require("../filters");
-const getMultipleAccountsInfoSafe_1 = require("../../../utils/solana/getMultipleAccountsInfoSafe");
 const helpers_1 = require("../../../utils/solana/pyth/helpers");
 const constants_1 = require("../../tokens/constants");
 const constants_2 = require("./constants");
@@ -26,9 +25,9 @@ const structs_1 = require("./structs");
 const usdFactor = new bignumber_js_1.default(Math.pow(10, 6));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const perpetualsPositions = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.positionStruct, constants_2.perpsProgramId, (0, filters_1.perpetualsPositionsFilter)(owner));
-    if (perpetualsPositions.length === 0 ||
-        !perpetualsPositions.some((perp) => perp.sizeUsd.isGreaterThan(0)))
+    const positionAccounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.positionStruct, constants_2.perpsProgramId, (0, filters_1.perpetualsPositionsFilter)(owner));
+    if (positionAccounts.length === 0 ||
+        positionAccounts.every((perp) => perp.sizeUsd.isLessThanOrEqualTo(0)))
         return [];
     const custodiesAccounts = yield cache.getItem(constants_2.custodiesKey, {
         prefix: constants_2.platformId,
@@ -36,20 +35,29 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     });
     if (!custodiesAccounts)
         return [];
+    const perpPoolsArr = yield cache.getItem(constants_2.perpPoolsKey, {
+        prefix: constants_2.platformId,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+    if (!perpPoolsArr)
+        return [];
+    const perpPools = new Map();
+    perpPoolsArr.forEach((a) => {
+        perpPools.set(a.pubkey.toString(), a);
+    });
     const oraclesPubkeys = [];
     const custodyById = new Map();
-    custodiesAccounts.forEach((acc) => {
-        oraclesPubkeys.push(new web3_js_1.PublicKey(acc.oracle.oracleAccount));
-        custodyById.set(acc.pubkey, acc);
+    custodiesAccounts.forEach((a) => {
+        oraclesPubkeys.push(new web3_js_1.PublicKey(a.oracle.oracleAccount));
+        custodyById.set(a.pubkey, a);
     });
-    const oracleAccounts = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(client, oraclesPubkeys);
-    const pythPricesByAccount = (0, helpers_1.getPythPricesDatasMap)(oraclesPubkeys, oracleAccounts);
+    const pythPricesByAccount = yield (0, helpers_1.getPythPricesAsMap)(client, oraclesPubkeys);
     const tokensDetailsById = new Map();
     const tokensDetails = yield cache.getItems(custodiesAccounts.map((acc) => acc.mint), { prefix: constants_1.tokenListsDetailsPrefix, networkId: portfolio_core_1.NetworkId.solana });
     tokensDetails.forEach((tD) => tD ? tokensDetailsById.set(tD.address, tD) : undefined);
     const positions = [];
-    for (const position of perpetualsPositions) {
-        const { collateralUsd, sizeUsd, price, side } = position;
+    for (const position of positionAccounts) {
+        const { collateralUsd, sizeUsd, price, side, cumulativeInterestSnapshot, lockedAmount, } = position;
         if (sizeUsd.isLessThanOrEqualTo(0))
             continue;
         if (side === structs_1.Side.None)
@@ -59,46 +67,44 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const collateralCustody = custodyById.get(position.collateralCustody.toString());
         if (!custody || !collateralCustody)
             continue;
-        const openingPrice = price.dividedBy(usdFactor);
-        const custodyPriceData = pythPricesByAccount.get(custody.oracle.oracleAccount);
-        const collateralCustodyPriceData = pythPricesByAccount.get(collateralCustody.oracle.oracleAccount);
-        if (!custodyPriceData ||
-            !custodyPriceData.price ||
-            !collateralCustodyPriceData ||
-            !collateralCustodyPriceData.price)
+        const perpPool = perpPools.get(custody.pool);
+        if (!perpPool)
             continue;
-        const currentPrice = new bignumber_js_1.default(custodyPriceData.price);
+        const entryPrice = price.dividedBy(usdFactor);
+        const currentPrice = pythPricesByAccount.get(custody.oracle.oracleAccount);
+        if (!currentPrice)
+            continue;
+        const size = lockedAmount.div(Math.pow(10, custody.decimals));
+        const sizeValue = sizeUsd.dividedBy(usdFactor);
         const leverage = sizeUsd.dividedBy(collateralUsd);
-        // const collatAmount = collateralUsd
-        //   .dividedBy(collateralCustodyPriceData.price)
-        //   .dividedBy(usdFactor);
-        const collatValue = collateralUsd.dividedBy(usdFactor).toNumber();
-        // const custodyAmount = collatAmount.times(leverage);
-        // const custodyValue = sizeUsd.dividedBy(usdFactor).toNumber();
-        // const borrowFee = sizeUsd
-        //   .times(
-        //     new BigNumber(
-        //       collateralCustody.fundingRateState.cumulativeInterestRate
-        //     ).minus(cumulativeInterestSnapshot)
-        //   )
-        //   .dividedBy(10 ** 15)
-        //   .absoluteValue();
-        // const openAndCloseFees = sizeUsd.times(0.001).times(2).dividedBy(usdFactor);
-        // const fees = borrowFee.plus(openAndCloseFees).negated().toNumber();
+        const collateralValue = collateralUsd.dividedBy(usdFactor);
+        const { increasePositionBps, decreasePositionBps } = perpPool.fees;
+        const increaseFees = new bignumber_js_1.default(increasePositionBps).div(10000);
+        const decreaseFees = new bignumber_js_1.default(decreasePositionBps).div(10000);
+        const openFees = entryPrice.times(size).times(increaseFees);
+        const closeFees = sizeValue.times(decreaseFees);
+        const openAndCloseFees = openFees.plus(closeFees);
+        const borrowFee = sizeUsd
+            .times(new bignumber_js_1.default(collateralCustody.fundingRateState.cumulativeInterestRate).minus(cumulativeInterestSnapshot))
+            .dividedBy(Math.pow(10, 15))
+            .absoluteValue();
+        const fees = borrowFee.plus(openAndCloseFees).toNumber();
         const priceDelta = isLong
-            ? currentPrice.minus(openingPrice)
-            : openingPrice.minus(currentPrice);
-        const priceVar = priceDelta.dividedBy(openingPrice);
-        const pnl = priceVar.times(collatValue).times(leverage).toNumber();
-        // const value = collateralUsd.dividedBy(usdFactor).plus(pnl).toNumber();
+            ? new bignumber_js_1.default(currentPrice).minus(entryPrice)
+            : entryPrice.minus(currentPrice);
+        const priceVar = priceDelta.dividedBy(entryPrice);
+        const pnlValue = priceVar.times(collateralValue).times(leverage);
+        const value = collateralValue.plus(pnlValue).minus(fees);
         positions.push({
-            collateralValue: collateralUsd.dividedBy(usdFactor).toNumber(),
-            liquidationPrice: null,
-            sizeValue: sizeUsd.toNumber(),
-            value: collateralUsd.dividedBy(usdFactor).plus(pnl).toNumber(),
-            side: isLong ? portfolio_core_1.LeverageSide.long : portfolio_core_1.LeverageSide.short,
             address: custody.mint,
+            side: isLong ? portfolio_core_1.LeverageSide.long : portfolio_core_1.LeverageSide.short,
             leverage: leverage.toNumber(),
+            liquidationPrice: null,
+            collateralValue: collateralValue.toNumber(),
+            size: size.toNumber(),
+            sizeValue: sizeValue.toNumber(),
+            pnlValue: pnlValue.toNumber(),
+            value: value.toNumber(),
         });
     }
     if (positions.length === 0)
@@ -109,8 +115,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             type: portfolio_core_1.PortfolioElementType.leverage,
             data: {
                 positions,
+                positionsValue: value,
                 value,
                 collateralAssets: [],
+                collateralValue: 0,
             },
             label: 'Leverage',
             networkId: portfolio_core_1.NetworkId.solana,

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

@@ -1 +1 @@
-{"version":3,"file":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/perpetualFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gEAAqC;AACrC,6CAA4C;AAG5C,oDAAyD;AACzD,kDAAiE;AACjE,wCAAuD;AAEvD,mGAAgG;AAChG,gEAA2E;AAC3E,sDAAiE;AACjE,2CAAuE;AACvE,uCAAiD;AAEjD,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;AACzC,MAAM,QAAQ,GAAoB,CAChC,KAAa,EACb,KAAY,EACyB,EAAE;IACvC,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAwB,EACxD,MAAM,EACN,wBAAc,EACd,0BAAc,EACd,IAAA,mCAAyB,EAAC,KAAK,CAAC,CACjC,CAAC;IACF,IACE,mBAAmB,CAAC,MAAM,KAAK,CAAC;QAChC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAElE,OAAO,EAAE,CAAC;IAEZ,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,OAAO,CAAgB,wBAAY,EAAE;QACzE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,cAAc,GAAgB,EAAE,CAAC;IACvC,MAAM,WAAW,GAA6B,IAAI,GAAG,EAAE,CAAC;IACxD,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,cAAc,CAAC,IAAI,CAAC,IAAI,mBAAS,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7D,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,IAAA,yDAA2B,EACtD,MAAM,EACN,cAAc,CACf,CAAC;IACF,MAAM,mBAAmB,GAAG,IAAA,+BAAqB,EAC/C,cAAc,EACd,cAAc,CACf,CAAC;IAEF,MAAM,iBAAiB,GAA8B,IAAI,GAAG,EAAE,CAAC;IAC/D,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,CACxC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC,EAAE,MAAM,EAAE,mCAAuB,EAAE,SAAS,EAAE,0BAAS,CAAC,MAAM,EAAE,CACjE,CAAC;IACF,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC3B,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CACvD,CAAC;IAEF,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE,CAAC;QAC3C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;QACzD,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAC7C,IAAI,IAAI,KAAK,cAAI,CAAC,IAAI;YAAE,SAAS;QACjC,MAAM,MAAM,GAAG,IAAI,KAAK,cAAI,CAAC,IAAI,CAAC;QAElC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CACvC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CACtC,CAAC;QACF,IAAI,CAAC,OAAO,IAAI,CAAC,iBAAiB;YAAE,SAAS;QAE7C,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAC9C,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,GAAG,CACxD,iBAAiB,CAAC,MAAM,CAAC,aAAa,CACvC,CAAC;QACF,IACE,CAAC,gBAAgB;YACjB,CAAC,gBAAgB,CAAC,KAAK;YACvB,CAAC,0BAA0B;YAC3B,CAAC,0BAA0B,CAAC,KAAK;YAEjC,SAAS;QACX,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAClD,qCAAqC;QACrC,iDAAiD;QACjD,2BAA2B;QAC3B,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;QAElE,sDAAsD;QACtD,gEAAgE;QAChE,4BAA4B;QAC5B,YAAY;QACZ,qBAAqB;QACrB,kEAAkE;QAClE,0CAA0C;QAC1C,MAAM;QACN,yBAAyB;QACzB,sBAAsB;QAEtB,+EAA+E;QAC/E,sEAAsE;QACtE,MAAM,UAAU,GAAG,MAAM;YACvB,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC;YAClC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnE,yEAAyE;QAEzE,SAAS,CAAC,IAAI,CAAC;YACb,eAAe,EAAE,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;YAC9D,gBAAgB,EAAE,IAAI;YACtB,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE;YAC7B,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;YAC9D,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,6BAAY,CAAC,IAAI,CAAC,CAAC,CAAC,6BAAY,CAAC,KAAK;YACrD,OAAO,EAAE,OAAO,CAAC,IAAI;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC9B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,IAAI,EAAE;gBACJ,SAAS;gBACT,KAAK;gBACL,gBAAgB,EAAE,EAAE;aACrB;YACD,KAAK,EAAE,UAAU;YACjB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK;SACN;KACF,CAAC;AACJ,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":"perpetualFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/perpetualFetcher.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-export type CustodyInfo = Custody & {
+export type CustodyInfo = ParsedCustody & {
     pubkey: string;
 };
-type Custody = {
+type ParsedCustody = {
     buffer: Buffer;
     pool: string;
     mint: string;
@@ -18,6 +18,31 @@ type Custody = {
     bump: number;
     tokenAccountBump: number;
 };
+export type PerpetualPoolInfo = ParsedPerpetualPool & {
+    pubkey: string;
+};
+type ParsedPerpetualPool = {
+    buffer: Buffer;
+    name: number;
+    custodies: string[];
+    aumUsd: string;
+    fees: ParsedFees;
+    maxRequestExecutionSec: string;
+    bump: number;
+    lpTokenBump: number;
+    inceptionTime: string;
+};
+type ParsedFees = {
+    increasePositionBps: string;
+    decreasePositionBps: string;
+    addRemoveLiquidityBps: string;
+    swapBps: string;
+    taxBps: string;
+    stableSwapBps: string;
+    stableSwapTaxBps: string;
+    liquidationRewardBps: string;
+    protocolShareBps: string;
+};
 declare enum OracleType {
     None = 0,
     Test = 1,

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/types.ts"],"names":[],"mappings":";;AAqBA,IAAK,UAIJ;AAJD,WAAK,UAAU;IACb,2CAAI,CAAA;IACJ,2CAAI,CAAA;IACJ,2CAAI,CAAA;AACN,CAAC,EAJI,UAAU,KAAV,UAAU,QAId"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/types.ts"],"names":[],"mappings":";;AAgDA,IAAK,UAIJ;AAJD,WAAK,UAAU;IACb,2CAAI,CAAA;IACJ,2CAAI,CAAA;IACJ,2CAAI,CAAA;AACN,CAAC,EAJI,UAAU,KAAV,UAAU,QAId"}

package/src/plugins/kamino/constants.js

@@ -47,6 +47,10 @@ exports.lendingConfigs = new Map([
                     'he1iusmfkpAdwvxLNGV8Y1iSbj4rUy6yMhEA3fotn9A',
                     'So11111111111111111111111111111111111111112',
                 ],
+                [
+                    'vSoLxydx6akxyMD9XEcPvGYNGq6Nn66oqVb3UkGkei7',
+                    'So11111111111111111111111111111111111111112',
+                ],
             ],
             leveragePairs: [
                 [

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAI/B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,qCAAqC,kBAAU,MAAM;IAC5D,OAAO,EAAE,yBAAyB;IAClC,WAAW,EAAE,uBAAuB;CACrC,CAAC;AAEW,QAAA,QAAQ,GAAG,6CAA6C,CAAC;AACzD,QAAA,YAAY,GAAG,CAAC,CAAC;AACjB,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,gBAAgB,GAC3B,iDAAiD,CAAC;AAEvC,QAAA,cAAc,GAAG,8CAA8C,CAAC;AAEhE,QAAA,kBAAkB,GAAG,6CAA6C,CAAC;AACnE,QAAA,gBAAgB,GAAG,GAAG,kBAAU,aAAa,CAAC;AAE9C,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AACW,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAE5D,QAAA,cAAc,GAAqC,IAAI,GAAG,CAAC;IACtE;QACE,8CAA8C;QAC9C;YACE,IAAI,EAAE,aAAa;YACnB,aAAa,EAAE;gBACb;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,8CAA8C;oBAC9C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;aACF;YACD,aAAa,EAAE;gBACb;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;gBACD;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;gBACD;oBACE,6CAA6C;oBAC7C,8CAA8C;iBAC/C;gBACD;oBACE,6CAA6C;oBAC7C,8CAA8C;iBAC/C;gBACD;oBACE,6CAA6C;oBAC7C,8CAA8C;iBAC/C;gBACD;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;gBACD;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;aACF;SACF;KACF;IACD,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IACxE,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;CAC9E,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,WAAW,GAAG,UAAU,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAI/B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,qCAAqC,kBAAU,MAAM;IAC5D,OAAO,EAAE,yBAAyB;IAClC,WAAW,EAAE,uBAAuB;CACrC,CAAC;AAEW,QAAA,QAAQ,GAAG,6CAA6C,CAAC;AACzD,QAAA,YAAY,GAAG,CAAC,CAAC;AACjB,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,gBAAgB,GAC3B,iDAAiD,CAAC;AAEvC,QAAA,cAAc,GAAG,8CAA8C,CAAC;AAEhE,QAAA,kBAAkB,GAAG,6CAA6C,CAAC;AACnE,QAAA,gBAAgB,GAAG,GAAG,kBAAU,aAAa,CAAC;AAE9C,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,6CAA6C,CAC9C,CAAC;AACW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AACW,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAE5D,QAAA,cAAc,GAAqC,IAAI,GAAG,CAAC;IACtE;QACE,8CAA8C;QAC9C;YACE,IAAI,EAAE,aAAa;YACnB,aAAa,EAAE;gBACb;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,8CAA8C;oBAC9C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;gBACD;oBACE,6CAA6C;oBAC7C,6CAA6C;iBAC9C;aACF;YACD,aAAa,EAAE;gBACb;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;gBACD;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;gBACD;oBACE,6CAA6C;oBAC7C,8CAA8C;iBAC/C;gBACD;oBACE,6CAA6C;oBAC7C,8CAA8C;iBAC/C;gBACD;oBACE,6CAA6C;oBAC7C,8CAA8C;iBAC/C;gBACD;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;gBACD;oBACE,8CAA8C;oBAC9C,8CAA8C;iBAC/C;aACF;SACF;KACF;IACD,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IACxE,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;CAC9E,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,WAAW,GAAG,UAAU,CAAC"}

package/src/utils/solana/pyth/helpers.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { PublicKey, AccountInfo } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
 import { TokenPriceSource } from '@sonarwatch/portfolio-core';
 import { Base, MappingData, PermissionData, PriceData } from './structs';
 import { SolanaClient } from '../../clients/types';
@@ -12,7 +12,7 @@ export declare function parseBaseData(data: Buffer): Base | undefined;
 export declare const parseMappingData: (data: Buffer) => MappingData;
 export declare const parsePriceData: (data: Buffer, currentSlot?: number) => PriceData;
 export declare const parsePermissionData: (data: Buffer) => PermissionData;
-export declare function getPythPricesDatasMap(pubkeys: PublicKey[], accounts: (AccountInfo<Buffer> | null)[]): Map<string, PriceData>;
+export declare function getPythPricesAsMap(connection: SolanaClient, feedAddresses: PublicKey[]): Promise<Map<string, number>>;
 export declare function getPythPrices(connection: SolanaClient, feedAddresses: PublicKey[]): Promise<(number | null)[]>;
 export declare function getPythPrice(connection: SolanaClient, feedAddress: PublicKey): Promise<number | null>;
 export declare function getPythTokenPriceSources(connection: SolanaClient, params: {

package/src/utils/solana/pyth/helpers.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPythTokenPriceSources = exports.getPythPrice = exports.getPythPrices = exports.getPythPricesDatasMap = exports.parsePermissionData = exports.parsePriceData = exports.parseMappingData = exports.parseBaseData = exports.MAX_SLOT_DIFFERENCE = exports.Version = exports.Version2 = exports.Magic = void 0;
+exports.getPythTokenPriceSources = exports.getPythPrice = exports.getPythPrices = exports.getPythPricesAsMap = exports.parsePermissionData = exports.parsePriceData = exports.parseMappingData = exports.parseBaseData = exports.MAX_SLOT_DIFFERENCE = exports.Version = exports.Version2 = exports.Magic = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const structs_1 = require("./structs");
@@ -242,13 +242,19 @@ const parsePermissionData = (data) => {
     };
 };
 exports.parsePermissionData = parsePermissionData;
-function getPythPricesDatasMap(pubkeys, accounts) {
-    const pricesDatas = accounts.map((account) => account ? (0, exports.parsePriceData)(account.data) : undefined);
-    const priceMap = new Map();
-    pricesDatas.forEach((prices, index) => prices ? priceMap.set(pubkeys[index].toString(), prices) : undefined);
-    return priceMap;
+function getPythPricesAsMap(connection, feedAddresses) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const prices = yield getPythPrices(connection, feedAddresses);
+        const priceMap = new Map();
+        feedAddresses.forEach((feedAddress, i) => {
+            const price = prices[i];
+            if (price)
+                priceMap.set(feedAddress.toString(), price);
+        });
+        return priceMap;
+    });
 }
-exports.getPythPricesDatasMap = getPythPricesDatasMap;
+exports.getPythPricesAsMap = getPythPricesAsMap;
 function getPythPrices(connection, feedAddresses) {
     return __awaiter(this, void 0, void 0, function* () {
         const accounts = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(connection, feedAddresses);

package/src/utils/solana/pyth/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/pyth/helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/pyth/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,+DAAyE;AACzE,uCAYmB;AACnB,uCAA4D;AAE5D,gFAA6E;AAC7E,iEAAyE;AACzE,0EAAuE;AAE1D,QAAA,KAAK,GAAG,UAAU,CAAC;AACnB,QAAA,QAAQ,GAAG,CAAC,CAAC;AACb,QAAA,OAAO,GAAG,gBAAQ,CAAC;AAChC,uGAAuG;AAC1F,QAAA,mBAAmB,GAAG,EAAE,CAAC;AAEtC,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AACvC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAChC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,CAAC;AAE1D,SAAgB,aAAa,CAAC,IAAY;IACxC,8CAA8C;IAC9C,IAAI,IAAI,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,KAAK,KAAK,aAAK,EAAE,CAAC;QACpB,kBAAkB;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,eAAe;QACf,MAAM,IAAI,GAAgB,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/C,oBAAoB;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAjBD,sCAiBC;AAEM,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAe,EAAE;IAC5D,oBAAoB;IACpB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnC,kBAAkB;IAClB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrC,eAAe;IACf,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAClC,oBAAoB;IACpB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACnC,6BAA6B;IAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC1C,SAAS;IACT,mDAAmD;IACnD,gCAAgC;IAChC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,2BAA2B;IAC3B,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,MAAM,kBAAkB,GAAgB,EAAE,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC,CAAC;QAC5D,MAAM,iBAAiB,GAAG,IAAI,mBAAS,CAAC,mBAAmB,CAAC,CAAC;QAC7D,MAAM,IAAI,EAAE,CAAC;QACb,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO;QACL,KAAK;QACL,OAAO;QACP,IAAI;QACJ,IAAI;QACJ,kBAAkB;QAClB,kBAAkB;KACnB,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,gBAAgB,oBAgC3B;AAEF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAS,EAAE;IAC/D,kBAAkB;IAClB,MAAM,cAAc,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;IACtD,uBAAuB;IACvB,MAAM,mBAAmB,GAAG,IAAA,yBAAe,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,GAAG,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;IAChE,mBAAmB;IACnB,MAAM,MAAM,GAAgB,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAClD,6BAA6B;IAC7B,MAAM,eAAe,GAAe,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC1D,4HAA4H;IAC5H,MAAM,WAAW,GAAG,MAAM,CAAC,IAAA,yBAAe,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IACtD,OAAO;QACL,cAAc;QACd,KAAK;QACL,mBAAmB;QACnB,UAAU;QACV,MAAM;QACN,eAAe;QACf,WAAW;KACZ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,QAAgB,EAAO,EAAE;IACvD,uBAAuB;IACvB,MAAM,cAAc,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;IACtD,kCAAkC;IAClC,MAAM,SAAS,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1C,oCAAoC;IACpC,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7C,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AAC3D,CAAC,CAAC;AAEF,wHAAwH;AACxH,iGAAiG;AAC1F,MAAM,cAAc,GAAG,CAC5B,IAAY,EACZ,WAAoB,EACT,EAAE;IACb,oBAAoB;IACpB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnC,kBAAkB;IAClB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrC,eAAe;IACf,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAClC,qBAAqB;IACrB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACnC,4BAA4B;IAC5B,MAAM,SAAS,GAAc,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACnD,iBAAiB;IACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACtC,6BAA6B;IAC7B,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACjD,2CAA2C;IAC3C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACzC,mDAAmD;IACnD,MAAM,QAAQ,GAAG,IAAA,yBAAe,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3C,yCAAyC;IACzC,MAAM,SAAS,GAAG,IAAA,yBAAe,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5C,mCAAmC;IACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxD,iDAAiD;IACjD,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC7D,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3C,wDAAwD;IACxD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1C,kCAAkC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAChC,kCAAkC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACnC,kCAAkC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACnC,iCAAiC;IACjC,MAAM,iBAAiB,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9D,6BAA6B;IAC7B,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,gCAAgC;IAChC,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAChD,qCAAqC;IACrC,MAAM,sBAAsB,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,MAAM,CAAC,sBAAsB,CAAC,GAAG,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;IACtE,yCAAyC;IACzC,MAAM,2BAA2B,GAAG,IAAA,yBAAe,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/D,MAAM,kBAAkB,GACtB,MAAM,CAAC,2BAA2B,CAAC,GAAG,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;IACvD,kCAAkC;IAClC,MAAM,iBAAiB,GAAG,IAAA,wBAAc,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEjE,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE3B,IAAI,WAAW,IAAI,MAAM,KAAK,qBAAW,CAAC,OAAO,EAAE,CAAC;QAClD,IAAI,WAAW,GAAG,SAAS,CAAC,WAAW,GAAG,2BAAmB,EAAE,CAAC;YAC9D,MAAM,GAAG,qBAAW,CAAC,OAAO,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC;IACV,IAAI,UAAU,CAAC;IACf,IAAI,MAAM,KAAK,qBAAW,CAAC,OAAO,EAAE,CAAC;QACnC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;QACxB,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;IACpC,CAAC;IAED,8BAA8B;IAC9B,MAAM,eAAe,GAAqB,EAAE,CAAC;IAC7C,IAAI,MAAM,GAAG,GAAG,CAAC;IACjB,OAAO,eAAe,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC;QACjE,MAAM,IAAI,EAAE,CAAC;QACb,MAAM,kBAAkB,GAAG,cAAc,CACvC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC,EAC/B,QAAQ,CACT,CAAC;QACF,MAAM,IAAI,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QACzE,MAAM,IAAI,EAAE,CAAC;QACb,eAAe,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO;QACL,KAAK;QACL,OAAO;QACP,IAAI;QACJ,IAAI;QACJ,SAAS;QACT,QAAQ;QACR,kBAAkB;QAClB,UAAU;QACV,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,aAAa;QACb,SAAS;QACT,aAAa;QACb,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,iBAAiB;QACjB,mBAAmB;QACnB,YAAY;QACZ,sBAAsB;QACtB,aAAa;QACb,2BAA2B;QAC3B,kBAAkB;QAClB,iBAAiB;QACjB,SAAS;QACT,eAAe;QACf,KAAK;QACL,UAAU;QACV,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AAtHW,QAAA,cAAc,kBAsHzB;AAEK,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAkB,EAAE;IAClE,oBAAoB;IACpB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnC,kBAAkB;IAClB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACrC,eAAe;IACf,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAClC,qBAAqB;IACrB,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC1D,MAAM,qBAAqB,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAChE,MAAM,iBAAiB,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7D,OAAO;QACL,KAAK;QACL,OAAO;QACP,IAAI;QACJ,IAAI;QACJ,eAAe;QACf,qBAAqB;QACrB,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,mBAAmB,uBAqB9B;AAEF,SAAsB,kBAAkB,CACtC,UAAwB,EACxB,aAA0B;;QAE1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC;QAChD,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,IAAI,KAAK;gBAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAXD,gDAWC;AAED,SAAsB,aAAa,CACjC,UAAwB,EACxB,aAA0B;;QAE1B,MAAM,QAAQ,GAAG,MAAM,IAAA,yDAA2B,EAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC9E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1B,IAAI,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YACtB,OAAO,CACL,IAAA,sBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC,aAAa,CACzE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAXD,sCAWC;AACD,SAAsB,YAAY,CAChC,UAAwB,EACxB,WAAsB;;QAEtB,OAAO,CAAC,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;CAAA;AALD,oCAKC;AAED,SAAsB,wBAAwB,CAC5C,UAAwB,EACxB,MAIG;;QAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,UAAU,EACV,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC1B,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAwB,EAChD,UAAU,EACV,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC1B,CAAC;QAEF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAA2B,EAAE;YACtD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC;YACvD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,CAAC,QAAQ;gBAAE,OAAO,IAAI,CAAC;YAE3B,OAAO;gBACL,OAAO;gBACP,EAAE,EAAE,aAAa,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;gBACxC,QAAQ;gBACR,SAAS,EAAE,0BAAS,CAAC,MAAM;gBAC3B,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,gCAAoB,CAAC,EAAE;gBACvD,KAAK;gBACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,MAAM,EAAE,CAAC;aACV,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAnCD,4DAmCC"}