@sonarwatch/portfolio-plugins 0.15.27 → 0.15.29

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

@@ -24,7 +24,7 @@ const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry
 // const slotTtl = 30000;
 // const slot: number | null = null;
 // const slotUpdate = 0;
-const dustFilter = 0.00001;
+const dustFilter = 0.0001;
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, struct_1.escrowStruct, constants_1.dlmmVaultProgramId, [
@@ -44,6 +44,9 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     });
     if (!vaults)
         throw new Error('Vaults not cached');
+    const tokenPrices = yield cache.getTokenPricesAsMap(Object.values(vaults)
+        .map((v) => v && [v.baseMint, v.quoteMint])
+        .flat(), portfolio_core_1.NetworkId.solana);
     const time = Date.now();
     // Looks like Meteora is using timesteamp instead of slot now inside their accounts
     // if (!slot || Date.now() - slotTtl > slotUpdate) {
@@ -52,11 +55,10 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     // }
     // if (!slot) return [];
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
-    accounts.forEach((escrow) => {
+    for (const escrow of accounts) {
         const vault = vaults[escrow.dlmmVault.toString()];
         if (!vault || !vault.endVestingTs || !vault.startVestingTs)
-            return;
-        // if (time > Number(vault.endVestingTs)) return;
+            continue;
         const element = elementRegistry.addElementMultiple({
             label: 'Vesting',
             name: 'Alpha Vault',
@@ -73,72 +75,68 @@ 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 && escrow.refunded === 0) {
-            element.addAsset({
-                address: vault.quoteMint,
-                amount: escrow.totalDeposit,
-            });
+        const baseTokenPrice = tokenPrices.get(vault.baseMint);
+        const quoteTokenPrice = tokenPrices.get(vault.quoteMint);
+        const filledRatio = new bignumber_js_1.default(vault.totalDeposit)
+            .div(vault.maxCap)
+            .toNumber();
+        if (escrow.refunded === 0 && filledRatio > 1) {
+            const amount = new bignumber_js_1.default(escrow.totalDeposit).times(1 - 1 / filledRatio);
+            if (quoteTokenPrice &&
+                amount
+                    .shiftedBy(-quoteTokenPrice.decimals)
+                    .multipliedBy(quoteTokenPrice.price)
+                    .isGreaterThan(dustFilter)) {
+                element.addAsset({
+                    address: vault.quoteMint,
+                    amount,
+                    attributes: {
+                        isClaimable: true,
+                    },
+                });
+            }
+        }
+        const shares = new bignumber_js_1.default(escrow.totalDeposit).div(vault.totalDeposit);
+        const totalAmount = new bignumber_js_1.default(vault.boughtToken).times(shares);
+        const remainingAmount = totalAmount.minus(escrow.claimedToken);
+        if (remainingAmount.isLessThan(dustFilter))
+            continue;
+        let claimableAmount = new bignumber_js_1.default(remainingAmount.toString());
+        if (time < Number(vault.endVestingTs)) {
+            const amountPerSec = new bignumber_js_1.default(totalAmount).div(Number(vault.endVestingTs) - Number(vault.startVestingTs));
+            let lastClaimedTs = escrow.lastClaimedTs.isZero()
+                ? Number(vault.startVestingTs)
+                : escrow.lastClaimedTs.toNumber();
+            if (lastClaimedTs > time)
+                lastClaimedTs = time;
+            claimableAmount = amountPerSec.times(Math.min(time, Number(vault.endVestingTs)) - lastClaimedTs);
         }
-        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);
+        if (baseTokenPrice &&
+            claimableAmount
+                .shiftedBy(-baseTokenPrice.decimals)
+                .multipliedBy(baseTokenPrice.price)
+                .isGreaterThan(dustFilter)) {
             element.addAsset({
                 address: vault.baseMint,
-                amount: totalAmount,
+                amount: claimableAmount,
                 attributes: {
+                    isClaimable: Number(vault.endVestingTs) * 1000 < Date.now(),
                     lockedUntil: Number(vault.endVestingTs) * 1000,
                 },
             });
         }
-        else {
-            // Vesting started
-            // If not refunded yet
-            const filledRatio = new bignumber_js_1.default(vault.totalDeposit)
-                .div(vault.maxCap)
-                .toNumber();
-            if (escrow.refunded === 0 && filledRatio > 1) {
-                const amount = new bignumber_js_1.default(escrow.totalDeposit).times(1 - 1 / filledRatio);
-                if (amount.isGreaterThan(dustFilter))
-                    element.addAsset({
-                        address: vault.quoteMint,
-                        amount,
-                    });
-            }
-            const shares = new bignumber_js_1.default(escrow.totalDeposit).div(vault.totalDeposit);
-            const totalAmount = new bignumber_js_1.default(vault.boughtToken).times(shares);
-            const remainingAmount = totalAmount.minus(escrow.claimedToken);
-            if (remainingAmount.isLessThan(dustFilter))
-                return;
-            let claimableAmount = new bignumber_js_1.default(remainingAmount.toString());
-            if (time < Number(vault.endVestingTs)) {
-                const amountPerSec = new bignumber_js_1.default(totalAmount).div(Number(vault.endVestingTs) - Number(vault.startVestingTs));
-                let lastClaimedTs = escrow.lastClaimedTs.isZero()
-                    ? Number(vault.startVestingTs)
-                    : escrow.lastClaimedTs.toNumber();
-                if (lastClaimedTs > time)
-                    lastClaimedTs = time;
-                claimableAmount = amountPerSec.times(Math.min(time, Number(vault.endVestingTs)) - lastClaimedTs);
-            }
-            if (claimableAmount.isGreaterThan(dustFilter)) {
-                element.addAsset({
-                    address: vault.baseMint,
-                    amount: claimableAmount,
-                    attributes: {
-                        isClaimable: true,
-                    },
-                });
-            }
-            const vestingAmount = remainingAmount.minus(claimableAmount);
-            if (vestingAmount.isGreaterThan(dustFilter)) {
-                element.addAsset({
-                    address: vault.baseMint,
-                    amount: vestingAmount,
-                });
-            }
+        const vestingAmount = remainingAmount.minus(claimableAmount);
+        if (baseTokenPrice &&
+            vestingAmount
+                .shiftedBy(-baseTokenPrice.decimals)
+                .multipliedBy(baseTokenPrice.price)
+                .isGreaterThan(dustFilter)) {
+            element.addAsset({
+                address: vault.baseMint,
+                amount: vestingAmount,
+            });
         }
-    });
+    }
     return elementRegistry.getElements(cache);
 });
 const fetcher = {

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":";AAAA,2BAA2B;AAC3B,mBAAmB;;;;;;;;;;;;;;AAEnB,+DAAuD;AACvD,gEAAqC;AAGrC,oDAAyD;AACzD,4CAA6E;AAE7E,kDAAiE;AACjE,sCAAyC;AACzC,mFAAgF;AAEhF,yBAAyB;AACzB,oCAAoC;AACpC,wBAAwB;AAExB,MAAM,UAAU,GAAG,OAAO,CAAC;AAE3B,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,qBAAY,EACZ,8BAAkB,EAClB;QACE,EAAE,QAAQ,EAAE,qBAAY,CAAC,QAAQ,EAAE;QACnC;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,EAAE;gBACV,KAAK,EAAE,KAAK;aACb;SACF;KACF,CACF,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAmB,yBAAa,EAAE;QAClE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAExB,mFAAmF;IACnF,oDAAoD;IACpD,mCAAmC;IACnC,6BAA6B;IAC7B,IAAI;IACJ,wBAAwB;IAExB,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,cAAc;YAAE,OAAO;QACnE,iDAAiD;QAEjD,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACjD,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE,MAAM,CAAC,MAAM;YAClB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;iBACjC;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;iBACjC;aACF;YACD,IAAI,EAAE,+BAA+B,KAAK,CAAC,MAAM,EAAE;SACpD,CAAC,CAAC;QAEH,0BAA0B;QAC1B,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YACxE,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,KAAK,CAAC,SAAS;gBACxB,MAAM,EAAE,MAAM,CAAC,YAAY;aAC5B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,CAAC,cAAc,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;YACvD,sCAAsC;YACtC,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC1E,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnE,OAAO,CAAC,QAAQ,CAAC;gBACf,OAAO,EAAE,KAAK,CAAC,QAAQ;gBACvB,MAAM,EAAE,WAAW;gBACnB,UAAU,EAAE;oBACV,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,IAAI;iBAC/C;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,sBAAsB;YACtB,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,YAAY,CAAC;iBAClD,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;iBACjB,QAAQ,EAAE,CAAC;YAEd,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC7C,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,CACrD,CAAC,GAAG,CAAC,GAAG,WAAW,CACpB,CAAC;gBAEF,IAAI,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC;oBAClC,OAAO,CAAC,QAAQ,CAAC;wBACf,OAAO,EAAE,KAAK,CAAC,SAAS;wBACxB,MAAM;qBACP,CAAC,CAAC;YACP,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC1E,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnE,MAAM,eAAe,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC/D,IAAI,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC;gBAAE,OAAO;YAEnD,IAAI,eAAe,GAAG,IAAI,sBAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChE,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACtC,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,CAAC,GAAG,CACjD,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAC1D,CAAC;gBACF,IAAI,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE;oBAC/C,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;oBAC9B,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,aAAa,GAAG,IAAI;oBAAE,aAAa,GAAG,IAAI,CAAC;gBAC/C,eAAe,GAAG,YAAY,CAAC,KAAK,CAClC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,aAAa,CAC3D,CAAC;YACJ,CAAC;YAED,IAAI,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9C,OAAO,CAAC,QAAQ,CAAC;oBACf,OAAO,EAAE,KAAK,CAAC,QAAQ;oBACvB,MAAM,EAAE,eAAe;oBACvB,UAAU,EAAE;wBACV,WAAW,EAAE,IAAI;qBAClB;iBACF,CAAC,CAAC;YACL,CAAC;YAED,MAAM,aAAa,GAAG,eAAe,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAC7D,IAAI,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,OAAO,CAAC,QAAQ,CAAC;oBACf,OAAO,EAAE,KAAK,CAAC,QAAQ;oBACvB,MAAM,EAAE,aAAa;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"dlmmVaultsFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/dlmm/dlmmVaultsFetcher.ts"],"names":[],"mappings":"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"}

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

