@sonarwatch/portfolio-plugins 0.15.27 → 0.15.29

package/src/plugins/solayer/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/airdropFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/solayer/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAA8D;AAC9D,kDAA6C;AAC7C,gEAAqC;AACrC,6CAA4C;AAC5C,yDAK8B;AAC9B,2CAMqB;AAErB,iDAAsD;AACtD,0FAAuF;AACvF,+CAAwD;AAExD,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,IAAI,GAAmC,CAAC;IACxC,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,sBAAU,GAAG,KAAK,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,GAAG;QAC3C,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAExD,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAkB,EAC5C,MAAM,EACN,IAAI,mBAAS,CAAC,8CAA8C,CAAC,EAC7D;QACE;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,aAAa;aACrB;SACF;QACD;YACE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,KAAK;aACb;SACF;KACF,CACF,CAAC;IACF,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAEtC,IAAI,MAAM,GAAY,EAAE,CAAC;IACzB,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,qBAAS,CAAC,CAAC;IAC7E,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,SAAA,EAAE,EAAI,yBAAa,CAAA,CAAC,CAAC,QAAQ,EAAE;gBAC7D,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,MAAM;gBACN,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;aAC/D;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;AACW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,iBAAiB,EACjB,0BAAc,CAAC,QAAQ,CACxB,CAAC"}

package/src/plugins/sonic/airdropFetcher.js

@@ -8,18 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetcher = exports.airdropFetcher = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const axios_1 = __importDefault(require("axios"));
+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 res = yield axios_1.default.get(constants_1.airdropApi + owner);
-    if (!res.data.length)
+    const client = (0, clients_1.getClientSolana)();
+    const account = yield ParsedGpa_1.ParsedGpa.build(client, structs_1.airdropProofStruct, new web3_js_1.PublicKey('magnaSHyv8zzKJJmr8NSz5JXmtdGDTTFPEADmvNAwbj'))
+        .addDataSizeFilter(127)
+        .addFilter('discriminator', [7, 25, 94, 15, 208, 170, 4, 103])
+        .addFilter('user', new web3_js_1.PublicKey(owner))
+        .run();
+    if (!account.length)
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: constants_1.airdropStatics,
             items: [
@@ -31,20 +37,16 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
                 },
             ],
         });
-    let amount = 0;
-    let claimedAmount = 0;
-    for (const airdrop of res.data) {
-        amount += airdrop.total;
-        claimedAmount += airdrop.claimed;
-    }
+    const claims = (yield Promise.all(account.map((acc) => (0, getClaimTransactions_1.getClaimTransactions)(owner, acc.pubkey.toString(), constants_1.sonicMint)))).flat();
     return (0, AirdropFetcher_1.getAirdropRaw)({
         statics: constants_1.airdropStatics,
         items: [
             {
-                amount,
-                isClaimed: claimedAmount === amount,
+                amount: claims.reduce((acc, claim) => acc + claim.amount, 0),
+                isClaimed: true,
                 label: 'SONIC',
                 address: constants_1.sonicMint,
+                claims,
             },
         ],
     });

