@sonarwatch/portfolio-plugins 0.12.55 → 0.12.57

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.12.57](https://github.com/sonarwatch/portfolio/compare/plugins-0.12.56...plugins-0.12.57) (2024-07-12)
+
+
+
+## [0.12.56](https://github.com/sonarwatch/portfolio/compare/plugins-0.12.55...plugins-0.12.56) (2024-07-12)
+
+
+
 ## [0.12.55](https://github.com/sonarwatch/portfolio/compare/plugins-0.12.54...plugins-0.12.55) (2024-07-11)
 
 

package/package.json

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

package/src/AirdropFetcher.d.ts

@@ -1,5 +1,6 @@
-import { AddressSystemType, Airdrop, AirdropFetcherResult, AirdropFetchersResult, NetworkIdType } from '@sonarwatch/portfolio-core';
+import { AddressSystemType, Airdrop, AirdropFetcherResult, AirdropFetchersResult, IsClaimed, NetworkIdType, UsdValue } from '@sonarwatch/portfolio-core';
 import { Cache } from './Cache';
+import { Fetcher } from './Fetcher';
 export type AirdropFetcherExecutor = (owner: string, cache: Cache) => Promise<Airdrop>;
 export type AirdropFetcher = {
     id: string;
@@ -7,5 +8,18 @@ export type AirdropFetcher = {
     executor: AirdropFetcherExecutor;
 };
 export declare function runAirdropFetchersByNetworkId(owner: string, networkId: NetworkIdType, fetchers: AirdropFetcher[], cache: Cache): Promise<AirdropFetchersResult>;
+export type AirdropStatics = Omit<Airdrop, 'status' | 'items'>;
+export declare function getAirdrop(params: {
+    statics: AirdropStatics;
+    items: {
+        amount: number;
+        label: string;
+        price: UsdValue;
+        imageUri?: string;
+        address?: string;
+        isClaimed: IsClaimed;
+    }[];
+}): Airdrop;
 export declare function runAirdropFetchers(owner: string, addressSystem: AddressSystemType, fetchers: AirdropFetcher[], cache: Cache): Promise<AirdropFetchersResult>;
 export declare function runAirdropFetcher(owner: string, fetcher: AirdropFetcher, cache: Cache): Promise<AirdropFetcherResult>;
+export declare function airdropFetcherToFetcher(airdropFetcher: AirdropFetcher, platformId: string, id: string, claimEnd?: number): Fetcher;

package/src/AirdropFetcher.js

@@ -12,9 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runAirdropFetcher = exports.runAirdropFetchers = exports.runAirdropFetchersByNetworkId = void 0;
+exports.airdropFetcherToFetcher = exports.runAirdropFetcher = exports.runAirdropFetchers = exports.getAirdrop = exports.runAirdropFetchersByNetworkId = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const promiseTimeout_1 = __importDefault(require("./utils/misc/promiseTimeout"));
+const tokenPriceToAssetToken_1 = __importDefault(require("./utils/misc/tokenPriceToAssetToken"));
 const runAirdropFetcherTimeout = 10000;
 function runAirdropFetchersByNetworkId(owner, networkId, fetchers, cache) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -26,6 +27,26 @@ function runAirdropFetchersByNetworkId(owner, networkId, fetchers, cache) {
     });
 }
 exports.runAirdropFetchersByNetworkId = runAirdropFetchersByNetworkId;
+function getAirdrop(params) {
+    const status = (0, portfolio_core_1.getAirdropStatus)(params.statics.claimStart, params.statics.claimEnd);
+    return Object.assign(Object.assign({}, params.statics), { status, items: getAirdropItems(status, params.items) });
+}
+exports.getAirdrop = getAirdrop;
+function getAirdropItems(airdropStatus, items) {
+    return items.map((item) => {
+        const isEligible = (0, portfolio_core_1.getIsEligible)(item.amount);
+        return {
+            amount: item.amount,
+            isClaimed: isEligible === false ? false : item.isClaimed,
+            isEligible,
+            label: item.label,
+            price: item.price,
+            status: (0, portfolio_core_1.getAirdropItemStatus)(airdropStatus, item.amount, item.isClaimed),
+            address: item.address,
+            imageUri: item.imageUri,
+        };
+    });
+}
 function runAirdropFetchers(owner, addressSystem, fetchers, cache) {
     return __awaiter(this, void 0, void 0, function* () {
         const fOwner = (0, portfolio_core_1.formatAddress)(owner, addressSystem);
@@ -89,4 +110,55 @@ function runAirdropFetcher(owner, fetcher, cache) {
     });
 }
 exports.runAirdropFetcher = runAirdropFetcher;
+function airdropFetcherToFetcher(airdropFetcher, platformId, id, claimEnd) {
+    return {
+        id,
+        networkId: airdropFetcher.networkId,
+        executor: (owner, cache) => __awaiter(this, void 0, void 0, function* () {
+            if (claimEnd && Date.now() > claimEnd)
+                return [];
+            const airdrop = yield airdropFetcher.executor(owner, cache);
+            const assets = [];
+            airdrop.items.forEach((item) => {
+                if (item.status !== portfolio_core_1.AirdropItemStatus.claimable &&
+                    item.status !== portfolio_core_1.AirdropItemStatus.claimableLater)
+                    return;
+                const asset = item.address
+                    ? (0, tokenPriceToAssetToken_1.default)(item.address, item.amount, airdropFetcher.networkId, undefined, item.price || undefined, { isClaimable: true, lockedUntil: airdrop.claimStart })
+                    : {
+                        type: portfolio_core_1.PortfolioAssetType.generic,
+                        data: {
+                            amount: item.amount,
+                            price: item.price,
+                        },
+                        name: item.label,
+                        networkId: airdropFetcher.networkId,
+                        attributes: {
+                            isClaimable: true,
+                            lockedUntil: airdrop.claimStart,
+                        },
+                        value: item.price ? item.price * item.amount : null,
+                        imageUri: item.imageUri,
+                    };
+                assets.push(asset);
+            });
+            if (assets.length === 0)
+                return [];
+            return [
+                {
+                    networkId: airdropFetcher.networkId,
+                    label: 'Airdrop',
+                    data: {
+                        assets,
+                    },
+                    platformId,
+                    type: portfolio_core_1.PortfolioElementType.multiple,
+                    value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
+                    name: airdrop.name,
+                },
+            ];
+        }),
+    };
+}
+exports.airdropFetcherToFetcher = airdropFetcherToFetcher;
 //# sourceMappingURL=AirdropFetcher.js.map

package/src/AirdropFetcher.js.map

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

package/src/plugins/drift/airdropFetcher.js

@@ -1,71 +1,8 @@
 "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 constants_1 = require("./constants");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helpersAirdrop_1 = require("./helpersAirdrop");
-const helpers_1 = require("../jupiter/helpers");
-const clients_1 = require("../../utils/clients");
-const claimEnds = 1723831200000;
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    if (Date.now() > claimEnds)
-        return [];
-    const { amount, merkle } = yield (0, helpersAirdrop_1.fetchAirdropInfo)(owner);
-    if (amount === 0)
-        return [];
-    const client = (0, clients_1.getClientSolana)();
-    const claimStatus = (0, helpers_1.deriveClaimStatus)(owner, merkle, constants_1.distributorPid);
-    const account = yield client.getAccountInfo(claimStatus);
-    if (account)
-        return [];
-    const tokenPrice = constants_1.driftMint
-        ? yield cache.getTokenPrice(constants_1.driftMint, portfolio_core_1.NetworkId.solana)
-        : undefined;
-    const asset = tokenPrice
-        ? (0, tokenPriceToAssetToken_1.default)(tokenPrice.address, amount, portfolio_core_1.NetworkId.solana, tokenPrice)
-        : {
-            type: 'generic',
-            data: {
-                amount,
-                name: 'DRIFT',
-                price: null,
-                imageUri: constants_1.platform.image,
-            },
-            attributes: {
-                lockedUntil: helpersAirdrop_1.claimStart,
-            },
-            networkId: portfolio_core_1.NetworkId.solana,
-            value: null,
-        };
-    return [
-        {
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            type: portfolio_core_1.PortfolioElementType.multiple,
-            data: {
-                assets: [asset],
-            },
-            value: null,
-            label: 'Airdrop',
-        },
-    ];
-});
-const fetcher = {
-    id: `${constants_1.platformId}-airdrop`,
-    networkId: portfolio_core_1.NetworkId.solana,
-    executor,
-};
+const AirdropFetcher_1 = require("../../AirdropFetcher");
+const constants_1 = require("./constants");
+const fetcher = (0, AirdropFetcher_1.airdropFetcherToFetcher)(helpersAirdrop_1.airdropFetcher, constants_1.platformId, `${constants_1.platformId}-airdrop`, constants_1.airdropStatics.claimEnd);
 exports.default = fetcher;
 //# sourceMappingURL=airdropFetcher.js.map

