npm - @sonarwatch/portfolio-plugins - Versions diffs - 0.15.39 → 0.15.41 - Mend

@sonarwatch/portfolio-plugins 0.15.39 → 0.15.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (136) hide show

package/src/plugins/jito/constants.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
+import { AirdropStatics } from '../../AirdropFetcher';
 export declare const platformId = "jito";
 export declare const jtoMint = "jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL";
 export declare const jitoSOLMint = "J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn";
@@ -13,3 +14,4 @@ export declare const airdropUrl = "https://airdrop.jito.network/status/";
 export declare const restakingPid: PublicKey;
 export declare const restakingVaultsKey = "restaking-vaults";
 export declare const platformIdByVault: Map<string, string>;
+export declare const airdropStatics: AirdropStatics;

package/src/plugins/jito/constants.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.platformIdByVault = exports.restakingVaultsKey = exports.restakingPid = exports.airdropUrl = exports.jtoDecimals = exports.merkleDistributor = exports.merkleTree = exports.kyrosPlatformId = exports.renzoPlatformId = exports.jitoSOLMint = exports.jtoMint = exports.platformId = void 0;
+exports.airdropStatics = exports.platformIdByVault = exports.restakingVaultsKey = exports.restakingPid = exports.airdropUrl = exports.jtoDecimals = exports.merkleDistributor = exports.merkleTree = exports.kyrosPlatformId = exports.renzoPlatformId = exports.jitoSOLMint = exports.jtoMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("../fragmetric/constants");
 exports.platformId = 'jito';
@@ -19,4 +19,13 @@ exports.platformIdByVault = new Map([
     ['CQpvXgoaaawDCLh8FwMZEwQqnPakRUZ5BnzhjnEBPJv', exports.kyrosPlatformId],
     ['HR1ANmDHjaEhknvsTaK48M5xZtbBiwNdXM5NTiWhAb4S', constants_1.platformId],
 ]);
+exports.airdropStatics = {
+    claimLink: 'https://jito.network/airdrop',
+    emitterLink: 'https://jito.network/',
+    emitterName: 'Jito',
+    id: 'jito-airdrop',
+    image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/jito.webp',
+    claimStart: 1701964800000,
+    claimEnd: 1749312000000,
+};
 //# sourceMappingURL=constants.js.map

package/src/plugins/jito/constants.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,uDAA6E;~~AAEhE~~,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,OAAO,GAAG,6CAA6C,CAAC;AACxD,QAAA,WAAW,GAAG,8CAA8C,CAAC;AAE7D,QAAA,eAAe,GAAG,OAAO,CAAC;AAC1B,QAAA,eAAe,GAAG,OAAO,CAAC;AAE1B,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,iBAAiB,GAAG,6CAA6C,CAAC;AAClE,QAAA,WAAW,GAAG,CAAC,CAAC;AAChB,QAAA,UAAU,GAAG,sCAAsC,CAAC;AAEpD,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AACW,QAAA,kBAAkB,GAAG,kBAAkB,CAAC;AAExC,QAAA,iBAAiB,GAAG,IAAI,GAAG,CAAC;IACvC,CAAC,8CAA8C,EAAE,uBAAe,CAAC;IACjE,CAAC,6CAA6C,EAAE,uBAAe,CAAC;IAChE,CAAC,8CAA8C,EAAE,sBAAoB,CAAC;CACvE,CAAC,CAAC"}
1	+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,uDAA6E;AAGhE,QAAA,UAAU,GAAG,MAAM,CAAC;AACpB,QAAA,OAAO,GAAG,6CAA6C,CAAC;AACxD,QAAA,WAAW,GAAG,8CAA8C,CAAC;AAE7D,QAAA,eAAe,GAAG,OAAO,CAAC;AAC1B,QAAA,eAAe,GAAG,OAAO,CAAC;AAE1B,QAAA,UAAU,GAAG,8CAA8C,CAAC;AAC5D,QAAA,iBAAiB,GAAG,6CAA6C,CAAC;AAClE,QAAA,WAAW,GAAG,CAAC,CAAC;AAChB,QAAA,UAAU,GAAG,sCAAsC,CAAC;AAEpD,QAAA,YAAY,GAAG,IAAI,mBAAS,CACvC,6CAA6C,CAC9C,CAAC;AACW,QAAA,kBAAkB,GAAG,kBAAkB,CAAC;AAExC,QAAA,iBAAiB,GAAG,IAAI,GAAG,CAAC;IACvC,CAAC,8CAA8C,EAAE,uBAAe,CAAC;IACjE,CAAC,6CAA6C,EAAE,uBAAe,CAAC;IAChE,CAAC,8CAA8C,EAAE,sBAAoB,CAAC;CACvE,CAAC,CAAC;AAEU,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,8BAA8B;IACzC,WAAW,EAAE,uBAAuB;IACpC,WAAW,EAAE,MAAM;IACnB,EAAE,EAAE,cAAc;IAClB,KAAK,EACH,0EAA0E;IAC5E,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC"}

package/src/plugins/jito/index.d.ts CHANGED Viewed

@@ -2,3 +2,4 @@ import { Fetcher } from '../../Fetcher';
 import { Job } from '../../Job';
 export declare const jobs: Job[];
 export declare const fetchers: Fetcher[];