package/src/plugins/sonic/airdropFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAC7C,yDAK8B;AAC9B,2CAAgF;AAGhF,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,GAAG,GAAqC,MAAM,eAAK,CAAC,GAAG,CAC3D,sBAAU,GAAG,KAAK,CACnB,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM;QAClB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;QACxB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IACnC,CAAC;IAED,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM;gBACN,SAAS,EAAE,aAAa,KAAK,MAAM;gBACnC,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;aACnB;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;AACW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,eAAe,EACf,0BAAc,CAAC,QAAQ,CACxB,CAAC"}
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAC5C,yDAK8B;AAC9B,2CAAoE;AACpE,iDAAsD;AACtD,kEAA+D;AAC/D,uCAA+C;AAC/C,0FAAuF;AAEvF,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,OAAO,GAAG,MAAM,qBAAS,CAAC,KAAK,CACnC,MAAM,EACN,4BAAkB,EAClB,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAC7D;SACE,iBAAiB,CAAC,GAAG,CAAC;SACtB,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SAC7D,SAAS,CAAC,MAAM,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SACvC,GAAG,EAAE,CAAC;IAET,IAAI,CAAC,OAAO,CAAC,MAAM;QACjB,OAAO,IAAA,8BAAa,EAAC;YACnB,OAAO,EAAE,0BAAc;YACvB,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,CAAC;oBACT,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,qBAAS;iBACnB;aACF;SACF,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAClB,IAAA,2CAAoB,EAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,qBAAS,CAAC,CAC9D,CACF,CACF,CAAC,IAAI,EAAE,CAAC;IAET,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5D,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,OAAO;gBACd,OAAO,EAAE,qBAAS;gBAClB,MAAM;aACP;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;AACW,QAAA,OAAO,GAAG,IAAA,wCAAuB,EAC5C,sBAAc,EACd,sBAAU,EACV,eAAe,EACf,0BAAc,CAAC,QAAQ,CACxB,CAAC"}

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

@@ -24,3 +24,10 @@ export type UserStakeIndex = {
     index: number;
 };
 export declare const userStakeIndexStruct: FixableBeetStruct<UserStakeIndex, Partial<UserStakeIndex>>;
+export type AirdropProof = {
+    discriminator: number[];
+    offset: Buffer;
+    user: PublicKey;
+    padding: Buffer;
+};
+export declare const airdropProofStruct: FixableBeetStruct<AirdropProof, Partial<AirdropProof>>;

package/src/plugins/sonic/structs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userStakeIndexStruct = exports.StakeTypeEnum = void 0;
+exports.airdropProofStruct = exports.userStakeIndexStruct = exports.StakeTypeEnum = void 0;
 const beet_1 = require("@metaplex-foundation/beet");
 const beet_solana_1 = require("@metaplex-foundation/beet-solana");
 const solana_1 = require("../../utils/solana");
@@ -24,4 +24,10 @@ exports.userStakeIndexStruct = new beet_1.FixableBeetStruct([
     ['user', beet_solana_1.publicKey],
     ['index', beet_1.u32],
 ], (args) => args);
+exports.airdropProofStruct = new beet_1.FixableBeetStruct([
+    ['discriminator', (0, beet_1.uniformFixedSizeArray)(beet_1.u8, 8)],
+    ['offset', (0, solana_1.blob)(77)],
+    ['user', beet_solana_1.publicKey],
+    ['padding', (0, solana_1.blob)(10)],
+], (args) => args);
 //# sourceMappingURL=structs.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/structs.ts"],"names":[],"mappings":";;;AAAA,oDAMmC;AACnC,kEAA6D;AAG7D,+CAAoD;AAEpD,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,uDAAO,CAAA;IACP,qDAAM,CAAA;AACR,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAkBY,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,WAAI,CAAC;IAChB,CAAC,YAAY,EAAE,WAAI,CAAC;IACpB,CAAC,MAAM,EAAE,UAAG,CAAC;IACb,CAAC,WAAW,EAAE,SAAE,CAAC;IACjB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,UAAG,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC"}
