@sonarwatch/portfolio-plugins 0.15.40 → 0.15.42

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.15.42](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.41...plugins-0.15.42) (2025-06-27)
+
+
+
+## [0.15.41](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.40...plugins-0.15.41) (2025-06-27)
+
+
+### Features
+
+* **airdrop:** add claims info ([4a5760a](https://github.com/sonarwatch/portfolio/commit/4a5760a99510c8ce29df6173687eaf5793028a0e))
+* **airdrop:** add claims info ([54da11f](https://github.com/sonarwatch/portfolio/commit/54da11ff036c979ac27c0cbe897e2406ffc6e93c))
+* **airdrop:** add claims info for Streamflow Solana airdrop ([3d0a2b5](https://github.com/sonarwatch/portfolio/commit/3d0a2b5cab483322fa7d0e28ccd12c3736639b51))
+* **airdrop:** add DNR claims info ([c5bc8c7](https://github.com/sonarwatch/portfolio/commit/c5bc8c72677d9dd29e8a11c1395fc2e15c2d079e))
+* **airdrop:** add FIDA claims ([284a533](https://github.com/sonarwatch/portfolio/commit/284a533f9a190370afe488dd24c1598c877cd01f))
+* **airdrop:** add JITO claims info ([7e88d32](https://github.com/sonarwatch/portfolio/commit/7e88d323bc30f68117fda4005aae15dd0a8b3436))
+* **airdrop:** implement distribution claim logic and add distributionClaimStruct ([3a4f244](https://github.com/sonarwatch/portfolio/commit/3a4f24423d87e9b7452bbeaca09f9af7f0a24ce9))
+* **fetchers:** update fetchers import to use defaultFetchers in run-fetchers-by-network-id script ([d6a1bb3](https://github.com/sonarwatch/portfolio/commit/d6a1bb3e27d7ec2036638a4aefca21510e9a17ff))
+
+
+
 ## [0.15.40](https://github.com/sonarwatch/portfolio/compare/plugins-0.15.39...plugins-0.15.40) (2025-06-24)
 
 

package/package.json

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

package/src/plugins/bonfida/airdropFetcher.d.ts

@@ -1,3 +1,3 @@
-import { Fetcher } from '../../Fetcher';
-declare const fetcher: Fetcher;
-export default fetcher;
+import { AirdropFetcher } from '../../AirdropFetcher';
+export declare const airdropFetcher: AirdropFetcher;
+export declare const fetcher: import("../..").Fetcher;

package/src/plugins/bonfida/airdropFetcher.js

@@ -12,48 +12,82 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetcher = exports.airdropFetcher = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const axios_1 = __importDefault(require("axios"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const solana_1 = require("../../utils/solana");
 const structs_1 = require("../jito/structs");
 const clients_1 = require("../../utils/clients");
-const filters_1 = require("./filters");
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+const AirdropFetcher_1 = require("../../AirdropFetcher");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const apiRes = yield axios_1.default
         .get(constants_1.airdropApi + owner, { timeout: 5000 })
         .catch(() => null);
-    if (!apiRes || apiRes.data.error)
-        return [];
     const client = (0, clients_1.getClientSolana)();
-    const claimStatus = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.claimStatusStruct, constants_1.airdropPid, (0, filters_1.claimFilters)(owner));
-    const claim = claimStatus.at(0);
-    if (claim)
-        return [];
-    const fidaTokenPrice = yield cache.getTokenPrice(constants_1.fidaMint, portfolio_core_1.NetworkId.solana);
-    const amount = new bignumber_js_1.default(apiRes.data.amount_unlocked).dividedBy(Math.pow(10, constants_1.fidaDecimals));
-    const element = {
-        networkId: portfolio_core_1.NetworkId.solana,
-        label: 'Airdrop',
-        platformId: constants_1.platformId,
-        type: portfolio_core_1.PortfolioElementType.multiple,
-        value: fidaTokenPrice
-            ? amount.times(fidaTokenPrice.price).toNumber()
-            : null,
-        data: {
-            assets: [
-                (0, tokenPriceToAssetToken_1.default)(constants_1.fidaMint, amount.toNumber(), portfolio_core_1.NetworkId.solana, fidaTokenPrice),
+    const claimStatus = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.claimStatusStruct, constants_1.airdropPid)
+        .addFilter('discriminator', [22, 183, 249, 157, 247, 95, 150, 96])
+        .addFilter('claimant', new web3_js_1.PublicKey(owner))
+        .run();
+    // neither an API response nor claims accounts
+    if ((!apiRes || apiRes.data.error) && !claimStatus.length) {
+        return (0, AirdropFetcher_1.getAirdropRaw)({
+            statics: constants_1.fidaAirdropStatics,
+            items: [
+                {
+                    amount: 0,
+                    isClaimed: false,
+                    label: 'FIDA',
+                    address: constants_1.fidaMint,
+                },
             ],
-        },
-    };
-    return [element];
+        });
+    }
+    // if there is no claim status, it means the user is eligible but has not claimed yet
+    if (!claimStatus.length && apiRes) {
+        return (0, AirdropFetcher_1.getAirdropRaw)({
+            statics: constants_1.fidaAirdropStatics,
+            items: [
+                {
+                    amount: new bignumber_js_1.default(apiRes.data.amount_unlocked)
+                        .dividedBy(Math.pow(10, constants_1.fidaDecimals))
+                        .toNumber(),
+                    isClaimed: false,
+                    label: 'FIDA',
+                    address: constants_1.fidaMint,
+                },
+            ],
+        });
+    }
+    const claims = yield Promise.all([
+        ...claimStatus.map((cs) => (0, getClaimTransactions_1.getClaimTransactions)(owner, cs.pubkey, constants_1.fidaMint)),
+    ]);
+    const claimedAmount = claims.reduce((acc, claim) => acc.plus(claim.reduce((sum, tx) => sum.plus(tx.amount), new bignumber_js_1.default(0))), new bignumber_js_1.default(0));
+    return (0, AirdropFetcher_1.getAirdropRaw)({
+        statics: constants_1.fidaAirdropStatics,
+        items: [
+            {
+                amount: apiRes
+                    ? new bignumber_js_1.default(apiRes.data.amount_unlocked)
+                        .dividedBy(Math.pow(10, constants_1.fidaDecimals))
+                        .toNumber()
+                    : claimedAmount.toNumber(),
+                isClaimed: true,
+                label: 'FIDA',
+                address: constants_1.fidaMint,
+                claims: claims.flat(),
+                ref: claimStatus ? claimStatus[0].pubkey.toString() : undefined,
+            },
+        ],
+    });
 });
-const fetcher = {
-    id: `${constants_1.platformId}-airdrop`,
+exports.airdropFetcher = {
+    id: constants_1.fidaAirdropStatics.id,
     networkId: portfolio_core_1.NetworkId.solana,
     executor,
 };
-exports.default = fetcher;
+exports.fetcher = (0, AirdropFetcher_1.airdropFetcherToFetcher)(exports.airdropFetcher, constants_1.platformId, constants_1.fidaAirdropStatics.id, constants_1.fidaAirdropStatics.claimEnd);
 //# sourceMappingURL=airdropFetcher.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,kDAA6C;AAC7C,gEAAqC;AAErC,2CAMqB;AAErB,qGAA6E;AAE7E,+CAA8D;AAC9D,6CAAoD;AACpD,iDAAsD;AACtD,uCAAyC;AAEzC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAA0C,MAAM,eAAK;SAC9D,GAAG,CAAC,sBAAU,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAE5C,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAwB,EAChD,MAAM,EACN,2BAAiB,EACjB,sBAAU,EACV,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB,CAAC;IACF,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,KAAK;QAAE,OAAO,EAAE,CAAC;IAErB,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,oBAAQ,EAAE,0BAAS,CAAC,MAAM,CAAC,CAAC;IAE7E,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CACjE,SAAA,EAAE,EAAI,wBAAY,CAAA,CACnB,CAAC;IAEF,MAAM,OAAO,GAA6B;QACxC,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,KAAK,EAAE,SAAS;QAChB,UAAU,EAAV,sBAAU;QACV,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,KAAK,EAAE,cAAc;YACnB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;YAC/C,CAAC,CAAC,IAAI;QACR,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,IAAA,gCAAsB,EACpB,oBAAQ,EACR,MAAM,CAAC,QAAQ,EAAE,EACjB,0BAAS,CAAC,MAAM,EAChB,cAAc,CACf;aACF;SACF;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,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/bonfida/airdropFetcher.ts"],"names":[],"mappings":"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"}

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

@@ -10,3 +10,4 @@ export declare const airdropApi = "https://jito-distributor-api.n38t0uklh84us.ap
 export declare const fidaDecimals = 6;
 export declare const snsMint = "SNS8DJbHc34nKySHVhLGMUUE72ho6igvJaxtq9T3cX3";
 export declare const snsAirdropStatics: AirdropStatics;
+export declare const fidaAirdropStatics: AirdropStatics;

package/src/plugins/bonfida/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.snsAirdropStatics = exports.snsMint = exports.fidaDecimals = exports.airdropApi = exports.airdropPid = exports.offerPid = exports.fidaMint = exports.platformId = void 0;
+exports.fidaAirdropStatics = exports.snsAirdropStatics = exports.snsMint = exports.fidaDecimals = exports.airdropApi = exports.airdropPid = exports.offerPid = exports.fidaMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'sns';
 exports.fidaMint = 'EchesyfXePKdLtoiZSL8pBe8Myagyy8ZRqsACNCFGnvp';
@@ -16,6 +16,15 @@ exports.snsAirdropStatics = {
     claimLink: 'https://airdrop.sns.id/',
     claimStart: 1747137600000,
     claimEnd: 1754913600000,
-    image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/debridge.webp',
+    image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/sns.webp',
+};
+exports.fidaAirdropStatics = {
+    emitterLink: 'https://bonfida.id/',
+    emitterName: 'bonfida',
+    id: 'bonfida-airdrop',
+    claimLink: 'https://www.bonfida.org/',
+    claimStart: 1718452800000,
+    claimEnd: 1723723200000,
+    image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/sns.webp',
 };
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,KAAK,CAAC;AACnB,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,yFAAyF,CAAC;AAC/E,QAAA,YAAY,GAAG,CAAC,CAAC;AAEjB,QAAA,OAAO,GAAG,6CAA6C,CAAC;AAExD,QAAA,iBAAiB,GAAmB;IAC/C,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,KAAK;IAClB,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,yBAAyB;IACpC,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,KAAK,EACH,8EAA8E;CACjF,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,KAAK,CAAC;AACnB,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,yFAAyF,CAAC;AAC/E,QAAA,YAAY,GAAG,CAAC,CAAC;AAEjB,QAAA,OAAO,GAAG,6CAA6C,CAAC;AAExD,QAAA,iBAAiB,GAAmB;IAC/C,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,KAAK;IAClB,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,yBAAyB;IACpC,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,KAAK,EACH,yEAAyE;CAC5E,CAAC;AAEW,QAAA,kBAAkB,GAAmB;IAChD,WAAW,EAAE,qBAAqB;IAClC,WAAW,EAAE,SAAS;IACtB,EAAE,EAAE,iBAAiB;IACrB,SAAS,EAAE,0BAA0B;IACrC,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,KAAK,EACH,yEAAyE;CAC5E,CAAC"}

package/src/plugins/bonfida/index.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.airdropFetchers = exports.fetchers = exports.jobs = void 0;
 const offersFetcher_1 = __importDefault(require("./offersFetcher"));
-const airdropFetcher_1 = __importDefault(require("./airdropFetcher"));
+const airdropFetcher_1 = require("./airdropFetcher");
 const snsAirdropFetcher_1 = require("./snsAirdropFetcher");
 exports.jobs = [];
-exports.fetchers = [offersFetcher_1.default, airdropFetcher_1.default, snsAirdropFetcher_1.fetcher];
-exports.airdropFetchers = [snsAirdropFetcher_1.airdropFetcher];
+exports.fetchers = [offersFetcher_1.default, snsAirdropFetcher_1.fetcher];
+exports.airdropFetchers = [snsAirdropFetcher_1.airdropFetcher, airdropFetcher_1.airdropFetcher];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/index.ts"],"names":[],"mappings":";;;;;;AAEA,oEAA4C;AAC5C,sEAA8C;AAC9C,2DAG6B;AAEhB,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,uBAAa,EAAE,wBAAc,EAAE,2BAAO,CAAC,CAAC;AAE/D,QAAA,eAAe,GAAG,CAAC,kCAAiB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/bonfida/index.ts"],"names":[],"mappings":";;;;;;AAEA,oEAA4C;AAC5C,qDAAwE;AACxE,2DAG6B;AAEhB,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,uBAAa,EAAE,2BAAU,CAAC,CAAC;AAElD,QAAA,eAAe,GAAG,CAAC,kCAAiB,EAAE,+BAAkB,CAAC,CAAC"}

package/src/plugins/debridge/airdropFetcher.js

@@ -20,6 +20,7 @@ const clients_1 = require("../../utils/clients");
 const distributions_json_1 = __importDefault(require("./distributions.json"));
 const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
 const helpers_1 = require("./helpers");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
 const distributionByWallet = distributions_json_1.default;
 const executorDis1 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const isEvm = (0, portfolio_core_1.isEvmAddress)(owner);
@@ -28,6 +29,7 @@ const executorDis1 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
         ? (0, helpers_1.getEvmReceiptPdaBySeason)(owner, 1)
         : (0, helpers_1.getSolReceiptPdaBySeason)(owner, 1);
     const receipt = yield (0, clients_1.getClientSolana)().getAccountInfo(pda);
+    const claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, pda, constants_1.dbrMint);
     if (!walletDistributions || !walletDistributions.one) {
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: constants_1.firstDistribStatics,
@@ -51,6 +53,8 @@ const executorDis1 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
                 label: 'DBR',
                 address: isEvm ? undefined : constants_1.dbrMint,
                 imageUri: isEvm ? constants_1.dbrImg : undefined,
+                claims,
+                ref: pda.toString(),
             },
         ],
     });
@@ -63,6 +67,7 @@ const executorDis2 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
         : [(0, helpers_1.getSolReceiptPdaBySeason)(owner, 2), (0, helpers_1.getSolReceiptPdaBySeason)(owner, 3)];
     const receipts = yield (0, getMultipleAccountsInfoSafe_1.getMultipleAccountsInfoSafe)((0, clients_1.getClientSolana)(), pdas);
     const isClaimed = receipts.some((receipt) => !!receipt);
+    const claims = yield Promise.all(pdas.map((pda) => (0, getClaimTransactions_1.getClaimTransactions)(owner, pda, constants_1.dbrMint)));
     if (!walletDistributions || !walletDistributions.two) {
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: constants_1.secondDistribStatics,
@@ -86,6 +91,7 @@ const executorDis2 = (owner) => __awaiter(void 0, void 0, void 0, function* () {
                 label: 'DBR',
                 address: isEvm ? undefined : constants_1.dbrMint,
                 imageUri: isEvm ? constants_1.dbrImg : undefined,
+                claims: claims.flat(),
             },
         ],
     });

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

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

package/src/plugins/defituna/airdropFetcher.d.ts

@@ -0,0 +1,2 @@
+import { AirdropFetcher } from '../../AirdropFetcher';
+export declare const tunaAirdropFetcher: AirdropFetcher;

package/src/plugins/defituna/airdropFetcher.js

@@ -0,0 +1,63 @@
+"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.tunaAirdropFetcher = void 0;
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
+const AirdropFetcher_1 = require("../../AirdropFetcher");
+const constants_1 = require("./constants");
+const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    // const client = getClientSolana();
+    const res = yield axios_1.default
+        .get(constants_1.apiUrl + owner, { timeout: 3000 })
+        .catch(() => null);
+    // const claimStatus = deriveClaimStatus(owner, merkleTree, merkleDistributor);
+    // const claimAccount = await getParsedAccountInfo(
+    //   client,
+    //   claimStatusStruct,
+    //   claimStatus
+    // );
+    if (!res) {
+        return (0, AirdropFetcher_1.getAirdropRaw)({
+            statics: constants_1.airdropStatics,
+            items: [
+                {
+                    amount: 0,
+                    isClaimed: false,
+                    label: 'TUNA',
+                    address: constants_1.tunaMint,
+                },
+            ],
+        });
+    }
+    // const claims = await getClaimTransactions(owner, claimStatus, jtoMint);
+    const amount = res.data.data.lending + res.data.data.trade + res.data.data.trumped;
+    return (0, AirdropFetcher_1.getAirdropRaw)({
+        statics: constants_1.airdropStatics,
+        items: [
+            {
+                amount,
+                isClaimed: false,
+                label: 'TUNA',
+                address: constants_1.tunaMint,
+            },
+        ],
+    });
+});
+exports.tunaAirdropFetcher = {
+    id: constants_1.airdropStatics.id,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+//# sourceMappingURL=airdropFetcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,yDAI8B;AAC9B,2CAA+D;AAI/D,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,oCAAoC;IACpC,MAAM,GAAG,GAA6C,MAAM,eAAK;SAC9D,GAAG,CAAC,kBAAM,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SACtC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrB,+EAA+E;IAC/E,mDAAmD;IACnD,YAAY;IACZ,uBAAuB;IACvB,gBAAgB;IAChB,KAAK;IAEL,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,MAAM;oBACb,OAAO,EAAE,oBAAQ;iBAClB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IACD,0EAA0E;IAE1E,MAAM,MAAM,GACV,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAEtE,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,oBAAQ;aAClB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,kBAAkB,GAAmB;IAChD,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC"}

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

@@ -3,7 +3,11 @@
 import { PublicKey } from '@solana/web3.js';
 import { MemoizedCache } from '../../utils/misc/MemoizedCache';
 import { Vault } from './structs';
+import { AirdropStatics } from '../../AirdropFetcher';
 export declare const platformId = "defituna";
 export declare const defiTunaProgram: PublicKey;
 export declare const lendingPoolsCacheKey = "lending-pools";
 export declare const poolsMemo: MemoizedCache<Vault[], Vault[]>;
+export declare const apiUrl = "https://embed.defituna.com/airdrop/wallet/";
+export declare const tunaMint: undefined;
+export declare const airdropStatics: AirdropStatics;

package/src/plugins/defituna/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.poolsMemo = exports.lendingPoolsCacheKey = exports.defiTunaProgram = exports.platformId = void 0;
+exports.airdropStatics = exports.tunaMint = exports.apiUrl = exports.poolsMemo = exports.lendingPoolsCacheKey = exports.defiTunaProgram = exports.platformId = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
 const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
@@ -11,4 +11,16 @@ exports.poolsMemo = new MemoizedCache_1.MemoizedCache(exports.lendingPoolsCacheK
     prefix: exports.platformId,
     networkId: portfolio_core_1.NetworkId.solana,
 });
+exports.apiUrl = 'https://embed.defituna.com/airdrop/wallet/';
+exports.tunaMint = undefined;
+exports.airdropStatics = {
+    emitterLink: 'https://defituna.com',
+    id: 'defituna-airdrop',
+    name: 'DefiTuna Airdrop',
+    emitterName: 'DefiTuna',
+    image: 'https://sonar.watch/img/defituna.webp',
+    claimStart: undefined,
+    claimEnd: undefined,
+    claimLink: 'https://defituna.com/airdrop',
+};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/constants.ts"],"names":[],"mappings":";;;AAAA,+DAAuD;AACvD,6CAA4C;AAC5C,kEAA+D;AAGlD,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,SAAS,GAAG,IAAI,6BAAa,CAAU,4BAAoB,EAAE;IACxE,MAAM,EAAE,kBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/constants.ts"],"names":[],"mappings":";;;AAAA,+DAAuD;AACvD,6CAA4C;AAC5C,kEAA+D;AAIlD,QAAA,UAAU,GAAG,UAAU,CAAC;AACxB,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AAEW,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,SAAS,GAAG,IAAI,6BAAa,CAAU,4BAAoB,EAAE;IACxE,MAAM,EAAE,kBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEU,QAAA,MAAM,GAAG,4CAA4C,CAAC;AACtD,QAAA,QAAQ,GAAG,SAAS,CAAC;AACrB,QAAA,cAAc,GAAmB;IAC5C,WAAW,EAAE,sBAAsB;IACnC,EAAE,EAAE,kBAAkB;IACtB,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE,UAAU;IACvB,KAAK,EAAE,uCAAuC;IAC9C,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,SAAS;IACnB,SAAS,EAAE,8BAA8B;CAC1C,CAAC"}

package/src/plugins/defituna/index.d.ts

@@ -1,4 +1,6 @@
+import { AirdropFetcher } from '../../AirdropFetcher';
 import { Fetcher } from '../../Fetcher';
 import { Job } from '../../Job';
 export declare const jobs: Job[];
 export declare const fetchers: Fetcher[];
+export declare const airdropFetchers: AirdropFetcher[];

package/src/plugins/defituna/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchers = exports.jobs = void 0;
+exports.airdropFetchers = exports.fetchers = exports.jobs = void 0;
 const lendingFetcher_1 = __importDefault(require("./lendingFetcher"));
 const lendingPoolsJob_1 = __importDefault(require("./lendingPoolsJob"));
 const positionsFetcher_1 = __importDefault(require("./positionsFetcher"));
+const airdropFetcher_1 = require("./airdropFetcher");
 exports.jobs = [lendingPoolsJob_1.default];
 exports.fetchers = [lendingFetcher_1.default, positionsFetcher_1.default];
+exports.airdropFetchers = [airdropFetcher_1.tunaAirdropFetcher];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/index.ts"],"names":[],"mappings":";;;;;;AAEA,sEAA8C;AAC9C,wEAAgD;AAChD,0EAAkD;AAErC,QAAA,IAAI,GAAU,CAAC,yBAAe,CAAC,CAAC;AAChC,QAAA,QAAQ,GAAc,CAAC,wBAAc,EAAE,0BAAgB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/index.ts"],"names":[],"mappings":";;;;;;AAGA,sEAA8C;AAC9C,wEAAgD;AAChD,0EAAkD;AAClD,qDAAsD;AAEzC,QAAA,IAAI,GAAU,CAAC,yBAAe,CAAC,CAAC;AAChC,QAAA,QAAQ,GAAc,CAAC,wBAAc,EAAE,0BAAgB,CAAC,CAAC;AACzD,QAAA,eAAe,GAAqB,CAAC,mCAAkB,CAAC,CAAC"}

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

@@ -0,0 +1,7 @@
+export type AirdropApiResponse = {
+    data: {
+        lending: number;
+        trade: number;
+        trumped: number;
+    };
+};

package/src/plugins/defituna/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/defituna/types.ts"],"names":[],"mappings":""}

package/src/plugins/drift-market-maker-vault/depositsFetcher.js

@@ -44,7 +44,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         if (!vaultInfo || new bignumber_js_1.default(vaultInfo.totalShares).isZero())
             continue;
         const { name, mint, platformId, link } = vaultInfo;
-        const element = elementRegistry.addElementMultiple({
+        const element = elementRegistry.addElementLiquidity({
             label: 'Deposit',
             platformId,
             name,
@@ -57,36 +57,46 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             ],
             ref: depositAccount.pubkey,
         });
+        const liquidity = element.addLiquidity();
         const pricePerShare = new bignumber_js_1.default(vaultInfo.totalTokens).dividedBy(vaultInfo.totalShares);
         const userSharesValue = depositAccount.vaultShares.multipliedBy(pricePerShare);
         const { netDeposits } = depositAccount;
         const performanceFee = new bignumber_js_1.default(vaultInfo.profitShare).shiftedBy(-6);
         const PnL = userSharesValue.minus(netDeposits);
-        element.addAsset({
+        liquidity.addAsset({
             address: mint,
             amount: netDeposits.minus(((_a = depositAccount.lastWithdrawRequest) === null || _a === void 0 ? void 0 : _a.value) || 0),
         });
+        if (vaultInfo.apy90d) {
+            liquidity.addYield((0, portfolio_core_1.yieldFromApy)(vaultInfo.apy90d));
+        }
         let hasPendingFees = false;
         if (PnL.isPositive()) {
             const profitShareFees = PnL.multipliedBy(performanceFee).minus(depositAccount.profitShareFeePaid);
             if (profitShareFees.isPositive()) {
                 hasPendingFees = true;
-                element.addAsset({
+                liquidity.addAsset({
                     address: mint,
                     amount: profitShareFees.negated(),
                     attributes: {
                         tags: [`Pending ${performanceFee.shiftedBy(2)}% Performance Fee`],
                     },
                 });
+                if (vaultInfo.apy90d) {
+                    liquidity.addYield((0, portfolio_core_1.yieldFromApy)(vaultInfo.apy90d));
+                }
             }
         }
-        element.addAsset({
+        liquidity.addAsset({
             address: mint,
             amount: PnL,
             attributes: {
                 tags: [hasPendingFees ? 'PnL before Fees' : 'PnL'],
             },
         });
+        if (vaultInfo.apy90d) {
+            liquidity.addYield((0, portfolio_core_1.yieldFromApy)(vaultInfo.apy90d));
+        }
         if (!((_b = depositAccount.lastWithdrawRequest) === null || _b === void 0 ? void 0 : _b.value.isZero())) {
             const withdrawCooldown = [
                 constants_2.neutralPlatformId,
@@ -95,7 +105,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             ].includes(platformId)
                 ? exports.oneDay
                 : exports.sevenDays;
-            element.addAsset({
+            liquidity.addAsset({
                 address: mint,
                 amount: depositAccount.lastWithdrawRequest.value,
                 attributes: {
@@ -105,6 +115,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                         .toNumber(),
                 },
             });
+            if (vaultInfo.apy90d) {
+                liquidity.addYield((0, portfolio_core_1.yieldFromApy)(0));
+            }
         }
     }
     return elementRegistry.getElements(cache);

package/src/plugins/drift-market-maker-vault/depositsFetcher.js.map

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

package/src/plugins/drift-market-maker-vault/types.d.ts

@@ -9,4 +9,5 @@ export type VaultInfo = {
     user: string;
     profitShare: number;
     link?: string;
+    apy90d?: number;
 };

package/src/plugins/drift-market-maker-vault/vaultsJob.js

@@ -8,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const constants_1 = require("../drift/constants");
@@ -18,7 +22,7 @@ const filters_1 = require("./filters");
 const helpers_1 = require("./helpers");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const [vaultIdsByProgram, spotMarkets] = yield Promise.all([
+    const [vaultIdsByProgram, spotMarkets, apys] = yield Promise.all([
         Promise.all(constants_2.vaultsProgramIds.map((vaultsPid) => client.getProgramAccounts(vaultsPid, {
             filters: filters_1.vaultFilter,
             dataSlice: { offset: 0, length: 0 },
@@ -27,6 +31,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             prefix: constants_1.platformId,
             networkId: portfolio_core_1.NetworkId.solana,
         }),
+        axios_1.default.get(`https://app.drift.trade/api/vaults`),
     ]);
     if (!spotMarkets)
         return;
@@ -60,6 +65,9 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 user: vault.user.toString(),
                 profitShare: vault.profitShare,
                 link,
+                apy90d: apys.data[pubkey]
+                    ? apys.data[pubkey].apys['90d'] / 100
+                    : undefined,
             };
             cachedItems.push({
                 key: pubkey,