+export declare const airdropFetchers: import("../..").AirdropFetcher[];

package/src/plugins/jito/index.js CHANGED Viewed

@@ -3,10 +3,14 @@ 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 airdropFetcher_1 = __importDefault(require("./airdropFetcher"));
+exports.airdropFetchers = exports.fetchers = exports.jobs = void 0;
 const vaultsJob_1 = __importDefault(require("./vaultsJob"));
 const ticketFetcher_1 = __importDefault(require("./ticketFetcher"));
+const airdropFetcher_1 = require("./airdropFetcher");
 exports.jobs = [vaultsJob_1.default];
-exports.fetchers = [airdropFetcher_1.default, ticketFetcher_1.default];
+exports.fetchers = [
+    // aidropFetcher
+    ticketFetcher_1.default,
+];
+exports.airdropFetchers = [airdropFetcher_1.jitoAirdropFetcher];
 //# sourceMappingURL=index.js.map

package/src/plugins/jito/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/index.ts"],"names":[],"mappings":";;;;;;AAEA,~~sEAA6C;AAC7C,~~4DAAoC;AACpC,oEAA4C;~~AAE/B~~,QAAA,IAAI,GAAU,CAAC,mBAAS,CAAC,CAAC;AAC1B,QAAA,QAAQ,GAAc,CAAC,~~wBAAa~~,~~EAAE~~,~~uBAAa~~,CAAC,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/index.ts"],"names":[],"mappings":";;;;;;AAEA,4DAAoC;AACpC,oEAA4C;AAC5C,qDAAsD;AAEzC,QAAA,IAAI,GAAU,CAAC,mBAAS,CAAC,CAAC;AAC1B,QAAA,QAAQ,GAAc;IACjC,gBAAgB;IAChB,uBAAa;CACd,CAAC;AACW,QAAA,eAAe,GAAG,CAAC,mCAAkB,CAAC,CAAC"}

package/src/plugins/jito/structs.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
 export type ClaimStatus = {
-    buffer: Buffer;
+    discriminator: number[];
     claimant: PublicKey;
     lockedAmount: BigNumber;
     lockedAmountWithdrawn: BigNumber;

package/src/plugins/jito/structs.js CHANGED Viewed

@@ -5,7 +5,7 @@ const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
 exports.claimStatusStruct = new beet_1.BeetStruct([
-    ['buffer', (0, solana_1.blob)(8)],
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
     ['claimant', beet_solana_1.publicKey],
     ['lockedAmount', solana_1.u64],
     ['lockedAmountWithdrawn', solana_1.u64],

package/src/plugins/jito/structs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/structs.ts"],"names":[],"mappings":";;;AAAA,oDAMmC;AAGnC,kEAA6D;AAC7D,+CAA+C;AAUlC,QAAA,iBAAiB,GAAG,IAAI,iBAAU,CAC7C;IACE,CAAC,~~QAAQ~~,EAAE,IAAA,~~aAAI~~,EAAC,CAAC,CAAC,CAAC;~~IACnB~~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"}
1	+ {"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/jito/structs.ts"],"names":[],"mappings":"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"}

package/src/plugins/jupiter/launchpad/lfgAirdropFetcher.js CHANGED Viewed

@@ -19,6 +19,7 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const AirdropFetcher_1 = require("../../../AirdropFetcher");
 const deriveClaimStatus_1 = require("../../../utils/solana/jupiter/deriveClaimStatus");
 const clients_1 = require("../../../utils/clients");
+const getClaimTransactions_1 = require("../../../utils/solana/jupiter/getClaimTransactions");
 function getLfgAirdropFetcher(aConfig) {
     const executor = (owner) => __awaiter(this, void 0, void 0, function* () {
         const client = (0, clients_1.getClientSolana)();
@@ -46,7 +47,10 @@ function getLfgAirdropFetcher(aConfig) {
                 ],
             });
         const claimStatusAddress = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, claimProof.data.merkle_tree, aConfig.distributorProgram);
-        const claimStatusAaccount = yield client.getAccountInfo(claimStatusAddress);
+        const [claims, claimStatusAccount] = yield Promise.all([
+            (0, getClaimTransactions_1.getClaimTransactions)(owner, claimStatusAddress, aConfig.mint),
+            client.getAccountInfo(claimStatusAddress),
+        ]);
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: aConfig.statics,
             items: [
@@ -54,9 +58,10 @@ function getLfgAirdropFetcher(aConfig) {
                     amount: new bignumber_js_1.default(claimProof.data.amount)
                         .div(Math.pow(10, aConfig.decimals))
                         .toNumber(),
-                    isClaimed: claimStatusAaccount !== null,
+                    isClaimed: claimStatusAccount !== null,
                     label: aConfig.label,
                     address: aConfig.mint,
+                    claims,
                 },
             ],
         });

