@sonarwatch/portfolio-plugins 0.15.29 → 0.15.31

package/src/plugins/fluxbeam/poolsJob.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
@@ -16,30 +19,31 @@ const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const structs_1 = require("./structs");
 const getLpTokenSourceRaw_1 = require("../../utils/misc/getLpTokenSourceRaw");
+const getCachedDecimalsForToken_1 = require("../../utils/misc/getCachedDecimalsForToken");
+const sleep_1 = __importDefault(require("../../utils/misc/sleep"));
 const tokenAccountsToExclude = [
     'F5LQTC4G9kBsMKsXtHgf9RqR15k3JB8K3smR73VB9pzY',
     '3zAvJPHBX42kc1htJc6RFihhpnQxP5KqpqqkrTEUhZ9S',
 ];
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const connection = (0, clients_1.getClientSolana)();
     const allPoolsPubkeys = yield connection.getProgramAccounts(new web3_js_1.PublicKey(constants_1.fluxbeamPoolsPid), {
         filters: [{ dataSize: structs_1.poolStruct.byteSize }],
         dataSlice: { length: 0, offset: 0 },
     });
+    yield (0, sleep_1.default)(5000);
     const step = 100;
-    let tempPools;
     const sources = [];
     for (let offset = 0; offset < allPoolsPubkeys.length; offset += step) {
         const tempTokenAccountsMap = new Map();
-        const tempTokenMintsAccountsMap = new Map();
         const tempTokenMints = [];
         const tempTokenAddresses = new Set();
         const tempsReserveAccounts = [];
         const tempsPoolMints = [];
-        tempPools = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.poolStruct, allPoolsPubkeys.slice(offset, offset + step).map((res) => res.pubkey));
-        tempPools = tempPools.filter((pool) => pool === null || pool === void 0 ? void 0 : pool.isInitialized);
+        const tempPools = yield (0, solana_1.getParsedMultipleAccountsInfo)(connection, structs_1.poolStruct, allPoolsPubkeys.slice(offset, offset + step).map((res) => res.pubkey));
         tempPools.forEach((pool) => {
-            if (pool) {
+            if (pool && pool.isInitialized) {
                 tempTokenMints.push(...[pool.tokenAMint, pool.tokenBMint]);
                 tempTokenAddresses.add(pool.tokenAMint.toString());
                 tempTokenAddresses.add(pool.tokenBMint.toString());
@@ -47,26 +51,18 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 tempsPoolMints.push(...[pool.poolMint]);
             }
         });
-        const [tokenAccounts, poolMintsAccounts, tokenMintsAccounts, tokenPriceById,] = yield Promise.all([
+        const tokenPrices = yield cache.getTokenPricesAsMap(tempTokenAddresses, portfolio_core_1.NetworkId.solana);
+        const tokensMissingDecimals = Array.from(tempTokenAddresses).filter((t) => !tokenPrices.get(t) && !tokenAccountsToExclude.includes(t));
+        const missingDecimals = yield Promise.all(tokensMissingDecimals.map((t) => (0, getCachedDecimalsForToken_1.getCachedDecimalsForToken)(cache, t, portfolio_core_1.NetworkId.solana)));
+        const decimalsByMissingToken = new Map();
+        missingDecimals.forEach((d, index) => {
+            decimalsByMissingToken.set(tokensMissingDecimals[index], d);
+        });
+        const [tokenAccounts, poolMintsAccounts, tokenPriceById] = yield Promise.all([
             (0, solana_1.getParsedMultipleAccountsInfo)(connection, solana_1.tokenAccountStruct, tempsReserveAccounts),
             (0, solana_1.getParsedMultipleAccountsInfo)(connection, solana_1.mintAccountStruct, tempsPoolMints),
-            (0, solana_1.getParsedMultipleAccountsInfo)(connection, solana_1.mintAccountStruct, Array.from(tempTokenAddresses)
-                .map((t) => {
-                if (!tokenAccountsToExclude.includes(t)) {
-                    return new web3_js_1.PublicKey(t);
-                }
-                return [];
-            })
-                .flat()),
             cache.getTokenPricesAsMap(tempTokenAddresses, portfolio_core_1.NetworkId.solana),
         ]);
-        if (!tokenMintsAccounts)
-            continue;
-        tokenMintsAccounts.forEach((tokenMintAccount) => {
-            if (!tokenMintAccount)
-                return;
-            tempTokenMintsAccountsMap.set(tokenMintAccount.pubkey.toString(), tokenMintAccount);
-        });
         tokenAccounts.forEach((tokenAccount) => {
             if (!tokenAccount)
                 return;
@@ -83,9 +79,11 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             const tokenAccountB = tempTokenAccountsMap.get(pool.tokenB.toString());
             if (!tokenAccountA || !tokenAccountB)
                 continue;
-            const mintAccountA = tempTokenMintsAccountsMap.get(pool.tokenAMint.toString());
-            const mintAccountB = tempTokenMintsAccountsMap.get(pool.tokenBMint.toString());
-            if (!mintAccountA || !mintAccountB)
+            const decimalA = ((_a = tokenPriceById.get(pool.tokenAMint.toString())) === null || _a === void 0 ? void 0 : _a.decimals) ||
+                decimalsByMissingToken.get(pool.tokenAMint.toString());
+            const decimalB = ((_b = tokenPriceById.get(pool.tokenBMint.toString())) === null || _b === void 0 ? void 0 : _b.decimals) ||
+                decimalsByMissingToken.get(pool.tokenBMint.toString());
+            if (!decimalA || !decimalB)
                 continue;
             const tokenPriceA = tokenPriceById.get(pool.tokenAMint.toString());
             const tokenPriceB = tokenPriceById.get(pool.tokenBMint.toString());
@@ -101,14 +99,14 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 poolUnderlyingsRaw: [
                     {
                         address: pool.tokenAMint.toString(),
-                        decimals: mintAccountA.decimals,
+                        decimals: decimalA,
                         reserveAmountRaw: tokenAccountA.amount,
                         tokenPrice: tokenPriceA,
                         weight: 0.5,
                     },
                     {
                         address: pool.tokenBMint.toString(),
-                        decimals: mintAccountB.decimals,
+                        decimals: decimalB,
                         reserveAmountRaw: tokenAccountB.amount,
                         tokenPrice: tokenPriceB,
                         weight: 0.5,
@@ -124,7 +122,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_1.platformId}-pools`,
     executor,
-    labels: ['normal'],
+    labels: ['slow'],
 };
 exports.default = job;
 //# sourceMappingURL=poolsJob.js.map

package/src/plugins/fluxbeam/poolsJob.js.map

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

package/src/plugins/hawksight/positionsFetcher.js

@@ -19,12 +19,9 @@ const helper_1 = require("./helper");
 const obligationsFetcher_1 = __importDefault(require("../save/obligationsFetcher"));
 const dlmmPositionsFetcher_1 = __importDefault(require("../meteora/dlmm/dlmmPositionsFetcher"));
 const solana_1 = __importDefault(require("../tokens/fetchers/solana"));
-const getWhirlpoolPositions_1 = require("../orca/getWhirlpoolPositions");
-const getSolanaDasEndpoint_1 = __importDefault(require("../../utils/clients/getSolanaDasEndpoint"));
-const getAssetsByOwnerDas_1 = require("../../utils/solana/das/getAssetsByOwnerDas");
-const heliusAssetToAssetCollectible_1 = require("../../utils/solana/das/heliusAssetToAssetCollectible");
 const constants_2 = require("../marinade/constants");
 const hasTransactions_1 = require("../../utils/hasTransactions");
+const whirlpoolFetcher_1 = __importDefault(require("../orca/whirlpoolFetcher"));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const derivedAddresses = (0, helper_1.getHawksightUserPdas)(new web3_js_1.PublicKey(owner));
     const hasAnyTransactions = yield Promise.all([
@@ -33,31 +30,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     ]).then((results) => results[0] || results[1]);
     if (!hasAnyTransactions)
         return [];
-    const dasUrl = (0, getSolanaDasEndpoint_1.default)();
-    const displayOptions = {
-        showCollectionMetadata: true,
-        showUnverifiedCollections: true,
-        showInscription: false,
-        showNativeBalance: false,
-        showGrandTotal: false,
-        showFungible: true,
-    };
-    const heliusAssets = (yield Promise.all([
-        (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(dasUrl, derivedAddresses[0].toString(), displayOptions),
-        (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(dasUrl, derivedAddresses[1].toString(), displayOptions),
-    ])).flat();
-    const collectibles = [];
-    heliusAssets.forEach((asset) => {
-        const collectible = (0, heliusAssetToAssetCollectible_1.heliusAssetToAssetCollectible)(asset);
-        if (collectible)
-            collectibles.push(collectible);
-    });
     const portfolioElements = (yield Promise.all([
         // This handles Kamino, Saber, Marinade
         solana_1.default.executor(derivedAddresses[0].toString(), cache),
         solana_1.default.executor(derivedAddresses[1].toString(), cache),
         // This handles Orca
-        (0, getWhirlpoolPositions_1.getWhirlpoolPositions)(cache, collectibles),
+        whirlpoolFetcher_1.default.executor(derivedAddresses[0].toString(), cache),
+        whirlpoolFetcher_1.default.executor(derivedAddresses[1].toString(), cache),
         // This handles Save
         obligationsFetcher_1.default.executor(derivedAddresses[0].toString(), cache),
         obligationsFetcher_1.default.executor(derivedAddresses[1].toString(), cache),

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

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

package/src/plugins/helium/getHeliumPositions.d.ts

@@ -0,0 +1,3 @@
+import { ParsedAccount, TokenAccount } from '../../utils/solana';
+import { Cache } from '../../Cache';
+export declare const getHeliumPositions: (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;

package/src/plugins/helium/getHeliumPositions.js

@@ -0,0 +1,52 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHeliumPositions = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const clients_1 = require("../../utils/clients");
+const solana_1 = require("../../utils/solana");
+const constants_1 = require("./constants");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const structs_1 = require("./structs");
+const constants_2 = require("../daos/constants");
+const helpers_1 = require("../daos/helpers");
+const getHeliumPositions = (potentialTokens, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!potentialTokens.length)
+        return [];
+    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.stakeRegistryId)[0]);
+    const client = (0, clients_1.getClientSolana)();
+    const accounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.positionDataStruct, positionsProgramAddress);
+    if (!accounts.length)
+        return [];
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_2.heliumPlatformId);
+    accounts.forEach((account) => {
+        if (!account)
+            return;
+        const element = elementRegistry.addElementMultiple({
+            label: 'Deposit',
+            ref: account.pubkey,
+            link: `https://heliumvote.com/hnt/positions/${account.pubkey}`,
+            sourceRefs: [{ name: 'Vault', address: account.registrar.toString() }],
+        });
+        const lockedUntil = (0, helpers_1.getLockedUntil)(account.lockup.startTs, account.lockup.endTs, account.lockup.kind);
+        element.addAsset({
+            address: 'hntyVP6YFm1Hg25TN9WGLqM12b8TQmcknKrdu1oxWux',
+            amount: account.amountDepositedNative,
+            attributes: {
+                lockedUntil,
+            },
+        });
+    });
+    return elementRegistry.getElements(cache);
+});
+exports.getHeliumPositions = getHeliumPositions;
+//# sourceMappingURL=getHeliumPositions.js.map

