@sonarwatch/portfolio-plugins 0.15.12 → 0.15.19

package/src/plugins/kamino/vaultsJob.js

@@ -0,0 +1,102 @@
+"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 bignumber_js_1 = __importDefault(require("bignumber.js"));
+const clients_1 = require("../../utils/clients");
+const constants_1 = require("./constants");
+const solana_1 = require("../../utils/solana");
+const vaults_1 = require("./structs/vaults");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const accounts = yield ParsedGpa_1.ParsedGpa.build(client, vaults_1.vaultStateStruct, constants_1.vaultProgramId)
+        .addFilter('accountDiscriminator', [228, 196, 82, 165, 98, 210, 235, 152])
+        .run();
+    if (!accounts.length)
+        throw new Error('No Vaults accounts found');
+    const [reserves, tokenPrices] = yield Promise.all([
+        constants_1.reservesMemo.getItem(cache),
+        cache.getTokenPricesAsMap(accounts.map((account) => account.tokenMint.toString()), portfolio_core_1.NetworkId.solana),
+    ]);
+    const tokenPriceSources = [];
+    const tokenYields = [];
+    accounts.forEach((account) => {
+        const tokenMintPrice = tokenPrices.get(account.tokenMint.toString());
+        if (!tokenMintPrice)
+            return;
+        let investedInReserve = new bignumber_js_1.default(0);
+        let totalAPR = new bignumber_js_1.default(0);
+        let totalWeights = new bignumber_js_1.default(0);
+        account.vaultAllocationStrategy.forEach((allocationStrategy) => {
+            if (allocationStrategy.reserve.toString() ===
+                '11111111111111111111111111111111')
+                return;
+            const reserve = reserves[allocationStrategy.reserve.toString()];
+            if (!reserve)
+                return;
+            const reserveAllocationLiquidityAmount = allocationStrategy.ctokenAllocation.div(reserve.exchangeRate);
+            investedInReserve = investedInReserve.plus(reserveAllocationLiquidityAmount);
+            const reserveAPR = reserve.supplyApr;
+            const weight = allocationStrategy.targetAllocationWeight;
+            const weightedAPR = new bignumber_js_1.default(reserveAPR).multipliedBy(weight);
+            totalAPR = totalAPR.plus(weightedAPR);
+            totalWeights = totalWeights.plus(weight);
+        });
+        const shares = account.sharesIssued.shiftedBy(-account.sharesMintDecimals);
+        const totalAvailable = account.tokenAvailable.shiftedBy(-account.tokenMintDecimals);
+        const totalInvested = investedInReserve.shiftedBy(-account.tokenMintDecimals);
+        const pendingFees = account.pendingFeesSf.shiftedBy(-account.tokenMintDecimals);
+        const totalAUMIncludingFees = totalAvailable.plus(totalInvested);
+        const netAUM = totalAUMIncludingFees.minus(pendingFees);
+        const perShare = netAUM.div(shares);
+        const tokenPriceSource = {
+            id: account.pubkey.toString(),
+            weight: 1,
+            address: account.sharesMint.toString(),
+            networkId: portfolio_core_1.NetworkId.solana,
+            platformId: constants_1.platformId,
+            decimals: account.sharesMintDecimals.toNumber(),
+            price: perShare.multipliedBy(tokenMintPrice.price).toNumber(),
+            timestamp: Date.now(),
+            sourceRefs: [
+                {
+                    name: 'Vault',
+                    address: account.pubkey.toString(),
+                },
+            ],
+            elementName: (0, solana_1.u8ArrayToString)(account.name),
+        };
+        const grossAPR = totalAPR.div(totalWeights);
+        const netAPR = grossAPR
+            .multipliedBy(new bignumber_js_1.default(1).minus(new bignumber_js_1.default(account.performanceFeeBps.toString()).div(10000)))
+            .multipliedBy(new bignumber_js_1.default(1).minus(new bignumber_js_1.default(account.managementFeeBps.toString()).div(10000)));
+        tokenPriceSources.push(tokenPriceSource);
+        tokenYields.push({
+            address: account.sharesMint.toString(),
+            networkId: portfolio_core_1.NetworkId.solana,
+            yield: (0, portfolio_core_1.yieldFromApr)(netAPR.toNumber()),
+            timestamp: Date.now(),
+        });
+    });
+    yield cache.setTokenPriceSources(tokenPriceSources);
+    yield cache.setTokenYields(tokenYields);
+});
+const job = {
+    id: `${constants_1.platformId}-vaults`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=vaultsJob.js.map

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

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

package/src/plugins/kriya/strategyLpRebalancingJob.js

@@ -89,7 +89,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_1.platformId}-strategy-lp-rebalancing`,
     executor,
-    labels: ['realtime'],
+    labels: ['normal'],
 };
 exports.default = job;
 //# sourceMappingURL=strategyLpRebalancingJob.js.map

package/src/plugins/kriya/strategyLpRebalancingJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategyLpRebalancingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kriya/strategyLpRebalancingJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"strategyLpRebalancingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kriya/strategyLpRebalancingJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAwE;AACxE,kDAA6C;AAG7C,iDAAmD;AACnD,2CAMqB;AASrB,yDAAsD;AACtD,mFAAgF;AAChF,+DAA4D;AAG5D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,WAAW,GAAwB,EAAE,CAAC;IAE5C,MAAM,aAAa,GAAoC,MAAM,eAAK,CAAC,GAAG,CACpE,oCAAwB,CACzB,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAChD,MAAM,CAAC,UAAU,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzD,IAAA,qBAAS,EAAQ,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC;YAC3C,IAAA,+CAAsB,EAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC;SAClD,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC;QAC/C,IAAI,CAAC,KAAK;YAAE,SAAS;QAErB,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC;QAClD,MAAM,gBAAgB,GAAG,OAAO;YAC9B,CAAC,CAAC,yCAA6B;YAC/B,CAAC,CAAC,yCAA6B,CAAC;QAClC,IAAI,aAAa,CAAC;QAClB,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;YACxC,IAAI,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI,MAAK,gBAAgB,EAAE,CAAC;gBAC3C,aAAa,GAAG,OAAO;oBACrB,CAAC,CAAE,MAAA,MAAM,CAAC,IAAI,CAAC,OAAO,0CAAE,MAA6B;oBACrD,CAAC,CAAE,MAAA,MAAM,CAAC,IAAI,CAAC,OAAO,0CAAE,MAA6B,CAAC;YAC1D,CAAC;QACH,CAAC;QACD,IACE,CAAC,aAAa;YACd,CAAC,SAAS,CAAC,IAAI;YACf,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;YACpB,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY;YAC5B,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY;YAE5B,SAAS;QAEX,MAAM,mBAAmB,GAAG;YAC1B,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE;YACf,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE;YACzB,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;YAC7B,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS;YAC/C,SAAS,EAAE,KAAK,CAAC,UAAU;YAC3B,SAAS,EAAE,KAAK,CAAC,UAAU;YAC3B,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK;YAChE,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,YAAY;YACpC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,YAAY;SACrC,CAAC;QACF,IAAI,MAAA,SAAS,CAAC,IAAI,CAAC,IAAI,0CAAE,MAAM,EAAE,CAAC;YAChC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAS,EAC9B,MAAM,EACN,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAC3B,CAAC;gBACF,IAAI,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,EAAE,CAAC;oBACnC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,gCAAe,EAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAErD,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACrC,MAAM,iBAAiB,mCAClB,mBAAmB,KACtB,gBAAgB,EAAE,IAAA,2BAAY,EAC5B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAC5D,EACD,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EACnB,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GACpB,CAAC;wBACF,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,SAAS,CAAC,WAAW,KAAK,OAAO,EAAE,CAAC;gBAC7C,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAS,EAC9B,MAAM,EACN,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAC3B,CAAC;gBACF,IAAI,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,EAAE,CAAC;oBACnC,MAAM,iBAAiB,mCAClB,mBAAmB,KACtB,gBAAgB,EAAE,IAAA,2BAAY,EAC5B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CACpD,EACD,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EACtD,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,GACvD,CAAC;oBACF,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,CAAC,OAAO,CAAC,wCAA4B,EAAE,WAAW,EAAE;QAC7D,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,0BAA0B;IAC3C,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/lavarage/positionsFetcher.js

@@ -21,7 +21,6 @@ const structs_1 = require("./structs");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const solana_1 = require("../../utils/solana");
-const amountFactor = Math.pow(10, 6);
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const [usdcPositions, solPositions] = yield Promise.all([
@@ -66,13 +65,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             ? acc.lastInterestCollect
             : acc.timestamp;
         const daysSinceStart = Math.floor((Date.now() / 1000 - timeReference.toNumber()) / (60 * 60 * 24));
+        const collat = index + 1 <= usdcPositions.length ? usdcPrice : solPrice;
         // Seems like they mixed up the collateral and size
-        const size = acc.collateralAmount.dividedBy(amountFactor);
-        const collatAmount = acc.userPaid.dividedBy(amountFactor);
-        const amount = acc.amount.dividedBy(amountFactor);
-        const collatPrice = index <= usdcPositions.length ? usdcPrice.price : solPrice.price;
-        const collatSizeValue = size.times(collatPrice);
-        const collateralValue = collatAmount.times(collatPrice);
+        const size = acc.collateralAmount.dividedBy(Math.pow(10, assetPrice.decimals)); // in asset
+        const collatAmount = acc.userPaid.dividedBy(Math.pow(10, collat.decimals));
+        const amount = acc.amount.dividedBy(Math.pow(10, collat.decimals));
+        const collatSizeValue = size.times(assetPrice.price);
+        const collateralValue = collatAmount.times(collat.price);
         const sizeValue = size.times(assetPrice.price);
         const dailyInterest = acc.interestRate / 365;
         const entryPrice = amount.plus(collatAmount).dividedBy(size);
@@ -82,8 +81,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const liquidationPrice = amount
             .plus(interest)
             .dividedBy(collatSizeValue.times(0.9))
+            .multipliedBy(assetPrice.price)
             .toNumber();
-        const pnlValue = new bignumber_js_1.default(assetPrice.price)
+        const markPrice = assetPrice.price / collat.price;
+        const pnlValue = new bignumber_js_1.default(markPrice)
             .minus(entryPrice)
             .times(size)
             .minus(interest)
@@ -96,7 +97,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 .plus(acc.userPaid)
                 .dividedBy(acc.userPaid)
                 .toNumber(),
-            markPrice: assetPrice.price,
+            markPrice,
             liquidationPrice,
             side: portfolio_core_1.LeverageSide.long,
             size: size.toNumber(),

package/src/plugins/lavarage/positionsFetcher.js.map

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

package/src/plugins/meteora/dlmm/dlmmVaultsFetcher.js

@@ -74,12 +74,24 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             link: `https://app.meteora.ag/dlmm/${vault.lbPair}`,
         });
         // Vesting not started yet