+{"version":3,"file":"structs.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/sonic/structs.ts"],"names":[],"mappings":";;;AAAA,oDAOmC;AACnC,kEAA6D;AAG7D,+CAAoD;AAEpD,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,uDAAO,CAAA;IACP,qDAAM,CAAA;AACR,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAkBY,QAAA,oBAAoB,GAAG,IAAI,wBAAiB,CACvD;IACE,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,CAAC,CAAC,CAAC;IACnB,CAAC,oBAAoB,EAAE,YAAG,CAAC;IAC3B,CAAC,SAAS,EAAE,YAAG,CAAC;IAChB,CAAC,OAAO,EAAE,YAAG,CAAC;IACd,CAAC,YAAY,EAAE,YAAG,CAAC;IACnB,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,YAAG,CAAC;IACf,CAAC,QAAQ,EAAE,WAAI,CAAC;IAChB,CAAC,YAAY,EAAE,WAAI,CAAC;IACpB,CAAC,MAAM,EAAE,UAAG,CAAC;IACb,CAAC,WAAW,EAAE,SAAE,CAAC;IACjB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,OAAO,EAAE,UAAG,CAAC;CACf,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAsB,CACjC,CAAC;AASW,QAAA,kBAAkB,GAAG,IAAI,wBAAiB,CACrD;IACE,CAAC,eAAe,EAAE,IAAA,4BAAqB,EAAC,SAAE,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,QAAQ,EAAE,IAAA,aAAI,EAAC,EAAE,CAAC,CAAC;IACpB,CAAC,MAAM,EAAE,uBAAS,CAAC;IACnB,CAAC,SAAS,EAAE,IAAA,aAAI,EAAC,EAAE,CAAC,CAAC;CACtB,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAoB,CAC/B,CAAC"}

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

@@ -10,4 +10,5 @@ export declare const pid: PublicKey;
 export declare const merklePid: PublicKey;
 export declare const stakePid: PublicKey;
 export declare const airdropApi = "https://api.streamflow.foundation/v2/api/airdrop-recipients/check-eligibility";
+export declare const streamflowApi = "https://api-public.streamflow.finance/v2/api/";
 export declare const airdropStatics: AirdropStatics;

package/src/plugins/streamflow/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.airdropStatics = exports.airdropApi = exports.stakePid = exports.merklePid = exports.pid = exports.streamflowProgramId = exports.platformImg = exports.platformId = exports.streamMint = void 0;
+exports.airdropStatics = exports.streamflowApi = exports.airdropApi = exports.stakePid = exports.merklePid = exports.pid = exports.streamflowProgramId = exports.platformImg = exports.platformId = exports.streamMint = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.streamMint = 'STREAMribRwybYpMmSYoCsQUdr6MZNXEqHgm7p1gu9M';
 exports.platformId = 'streamflow';
@@ -10,6 +10,7 @@ exports.pid = new web3_js_1.PublicKey('aSTRM2NKoKxNnkmLWk9sz3k74gKBk9t7bpPrTGxMs
 exports.merklePid = new web3_js_1.PublicKey('MErKy6nZVoVAkryxAejJz2juifQ4ArgLgHmaJCQkU7N');
 exports.stakePid = new web3_js_1.PublicKey('STAKEvGqQTtzJZH6BWDcbpzXXn2BBerPAgQ3EGLN2GH');
 exports.airdropApi = 'https://api.streamflow.foundation/v2/api/airdrop-recipients/check-eligibility';
+exports.streamflowApi = 'https://api-public.streamflow.finance/v2/api/';
 exports.airdropStatics = {
     claimLink: 'https://streamflow.foundation/',
     emitterLink: 'https://streamflow.foundation/',

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,WAAW,GACtB,gFAAgF,CAAC;AACtE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,6CAA6C,CAC9C,CAAC;AACW,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,+EAA+E,CAAC;AAErE,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,gCAAgC;IAC3C,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE,YAAY;IACzB,EAAE,EAAE,oBAAoB;IACxB,KAAK,EACH,gFAAgF;IAClF,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAE,aAAa;CAC1B,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,6CAA6C,CAAC;AAC3D,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,WAAW,GACtB,gFAAgF,CAAC;AACtE,QAAA,mBAAmB,GAAG,IAAI,mBAAS,CAC9C,6CAA6C,CAC9C,CAAC;AACW,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,SAAS,GAAG,IAAI,mBAAS,CACpC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,6CAA6C,CAC9C,CAAC;AAEW,QAAA,UAAU,GACrB,+EAA+E,CAAC;AAErE,QAAA,aAAa,GAAG,+CAA+C,CAAC;AAEhE,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,gCAAgC;IAC3C,WAAW,EAAE,gCAAgC;IAC7C,WAAW,EAAE,YAAY;IACzB,EAAE,EAAE,oBAAoB;IACxB,KAAK,EACH,gFAAgF;IAClF,QAAQ,EAAE,aAAa;IACvB,UAAU,EAAE,aAAa;CAC1B,CAAC"}

package/src/plugins/streamflow/helpers.js

@@ -22,8 +22,8 @@ const airdropAddresses_1 = require("./airdropAddresses");
 function getPda(owner, distributor) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from([67, 108, 97, 105, 109, 83, 116, 97, 116, 117, 115]),
-        Buffer.from(owner),
-        Buffer.from(distributor),
+        new web3_js_1.PublicKey(owner).toBuffer(),
+        new web3_js_1.PublicKey(distributor).toBuffer(),
     ], constants_1.merklePid)[0];
 }
 exports.getPda = getPda;