package/src/plugins/jupiter/launchpad/lfgAirdropFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"lfgAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/lfgAirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,gEAAqC;AACrC,4DAIiC;AAGjC,uFAAoF;AACpF,oDAAyD;~~AAEzD~~,SAAgB,oBAAoB,CAAC,OAAsB;IACzD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,UAAU,GAA6C,MAAM,eAAK;aACrE,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9B,OAAO,EAAE,IAAI;SACd,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IACE,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,EACxD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ;YACpD,OAAO,IAAA,8BAAa,EAAC;gBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE;oBACL;wBACE,MAAM,EAAE,CAAC;wBACT,SAAS,EAAE,KAAK;wBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;qBACtB;iBACF;aACF,CAAC,CAAC;QAEL,MAAM,kBAAkB,GAAG,IAAA,qCAAiB,EAC1C,KAAK,EACL,UAAU,CAAC,IAAI,CAAC,WAAW,EAC3B,OAAO,CAAC,kBAAkB,CAC3B,CAAC;QACF,MAAM,~~mBAAmB~~,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;~~QAE5E~~,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,IAAI,sBAAS,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;yBAC1C,GAAG,CAAC,SAAA,EAAE,EAAI,OAAO,CAAC,QAAQ,CAAA,CAAC;yBAC3B,QAAQ,EAAE;oBACb,SAAS,EAAE,~~mBAAmB~~,KAAK,IAAI;~~oBACvC~~,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;~~iBACtB~~;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QACtB,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,QAAQ;KACT,CAAC;AACJ,CAAC;~~AAzDD~~,~~oDAyDC~~"}
1	+ {"version":3,"file":"lfgAirdropFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/launchpad/lfgAirdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,gEAAqC;AACrC,4DAIiC;AAGjC,uFAAoF;AACpF,oDAAyD;AACzD,6FAA0F;AAE1F,SAAgB,oBAAoB,CAAC,OAAsB;IACzD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QACjC,MAAM,UAAU,GAA6C,MAAM,eAAK;aACrE,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9B,OAAO,EAAE,IAAI;SACd,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IACE,CAAC,CAAC,QAAQ;gBACV,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,EACxD,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ;YACpD,OAAO,IAAA,8BAAa,EAAC;gBACnB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE;oBACL;wBACE,MAAM,EAAE,CAAC;wBACT,SAAS,EAAE,KAAK;wBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;qBACtB;iBACF;aACF,CAAC,CAAC;QAEL,MAAM,kBAAkB,GAAG,IAAA,qCAAiB,EAC1C,KAAK,EACL,UAAU,CAAC,IAAI,CAAC,WAAW,EAC3B,OAAO,CAAC,kBAAkB,CAC3B,CAAC;QACF,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrD,IAAA,2CAAoB,EAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC;YAC7D,MAAM,CAAC,cAAc,CAAC,kBAAkB,CAAC;SAC1C,CAAC,CAAC;QAEH,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,IAAI,sBAAS,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;yBAC1C,GAAG,CAAC,SAAA,EAAE,EAAI,OAAO,CAAC,QAAQ,CAAA,CAAC;yBAC3B,QAAQ,EAAE;oBACb,SAAS,EAAE,kBAAkB,KAAK,IAAI;oBACtC,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;oBACrB,MAAM;iBACP;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;IAEF,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;QACtB,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,QAAQ;KACT,CAAC;AACJ,CAAC;AA7DD,oDA6DC"}

package/src/plugins/magiceden/airdropFetcher.js CHANGED Viewed

@@ -14,21 +14,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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 web3_js_1 = require("@solana/web3.js");
 const AirdropFetcher_1 = require("../../AirdropFetcher");
 const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const structs_1 = require("./structs");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    const input = JSON.stringify({
-        json: {
-            claimWallet: owner,
-            token: constants_1.meMint,
-            allocationEvent: 'tge-airdrop-final',
-        },
-    });
-    const encodedInput = encodeURIComponent(input);
-    const res = yield axios_1.default.get(constants_1.airdropApi + encodedInput);
-    if (!res.data)
+    const client = (0, clients_1.getClientSolana)();
+    // const input = JSON.stringify({
+    //   json: {
+    //     claimWallet: owner,
+    //     token: meMint,
+    //     allocationEvent: 'tge-airdrop-final',
+    //   },
+    // });
+    const claimStatus = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.distributionClaimStruct, constants_1.stakingPid)
+        .addFilter('claimant', new web3_js_1.PublicKey(owner))
+        .addFilter('discriminator', [239, 137, 48, 156, 94, 143, 205, 29])
+        .run();
+    if (claimStatus.length === 0) {
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: constants_1.airdropStatics,
             items: [
@@ -40,20 +47,40 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
                 },
             ],
         });
-    const isClaimed = res.data.result.data.json.claimStatus === 'claimed';
-    const amount = new bignumber_js_1.default(res.data.result.data.json.availableTokenAmount)
-        .dividedBy(Math.pow(10, 6))
-        .toNumber();
+    }
+    // const encodedInput = encodeURIComponent(input);
+    // const res: AxiosResponse<AirdropResponse> = await axios.get(
+    //   airdropApi + encodedInput
+    // );
+    // if (!res.data)
+    //   return getAirdropRaw({
+    //     statics: airdropStatics,
+    //     items: [
+    //       {
+    //         amount: 0,
+    //         isClaimed: false,
+    //         label: 'ME',
+    //         address: meMint,
+    //       },
+    //     ],
+    //   });
+    const claims = yield Promise.all([
+        ...claimStatus.map((cS) => (0, getClaimTransactions_1.getClaimTransactions)(owner, cS.pubkey, constants_1.meMint)),
+    ]);
+    const claimedAmount = claims.reduce((acc, claim) => acc.plus(claim.reduce((sum, tx) => sum.plus(tx.amount), new bignumber_js_1.default(0))), new bignumber_js_1.default(0));
+    // const isClaimed = res.data.result.data.json.claimStatus === 'claimed';
+    // const amount = new BigNumber(res.data.result.data.json.availableTokenAmount)
+    //   .dividedBy(10 ** 6)
+    //   .toNumber();
     return (0, AirdropFetcher_1.getAirdropRaw)({
         statics: constants_1.airdropStatics,
         items: [
             {
-                // We have no way to know if a user was eligible and claimed
-                // We can only know if user claimed, or didn't claimed + amount.
-                amount,
-                isClaimed,
+                amount: claimedAmount.toNumber(),
+                isClaimed: true,
                 label: 'ME',
                 address: constants_1.meMint,
+                claims: claims.flat(),
             },
         ],
     });

