@sonarwatch/portfolio-plugins 0.12.28 → 0.12.29

package/src/plugins/raydium/clmmJob.js

@@ -13,30 +13,129 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const constants_1 = require("./constants");
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
-const tokenPricesFromSqrt_1 = __importDefault(require("../../utils/clmm/tokenPricesFromSqrt"));
+const tokenPricesFromSqrt_1 = require("../../utils/clmm/tokenPricesFromSqrt");
 const clmms_1 = require("./structs/clmms");
 const filters_1 = require("./filters");
+const getLpUnderlyingTokenSource_1 = require("../../utils/misc/getLpUnderlyingTokenSource");
+const constants_2 = require("../../utils/misc/constants");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const clmmPoolsInfo = yield (0, solana_1.getParsedProgramAccounts)(client, clmms_1.poolStateStruct, constants_1.raydiumProgram, filters_1.clmmPoolsStateFilter);
+    const allPoolsPubkeys = yield client.getProgramAccounts(constants_1.raydiumProgram, {
+        filters: filters_1.clmmPoolsStateFilter,
+        dataSlice: { offset: 0, length: 0 },
+    });
+    const acceptedPairs = getLpUnderlyingTokenSource_1.defaultAcceptedPairs.get(portfolio_core_1.NetworkId.solana);
+    if (!acceptedPairs)
+        return;
+    const step = 100;
+    const tokenPriceSources = [];
     const promises = [];
-    for (let id = 0; id < clmmPoolsInfo.length; id++) {
-        const poolState = clmmPoolsInfo[id];
-        if (poolState.liquidity.isZero())
-            continue;
-        const reserve0 = yield client.getBalance(poolState.tokenVault0);
-        const reserve1 = yield client.getBalance(poolState.tokenVault1);
-        promises.push((0, tokenPricesFromSqrt_1.default)(cache, portfolio_core_1.NetworkId.solana, poolState.pubkey.toString(), new bignumber_js_1.default(reserve0), new bignumber_js_1.default(reserve1), poolState.sqrtPriceX64, poolState.tokenMint0.toString(), poolState.tokenMint1.toString()));
-        promises.push(cache.setItem(poolState.pubkey.toString(), poolState, {
-            prefix: constants_1.poolStatesPrefix,
-            networkId: portfolio_core_1.NetworkId.solana,
-        }));
+    let clmmPoolsInfo;
+    let tokenAccounts;
+    let tokenPriceById;
+    for (let offset = 0; offset < allPoolsPubkeys.length; offset += step) {
+        const tokenAccountsPkeys = [];
+        const mints = new Set();
+        clmmPoolsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, allPoolsPubkeys.slice(offset, offset + step).map((res) => res.pubkey));
+        clmmPoolsInfo.forEach((pI) => {
+            if (!pI)
+                return;
+            mints.add(pI.tokenMint0.toString());
+            mints.add(pI.tokenMint1.toString());
+            tokenAccountsPkeys.push(pI.tokenVault0, pI.tokenVault1);
+        });
+        [tokenAccounts, tokenPriceById] = yield Promise.all([
+            (0, solana_1.getParsedMultipleAccountsInfo)(client, solana_1.tokenAccountStruct, tokenAccountsPkeys),
+            cache.getTokenPricesAsMap(Array.from(mints), portfolio_core_1.NetworkId.solana),
+        ]);
+        const tokenAccountsMap = new Map();
+        tokenAccounts.forEach((tA) => {
+            if (!tA)
+                return;
+            tokenAccountsMap.set(tA.pubkey.toString(), tA);
+        });
+        let mintA;
+        let mintB;
+        let unknownPrice;
+        let decimalA;
+        let decimalB;
+        let poolState;
+        let refLiquidity;
+        let priceAToB;
+        let refTokenPrice;
+        let refTokenAccount;
+        for (let id = 0; id < clmmPoolsInfo.length; id++) {
+            poolState = clmmPoolsInfo[id];
+            if (!poolState || poolState.liquidity.isZero())
+                continue;
+            mintA = poolState.tokenMint0.toString();
+            mintB = poolState.tokenMint1.toString();
+            decimalA = poolState.mintDecimals0;
+            decimalB = poolState.mintDecimals1;
+            let refMint;
+            let unkMint;
+            let refTokenVault;
+            let aToB;
+            let refDecimal;
+            let unkDecimal;
+            if (acceptedPairs.includes(mintA)) {
+                refMint = mintA;
+                unkMint = mintB;
+                refTokenVault = poolState.tokenVault0.toString();
+                aToB = true;
+                refDecimal = decimalA;
+                unkDecimal = decimalB;
+            }
+            else if (acceptedPairs.includes(mintB)) {
+                refMint = mintB;
+                unkMint = mintA;
+                refTokenVault = poolState.tokenVault1.toString();
+                aToB = false;
+                refDecimal = decimalB;
+                unkDecimal = decimalA;
+            }
+            else {
+                continue;
+            }
+            refTokenPrice = tokenPriceById.get(refMint);
+            if (!refTokenPrice)
+                continue;
+            refTokenAccount = tokenAccountsMap.get(refTokenVault);
+            if (!refTokenAccount)
+                continue;
+            refLiquidity = refTokenAccount.amount
+                .times(refTokenPrice.price)
+                .dividedBy(Math.pow(10, refDecimal));
+            if (refLiquidity.isLessThan(constants_2.minimumReserveValue))
+                continue;
+            priceAToB = (0, tokenPricesFromSqrt_1.sqrtPriceX64ToPrice)(poolState.sqrtPriceX64, decimalA, decimalB);
+            unknownPrice = aToB
+                ? new decimal_js_1.default(refTokenPrice.price).dividedBy(priceAToB).toNumber()
+                : new decimal_js_1.default(refTokenPrice.price).times(priceAToB).toNumber();
+            tokenPriceSources.push({
+                address: unkMint,
+                decimals: unkDecimal,
+                id: constants_1.platformId,
+                networkId: portfolio_core_1.NetworkId.solana,
+                platformId: constants_1.platformId,
+                price: unknownPrice,
+                timestamp: Date.now(),
+                weight: 1,
+            });
+            promises.push(cache.setItem(poolState.pubkey.toString(), poolState, {
+                prefix: constants_1.poolStatesPrefix,
+                networkId: portfolio_core_1.NetworkId.solana,
+            }));
+        }
+        yield Promise.all([
+            ...promises,
+            cache.setTokenPriceSources(tokenPriceSources),
+        ]);
     }
