@sonarwatch/portfolio-plugins 0.11.159 → 0.11.161

package/src/plugins/jupiter/{voteFetcher.js → governance/voteFetcher.js}

@@ -13,16 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const constants_1 = require("./constants");
-const clients_1 = require("../../utils/clients");
-const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
-const helpers_1 = require("./helpers");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const vote_1 = require("./structs/vote");
+const clients_1 = require("../../../utils/clients");
+const getParsedAccountInfo_1 = require("../../../utils/solana/getParsedAccountInfo");
+const helpers_1 = require("../helpers");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const structs_1 = require("../launchpad/structs");
+const constants_1 = require("../launchpad/constants");
+const constants_2 = require("./constants");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const escrowPubkey = (0, helpers_1.getVotePda)(owner);
-    const escrowAccount = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, vote_1.escrowStruct, escrowPubkey);
+    const escrowAccount = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.escrowStruct, escrowPubkey);
     if (!escrowAccount)
         return [];
     const jupTokenPrice = yield cache.getTokenPrice(constants_1.jupMint, portfolio_core_1.NetworkId.solana);
@@ -42,14 +43,14 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             label: 'Staked',
             name: 'Vote',
             networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
+            platformId: constants_2.jupGovernancePlatformId,
             data: { assets: [asset] },
             value: asset.value,
         },
     ];
 });
 const fetcher = {
-    id: `${constants_1.platformId}-vote`,
+    id: `${constants_2.jupGovernancePlatformId}-vote`,
     networkId: portfolio_core_1.NetworkId.solana,
     executor,
 };

package/src/plugins/jupiter/governance/voteFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"voteFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/voteFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AAGpC,oDAAyD;AACzD,qFAAkF;AAClF,wCAAwC;AACxC,wGAAgF;AAChF,kDAAoD;AACpD,sDAAiD;AACjD,2CAAsD;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,YAAY,GAAG,IAAA,oBAAU,EAAC,KAAK,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,MAAM,IAAA,2CAAoB,EAC9C,MAAM,EACN,sBAAY,EACZ,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,mBAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IAEnC,IAAI,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,CAAC;IAE7C,MAAM,KAAK,GAAmB,IAAA,gCAAsB,EAClD,mBAAO,EACP,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC,CAAC,QAAQ,EAAE,EACzD,0BAAS,CAAC,MAAM,EAChB,aAAa,CACd,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,IAAI,IAAI,CAC1B,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAClD,CAAC;QACF,KAAK,CAAC,UAAU,GAAG,EAAE,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;IAC5D,CAAC;IAED,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,mCAAuB;YACnC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE;YACzB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,mCAAuB,OAAO;IACrC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/jupiter/helpers.js