package/src/plugins/magiceden/airdropFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,~~kDAA6C;AAC7C,~~gEAAqC;AACrC,yDAK8B;AAE9B,2CAA6E;~~AAG7E~~,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,~~KAAK~~,GAAG,~~IAAI~~,~~CAAC~~,~~SAAS~~,CAAC;~~QAC3B~~,~~IAAI~~,~~EAAE~~;~~YACJ~~,~~WAAW~~,~~EAAE~~,~~KAAK~~;~~YAClB~~,KAAK,~~EAAE~~,~~kBAAM;YACb~~,~~eAAe~~,~~EAAE~~,~~mBAAmB~~;~~SACrC;KACF~~,~~CAAC~~,CAAC~~;IAEH~~,~~MAAM~~,~~YAAY~~,~~GAAG~~,~~kBAAkB~~,CAAC,KAAK,CAAC,CAAC;~~IAC/C~~,~~MAAM~~,GAAG,~~GAAmC~~,~~MAAM~~,~~eAAK~~,~~CAAC~~,GAAG,~~CACzD~~,~~sBAAU~~,GAAG,~~YAAY~~,~~CAC1B~~,CAAC;~~IAEF~~,IAAI,CAAC,~~GAAG~~,CAAC,~~IAAI~~;~~QACX~~,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,kBAAM;iBAChB;aACF;SACF,CAAC,CAAC;IAEL,~~MAAM~~,SAAS,~~GAAG~~,GAAG,CAAC,~~IAAI~~,CAAC,~~MAAM~~,CAAC,~~IAAI~~,CAAC,~~IAAI~~,CAAC,~~WAAW~~,KAAK,~~SAAS~~,CAAC~~;IACtE~~,MAAM,MAAM,GAAG,~~IAAI~~,~~sBAAS~~,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,~~IAAI~~,CAAC,IAAI,CAAC,~~oBAAoB~~,CAAC~~;SACzE~~,~~SAAS~~,CAAC,~~SAAA,~~EAAE,~~EAAI~~,CAAC,~~CAAA~~,CAAC~~;SAClB~~,~~QAAQ~~,~~EAAE~~,CAAC;~~IAEd~~,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,~~4DAA4D;gBAC5D~~,~~gEAAgE;gBAChE~~,~~MAAM~~;~~gBACN~~,SAAS;~~gBACT~~,KAAK,EAAE,IAAI;gBACX,OAAO,EAAE,kBAAM;~~aAChB~~;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,mBAAmB,EACnB,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
1	+ {"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/magiceden/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,6CAA4C;AAC5C,yDAK8B;AAE9B,2CAA6E;AAC7E,iDAAsD;AACtD,kEAA+D;AAC/D,uCAAoD;AACpD,0FAAuF;AAEvF,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,iCAAiC;IACjC,YAAY;IACZ,0BAA0B;IAC1B,qBAAqB;IACrB,4CAA4C;IAC5C,OAAO;IACP,MAAM;IACN,MAAM,WAAW,GAAG,MAAM,qBAAS,CAAC,KAAK,CACvC,MAAM,EACN,iCAAuB,EACvB,sBAAU,CACX;SACE,SAAS,CAAC,UAAU,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC3C,SAAS,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;SACjE,GAAG,EAAE,CAAC;IAET,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,kBAAM;iBAChB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,kDAAkD;IAClD,+DAA+D;IAC/D,8BAA8B;IAC9B,KAAK;IAEL,iBAAiB;IACjB,2BAA2B;IAC3B,+BAA+B;IAC/B,eAAe;IACf,UAAU;IACV,qBAAqB;IACrB,4BAA4B;IAC5B,uBAAuB;IACvB,2BAA2B;IAC3B,WAAW;IACX,SAAS;IACT,QAAQ;IAER,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC/B,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,2CAAoB,EAAC,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,kBAAM,CAAC,CAAC;KAC3E,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CACb,GAAG,CAAC,IAAI,CACN,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC,CACjE,EACH,IAAI,sBAAS,CAAC,CAAC,CAAC,CACjB,CAAC;IAEF,yEAAyE;IACzE,+EAA+E;IAC/E,wBAAwB;IACxB,iBAAiB;IAEjB,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE;gBAChC,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,IAAI;gBACX,OAAO,EAAE,kBAAM;gBACf,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;aACtB;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,mBAAmB,EACnB,0BAAc,CAAC,QAAQ,CACxB,CAAC"}

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