-    yield Promise.all(promises);
 });
 const job = {
     id: `${constants_1.platformId}-clmm`,

package/src/plugins/raydium/clmmJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"clmmJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,2CAA2E;AAC3E,+CAA8D;AAC9D,iDAAsD;AAGtD,+FAA4E;AAC5E,2CAAkD;AAClD,uCAAiD;AAEjD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,aAAa,GAAG,MAAM,IAAA,iCAAwB,EAClD,MAAM,EACN,uBAAe,EACf,0BAAc,EACd,8BAAoB,CACrB,CAAC;IAEF,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,aAAa,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE;YAAE,SAAS;QAE3C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAChE,QAAQ,CAAC,IAAI,CACX,IAAA,6BAAwB,EACtB,KAAK,EACL,0BAAS,CAAC,MAAM,EAChB,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC3B,IAAI,sBAAS,CAAC,QAAQ,CAAC,EACvB,IAAI,sBAAS,CAAC,QAAQ,CAAC,EACvB,SAAS,CAAC,YAAY,EACtB,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC/B,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,CAChC,CACF,CAAC;QAEF,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE;YACpD,MAAM,EAAE,4BAAgB;YACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;SAC5B,CAAC,CACH,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"clmmJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/raydium/cpmmJob.js

@@ -18,74 +18,88 @@ const cpmm_1 = require("./structs/cpmm");
 const getLpTokenSourceRaw_1 = require("../../utils/misc/getLpTokenSourceRaw");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const clmmPoolsInfo = yield (0, solana_1.getParsedProgramAccounts)(client, cpmm_1.poolStateStruct, constants_1.cpmmProgramId, filters_1.cpmmPoolsStateFilter);
-    const tokenAccountsPkeys = [];
-    const mints = new Set();
-    clmmPoolsInfo.forEach((pI) => {
-        mints.add(pI.token0Mint.toString());
-        mints.add(pI.token1Mint.toString());
-        tokenAccountsPkeys.push(...[pI.token0Vault, pI.token1Vault]);
-    });
-    const [tokenAccounts, tokenPriceById] = yield Promise.all([
-        (0, solana_1.getParsedMultipleAccountsInfo)(client, solana_1.tokenAccountStruct, tokenAccountsPkeys),
-        cache.getTokenPricesAsMap(Array.from(mints), portfolio_core_1.NetworkId.solana),
-    ]);
-    const tokenAccountsMap = new Map();
-    tokenAccounts.forEach((tA) => {
-        if (!tA)
-            return;
-        tokenAccountsMap.set(tA.pubkey.toString(), tA);
+    const allPoolsPubkeys = yield client.getProgramAccounts(constants_1.cpmmProgramId, {
+        filters: filters_1.cpmmPoolsStateFilter,
+        dataSlice: { offset: 0, length: 0 },
     });
+    const step = 100;
     const tokenPriceSources = [];
-    for (let id = 0; id < clmmPoolsInfo.length; id++) {
-        const poolState = clmmPoolsInfo[id];
-        const mintA = poolState.token0Mint.toString();
-        const mintB = poolState.token1Mint.toString();
-        const tokenAccountA = tokenAccountsMap.get(poolState.token0Vault.toString());
-        const tokenAccountB = tokenAccountsMap.get(poolState.token1Vault.toString());
-        if (!tokenAccountA || !tokenAccountB)
-            continue;
-        const decimalsA = poolState.mint0Decimals;
-        const decimalsB = poolState.mint1Decimals;
-        const tokenAmountARaw = tokenAccountA.amount;
-        const tokenAmountBRaw = tokenAccountB.amount;
-        if (tokenAmountARaw.isZero() && tokenAmountBRaw.isZero())
-            continue;
-        const [tokenPriceA, tokenPriceB] = [
-            tokenPriceById.get(mintA),
-            tokenPriceById.get(mintB),
-        ];
-        const { lpMint, lpMintDecimals, lpSupply } = poolState;
-        if (lpSupply.isZero())
-            continue;
-        tokenPriceSources.push(...(0, getLpTokenSourceRaw_1.getLpTokenSourceRaw)({
-            networkId: portfolio_core_1.NetworkId.solana,
-            lpDetails: {
-                address: lpMint.toString(),
-                decimals: lpMintDecimals,
-                supplyRaw: lpSupply,
-            },
-            poolUnderlyingsRaw: [
-                {
-                    address: mintA,
-                    decimals: decimalsA,
-                    tokenPrice: tokenPriceA,
-                    reserveAmountRaw: tokenAmountARaw,
-                    weight: 0.5,
-                },
-                {
-                    address: mintB,
-                    decimals: decimalsB,
-                    tokenPrice: tokenPriceB,
-                    reserveAmountRaw: tokenAmountBRaw,
-                    weight: 0.5,
+    let cpmmPoolsInfo;
+    let tokenAccounts;
+    let tokenPriceById;
+    for (let offset = 0; offset < allPoolsPubkeys.length; offset += step) {
+        const tokenAccountsPkeys = [];
+        const mints = new Set();
+        cpmmPoolsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, cpmm_1.poolStateStruct, allPoolsPubkeys.slice(offset, offset + step).map((res) => res.pubkey));
+        cpmmPoolsInfo.forEach((pI) => {
+            if (!pI)
+                return;
+            mints.add(pI.token0Mint.toString());
+            mints.add(pI.token1Mint.toString());
+            tokenAccountsPkeys.push(...[pI.token0Vault, pI.token1Vault]);
+        });
+        [tokenAccounts, tokenPriceById] = yield Promise.all([
+            (0, solana_1.getParsedMultipleAccountsInfo)(client, solana_1.tokenAccountStruct, tokenAccountsPkeys),
+            cache.getTokenPricesAsMap(Array.from(mints), portfolio_core_1.NetworkId.solana),
+        ]);
+        const tokenAccountsMap = new Map();
+        tokenAccounts.forEach((tA) => {
+            if (!tA)
+                return;
+            tokenAccountsMap.set(tA.pubkey.toString(), tA);
+        });
+        for (let id = 0; id < cpmmPoolsInfo.length; id++) {
+            const poolState = cpmmPoolsInfo[id];
+            if (!poolState)
+                continue;
+            const mintA = poolState.token0Mint.toString();
+            const mintB = poolState.token1Mint.toString();
+            const tokenAccountA = tokenAccountsMap.get(poolState.token0Vault.toString());
+            const tokenAccountB = tokenAccountsMap.get(poolState.token1Vault.toString());
+            if (!tokenAccountA || !tokenAccountB)
+                continue;
+            const decimalsA = poolState.mint0Decimals;
+            const decimalsB = poolState.mint1Decimals;
+            const tokenAmountARaw = tokenAccountA.amount;
+            const tokenAmountBRaw = tokenAccountB.amount;
+            if (tokenAmountARaw.isZero() && tokenAmountBRaw.isZero())
+                continue;
+            const [tokenPriceA, tokenPriceB] = [
+                tokenPriceById.get(mintA),
+                tokenPriceById.get(mintB),
+            ];
+            const { lpMint, lpMintDecimals, lpSupply } = poolState;
+            if (lpSupply.isZero())
+                continue;
+            tokenPriceSources.push(...(0, getLpTokenSourceRaw_1.getLpTokenSourceRaw)({
+                networkId: portfolio_core_1.NetworkId.solana,
+                lpDetails: {
+                    address: lpMint.toString(),
+                    decimals: lpMintDecimals,
+                    supplyRaw: lpSupply,
                 },
-            ],
-            sourceId: poolState.pubkey.toString(),
-            elementName: 'CPMM',
-            platformId: constants_1.platformId,
-            priceUnderlyings: true,
-        }));
+                poolUnderlyingsRaw: [
+                    {
+                        address: mintA,
+                        decimals: decimalsA,
+                        tokenPrice: tokenPriceA,
+                        reserveAmountRaw: tokenAmountARaw,
+                        weight: 0.5,
+                    },
+                    {
+                        address: mintB,
+                        decimals: decimalsB,
+                        tokenPrice: tokenPriceB,
+                        reserveAmountRaw: tokenAmountBRaw,
+                        weight: 0.5,
+                    },
+                ],
+                sourceId: poolState.pubkey.toString(),
+                elementName: 'CPMM',
+                platformId: constants_1.platformId,
+                priceUnderlyings: true,
+            }));
+        }
     }
     yield cache.setTokenPriceSources(tokenPriceSources);
 });

package/src/plugins/raydium/cpmmJob.js.map

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

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/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/whalesmarket/constants.d.ts

@@ -3,3 +3,6 @@ import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "whalesmarket";
 export declare const platform: Platform;
 export declare const pid: PublicKey;
+export declare const whalesApi = "https://api-v2.whales.market/v2/tokens/";
+export declare const tokensKey = "tokens";
+export declare const lastCountKey = "lastCount";

package/src/plugins/whalesmarket/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pid = exports.platform = exports.platformId = void 0;
+exports.lastCountKey = exports.tokensKey = exports.whalesApi = exports.pid = exports.platform = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'whalesmarket';
 exports.platform = {
@@ -12,4 +12,7 @@ exports.platform = {
     twitter: 'https://twitter.com/WhalesMarket',
 };
 exports.pid = new web3_js_1.PublicKey('stPdYNaJNsV3ytS9Xtx4GXXXRcVqVS6x66ZFa26K39S');
+exports.whalesApi = 'https://api-v2.whales.market/v2/tokens/';
+exports.tokensKey = 'tokens';
+exports.lastCountKey = 'lastCount';
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/whalesmarket/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,cAAc,CAAC;AAC5B,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,oDAAoD;IAC3D,WAAW,EAAE,eAAe,EAAE,sCAAsC;IACpE,OAAO,EAAE,4BAA4B;IACrC,OAAO,EAAE,kCAAkC;CAC5C,CAAC;AAEW,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/whalesmarket/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,cAAc,CAAC;AAC5B,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,oDAAoD;IAC3D,WAAW,EAAE,eAAe,EAAE,sCAAsC;IACpE,OAAO,EAAE,4BAA4B;IACrC,OAAO,EAAE,kCAAkC;CAC5C,CAAC;AAEW,QAAA,GAAG,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AACnE,QAAA,SAAS,GAAG,yCAAyC,CAAC;AACtD,QAAA,SAAS,GAAG,QAAQ,CAAC;AACrB,QAAA,YAAY,GAAG,WAAW,CAAC"}