@@ -2,9 +2,6 @@
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const vaultsFilters: GetProgramAccountsFilter[];
-export declare const constantPoolsFilters: GetProgramAccountsFilter[];
-export declare const stablePoolsFilters: GetProgramAccountsFilter[];
-export declare const memePoolsFilters: GetProgramAccountsFilter[];
 export declare const farmAccountFilter: (owner: string) => GetProgramAccountsFilter[];
 export declare const stakeEscrowFilter: (owner: string) => GetProgramAccountsFilter[];
 export declare const feeVaultFilter: () => GetProgramAccountsFilter[];

package/src/plugins/meteora/filters.js

@@ -1,14 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unstakeFilter = exports.feeVaultFilter = exports.stakeEscrowFilter = exports.farmAccountFilter = exports.memePoolsFilters = exports.stablePoolsFilters = exports.constantPoolsFilters = exports.vaultsFilters = void 0;
+exports.unstakeFilter = exports.feeVaultFilter = exports.stakeEscrowFilter = exports.farmAccountFilter = exports.vaultsFilters = void 0;
 exports.vaultsFilters = [{ dataSize: 10240 }];
-exports.constantPoolsFilters = [
-    { dataSize: 944 },
-];
-exports.stablePoolsFilters = [
-    { dataSize: 1387 },
-];
-exports.memePoolsFilters = [{ dataSize: 952 }];
 const farmAccountFilter = (owner) => [
     { dataSize: 200 },
     {

package/src/plugins/meteora/filters.js.map

@@ -1 +1 @@
-{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/filters.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAA+B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAElE,QAAA,oBAAoB,GAA+B;IAC9D,EAAE,QAAQ,EAAE,GAAG,EAAE;CAClB,CAAC;AAEW,QAAA,kBAAkB,GAA+B;IAC5D,EAAE,QAAQ,EAAE,IAAI,EAAE;CACnB,CAAC;AAEW,QAAA,gBAAgB,GAA+B,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;AAEzE,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B,EAAE,QAAQ,EAAE,GAAG,EAAE;IACjB;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;CACF,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEK,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,MAAM,cAAc,GAAG,GAA+B,EAAE,CAAC;IAC9D;QACE,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,aAAa,GAAG,CAC3B,WAAmB,EACS,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,WAAW;SACnB;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,aAAa,iBAYxB"}
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/filters.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAA+B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAExE,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B,EAAE,QAAQ,EAAE,GAAG,EAAE;IACjB;QACE,MAAM,EAAE;YACN,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,KAAK;SACb;KACF;CACF,CAAC;AAVW,QAAA,iBAAiB,qBAU5B;AAEK,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACe,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,KAAK;SACb;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,iBAAiB,qBAY5B;AAEK,MAAM,cAAc,GAAG,GAA+B,EAAE,CAAC;IAC9D;QACE,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,aAAa,GAAG,CAC3B,WAAmB,EACS,EAAE,CAAC;IAC/B;QACE,MAAM,EAAE;YACN,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,WAAW;SACnB;KACF;IACD;QACE,QAAQ,EAAE,GAAG;KACd;CACF,CAAC;AAZW,QAAA,aAAa,iBAYxB"}

package/src/plugins/meteora/pools/poolsJob.js

@@ -13,41 +13,27 @@ const constants_1 = require("../constants");
 const clients_1 = require("../../../utils/clients");
 const solana_1 = require("../../../utils/solana");
 const struct_1 = require("../struct");
-const filters_1 = require("../filters");
 const helpers_1 = require("../helpers");
-const poolsConfigs = [
-    {
-        pid: constants_1.poolsProgramId,
-        struct: struct_1.poolStateStruct,
-        filter: filters_1.constantPoolsFilters,
-    },
-    {
-        pid: constants_1.poolsProgramId,
-        struct: struct_1.poolStateStruct,
-        filter: filters_1.stablePoolsFilters,
-    },
-    {
-        pid: constants_1.poolsProgramId,
-        struct: struct_1.poolStateV2Struct,
-        filter: filters_1.memePoolsFilters,
-    },
-];
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const step = 100;
     const sources = [];
-    let poolsPubKeys;
+    const poolsPubKeys = (yield client.getProgramAccounts(constants_1.poolsProgramId, {
+        filters: [
+            {
+                memcmp: {
+                    offset: 0,
+                    bytes: 'hQrXeCntzbV',
+                },
+            },
+        ],
+        dataSlice: { length: 0, offset: 0 },
+    })).map((acc) => acc.pubkey);
     let poolsAccounts;
-    for (const poolConfig of poolsConfigs) {
-        poolsPubKeys = (yield client.getProgramAccounts(poolConfig.pid, {
-            filters: [...poolConfig.filter],
-            dataSlice: { length: 0, offset: 0 },
-        })).map((acc) => acc.pubkey);
-        for (let offset = 0; offset < poolsPubKeys.length; offset += step) {
-            poolsAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, poolConfig.struct, poolsPubKeys.slice(offset, offset + step).map((key) => key));
-            const lpSources = yield (0, helpers_1.getLpTokenPricesFromPoolsStates)(client, cache, poolsAccounts);
-            sources.push(...lpSources);
-        }
+    for (let offset = 0; offset < poolsPubKeys.length; offset += step) {
+        poolsAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.poolStateStruct, poolsPubKeys.slice(offset, offset + step).map((key) => key));
+        const lpSources = yield (0, helpers_1.getLpTokenPricesFromPoolsStates)(client, cache, poolsAccounts);
+        sources.push(...lpSources);
     }
     yield cache.setTokenPriceSources(sources);
 });

