@sonarwatch/portfolio-plugins 0.12.110 → 0.12.111

package/README.md

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

package/package.json

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

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

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

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

@@ -3,14 +3,16 @@ import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "save";
 export declare const platform: Platform;
 export declare const marketsPrefix = "save-markets";
-export declare const reservesPrefix = "save-reserves";
 export declare const marketsKey = "markets";
+export declare const reservesPrefix = "save-reserves";
+export declare const rewardStatsPrefix = "save-reward-stats";
+export declare const rewardStatsKey = "reward-stats";
 export declare const pid: PublicKey;
 export declare const merkleProgramId: PublicKey;
 export declare const marketsEndpoint = "https://api.solend.fi/v1/markets/configs";
 export declare const reserveEndpoint = "https://api.solend.fi/v1/reserves/?ids=";
 export declare const wadsDecimal = 18;
 export declare const mainMarket = "4UpD2fh7xH3VP9QQaXtsS1YY3bxzWhtfpks7FatyKvdY";
-export declare const externalRewardsEndpoint = "https://global.solend.fi/liquidity-mining/external-reward-score-v2?wallet=";
-export declare const rewardsEndpoint = "https://global.solend.fi/liquidity-mining/reward-proofs?obligation=";
+export declare const rewardProofsEndpoint = "https://api.save.finance/liquidity-mining/reward-proofs?obligation=";
+export declare const externalRewardStatsEndpoint = "https://api.save.finance/liquidity-mining/external-reward-stats-v2?flat=true";
 export declare const slndMint = "SLNDpmoWTVADgEdndyvWzroNL7zSi1dF9PC3xHGtPwp";