-        if (time < Number(vault.startVestingTs) * 1000) {
+        if (time < Number(vault.startVestingTs) * 1000 && escrow.refunded === 0) {
             element.addAsset({
                 address: vault.quoteMint,
                 amount: escrow.totalDeposit,
             });
         }
+        else if (vault.startVestingTs === vault.endVestingTs) {
+            // Unlock immediately after endVesting
+            const shares = new bignumber_js_1.default(escrow.totalDeposit).div(vault.totalDeposit);
+            const totalAmount = new bignumber_js_1.default(vault.boughtToken).times(shares);
+            element.addAsset({
+                address: vault.baseMint,
+                amount: totalAmount,
+                attributes: {
+                    lockedUntil: Number(vault.endVestingTs) * 1000,
+                },
+            });
+        }
         else {
             // Vesting started
             // If not refunded yet

package/src/plugins/meteora/dlmm/dlmmVaultsFetcher.js.map

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

package/src/plugins/mole/farmsJob.js

@@ -46,7 +46,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_1.platformId}-farms`,
     executor,
-    labels: ['realtime'],
+    labels: ['normal'],
 };
 exports.default = job;
 //# sourceMappingURL=farmsJob.js.map

package/src/plugins/mole/farmsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"farmsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mole/farmsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAA8E;AAE9E,iDAAmD;AACnD,qEAAkE;AAClE,mFAAgF;AAEhF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAW,mBAAO,EAAE;QAClD,MAAM,EAAE,wBAAY;QACpB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO;IAEjE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAe,EACtC,MAAM,EACN,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CACpC,CAAC;IAEF,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;;QAC/B,IAAI,MAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YACrE,iBAAiB,CAAC,IAAI,CACpB,MAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CACpE,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,iBAAiB,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CACzC,IAAA,+CAAsB,EAAe,MAAM,EAAE,gBAAgB,CAAC,CAC/D,CACF,CAAC;IAEF,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;;QAAC,OAAA,CAAC;YAC3D,EAAE,EAAE,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,IAAI;YACvC,KAAK,EAAE,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;YACxD,MAAM,EAAE,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;SAC3D,CAAC,CAAA;KAAA,CAAC,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,wBAAY,EAAE,SAAS,EAAE;QAC3C,MAAM,EAAE,wBAAY;QACpB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"farmsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/mole/farmsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAA8E;AAE9E,iDAAmD;AACnD,qEAAkE;AAClE,mFAAgF;AAEhF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAW,mBAAO,EAAE;QAClD,MAAM,EAAE,wBAAY;QACpB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO;IAEjE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAe,EACtC,MAAM,EACN,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CACpC,CAAC;IAEF,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;;QAC/B,IAAI,MAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YACrE,iBAAiB,CAAC,IAAI,CACpB,MAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CACpE,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,iBAAiB,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,CACzC,IAAA,+CAAsB,EAAe,MAAM,EAAE,gBAAgB,CAAC,CAC/D,CACF,CAAC;IAEF,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;;QAAC,OAAA,CAAC;YAC3D,EAAE,EAAE,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,IAAI;YACvC,KAAK,EAAE,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;YACxD,MAAM,EAAE,MAAA,MAAA,QAAQ,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;SAC3D,CAAC,CAAA;KAAA,CAAC,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,wBAAY,EAAE,SAAS,EAAE;QAC3C,MAAM,EAAE,wBAAY;QACpB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/sanctum/asrAirdropFetcher.d.ts

@@ -0,0 +1,3 @@
+import { AirdropFetcher } from '../../AirdropFetcher';
+export declare const asrAirdropFetcher: AirdropFetcher;
+export declare const asrFetcher: import("../..").Fetcher;

package/src/plugins/sanctum/asrAirdropFetcher.js

@@ -0,0 +1,60 @@
+"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.asrFetcher = exports.asrAirdropFetcher = 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 AirdropFetcher_1 = require("../../AirdropFetcher");
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const deriveClaimStatus_1 = require("../../utils/solana/jupiter/deriveClaimStatus");
+const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield axios_1.default
+        .get(constants_1.asrApi + owner, { timeout: 5000 })
+        .catch(() => null);
+    if (!res || res.data.error)
+        return (0, AirdropFetcher_1.getAirdropRaw)({
+            statics: constants_1.asrAirdropStatics,
+            items: [
+                {
+                    amount: 0,
+                    isClaimed: false,
+                    label: 'CLOUD',
+                    address: constants_1.sCloudMint,
+                },
+            ],
+        });
+    const client = (0, clients_1.getClientSolana)();
+    const claimStatus = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, 'F1kocmKzLCNURG67qnkBibGokkiQX6w3E1sn2dXr82wy', constants_1.distributorPid.toString());
+    const claimAccount = yield client.getAccountInfo(claimStatus);
+    return (0, AirdropFetcher_1.getAirdropRaw)({
+        statics: constants_1.asrAirdropStatics,
+        items: [
+            {
+                amount: new bignumber_js_1.default(res.data.amount).dividedBy(Math.pow(10, 9)).toNumber(),
+                isClaimed: !!claimAccount,
+                label: 'CLOUD',
+                address: constants_1.sCloudMint,
+            },
+        ],
+    });
+});
+exports.asrAirdropFetcher = {
+    id: constants_1.asrAirdropStatics.id,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.asrFetcher = (0, AirdropFetcher_1.airdropFetcherToFetcher)(exports.asrAirdropFetcher, constants_1.platformId, 'sanctum-asr-airdrop', constants_1.asrAirdropStatics.claimEnd);
+//# sourceMappingURL=asrAirdropFetcher.js.map

package/src/plugins/sanctum/asrAirdropFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asrAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/asrAirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,gEAAqC;AACrC,yDAK8B;AAC9B,2CAMqB;AAErB,iDAAsD;AACtD,oFAAiF;AAEjF,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,GAAG,GAA0C,MAAM,eAAK;SAC3D,GAAG,CAAC,kBAAM,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SACtC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAErB,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK;QACxB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,6BAAiB;YAC1B,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,sBAAU;iBACpB;aACF;SACF,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,qCAAiB,EACnC,KAAK,EACL,8CAA8C,EAC9C,0BAAc,CAAC,QAAQ,EAAE,CAC1B,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9D,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,6BAAiB;QAC1B,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,IAAI,sBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,CAAC,CAAA,CAAC,CAAC,QAAQ,EAAE;gBACpE,SAAS,EAAE,CAAC,CAAC,YAAY;gBACzB,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,sBAAU;aACpB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,iBAAiB,GAAmB;IAC/C,EAAE,EAAE,6BAAiB,CAAC,EAAE;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AACW,QAAA,UAAU,GAAG,IAAA,wCAAuB,EAC/C,yBAAiB,EACjB,sBAAU,EACV,qBAAqB,EACrB,6BAAiB,CAAC,QAAQ,CAC3B,CAAC"}

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

@@ -6,8 +6,12 @@ export declare const platformId = "sanctum";
 export declare const platformImage = "https://sonar.watch/img/platforms/sanctum.webp";
 export declare const platformWebsite = "https://www.sanctum.so/";
 export declare const cloudMint = "CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu";
+export declare const sCloudMint = "sc1dNAxRBj5CNWaGC26AR7PEW75R36Umzt1V8vuP8kZ";
 export declare const lstsKey = "lsts";
+export declare const asrApi = "https://asr1-api.sanctum.so/amount/";
 export declare const cloudDecimals = 9;
 export declare const s1AirdropStatics: AirdropStatics;
 export declare const nclbAirdropStatics: AirdropStatics;
 export declare const stakingPid: PublicKey;
+export declare const distributorPid: PublicKey;
+export declare const asrAirdropStatics: AirdropStatics;

package/src/plugins/sanctum/constants.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stakingPid = exports.nclbAirdropStatics = exports.s1AirdropStatics = exports.cloudDecimals = exports.lstsKey = exports.cloudMint = exports.platformWebsite = exports.platformImage = exports.platformId = void 0;
+exports.asrAirdropStatics = exports.distributorPid = exports.stakingPid = exports.nclbAirdropStatics = exports.s1AirdropStatics = exports.cloudDecimals = exports.asrApi = exports.lstsKey = exports.sCloudMint = exports.cloudMint = exports.platformWebsite = exports.platformImage = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'sanctum';
 exports.platformImage = 'https://sonar.watch/img/platforms/sanctum.webp';
 exports.platformWebsite = 'https://www.sanctum.so/';
 exports.cloudMint = 'CLoUDKc4Ane7HeQcPpE3YHnznRxhMimJ4MyaUqyHFzAu';
+exports.sCloudMint = 'sc1dNAxRBj5CNWaGC26AR7PEW75R36Umzt1V8vuP8kZ';
 exports.lstsKey = 'lsts';
+// If this API doesn't work anymore, you can find the tree.json inside our shared convo
+// with sanctum team
+exports.asrApi = 'https://asr1-api.sanctum.so/amount/';
 exports.cloudDecimals = 9;
 exports.s1AirdropStatics = {
     id: 'sanctum',
@@ -18,7 +22,7 @@ exports.s1AirdropStatics = {
     image: exports.platformImage,
 };
 exports.nclbAirdropStatics = {
-    id: 'sanctum-nclb',
+    id: 'sanctum-nclb', // No Cloud Left Behing
     claimStart: undefined,
     claimEnd: undefined,
     emitterName: 'Sanctum',
@@ -27,4 +31,15 @@ exports.nclbAirdropStatics = {
     image: exports.platformImage,
 };
 exports.stakingPid = new web3_js_1.PublicKey('bon4Kh3x1uQK16w9b9DKgz3Aw4AP1pZxBJk55Q6Sosb');
+exports.distributorPid = new web3_js_1.PublicKey('9R2CZDyVjBBK2bxx6NfKdnYMYfh8TQEphUUgZ4861XqJ');
+exports.asrAirdropStatics = {
+    id: 'sanctum-asr',
+    claimStart: 1755871200000,
+    claimEnd: 1755648000000,
+    emitterName: 'Sanctum',
+    emitterLink: exports.platformWebsite,
+    claimLink: 'https://vote.sanctum.so/',
+    image: exports.platformImage,
+    name: 'ASR #1',
+};
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,aAAa,GAAG,gDAAgD,CAAC;AACjE,QAAA,eAAe,GAAG,yBAAyB,CAAC;AAC5C,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAC3D,QAAA,OAAO,GAAG,MAAM,CAAC;AAEjB,QAAA,aAAa,GAAG,CAAC,CAAC;AAClB,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,SAAS;IACb,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,uBAAe;IAC5B,SAAS,EAAE,4BAA4B;IACvC,KAAK,EAAE,qBAAa;CACrB,CAAC;AAEW,QAAA,kBAAkB,GAAmB;IAChD,EAAE,EAAE,cAAc;IAClB,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,uBAAe;IAC5B,SAAS,EAAE,mCAAmC;IAC9C,KAAK,EAAE,qBAAa;CACrB,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,aAAa,GAAG,gDAAgD,CAAC;AACjE,QAAA,eAAe,GAAG,yBAAyB,CAAC;AAC5C,QAAA,SAAS,GAAG,8CAA8C,CAAC;AAC3D,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,OAAO,GAAG,MAAM,CAAC;AAE9B,uFAAuF;AACvF,oBAAoB;AACP,QAAA,MAAM,GAAG,qCAAqC,CAAC;AAC/C,QAAA,aAAa,GAAG,CAAC,CAAC;AAElB,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,SAAS;IACb,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,uBAAe;IAC5B,SAAS,EAAE,4BAA4B;IACvC,KAAK,EAAE,qBAAa;CACrB,CAAC;AAEW,QAAA,kBAAkB,GAAmB;IAChD,EAAE,EAAE,cAAc,EAAE,uBAAuB;IAC3C,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,uBAAe;IAC5B,SAAS,EAAE,mCAAmC;IAC9C,KAAK,EAAE,qBAAa;CACrB,CAAC;AAEW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAmB;IAC/C,EAAE,EAAE,aAAa;IACjB,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;IACvB,WAAW,EAAE,SAAS;IACtB,WAAW,EAAE,uBAAe;IAC5B,SAAS,EAAE,0BAA0B;IACrC,KAAK,EAAE,qBAAa;IACpB,IAAI,EAAE,QAAQ;CACf,CAAC"}

package/src/plugins/sanctum/index.js

@@ -8,10 +8,17 @@ const s1AirdropFetcher_1 = require("./s1AirdropFetcher");
 const nclbAirdropFetcher_1 = require("./nclbAirdropFetcher");
 const stakingFetcher_1 = __importDefault(require("./stakingFetcher"));
 const lstsJob_1 = __importDefault(require("./lstsJob"));
+const asrAirdropFetcher_1 = require("./asrAirdropFetcher");
 exports.jobs = [lstsJob_1.default];
-exports.fetchers = [s1AirdropFetcher_1.fetcher, nclbAirdropFetcher_1.fetcher, stakingFetcher_1.default];
+exports.fetchers = [
+    s1AirdropFetcher_1.fetcher,
+    nclbAirdropFetcher_1.fetcher,
+    stakingFetcher_1.default,
+    asrAirdropFetcher_1.asrFetcher,
+];
 exports.airdropFetchers = [
     s1AirdropFetcher_1.airdropFetcher,
     nclbAirdropFetcher_1.airdropFetcher,
+    asrAirdropFetcher_1.asrAirdropFetcher,
 ];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/index.ts"],"names":[],"mappings":";;;;;;AAEA,yDAG4B;AAE5B,6DAG8B;AAC9B,sEAA8C;AAC9C,wDAAgC;AAEnB,QAAA,IAAI,GAAU,CAAC,iBAAO,CAAC,CAAC;AACxB,QAAA,QAAQ,GAAc,CAAC,0BAAS,EAAE,4BAAW,EAAE,wBAAc,CAAC,CAAC;AAC/D,QAAA,eAAe,GAAqB;IAC/C,iCAAgB;IAChB,mCAAkB;CACnB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/index.ts"],"names":[],"mappings":";;;;;;AAEA,yDAG4B;AAE5B,6DAG8B;AAC9B,sEAA8C;AAC9C,wDAAgC;AAChC,2DAAoE;AAEvD,QAAA,IAAI,GAAU,CAAC,iBAAO,CAAC,CAAC;AACxB,QAAA,QAAQ,GAAc;IACjC,0BAAS;IACT,4BAAW;IACX,wBAAc;IACd,8BAAU;CACX,CAAC;AACW,QAAA,eAAe,GAAqB;IAC/C,iCAAgB;IAChB,mCAAkB;IAClB,qCAAiB;CAClB,CAAC"}

package/src/plugins/sanctum/lstsJob.js

@@ -15,6 +15,14 @@ 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 BATCH_SIZE = 100;
+function chunkArray(arr, chunkSize) {
+    const result = [];
+    for (let i = 0; i < arr.length; i += chunkSize) {
+        result.push(arr.slice(i, i + chunkSize));
+    }
+    return result;
+}
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield axios_1.default.get('https://raw.githubusercontent.com/igneous-labs/sanctum-lst-list/master/sanctum-lst-list.toml');
     const regex = /(?<=mint = ").{44}/g;
@@ -25,23 +33,29 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             prefix: constants_1.platformId,
             networkId: portfolio_core_1.NetworkId.solana,
         });
-        const params = new URLSearchParams();
-        mints.forEach((mint) => {
-            params.append('lst', mint);
-        });
-        const aprs = yield axios_1.default.get(`https://extra-api.sanctum.so/v1/apy/latest?${params.toString()}`);
-        yield cache.setTokenYields(Object.keys(aprs.data.apys).map((address) => {
-            const apy = aprs.data.apys[address];
-            return {
-                address,
-                networkId: portfolio_core_1.NetworkId.solana,
-                yield: {
-                    apr: (0, portfolio_core_1.apyToApr)(apy),
-                    apy,
-                },
-                timestamp: Date.now(),
-            };
-        }));
+        const chunks = chunkArray(mints, BATCH_SIZE);
+        const allYields = [];
+        for (const chunk of chunks) {
+            const params = new URLSearchParams();
+            chunk.forEach((mint) => {
+                params.append('lst', mint);
+            });
+            const aprs = yield axios_1.default.get(`https://extra-api.sanctum.so/v1/apy/latest?${params.toString()}`);
+            const yields = Object.keys(aprs.data.apys).map((address) => {
+                const apy = aprs.data.apys[address];
+                return {
+                    address,
+                    networkId: portfolio_core_1.NetworkId.solana,
+                    yield: {
+                        apr: (0, portfolio_core_1.apyToApr)(apy),
+                        apy,
+                    },
+                    timestamp: Date.now(),
+                };
+            });
+            allYields.push(...yields);
+        }
+        yield cache.setTokenYields(allYields);
     }
 });
 const job = {

package/src/plugins/sanctum/lstsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"lstsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/lstsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,+DAAiE;AAGjE,2CAAkD;AAElD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CACzB,8FAA8F,CAC/F,CAAC;IAEF,MAAM,KAAK,GAAG,qBAAqB,CAAC;IACpC,MAAM,QAAQ,GAAoB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEhE,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC,OAAO,CAAC,mBAAO,EAAE,KAAK,EAAE;YAClC,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,eAAK,CAAC,GAAG,CAEzB,8CAA8C,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAEtE,MAAM,KAAK,CAAC,cAAc,CACxB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACpC,OAAO;gBACL,OAAO;gBACP,SAAS,EAAE,0BAAS,CAAC,MAAM;gBAC3B,KAAK,EAAE;oBACL,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;oBAClB,GAAG;iBACJ;gBACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACtB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;AACH,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"lstsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sanctum/lstsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,+DAAiE;AAGjE,2CAAkD;AAElD,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,SAAS,UAAU,CAAI,GAAQ,EAAE,SAAiB;IAChD,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CACzB,8FAA8F,CAC/F,CAAC;IAEF,MAAM,KAAK,GAAG,qBAAqB,CAAC;IACpC,MAAM,QAAQ,GAAoB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEhE,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC,OAAO,CAAC,mBAAO,EAAE,KAAK,EAAE;YAClC,MAAM,EAAE,sBAAU;YAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,EAAE,CAAC;QAErB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;YACrC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG,MAAM,eAAK,CAAC,GAAG,CAEzB,8CAA8C,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEtE,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACzD,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACpC,OAAO;oBACL,OAAO;oBACP,SAAS,EAAE,0BAAS,CAAC,MAAM;oBAC3B,KAAK,EAAE;wBACL,GAAG,EAAE,IAAA,yBAAQ,EAAC,GAAG,CAAC;wBAClB,GAAG;qBACJ;oBACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -0,0 +1,4 @@
+export type AirdropResponse = {
+    amount: string;
+    error?: string;
+};

package/src/plugins/sanctum/types.js

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

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

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

package/src/plugins/save/index.js

@@ -8,6 +8,12 @@ const reservesJob_1 = __importDefault(require("./reservesJob"));
 const marketsJob_1 = __importDefault(require("./marketsJob"));
 const obligationsFetcher_1 = __importDefault(require("./obligationsFetcher"));
 const token2022wrapperJob_1 = __importDefault(require("./token2022wrapperJob"));
-exports.jobs = [marketsJob_1.default, reservesJob_1.default, token2022wrapperJob_1.default];
+const saveSolPriceJob_1 = __importDefault(require("./saveSolPriceJob"));
+exports.jobs = [
+    marketsJob_1.default,
+    reservesJob_1.default,
+    token2022wrapperJob_1.default,
+    saveSolPriceJob_1.default,
+];
 exports.fetchers = [obligationsFetcher_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":";;;;;;AAEA,gEAAwC;AACxC,8DAAsC;AACtC,8EAAqD;AACrD,gFAAwD;AAE3C,QAAA,IAAI,GAAU,CAAC,oBAAU,EAAE,qBAAW,EAAE,6BAAmB,CAAC,CAAC;AAC7D,QAAA,QAAQ,GAAc,CAAC,4BAAiB,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/index.ts"],"names":[],"mappings":";;;;;;AAEA,gEAAwC;AACxC,8DAAsC;AACtC,8EAAqD;AACrD,gFAAwD;AACxD,wEAAgD;AAEnC,QAAA,IAAI,GAAU;IACzB,oBAAU;IACV,qBAAW;IACX,6BAAmB;IACnB,yBAAe;CAChB,CAAC;AACW,QAAA,QAAQ,GAAc,CAAC,4BAAiB,CAAC,CAAC"}

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

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

package/src/plugins/save/saveSolPriceJob.js

@@ -0,0 +1,40 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
+const constants_1 = require("./constants");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const address = 'SAVEDpx3nFNdzG3ymJfShYnrBuYy7LtQEABZQ3qtTFt';
+    const pricesRes = yield axios_1.default.get(`https://api.save.finance/v1/prices?symbols=${address}`);
+    if (!pricesRes || !pricesRes.data || pricesRes.data.results.length !== 1)
+        throw new Error('Error on saveSol price request');
+    yield cache.setTokenPriceSource({
+        address,
+        networkId: portfolio_core_1.NetworkId.solana,
+        decimals: 9,
+        id: 'Save API',
+        platformId: portfolio_core_1.walletTokensPlatformId,
+        price: pricesRes.data.results[0].price,
+        timestamp: Date.now(),
+        weight: 1,
+    });
+});
+const job = {
+    id: `${constants_1.platformId}-savesol-price`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=saveSolPriceJob.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"saveSolPriceJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/save/saveSolPriceJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA+E;AAC/E,kDAA0B;AAG1B,2CAAyC;AAEzC,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,6CAA6C,CAAC;IAE9D,MAAM,SAAS,GAAG,MAAM,eAAK,CAAC,GAAG,CAC/B,8CAA8C,OAAO,EAAE,CACxD,CAAC;IACF,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAEpD,MAAM,KAAK,CAAC,mBAAmB,CAAC;QAC9B,OAAO;QACP,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,QAAQ,EAAE,CAAC;QACX,EAAE,EAAE,UAAU;QACd,UAAU,EAAE,uCAAsB;QAClC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK;QACtC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,MAAM,EAAE,CAAC;KACV,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,gBAAgB;IACjC,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}