@sonarwatch/portfolio-plugins 0.12.26 → 0.12.28

package/README.md

@@ -1,3 +1,3 @@
-# @sonarwatch/portfolio-plugins
-
-This library is @sonarwatch/portfolio-plugins
+# @sonarwatch/portfolio-plugins
+
+This library is @sonarwatch/portfolio-plugins

package/package.json

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

package/src/plugins/balancer/helpers/pools.js

@@ -36,27 +36,27 @@ exports.getBalancerPoolsV2 = void 0;
 const graphql_request_1 = __importStar(require("graphql-request"));
 function getBalancerPoolsV2(url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    query pools {
-      pools(
-        first: 1000
-        orderBy: totalLiquidity
-        orderDirection: desc
-        where: { totalLiquidity_gt: "500" }
-      ) {
-        id
-        address
-        symbol
-        totalLiquidity
-        totalShares
-        tokens {
-          balance
-          decimals
-          symbol
-          address
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    query pools {
+      pools(
+        first: 1000
+        orderBy: totalLiquidity
+        orderDirection: desc
+        where: { totalLiquidity_gt: "500" }
+      ) {
+        id
+        address
+        symbol
+        totalLiquidity
+        totalShares
+        tokens {
+          balance
+          decimals
+          symbol
+          address
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

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,
@@ -107,7 +107,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             borrowedAssets.length === 0 &&
             rewardAssets.length === 0)
             return;
-        const value = positionSizeUsd.plus(pnl).toNumber();
+        const value = margin
+            .dividedBy(Math.pow(10, 9))
+            .plus(pnl)
+            .toNumber();
+        if (value === 0)
+            return;
         const side = ((_3 = (_2 = (_1 = (_0 = position.data) === null || _0 === void 0 ? void 0 : _0.content) === null || _1 === void 0 ? void 0 : _1.fields) === null || _2 === void 0 ? void 0 : _2.value) === null || _3 === void 0 ? void 0 : _3.fields.isPosPositive)
             ? 'Long'
             : 'Short';

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":";;;;;;;;;;;;;;AAAA,+DAQoC;AACpC,gEAAqC;AACrC,6CAA4C;AAG5C,2CAA+D;AAC/D,iDAAsD;AACtD,+CAA8D;AAC9D,gGAA6F;AAC7F,6DAAwE;AACxE,mDAA8D;AAC9D,uCAAsD;AACtD,uCAA2C;AAE3C,yDAAmD;AAEnD,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC;AACzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,mBAAmB,GAAG,MAAM,IAAA,iCAAwB,EACxD,MAAM,EACN,wBAAc,EACd,oBAAQ,EACR,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,YAAY,GAAG,MAAM,KAAK,CAAC,OAAO,CAAe,sBAAU,EAAE;QACjE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,MAAM,cAAc,GAAgB,EAAE,CAAC;IACvC,MAAM,UAAU,GAA4B,IAAI,GAAG,EAAE,CAAC;IACtD,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC9B,cAAc,CAAC,IAAI,CACjB,IAAI,mBAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAChE,CAAC;QACF,cAAc,CAAC,IAAI,CACjB,IAAI,mBAAS,CAAC,MAAM,CAAC,wBAAwB,CAAC,MAAM,CAAC,aAAa,CAAC,CACpE,CAAC;QACF,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,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,YAAY;SACT,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;QACZ,GAAG,CAAC,oBAAoB,CAAC,IAAI;QAC7B,GAAG,CAAC,wBAAwB,CAAC,IAAI;KAClC,CAAC;SACD,IAAI,EAAE,EACT,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,QAAQ,GAAuB,EAAE,CAAC;IACxC,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE,CAAC;QAC3C,IAAI,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAAE,SAAS;QAEtD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,cAAI,CAAC,IAAI;YAAE,SAAS;QAEhD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,cAAI,CAAC,IAAI,CAAC;QACjD,MAAM,iBAAiB,GAAG,MAAM,CAAC,wBAAwB,CAAC;QAC1D,MAAM,aAAa,GAAG,MAAM,CAAC,oBAAoB,CAAC;QAClD,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB;YAAE,SAAS;QAE5C,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAc,EAAE,CAAC;QACrC,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QACrE,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,YAAY,CACjD,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAC3B,CAAC;QAEF,MAAM,eAAe,GAAG,mBAAmB,CAAC,GAAG,CAC7C,aAAa,CAAC,MAAM,CAAC,aAAa,CACnC,CAAC;QACF,MAAM,0BAA0B,GAAG,mBAAmB,CAAC,GAAG,CACxD,iBAAiB,CAAC,MAAM,CAAC,aAAa,CACvC,CAAC;QACF,IACE,CAAC,eAAe;YAChB,CAAC,eAAe,CAAC,KAAK;YACtB,CAAC,0BAA0B;YAC3B,CAAC,0BAA0B,CAAC,KAAK;YAEjC,SAAS;QACX,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAElD,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QAE7D,MAAM,YAAY,GAAG,aAAa;aAC/B,SAAS,CAAC,0BAA0B,CAAC,KAAK,CAAC;aAC3C,SAAS,CAAC,SAAS,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;QAElE,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE5D,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;QAEpD,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAEnE,cAAc,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,WAAW;YAClB,UAAU,EAAE,EAAE;YACd,IAAI,EAAE;gBACJ,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;gBAC/B,OAAO,EAAE,iBAAiB,CAAC,IAAI;gBAC/B,KAAK,EAAE,0BAA0B,CAAC,KAAK;aACxC;SACF,CAAC,CAAC;QACH,cAAc,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,WAAW;YAClB,UAAU,EAAE,EAAE;YACd,IAAI,EAAE;gBACJ,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;gBAC/B,OAAO,EAAE,aAAa,CAAC,IAAI;gBAC3B,KAAK,EAAE,eAAe,CAAC,KAAK;aAC7B;SACF,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,GAAG;YACV,UAAU,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE;SACpD,CAAC,CAAC;QACH,sBAAsB;QACtB,qBAAqB;QACrB,iCAAiC;QACjC,iBAAiB;QACjB,oBAAoB;QACpB,kDAAkD;QAClD,MAAM;QAEN,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QAEzE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,GAC9D,IAAA,wCAAuB,EAAC,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;QAExE,MAAM,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtE,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAEvC,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,qCAAoB,CAAC,UAAU;YACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,UAAU;YACjB,KAAK;YACL,IAAI,EAAE,GAAG,UAAU,IAAI,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG;YAC3D,IAAI,EAAE;gBACJ,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,cAAc;gBACd,aAAa;gBACb,cAAc;gBACd,eAAe,EAAE,IAAI;gBAErB,YAAY;gBACZ,WAAW;gBACX,WAAW;gBACX,KAAK;aACN;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"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":";;;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,SAAS,GAAG,IAAI,wBAAiB,CAC5C;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,IAAe,CAC1B,CAAC"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/flash/structs.ts"],"names":[],"mappings":"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"}

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,127 +35,97 @@ 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 elements = [];
-    for (const position of perpetualsPositions) {
-        if (position.sizeUsd.isLessThanOrEqualTo(0))
+    const positions = [];
+    for (const position of positionAccounts) {
+        const { collateralUsd, sizeUsd, price, side, cumulativeInterestSnapshot, lockedAmount, } = position;
+        if (sizeUsd.isLessThanOrEqualTo(0))
             continue;
-        if (position.side === structs_1.Side.None)
+        if (side === structs_1.Side.None)
             continue;
-        const isLong = position.side === structs_1.Side.Long;
+        const isLong = side === structs_1.Side.Long;
         const custody = custodyById.get(position.custody.toString());
         const collateralCustody = custodyById.get(position.collateralCustody.toString());
         if (!custody || !collateralCustody)
             continue;
-        const borrowedAssets = [];
-        const borrowedYields = [];
-        const suppliedAssets = [];
-        const suppliedYields = [];
-        const rewardAssets = [];
-        const { collateralUsd, sizeUsd, price, cumulativeInterestSnapshot } = position;
-        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 entryPrice = price.dividedBy(usdFactor);
+        const currentPrice = pythPricesByAccount.get(custody.oracle.oracleAccount);
+        if (!currentPrice)
             continue;
-        const currentPrice = new bignumber_js_1.default(custodyPriceData.price);
+        const size = lockedAmount.div(Math.pow(10, custody.decimals));
+        const sizeValue = sizeUsd.dividedBy(usdFactor);
         const leverage = sizeUsd.dividedBy(collateralUsd);
-        const custodyDetails = tokensDetailsById.get(custody.mint);
-        const custodyName = custodyDetails ? custodyDetails.symbol : '';
-        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 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 openAndCloseFees = sizeUsd.times(0.001).times(2).dividedBy(usdFactor);
-        const fees = borrowFee.plus(openAndCloseFees).negated().toNumber();
+        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();
-        suppliedAssets.push({
-            type: 'token',
-            networkId: portfolio_core_1.NetworkId.solana,
-            value: collatValue,
-            attributes: {},
-            data: {
-                amount: collatAmount.toNumber(),
-                address: collateralCustody.mint,
-                price: collateralCustodyPriceData.price,
-            },
+            ? 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({
+            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(),
         });
-        borrowedAssets.push({
-            type: 'token',
-            networkId: portfolio_core_1.NetworkId.solana,
-            value: custodyValue,
-            attributes: {},
+    }
+    if (positions.length === 0)
+        return [];
+    const value = (0, portfolio_core_1.getUsdValueSum)(positions.map((a) => a.value));
+    return [
+        {
+            type: portfolio_core_1.PortfolioElementType.leverage,
             data: {
-                amount: custodyAmount.toNumber(),
-                address: custody.mint,
-                price: custodyPriceData.price,
+                positions,
+                positionsValue: value,
+                value,
+                collateralAssets: [],
+                collateralValue: 0,
             },
-        });
-        rewardAssets.push({
-            type: 'generic',
-            networkId: portfolio_core_1.NetworkId.solana,
-            value: pnl,
-            attributes: {},
-            data: { name: 'PNL ($)', amount: pnl, price: null },
-        });
-        rewardAssets.push({
-            type: 'generic',
-            networkId: portfolio_core_1.NetworkId.solana,
-            value: fees,
-            attributes: {},
-            data: { name: 'Fees O/C ($)', amount: fees, price: null },
-        });
-        if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
-            continue;
-        const { borrowedValue, suppliedValue, healthRatio, rewardValue } = (0, portfolio_core_1.getElementLendingValues)(suppliedAssets, borrowedAssets, rewardAssets);
-        const value = collateralUsd.dividedBy(usdFactor).plus(pnl).toNumber();
-        const side = isLong ? 'Long' : 'Short';
-        elements.push({
-            type: portfolio_core_1.PortfolioElementType.borrowlend,
+            label: 'Leverage',
             networkId: portfolio_core_1.NetworkId.solana,
             platformId: constants_2.platformId,
-            label: 'Leverage',
             value,
-            name: `${custodyName} ${side} ${leverage.decimalPlaces(2)}x`,
-            data: {
-                borrowedAssets,
-                borrowedValue,
-                borrowedYields,
-                suppliedAssets,
-                suppliedValue,
-                suppliedYields,
-                collateralRatio: null,
-                rewardAssets,
-                rewardValue,
-                healthRatio,
-                value,
-            },
-        });
-    }
-    return elements;
+        },
+    ];
 });
 const fetcher = {
     id: `${constants_2.platformId}-perpetual`,