package/src/plugins/streamflow/helpers.js.map

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

package/src/plugins/streamflow/merkleFetcher.js

@@ -8,12 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
-const clients_1 = require("../../utils/clients");
-const solana_1 = require("../../utils/solana");
-const structs_1 = require("./structs");
 const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
 const helpers_1 = require("./helpers");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
@@ -22,36 +24,35 @@ const merkleMemo = new MemoizedCache_1.MemoizedCache('merkles', {
     networkId: portfolio_core_1.NetworkId.solana,
 });
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const client = (0, clients_1.getClientSolana)();
     const merkles = yield merkleMemo.getItem(cache);
     if (!merkles)
         throw new Error('No active merkles found in cache');
-    const pdas = (0, helpers_1.getPdas)(owner, merkles.map((m) => m.address));
-    // This will only return accounts that exist
-    // meaning if the user didn't start to claim we won't but able to find his account
-    const claimAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, structs_1.claimStatusStruct, pdas);
+    const apiResponses = yield Promise.all(merkles.map((merkle) => axios_1.default
+        .get(`${constants_1.streamflowApi}/airdrops/${merkle.address}/claimants/${owner}`)
+        .then((response) => response.data)
+        .catch(() => undefined)));
     const registry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
-    for (let i = 0; i < claimAccounts.length; i += 1) {
-        const claim = claimAccounts[i];
-        if (!claim)
+    for (let i = 0; i < apiResponses.length; i += 1) {
+        const allocationStatus = apiResponses[i];
+        if (!allocationStatus)
             continue;
         const merkle = merkles[i];
-        if (claim.closed)
+        if (allocationStatus.chain !== 'SOLANA')
             continue;
         const element = registry.addElementMultiple({
             label: 'Airdrop',
             link: `https://app.streamflow.finance/airdrops/solana/mainnet/${merkle.address}`,
-            ref: claim.pubkey.toString(),
+            ref: (0, helpers_1.getPda)(owner, allocationStatus.distributorAddress),
             sourceRefs: [{ address: merkle.address, name: 'Distributor' }],
         });
         element.addAsset({
             address: merkle.mint,
-            amount: claim.unlockedAmount.minus(claim.lockedAmountWithdrawn),
+            amount: new bignumber_js_1.default(allocationStatus.amountUnlocked).minus(allocationStatus.amountClaimed),
             attributes: { isClaimable: true },
         });
         element.addAsset({
             address: merkle.mint,
-            amount: claim.lockedAmount.minus(claim.lockedAmountWithdrawn),
+            amount: new bignumber_js_1.default(allocationStatus.amountLocked),
             attributes: { lockedUntil: -1 },
         });
     }

package/src/plugins/streamflow/merkleFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"merkleFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/merkleFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAyC;AACzC,iDAAsD;AACtD,+CAAmE;AACnE,uCAA8C;AAC9C,kEAA+D;AAC/D,uCAAoC;AAEpC,gFAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,6BAAa,CAAe,SAAS,EAAE;IAC5D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAElE,MAAM,IAAI,GAAG,IAAA,iBAAO,EAClB,KAAK,EACL,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAC9B,CAAC;IAEF,4CAA4C;IAC5C,kFAAkF;IAClF,MAAM,aAAa,GAAG,MAAM,IAAA,sCAA6B,EACvD,MAAM,EACN,2BAAiB,EACjB,IAAI,CACL,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,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,CAAC,KAAK;YAAE,SAAS;QAErB,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,MAAM;YAAE,SAAS;QAE3B,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,0DAA0D,MAAM,CAAC,OAAO,EAAE;YAChF,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC5B,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SAC/D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC;YAC/D,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,qBAAqB,CAAC;YAC7D,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE;SAChC,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,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"merkleFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/merkleFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA0B;AAC1B,gEAAqC;AAGrC,2CAAwD;AACxD,kEAA+D;AAC/D,uCAAmC;AAEnC,gFAA6E;AAE7E,MAAM,UAAU,GAAG,IAAI,6BAAa,CAAe,SAAS,EAAE;IAC5D,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACrB,eAAK;SACF,GAAG,CAAC,GAAG,yBAAa,aAAa,MAAM,CAAC,OAAO,cAAc,KAAK,EAAE,CAAC;SACrE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAwB,CAAC;SACrD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAC1B,CACF,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB;YAAE,SAAS;QAEhC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,gBAAgB,CAAC,KAAK,KAAK,QAAQ;YAAE,SAAS;QAElD,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,0DAA0D,MAAM,CAAC,OAAO,EAAE;YAChF,GAAG,EAAE,IAAA,gBAAM,EAAC,KAAK,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;YACvD,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SAC/D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,sBAAS,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC,KAAK,CAC1D,gBAAgB,CAAC,aAAa,CAC/B;YACD,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,sBAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACpD,UAAU,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE;SAChC,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,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -11,6 +11,15 @@ export type Data = {
     cexWalletAddress: null;
     allocation: string;
 };
+export type AirdropsResponse = {
+    chain: string;
+    distributorAddress: string;
+    address: string;
+    amountUnlocked: string;
+    amountLocked: string;
+    amountClaimed: string;
+    proof: number[];
+};
 export type MerkleInfo = {
     address: string;
     mint: string;

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/tensor/airdropPowerUsersFetcher.js

@@ -22,7 +22,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     if (!(0, helpers_1.ownerHasPowerUserAllocation)(owner))
         return [];
     const connection = (0, clients_1.getClientSolana)();
-    const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magmaProgramId), (0, filters_1.vestingFilter)(owner), 1);
+    const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magnaProgramId), (0, filters_1.vestingFilter)(owner), 1);
     if (!accounts.length)
         return [];
     const tokenAccounts = yield connection.getParsedTokenAccountsByOwner(accounts[0].pubkey, { mint: new web3_js_1.PublicKey(constants_1.tnsrMint) });

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