package/src/plugins/helium/getHeliumPositions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHeliumPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/helium/getHeliumPositions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,+DAAuD;AACvD,iDAAsD;AACtD,+CAI4B;AAC5B,2CAA8C;AAC9C,gFAA6E;AAE7E,uCAA+C;AAC/C,iDAAqD;AACrD,6CAAiD;AAE1C,MAAM,kBAAkB,GAAG,CAChC,eAA8C,EAC9C,KAAY,EACZ,EAAE;IACF,IAAI,CAAC,eAAe,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEvC,MAAM,uBAAuB,GAAG,eAAe,CAAC,GAAG,CACjD,CAAC,OAAO,EAAE,EAAE,CACV,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAClD,2BAAe,CAChB,CAAC,CAAC,CAAC,CACP,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,IAAA,sCAA6B,EAClD,MAAM,EACN,4BAAkB,EAClB,uBAAuB,CACxB,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,eAAe,GAAG,IAAI,iCAAe,CACzC,0BAAS,CAAC,MAAM,EAChB,4BAAgB,CACjB,CAAC;IAEF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;YACjD,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,OAAO,CAAC,MAAM;YACnB,IAAI,EAAE,wCAAwC,OAAO,CAAC,MAAM,EAAE;YAC9D,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;SACvE,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAA,wBAAc,EAChC,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,KAAK,EACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CACpB,CAAC;QAEF,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,6CAA6C;YACtD,MAAM,EAAE,OAAO,CAAC,qBAAqB;YACrC,UAAU,EAAE;gBACV,WAAW;aACZ;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAvDW,QAAA,kBAAkB,sBAuD7B"}