@@ -46,3 +46,14 @@ export type Pool = {
     sharedEscrowCount: BigNumber;
 };
 export declare const poolStruct: BeetStruct<Pool, Partial<Pool>>;
+export type DistributionClaim = {
+    discriminator: number[];
+    ns: PublicKey;
+    distribution: PublicKey;
+    claimant: PublicKey;
+    distributionTokenMint: PublicKey;
+    amount: BigNumber;
+    cosignedMsg: number[];
+    padding: number[];
+};
+export declare const distributionClaimStruct: BeetStruct<DistributionClaim, Partial<DistributionClaim>>;

package/src/plugins/magiceden/structs.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.poolStruct = exports.allowlistStruct = exports.lockUpStruct = void 0;
+exports.distributionClaimStruct = 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");
@@ -43,4 +43,14 @@ exports.poolStruct = new beet_1.BeetStruct([
     ['sharedEscrowAccount', beet_solana_1.publicKey],
     ['sharedEscrowCount', solana_1.u64],
 ], (args) => args);
+exports.distributionClaimStruct = new beet_1.BeetStruct([
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['ns', beet_solana_1.publicKey],
+    ['distribution', beet_solana_1.publicKey],
+    ['claimant', beet_solana_1.publicKey],
+    ['distributionTokenMint', beet_solana_1.publicKey],
+    ['amount', solana_1.u64],
+    ['cosignedMsg', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 32)],
+    ['padding', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 240)],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

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

	@@ -1 +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;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"}
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;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;AAaW,QAAA,uBAAuB,GAAG,IAAI,iBAAU,CACnD;IACE,CAAC,eAAe,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,IAAI,EAAE,uBAAS,CAAC;IACjB,CAAC,cAAc,EAAE,uBAAS,CAAC;IAC3B,CAAC,UAAU,EAAE,uBAAS,CAAC;IACvB,CAAC,uBAAuB,EAAE,uBAAS,CAAC;IACpC,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,aAAa,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC,SAAS,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,GAAG,CAAC,CAAC;CAC5C,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAyB,CACpC,CAAC"}

package/src/plugins/meteora/vaultsJob.js CHANGED Viewed

@@ -56,6 +56,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
                 },
             ],
             timestamp: Date.now(),
+            link: 'https://www.meteora.ag/vaults',
         };
         lpSources.push(lpSource);
     }