@@ -16,7 +16,7 @@ exports.getMergedAssets = exports.getJupiterPrices = exports.getVotePda = export
 const web3_js_1 = require("@solana/web3.js");
 const axios_1 = __importDefault(require("axios"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const constants_1 = require("./constants");
+const constants_1 = require("./launchpad/constants");
 function deriveClaimStatus(claimant, distributor, programId) {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('ClaimStatus'), claimant.toBytes(), distributor.toBytes()], programId);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA6C;AAC7C,+DAA4E;AAC5E,2CAA0D;AAG1D,SAAgB,iBAAiB,CAC/B,QAAmB,EACnB,WAAsB,EACtB,SAAoB;IAEpB,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,EACvE,SAAS,CACV,CAAC;AACJ,CAAC;AATD,8CASC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrB,wBAAY,CAAC,OAAO,EAAE;QACtB,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE;KAC/B,EACD,yBAAa,CACd,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AATD,gCASC;AAED,SAAsB,gBAAgB,CAAC,KAAkB,EAAE,MAAiB;;QAC1E,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CACzB,+BAA+B,EAC/B;YACE,MAAM,EAAE;gBACN,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC7C,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC3B;SACF,CACF,CAAC;QACF,MAAM,MAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;QAC9C,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AAfD,4CAeC;AAED,SAAgB,eAAe,CAAC,MAAwB;IACtD,MAAM,WAAW,GAAgC,IAAI,GAAG,EAAE,CAAC;IAC3D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,SAAS;QAErC,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;QAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;QAC/B,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC;YACzC,aAAa,CAAC,KAAK,GAAG,IAAA,+BAAc,EAAC,CAAC,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YACxE,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC;AAnBD,0CAmBC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA6C;AAC7C,+DAA4E;AAE5E,qDAAoE;AAEpE,SAAgB,iBAAiB,CAC/B,QAAmB,EACnB,WAAsB,EACtB,SAAoB;IAEpB,OAAO,mBAAS,CAAC,sBAAsB,CACrC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,EACvE,SAAS,CACV,CAAC;AACJ,CAAC;AATD,8CASC;AAED,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrB,wBAAY,CAAC,OAAO,EAAE;QACtB,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE;KAC/B,EACD,yBAAa,CACd,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AATD,gCASC;AAED,SAAsB,gBAAgB,CAAC,KAAkB,EAAE,MAAiB;;QAC1E,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CACzB,+BAA+B,EAC/B;YACE,MAAM,EAAE;gBACN,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC7C,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE;aAC3B;SACF,CACF,CAAC;QACF,MAAM,MAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;QAC9C,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AAfD,4CAeC;AAED,SAAgB,eAAe,CAAC,MAAwB;IACtD,MAAM,WAAW,GAAgC,IAAI,GAAG,EAAE,CAAC;IAC3D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;YAAE,SAAS;QAErC,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;QAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;QACtC,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC;QAC/B,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC;YACzC,aAAa,CAAC,KAAK,GAAG,IAAA,+BAAc,EAAC,CAAC,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YACxE,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC;AAnBD,0CAmBC"}

package/src/plugins/jupiter/index.js

@@ -4,19 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = exports.platforms = void 0;
-const perpetualFetcher_1 = __importDefault(require("./perpetualFetcher"));
-const custodiesJob_1 = __importDefault(require("./custodiesJob"));
+const perpetualFetcher_1 = __importDefault(require("./exchange/perpetualFetcher"));
+const valueAverageFetcher_1 = __importDefault(require("./exchange/valueAverageFetcher"));
+const limitFetcher_1 = __importDefault(require("./exchange/limitFetcher"));
+const dcaFetcher_1 = __importDefault(require("./exchange/dcaFetcher"));
+const custodiesJob_1 = __importDefault(require("./exchange/custodiesJob"));
+const allocationsFetcher_1 = __importDefault(require("./launchpad/allocationsFetcher"));
+const voteFetcher_1 = __importDefault(require("./governance/voteFetcher"));
 const pricingJob_1 = __importDefault(require("./pricingJob"));
-const airdropFetcher_1 = __importDefault(require("./airdropFetcher"));
-const voteFetcher_1 = __importDefault(require("./voteFetcher"));
-const constants_1 = require("./constants");
-const valueAverageFetcher_1 = __importDefault(require("./valueAverageFetcher"));
+const constants_1 = require("./exchange/constants");
 exports.platforms = [constants_1.jupiterPlatform];
 exports.jobs = [custodiesJob_1.default, pricingJob_1.default];
 exports.fetchers = [
     perpetualFetcher_1.default,
-    airdropFetcher_1.default,
-    voteFetcher_1.default,
     valueAverageFetcher_1.default,
+    limitFetcher_1.default,
+    dcaFetcher_1.default,
+    allocationsFetcher_1.default,
+    voteFetcher_1.default,
 ];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/index.ts"],"names":[],"mappings":";;;;;;AAGA,0EAAkD;AAClD,kEAA0C;AAC1C,8DAAsC;AACtC,sEAA8C;AAC9C,gEAAwC;AACxC,2CAA8C;AAC9C,gFAAwD;AAE3C,QAAA,SAAS,GAAe,CAAC,2BAAe,CAAC,CAAC;AAC1C,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,oBAAU,CAAC,CAAC;AACzC,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,wBAAc;IACd,qBAAW;IACX,6BAAmB;CACpB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/index.ts"],"names":[],"mappings":";;;;;;AAGA,mFAA2D;AAC3D,yFAAiE;AACjE,2EAAmD;AACnD,uEAA+C;AAC/C,2EAAmD;AAEnD,wFAA+D;AAE/D,2EAAmD;AAEnD,8DAAsC;AACtC,oDAAuD;AAE1C,QAAA,SAAS,GAAe,CAAC,2BAAe,CAAC,CAAC;AAC1C,QAAA,IAAI,GAAU,CAAC,sBAAY,EAAE,oBAAU,CAAC,CAAC;AACzC,QAAA,QAAQ,GAAc;IACjC,0BAAgB;IAChB,6BAAmB;IACnB,sBAAY;IACZ,oBAAU;IACV,4BAAiB;IACjB,qBAAW;CACZ,CAAC"}

package/src/plugins/jupiter/launchpad/allocationsFetcher.d.ts

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

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

@@ -0,0 +1,79 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
+const web3_js_1 = require("@solana/web3.js");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const clients_1 = require("../../../utils/clients");
+const helpers_1 = require("../helpers");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const structs_1 = require("./structs");
+const constants_1 = require("./constants");
+const solana_1 = require("../../../utils/solana");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const claimsProof = yield Promise.all(constants_1.airdropsInfo.map((info) => axios_1.default.get(`${constants_1.merkleApi}/${info.mint}/${owner}`).catch(() => null)));
+    const eligibleAirdrops = [];
+    const proofs = [];
+    for (let i = 0; i < claimsProof.length; i++) {
+        const proof = claimsProof[i];
+        if (!proof)
+            continue;
+        eligibleAirdrops.push(constants_1.airdropsInfo[i]);
+        proofs.push(proof.data);
+    }
+    if (proofs.length === 0)
+        return [];
+    const claimStatusAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.claimStatusStruct, proofs.map((proof) => (0, helpers_1.deriveClaimStatus)(new web3_js_1.PublicKey(owner), new web3_js_1.PublicKey(proof.merkle_tree), constants_1.merkleDistributorPid)[0]));
+    const tokenPriceById = yield cache.getTokenPricesAsMap(eligibleAirdrops.map((info) => info.mint), portfolio_core_1.NetworkId.solana);
+    const assets = [];
+    for (let j = 0; j < claimStatusAccounts.length; j++) {
+        const claimStatus = claimStatusAccounts[j];
+        if (claimStatus)
+            continue;
+        const proof = proofs[j];
+        const { claimUntilTs, decimals, mint } = eligibleAirdrops[j];
+        if (claimUntilTs < Date.now())
+            continue;
+        const tokenPrice = tokenPriceById.get(mint);
+        const amount = new bignumber_js_1.default(proof.amount)
+            .dividedBy(Math.pow(10, decimals))
+            .toNumber();
+        const asset = (0, tokenPriceToAssetToken_1.default)(mint, amount, portfolio_core_1.NetworkId.solana, tokenPrice, undefined, { isClaimable: true });
+        assets.push(asset);
+    }
+    if (assets.length === 0)
+        return [];
+    return [
+        {
+            type: portfolio_core_1.PortfolioElementType.multiple,
+            label: 'Rewards',
+            networkId: portfolio_core_1.NetworkId.solana,
+            platformId: constants_1.jupLaunchpadPlatformId,
+            name: 'Allocation',
+            data: {
+                assets,
+            },
+            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value)),
+        },
+    ];
+});
+const fetcher = {
+    id: `${constants_1.jupLaunchpadPlatformId}-allocation`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=allocationsFetcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"allocationsFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/allocationsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AACpC,kDAA6C;AAC7C,6CAA4C;AAC5C,gEAAqC;AAGrC,oDAAyD;AAEzD,wCAA+C;AAC/C,wGAAgF;AAChF,uCAA8C;AAC9C,2CAMqB;AACrB,kDAAsE;AAEtE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,WAAW,GACf,MAAM,OAAO,CAAC,GAAG,CACf,wBAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACxB,eAAK,CAAC,GAAG,CAAC,GAAG,qBAAS,IAAI,IAAI,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAClE,CACF,CAAC;IAEJ,MAAM,gBAAgB,GAAkB,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK;YAAE,SAAS;QAErB,gBAAgB,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,MAAM,mBAAmB,GAAG,MAAM,IAAA,sCAA6B,EAC7D,MAAM,EACN,2BAAiB,EACjB,MAAM,CAAC,GAAG,CACR,CAAC,KAAK,EAAE,EAAE,CACR,IAAA,2BAAiB,EACf,IAAI,mBAAS,CAAC,KAAK,CAAC,EACpB,IAAI,mBAAS,CAAC,KAAK,CAAC,WAAW,CAAC,EAChC,gCAAoB,CACrB,CAAC,CAAC,CAAC,CACP,CACF,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACpD,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EACzC,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpD,MAAM,WAAW,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,WAAW;YAAE,SAAS;QAE1B,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC7D,IAAI,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE;YAAE,SAAS;QAExC,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE5C,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,MAAM,CAAC;aACvC,SAAS,CAAC,SAAA,EAAE,EAAI,QAAQ,CAAA,CAAC;aACzB,QAAQ,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,IAAI,EACJ,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,UAAU,EACV,SAAS,EACT,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnC,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,KAAK,EAAE,SAAS;YAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAE,kCAAsB;YAClC,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE;gBACJ,MAAM;aACP;YACD,KAAK,EAAE,IAAA,+BAAc,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1D;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,kCAAsB,aAAa;IAC1C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/jupiter/{constants.d.ts → launchpad/constants.d.ts}

@@ -1,15 +1,16 @@
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
-export declare const platformId = "jupiter";
-export declare const jupiterPlatform: Platform;
-export declare const jlpPool: PublicKey;
-export declare const jlpToken: PublicKey;
-export declare const perpsProgramId: PublicKey;
-export declare const valueAverageProgramId: PublicKey;
+export declare const jupLaunchpadPlatformId = "jupiter-launchpad";
+export declare const jupLaunchpadPlatform: Platform;
 export declare const voteProgramId: PublicKey;
 export declare const lockerPubkey: PublicKey;
-export declare const merkleDistributorPid: PublicKey;
 export declare const jupMint = "JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN";
 export declare const jupDecimals = 6;
-export declare const merkleApi = "https://worker.jup.ag/jup-claim-proof/JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN/";
-export declare const custodiesKey = "custodies";
+export declare const merkleDistributorPid: PublicKey;
+export declare const merkleApi = "https://worker.jup.ag/jup-claim-proof";
+export type AirdropInfo = {
+    mint: string;
+    decimals: number;
+    claimUntilTs: number;
+};
+export declare const airdropsInfo: AirdropInfo[];

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

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.airdropsInfo = exports.merkleApi = exports.merkleDistributorPid = exports.jupDecimals = exports.jupMint = exports.lockerPubkey = exports.voteProgramId = exports.jupLaunchpadPlatform = exports.jupLaunchpadPlatformId = void 0;
+const web3_js_1 = require("@solana/web3.js");
+exports.jupLaunchpadPlatformId = 'jupiter-launchpad';
+exports.jupLaunchpadPlatform = {
+    id: exports.jupLaunchpadPlatformId,
+    name: 'Jupiter Launchpad',
+    image: 'https://sonar.watch/img/platforms/jupiter.png',
+    website: 'https://lfg.jup.ag/',
+    twitter: 'https://twitter.com/JupiterExchange',
+};
+exports.voteProgramId = new web3_js_1.PublicKey('voTpe3tHQ7AjQHMapgSue2HJFAh2cGsdokqN3XqmVSj');
+exports.lockerPubkey = new web3_js_1.PublicKey('CVMdMd79no569tjc5Sq7kzz8isbfCcFyBS5TLGsrZ5dN');
+exports.jupMint = 'JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN';
+exports.jupDecimals = 6;
+exports.merkleDistributorPid = new web3_js_1.PublicKey('meRjbQXFNf5En86FXT2YPz1dQzLj4Yb3xK8u1MVgqpb');
+exports.merkleApi = 'https://worker.jup.ag/jup-claim-proof';
+exports.airdropsInfo = [
+    {
+        mint: 'JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN',
+        decimals: 6,
+        claimUntilTs: 1722430800000,
+    },
+    {
+        mint: 'ZEUS1aR7aX8DFFJf5QjWj2ftDDdNTroMNGo8YoQm3Gq',
+        decimals: 6,
+        claimUntilTs: 1713445200000,
+    },
+];
+//# sourceMappingURL=constants.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,sBAAsB,GAAG,mBAAmB,CAAC;AAC7C,QAAA,oBAAoB,GAAa;IAC5C,EAAE,EAAE,8BAAsB;IAC1B,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,+CAA+C;IACtD,OAAO,EAAE,qBAAqB;IAC9B,OAAO,EAAE,qCAAqC;CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AACW,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,8CAA8C,CAC/C,CAAC;AACW,QAAA,OAAO,GAAG,6CAA6C,CAAC;AACxD,QAAA,WAAW,GAAG,CAAC,CAAC;AAEhB,QAAA,oBAAoB,GAAG,IAAI,mBAAS,CAC/C,6CAA6C,CAC9C,CAAC;AACW,QAAA,SAAS,GAAG,uCAAuC,CAAC;AAOpD,QAAA,YAAY,GAAkB;IACzC;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,YAAY,EAAE,aAAa;KAC5B;IACD;QACE,IAAI,EAAE,6CAA6C;QACnD,QAAQ,EAAE,CAAC;QACX,YAAY,EAAE,aAAa;KAC5B;CACF,CAAC"}

package/src/plugins/jupiter/{structs/vote.d.ts → launchpad/structs.d.ts}

@@ -16,3 +16,13 @@ export type Escrow = {
     buffers: BigNumber[];
 };
 export declare const escrowStruct: BeetStruct<Escrow, Partial<Escrow>>;
+export type ClaimStatus = {
+    buffer: Buffer;
+    claimant: PublicKey;
+    lockedAmount: BigNumber;
+    lockedAmountWithdrawn: BigNumber;
+    unlockedAmount: BigNumber;
+    closable: Buffer;
+    admin: PublicKey;
+};
+export declare const claimStatusStruct: BeetStruct<ClaimStatus, Partial<ClaimStatus>>;

package/src/plugins/jupiter/{structs/vote.js → launchpad/structs.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escrowStruct = void 0;
+exports.claimStatusStruct = exports.escrowStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../../utils/solana");
@@ -17,4 +17,13 @@ exports.escrowStruct = new beet_1.BeetStruct([
     ['isMaxLock', beet_1.bool],
     ['buffers', (0, beet_1.uniformFixedSizeArray)(solana_1.u128, 10)],
 ], (args) => args);
-//# sourceMappingURL=vote.js.map
+exports.claimStatusStruct = new beet_1.BeetStruct([
+    ['buffer', (0, solana_1.blob)(8)],
+    ['claimant', beet_solana_1.publicKey],
+    ['lockedAmount', solana_1.u64],
+    ['lockedAmountWithdrawn', solana_1.u64],
+    ['unlockedAmount', solana_1.u64],
+    ['closable', (0, solana_1.blob)(1)],
+    ['admin', beet_solana_1.publicKey],
+], (args) => args);
+//# sourceMappingURL=structs.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/structs.ts"],"names":[],"mappings":";;;AAAA,oDAKmC;AACnC,kEAA6D;AAG7D,kDAA6D;AAgBhD,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,QAAQ,EAAE,uBAAS,CAAC;IACrB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,iBAAiB,EAAE,YAAG,CAAC;IACxB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,WAAW,EAAE,WAAI,CAAC;IACnB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,aAAI,EAAE,EAAE,CAAC,CAAC;CAC7C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AAYW,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,cAAc,EAAE,YAAG,CAAC;IACrB,CAAC,uBAAuB,EAAE,YAAG,CAAC;IAC9B,CAAC,gBAAgB,EAAE,YAAG,CAAC;IACvB,CAAC,UAAU,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACrB,CAAC,OAAO,EAAE,uBAAS,CAAC;CACrB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAmB,CAC9B,CAAC"}

package/src/plugins/jupiter/pricingJob.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
-const constants_1 = require("./constants");
+const constants_1 = require("./exchange/constants");
 const helpers_1 = require("./helpers");
 const constants_2 = require("../tokens/constants");
 const getMultipleDecimalsAsMap_1 = require("../../utils/solana/getMultipleDecimalsAsMap");

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

@@ -1 +1 @@
-{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,2CAAyC;AACzC,uCAA6C;AAC7C,mDAA2D;AAC3D,0FAAuF;AACvF,iDAAsD;AAEtD,MAAM,KAAK,GAAG;IACZ,8CAA8C,EAAE,uBAAuB;IACvE,6CAA6C,EAAE,YAAY;IAC3D,8CAA8C,EAAE,OAAO;CACxD,CAAC;AACF,MAAM,OAAO,GAAG,2CAA0B,CAAC;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,CAAC,aAAa;QAAE,OAAO;IAE3B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAwB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACxE,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,MAAM,GAAqB;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ;YACR,EAAE,EAAE,aAAa;YACjB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,EAAE,aAAa,CAAC,KAAK,GAAG,KAAK;YAClC,UAAU,EAAE,gCAAoB,CAAC,EAAE;YACnC,MAAM,EAAE,GAAG;SACZ,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,KAAK,EAAE,WAAW;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jupiter/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,oDAAkD;AAClD,uCAA6C;AAC7C,mDAA2D;AAC3D,0FAAuF;AACvF,iDAAsD;AAEtD,MAAM,KAAK,GAAG;IACZ,8CAA8C,EAAE,uBAAuB;IACvE,6CAA6C,EAAE,YAAY;IAC3D,8CAA8C,EAAE,OAAO;CACxD,CAAC;AACF,MAAM,OAAO,GAAG,2CAA0B,CAAC;AAE3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAC3E,IAAI,CAAC,aAAa;QAAE,OAAO;IAE3B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAwB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACxE,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,MAAM,GAAqB;YAC/B,OAAO,EAAE,IAAI;YACb,QAAQ;YACR,EAAE,EAAE,aAAa;YACjB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,KAAK,EAAE,aAAa,CAAC,KAAK,GAAG,KAAK;YAClC,UAAU,EAAE,gCAAoB,CAAC,EAAE;YACnC,MAAM,EAAE,GAAG;SACZ,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,KAAK,EAAE,WAAW;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/meteora/dlmmHelper.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
 import BigNumber from 'bignumber.js';
-import { BinLiquidity, LMRewards, PositionData, PositionVersion } from './types';
+import { BinLiquidity, LMRewards, PositionData, PositionVersion, SwapFee } from './types';
 import { Bin, BinArray, DLMMPosition, LbPair } from './struct';
 export declare const MAX_BIN_ARRAY_SIZE: BN;
 export declare const SCALE_OFFSET = 64;
@@ -11,16 +11,17 @@ export declare function deriveBinArrayBitmapExtension(lbPair: PublicKey, program
 export declare function deriveBinArray(lbPair: PublicKey, index: BN, programId: PublicKey): [PublicKey, number];
 export declare function processPosition(program: PublicKey, version: PositionVersion, lbPair: LbPair, position: DLMMPosition, baseTokenDecimal: number, quoteTokenDecimal: number, lowerBinArray: BinArray, upperBinArray: BinArray): PositionData | null;
 export declare function getBinsBetweenLowerAndUpperBound(lbPair: LbPair, lowerBinId: number, upperBinId: number, baseTokenDecimal: number, quoteTokenDecimal: number, lowerBinArrays: BinArray, upperBinArrays: BinArray): BinLiquidity[];
-export declare function getClaimableLMReward(program: PublicKey, positionVersion: PositionVersion, lbPair: LbPair, onChainTimestamp: number, position: DLMMPosition, lowerBinArray?: BinArray, upperBinArray?: BinArray): Promise<LMRewards>;
+export declare function getClaimableLMReward(program: PublicKey, positionVersion: PositionVersion, lbPair: LbPair, onChainTimestamp: number, position: DLMMPosition, lowerBinArray: BinArray, upperBinArray: BinArray): LMRewards;
+export declare function getClaimableSwapFee(program: PublicKey, positionVersion: PositionVersion, position: DLMMPosition, lowerBinArray: BinArray, upperBinArray: BinArray): SwapFee;
 export declare function getBinFromBinArray(binId: number, binArray: BinArray): Bin;
 export declare function getBinArrayLowerUpperBinId(binArrayIndex: BigNumber): BigNumber[];
 export declare enum Rounding {
     Up = 0,
     Down = 1
 }
-export declare function mulShr(x: BigNumber, y: BigNumber, offset: number, rounding: Rounding): BigNumber;
-export declare function shlDiv(x: BigNumber, y: BigNumber, offset: number, rounding: Rounding): BigNumber;
-export declare function mulDiv(x: BigNumber, y: BigNumber, denominator: BigNumber, rounding: Rounding): BigNumber;
+export declare function mulShr(x: BN, y: BN, offset: number, rounding: Rounding): BigNumber;
+export declare function shlDiv(x: BN, y: BN, offset: number, rounding: Rounding): BigNumber;
+export declare function mulDiv(x: BN, y: BN, denominator: BN, rounding: Rounding): BigNumber;
 export declare function getPriceOfBinByBinId(binStep: number, binId: number): string;
 export declare function getTokensAmountsFromLiquidity(position: DLMMPosition, pool: LbPair, lowerBinArray: BinArray, upperBinArray: BinArray, baseTokenDecimal: number, quoteTokenDecimal: number): {
     tokenAmountA: BigNumber;

package/src/plugins/meteora/dlmmHelper.js

@@ -1,27 +1,15 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokensAmountsFromLiquidity = exports.getPriceOfBinByBinId = exports.mulDiv = exports.shlDiv = exports.mulShr = exports.Rounding = exports.getBinArrayLowerUpperBinId = exports.getBinFromBinArray = exports.getClaimableLMReward = exports.getBinsBetweenLowerAndUpperBound = exports.processPosition = exports.deriveBinArray = exports.deriveBinArrayBitmapExtension = exports.binIdToBinArrayIndex = exports.BASIS_POINT_MAX = exports.SCALE_OFFSET = exports.MAX_BIN_ARRAY_SIZE = void 0;
+exports.getTokensAmountsFromLiquidity = exports.getPriceOfBinByBinId = exports.mulDiv = exports.shlDiv = exports.mulShr = exports.Rounding = exports.getBinArrayLowerUpperBinId = exports.getBinFromBinArray = exports.getClaimableSwapFee = exports.getClaimableLMReward = exports.getBinsBetweenLowerAndUpperBound = exports.processPosition = exports.deriveBinArray = exports.deriveBinArrayBitmapExtension = exports.binIdToBinArrayIndex = exports.BASIS_POINT_MAX = exports.SCALE_OFFSET = exports.MAX_BIN_ARRAY_SIZE = void 0;
 /* eslint-disable eqeqeq */
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const solana_1 = require("../../utils/solana");
-const clients_1 = require("../../utils/clients");
 const types_1 = require("./types");
-const struct_1 = require("./struct");
 const constants_1 = require("./constants");
 exports.MAX_BIN_ARRAY_SIZE = new bn_js_1.default(70);
 exports.SCALE_OFFSET = 64;
@@ -87,12 +75,33 @@ function processPosition(program, version, lbPair, position, baseTokenDecimal, q
             positionYAmount: positionYAmount.toString(),
         });
     });
+    // Not getting the right results
+    // const { feeX, feeY } = getClaimableSwapFee(
+    //   program,
+    //   version,
+    //   position,
+    //   lowerBinArray,
+    //   upperBinArray
+    // );
+    // const { rewardOne, rewardTwo } = getClaimableLMReward(
+    //   program,
+    //   version,
+    //   lbPair,
+    //   new Date(Date.now()).getTime(),
+    //   position,
+    //   lowerBinArray,
+    //   upperBinArray
+    // );
     return {
         totalXAmount: new bignumber_js_1.default(totalXAmount.toString()),
         totalYAmount: new bignumber_js_1.default(totalYAmount.toString()),
         positionBinData: positionData,
         lowerBinId,
         upperBinId,
+        feeX: new bignumber_js_1.default(0),
+        feeY: new bignumber_js_1.default(0),
+        rewardOne: new bignumber_js_1.default(0),
+        rewardTwo: new bignumber_js_1.default(0),
     };
 }
 exports.processPosition = processPosition;
@@ -148,73 +157,90 @@ function getBinsBetweenLowerAndUpperBound(lbPair, lowerBinId, upperBinId, baseTo
 }
 exports.getBinsBetweenLowerAndUpperBound = getBinsBetweenLowerAndUpperBound;
 function getClaimableLMReward(program, positionVersion, lbPair, onChainTimestamp, position, lowerBinArray, upperBinArray) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const client = (0, clients_1.getClientSolana)();
-        let lowerBinArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(position.lowerBinId));
-        const rewards = [new bignumber_js_1.default(0), new bignumber_js_1.default(0)];
-        let tempLowerBinArray = lowerBinArray;
-        let tempUpperBinArray = upperBinArray;
-        if (!lowerBinArray || !upperBinArray) {
-            lowerBinArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(position.lowerBinId));
-            const [newlowerBinArray] = deriveBinArray(position.lbPair, lowerBinArrayIdx, program);
-            const upperBinArrayIdx = lowerBinArrayIdx.add(new bn_js_1.default(1));
-            const [newupperBinArray] = deriveBinArray(position.lbPair, upperBinArrayIdx, program);
-            [tempLowerBinArray, tempUpperBinArray] =
-                yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.binArrayStruct, [
-                    newlowerBinArray,
-                    newupperBinArray,
-                ]);
-        }
-        if (!tempLowerBinArray || !tempUpperBinArray)
-            throw new Error('BinArray not found');
-        for (let i = position.lowerBinId; i <= position.upperBinId; i++) {
-            const binArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(i));
-            const binArray = binArrayIdx.eq(lowerBinArrayIdx)
-                ? tempLowerBinArray
-                : tempUpperBinArray;
-            const binState = getBinFromBinArray(i, binArray);
-            const binIdxInPosition = i - position.lowerBinId;
-            const positionRewardInfo = position.rewardInfos[binIdxInPosition];
-            const liquidityShare = positionVersion === types_1.PositionVersion.V1
-                ? position.liquidityShares[binIdxInPosition]
-                : position.liquidityShares[binIdxInPosition].shiftedBy(64);
-            for (let j = 0; j < 2; j++) {
-                const pairRewardInfo = lbPair.rewardInfos[j];
-                if (!pairRewardInfo.mint.equals(web3_js_1.PublicKey.default)) {
-                    let rewardPerTokenStored = j === 0
-                        ? binState.rewardPerTokenXStored
-                        : binState.rewardPerTokenYStored;
-                    if (i == lbPair.activeId && !binState.liquiditySupply.isZero()) {
-                        const currentTime = new bignumber_js_1.default(Math.min(onChainTimestamp, pairRewardInfo.rewardDurationEnd.toNumber()));
-                        const delta = currentTime.minus(pairRewardInfo.lastUpdateTime);
-                        const liquiditySupply = binArray.version === 0
-                            ? binState.liquiditySupply
-                            : binState.liquiditySupply.shiftedBy(64);
-                        const rewardPerTokenStoredDelta = pairRewardInfo.rewardRate
-                            .times(delta.toString())
-                            .div(new bignumber_js_1.default(15))
-                            .div(liquiditySupply);
-                        rewardPerTokenStored = rewardPerTokenStored.plus(rewardPerTokenStoredDelta);
-                    }
-                    const delta = rewardPerTokenStored.minus(j === 0
-                        ? positionRewardInfo.rewardPerTokenCompletesX
-                        : positionRewardInfo.rewardPerTokenCompletesY);
-                    const newReward = mulShr(delta, liquidityShare, exports.SCALE_OFFSET, Rounding.Down);
-                    rewards[j] = rewards[j]
-                        .plus(newReward)
-                        .plus(j === 0
-                        ? positionRewardInfo.rewardPendingsX
-                        : positionRewardInfo.rewardPendingsY);
+    const lowerBinArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(position.lowerBinId));
+    const rewards = [new bignumber_js_1.default(0), new bignumber_js_1.default(0)];
+    if (!lowerBinArray || !upperBinArray)
+        throw new Error('BinArray not found');
+    for (let i = position.lowerBinId; i <= position.upperBinId; i++) {
+        const binArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(i));
+        const binArray = binArrayIdx.eq(lowerBinArrayIdx)
+            ? lowerBinArray
+            : upperBinArray;
+        const binState = getBinFromBinArray(i, binArray);
+        const binIdxInPosition = i - position.lowerBinId;
+        const positionRewardInfo = position.rewardInfos[binIdxInPosition];
+        const liquidityShare = positionVersion === types_1.PositionVersion.V1
+            ? new bn_js_1.default(position.liquidityShares[binIdxInPosition].toString())
+            : new bn_js_1.default(position.liquidityShares[binIdxInPosition].toString()).shrn(64);
+        for (let j = 0; j < 2; j++) {
+            const pairRewardInfo = lbPair.rewardInfos[j];
+            if (!pairRewardInfo.mint.equals(web3_js_1.PublicKey.default)) {
+                let rewardPerTokenStored = j === 0
+                    ? binState.rewardPerTokenXStored
+                    : binState.rewardPerTokenYStored;
+                if (i == lbPair.activeId && !binState.liquiditySupply.isZero()) {
+                    const currentTime = new bignumber_js_1.default(Math.min(onChainTimestamp, pairRewardInfo.rewardDurationEnd.toNumber()));
+                    const delta = currentTime.minus(pairRewardInfo.lastUpdateTime);
+                    const liquiditySupply = binArray.version === 0
+                        ? binState.liquiditySupply
+                        : binState.liquiditySupply.shiftedBy(64);
+                    const rewardPerTokenStoredDelta = pairRewardInfo.rewardRate
+                        .times(delta.toString())
+                        .div(new bignumber_js_1.default(15))
+                        .div(liquiditySupply);
+                    rewardPerTokenStored = rewardPerTokenStored.plus(rewardPerTokenStoredDelta);
                 }
+                const delta = rewardPerTokenStored.minus(j === 0
+                    ? positionRewardInfo.rewardPerTokenCompletesX
+                    : positionRewardInfo.rewardPerTokenCompletesY);
+                const newReward = mulShr(new bn_js_1.default(delta.toString()), liquidityShare, exports.SCALE_OFFSET, Rounding.Down);
+                rewards[j] = rewards[j]
+                    .plus(newReward)
+                    .plus(j === 0
+                    ? positionRewardInfo.rewardPendingsX
+                    : positionRewardInfo.rewardPendingsY);
             }
         }
-        return {
-            rewardOne: rewards[0],
-            rewardTwo: rewards[1],
-        };
-    });
+    }
+    return {
+        rewardOne: rewards[0],
+        rewardTwo: rewards[1],
+    };
 }
 exports.getClaimableLMReward = getClaimableLMReward;