package/src/plugins/drift/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AAGpC,2CAA8E;AAC9E,qGAA6E;AAC7E,qDAAgE;AAChE,gDAAuD;AACvD,iDAAsD;AAEtD,MAAM,SAAS,GAAG,aAAa,CAAC;AAChC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;QAAE,OAAO,EAAE,CAAC;IAEtC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,iCAAgB,EAAC,KAAK,CAAC,CAAC;IACzD,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,2BAAiB,EAAC,KAAK,EAAE,MAAM,EAAE,0BAAc,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IACzD,IAAI,OAAO;QAAE,OAAO,EAAE,CAAC;IAEvB,MAAM,UAAU,GAAG,qBAAS;QAC1B,CAAC,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,qBAAS,EAAE,0BAAS,CAAC,MAAM,CAAC;QACxD,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,KAAK,GAAmB,UAAU;QACtC,CAAC,CAAC,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX;QACH,CAAC,CAAC;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE;gBACJ,MAAM;gBACN,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,oBAAQ,CAAC,KAAK;aACzB;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,2BAAU;aACxB;YACD,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAI;SACZ,CAAC;IAEN,OAAO;QACL;YACE,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;YACD,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/airdropFetcher.ts"],"names":[],"mappings":";;AACA,qDAAkD;AAClD,yDAA+D;AAC/D,2CAAyD;AAEzD,MAAM,OAAO,GAAY,IAAA,wCAAuB,EAC9C,+BAAc,EACd,sBAAU,EACV,GAAG,sBAAU,UAAU,EACvB,0BAAc,CAAC,QAAQ,CACxB,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
+import { AirdropStatics } from '../../AirdropFetcher';
 export declare const platformId = "drift";
 export declare const platformName = "Drift";
 export declare const platformImage = "https://sonar.watch/img/platforms/drift.webp";
@@ -11,6 +12,6 @@ export declare const preMarketPriceKey = "premarketPrice";
 export declare const perpMarketsIndexesKey = "perp-markets-indexes";
 export declare const oracleToMintKey = "oracle-to-mint";
 export declare const airdropUrl = "https://airdrop.drift.trade/eligibility/";
-export declare const distributorPid = "E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x";
 export declare const driftDecimals = 6;
 export declare const driftMint = "DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7";
+export declare const airdropStatics: AirdropStatics;

package/src/plugins/drift/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.driftMint = exports.driftDecimals = exports.distributorPid = exports.airdropUrl = exports.oracleToMintKey = exports.perpMarketsIndexesKey = exports.preMarketPriceKey = exports.driftProgram = exports.prefixSpotMarkets = exports.platform = exports.platformWebsite = exports.platformImage = exports.platformName = exports.platformId = void 0;
+exports.airdropStatics = exports.driftMint = exports.driftDecimals = exports.airdropUrl = exports.oracleToMintKey = exports.perpMarketsIndexesKey = exports.preMarketPriceKey = exports.driftProgram = exports.prefixSpotMarkets = exports.platform = exports.platformWebsite = exports.platformImage = exports.platformName = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'drift';
 exports.platformName = 'Drift';
@@ -19,7 +19,16 @@ exports.preMarketPriceKey = 'premarketPrice';
 exports.perpMarketsIndexesKey = 'perp-markets-indexes';
 exports.oracleToMintKey = 'oracle-to-mint';
 exports.airdropUrl = 'https://airdrop.drift.trade/eligibility/';
-exports.distributorPid = 'E7HtfkEMhmn9uwL7EFNydcXBWy5WCYN1vFmKKjipEH1x';
 exports.driftDecimals = 6;
 exports.driftMint = 'DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7';
+exports.airdropStatics = {
+    id: 'drift-airdrop-1',
+    claimLink: 'https://drift.foundation',
+    image: exports.platformImage,
+    name: undefined,
+    emitterName: exports.platformName,
+    emitterLink: exports.platformWebsite,
+    claimStart: 1715860800000,
+    claimEnd: 1723831200000,
+};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAC/D,QAAA,eAAe,GAAG,0BAA0B,CAAC;AAC7C,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,oBAAY;IAClB,KAAK,EAAE,qBAAa;IACpB,WAAW,EAAE,OAAO;IACpB,OAAO,EAAE,uBAAe;CACzB,CAAC;AACW,QAAA,iBAAiB,GAAG,GAAG,kBAAU,cAAc,CAAC;AAEhD,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AACrC,QAAA,qBAAqB,GAAG,sBAAsB,CAAC;AAC/C,QAAA,eAAe,GAAG,gBAAgB,CAAC;AAEnC,QAAA,UAAU,GAAG,0CAA0C,CAAC;AACxD,QAAA,cAAc,GAAG,8CAA8C,CAAC;AAChE,QAAA,aAAa,GAAG,CAAC,CAAC;AAClB,QAAA,SAAS,GAAG,8CAA8C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAI/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAC/D,QAAA,eAAe,GAAG,0BAA0B,CAAC;AAC7C,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,oBAAY;IAClB,KAAK,EAAE,qBAAa;IACpB,WAAW,EAAE,OAAO;IACpB,OAAO,EAAE,uBAAe;CACzB,CAAC;AACW,QAAA,iBAAiB,GAAG,GAAG,kBAAU,cAAc,CAAC;AAEhD,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AACrC,QAAA,qBAAqB,GAAG,sBAAsB,CAAC;AAC/C,QAAA,eAAe,GAAG,gBAAgB,CAAC;AAEnC,QAAA,UAAU,GAAG,0CAA0C,CAAC;AACxD,QAAA,aAAa,GAAG,CAAC,CAAC;AAClB,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAE3D,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,0BAA0B;IACrC,KAAK,EAAE,qBAAa;IACpB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,oBAAY;IACzB,WAAW,EAAE,uBAAe;IAC5B,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC"}