@@ -5,6 +5,6 @@ import { AirdropStatics } from '../../AirdropFetcher';
 export declare const tnsrMint = "TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6";
 export declare const platformId = "tensor";
 export declare const tensorPid: PublicKey;
-export declare const magmaProgramId = "3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy";
+export declare const magnaProgramId = "3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy";
 export declare const s4Statics: AirdropStatics;
 export declare const powerUsersStatics: AirdropStatics;

package/src/plugins/tensor/constants.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.powerUsersStatics = exports.s4Statics = exports.magmaProgramId = exports.tensorPid = exports.platformId = exports.tnsrMint = void 0;
+exports.powerUsersStatics = exports.s4Statics = exports.magnaProgramId = exports.tensorPid = exports.platformId = exports.tnsrMint = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.tnsrMint = 'TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6';
 exports.platformId = 'tensor';
 exports.tensorPid = new web3_js_1.PublicKey('TSWAPaqyCSx2KABk68Shruf4rp7CxcNi8hAsbdwmHbN');
-exports.magmaProgramId = '3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy';
+exports.magnaProgramId = '3zK38YBP6u3BpLUpaa6QhRHh4VXdv3J8cmD24fFpuyqy';
 exports.s4Statics = {
     claimStart: 1738281600000,
     claimEnd: 1753963200000,

package/src/plugins/tensor/powerUserAirdropFetcher.js

@@ -38,7 +38,7 @@ const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
             ],
         });
     const connection = (0, clients_1.getClientSolana)();