+function getClaimableSwapFee(program, positionVersion, position, lowerBinArray, upperBinArray) {
+    const lowerBinArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(position.lowerBinId));
+    let feeX = new bignumber_js_1.default(0);
+    let feeY = new bignumber_js_1.default(0);
+    if (!lowerBinArray || !upperBinArray)
+        throw new Error('BinArray not found');
+    for (let i = position.lowerBinId; i <= position.upperBinId; i++) {
+        const binArrayIdx = binIdToBinArrayIndex(new bignumber_js_1.default(i));
+        const binArray = binArrayIdx.eq(lowerBinArrayIdx)
+            ? lowerBinArray
+            : upperBinArray;
+        const binState = getBinFromBinArray(i, binArray);
+        const binIdxInPosition = i - position.lowerBinId;
+        const feeInfos = position.feeInfos[binIdxInPosition];
+        const liquidityShare = positionVersion === types_1.PositionVersion.V1
+            ? new bn_js_1.default(position.liquidityShares[binIdxInPosition].toString())
+            : new bn_js_1.default(position.liquidityShares[binIdxInPosition].toString()).shrn(64);
+        if (liquidityShare.isZero())
+            continue;
+        const feeXPerToken = binState.feeAmountXPerTokenStored.minus(feeInfos.feeXPerTokenComplete);
+        if (!feeXPerToken.isZero()) {
+            const newFeeX = mulShr(liquidityShare, new bn_js_1.default(feeXPerToken.toString()), exports.SCALE_OFFSET, Rounding.Down);
+            feeX = feeX.plus(newFeeX).plus(feeInfos.feeXPending);
+        }
+        const feeYPerToken = binState.feeAmountXPerTokenStored.minus(feeInfos.feeXPerTokenComplete);
+        if (!feeYPerToken.isZero()) {
+            const newFeeY = mulShr(liquidityShare, new bn_js_1.default(feeYPerToken.toString()), exports.SCALE_OFFSET, Rounding.Down);
+            feeY = feeY.plus(newFeeY).plus(feeInfos.feeYPending);
+        }
+    }
+    return { feeX, feeY };
+}
+exports.getClaimableSwapFee = getClaimableSwapFee;
 function getBinFromBinArray(binId, binArray) {
     const [lowerBinId, upperBinId] = getBinArrayLowerUpperBinId(binArray.index);
     let index = 0;
@@ -242,23 +268,21 @@ var Rounding;
     Rounding[Rounding["Down"] = 1] = "Down";
 })(Rounding || (exports.Rounding = Rounding = {}));
 function mulShr(x, y, offset, rounding) {
-    const denominator = new bignumber_js_1.default(1).shiftedBy(-offset);
+    const denominator = new bn_js_1.default(1).shln(offset);
     return mulDiv(x, y, denominator, rounding);
 }
 exports.mulShr = mulShr;
 function shlDiv(x, y, offset, rounding) {
-    const scale = new bignumber_js_1.default(1).shiftedBy(-offset);
+    const scale = new bn_js_1.default(1).shln(-offset);
     return mulDiv(x, scale, y, rounding);
 }
 exports.shlDiv = shlDiv;
 function mulDiv(x, y, denominator, rounding) {
-    const { div, mod } = new bn_js_1.default(x.toString())
-        .mul(new bn_js_1.default(y.toString()))
-        .divmod(new bn_js_1.default(denominator.toString()));
-    if (rounding == Rounding.Up && !mod.isZero()) {
-        return new bignumber_js_1.default(div.add(new bn_js_1.default(1)).toString());
+    const { div: resultat, mod: reste } = x.mul(y).divmod(denominator);
+    if (rounding == Rounding.Up && !reste.isZero()) {
+        return new bignumber_js_1.default(resultat.add(new bn_js_1.default(1)).toString());
     }
-    return new bignumber_js_1.default(div.toString());
+    return new bignumber_js_1.default(resultat.toString());
 }
 exports.mulDiv = mulDiv;
 function getPriceOfBinByBinId(binStep, binId) {