package/src/plugins/drift/helpersAirdrop.d.ts

@@ -1,5 +1,9 @@
-import { AirdropInfo } from './types';
 import { AirdropFetcher } from '../../AirdropFetcher';
-export declare const claimStart = 1715860800000;
+type AirdropInfo = {
+    merkle?: string;
+    amount: number;
+    isClaimed: boolean;
+};
 export declare function fetchAirdropInfo(owner: string): Promise<AirdropInfo>;
 export declare const airdropFetcher: AirdropFetcher;
+export {};

package/src/plugins/drift/helpersAirdrop.js

@@ -12,13 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.airdropFetcher = exports.fetchAirdropInfo = exports.claimStart = void 0;
+exports.airdropFetcher = exports.fetchAirdropInfo = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const axios_1 = __importDefault(require("axios"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
+const AirdropFetcher_1 = require("../../AirdropFetcher");
 const driftFactor = new bignumber_js_1.default(Math.pow(10, constants_1.driftDecimals));
-exports.claimStart = 1715860800000;
 function fetchAirdropInfo(owner) {
     return __awaiter(this, void 0, void 0, function* () {
         const res = yield axios_1.default.get(constants_1.airdropUrl + owner, {
@@ -31,6 +31,9 @@ function fetchAirdropInfo(owner) {
                 return status === 404 || status === 200;
             },
         });
+        if (res.data.error) {
+            return { amount: 0, merkle: undefined, isClaimed: false };
+        }
         const availableAmount = Date.now() > res.data.end_ts * 1000
             ? res.data.end_amount
             : res.data.start_amount;
@@ -39,31 +42,30 @@ function fetchAirdropInfo(owner) {
                 .dividedBy(driftFactor)
                 .toNumber(),
             merkle: res.data.merkle_tree,
+            isClaimed: res.data.unvested_amount === 0,
         };
     });
 }
 exports.fetchAirdropInfo = fetchAirdropInfo;
-const airdropStatics = {
-    claimLink: 'https://drift.foundation/eligibility',
-    id: 'drift-airdrop-1',
-    image: constants_1.platformImage,
-    label: 'DRIFT',
-    name: undefined,
-    emitterName: constants_1.platformName,
-    emitterLink: constants_1.platformWebsite,
-    claimStart: exports.claimStart,
-    claimEnd: undefined,
-};
-const fetchAirdropExecutor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    let { amount } = yield fetchAirdropInfo(owner);
-    if (amount === 0)
-        amount = -1;
-    const claimStatus = (0, portfolio_core_1.getAirdropClaimStatus)(airdropStatics.claimStart, airdropStatics.claimEnd);
-    return Object.assign(Object.assign({}, airdropStatics), { amount,
-        claimStatus, isClaimed: false, price: null });
+const fetchAirdropExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const airdropInfo = yield fetchAirdropInfo(owner);
+    const { isClaimed, amount } = airdropInfo;
+    const driftPrice = yield cache.getTokenPrice(constants_1.driftMint, portfolio_core_1.NetworkId.solana);
+    return (0, AirdropFetcher_1.getAirdrop)({
+        statics: constants_1.airdropStatics,
+        items: [
+            {
+                amount,
+                label: 'DRIFT',
+                address: constants_1.driftMint,
+                price: (driftPrice === null || driftPrice === void 0 ? void 0 : driftPrice.price) || null,
+                isClaimed,
+            },
+        ],
+    });
 });
 exports.airdropFetcher = {
-    id: airdropStatics.id,
+    id: constants_1.airdropStatics.id,
     networkId: portfolio_core_1.NetworkId.solana,
     executor: fetchAirdropExecutor,
 };

package/src/plugins/drift/helpersAirdrop.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpersAirdrop.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/helpersAirdrop.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,kDAA6C;AAC7C,+DAA8E;AAC9E,2CAMqB;AAIrB,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC;AAC1C,QAAA,UAAU,GAAG,aAAa,CAAC;AAExC,SAAsB,gBAAgB,CAAC,KAAa;;QAClD,MAAM,GAAG,GAAmC,MAAM,eAAK,CAAC,GAAG,CACzD,sBAAU,GAAG,KAAK,EAClB;YACE,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE,2BAA2B;aACrC;YACD,OAAO,EAAE,IAAI;YACb,cAAc,CAAC,MAAM;gBACnB,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;YAC1C,CAAC;SACF,CACF,CAAC;QAEF,MAAM,eAAe,GACnB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI;YACjC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU;YACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;QAE5B,OAAO;YACL,MAAM,EAAE,IAAI,sBAAS,CAAC,eAAe,IAAI,CAAC,CAAC;iBACxC,SAAS,CAAC,WAAW,CAAC;iBACtB,QAAQ,EAAE;YACb,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW;SAC7B,CAAC;IACJ,CAAC;CAAA;AA1BD,4CA0BC;AAED,MAAM,cAAc,GAAG;IACrB,SAAS,EAAE,sCAAsC;IACjD,EAAE,EAAE,iBAAiB;IACrB,KAAK,EAAE,yBAAa;IACpB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,wBAAY;IACzB,WAAW,EAAE,2BAAe;IAC5B,UAAU,EAAV,kBAAU;IACV,QAAQ,EAAE,SAAS;CACpB,CAAC;AACF,MAAM,oBAAoB,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC3E,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC/C,IAAI,MAAM,KAAK,CAAC;QAAE,MAAM,GAAG,CAAC,CAAC,CAAC;IAE9B,MAAM,WAAW,GAAG,IAAA,sCAAqB,EACvC,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,QAAQ,CACxB,CAAC;IACF,uCACK,cAAc,KACjB,MAAM;QACN,WAAW,EACX,SAAS,EAAE,KAAK,EAChB,KAAK,EAAE,IAAI,IACX;AACJ,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,cAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,oBAAoB;CAC/B,CAAC"}
+{"version":3,"file":"helpersAirdrop.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/drift/helpersAirdrop.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AACrC,kDAA6C;AAC7C,+DAAuD;AACvD,2CAKqB;AACrB,yDAI8B;AAG9B,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC;AAmBvD,SAAsB,gBAAgB,CAAC,KAAa;;QAClD,MAAM,GAAG,GAAmC,MAAM,eAAK,CAAC,GAAG,CACzD,sBAAU,GAAG,KAAK,EAClB;YACE,OAAO,EAAE;gBACP,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EAAE,2BAA2B;aACrC;YACD,OAAO,EAAE,IAAI;YACb,cAAc,CAAC,MAAM;gBACnB,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC;YAC1C,CAAC;SACF,CACF,CAAC;QAEF,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;QAC5D,CAAC;QAED,MAAM,eAAe,GACnB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI;YACjC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU;YACrB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC;QAE5B,OAAO;YACL,MAAM,EAAE,IAAI,sBAAS,CAAC,eAAe,IAAI,CAAC,CAAC;iBACxC,SAAS,CAAC,WAAW,CAAC;iBACtB,QAAQ,EAAE;YACb,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW;YAC5B,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC;SAC1C,CAAC;IACJ,CAAC;CAAA;AA/BD,4CA+BC;AAED,MAAM,oBAAoB,GAA2B,CACnD,KAAa,EACb,KAAY,EACZ,EAAE;IACF,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAE1C,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,qBAAS,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE1E,OAAO,IAAA,2BAAU,EAAC;QAChB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,KAAK,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KAAI,IAAI;gBAChC,SAAS;aACV;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ,EAAE,oBAAoB;CAC/B,CAAC"}

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