package/src/plugins/meteora/pools/poolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/pools/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,4CAA0D;AAC1D,oDAAyD;AACzD,kDAG+B;AAC/B,sCAA0E;AAC1E,wCAIoB;AAGpB,wCAA6D;AAE7D,MAAM,YAAY,GAAG;IACnB;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,wBAAe;QACvB,MAAM,EAAE,8BAAoB;KAC7B;IACD;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,wBAAe;QACvB,MAAM,EAAE,4BAAkB;KAC3B;IACD;QACE,GAAG,EAAE,0BAAc;QACnB,MAAM,EAAE,0BAAiB;QACzB,MAAM,EAAE,0BAAgB;KACzB;CACF,CAAC;AAEF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC;IAEjB,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,IAAI,YAAyB,CAAC;IAC9B,IAAI,aAAkD,CAAC;IACvD,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;QACtC,YAAY,GAAG,CACb,MAAM,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,GAAG,EAAE;YAC9C,OAAO,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;YAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;SACpC,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE3B,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;YAClE,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACjD,MAAM,EACN,UAAU,CAAC,MAAM,EACjB,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAC5D,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,IAAA,yCAA+B,EACrD,MAAM,EACN,KAAK,EACL,aAAa,CACd,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,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"}
+{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/pools/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,4CAA0D;AAC1D,oDAAyD;AACzD,kDAG+B;AAC/B,sCAAuD;AAGvD,wCAA6D;AAE7D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC;IAEjB,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,MAAM,YAAY,GAAG,CACnB,MAAM,MAAM,CAAC,kBAAkB,CAAC,0BAAc,EAAE;QAC9C,OAAO,EAAE;YACP;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,aAAa;iBACrB;aACF;SACF;QACD,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;KACpC,CAAC,CACH,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE3B,IAAI,aAAkD,CAAC;IAEvD,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;QAClE,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACjD,MAAM,EACN,wBAAe,EACf,YAAY,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAC5D,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,IAAA,yCAA+B,EACrD,MAAM,EACN,KAAK,EACL,aAAa,CACd,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,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/meteora/struct.d.ts

@@ -97,7 +97,7 @@ export type PartnerInfo = {
 };
 export declare const partnerInfoStruct: BeetStruct<PartnerInfo, Partial<PartnerInfo>>;
 export type PoolState = {
-    buffer: Buffer;
+    accountDiscriminator: number[];
     lpMint: PublicKey;
     tokenAMint: PublicKey;
     tokenBMint: PublicKey;
@@ -107,23 +107,8 @@ export type PoolState = {
     bVaultLp: PublicKey;
     aVaultLpBump: number;
     enabled: boolean;
-    adminTokenAFee: PublicKey;
-    adminTokenBFee: PublicKey;
-    admin: PublicKey;
-    feeLastUpdatedAt?: BigNumber;
-    padding0?: number[];
-    fees: PoolFees;
-    poolType: PoolType;
-    stake: PublicKey;
-    totalLockedLp?: BigNumber;
-    bootstrapping?: Boostrapping;
-    partnerInfo?: PartnerInfo;
-    padding2?: Padding2;
-    padding: Padding;
-    curveType: CurveType;
 };
 export declare const poolStateStruct: FixableBeetStruct<PoolState, Partial<PoolState>>;
-export declare const poolStateV2Struct: FixableBeetStruct<PoolState, Partial<PoolState>>;
 export type Farm = {
     buffer: Buffer;
     authority: PublicKey;

package/src/plugins/meteora/struct.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escrowStruct = exports.farmAccountStruct = exports.farmStruct = exports.poolStateV2Struct = exports.poolStateStruct = exports.partnerInfoStruct = exports.boostrappingStruct = exports.poolFeesStruct = exports.PoolType = exports.CurveType = exports.stableParamsStruct = exports.TokenMultiplierStruct = exports.depegStruct = exports.DepegType = exports.padding2Struct = exports.paddingStruct = exports.vaultStruct = exports.lockedProfitTrackerStruct = exports.vaultBumpsStruct = void 0;
+exports.escrowStruct = exports.farmAccountStruct = exports.farmStruct = exports.poolStateStruct = exports.partnerInfoStruct = exports.boostrappingStruct = exports.poolFeesStruct = exports.PoolType = exports.CurveType = exports.stableParamsStruct = exports.TokenMultiplierStruct = exports.depegStruct = exports.DepegType = exports.padding2Struct = exports.paddingStruct = exports.vaultStruct = exports.lockedProfitTrackerStruct = exports.vaultBumpsStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -89,27 +89,7 @@ exports.partnerInfoStruct = new beet_1.BeetStruct([
     ['pendingFeeB', solana_1.u64],
 ], (args) => args);
 exports.poolStateStruct = new beet_1.FixableBeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
-    ['lpMint', beet_solana_1.publicKey],
-    ['tokenAMint', beet_solana_1.publicKey],
-    ['tokenBMint', beet_solana_1.publicKey],
-    ['aVault', beet_solana_1.publicKey],
-    ['bVault', beet_solana_1.publicKey],
-    ['aVaultLp', beet_solana_1.publicKey],
-    ['bVaultLp', beet_solana_1.publicKey],
-    ['aVaultLpBump', beet_1.u8],
-    ['enabled', beet_1.bool],
-    ['adminTokenAFee', beet_solana_1.publicKey],
-    ['adminTokenBFee', beet_solana_1.publicKey],
-    ['admin', beet_solana_1.publicKey],
-    ['fees', exports.poolFeesStruct],
-    ['poolType', beet_1.u8],
-    ['stake', beet_solana_1.publicKey],
-    ['padding', exports.paddingStruct],
-    ['curveType', beet_1.u8],
-], (args) => args);
-exports.poolStateV2Struct = new beet_1.FixableBeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
+    ['accountDiscriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
     ['lpMint', beet_solana_1.publicKey],
     ['tokenAMint', beet_solana_1.publicKey],
     ['tokenBMint', beet_solana_1.publicKey],
@@ -119,18 +99,18 @@ exports.poolStateV2Struct = new beet_1.FixableBeetStruct([
     ['bVaultLp', beet_solana_1.publicKey],
     ['aVaultLpBump', beet_1.u8],
     ['enabled', beet_1.bool],
-    ['adminTokenAFee', beet_solana_1.publicKey],
-    ['adminTokenBFee', beet_solana_1.publicKey],
-    ['feeLastUpdatedAt', solana_1.u64],
-    ['padding0', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 24)],
-    ['fees', exports.poolFeesStruct],
-    ['poolType', beet_1.u8],
-    ['stake', beet_solana_1.publicKey],
-    ['totalLockedLp', solana_1.u64],
-    ['bootstrapping', exports.boostrappingStruct],
-    ['partnerInfo', exports.partnerInfoStruct],
-    ['padding2', exports.padding2Struct],
-    ['curveType', beet_1.u8],
+    /* ['adminTokenAFee', publicKey],
+    ['adminTokenBFee', publicKey],
+    ['feeLastUpdatedAt', u64],
+    ['padding0', uniformFixedSizeArray(u8, 24)],
+    ['fees', poolFeesStruct],
+    ['poolType', u8],
+    ['stake', publicKey],
+    ['totalLockedLp', u64],
+    ['bootstrapping', boostrappingStruct],
+    ['partnerInfo', partnerInfoStruct],
+    ['padding2', padding2Struct],
+    ['curveType', u8], */
 ], (args) => args);
 exports.farmStruct = new beet_1.BeetStruct([
     ['buffer', (0, solana_1.blob)(8)],

package/src/plugins/meteora/struct.js.map

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

package/src/plugins/oresupply/boostJob.js

@@ -16,10 +16,20 @@ const structs_1 = require("./structs");
 const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const boostAccounts = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.boostStruct, constants_1.orePid)
-        .addDataSizeFilter(structs_1.boostStruct.byteSize)
-        .addFilter('accountDiscriminator', [100, 0, 0, 0, 0, 0, 0, 0])
-        .run();
+    const [configAccounts, boostAccounts] = yield Promise.all([
+        ParsedGpa_1.ParsedGpa.build(connection, structs_1.configStruct, constants_1.orePid)
+            .addFilter('accountDiscriminator', [101, 0, 0, 0, 0, 0, 0, 0])
+            .run(),
+        ParsedGpa_1.ParsedGpa.build(connection, structs_1.boostStruct, constants_1.orePid)
+            .addDataSizeFilter()
+            .addFilter('accountDiscriminator', [100, 0, 0, 0, 0, 0, 0, 0])
+            .run(),
+    ]);
+    const config = Object.assign(Object.assign({}, configAccounts[0]), { boosts: configAccounts[0].boosts.filter((b) => b.toString() !== '11111111111111111111111111111111') });
+    yield cache.setItem('config', config, {
+        prefix: constants_1.platformId,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
     yield cache.setItem('boosts', boostAccounts, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/oresupply/boostJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"boostJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/boostJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAiD;AACjD,iDAAsD;AACtD,uCAAwC;AACxC,kEAA+D;AAE/D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAW,EAAE,kBAAM,CAAC;SACzE,iBAAiB,CAAC,qBAAW,CAAC,QAAQ,CAAC;SACvC,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC7D,GAAG,EAAE,CAAC;IAET,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE;QAC3C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,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"}
+{"version":3,"file":"boostJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/boostJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAiD;AACjD,iDAAsD;AACtD,uCAA8D;AAC9D,kEAA+D;AAE/D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxD,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,sBAAY,EAAE,kBAAM,CAAC;aAC9C,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC7D,GAAG,EAAE;QACR,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAW,EAAE,kBAAM,CAAC;aAC7C,iBAAiB,EAAE;aACnB,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;aAC7D,GAAG,EAAE;KACT,CAAC,CAAC;IAEH,MAAM,MAAM,mCACP,cAAc,CAAC,CAAC,CAAC,KACpB,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,kCAAkC,CAC3D,GACF,CAAC;IAEF,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE;QACpC,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE;QAC3C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,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/oresupply/stakeFetcher.js

@@ -21,9 +21,16 @@ const boostMemo = new MemoizedCache_1.MemoizedCache('boosts', {
     prefix: constants_1.platformId,
     networkId: portfolio_core_1.NetworkId.solana,
 });
+const configMemo = new MemoizedCache_1.MemoizedCache('config', {
+    prefix: constants_1.platformId,
+    networkId: portfolio_core_1.NetworkId.solana,
+});
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
-    const boostAccounts = yield boostMemo.getItem(cache);
+    const [boostAccounts, config] = yield Promise.all([
+        boostMemo.getItem(cache),
+        configMemo.getItem(cache),
+    ]);
     if (!boostAccounts)
         throw new Error('Boosts not found in cache');
     const stakeAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.stakeStruct, (0, helpers_1.getStakePdas)(owner, boostAccounts.map((b) => b.pubkey)));

package/src/plugins/oresupply/stakeFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"stakeFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/stakeFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAAkD;AAElD,iDAAsD;AACtD,+CAAmE;AACnE,gFAA6E;AAC7E,uCAAqD;AACrD,kEAA+D;AAC/D,uCAAyC;AAEzC,MAAM,SAAS,GAAG,IAAI,6BAAa,CAAgB,QAAQ,EAAE;IAC3D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACrD,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEjE,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,UAAU,EACV,qBAAW,EACX,IAAA,sBAAY,EACV,KAAK,EACL,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CACnC,CACF,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CACzC,CAAC;QACF,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;YAC/B,GAAG,EAAE,GAAG,CAAC,MAAM;YACf,IAAI,EAAE,4BAA4B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YAC5D,UAAU,EAAE;gBACV;oBACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACnC,IAAI,EAAE,MAAM;iBACb;aACF;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC;YACX,OAAO,EAAE,QAAQ,CAAC,IAAI;YACtB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;QAEH,GAAG,CAAC,cAAc,CAAC;YACjB,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,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":"stakeFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/oresupply/stakeFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAAkD;AAElD,iDAAsD;AACtD,+CAAmE;AACnE,gFAA6E;AAC7E,uCAA6D;AAC7D,kEAA+D;AAC/D,uCAAyC;AAEzC,MAAM,SAAS,GAAG,IAAI,6BAAa,CAAgB,QAAQ,EAAE;IAC3D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AACH,MAAM,UAAU,GAAG,IAAI,6BAAa,CAAS,QAAQ,EAAE;IACrD,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;QACxB,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC;KAC1B,CAAC,CAAC;IACH,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEjE,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,UAAU,EACV,qBAAW,EACX,IAAA,sBAAY,EACV,KAAK,EACL,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CACnC,CACF,CAAC;IACF,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IACH,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CACzC,CAAC;QACF,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;YAC/B,GAAG,EAAE,GAAG,CAAC,MAAM;YACf,IAAI,EAAE,4BAA4B,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YAC5D,UAAU,EAAE;gBACV;oBACE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACnC,IAAI,EAAE,MAAM;iBACb;aACF;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,QAAQ,CAAC;YACX,OAAO,EAAE,QAAQ,CAAC,IAAI;YACtB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;QAEH,GAAG,CAAC,cAAc,CAAC;YACjB,OAAO,EAAE,mBAAO;YAChB,MAAM,EAAE,GAAG,CAAC,OAAO;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/parcl/helpersAirdrop.js

@@ -22,6 +22,7 @@ const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo"
 const structs_1 = require("../jupiter/launchpad/structs");
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const clients_1 = require("../../utils/clients");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
 function fetchAllocation(owner, cache) {
     return __awaiter(this, void 0, void 0, function* () {
         const cachedAllocation = yield cache.getItem(owner, {
@@ -68,20 +69,28 @@ function fetchAirdrop(owner, client, cache) {
     return __awaiter(this, void 0, void 0, function* () {
         const allocation = yield fetchAllocation(owner, cache);
         const amount = !allocation.merkleTree ? 0 : allocation.amount;
-        let isClaimed = false;
+        let claims = [];
+        let claimStatusPubkey;
+        let claimStatusAccount;
         if (amount > 0 && allocation.merkleTree) {
-            const claimStatusPubkey = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, allocation.merkleTree, constants_1.distributorProgram);
-            const claimStatusAccount = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, claimStatusPubkey);
-            isClaimed = claimStatusAccount !== null;
+            claimStatusPubkey = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, allocation.merkleTree, constants_1.distributorProgram);
+            claimStatusAccount = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(client, structs_1.claimStatusStruct, claimStatusPubkey);
+            if (claimStatusAccount) {
+                claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimStatusPubkey, constants_1.prclMint);
+            }
         }
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: constants_1.airdropStatics,
             items: [
                 {
                     amount,
-                    isClaimed,
+                    isClaimed: claimStatusAccount !== null,
                     label: 'PRCL',
                     address: constants_1.prclMint,
+                    claims,
+                    ref: claimStatusAccount && claimStatusPubkey
+                        ? claimStatusPubkey.toString()
+                        : undefined,
                 },
             ],
         });

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

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

package/src/plugins/solayer/airdropFetcher.js

@@ -16,11 +16,12 @@ 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 tx_parser_1 = require("@sonarwatch/tx-parser");
 const web3_js_1 = require("@solana/web3.js");
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
+const solana_1 = require("../../utils/solana");
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     let res;
@@ -53,11 +54,25 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
             ],
         });
     const totalAmount = new bignumber_js_1.default(res.data.totalAmount);
-    // This is for test purpose
-    const claimAccount = new web3_js_1.PublicKey('35YYQV8wTUWxKoyMSAzhLSshxYSuiWZmtnsb94asAZfk');
-    const claimSignatures = yield (0, tx_parser_1.getSignatures)(client, claimAccount.toString());
-    const claimTransaction = yield (0, tx_parser_1.getTransactions)(client, claimSignatures.map((s) => s.signature));
-    const claimTransactionParsed = claimTransaction.map((t) => (0, tx_parser_1.parseTransaction)(t, owner));
+    const claimAccounts = yield (0, solana_1.getProgramAccounts)(client, new web3_js_1.PublicKey('ARDPkhymCbfdan375FCgPnBJQvUfHeb7nHVdBfwWSxrp'), [
+        {
+            memcmp: {
+                offset: 0,
+                bytes: 'NiUarf1ngHA',
+            },
+        },
+        {
+            memcmp: {
+                offset: 9,
+                bytes: owner,
+            },
+        },
+    ]);
+    const claimAccount = claimAccounts[0];
+    let claims = [];
+    if (claimAccount) {
+        claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimAccount.pubkey, constants_1.layerMint);
+    }
     return (0, AirdropFetcher_1.getAirdropRaw)({
         statics: constants_1.airdropStatics,
         items: [
@@ -66,20 +81,8 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
                 isClaimed: false,
                 label: 'LAYER',
                 address: constants_1.layerMint,
-                claims: claimTransactionParsed.flatMap((t) => {
-                    var _a;
-                    if (t && t.blockTime) {
-                        const layerChange = (_a = t === null || t === void 0 ? void 0 : t.balanceChanges.find((b) => b.address === constants_1.layerMint)) === null || _a === void 0 ? void 0 : _a.change;
-                        if (layerChange)
-                            return {
-                                amount: layerChange,
-                                date: t.blockTime * 1000,
-                                txId: t.signature,
-                            };
-                    }
-                    return [];
-                }),
-                ref: '35YYQV8wTUWxKoyMSAzhLSshxYSuiWZmtnsb94asAZfk',
+                claims,
+                ref: claimAccount ? claimAccount.pubkey.toString() : undefined,
             },
         ],
     });