package/src/plugins/helium/positionsFetcher.d.ts

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

package/src/plugins/helium/positionsFetcher.js

@@ -0,0 +1,26 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
+const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
+const getHeliumPositions_1 = require("./getHeliumPositions");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner)).filter((x) => x.amount.isEqualTo(1));
+    return (0, getHeliumPositions_1.getHeliumPositions)(potentialTokens, cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-positions`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=positionsFetcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/helium/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,wFAAqF;AACrF,6DAA0D;AAE1D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1E,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CACtB,CAAC;IAEF,OAAO,IAAA,uCAAkB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/kamino/airdropHelpers.js

@@ -16,15 +16,7 @@ const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const clients_1 = require("../../utils/clients");
 const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
 const structs_1 = require("../jupiter/launchpad/structs");
-const Memoized_1 = require("../../utils/misc/Memoized");
-const claimsMemos = {};
-const getCachedClaims = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!claimsMemos[owner]) {
-        claimsMemos[owner] = new Memoized_1.Memoized(() => getClaims(owner));
-    }
-    return claimsMemos[owner].getItem();
-});
-exports.getCachedClaims = getCachedClaims;
+const MemoryCache_1 = require("../../utils/misc/MemoryCache");
 const getClaims = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const accounts = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.claimStatusStruct, constants_1.kaminoAirdropProgram)
@@ -40,4 +32,7 @@ const getClaims = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     }
     return claims;
 });
+const memoCollection = new MemoryCache_1.MemoryCache(getClaims);
+const getCachedClaims = (owner) => __awaiter(void 0, void 0, void 0, function* () { return memoCollection.getItem(owner); });
+exports.getCachedClaims = getCachedClaims;
 //# sourceMappingURL=airdropHelpers.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"airdropHelpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/airdropHelpers.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA4C;AAC5C,2CAA6D;AAC7D,kEAA+D;AAC/D,iDAAsD;AACtD,0FAAuF;AACvF,0DAAiE;AACjE,wDAAqD;AAErD,MAAM,WAAW,GAAyC,EAAE,CAAC;AAEtD,MAAM,eAAe,GAAG,CAAO,KAAa,EAAE,EAAE;IACrD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,WAAW,CAAC,KAAK,CAAC,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;AACtC,CAAC,CAAA,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEF,MAAM,SAAS,GAAG,CAAO,KAAa,EAAE,EAAE;IACxC,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CACpC,MAAM,EACN,2BAAiB,EACjB,gCAAoB,CACrB;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;SACxE,SAAS,CAAC,UAAU,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC3C,GAAG,EAAE,CAAC;IAET,IAAI,MAAM,GAAY,EAAE,CAAC;IACzB,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,GAAG,CACP,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5B,IAAA,2CAAoB,EAClB,8CAA8C,EAC9C,OAAO,CAAC,MAAM,EACd,oBAAQ,CACT;YACD,IAAA,2CAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,oBAAQ,CAAC;SACtD,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC"}
+{"version":3,"file":"airdropHelpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kamino/airdropHelpers.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA4C;AAC5C,2CAA6D;AAC7D,kEAA+D;AAC/D,iDAAsD;AACtD,0FAAuF;AACvF,0DAAiE;AACjE,8DAA2D;AAE3D,MAAM,SAAS,GAAG,CAAO,KAAa,EAAE,EAAE;IACxC,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CACpC,MAAM,EACN,2BAAiB,EACjB,gCAAoB,CACrB;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;SACxE,SAAS,CAAC,UAAU,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC3C,GAAG,EAAE,CAAC;IAET,IAAI,MAAM,GAAY,EAAE,CAAC;IACzB,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,GAAG,CACP,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5B,IAAA,2CAAoB,EAClB,8CAA8C,EAC9C,OAAO,CAAC,MAAM,EACd,oBAAQ,CACT;YACD,IAAA,2CAAoB,EAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,oBAAQ,CAAC;SACtD,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CAAU,SAAS,CAAC,CAAC;AAEpD,MAAM,eAAe,GAAG,CAAO,KAAa,EAAE,EAAE,kDACrD,OAAA,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AADnB,QAAA,eAAe,mBACI"}

package/src/plugins/magiceden/bidsFetcher.d.ts

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

package/src/plugins/magiceden/bidsFetcher.js

@@ -0,0 +1,58 @@
+"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 web3_js_1 = require("@solana/web3.js");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const accounts = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.poolStruct, constants_1.ammPid)
+        .addFilter('discriminator', [241, 154, 109, 4, 17, 177, 109, 188])
+        .addFilter('owner', new web3_js_1.PublicKey(owner))
+        .addFilter('sharedEscrowCount', 0)
+        .run();
+    if (!accounts || accounts.length === 0)
+        return [];
+    const totalAmount = accounts.reduce((sum, acc) => {
+        // This means it will use the escrow account to fund the bid
+        // We don't count it because we already cover it in the escrow fetcher
+        if (acc.sharedEscrowCount.toNumber() === 1)
+            return sum;
+        if (acc.expiry.toNumber() > Date.now() / 1000)
+            return sum;
+        return sum.plus(acc.spotPrice);
+    }, new bignumber_js_1.default(0));
+    const registry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const element = registry.addElementMultiple({
+        label: 'Deposit',
+        name: 'Bids',
+    });
+    element.addAsset({
+        address: portfolio_core_1.solanaNativeAddress,
+        amount: totalAmount,
+    });
+    return registry.getElements(cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-bids`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=bidsFetcher.js.map

package/src/plugins/magiceden/bidsFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bidsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/bidsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAA4E;AAC5E,6CAA4C;AAC5C,gEAAqC;AAGrC,2CAAiD;AACjD,iDAAsD;AACtD,gFAA6E;AAC7E,kEAA+D;AAC/D,uCAAuC;AAEvC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAU,EAAE,kBAAM,CAAC;SAC/D,SAAS,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SACjE,SAAS,CAAC,OAAO,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SACxC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC;SACjC,GAAG,EAAE,CAAC;IAET,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC/C,4DAA4D;QAC5D,sEAAsE;QACtE,IAAI,GAAG,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QACvD,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI;YAAE,OAAO,GAAG,CAAC;QAE1D,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAErB,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;QAC1C,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,oCAAmB;QAC5B,MAAM,EAAE,WAAW;KACpB,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -9,4 +9,5 @@ export declare const m2Program: PublicKey;
 export declare const m2AuctionHouse: PublicKey;
 export declare const stakingPid: PublicKey;
 export declare const airdropApi = "https://mefoundation.com/api/trpc/allocation.queryClaimStatus?input=";
+export declare const ammPid: PublicKey;
 export declare const airdropStatics: AirdropStatics;

package/src/plugins/magiceden/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.airdropStatics = exports.airdropApi = exports.stakingPid = exports.m2AuctionHouse = exports.m2Program = exports.m2Prefix = exports.meMint = exports.platformId = void 0;
+exports.airdropStatics = exports.ammPid = exports.airdropApi = exports.stakingPid = exports.m2AuctionHouse = exports.m2Program = exports.m2Prefix = exports.meMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'magiceden';
 exports.meMint = 'MEFNBXixkEbait3xn9bkm8WsJzXtVsaJEn4c8Sam21u';
@@ -9,6 +9,7 @@ exports.m2Program = new web3_js_1.PublicKey('M2mx93ekt1fmXSVkTrUL9xVFHkmME8HTUi5
 exports.m2AuctionHouse = new web3_js_1.PublicKey('E8cU1WiRWjanGxmn96ewBgk9vPTcL6AEZ1t6F6fkgUWe');
 exports.stakingPid = new web3_js_1.PublicKey('veTbq5fF2HWYpgmkwjGKTYLVpY6miWYYmakML7R7LRf');
 exports.airdropApi = 'https://mefoundation.com/api/trpc/allocation.queryClaimStatus?input=';
+exports.ammPid = new web3_js_1.PublicKey('mmm3XBJg5gk8XJxEKBvdgptZz6SgK4tXvn36sodowMc');
 exports.airdropStatics = {
     claimLink: 'https://mefoundation.com/link',
     emitterLink: 'https://mefoundation.com/',

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,MAAM,GAAG,6CAA6C,CAAC;AAEvD,QAAA,QAAQ,GAAG,IAAI,CAAC;AAChB,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AACW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AACW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AACW,QAAA,UAAU,GACrB,sEAAsE,CAAC;AAE5D,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,+BAA+B;IAC1C,WAAW,EAAE,2BAA2B;IACxC,WAAW,EAAE,WAAW;IACxB,EAAE,EAAE,mBAAmB;IACvB,KAAK,EACH,+EAA+E;IACjF,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,WAAW,CAAC;AACzB,QAAA,MAAM,GAAG,6CAA6C,CAAC;AAEvD,QAAA,QAAQ,GAAG,IAAI,CAAC;AAChB,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AACW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AACW,QAAA,UAAU,GAAG,IAAI,mBAAS,CACrC,6CAA6C,CAC9C,CAAC;AACW,QAAA,UAAU,GACrB,sEAAsE,CAAC;AAE5D,QAAA,MAAM,GAAG,IAAI,mBAAS,CACjC,6CAA6C,CAC9C,CAAC;AACW,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,+BAA+B;IAC1C,WAAW,EAAE,2BAA2B;IACxC,WAAW,EAAE,WAAW;IACxB,EAAE,EAAE,mBAAmB;IACvB,KAAK,EACH,+EAA+E;IACjF,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC"}

package/src/plugins/magiceden/index.js

@@ -7,7 +7,8 @@ exports.airdropFetchers = exports.fetchers = exports.jobs = void 0;
 const escrowFetcher_1 = __importDefault(require("./escrowFetcher"));
 const stakingFetcher_1 = __importDefault(require("./stakingFetcher"));
 const airdropFetcher_1 = require("./airdropFetcher");
+const bidsFetcher_1 = __importDefault(require("./bidsFetcher"));
 exports.jobs = [];
-exports.fetchers = [escrowFetcher_1.default, stakingFetcher_1.default];
+exports.fetchers = [escrowFetcher_1.default, stakingFetcher_1.default, bidsFetcher_1.default];
 exports.airdropFetchers = [airdropFetcher_1.airdropFetcher];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/index.ts"],"names":[],"mappings":";;;;;;AAGA,oEAA4C;AAC5C,sEAA8C;AAC9C,qDAAkD;AAErC,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,uBAAa,EAAE,wBAAc,CAAC,CAAC;AACtD,QAAA,eAAe,GAAqB,CAAC,+BAAc,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/index.ts"],"names":[],"mappings":";;;;;;AAGA,oEAA4C;AAC5C,sEAA8C;AAC9C,qDAAkD;AAClD,gEAAwC;AAE3B,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,uBAAa,EAAE,wBAAc,EAAE,qBAAW,CAAC,CAAC;AACnE,QAAA,eAAe,GAAqB,CAAC,+BAAc,CAAC,CAAC"}

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

@@ -16,3 +16,33 @@ export type LockUp = {
     padding: number[];
 };
 export declare const lockUpStruct: BeetStruct<LockUp, Partial<LockUp>>;
+export type Allowlist = {
+    kind: number;
+    value: PublicKey;
+};
+export declare const allowlistStruct: BeetStruct<Allowlist, Partial<Allowlist>>;
+export type Pool = {
+    discriminator: number[];
+    spotPrice: BigNumber;
+    curveType: number;
+    curveDelta: BigNumber;
+    reinvestFulfillBuy: boolean;
+    reinvestFulfillSell: boolean;
+    expiry: BigNumber;
+    lpFeeBp: number;
+    referral: PublicKey;
+    referralBp: number;
+    buysideCreatorRoyaltyBp: number;
+    cosignerAnnotation: number[];
+    sellsideAssetAmount: BigNumber;
+    lpFeeEarned: BigNumber;
+    owner: PublicKey;
+    cosigner: PublicKey;
+    uuid: PublicKey;
+    paymentMint: PublicKey;
+    allowlists: Allowlist[];
+    buysidePaymentAmount: BigNumber;
+    sharedEscrowAccount: PublicKey;
+    sharedEscrowCount: BigNumber;
+};
+export declare const poolStruct: BeetStruct<Pool, Partial<Pool>>;

package/src/plugins/magiceden/structs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lockUpStruct = void 0;
+exports.poolStruct = exports.allowlistStruct = exports.lockUpStruct = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -15,4 +15,32 @@ exports.lockUpStruct = new beet_1.BeetStruct([
     ['targetVotingPct', beet_1.u16],
     ['padding', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 240)],
 ], (args) => args);
+exports.allowlistStruct = new beet_1.BeetStruct([
+    ['kind', beet_1.u8],
+    ['value', beet_solana_1.publicKey],
+], (args) => args);
+exports.poolStruct = new beet_1.BeetStruct([
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['spotPrice', solana_1.u64],
+    ['curveType', beet_1.u8],
+    ['curveDelta', solana_1.u64],
+    ['reinvestFulfillBuy', beet_1.u8], // bool as u8
+    ['reinvestFulfillSell', beet_1.u8], // bool as u8
+    ['expiry', solana_1.i64],
+    ['lpFeeBp', beet_1.u16],
+    ['referral', beet_solana_1.publicKey],
+    ['referralBp', beet_1.u16],
+    ['buysideCreatorRoyaltyBp', beet_1.u16],
+    ['cosignerAnnotation', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)],
+    ['sellsideAssetAmount', solana_1.u64],
+    ['lpFeeEarned', solana_1.u64],
+    ['owner', beet_solana_1.publicKey],
+    ['cosigner', beet_solana_1.publicKey],
+    ['uuid', beet_solana_1.publicKey],
+    ['paymentMint', beet_solana_1.publicKey],
+    ['allowlists', (0, beet_1.uniformFixedSizeArray)(exports.allowlistStruct, 6)],
+    ['buysidePaymentAmount', solana_1.u64],
+    ['sharedEscrowAccount', beet_solana_1.publicKey],
+    ['sharedEscrowCount', solana_1.u64],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/structs.ts"],"names":[],"mappings":";;;AAAA,oDAKmC;AACnC,kEAA6D;AAG7D,+CAAoD;AAcvC,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,IAAI,EAAE,uBAAS,CAAC;IACjB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,kBAAkB,EAAE,UAAG,CAAC;IACzB,CAAC,iBAAiB,EAAE,UAAG,CAAC;IACxB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,GAAG,CAAC,CAAC;CAC5C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/structs.ts"],"names":[],"mappings":";;;AAAA,oDAKmC;AACnC,kEAA6D;AAG7D,+CAAoD;AAcvC,QAAA,YAAY,GAAG,IAAI,iBAAU,CACxC;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,IAAI,EAAE,uBAAS,CAAC;IACjB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,kBAAkB,EAAE,UAAG,CAAC;IACzB,CAAC,iBAAiB,EAAE,UAAG,CAAC;IACxB,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,GAAG,CAAC,CAAC;CAC5C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAc,CACzB,CAAC;AAQW,QAAA,eAAe,GAAG,IAAI,iBAAU,CAC3C;IACE,CAAC,MAAM,EAAE,SAAE,CAAC;IACZ,CAAC,OAAO,EAAE,uBAAS,CAAC;CACrB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAiB,CAC5B,CAAC;AA4BW,QAAA,UAAU,GAAG,IAAI,iBAAU,CACtC;IACE,CAAC,eAAe,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,WAAW,EAAE,YAAG,CAAC;IAClB,CAAC,WAAW,EAAE,SAAE,CAAC;IACjB,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,oBAAoB,EAAE,SAAE,CAAC,EAAE,aAAa;IACzC,CAAC,qBAAqB,EAAE,SAAE,CAAC,EAAE,aAAa;IAC1C,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,SAAS,EAAE,UAAG,CAAC;IAChB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,YAAY,EAAE,UAAG,CAAC;IACnB,CAAC,yBAAyB,EAAE,UAAG,CAAC;IAChC,CAAC,oBAAoB,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC,qBAAqB,EAAE,YAAG,CAAC;IAC5B,CAAC,aAAa,EAAE,YAAG,CAAC;IACpB,CAAC,OAAO,EAAE,uBAAS,CAAC;IACpB,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,aAAa,EAAE,uBAAS,CAAC;IAC1B,CAAC,YAAY,EAAE,IAAA,4BAAqB,EAAC,uBAAe,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC,sBAAsB,EAAE,YAAG,CAAC;IAC7B,CAAC,qBAAqB,EAAE,uBAAS,CAAC;IAClC,CAAC,mBAAmB,EAAE,YAAG,CAAC;CAC3B,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAY,CACvB,CAAC"}

package/src/plugins/metaplex/resizableNftFetcher.js

@@ -10,25 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const clients_1 = require("../../utils/clients");
-const solana_1 = require("../../utils/solana");
 const helpers_1 = require("./helpers");
 const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
+const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
 const resizeExpiration = 1745582400000;
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (Date.now() > resizeExpiration)
         return [];
     const client = (0, clients_1.getClientSolana)();
-    const asset = yield client.getTokenAccountsByOwner(new web3_js_1.PublicKey(owner), {
-        programId: new web3_js_1.PublicKey(solana_1.solanaTokenPid),
-    });
-    const tokenAccounts = asset.value
-        .map((account) => solana_1.tokenAccountStruct.deserialize(account.account.data)[0])
-        .filter((tA) => !tA.amount.isZero());
+    const tokenAccounts = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((tA) => !tA.amount.isZero());
     const metadataPubkeys = [];
     const editionPubkeys = [];
     tokenAccounts.forEach((account) => {

package/src/plugins/metaplex/resizableNftFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"resizableNftFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/metaplex/resizableNftFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resizableNftFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/metaplex/resizableNftFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA4E;AAG5E,2CAIqB;AAErB,gFAA6E;AAC7E,iDAAsD;AACtD,uCAAqE;AACrE,gGAA6F;AAC7F,wFAAyF;AAEzF,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAEvC,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;;IACtE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB;QAAE,OAAO,EAAE,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACrE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAC5B,CAAC;IAEF,MAAM,eAAe,GAAgB,EAAE,CAAC;IACxC,MAAM,cAAc,GAAgB,EAAE,CAAC;IACvC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAChC,eAAe,CAAC,IAAI,CAAC,IAAA,2BAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,cAAc,CAAC,IAAI,CAAC,IAAA,+BAAqB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC5D,IAAA,yDAA2B,EAAC,MAAM,EAAE,cAAc,CAAC;QACnD,IAAA,yDAA2B,EAAC,MAAM,EAAE,eAAe,CAAC;KACrD,CAAC,CAAC;IAEH,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,cAAc,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAAE,SAAS;QAEnC,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,cAAc;YAAE,SAAS;QAE9B,IAAI,CAAA,MAAA,gBAAgB,CAAC,CAAC,CAAC,0CAAE,IAAI,CAAC,UAAU,MAAK,GAAG,EAAE,CAAC;YACjD,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;gBAC3C,MAAM,IAAI,kCAAsB,CAAC;YACnC,CAAC;YACD,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;gBAC3C,MAAM,IAAI,iCAAqB,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACjD,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,gBAAgB;QACtB,IAAI,EAAE,6BAA6B;KACpC,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,CAAC;QACf,OAAO,EAAE,oCAAmB;QAC5B,MAAM;QACN,cAAc,EAAE,IAAI;QACpB,UAAU,EAAE;YACV,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}