@@ -7,20 +7,4 @@ export type PreMarketPrice = {
     id: string;
     price: number;
 };
-export type AirdropResponse = {
-    claimant: string;
-    merkle_tree: string;
-    mint: string;
-    start_ts: number;
-    end_ts: number;
-    start_amount: number;
-    end_amount: number;
-    unvested_amount: number;
-    claimed_amount: number;
-    error: string;
-};
-export type AirdropInfo = {
-    merkle: string;
-    amount: number;
-};
 export type PerpMarketIndexes = Array<[number, string]>;

package/src/plugins/jupiter/governance/asrFetcher.js

@@ -16,7 +16,7 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const clients_1 = require("../../../utils/clients");
-const helpers_1 = require("../helpers");
+const deriveClaimStatus_1 = require("../../../utils/solana/jupiter/deriveClaimStatus");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
 const structs_1 = require("../launchpad/structs");
 const constants_1 = require("../launchpad/constants");
@@ -34,10 +34,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     for (let i = 0; i < claims.length; i++) {
         const proof = claims[i];
         if (proof.mint === constants_1.jupMint) {
-            claimsStatusPubkeys.push((0, helpers_1.deriveClaimStatus)(owner, proof.merkle_tree, constants_1.jupDisProgram));
+            claimsStatusPubkeys.push((0, deriveClaimStatus_1.deriveClaimStatus)(owner, proof.merkle_tree, constants_1.jupDisProgram));
         }
         else {
-            claimsStatusPubkeys.push((0, helpers_1.deriveClaimStatus)(owner, proof.merkle_tree, constants_1.mainDisProgram));
+            claimsStatusPubkeys.push((0, deriveClaimStatus_1.deriveClaimStatus)(owner, proof.merkle_tree, constants_1.mainDisProgram));
         }
     }
     const [claimStatusAccounts, tokenPriceById] = yield Promise.all([

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

@@ -1 +1 @@
-{"version":3,"file":"asrFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/asrFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AACpC,kDAA6C;AAE7C,gEAAqC;AAGrC,oDAAyD;AAEzD,wCAA+C;AAC/C,wGAAgF;AAChF,kDAAyD;AACzD,sDAKgC;AAChC,2CAAyC;AACzC,kDAAsE;AAEtE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,WAAW,GAAsC,MAAM,eAAK;SAC/D,GAAG,CAAC,GAAG,kBAAM,IAAI,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC5C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,KAAK,CAAA;QAAE,OAAO,EAAE,CAAC;IAExC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;IAEtC,MAAM,mBAAmB,GAAgB,EAAE,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAO,EAAE,CAAC;YAC3B,mBAAmB,CAAC,IAAI,CACtB,IAAA,2BAAiB,EAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,yBAAa,CAAC,CAC3D,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,IAAI,CACtB,IAAA,2BAAiB,EAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,0BAAc,CAAC,CAC5D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9D,IAAA,sCAA6B,EAC3B,MAAM,EACN,2BAAiB,EACjB,mBAAmB,CACpB;QACD,KAAK,CAAC,mBAAmB,CACvB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAC5D,0BAAS,CAAC,MAAM,CACjB;KACF,CAAC,CAAC;IAEH,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,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,SAAS;QAE1B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,MAAM,CAAC;aACvC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aACpC,QAAQ,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,KAAK,CAAC,IAAI,EACV,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,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,EAAV,sBAAU;YACV,IAAI,EAAE,wBAAwB;YAC9B,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,sBAAU,MAAM;IACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"asrFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/governance/asrFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAKoC;AACpC,kDAA6C;AAE7C,gEAAqC;AAGrC,oDAAyD;AAEzD,uFAAoF;AACpF,wGAAgF;AAChF,kDAAyD;AACzD,sDAKgC;AAChC,2CAAyC;AACzC,kDAAsE;AAEtE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,WAAW,GAAsC,MAAM,eAAK;SAC/D,GAAG,CAAC,GAAG,kBAAM,IAAI,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC5C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,KAAK,CAAA;QAAE,OAAO,EAAE,CAAC;IAExC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;IAEtC,MAAM,mBAAmB,GAAgB,EAAE,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAO,EAAE,CAAC;YAC3B,mBAAmB,CAAC,IAAI,CACtB,IAAA,qCAAiB,EAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,yBAAa,CAAC,CAC3D,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,mBAAmB,CAAC,IAAI,CACtB,IAAA,qCAAiB,EAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,0BAAc,CAAC,CAC5D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9D,IAAA,sCAA6B,EAC3B,MAAM,EACN,2BAAiB,EACjB,mBAAmB,CACpB;QACD,KAAK,CAAC,mBAAmB,CACvB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAC5D,0BAAS,CAAC,MAAM,CACjB;KACF,CAAC,CAAC;IAEH,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,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,SAAS;QAE1B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,MAAM,CAAC;aACvC,SAAS,CAAC,SAAA,EAAE,EAAI,UAAU,CAAC,QAAQ,CAAA,CAAC;aACpC,QAAQ,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,KAAK,CAAC,IAAI,EACV,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,UAAU,CACX,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,EAAV,sBAAU;YACV,IAAI,EAAE,wBAAwB;YAC9B,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,sBAAU,MAAM;IACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -1,6 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
 import { PortfolioAssetToken } from '@sonarwatch/portfolio-core';
-export declare function deriveClaimStatus(claimant: string, merkleTree: string, merkleDistributor: string): PublicKey;
 export declare function getVotePda(owner: string): PublicKey;
 export declare function getJupiterPrices(mints: PublicKey[], vsMint: PublicKey): Promise<Map<string, number>>;
 export declare function getMergedAssets(assets: PortfolioAssetToken[]): PortfolioAssetToken[];

package/src/plugins/jupiter/helpers.js

@@ -12,19 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMergedAssets = exports.getJupiterPrices = exports.getVotePda = exports.deriveClaimStatus = void 0;
+exports.getMergedAssets = exports.getJupiterPrices = exports.getVotePda = void 0;
 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("./launchpad/constants");
-function deriveClaimStatus(claimant, merkleTree, merkleDistributor) {
-    return web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from('ClaimStatus'),
-        new web3_js_1.PublicKey(claimant).toBytes(),
-        new web3_js_1.PublicKey(merkleTree).toBytes(),
-    ], new web3_js_1.PublicKey(merkleDistributor))[0];
-}
-exports.deriveClaimStatus = deriveClaimStatus;
 function getVotePda(owner) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from('Escrow'),

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,+DAGoC;AAEpC,qDAAoE;AAEpE,SAAgB,iBAAiB,CAC/B,QAAgB,EAChB,UAAkB,EAClB,iBAAyB;IAEzB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QAC1B,IAAI,mBAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;QACjC,IAAI,mBAAS,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;KACpC,EACD,IAAI,mBAAS,CAAC,iBAAiB,CAAC,CACjC,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,8CAaC;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,MAA6B;IAC3D,MAAM,WAAW,GAAqC,IAAI,GAAG,EAAE,CAAC;IAChE,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,+DAGoC;AAEpC,qDAAoE;AAEpE,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,MAA6B;IAC3D,MAAM,WAAW,GAAqC,IAAI,GAAG,EAAE,CAAC;IAChE,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/launchpad/allocationsFetcher.js

@@ -16,7 +16,7 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const clients_1 = require("../../../utils/clients");
-const helpers_1 = require("../helpers");
+const deriveClaimStatus_1 = require("../../../utils/solana/jupiter/deriveClaimStatus");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
 const structs_1 = require("./structs");
 const constants_1 = require("./constants");
@@ -40,7 +40,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             continue;
         eligibleAirdrops.push(constants_1.airdropsInfo[i]);
         proofs.push(proof.data);
-        claimsPubkeys.push((0, helpers_1.deriveClaimStatus)(owner, proof.data.merkle_tree, constants_1.airdropsInfo[i].distributorProgram));
+        claimsPubkeys.push((0, deriveClaimStatus_1.deriveClaimStatus)(owner, proof.data.merkle_tree, constants_1.airdropsInfo[i].distributorProgram));
     }
     if (proofs.length === 0)
         return [];

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

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

