@sonarwatch/portfolio-plugins 0.15.30 → 0.15.32

package/README.md

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

package/package.json

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

package/src/Job.d.ts

@@ -1,7 +1,7 @@
 import { NetworkIdType } from '@sonarwatch/portfolio-core';
 import { Cache } from './Cache';
 export type JobExecutor = (cache: Cache) => Promise<void>;
-export type JobLabel = 'normal' | 'coingecko' | 'realtime' | 'evm' | 'slow' | NetworkIdType;
+export type JobLabel = 'realtime' | 'normal' | 'slow' | 'coingecko' | 'evm' | NetworkIdType;
 export type Job = {
     id: string;
     executor: JobExecutor;

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

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

package/src/plugins/cropper/whirlpoolFetcher.js

@@ -14,7 +14,7 @@ const constants_1 = require("./constants");
 const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
 const getWhirlpoolPositions_1 = require("../orca/getWhirlpoolPositions");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
     return (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_1.platformId, constants_1.clmmPid)(potentialTokens, cache);
 });
 const fetcher = {

package/src/plugins/cropper/whirlpoolFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"whirlpoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cropper/whirlpoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAkD;AAGlD,wFAAqF;AACrF,yEAAiE;AAEjE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE7D,OAAO,IAAA,wCAAgB,EAAC,sBAAU,EAAE,mBAAO,CAAC,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACvE,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"whirlpoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cropper/whirlpoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAkD;AAGlD,wFAAyF;AACzF,yEAAiE;AAEjE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,IAAA,wCAAgB,EAAC,sBAAU,EAAE,mBAAO,CAAC,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACvE,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/fluxbeam/poolsJob.js

@@ -122,7 +122,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_1.platformId}-pools`,
     executor,
-    labels: ['slow'],
+    labels: [portfolio_core_1.NetworkId.solana, '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/helium/getHeliumPositions.d.ts

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

package/src/plugins/helium/getHeliumPositions.js

@@ -19,8 +19,7 @@ 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 = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = tokenAccounts.filter((x) => x.amount.isEqualTo(1));
+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]);

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

@@ -1 +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,aAA4C,EAC5C,KAAY,EACZ,EAAE;IACF,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAE3E,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;AAzDW,QAAA,kBAAkB,sBAyD7B"}
+{"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.js

@@ -14,7 +14,7 @@ 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);
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner)).filter((x) => x.amount.isEqualTo(1));
     return (0, getHeliumPositions_1.getHeliumPositions)(potentialTokens, cache);
 });
 const fetcher = {

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

@@ -1 +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,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE7D,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"}
+{"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/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/index.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = void 0;
+const resizableNftFetcher_1 = __importDefault(require("./resizableNftFetcher"));
 exports.jobs = [];
-exports.fetchers = [];
+exports.fetchers = [resizableNftFetcher_1.default];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/metaplex/index.ts"],"names":[],"mappings":";;;AAGa,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/metaplex/index.ts"],"names":[],"mappings":";;;;;;AAEA,gFAAsD;AAEzC,QAAA,IAAI,GAAU,EAAE,CAAC;AACjB,QAAA,QAAQ,GAAc,CAAC,6BAAiB,CAAC,CAAC"}

package/src/plugins/metaplex/resizableNftFetcher.d.ts

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

package/src/plugins/metaplex/resizableNftFetcher.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResizableNfts = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
@@ -17,12 +16,13 @@ const clients_1 = require("../../utils/clients");
 const helpers_1 = require("./helpers");
 const getMultipleAccountsInfoSafe_1 = require("../../utils/solana/getMultipleAccountsInfoSafe");
 const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
-const resizeExpiration = 1755426940000;
-const getResizableNfts = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
+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 tokenAccounts = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((tA) => !tA.amount.isZero());
     const metadataPubkeys = [];
     const editionPubkeys = [];
     tokenAccounts.forEach((account) => {
@@ -66,11 +66,6 @@ const getResizableNfts = (tokenAccounts, cache) => __awaiter(void 0, void 0, voi
     });
     return elementRegistry.getElements(cache);
 });
-exports.getResizableNfts = getResizableNfts;
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const tokenAccounts = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
-    return (0, exports.getResizableNfts)(tokenAccounts, cache);
-});
 const fetcher = {
     id: `${constants_1.platformId}-resize`,
     networkId: portfolio_core_1.NetworkId.solana,

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"}

package/src/plugins/meteora/cpamm/cpammPositionsFetcher.d.ts

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

package/src/plugins/meteora/cpamm/cpammPositionsFetcher.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMeteoraCpammPositions = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("../constants");
 const clients_1 = require("../../../utils/clients");
@@ -19,11 +18,9 @@ const structs_1 = require("./structs");
 const dlmmHelper_1 = require("../dlmm/dlmmHelper");
 const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
 const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccountsByOwner");
-const getMeteoraCpammPositions = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const nftAccounts = tokenAccounts.filter((x) => x.amount.isEqualTo(1));
-    if (!nftAccounts.length)
-        return [];
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
+    const nftAccounts = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
     const pdas = nftAccounts
         .map((account) => (account ? (0, helpers_1.derivePositionAddress)(account.mint) : []))
         .flat();
@@ -72,11 +69,6 @@ const getMeteoraCpammPositions = (tokenAccounts, cache) => __awaiter(void 0, voi
     }
     return registry.getElements(cache);
 });
-exports.getMeteoraCpammPositions = getMeteoraCpammPositions;
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
-    return (0, exports.getMeteoraCpammPositions)(potentialTokens, cache);
-});
 const fetcher = {
     id: `${constants_1.platformId}-cpamm-positions`,
     networkId: portfolio_core_1.NetworkId.solana,

package/src/plugins/meteora/cpamm/cpammPositionsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"cpammPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/cpamm/cpammPositionsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cpammPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/meteora/cpamm/cpammPositionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,4CAA0C;AAC1C,oDAAyD;AACzD,kDAAsE;AACtE,uCAKmB;AACnB,uCAAuD;AACvD,mDAA8C;AAC9C,mFAAgF;AAChF,2FAA4F;AAE5F,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,WAAW,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1E,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CACtB,CAAC;IAEF,MAAM,IAAI,GAAG,WAAW;SACrB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACtE,IAAI,EAAE,CAAC;IAEV,MAAM,SAAS,GAAG,MAAM,IAAA,sCAA6B,EACnD,MAAM,EACN,wBAAc,EACd,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,IAAA,sCAA6B,EAC/C,MAAM,EACN,oBAAU,EACV,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CACpE,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,MAAM,UAAU,GAAG,QAAQ,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;IAC5E,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ;YAAE,SAAS;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI;YAAE,SAAS;QAEpB,MAAM,GAAG,GAAG,UAAU,CAAC,YAAY,CAAC;YAClC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC/B,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YAC/D,IAAI,EAAE,iCAAiC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;SAChE,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,sCAA4B,EAC/C,QAAQ,CAAC,iBAAiB;aACvB,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC;aAC9B,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EAC1C,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,qBAAQ,CAAC,IAAI,CACd,CAAC;QAEF,GAAG,CAAC,QAAQ,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,sCAA4B,EAC/C,QAAQ,CAAC,iBAAiB,EAC1B,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,YAAY,EACjB,qBAAQ,CAAC,IAAI,CACd,CAAC;QAEF,GAAG,CAAC,QAAQ,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,UAAU;YACxB,MAAM,EAAE,YAAY;SACrB,CAAC,CAAC;QAEH,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAA,0BAAgB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,GAAG,CAAC,cAAc,CAAC;gBACjB,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;gBACjC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;aACnB,CAAC,CAAC;QACL,CAAC;QAED,GAAG,CAAC,cAAc,CAAC;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YACnC,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;QACH,GAAG,CAAC,cAAc,CAAC;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;YACnC,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,kBAAkB;IACnC,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/meteora/index.js

@@ -15,6 +15,7 @@ const dlmmVaultsFetcher_1 = __importDefault(require("./dlmm/dlmmVaultsFetcher"))
 const stakeForFeeFetcher_1 = __importDefault(require("./stake2earn/stakeForFeeFetcher"));
 const stakeForFeeVaultsJob_1 = __importDefault(require("./stake2earn/stakeForFeeVaultsJob"));
 const cpammV2Job_1 = __importDefault(require("./cpamm/cpammV2Job"));
+const cpammPositionsFetcher_1 = __importDefault(require("./cpamm/cpammPositionsFetcher"));
 const dlmmJob_1 = __importDefault(require("./dlmm/dlmmJob"));
 exports.jobs = [
     vaultsJob_1.default,
@@ -31,5 +32,6 @@ exports.fetchers = [
     dlmmPositionsFetcher_1.default,
     dlmmVaultsFetcher_1.default,
     stakeForFeeFetcher_1.default,
+    cpammPositionsFetcher_1.default,
 ];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/index.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,gEAAwC;AACxC,8FAAsE;AACtE,gEAAwC;AACxC,yEAAiD;AAGjD,wEAAgD;AAChD,uFAA8D;AAC9D,iFAAyD;AACzD,yFAAiE;AACjE,6FAAqE;AACrE,oEAA2C;AAC3C,6DAAqC;AAExB,QAAA,IAAI,GAAU;IACzB,mBAAS;IACT,kBAAQ;IACR,kBAAQ;IACR,4BAAkB;IAClB,iBAAO;IACP,uBAAa;IACb,8BAAoB;IACpB,oBAAS;CACV,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,sBAAY;IACZ,8BAAmB;IACnB,2BAAiB;IACjB,4BAAkB;CACnB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/index.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;AACpC,gEAAwC;AACxC,8FAAsE;AACtE,gEAAwC;AACxC,yEAAiD;AAGjD,wEAAgD;AAChD,uFAA8D;AAC9D,iFAAyD;AACzD,yFAAiE;AACjE,6FAAqE;AACrE,oEAA2C;AAC3C,0FAAiE;AACjE,6DAAqC;AAExB,QAAA,IAAI,GAAU;IACzB,mBAAS;IACT,kBAAQ;IACR,kBAAQ;IACR,4BAAkB;IAClB,iBAAO;IACP,uBAAa;IACb,8BAAoB;IACpB,oBAAS;CACV,CAAC;AACW,QAAA,QAAQ,GAAc;IACjC,sBAAY;IACZ,8BAAmB;IACnB,2BAAiB;IACjB,4BAAkB;IAClB,+BAAoB;CACrB,CAAC"}

package/src/plugins/orca/getWhirlpoolPositions.d.ts

@@ -4,4 +4,4 @@ import { PortfolioElement } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import { ParsedAccount, TokenAccount } from '../../utils/solana';
 import { Cache } from '../../Cache';
-export declare function getOrcaPositions(platformId: string, programId?: PublicKey): (tokenAccounts: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<PortfolioElement[]>;
+export declare function getOrcaPositions(platformId: string, programId?: PublicKey): (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<PortfolioElement[]>;

package/src/plugins/orca/getWhirlpoolPositions.js

@@ -19,12 +19,11 @@ const helpers_fees_1 = require("./helpers_fees");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const helpers_1 = require("./helpers");
 function getOrcaPositions(platformId, programId) {
-    return (tokenAccounts, cache) => __awaiter(this, void 0, void 0, function* () {
+    return (potentialTokens, cache) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const potentialTokens = tokenAccounts.filter((x) => x.amount.isEqualTo(1));
-        if (!potentialTokens.length)
-            return [];
         const positionsProgramAddress = potentialTokens.map((x) => (0, helpers_1.getPositionAddress)(x.mint, programId));
+        if (positionsProgramAddress.length === 0)
+            return [];
         const client = (0, clients_1.getClientSolana)();
         const positionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, whirlpool_1.positionStruct, positionsProgramAddress);
         if (!positionsInfo || positionsInfo.length === 0)

package/src/plugins/orca/getWhirlpoolPositions.js.map

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

package/src/plugins/orca/whirlpoolFetcher.js

@@ -14,7 +14,7 @@ const constants_1 = require("./constants");
 const getWhirlpoolPositions_1 = require("./getWhirlpoolPositions");
 const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner);
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
     return (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_1.platformId)(potentialTokens, cache);
 });
 const whirlpoolFetcher = {

package/src/plugins/orca/whirlpoolFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"whirlpoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/whirlpoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,mEAA2D;AAC3D,wFAAqF;AAErF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC;IAE7D,OAAO,IAAA,wCAAgB,EAAC,sBAAU,CAAC,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AAEF,MAAM,gBAAgB,GAAY;IAChC,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"whirlpoolFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/whirlpoolFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,mEAA2D;AAC3D,wFAAyF;AAEzF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,IAAA,wCAAgB,EAAC,sBAAU,CAAC,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC,CAAA,CAAC;AAEF,MAAM,gBAAgB,GAAY;IAChC,EAAE,EAAE,GAAG,sBAAU,aAAa;IAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}