package/src/plugins/meteora/vaultsJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAyE;AACzE,2CAA0D;AAC1D,iDAAsD;AACtD,+CAA8D;AAC9D,qCAAuC;AACvC,gGAA6F;AAC7F,uCAA0C;AAI1C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,oBAAW,EACX,2BAAe,EACf,uBAAa,CACd,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,EACzD,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE;YAAE,SAAS;QAC1C,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,eAAe;YAAE,SAAS;QAE/B,MAAM,WAAW,GAAG,MAAM,IAAA,yDAA2B,EACnD,KAAK,CAAC,OAAO,EACb,MAAM,EACN,CAAC,CACF,CAAC;QACF,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;QAC/D,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY;aACnC,GAAG,CAAC,SAAA,EAAE,EAAI,eAAe,CAAC,QAAQ,CAAA,CAAC;aACnC,QAAQ,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC;QACvD,MAAM,KAAK,GAAG,UAAU,GAAG,QAAQ,CAAC;QACpC,MAAM,QAAQ,GAAqB;YACjC,EAAE,EAAE,sBAAU;YACd,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YACjC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,WAAW,EAAE,OAAO;YACpB,QAAQ,EAAE,UAAU;YACpB,KAAK;YACL,WAAW,EAAE;gBACX;oBACE,SAAS,EAAE,0BAAS,CAAC,MAAM;oBAC3B,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,QAAQ,EAAE,eAAe,CAAC,QAAQ;oBAClC,KAAK,EAAE,eAAe,CAAC,KAAK;oBAC5B,WAAW,EAAE,KAAK,GAAG,eAAe,CAAC,KAAK;iBAC3C;aACF;YACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;~~SACtB~~,CAAC;QACF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;~~IACD~~,MAAM,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}
1	+ {"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAyE;AACzE,2CAA0D;AAC1D,iDAAsD;AACtD,+CAA8D;AAC9D,qCAAuC;AACvC,gGAA6F;AAC7F,uCAA0C;AAI1C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,oBAAW,EACX,2BAAe,EACf,uBAAa,CACd,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACjD,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,EACzD,0BAAS,CAAC,MAAM,CACjB,CAAC;IAEF,MAAM,SAAS,GAAuB,EAAE,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE;YAAE,SAAS;QAC1C,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,eAAe;YAAE,SAAS;QAE/B,MAAM,WAAW,GAAG,MAAM,IAAA,yDAA2B,EACnD,KAAK,CAAC,OAAO,EACb,MAAM,EACN,CAAC,CACF,CAAC;QACF,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;QAC/D,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY;aACnC,GAAG,CAAC,SAAA,EAAE,EAAI,eAAe,CAAC,QAAQ,CAAA,CAAC;aACnC,QAAQ,EAAE,CAAC;QACd,MAAM,UAAU,GAAG,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC;QACvD,MAAM,KAAK,GAAG,UAAU,GAAG,QAAQ,CAAC;QACpC,MAAM,QAAQ,GAAqB;YACjC,EAAE,EAAE,sBAAU;YACd,MAAM,EAAE,CAAC;YACT,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YACjC,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,WAAW,EAAE,OAAO;YACpB,QAAQ,EAAE,UAAU;YACpB,KAAK;YACL,WAAW,EAAE;gBACX;oBACE,SAAS,EAAE,0BAAS,CAAC,MAAM;oBAC3B,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,QAAQ,EAAE,eAAe,CAAC,QAAQ;oBAClC,KAAK,EAAE,eAAe,CAAC,KAAK;oBAC5B,WAAW,EAAE,KAAK,GAAG,eAAe,CAAC,KAAK;iBAC3C;aACF;YACD,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI,EAAE,+BAA+B;SACtC,CAAC;QACF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

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

package/src/plugins/orca/getWhirlpoolPositions.js CHANGED Viewed

@@ -18,11 +18,13 @@ const whirlpool_1 = require("./structs/whirlpool");
 const helpers_fees_1 = require("./helpers_fees");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const helpers_1 = require("./helpers");
-function getOrcaPositions(platformId, programId) {
+function getOrcaPositions(platformId, programId, useIdentifier = true) {
     return (tokenAccounts, cache) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const potentialTokens = tokenAccounts.filter((x) => x.amount.isEqualTo(1) &&
-            constants_1.positionsIdentifiers.some((identifier) => { var _a; return (_a = x.metadata) === null || _a === void 0 ? void 0 : _a.name.includes(identifier); }));
+        const potentialTokens = useIdentifier
+            ? tokenAccounts.filter((x) => x.amount.isEqualTo(1) &&
+                constants_1.positionsIdentifiers.some((identifier) => { var _a; return (_a = x.metadata) === null || _a === void 0 ? void 0 : _a.name.includes(identifier); }))
+            : tokenAccounts;
         if (!potentialTokens.length)
             return [];
         const positionsProgramAddress = potentialTokens.map((x) => (0, helpers_1.getPositionAddress)(x.mint, programId));
@@ -92,6 +94,7 @@ function getOrcaPositions(platformId, programId) {
                         address: whirlpoolInfo.pubkey.toString(),
                     },
                 ],
+                link: `https://www.orca.so/pools/${whirlpoolInfo.pubkey.toString()}`,
             });
             const feesAndRewards = (0, helpers_fees_1.calcFeesAndRewards)(whirlpoolInfo, positionInfo, tickArrays);
             if (feesAndRewards) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAyE;AAEzE,2CAAoE;AACpE,iDAAsD;AACtD,+CAI4B;AAE5B,mDAAgE;AAChE,iDAAwE;AACxE,gFAA6E;AAE7E,uCAA+C;AAE/C,SAAgB,gBAAgB,~~CAAC~~,UAAkB,~~EAAE~~,SAAqB;~~IACxE~~,OAAO,CACL,aAAwD,EACxD,KAAY,EACiB,EAAE;;QAC/B,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,~~CAC1C~~,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;~~YACrB~~,gCAAoB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,WACvC,OAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA,EAAA,CACtC,CACJ,CAAC;~~QACF~~,IAAI,CAAC,eAAe,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEvC,MAAM,uBAAuB,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACxD,IAAA,4BAAkB,EAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,CACtC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;QAEjC,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,MAAM,EACN,0BAAc,EACd,uBAAuB,CACxB,CAAC;QACF,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAE5D,MAAM,kBAAkB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,IAAI,GAAG;gBAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChE,KAAK,CAAC,QAAQ,CAA2B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBACvE,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B,CAAC;YACF,KAAK,CAAC,QAAQ,CACZ,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EACvD;gBACE,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B,CACF;SACF,CAAC,CAAC;QACH,IAAI,CAAC,iBAAiB;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA0C,IAAI,GAAG,EAAE,CAAC;QACtE,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAClC,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,IAAI,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;gBACpD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEvC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QAEzE,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC1E,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;YAC1D,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,CAAC,YAAY;gBAAE,SAAS;YAE5B,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,aAAa;gBAAE,SAAS;YAE7B,IACE,CAAC,aAAa,CAAC,UAAU;gBACzB,CAAC,aAAa,CAAC,UAAU;gBACzB,CAAC,aAAa,CAAC,gBAAgB;gBAE/B,SAAS;YAEX,MAAM,OAAO,GAAG,eAAe,CAAC,+BAA+B,CAAC;gBAC9D,IAAI,EAAE,+BAA+B;aACtC,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;gBACrC,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,QAAQ,EAAE,aAAa,CAAC,UAAU;gBAClC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,cAAc,EAAE,YAAY,CAAC,cAAc;gBAC3C,cAAc,EAAE,YAAY,CAAC,cAAc;gBAC3C,gBAAgB,EAAE,aAAa,CAAC,SAAS;gBACzC,aAAa,EAAE,aAAa,CAAC,SAAS;gBACtC,OAAO,EACL,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;oBACvC,CAAC,CAAC,GAAG,aAAa,CAAC,eAAe,GAAG,KAAK,CAAC;gBAC7C,aAAa,EAAE,MAAA,kBAAkB,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,MAAK,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,CACxD,0CAAE,KAAK,CAAC,KAAK,EAAE,MAAM;gBACtB,GAAG,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACnC,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE;qBACzC;iBACF;~~aACF~~,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,IAAA,iCAAkB,EACvC,aAAa,EACb,YAAY,EACZ,UAAU,CACX,CAAC;YAEF,IAAI,cAAc,EAAE,CAAC;gBACnB,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;oBACjC,MAAM,EAAE,cAAc,CAAC,QAAQ;iBAChC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,UAAU;oBACjC,MAAM,EAAE,cAAc,CAAC,QAAQ;iBAChC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1C,MAAM,EAAE,cAAc,CAAC,WAAW;iBACnC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1C,MAAM,EAAE,cAAc,CAAC,WAAW;iBACnC,CAAC,CAAC;gBAEH,SAAS,CAAC,cAAc,CAAC;oBACvB,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;oBAC1C,MAAM,EAAE,cAAc,CAAC,WAAW;iBACnC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC,CAAA,CAAC;AACJ,CAAC;~~AA1ID~~,~~4CA0IC~~"}