package/src/plugins/kamino/airdropFetcher.js

@@ -16,7 +16,7 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
-const helpers_1 = require("../jupiter/helpers");
+const deriveClaimStatus_1 = require("../../utils/solana/jupiter/deriveClaimStatus");
 const clients_1 = require("../../utils/clients");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const kmnoFactor = new bignumber_js_1.default(Math.pow(10, constants_1.kmnoDecimals));
@@ -26,7 +26,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         .catch(() => null);
     if (!allocation)
         return [];
-    const pda = (0, helpers_1.deriveClaimStatus)(owner, allocation.data.merkle_tree, constants_1.distributorProgram);
+    const pda = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, allocation.data.merkle_tree, constants_1.distributorProgram);
     const client = (0, clients_1.getClientSolana)();
     const claimStatus = yield client.getAccountInfo(pda);
     if (claimStatus)

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

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AACrC,kDAA6C;AAG7C,2CAMqB;AACrB,gDAAuD;AAEvD,iDAAsD;AACtD,qGAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,wBAAY,CAAA,CAAC,CAAC;AACrD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAA6C,MAAM,eAAK;SACrE,GAAG,CAAC,0BAAc,GAAG,KAAK,CAAC;SAC3B,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,GAAG,GAAG,IAAA,2BAAiB,EAC3B,KAAK,EACL,UAAU,CAAC,IAAI,CAAC,WAAW,EAC3B,8BAAkB,CACnB,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,WAAW;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;SAC7C,SAAS,CAAC,UAAU,CAAC;SACrB,QAAQ,EAAE,CAAC;IACd,MAAM,KAAK,GAAmB,IAAA,gCAAsB,EAClD,oBAAQ,EACR,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,cAAc,EACd,SAAS,EACT,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,SAAS;YAChB,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,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,gEAAqC;AACrC,kDAA6C;AAG7C,2CAMqB;AACrB,oFAAiF;AAEjF,iDAAsD;AACtD,qGAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,sBAAS,CAAC,SAAA,EAAE,EAAI,wBAAY,CAAA,CAAC,CAAC;AACrD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAA6C,MAAM,eAAK;SACrE,GAAG,CAAC,0BAAc,GAAG,KAAK,CAAC;SAC3B,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,GAAG,GAAG,IAAA,qCAAiB,EAC3B,KAAK,EACL,UAAU,CAAC,IAAI,CAAC,WAAW,EAC3B,8BAAkB,CACnB,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,WAAW;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;SAC7C,SAAS,CAAC,UAAU,CAAC;SACrB,QAAQ,EAAE,CAAC;IACd,MAAM,KAAK,GAAmB,IAAA,gCAAsB,EAClD,oBAAQ,EACR,MAAM,EACN,0BAAS,CAAC,MAAM,EAChB,cAAc,EACd,SAAS,EACT,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;IAEF,OAAO;QACL;YACE,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,SAAS;YAChB,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,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/parcl/airdropFetcher.js

@@ -1,47 +1,8 @@
 "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 constants_1 = require("./constants");
-const clients_1 = require("../../utils/clients");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helpersAirdrop_1 = require("./helpersAirdrop");
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    if (Date.now() > helpersAirdrop_1.airdropStatics.claimEnd)
-        return [];
-    const client = (0, clients_1.getClientSolana)();
-    const airdrop = yield (0, helpersAirdrop_1.fetchAirdrop)(owner, client, cache);
-    if (!(0, portfolio_core_1.isAirdropEligible)(airdrop) || airdrop.isClaimed)
-        return [];
-    if (!airdrop.amount)
-        return [];
-    const asset = (0, tokenPriceToAssetToken_1.default)(constants_1.prclMint, airdrop.amount, portfolio_core_1.NetworkId.solana, undefined, airdrop.price || undefined, { isClaimable: true });
-    return [
-        {
-            value: asset.value,
-            type: portfolio_core_1.PortfolioElementType.multiple,
-            platformId: constants_1.platformId,
-            networkId: portfolio_core_1.NetworkId.solana,
-            label: 'Airdrop',
-            data: { assets: [asset] },
-        },
-    ];
-});
-const fetcher = {
-    id: `${constants_1.platformId}-airdrop`,
-    networkId: portfolio_core_1.NetworkId.solana,
-    executor,
-};
+const AirdropFetcher_1 = require("../../AirdropFetcher");
+const fetcher = (0, AirdropFetcher_1.airdropFetcherToFetcher)(helpersAirdrop_1.airdropFetcher, constants_1.platformId, `${constants_1.platformId}-airdrop`, constants_1.airdropStatics.claimEnd);
 exports.default = fetcher;
 //# sourceMappingURL=airdropFetcher.js.map