-    const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magmaProgramId), (0, filters_1.vestingFilter)(owner), 1);
+    const accounts = yield (0, solana_1.getParsedProgramAccounts)(connection, struct_1.vestingAccountStruct, new web3_js_1.PublicKey(constants_1.magnaProgramId), (0, filters_1.vestingFilter)(owner), 1);
     if (!accounts.length)
         return (0, AirdropFetcher_1.getAirdropRaw)({
             statics: constants_1.powerUsersStatics,

package/src/plugins/tokens/fetchers/solana-simple.js

@@ -17,6 +17,7 @@ const web3_js_1 = require("@solana/web3.js");
 const clients_1 = require("../../../utils/clients");
 const solana_1 = require("../../../utils/solana");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
+const zeroDecimalMints_1 = require("../../../utils/solana/zeroDecimalMints");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = yield (0, clients_1.getClientSolana)();
     const promises = [
@@ -28,15 +29,14 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         }),
     ];
     const res = yield Promise.all(promises);
-    const accounts = [...res[0].value, ...res[1].value].filter((acc) => acc.account.data.parsed.info.tokenAmount.decimals !== 0 &&
-        acc.account.data.parsed.info.tokenAmount.uiAmount !== 0);
+    const accounts = [...res[0].value, ...res[1].value].filter((acc) => acc.account.data.parsed.info.tokenAmount.uiAmount !== 0 &&
+        (acc.account.data.parsed.info.tokenAmount.decimals !== 0 ||
+            zeroDecimalMints_1.zeroDecimalMints.has(acc.account.data.parsed.info.mint)));
     const tokenPrices = yield cache.getTokenPricesAsMap(accounts.map((a) => a.account.data.parsed.info.mint), portfolio_core_1.NetworkId.solana);
     const tokenAssets = [];
     accounts.forEach((acc) => {
         const { mint, tokenAmount } = acc.account.data.parsed.info;
-        const { uiAmount: amount, decimals } = tokenAmount;
-        if (decimals === 0)
-            return;
+        const { uiAmount: amount } = tokenAmount;
         const tokenPrice = tokenPrices.get(mint);
         if (tokenPrice && tokenPrice.platformId !== portfolio_core_1.walletTokensPlatformId)
             return;

package/src/plugins/tokens/fetchers/solana-simple.js.map

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

package/src/plugins/tokens/getTokenListsJob.js

@@ -53,7 +53,7 @@ function getTokenListsJob(networkId) {
     const job = {
         id: `token-lists-${networkId}`,
         executor,
-        labels: ['normal'],
+        labels: ['normal', 'evm', networkId],
     };
     return job;
 }

package/src/plugins/tokens/getTokenListsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTokenListsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tokens/getTokenListsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,kDAA6C;AAG7C,2CAA+C;AAC/C,uCAA4C;AAE5C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS;AAE9C,SAAS,gBAAgB,CAAC,SAAwB;IAChD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,yBAAQ,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,SAAS,GAAuC,MAAM,eAAK;aAC9D,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;aACzB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,OAAO,CAAe,SAAS,EAAE;YACnE,MAAM,EAAE,4BAAgB;SACzB,CAAC,CAAC;QAEH,IACE,eAAe;YACf,CAAC,IAAA,yBAAe,EAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,EACjE,CAAC;YACD,OAAO;QACT,CAAC;QAED,2DAA2D;QAC3D,4CAA4C;QAC5C,kEAAkE;QAClE,qBAAqB;QACrB,gBAAgB;QAChB,eAAe;QACf,OAAO;QACP,2CAA2C;QAC3C,uCAAuC;QACvC,iBAAiB;QACjB,WAAW;QACX,QAAQ;QACR,IAAI;QACJ,MAAM,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE;YAC7C,MAAM,EAAE,4BAAgB;YACxB,GAAG;SACJ,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;IACF,MAAM,GAAG,GAAQ;QACf,EAAE,EAAE,eAAe,SAAS,EAAE;QAC9B,QAAQ;QACR,MAAM,EAAE,CAAC,QAAQ,CAAC;KACnB,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AACD,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"getTokenListsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tokens/getTokenListsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAIoC;AACpC,kDAA6C;AAG7C,2CAA+C;AAC/C,uCAA4C;AAE5C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,SAAS;AAE9C,SAAS,gBAAgB,CAAC,SAAwB;IAChD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,yBAAQ,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,SAAS,GAAuC,MAAM,eAAK;aAC9D,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;aACzB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,OAAO,CAAe,SAAS,EAAE;YACnE,MAAM,EAAE,4BAAgB;SACzB,CAAC,CAAC;QAEH,IACE,eAAe;YACf,CAAC,IAAA,yBAAe,EAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,EACjE,CAAC;YACD,OAAO;QACT,CAAC;QAED,2DAA2D;QAC3D,4CAA4C;QAC5C,kEAAkE;QAClE,qBAAqB;QACrB,gBAAgB;QAChB,eAAe;QACf,OAAO;QACP,2CAA2C;QAC3C,uCAAuC;QACvC,iBAAiB;QACjB,WAAW;QACX,QAAQ;QACR,IAAI;QACJ,MAAM,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE;YAC7C,MAAM,EAAE,4BAAgB;YACxB,GAAG;SACJ,CAAC,CAAC;IACL,CAAC,CAAA,CAAC;IACF,MAAM,GAAG,GAAQ;QACf,EAAE,EAAE,eAAe,SAAS,EAAE;QAC9B,QAAQ;QACR,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC;KACrC,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AACD,kBAAe,gBAAgB,CAAC"}

package/src/plugins/uniswap-v2/helpers.js

@@ -40,28 +40,28 @@ function getPairKey(version) {
 exports.getPairKey = getPairKey;
 function getPairsV2FromTheGraph(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pairs(
-        orderBy: reserveUSD
-        first: ${length}
-        orderDirection: desc
-        where: { trackedReserveETH_not: "0" }
-      ) {
-        id
-        reserve0
-        reserve1
-        totalSupply
-        token0 {
-          id
-          decimals
-        }
-        token1 {
-          id
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pairs(
+        orderBy: reserveUSD
+        first: ${length}
+        orderDirection: desc
+        where: { trackedReserveETH_not: "0" }
+      ) {
+        id
+        reserve0
+        reserve1
+        totalSupply
+        token0 {
+          id
+          decimals
+        }
+        token1 {
+          id
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pairs = res.pairs;

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

@@ -0,0 +1,5 @@
+/// <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';
+export declare const platformId = "wasabi";
+export declare const pid: PublicKey;

package/src/plugins/wasabi/constants.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pid = exports.platformId = void 0;
+const web3_js_1 = require("@solana/web3.js");
+exports.platformId = 'wasabi';
+exports.pid = new web3_js_1.PublicKey('spicyTHtbmarmUxwFSHYpA8G4uP2nRNq38RReMpoZ9c');
+//# sourceMappingURL=constants.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wasabi/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC"}

package/src/plugins/wasabi/index.d.ts

@@ -0,0 +1,4 @@
+import { Fetcher } from '../../Fetcher';
+import { Job } from '../../Job';
+export declare const jobs: Job[];
+export declare const fetchers: Fetcher[];

package/src/plugins/wasabi/index.js

@@ -0,0 +1,13 @@
+"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 lpVaultsJob_1 = __importDefault(require("./lpVaultsJob"));
+// import depositsFetcher from './positionsFetcher';
+exports.jobs = [lpVaultsJob_1.default];
+exports.fetchers = [
+//  depositsFetcher
+];
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wasabi/index.ts"],"names":[],"mappings":";;;;;;AAEA,gEAAwC;AACxC,oDAAoD;AAEvC,QAAA,IAAI,GAAU,CAAC,qBAAW,CAAC,CAAC;AAC5B,QAAA,QAAQ,GAAc;AACjC,mBAAmB;CACpB,CAAC"}

package/src/plugins/wasabi/lpVaultsJob.d.ts

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

package/src/plugins/wasabi/lpVaultsJob.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
+const clients_1 = require("../../utils/clients");
+const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
+const solana_1 = require("../../utils/solana");
+const structs_1 = require("./structs");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const connection = (0, clients_1.getClientSolana)();
+    const lpVaults = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.lpVaultStruct, constants_1.pid)
+        .addFilter('discriminator', [189, 45, 167, 23, 91, 118, 105, 190])
+        .run();
+    const [mintAccounts, tokenPricesMap] = yield Promise.all([
+        (0, solana_1.getParsedMultipleAccountsInfo)(connection, solana_1.mintAccountStruct, lpVaults.map((vault) => vault.sharesMint)),
+        cache.getTokenPricesAsMap(lpVaults.map((vault) => vault.asset.toString()), portfolio_core_1.NetworkId.solana),
+    ]);
+    const sources = [];
+    for (let i = 0; i < lpVaults.length; i++) {
+        const mintAccount = mintAccounts[i];
+        if (!mintAccount)
+            continue;
+        const lpVault = lpVaults[i];
+        const assetPrice = tokenPricesMap.get(lpVault.asset.toString());
+        if (!assetPrice)
+            continue;
+        const { totalAssets, sharesMint } = lpVault;
+        const sPrice = totalAssets
+            .dividedBy(mintAccount.supply)
+            .times(assetPrice.price);
+        sources.push({
+            address: sharesMint.toString(),
+            decimals: mintAccount.decimals,
+            price: sPrice.toNumber(),
+            networkId: portfolio_core_1.NetworkId.solana,
+            id: lpVault.pubkey.toString(),
+            platformId: constants_1.platformId,
+            timestamp: Date.now(),
+            weight: 1,
+            link: `https://app.wasabi.xyz/?earn=${lpVault.sharesMint.toString()}&network=solana&chain=solana`,
+        });
+    }
+    yield cache.setTokenPriceSources(sources);
+});
+const job = {
+    id: `${constants_1.platformId}-lp-vaults`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=lpVaultsJob.js.map

package/src/plugins/wasabi/lpVaultsJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lpVaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/wasabi/lpVaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAyE;AAGzE,2CAA8C;AAC9C,iDAAsD;AACtD,kEAA+D;AAC/D,+CAG4B;AAC5B,uCAA0C;AAE1C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,qBAAS,CAAC,KAAK,CAAC,UAAU,EAAE,uBAAa,EAAE,eAAG,CAAC;SACnE,SAAS,CAAC,eAAe,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SACjE,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvD,IAAA,sCAA6B,EAC3B,UAAU,EACV,0BAAiB,EACjB,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAC1C;QACD,KAAK,CAAC,mBAAmB,CACvB,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAC/C,0BAAS,CAAC,MAAM,CACjB;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE5B,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAE5C,MAAM,MAAM,GAAG,WAAW;aACvB,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC;aAC7B,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC;YACX,OAAO,EAAE,UAAU,CAAC,QAAQ,EAAE;YAC9B,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE;YACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC7B,UAAU,EAAV,sBAAU;YACV,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,MAAM,EAAE,CAAC;YACT,IAAI,EAAE,gCAAgC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,8BAA8B;SAClG,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}