1	+ {"version":3,"file":"getWhirlpoolPositions.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/getWhirlpoolPositions.ts"],"names":[],"mappings":"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"}

package/src/plugins/ratex/ptPricesJob.js CHANGED Viewed

@@ -22,6 +22,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         content: {},
     });
     const tokenPriceSources = [];
+    const tokenYieldsSources = [];
     res.data.data.forEach((ptToken) => {
         const tokenPriceSource = {
             address: ptToken.pt_mint,
@@ -35,9 +36,18 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             elementName: 'Earn',
             label: 'Staked',
         };
+        tokenYieldsSources.push({
+            address: ptToken.pt_mint,
+            networkId: portfolio_core_1.NetworkId.solana,
+            yield: (0, portfolio_core_1.yieldFromApy)(ptToken.pt_yield),
+            timestamp: Date.now(),
+        });
         tokenPriceSources.push(tokenPriceSource);
     });
-    yield cache.setTokenPriceSources(tokenPriceSources);
+    yield Promise.all([
+        cache.setTokenPriceSources(tokenPriceSources),
+        cache.setTokenYields(tokenYieldsSources),
+    ]);
 });
 const job = {
     id: `${constants_1.platformId}-pt-prices`,

package/src/plugins/ratex/ptPricesJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ptPricesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ratex/ptPricesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+~~DAAyE~~;~~AAGzE~~,2CAAyC;AAGzC,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAEJ,MAAM,eAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE;QAC7C,UAAU,EAAE,UAAU;QACtB,MAAM,EAAE,cAAc;QACtB,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAuB,EAAE,CAAC;~~IAEjD~~,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAqB;YACzC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,CAAC;YACX,EAAE,EAAE,OAAO,CAAC,OAAO;YACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,OAAO,CAAC,UAAU;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,QAAQ;SAChB,CAAC;~~QAEF~~,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;~~AACtD~~,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}
1	+ {"version":3,"file":"ptPricesJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/ratex/ptPricesJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA6C;AAC7C,+DAKoC;AAGpC,2CAAyC;AAGzC,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAEJ,MAAM,eAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE;QAC7C,UAAU,EAAE,UAAU;QACtB,MAAM,EAAE,cAAc;QACtB,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IACjD,MAAM,kBAAkB,GAAiB,EAAE,CAAC;IAE5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAqB;YACzC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,CAAC;YACX,EAAE,EAAE,OAAO,CAAC,OAAO;YACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,OAAO,CAAC,UAAU;YACzB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,MAAM;YACnB,KAAK,EAAE,QAAQ;SAChB,CAAC;QACF,kBAAkB,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAA,6BAAY,EAAC,OAAO,CAAC,QAAQ,CAAC;YACrC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAC;QAEH,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC;QAC7C,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC;KACzC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}

package/src/plugins/raydium/clmmFetcher.js CHANGED Viewed

@@ -20,9 +20,10 @@ const clmms_1 = require("./structs/clmms");
 const helpers_1 = require("./helpers");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const getRaydiumClmmPositions = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!tokenAccounts.length)
+    const potentialTokens = tokenAccounts.filter((x) => { var _a; return ((_a = x.metadata) === null || _a === void 0 ? void 0 : _a.name) === constants_1.positionsIdentifier; });
+    if (!potentialTokens.length)
         return [];
-    const positionsProgramAddress = tokenAccounts.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
+    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
     const client = (0, clients_1.getClientSolana)();
     const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
     if (!personalPositionsInfo || personalPositionsInfo.length === 0)