package/src/plugins/parcl/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/parcl/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AAGpC,2CAAmD;AACnD,iDAAsD;AACtD,qGAA6E;AAC7E,qDAAgE;AAEhE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,+BAAc,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,OAAO,GAAG,MAAM,IAAA,6BAAY,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACzD,IAAI,CAAC,IAAA,kCAAiB,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAChE,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE/B,MAAM,KAAK,GAAG,IAAA,gCAAsB,EAClC,oBAAQ,EACR,OAAO,CAAC,MAAM,EACd,0BAAS,CAAC,MAAM,EAChB,SAAS,EACT,OAAO,CAAC,KAAK,IAAI,SAAS,EAC1B,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;IAEF,OAAO;QACL;YACE,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,qCAAoB,CAAC,QAAQ;YACnC,UAAU,EAAV,sBAAU;YACV,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE;SAC1B;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/parcl/airdropFetcher.ts"],"names":[],"mappings":";;AACA,2CAAyD;AACzD,qDAAkD;AAClD,yDAA+D;AAE/D,MAAM,OAAO,GAAY,IAAA,wCAAuB,EAC9C,+BAAc,EACd,sBAAU,EACV,GAAG,sBAAU,UAAU,EACvB,0BAAc,CAAC,QAAQ,CACxB,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -1,5 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
+import { AirdropStatics } from '../../AirdropFetcher';
 export declare const platformId = "parcl";
 export declare const platformImage = "https://sonar.watch/img/platforms/parcl.webp";
 export declare const platformWebsite = "https://app.parcl.co/";
@@ -13,3 +14,4 @@ export declare const prclDecimals = 6;
 export declare const merkleApi = "https://worker.jup.ag/jup-claim-proof";
 export declare const merkleTree = "5nRBuSmpA98JgrznGYEAFTvQAA7hCdFkVKS9e41N8mBQ";
 export declare const distributorProgram = "5tu3xkmLfud5BAwSuQke4WSjoHcQ52SbrPwX9es8j6Ve";
+export declare const airdropStatics: AirdropStatics;

package/src/plugins/parcl/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.distributorProgram = exports.merkleTree = exports.merkleApi = exports.prclDecimals = exports.prclMint = exports.allocationPrefix = exports.airdropApi = exports.programId = exports.platform = exports.platformName = exports.platformWebsite = exports.platformImage = exports.platformId = void 0;
+exports.airdropStatics = exports.distributorProgram = exports.merkleTree = exports.merkleApi = exports.prclDecimals = exports.prclMint = exports.allocationPrefix = exports.airdropApi = exports.programId = exports.platform = exports.platformName = exports.platformWebsite = exports.platformImage = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'parcl';
 exports.platformImage = 'https://sonar.watch/img/platforms/parcl.webp';
@@ -22,4 +22,14 @@ exports.prclDecimals = 6;
 exports.merkleApi = 'https://worker.jup.ag/jup-claim-proof';
 exports.merkleTree = '5nRBuSmpA98JgrznGYEAFTvQAA7hCdFkVKS9e41N8mBQ';
 exports.distributorProgram = '5tu3xkmLfud5BAwSuQke4WSjoHcQ52SbrPwX9es8j6Ve';
+exports.airdropStatics = {
+    id: 'parcl-airdrop-1',
+    claimLink: 'https://claims.parcllimited.com/',
+    image: exports.platformImage,
+    emitterLink: exports.platformWebsite,
+    emitterName: exports.platformName,
+    claimStart: 1704067200000,
+    claimEnd: 1735603200000,
+    name: undefined,
+};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/parcl/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAC/D,QAAA,eAAe,GAAG,uBAAuB,CAAC;AAC1C,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,oBAAY;IAClB,KAAK,EAAE,qBAAa;IACpB,WAAW,EAAE,cAAc,EAAE,sCAAsC;IACnE,OAAO,EAAE,uBAAe;IACxB,OAAO,EAAE,2BAA2B;CACrC,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,yCAAyC,CAAC;AACvD,QAAA,gBAAgB,GAAG,GAAG,kBAAU,aAAa,CAAC;AAC9C,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,YAAY,GAAG,CAAC,CAAC;AACjB,QAAA,SAAS,GAAG,uCAAuC,CAAC;AACpD,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,kBAAkB,GAC7B,8CAA8C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/parcl/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAI/B,QAAA,UAAU,GAAG,OAAO,CAAC;AACrB,QAAA,aAAa,GAAG,8CAA8C,CAAC;AAC/D,QAAA,eAAe,GAAG,uBAAuB,CAAC;AAC1C,QAAA,YAAY,GAAG,OAAO,CAAC;AACvB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,oBAAY;IAClB,KAAK,EAAE,qBAAa;IACpB,WAAW,EAAE,cAAc,EAAE,sCAAsC;IACnE,OAAO,EAAE,uBAAe;IACxB,OAAO,EAAE,2BAA2B;CACrC,CAAC;AAEW,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,yCAAyC,CAAC;AACvD,QAAA,gBAAgB,GAAG,GAAG,kBAAU,aAAa,CAAC;AAC9C,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,YAAY,GAAG,CAAC,CAAC;AACjB,QAAA,SAAS,GAAG,uCAAuC,CAAC;AACpD,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,kBAAkB,GAC7B,8CAA8C,CAAC;AAEpC,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,kCAAkC;IAC7C,KAAK,EAAE,qBAAa;IACpB,WAAW,EAAE,uBAAe;IAC5B,WAAW,EAAE,oBAAY;IACzB,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,SAAS;CAChB,CAAC"}

package/src/plugins/parcl/helpersAirdrop.d.ts

@@ -1,19 +1,2 @@
-import { Airdrop } from '@sonarwatch/portfolio-core';
-import { Allocation } from './types';
-import { Cache } from '../../Cache';
-import { SolanaClient } from '../../utils/clients/types';
 import { AirdropFetcher } from '../../AirdropFetcher';
-export declare function fetchAllocation(owner: string, cache: Cache): Promise<Allocation>;
-export declare const airdropStatics: {
-    id: string;
-    claimLink: string;
-    image: string;
-    label: string;
-    emitterLink: string;
-    emitterName: string;
-    claimStart: number;
-    claimEnd: number;
-    name: undefined;
-};
-export declare function fetchAirdrop(owner: string, client: SolanaClient, cache: Cache): Promise<Airdrop>;
 export declare const airdropFetcher: AirdropFetcher;

package/src/plugins/parcl/helpersAirdrop.js

@@ -12,14 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.airdropFetcher = exports.fetchAirdrop = exports.airdropStatics = exports.fetchAllocation = void 0;
+exports.airdropFetcher = void 0;
 const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