package/src/plugins/save/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.slndMint = exports.rewardsEndpoint = exports.externalRewardsEndpoint = exports.mainMarket = exports.wadsDecimal = exports.reserveEndpoint = exports.marketsEndpoint = exports.merkleProgramId = exports.pid = exports.marketsKey = exports.reservesPrefix = exports.marketsPrefix = exports.platform = exports.platformId = void 0;
+exports.slndMint = exports.externalRewardStatsEndpoint = exports.rewardProofsEndpoint = exports.mainMarket = exports.wadsDecimal = exports.reserveEndpoint = exports.marketsEndpoint = exports.merkleProgramId = exports.pid = exports.rewardStatsKey = exports.rewardStatsPrefix = exports.reservesPrefix = exports.marketsKey = exports.marketsPrefix = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'save';
 exports.platform = {
@@ -11,15 +11,17 @@ exports.platform = {
     website: 'https://save.finance/',
 };
 exports.marketsPrefix = `${exports.platformId}-markets`;
-exports.reservesPrefix = `${exports.platformId}-reserves`;
 exports.marketsKey = 'markets';
+exports.reservesPrefix = `${exports.platformId}-reserves`;
+exports.rewardStatsPrefix = `${exports.platformId}-reward-stats`;
+exports.rewardStatsKey = 'reward-stats';
 exports.pid = new web3_js_1.PublicKey('So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo');
 exports.merkleProgramId = new web3_js_1.PublicKey('mrksLcZ6rMs9xkmJgw6oKiR3GECw44Gb5NeDqu64kiw');
 exports.marketsEndpoint = 'https://api.solend.fi/v1/markets/configs';
 exports.reserveEndpoint = 'https://api.solend.fi/v1/reserves/?ids=';
 exports.wadsDecimal = 18;
 exports.mainMarket = '4UpD2fh7xH3VP9QQaXtsS1YY3bxzWhtfpks7FatyKvdY';
-exports.externalRewardsEndpoint = 'https://global.solend.fi/liquidity-mining/external-reward-score-v2?wallet=';
-exports.rewardsEndpoint = 'https://global.solend.fi/liquidity-mining/reward-proofs?obligation=';
+exports.rewardProofsEndpoint = 'https://api.save.finance/liquidity-mining/reward-proofs?obligation=';
+exports.externalRewardStatsEndpoint = 'https://api.save.finance/liquidity-mining/external-reward-stats-v2?flat=true';
 exports.slndMint = 'SLNDpmoWTVADgEdndyvWzroNL7zSi1dF9PC3xHGtPwp';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,uBAAuB;CACjC,CAAC;AACW,QAAA,aAAa,GAAG,GAAG,kBAAU,UAAU,CAAC;AACxC,QAAA,cAAc,GAAG,GAAG,kBAAU,WAAW,CAAC;AAC1C,QAAA,UAAU,GAAG,SAAS,CAAC;AAEvB,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,0CAA0C,CAAC;AAC7D,QAAA,eAAe,GAAG,yCAAyC,CAAC;AAC5D,QAAA,WAAW,GAAG,EAAE,CAAC;AACjB,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,uBAAuB,GAClC,4EAA4E,CAAC;AAClE,QAAA,eAAe,GAC1B,qEAAqE,CAAC;AAE3D,QAAA,QAAQ,GAAG,6CAA6C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,6CAA6C;IACpD,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,uBAAuB;CACjC,CAAC;AACW,QAAA,aAAa,GAAG,GAAG,kBAAU,UAAU,CAAC;AACxC,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,cAAc,GAAG,GAAG,kBAAU,WAAW,CAAC;AAC1C,QAAA,iBAAiB,GAAG,GAAG,kBAAU,eAAe,CAAC;AACjD,QAAA,cAAc,GAAG,cAAc,CAAC;AAEhC,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,eAAe,GAAG,IAAI,mBAAS,CAC1C,6CAA6C,CAC9C,CAAC;AACW,QAAA,eAAe,GAAG,0CAA0C,CAAC;AAC7D,QAAA,eAAe,GAAG,yCAAyC,CAAC;AAC5D,QAAA,WAAW,GAAG,EAAE,CAAC;AACjB,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,oBAAoB,GAC/B,qEAAqE,CAAC;AAC3D,QAAA,2BAA2B,GACtC,8EAA8E,CAAC;AAEpE,QAAA,QAAQ,GAAG,6CAA6C,CAAC"}

package/src/plugins/save/index.js

@@ -9,7 +9,8 @@ const marketsJob_1 = __importDefault(require("./marketsJob"));
 const obligationsFetcher_1 = __importDefault(require("./obligationsFetcher"));
 const constants_1 = require("./constants");
 const rewardsFetcher_1 = __importDefault(require("./rewardsFetcher"));
+const rewardStatsJob_1 = __importDefault(require("./rewardStatsJob"));
 exports.platforms = [constants_1.platform];
-exports.jobs = [marketsJob_1.default, reservesJob_1.default];
+exports.jobs = [marketsJob_1.default, reservesJob_1.default, rewardStatsJob_1.default];
 exports.fetchers = [obligationsFetcher_1.default, rewardsFetcher_1.default];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/index.ts"],"names":[],"mappings":";;;;;;AAGA,gEAAwC;AACxC,8DAAsC;AACtC,8EAAqD;AACrD,2CAAuC;AACvC,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,oBAAU,EAAE,qBAAW,CAAC,CAAC;AACxC,QAAA,QAAQ,GAAc,CAAC,4BAAiB,EAAE,wBAAc,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/index.ts"],"names":[],"mappings":";;;;;;AAGA,gEAAwC;AACxC,8DAAsC;AACtC,8EAAqD;AACrD,2CAAuC;AACvC,sEAA8C;AAC9C,sEAA8C;AAEjC,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,oBAAU,EAAE,qBAAW,EAAE,wBAAc,CAAC,CAAC;AACxD,QAAA,QAAQ,GAAc,CAAC,4BAAiB,EAAE,wBAAc,CAAC,CAAC"}

package/src/plugins/save/rewardStatsJob.d.ts

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

package/src/plugins/save/rewardStatsJob.js

@@ -0,0 +1,31 @@
+"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 axios_1 = __importDefault(require("axios"));
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const rewardStatsRes = yield axios_1.default.get(constants_1.externalRewardStatsEndpoint);
+    yield cache.setItem(constants_1.rewardStatsKey, rewardStatsRes.data, {
+        prefix: constants_1.rewardStatsPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+});
+const job = {
+    id: `${constants_1.platformId}-reward-stats`,
+    executor,
+    label: 'normal',
+};
+exports.default = job;
+//# sourceMappingURL=rewardStatsJob.js.map

package/src/plugins/save/rewardStatsJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rewardStatsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/rewardStatsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,+DAAuD;AACvD,2CAKqB;AAKrB,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,cAAc,GAAG,MAAM,eAAK,CAAC,GAAG,CACpC,uCAA2B,CAC5B,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,cAAc,CAAC,IAAI,EAAE;QACvD,MAAM,EAAE,6BAAiB;QACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,eAAe;IAChC,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/save/rewardsFetcher.js

@@ -14,77 +14,119 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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 bn_js_1 = require("bn.js");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
 const structs_1 = require("./structs");
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const client = (0, clients_1.getClientSolana)();
+const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
+const getClaimData = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const obligationAddress = yield web3_js_1.PublicKey.createWithSeed(new web3_js_1.PublicKey(owner), '4UpD2fh7xH3VP9QQaXtsS1YY3bxzWhtf', constants_1.pid);
-    const [rewardsRes, externalRewardsRes] = yield Promise.all([
-        axios_1.default.get(constants_1.rewardsEndpoint + obligationAddress.toString()),
-        axios_1.default.get(constants_1.externalRewardsEndpoint + owner),
-    ]);
-    const [rewards, externalRewards] = [rewardsRes.data, externalRewardsRes.data];
-    const slndRewards = rewards.filter((reward) => reward.incentivizer === 'slnd_points' &&
-        reward.quantity &&
-        reward.quantity !== '0');
-    const claimAndBumps = slndRewards.map((d) => web3_js_1.PublicKey.findProgramAddressSync([
+    const rewardProofsRes = yield axios_1.default.get(constants_1.rewardProofsEndpoint + obligationAddress.toString());
+    return rewardProofsRes.data.map((d) => (Object.assign(Object.assign({}, d), { distributorPublicKey: new web3_js_1.PublicKey(d.distributorPublicKey) })));
+});
+const getRewardData = (client, claimData) => __awaiter(void 0, void 0, void 0, function* () {
+    const claimAndBumps = claimData.map((d) => web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from('ClaimStatus', 'utf8'),
-        new bn_js_1.BN.BN(d.index).toArrayLike(Buffer, 'le', 8),
-        new web3_js_1.PublicKey(d.distributorPublicKey).toBytes(),
-    ], new web3_js_1.PublicKey(constants_1.merkleProgramId))[0]);
-    const tokenMints = [
-        constants_1.slndMint,
-        externalRewards.map((externalReward) => externalReward.score && externalReward.score !== '0'
-            ? externalReward.rewardMint
-            : null),
-    ]
-        .flat()
-        .filter((m) => m !== null);
-    if (tokenMints.length === 0)
+        new bn_js_1.BN.BN.BN(d.index).toArrayLike(Buffer, 'le', 8),
+        d.distributorPublicKey.toBytes(),
+    ], new web3_js_1.PublicKey(constants_1.merkleProgramId)));
+    const [merkleDistributors, claimStatuses] = yield Promise.all([
+        (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.merkleDistributorStruct, claimData.map((d) => d.distributorPublicKey)),
+        (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.claimStatusStruct, claimAndBumps.map((candb) => candb[0])),
+    ]);
+    const fullData = (yield Promise.all(claimData.map((d, index) => __awaiter(void 0, void 0, void 0, function* () {
+        const merkleDistributor = merkleDistributors[index];
+        const claimAndBump = claimAndBumps[index];
+        const claimStatus = claimStatuses[index];
+        if (!merkleDistributor || !claimAndBump)
+            return null;
+        const [distributorATAPublicKey] = web3_js_1.PublicKey.findProgramAddressSync([
+            d.distributorPublicKey.toBuffer(),
+            new web3_js_1.PublicKey(solana_1.solanaTokenPid).toBuffer(),
+            merkleDistributor.mint.toBuffer(),
+        ], solana_1.associatedTokenProgramId);
+        const accountFunded = (yield client.getTokenAccountBalance(distributorATAPublicKey)).value
+            .amount !== '0';
+        return Object.assign(Object.assign({}, d), { accountFunded, claimId: claimAndBump[0], claimStatusBump: claimAndBump[1], claimed: Boolean(claimStatus === null || claimStatus === void 0 ? void 0 : claimStatus.isClaimed), claimedAt: claimStatus ? Number(claimStatus.claimedAt) : 0, distributor: merkleDistributor, distributorATAPublicKey });
+    })))).filter((d) => d !== null);
+    const slndRewards = fullData.filter((d) => ['slnd_options', 'slnd'].includes(d.incentivizer));
+    return {
+        pythPointsRewards: fullData.filter((c) => c.incentivizer === 'pyth_points'),
+        slndPointsRewards: fullData.filter((c) => c.incentivizer === 'slnd_points'),
+        slnd: slndRewards,
+        external: fullData
+            .filter((d) => !['slnd_options', 'slnd', 'pyth_points', 'slnd_points'].includes(d.incentivizer))
+            .reduce((acc, currentValue) => {
+            if (!acc[currentValue.distributor.mint.toString()]) {
+                acc[currentValue.distributor.mint.toString()] = [];
+            }
+            acc[currentValue.distributor.mint.toString()].push(currentValue);
+            return acc;
+        }, {}),
+    };
+});
+const getRewards = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const claimData = yield getClaimData(owner);
+    if (claimData.length === 0)
         return [];