@@ -105,7 +106,6 @@ const getRaydiumClmmPositions = (tokenAccounts, cache) => __awaiter(void 0, void
 exports.getRaydiumClmmPositions = getRaydiumClmmPositions;
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)((0, clients_1.getClientSolana)(), owner);
-    console.log();
     return (0, exports.getRaydiumClmmPositions)(potentialTokens, cache);
 });
 const fetcher = {

package/src/plugins/raydium/clmmFetcher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"clmmFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAC5C,~~2CAA0E~~;~~AAG1E~~,wFAAqF;AACrF,+CAI4B;AAC5B,iDAAsD;AACtD,2CAIyB;AAEzB,uCAA0E;AAC1E,gFAA6E;AAEtE,MAAM,uBAAuB,GAAG,CACrC,aAAwD,EACxD,KAAY,EACZ,EAAE;IACF,IAAI,CAAC,~~aAAa~~,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;~~IAErC~~,MAAM,uBAAuB,GAAG,~~aAAa~~,CAAC,GAAG,~~CAC/C~~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~~AAvIW~~,QAAA,uBAAuB,~~2BAuIlC~~;AAEF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,MAAM,IAAA,iDAAuB,EACnD,IAAA,yBAAe,GAAE,EACjB,KAAK,CACN,CAAC;IAEF,OAAO,~~CAAC,GAAG,EAAE,CAAC;IAEd,OAAO,~~IAAA,+BAAuB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACzD,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"}
1	+ {"version":3,"file":"clmmFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/raydium/helpers.js CHANGED Viewed

@@ -23,6 +23,7 @@ const U64Resolution = 64;
 const MaxUint128 = Q128.subn(1);
 const MIN_TICK = -307200;
 const MAX_TICK = -MIN_TICK;
+const U64_IGNORE_RANGE = new bn_js_1.default('18446744073700000000');
 function signedRightShift(n0, shiftBy, bitWidth) {
     const twoN0 = n0.toTwos(bitWidth).shrn(shiftBy);
     twoN0.imaskn(bitWidth - shiftBy + 1);
@@ -311,14 +312,14 @@ function getfeeGrowthInside(poolState, tickLowerState, tickUpperState) {
         feeGrowthAboveX64B = poolState.feeGrowthGlobalX64B.sub(tickUpperState.feeGrowthOutsideX64B);
     }
     const feeGrowthInsideX64A = wrappingSubU128(wrappingSubU128(poolState.feeGrowthGlobalX64A, feeGrowthBelowX64A), feeGrowthAboveX64A);
-    const feeGrowthInsideBX64 = wrappingSubU128(wrappingSubU128(poolState.feeGrowthGlobalX64B, feeGrowthBelowX64B), feeGrowthAboveX64B);
-    return { feeGrowthInsideX64A, feeGrowthInsideBX64 };
+    const feeGrowthInsideX64B = wrappingSubU128(wrappingSubU128(poolState.feeGrowthGlobalX64B, feeGrowthBelowX64B), feeGrowthAboveX64B);
+    return { feeGrowthInsideX64A, feeGrowthInsideX64B };
 }
 function GetPositionFeesV2(ammPool, positionState, tickLowerState, tickUpperState) {
-    const { feeGrowthInsideX64A, feeGrowthInsideBX64 } = getfeeGrowthInside(ammPool, tickLowerState, tickUpperState);
+    const { feeGrowthInsideX64A, feeGrowthInsideX64B } = getfeeGrowthInside(ammPool, tickLowerState, tickUpperState);
     const feeGrowthdeltaA = mulDivFloor(wrappingSubU128(feeGrowthInsideX64A, positionState.feeGrowthInsideLastX64A), positionState.liquidity, Q64);
     const tokenFeeAmountA = positionState.tokenFeesOwedA.add(feeGrowthdeltaA);
-    const feeGrowthdelta1 = mulDivFloor(wrappingSubU128(feeGrowthInsideBX64, positionState.feeGrowthInsideLastX64B), positionState.liquidity, Q64);
+    const feeGrowthdelta1 = mulDivFloor(wrappingSubU128(feeGrowthInsideX64B, positionState.feeGrowthInsideLastX64B), positionState.liquidity, Q64);
     const tokenFeeAmountB = positionState.tokenFeesOwedB.add(feeGrowthdelta1);
     return { tokenFeeAmountA, tokenFeeAmountB };
 }
@@ -378,9 +379,17 @@ const getFeesAndRewardsBalance = (personalPositionInfo, poolStateInfo, tickArray
     const fees = GetPositionFeesV2(ammPool, positionState, tickLowerS, tickUpperS);
     const rewards = GetPositionRewardsV2(ammPool, positionState, tickLowerS, tickUpperS);
     return {
-        tokenFeeAmountA: new bignumber_js_1.default(fees.tokenFeeAmountA.toString(10)),
-        tokenFeeAmountB: new bignumber_js_1.default(fees.tokenFeeAmountB.toString(10)),
-        rewards: rewards.map((bn) => new bignumber_js_1.default(bn.toString(10))),
+        tokenFeeAmountA: fees.tokenFeeAmountA.gte(ZERO) &&
+            fees.tokenFeeAmountA.lt(U64_IGNORE_RANGE)
+            ? new bignumber_js_1.default(fees.tokenFeeAmountA.toString(10))
+            : new bignumber_js_1.default(0),
+        tokenFeeAmountB: fees.tokenFeeAmountB.gte(ZERO) &&
+            fees.tokenFeeAmountB.lt(U64_IGNORE_RANGE)
+            ? new bignumber_js_1.default(fees.tokenFeeAmountB.toString(10))
+            : new bignumber_js_1.default(0),
+        rewards: rewards.map((bn) => bn.gte(ZERO) && bn.lt(U64_IGNORE_RANGE)
+            ? new bignumber_js_1.default(bn.toString(10))
+            : new bignumber_js_1.default(0)),
     };
 };
 exports.getFeesAndRewardsBalance = getFeesAndRewardsBalance;