-const helpers_1 = require("../jupiter/helpers");
+const deriveClaimStatus_1 = require("../../utils/solana/jupiter/deriveClaimStatus");
 const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
 const structs_1 = require("../jupiter/launchpad/structs");
+const AirdropFetcher_1 = require("../../AirdropFetcher");
 const clients_1 = require("../../utils/clients");
 function fetchAllocation(owner, cache) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -63,35 +64,33 @@ function fetchAllocation(owner, cache) {
         return allocation;
     });
 }
-exports.fetchAllocation = fetchAllocation;
-exports.airdropStatics = {
-    id: 'parcl-airdrop-1',
-    claimLink: 'https://claims.parcllimited.com/',
-    image: constants_1.platformImage,
-    label: 'PRCL',
-    emitterLink: constants_1.platformWebsite,
-    emitterName: constants_1.platformName,
-    claimStart: 1,
-    claimEnd: 1735603200000,
-    name: undefined,
-};
 function fetchAirdrop(owner, client, cache) {
     return __awaiter(this, void 0, void 0, function* () {
         const prclTokenPrice = yield cache.getTokenPrice(constants_1.prclMint, portfolio_core_1.NetworkId.solana);
         const allocation = yield fetchAllocation(owner, cache);
-        const claimStatus = (0, portfolio_core_1.getAirdropClaimStatus)(exports.airdropStatics.claimStart, exports.airdropStatics.claimEnd);
-        if (allocation.amount === 0 || !allocation.merkleTree)
-            return Object.assign(Object.assign({}, exports.airdropStatics), { claimStatus, isClaimed: false, amount: -1, price: (prclTokenPrice === null || prclTokenPrice === void 0 ? void 0 : prclTokenPrice.price) || null });
-        const claimStatusPubkey = (0, helpers_1.deriveClaimStatus)(owner, allocation.merkleTree, constants_1.distributorProgram);
-        const claimStatusAccounts = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, claimStatusPubkey);
-        const isClaimed = claimStatusAccounts !== null;
-        return Object.assign(Object.assign({}, exports.airdropStatics), { claimStatus,
-            isClaimed, amount: allocation.amount, price: (prclTokenPrice === null || prclTokenPrice === void 0 ? void 0 : prclTokenPrice.price) || null });
+        const amount = !allocation.merkleTree ? 0 : allocation.amount;
+        let isClaimed = false;
+        if (amount > 0 && allocation.merkleTree) {
+            const claimStatusPubkey = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, allocation.merkleTree, constants_1.distributorProgram);
+            const claimStatusAccount = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, claimStatusPubkey);
+            isClaimed = claimStatusAccount !== null;
+        }
+        return (0, AirdropFetcher_1.getAirdrop)({
+            statics: constants_1.airdropStatics,
+            items: [
+                {
+                    amount,
+                    isClaimed,
+                    label: 'PRCL',
+                    address: constants_1.prclMint,
+                    price: (prclTokenPrice === null || prclTokenPrice === void 0 ? void 0 : prclTokenPrice.price) || null,
+                },
+            ],
+        });
     });
 }