-    const [tokenPrices, claimStatuses] = yield Promise.all([
-        cache.getTokenPricesAsMap(tokenMints, portfolio_core_1.NetworkId.solana),
-        (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.claimStatusStruct, claimAndBumps),
+    const client = (0, clients_1.getClientSolana)();
+    const [rewardData, rewardStats] = yield Promise.all([
+        getRewardData(client, claimData),
+        cache.getItem(constants_1.rewardStatsKey, {
+            prefix: constants_1.rewardStatsPrefix,
+            networkId: portfolio_core_1.NetworkId.solana,
+        }),
     ]);
-    const assets = [];
-    slndRewards.forEach((reward, i) => {
-        const tokenPrice = tokenPrices.get(constants_1.slndMint);
-        if (!tokenPrice)
-            return;
-        const claimStatus = claimStatuses[i];
-        if (!claimStatus || claimStatus.isClaimed)
-            return;
-        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(tokenPrice.address, new bignumber_js_1.default(reward.quantity)
-            .dividedBy(Math.pow(10, tokenPrice.decimals))
-            .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice)), { attributes: { isClaimable: true } }));
+    if (!rewardStats || rewardStats.length === 0)
+        return [];
+    const rewardsSummary = [
+        ...new Set(rewardStats.map((rew) => rew.rewardMint)),
+    ].map((rewardMint) => {
+        var _a, _b;
+        const claims = (_b = (_a = rewardData === null || rewardData === void 0 ? void 0 : rewardData.external) === null || _a === void 0 ? void 0 : _a[rewardMint]) !== null && _b !== void 0 ? _b : [];
+        const unclaimed = claims.filter((cd) => !cd.claimed && cd.accountFunded);
+        const totalUnclaimed = unclaimed.reduce((sum, lot) => new bignumber_js_1.default(lot.quantity).plus(sum), new bignumber_js_1.default(0));
+        return {
+            rewardMint,
+            totalUnclaimed,
+        };
     });
-    externalRewards.forEach((externalReward) => {
-        if (!externalReward.score || externalReward.score === '0')
-            return;
-        const tokenPrice = tokenPrices.get(externalReward.rewardMint);
+    const unclaimedSlnd = rewardData === null || rewardData === void 0 ? void 0 : rewardData.slnd.filter((cd) => cd.incentivizer === 'slnd' && !cd.claimed).reduce((sum, lot) => new bignumber_js_1.default(lot.quantity).dividedBy(Math.pow(10, 6)).plus(sum), new bignumber_js_1.default(0));
+    rewardsSummary.push({
+        rewardMint: constants_1.slndMint,
+        totalUnclaimed: unclaimedSlnd,
+    });
+    return rewardsSummary.filter((r) => r.totalUnclaimed.isGreaterThan(0));
+});
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const rewards = yield getRewards(owner, cache);
+    if (rewards.length === 0)
+        return [];
+    const tokenPrices = yield cache.getTokenPricesAsMap(rewards.map((r) => r.rewardMint), portfolio_core_1.NetworkId.solana);
+    const assets = [];
+    rewards.forEach((reward) => {
+        const tokenPrice = tokenPrices.get(reward.rewardMint);
         if (!tokenPrice)
             return;
-        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(tokenPrice.address, new bignumber_js_1.default(externalReward.score).dividedBy(Math.pow(10, 36)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice)), { attributes: { isClaimable: true } }));
+        assets.push(Object.assign(Object.assign({}, (0, tokenPriceToAssetToken_1.default)(tokenPrice.address, reward.totalUnclaimed.dividedBy(Math.pow(10, tokenPrice.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice)), { attributes: { isClaimable: true } }));
     });
     if (assets.length === 0)
         return [];
-    const element = {
-        networkId: portfolio_core_1.NetworkId.solana,
-        label: 'Rewards',
-        platformId: constants_1.platformId,
-        type: portfolio_core_1.PortfolioElementType.multiple,
-        value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
-        data: {
-            assets,
+    return [
+        {
+            networkId: portfolio_core_1.NetworkId.solana,
+            label: 'Rewards',
+            platformId: constants_1.platformId,
+            type: portfolio_core_1.PortfolioElementType.multiple,
+            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value)),
+            data: {
+                assets,
+            },
         },
-    };
-    return [element];
+    ];
 });
 const fetcher = {
     id: `${constants_1.platformId}-rewards`,

package/src/plugins/save/rewardsFetcher.js.map

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

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

@@ -93,3 +93,15 @@ export type ClaimStatus = {
     amount: BigNumber;
 };
 export declare const claimStatusStruct: BeetStruct<ClaimStatus, Partial<ClaimStatus>>;
+export type MerkleDistributor = {
+    buffer: Buffer;
+    base: PublicKey;
+    bump: number;
+    root: number[];
+    mint: PublicKey;
+    maxTotalClaim: BigNumber;
+    maxNumNodes: BigNumber;
+    totalAmountClaimed: BigNumber;
+    numNodesClaimed: BigNumber;
+};
+export declare const merkleDistributorStruct: BeetStruct<MerkleDistributor, Partial<MerkleDistributor>>;

package/src/plugins/save/structs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.claimStatusStruct = exports.obligationLiquidityStruct = exports.obligationCollateralStruct = exports.obligationStruct = exports.reserveStruct = exports.lastUpdateStruct = exports.liquidityStruct = exports.collateralStruct = exports.reserveConfigStruct = exports.feesStruct = void 0;
+exports.merkleDistributorStruct = exports.claimStatusStruct = exports.obligationLiquidityStruct = exports.obligationCollateralStruct = exports.obligationStruct = exports.reserveStruct = exports.lastUpdateStruct = exports.liquidityStruct = exports.collateralStruct = exports.reserveConfigStruct = exports.feesStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -85,4 +85,15 @@ exports.claimStatusStruct = new beet_1.BeetStruct([
     ['claimedAt', solana_1.i64],
     ['amount', solana_1.u64],
 ], (args) => args);
+exports.merkleDistributorStruct = new beet_1.BeetStruct([
+    ['buffer', (0, solana_1.blob)(8)],
+    ['base', beet_solana_1.publicKey],
+    ['bump', beet_1.u8],
+    ['root', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)],
+    ['mint', beet_solana_1.publicKey],
+    ['maxTotalClaim', solana_1.u64],
+    ['maxNumNodes', solana_1.u64],
+    ['totalAmountClaimed', solana_1.u64],
+    ['numNodesClaimed', solana_1.u64],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

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

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

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

@@ -1,3 +1,4 @@
+import { PublicKey } from '@solana/web3.js';
 export interface ApiResponse<T> {
     results: T[];
     next: null;
@@ -113,6 +114,24 @@ export type ExternalReward = {
     lastSlot: number;
     lastTx: 'string';
 };
+export type RewardStat = {
+    incentivizer: string;
+    lastSlot: number;
+    market: string;
+    mint: string;
+    reserveID: string;
+    rewardMint: string;
+    rewardSymbol: string;
+    rewardsPerShare: string;
+    side: string;
+    tokenMint: string;
+    totalBalance: string;
+    rewardRates: {
+        name: string;
+        beginningSlot: number;
+        rewardRate: number;
+    }[];
+};
 export type Obligation = {
     obligationID: string;
     lotNumber: number;
@@ -121,4 +140,31 @@ export type Obligation = {
     distributorPublicKey: string;
     name: string;
     incentivizer: string;
+    distributor: {
+        mint: string;
+    };
+};
+export type ClaimData = {
+    name: string;
+    obligationID: string;
+    lotNumber: number;
+    index: number;
+    quantity: string;
+    root: string;
+    proof: Array<string>;
+    distributorPublicKey: PublicKey;
+    optionMarketKey: PublicKey | null;
+    incentivizer: string;
+};
+export type FullClaimDataType = ClaimData & {
+    claimed: boolean;
+    claimedAt: number;
+    claimStatusBump: number;
+    accountFunded: boolean;
+    distributor: {
+        mint: PublicKey;
+        bump: number;
+    };
+    claimId: PublicKey;
+    distributorATAPublicKey: PublicKey;
 };

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/uniswap-v2/helpers.js

@@ -40,28 +40,28 @@ function getPairKey(version) {
 exports.getPairKey = getPairKey;
 function getPairsV2FromTheGraph(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pairs(
-        orderBy: reserveUSD
-        first: ${length}
-        orderDirection: desc
-        where: { trackedReserveETH_not: "0" }
-      ) {
-        id
-        reserve0
-        reserve1
-        totalSupply
-        token0 {
-          id
-          decimals
-        }
-        token1 {
-          id
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pairs(
+        orderBy: reserveUSD
+        first: ${length}
+        orderDirection: desc
+        where: { trackedReserveETH_not: "0" }
+      ) {
+        id
+        reserve0
+        reserve1
+        totalSupply
+        token0 {
+          id
+          decimals
+        }
+        token1 {
+          id
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pairs = res.pairs;