-exports.fetchAirdrop = fetchAirdrop;
 exports.airdropFetcher = {
-    id: exports.airdropStatics.id,
+    id: constants_1.airdropStatics.id,
     networkId: portfolio_core_1.NetworkId.solana,
     executor: (owner, cache) => {
         const client = (0, clients_1.getClientSolana)();

package/src/plugins/parcl/helpersAirdrop.js.map

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

package/src/plugins/zeta/airdropFetcher.js

@@ -39,9 +39,9 @@ const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const graphql_request_1 = __importStar(require("graphql-request"));
 const constants_1 = require("./constants");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const helper_1 = require("../jito/helper");
 const clients_1 = require("../../utils/clients");
 const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
+const deriveClaimStatuses_1 = require("../../utils/solana/jupiter/deriveClaimStatuses");
 const query = (0, graphql_request_1.gql) `
   query GetAirdropFinalFrontend($authority: String!) {
     getAirdropFinalFrontend(authority: $authority) {
@@ -71,7 +71,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const amount = res.getAirdropFinalFrontend.total_allocation;
     if (amount === 0)
         return [];
-    const claimStatuses = (0, helper_1.findClaimStatusesKeys)(owner, constants_1.distributors, constants_1.distributorPid);
+    const claimStatuses = (0, deriveClaimStatuses_1.deriveClaimStatuses)(owner, constants_1.distributors, constants_1.distributorPid);
     const client = (0, clients_1.getClientSolana)();
     const claimStatusesAccount = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)(client, claimStatuses);
     if (claimStatusesAccount.some((account) => account))

package/src/plugins/zeta/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/zeta/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAuE;AACvE,mEAA+C;AAG/C,2CAMqB;AAErB,qGAA6E;AAC7E,2CAAuD;AACvD,iDAAsD;AACtD,gGAA6F;AAE7F,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;CAchB,CAAC;AAEF,MAAM,SAAS,GAAG,0BAAS,CAAC,MAAM,CAAC;AAEnC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAO,EACvB,sBAAU,EACV,KAAK,EACL;QACE,SAAS,EAAE,KAAK;KACjB,EACD;QACE,MAAM,EAAE,4BAA4B;QACpC,QAAQ,EAAE,6BAA6B;QACvC,WAAW,EAAE,gCAAgC;KAC9C,CACF,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IAEpB,MAAM,MAAM,GAAG,GAAG,CAAC,uBAAuB,CAAC,gBAAgB,CAAC;IAE5D,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,aAAa,GAAG,IAAA,8BAAqB,EACzC,KAAK,EACL,wBAAY,EACZ,0BAAc,CACf,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,oBAAoB,GAAG,MAAM,IAAA,yDAA2B,EAC5D,MAAM,EACN,aAAa,CACd,CAAC;IAEF,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IAE/D,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,mBAAO,EAAE,SAAS,CAAC,CAAC;IACjE,MAAM,KAAK,GAAmB,UAAU;QACtC,CAAC,CAAC,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,SAAS,EACT,UAAU,EACV,SAAS,EACT,EAAE,WAAW,EAAE,aAAa,EAAE,CAC/B;QACH,CAAC,CAAC;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE;gBACJ,OAAO,EAAE,mBAAO;gBAChB,QAAQ,EACN,kMAAkM;gBACpM,MAAM;gBACN,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,KAAK;aACZ;YACD,KAAK,EAAE,IAAI;YACX,SAAS;YACT,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE;SAC3C,CAAC;IAEN,OAAO;QACL;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,SAAS;YAChB,SAAS;YACT,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;YACD,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS;IACT,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/zeta/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAuE;AACvE,mEAA+C;AAG/C,2CAMqB;AAErB,qGAA6E;AAC7E,iDAAsD;AACtD,gGAA6F;AAC7F,wFAAqF;AAErF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;CAchB,CAAC;AAEF,MAAM,SAAS,GAAG,0BAAS,CAAC,MAAM,CAAC;AAEnC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,GAAG,GAAG,MAAM,IAAA,yBAAO,EACvB,sBAAU,EACV,KAAK,EACL;QACE,SAAS,EAAE,KAAK;KACjB,EACD;QACE,MAAM,EAAE,4BAA4B;QACpC,QAAQ,EAAE,6BAA6B;QACvC,WAAW,EAAE,gCAAgC;KAC9C,CACF,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAEpB,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IAEpB,MAAM,MAAM,GAAG,GAAG,CAAC,uBAAuB,CAAC,gBAAgB,CAAC;IAE5D,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,aAAa,GAAG,IAAA,yCAAmB,EACvC,KAAK,EACL,wBAAY,EACZ,0BAAc,CACf,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,oBAAoB,GAAG,MAAM,IAAA,yDAA2B,EAC5D,MAAM,EACN,aAAa,CACd,CAAC;IAEF,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IAE/D,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,mBAAO,EAAE,SAAS,CAAC,CAAC;IACjE,MAAM,KAAK,GAAmB,UAAU;QACtC,CAAC,CAAC,IAAA,gCAAsB,EACpB,UAAU,CAAC,OAAO,EAClB,MAAM,EACN,SAAS,EACT,UAAU,EACV,SAAS,EACT,EAAE,WAAW,EAAE,aAAa,EAAE,CAC/B;QACH,CAAC,CAAC;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE;gBACJ,OAAO,EAAE,mBAAO;gBAChB,QAAQ,EACN,kMAAkM;gBACpM,MAAM;gBACN,KAAK,EAAE,IAAI;gBACX,IAAI,EAAE,KAAK;aACZ;YACD,KAAK,EAAE,IAAI;YACX,SAAS;YACT,UAAU,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE;SAC3C,CAAC;IAEN,OAAO;QACL;YACE,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,SAAS;YAChB,SAAS;YACT,UAAU,EAAV,sBAAU;YACV,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC,KAAK,CAAC;aAChB;YACD,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS;IACT,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/utils/solana/jupiter/deriveClaimStatus.d.ts

@@ -0,0 +1,2 @@
+import { PublicKey } from '@solana/web3.js';
+export declare function deriveClaimStatus(claimant: string, merkleTree: string, merkleDistributor: string): PublicKey;

package/src/utils/solana/jupiter/deriveClaimStatus.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deriveClaimStatus = void 0;
+const web3_js_1 = require("@solana/web3.js");
+function deriveClaimStatus(claimant, merkleTree, merkleDistributor) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from('ClaimStatus'),
+        new web3_js_1.PublicKey(claimant).toBytes(),
+        new web3_js_1.PublicKey(merkleTree).toBytes(),
+    ], new web3_js_1.PublicKey(merkleDistributor))[0];
+}
+exports.deriveClaimStatus = deriveClaimStatus;
+//# sourceMappingURL=deriveClaimStatus.js.map

package/src/utils/solana/jupiter/deriveClaimStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deriveClaimStatus.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/jupiter/deriveClaimStatus.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE5C,SAAgB,iBAAiB,CAC/B,QAAgB,EAChB,UAAkB,EAClB,iBAAyB;IAEzB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QAC1B,IAAI,mBAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;QACjC,IAAI,mBAAS,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;KACpC,EACD,IAAI,mBAAS,CAAC,iBAAiB,CAAC,CACjC,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,8CAaC"}

package/src/utils/solana/jupiter/deriveClaimStatuses.d.ts

@@ -0,0 +1,2 @@
+import { PublicKey } from '@solana/web3.js';
+export declare function deriveClaimStatuses(claimant: string, distributors: string[], programId: string): PublicKey[];

package/src/utils/solana/jupiter/deriveClaimStatuses.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deriveClaimStatuses = void 0;
+const deriveClaimStatus_1 = require("./deriveClaimStatus");
+function deriveClaimStatuses(claimant, distributors, programId) {
+    return distributors.map((d) => (0, deriveClaimStatus_1.deriveClaimStatus)(claimant, d, programId));
+}
+exports.deriveClaimStatuses = deriveClaimStatuses;
+//# sourceMappingURL=deriveClaimStatuses.js.map

package/src/utils/solana/jupiter/deriveClaimStatuses.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deriveClaimStatuses.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/utils/solana/jupiter/deriveClaimStatuses.ts"],"names":[],"mappings":";;;AACA,2DAAwD;AAExD,SAAgB,mBAAmB,CACjC,QAAgB,EAChB,YAAsB,EACtB,SAAiB;IAEjB,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,qCAAiB,EAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;AAC5E,CAAC;AAND,kDAMC"}

package/src/plugins/jito/helper.d.ts

@@ -1,3 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-export declare function findClaimStatusKey(claimant: string, distributor: string, programId: string): PublicKey;
-export declare function findClaimStatusesKeys(claimant: string, distributors: string[], programId: string): PublicKey[];

package/src/plugins/jito/helper.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findClaimStatusesKeys = exports.findClaimStatusKey = void 0;
-const web3_js_1 = require("@solana/web3.js");
-function findClaimStatusKey(claimant, distributor, programId) {
-    return web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from('ClaimStatus'),
-        new web3_js_1.PublicKey(distributor).toBytes(),
-        new web3_js_1.PublicKey(claimant).toBytes(),
-    ], new web3_js_1.PublicKey(programId))[0];
-}
-exports.findClaimStatusKey = findClaimStatusKey;
-function findClaimStatusesKeys(claimant, distributors, programId) {
-    return distributors.map((distributor) => web3_js_1.PublicKey.findProgramAddressSync([
-        Buffer.from('ClaimStatus'),
-        new web3_js_1.PublicKey(distributor).toBytes(),
-        new web3_js_1.PublicKey(claimant).toBytes(),
-    ], new web3_js_1.PublicKey(programId))[0]);
-}
-exports.findClaimStatusesKeys = findClaimStatusesKeys;
-//# sourceMappingURL=helper.js.map

package/src/plugins/jito/helper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/helper.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE5C,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,WAAmB,EACnB,SAAiB;IAEjB,OAAO,mBAAS,CAAC,sBAAsB,CACrC;QACE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QAC1B,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;QACpC,IAAI,mBAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;KAClC,EACD,IAAI,mBAAS,CAAC,SAAS,CAAC,CACzB,CAAC,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,gDAaC;AAED,SAAgB,qBAAqB,CACnC,QAAgB,EAChB,YAAsB,EACtB,SAAiB;IAEjB,OAAO,YAAY,CAAC,GAAG,CACrB,CAAC,WAAW,EAAE,EAAE,CACd,mBAAS,CAAC,sBAAsB,CAC9B;QACE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;QAC1B,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;QACpC,IAAI,mBAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;KAClC,EACD,IAAI,mBAAS,CAAC,SAAS,CAAC,CACzB,CAAC,CAAC,CAAC,CACP,CAAC;AACJ,CAAC;AAhBD,sDAgBC"}