@sonarwatch/portfolio-plugins 0.14.142 → 0.14.144

package/src/plugins/banx/{collectionsJob.js → vaultsJob.js}

@@ -15,30 +15,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
-/**
- * @deprecated
- * this job has been deprecated following protocol changes
- */
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const res = yield axios_1.default
-        .get(constants_1.banxApiCollectionsUrl, {
-        timeout: 5000,
-    })
-        .catch((err) => {
-        throw Error(`BANX_API ERR: ${err}`);
+    const resSpl = yield axios_1.default.get(constants_1.banxApiVaultsUrl, {
+        timeout: 3000,
     });
-    if (!res) {
-        throw Error(`BANX_API NO RESPONSE`);
-    }
-    yield cache.setItem(constants_1.collectionsCacheKey, res.data.data, {
+    yield cache.setItem(constants_1.vaultsCacheKey, resSpl.data.data, {
         prefix: constants_1.cachePrefix,
         networkId: portfolio_core_1.NetworkId.solana,
     });
 });
 const job = {
-    id: `${constants_1.platformId}-collections`,
+    id: `${constants_1.platformId}-vaults`,
     executor,
     labels: ['normal'],
 };
 exports.default = job;
-//# sourceMappingURL=collectionsJob.js.map
+//# sourceMappingURL=vaultsJob.js.map

package/src/plugins/banx/vaultsJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/banx/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA0B;AAG1B,2CAKqB;AAGrB,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,GAAG,CAAoB,4BAAgB,EAAE;QAClE,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,OAAO,CAAC,0BAAc,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;QACpD,MAAM,EAAE,uBAAW;QACnB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AAEF,kBAAe,GAAG,CAAC"}

package/src/plugins/jupiter/exchange/dcaFetcher.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const clients_1 = require("../../../utils/clients");
@@ -15,36 +18,82 @@ const solana_1 = require("../../../utils/solana");
 const constants_1 = require("./constants");
 const structs_1 = require("./structs");
 const filters_1 = require("./filters");
-const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
+const getCachedDecimalsForToken_1 = require("../../../utils/misc/getCachedDecimalsForToken");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)({ commitment: 'processed' });
     const accounts = yield (0, solana_1.getParsedProgramAccounts)(client, structs_1.dcaStruct, constants_1.dcaProgramId, (0, filters_1.DCAFilters)(owner));
     if (accounts.length === 0)
         return [];
-    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const mints = accounts
+        .map((account) => [
+        account.inputMint.toString(),
+        account.outputMint.toString(),
+    ])
+        .flat();
+    const pricesMap = yield cache.getTokenPricesAsMap(Array.from(mints), portfolio_core_1.NetworkId.solana);
+    const elements = [];
     for (let i = 0; i < accounts.length; i++) {
         const account = accounts[i];
-        const element = elementRegistry.addElementTrade({
+        const inputMint = account.inputMint.toString();
+        const inputTokenPrice = pricesMap.get(inputMint);
+        const outputMint = account.outputMint.toString();
+        const outputTokenPrice = pricesMap.get(outputMint);
+        // Decimals
+        const inputDecimals = (inputTokenPrice === null || inputTokenPrice === void 0 ? void 0 : inputTokenPrice.decimals) ||
+            (yield (0, getCachedDecimalsForToken_1.getCachedDecimalsForToken)(cache, inputMint, portfolio_core_1.NetworkId.solana));
+        if (!inputDecimals)
+            continue;
+        const outputDecimals = (outputTokenPrice === null || outputTokenPrice === void 0 ? void 0 : outputTokenPrice.decimals) ||
+            (yield (0, getCachedDecimalsForToken_1.getCachedDecimalsForToken)(cache, outputMint, portfolio_core_1.NetworkId.solana));
+        if (!outputDecimals)
+            continue;
+        const inputAmount = account.inDeposited
+            .minus(account.inUsed)
+            .div(Math.pow(10, inputDecimals))
+            .toNumber();
+        let inputAsset = null;
+        if (inputAmount !== 0)
+            inputAsset = (0, tokenPriceToAssetToken_1.default)(inputMint, inputAmount, portfolio_core_1.NetworkId.solana, inputTokenPrice);
+        const outputAmount = account.outReceived
+            .minus(account.outWithdrawn)
+            .div(Math.pow(10, outputDecimals))
+            .toNumber();
+        let outputAsset = null;
+        if (outputAmount !== 0)
+            outputAsset = (0, tokenPriceToAssetToken_1.default)(outputMint, outputAmount, portfolio_core_1.NetworkId.solana, outputTokenPrice);
+        const initialInputAmount = account.inDeposited
+            .div(Math.pow(10, inputDecimals))
+            .toNumber();
+        const element = {
+            networkId: portfolio_core_1.NetworkId.solana,
+            type: portfolio_core_1.PortfolioElementType.trade,
+            platformId: constants_1.platformId,
             label: 'DCA',
-            ref: account.pubkey.toString(),
-            link: 'https://jup.ag/recurring/',
-            contract: constants_1.dcaProgramId.toString(),
-        });
-        element.setTrade({
-            inputAsset: {
-                address: account.inputMint,
-                amount: account.inDeposited.minus(account.inUsed),
-            },
-            outputAsset: {
-                address: account.outputMint,
-                amount: account.outReceived.minus(account.outWithdrawn),
+            data: {
+                ref: account.pubkey.toString(),
+                assets: {
+                    input: inputAsset,
+                    output: outputAsset,
+                },
+                inputAddress: inputMint,
+                outputAddress: outputMint,
+                filledPercentage: 1 - inputAmount / initialInputAmount,
+                inputPrice: (inputTokenPrice === null || inputTokenPrice === void 0 ? void 0 : inputTokenPrice.price) || null,
+                outputPrice: (outputTokenPrice === null || outputTokenPrice === void 0 ? void 0 : outputTokenPrice.price) || null,
+                link: 'https://jup.ag/recurring/',
+                contract: constants_1.dcaProgramId.toString(),
+                initialInputAmount,
+                withdrawnOutputAmount: account.outWithdrawn
+                    .div(Math.pow(10, outputDecimals))
+                    .toNumber(),
+                createdAt: account.createdAt.toNumber() * 1000,
             },
-            initialInputAmount: account.inDeposited,
-            withdrawnOutputAmount: account.outWithdrawn,
-            createdAt: account.createdAt.toNumber() * 1000,
-        });
+            value: (0, portfolio_core_1.getUsdValueSum)([(inputAsset === null || inputAsset === void 0 ? void 0 : inputAsset.value) || 0, (outputAsset === null || outputAsset === void 0 ? void 0 : outputAsset.value) || 0]),
+        };
+        elements.push(element);
     }
-    return elementRegistry.getElements(cache);
+    return elements;
 });
 const fetcher = {
     id: `${constants_1.platformId}-dca`,

package/src/plugins/jupiter/exchange/dcaFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"dcaFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/dcaFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,oDAAyD;AACzD,kDAAiE;AACjE,2CAAuD;AACvD,uCAAsC;AACtC,uCAAuC;AACvC,mFAAgF;AAEhF,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5D,MAAM,QAAQ,GAAG,MAAM,IAAA,iCAAwB,EAC7C,MAAM,EACN,mBAAS,EACT,wBAAY,EACZ,IAAA,oBAAU,EAAC,KAAK,CAAC,CAClB,CAAC;IACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE5B,MAAM,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC;YAC9C,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC9B,IAAI,EAAE,2BAA2B;YACjC,QAAQ,EAAE,wBAAY,CAAC,QAAQ,EAAE;SAClC,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC;YACf,UAAU,EAAE;gBACV,OAAO,EAAE,OAAO,CAAC,SAAS;gBAC1B,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;aAClD;YACD,WAAW,EAAE;gBACX,OAAO,EAAE,OAAO,CAAC,UAAU;gBAC3B,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;aACxD;YACD,kBAAkB,EAAE,OAAO,CAAC,WAAW;YACvC,qBAAqB,EAAE,OAAO,CAAC,YAAY;YAC3C,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI;SAC/C,CAAC,CAAC;IACL,CAAC;IAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,MAAM;IACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"dcaFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/dcaFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/jupiter/exchange/limitFetcher.js

@@ -8,14 +8,18 @@ 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 clients_1 = require("../../../utils/clients");
 const solana_1 = require("../../../utils/solana");
 const constants_1 = require("./constants");
 const filters_1 = require("./filters");
-const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
 const structs_1 = require("./structs");
+const getCachedDecimalsForToken_1 = require("../../../utils/misc/getCachedDecimalsForToken");
+const tokenPriceToAssetToken_1 = __importDefault(require("../../../utils/misc/tokenPriceToAssetToken"));
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)({ commitment: 'processed' });
     const accountsRes = yield Promise.all([
@@ -28,34 +32,80 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const accounts = accountsRes.flat();
     if (accounts.length === 0)
         return [];
-    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const mints = accounts
+        .map((account) => [
+        account.inputMint.toString(),
+        account.outputMint.toString(),
+    ])
+        .flat();
+    const pricesMap = yield cache.getTokenPricesAsMap(Array.from(mints), portfolio_core_1.NetworkId.solana);
+    const elements = [];
     for (let i = 0; i < accounts.length; i++) {
         const account = accounts[i];
+        const inputMint = account.inputMint.toString();
+        const inputTokenPrice = pricesMap.get(inputMint);
+        const outputMint = account.outputMint.toString();
+        const outputTokenPrice = pricesMap.get(outputMint);
+        // Decimals
+        const inputDecimals = (inputTokenPrice === null || inputTokenPrice === void 0 ? void 0 : inputTokenPrice.decimals) ||
+            (yield (0, getCachedDecimalsForToken_1.getCachedDecimalsForToken)(cache, inputMint, portfolio_core_1.NetworkId.solana));
+        if (!inputDecimals)
+            continue;
+        const outputDecimals = (outputTokenPrice === null || outputTokenPrice === void 0 ? void 0 : outputTokenPrice.decimals) ||
+            (yield (0, getCachedDecimalsForToken_1.getCachedDecimalsForToken)(cache, outputMint, portfolio_core_1.NetworkId.solana));
+        if (!outputDecimals)
+            continue;
+        const intputAmount = account.makingAmount
+            .div(Math.pow(10, inputDecimals))
+            .toNumber();
+        const inputAsset = intputAmount === 0
+            ? null
+            : (0, tokenPriceToAssetToken_1.default)(inputMint, intputAmount, portfolio_core_1.NetworkId.solana, inputTokenPrice);
+        const outputAmount = account.oriTakingAmount
+            .minus(account.takingAmount)
+            .div(Math.pow(10, outputDecimals))
+            .toNumber();
+        const outputAsset = outputAmount === 0
+            ? null
+            : (0, tokenPriceToAssetToken_1.default)(outputMint, outputAmount, portfolio_core_1.NetworkId.solana, outputTokenPrice);
+        const initialInputAmount = account.oriMakingAmount
+            .div(Math.pow(10, inputDecimals))
+            .toNumber();
+        const expectedOutputAmount = account.oriTakingAmount
+            .div(Math.pow(10, outputDecimals))
+            .toNumber();
         const isV1 = i <= v1Length - 1;
-        const element = elementRegistry.addElementTrade({
-            tags: isV1 ? ['deprecated'] : undefined,
-            ref: account.pubkey.toString(),
-            link: 'https://jup.ag/trigger/',
+        const tags = isV1 ? ['deprecated'] : undefined;
+        const element = {
+            networkId: portfolio_core_1.NetworkId.solana,
             label: 'LimitOrder',
-            contract: isV1
-                ? constants_1.limitV1ProgramId.toString()
-                : constants_1.limitV2ProgramId.toString(),
-        });
-        element.setTrade({
-            inputAsset: {
-                address: account.inputMint,
-                amount: account.makingAmount,
-            },
-            outputAsset: {
-                address: account.outputMint,
-                amount: account.oriTakingAmount.minus(account.takingAmount),
+            platformId: constants_1.platformId,
+            type: portfolio_core_1.PortfolioElementType.trade,
+            tags,
+            data: {
+                assets: {
+                    input: inputAsset,
+                    output: outputAsset,
+                },
+                inputAddress: inputMint,
+                outputAddress: outputMint,
+                initialInputAmount,
+                expectedOutputAmount,
+                filledPercentage: 1 - intputAmount / initialInputAmount,
+                inputPrice: (inputTokenPrice === null || inputTokenPrice === void 0 ? void 0 : inputTokenPrice.price) || null,
+                outputPrice: (outputTokenPrice === null || outputTokenPrice === void 0 ? void 0 : outputTokenPrice.price) || null,
+                ref: account.pubkey.toString(),
+                link: 'https://jup.ag/trigger/',
+                contract: isV1
+                    ? constants_1.limitV1ProgramId.toString()
+                    : constants_1.limitV2ProgramId.toString(),
+                withdrawnOutputAmount: 0,
             },
-            initialInputAmount: account.oriMakingAmount,
-            expectedOutputAmount: account.oriTakingAmount,
-            withdrawnOutputAmount: 0,
-        });
+            value: (0, portfolio_core_1.getUsdValueSum)([(inputAsset === null || inputAsset === void 0 ? void 0 : inputAsset.value) || 0, (outputAsset === null || outputAsset === void 0 ? void 0 : outputAsset.value) || 0]),
+        };
+        elements.push(element);
     }
-    return elementRegistry.getElements(cache);
+    return elements;
 });
 const fetcher = {
     id: `${constants_1.platformId}-limit`,

package/src/plugins/jupiter/exchange/limitFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/limitFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,oDAAyD;AACzD,kDAAiE;AACjE,2CAA6E;AAC7E,uCAAyC;AACzC,mFAAgF;AAChF,uCAAiE;AAEjE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5D,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpC,KAAK;QACL,IAAA,iCAAwB,EACtB,MAAM,EACN,0BAAgB,EAChB,4BAAgB,EAChB,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB;QACD,KAAK;QACL,IAAA,iCAAwB,EACtB,MAAM,EACN,4BAAkB,EAClB,4BAAgB,EAChB,IAAA,sBAAY,EAAC,KAAK,CAAC,CACpB;KACF,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACvC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAE1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE5B,MAAM,IAAI,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC;QAE/B,MAAM,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC;YAC9C,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;YACvC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC9B,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,YAAY;YACnB,QAAQ,EAAE,IAAI;gBACZ,CAAC,CAAC,4BAAgB,CAAC,QAAQ,EAAE;gBAC7B,CAAC,CAAC,4BAAgB,CAAC,QAAQ,EAAE;SAChC,CAAC,CAAC;QAEH,OAAO,CAAC,QAAQ,CAAC;YACf,UAAU,EAAE;gBACV,OAAO,EAAE,OAAO,CAAC,SAAS;gBAC1B,MAAM,EAAE,OAAO,CAAC,YAAY;aAC7B;YACD,WAAW,EAAE;gBACX,OAAO,EAAE,OAAO,CAAC,UAAU;gBAC3B,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;aAC5D;YACD,kBAAkB,EAAE,OAAO,CAAC,eAAe;YAC3C,oBAAoB,EAAE,OAAO,CAAC,eAAe;YAC7C,qBAAqB,EAAE,CAAC;SACzB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"limitFetcher.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/jupiter/exchange/limitFetcher.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/switchboard/onDemandPricingJob.js

@@ -15,7 +15,7 @@ const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const constants_2 = require("../tokens/constants");
 const getSwitchboardOnDemandPrice_1 = require("./helpers/getSwitchboardOnDemandPrice");
-const getCachedDecimalsForToken_1 = require("../../utils/misc/getCachedDecimalsForToken");
+const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
 const solana_1 = require("../../utils/solana");
 const feedsToFetch = [
     {
@@ -43,7 +43,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const sources = [];
     for (const tokenInfo of feedsToFetch) {
         const values = yield (0, getSwitchboardOnDemandPrice_1.getSwitchboardOnDemandPrices)(connection, tokenInfo.feedsAddresses.map((t) => new web3_js_1.PublicKey(t)));
-        const decimals = yield (0, getCachedDecimalsForToken_1.getDecimalsForToken)(tokenInfo.mintAddress, portfolio_core_1.NetworkId.solana);
+        const decimals = yield (0, getDecimalsForToken_1.getDecimalsForToken)(tokenInfo.mintAddress, portfolio_core_1.NetworkId.solana);
         tokenInfo.feedsAddresses.forEach((feedToFetch, i) => {
             const price = values.at(i);
             if (!price || !decimals)

package/src/plugins/switchboard/onDemandPricingJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"onDemandPricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/switchboard/onDemandPricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,2CAAyC;AACzC,iDAAsD;AACtD,mDAA2D;AAC3D,uFAAqF;AACrF,0FAAiF;AAEjF,+CAAmE;AAEnE,MAAM,YAAY,GAAkC;IAClD;QACE,cAAc,EAAE;YACd,8CAA8C;YAC9C,8CAA8C;YAC9C,8CAA8C;SAC/C;QACD,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,WAAW,EAAE,2CAA0B;KACxC;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,uBAAc;QAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,sBAAa;QAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;CACF,CAAC;AAEF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAA,0DAA4B,EAC/C,UAAU,EACV,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,+CAAmB,EACxC,SAAS,CAAC,WAAW,EACrB,0BAAS,CAAC,MAAM,CACjB,CAAC;QAEF,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEhC,MAAM,MAAM,GAAqB;gBAC/B,OAAO,EAAE,SAAS,CAAC,WAAW;gBAC9B,QAAQ;gBACR,EAAE,EAAE,GAAG,sBAAU,SAAS,WAAW,CAAC,QAAQ,EAAE,EAAE;gBAClD,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,UAAU,EAAE,gCAAoB,CAAC,EAAE;gBACnC,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,KAAK;aACN,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,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,mBAAmB;IACpC,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"onDemandPricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/switchboard/onDemandPricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AACpC,6CAA4C;AAG5C,2CAAyC;AACzC,iDAAsD;AACtD,mDAA2D;AAC3D,uFAAqF;AACrF,8EAA2E;AAE3E,+CAAmE;AAEnE,MAAM,YAAY,GAAkC;IAClD;QACE,cAAc,EAAE;YACd,8CAA8C;YAC9C,8CAA8C;YAC9C,8CAA8C;SAC/C;QACD,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,WAAW,EAAE,2CAA0B;KACxC;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,uBAAc;QAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,sBAAa;QAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;CACF,CAAC;AAEF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAA,0DAA4B,EAC/C,UAAU,EACV,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,yCAAmB,EACxC,SAAS,CAAC,WAAW,EACrB,0BAAS,CAAC,MAAM,CACjB,CAAC;QAEF,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEhC,MAAM,MAAM,GAAqB;gBAC/B,OAAO,EAAE,SAAS,CAAC,WAAW;gBAC9B,QAAQ;gBACR,EAAE,EAAE,GAAG,sBAAU,SAAS,WAAW,CAAC,QAAQ,EAAE,EAAE;gBAClD,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,UAAU,EAAE,gCAAoB,CAAC,EAAE;gBACnC,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,KAAK;aACN,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,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,mBAAmB;IACpC,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,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/utils/misc/getCachedDecimalsForToken.d.ts

@@ -1,7 +1,6 @@
 import { NetworkIdType } from '@sonarwatch/portfolio-core';
 import { Cache } from '../../Cache';
 type Decimal = number | null;
-export declare function getDecimalsForToken(address: string, networkId: NetworkIdType): Promise<Decimal>;
 /**
  * Return the decimals of a token on any network using RPC calls or TokenList.
  *

package/src/utils/misc/getCachedDecimalsForToken.js

@@ -9,60 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCachedDecimalsForToken = exports.getDecimalsForToken = void 0;
+exports.getCachedDecimalsForToken = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const web3_js_1 = require("@solana/web3.js");
-const core_1 = require("@sei-js/core");
-const clients_1 = require("../clients");
-const constants_1 = require("../clients/constants");
-const sei_1 = require("../sei");
-const getDecimals_1 = require("../aptos/getDecimals");
-const getDecimals_2 = require("../solana/getDecimals");
-const getDecimals_3 = require("../sui/getDecimals");
 const MemoizedCache_1 = require("./MemoizedCache");
+const getDecimalsForToken_1 = require("./getDecimalsForToken");
 const ttl = 60 * 60 * 24;
 const decimalsMemo = new Map();
-function getDecimalsForToken(address, networkId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch (networkId) {
-            case 'aptos': {
-                const client = (0, clients_1.getClientAptos)();
-                return (0, getDecimals_1.getDecimals)(client, address);
-            }
-            case 'solana': {
-                const client = (0, clients_1.getClientSolana)();
-                return (0, getDecimals_2.getDecimals)(client, new web3_js_1.PublicKey(address));
-            }
-            case 'sei': {
-                if (address.startsWith('factory')) {
-                    const client = yield (0, clients_1.getClientSei)();
-                    const rep = yield client.cosmos.bank.v1beta1.denomMetadata({
-                        denom: address,
-                    });
-                    const denoms = rep.metadata.denomUnits;
-                    return denoms[denoms.length - 1].exponent;
-                }
-                if (address.startsWith('ibc')) {
-                    // No solution yet for IBC tokens
-                    return null;
-                }
-                if (address.startsWith('sei')) {
-                    const client = yield (0, core_1.getCosmWasmClient)((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.sei));
-                    const tokenInfo = (yield client.queryContractSmart(address, sei_1.tokenInfoQueryMsg));
-                    return tokenInfo.decimals || null;
-                }
-                return null;
-            }
-            case 'sui': {
-                const client = (0, clients_1.getClientSui)();
-                return (0, getDecimals_3.getDecimals)(client, address);
-            }
-            default:
-                throw new Error('getDecimalsForToken : Network not supported');
-        }
-    });
-}
-exports.getDecimalsForToken = getDecimalsForToken;
 /**
  * Return the decimals of a token on any network using RPC calls or TokenList.
  *
@@ -80,7 +32,7 @@ function getCachedDecimalsForToken(cache, address, networkId) {
             decimalMemo = new MemoizedCache_1.MemoizedCache((0, portfolio_core_1.formatTokenAddress)(address, networkId), {
                 prefix: 'decimalsfortoken',
                 networkId,
-            }, undefined, ttl, () => __awaiter(this, void 0, void 0, function* () { return getDecimalsForToken(address, networkId); }));
+            }, undefined, ttl, () => __awaiter(this, void 0, void 0, function* () { return (0, getDecimalsForToken_1.getDecimalsForToken)(address, networkId); }));
             decimalsMemo.set(key, decimalMemo);
         }
         return decimalMemo.getItem(cache);

package/src/utils/misc/getCachedDecimalsForToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCachedDecimalsForToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getCachedDecimalsForToken.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getCachedDecimalsForToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getCachedDecimalsForToken.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA+E;AAE/E,mDAAgD;AAChD,+DAA4D;AAG5D,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEzB,MAAM,YAAY,GAAwC,IAAI,GAAG,EAAE,CAAC;AAEpE;;;;;;;;GAQG;AACH,SAAsB,yBAAyB,CAC7C,KAAY,EACZ,OAAe,EACf,SAAwB;;QAExB,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,IAAA,mCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;QAErE,IAAI,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAExC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,WAAW,GAAG,IAAI,6BAAa,CAC7B,IAAA,mCAAkB,EAAC,OAAO,EAAE,SAAS,CAAC,EACtC;gBACE,MAAM,EAAE,kBAAkB;gBAC1B,SAAS;aACV,EACD,SAAS,EACT,GAAG,EACH,GAAS,EAAE,gDAAC,OAAA,IAAA,yCAAmB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAA,GAAA,CACpD,CAAC;YACF,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAxBD,8DAwBC"}

package/src/utils/misc/getDecimalsForToken.d.ts

@@ -0,0 +1,4 @@
+import { NetworkIdType } from '@sonarwatch/portfolio-core';
+type Decimal = number | null;
+export declare function getDecimalsForToken(address: string, networkId: NetworkIdType): Promise<Decimal>;
+export {};

package/src/utils/misc/getDecimalsForToken.js

@@ -0,0 +1,63 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDecimalsForToken = void 0;
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
+const core_1 = require("@sei-js/core");
+const clients_1 = require("../clients");
+const constants_1 = require("../clients/constants");
+const sei_1 = require("../sei");
+const getDecimals_1 = require("../aptos/getDecimals");
+const getDecimals_2 = require("../solana/getDecimals");
+const getDecimals_3 = require("../sui/getDecimals");
+function getDecimalsForToken(address, networkId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        switch (networkId) {
+            case 'aptos': {
+                const client = (0, clients_1.getClientAptos)();
+                return (0, getDecimals_1.getDecimals)(client, address);
+            }
+            case 'solana': {
+                const client = (0, clients_1.getClientSolana)();
+                return (0, getDecimals_2.getDecimals)(client, new web3_js_1.PublicKey(address));
+            }
+            case 'sei': {
+                if (address.startsWith('factory')) {
+                    const client = yield (0, clients_1.getClientSei)();
+                    const rep = yield client.cosmos.bank.v1beta1.denomMetadata({
+                        denom: address,
+                    });
+                    const denoms = rep.metadata.denomUnits;
+                    return denoms[denoms.length - 1].exponent;
+                }
+                if (address.startsWith('ibc')) {
+                    // No solution yet for IBC tokens
+                    return null;
+                }
+                if (address.startsWith('sei')) {
+                    const client = yield (0, core_1.getCosmWasmClient)((0, constants_1.getUrlEndpoint)(portfolio_core_1.NetworkId.sei));
+                    const tokenInfo = (yield client.queryContractSmart(address, sei_1.tokenInfoQueryMsg));
+                    return tokenInfo.decimals || null;
+                }
+                return null;
+            }
+            case 'sui': {
+                const client = (0, clients_1.getClientSui)();
+                return (0, getDecimals_3.getDecimals)(client, address);
+            }
+            default:
+                throw new Error('getDecimalsForToken : Network not supported');
+        }
+    });
+}
+exports.getDecimalsForToken = getDecimalsForToken;
+//# sourceMappingURL=getDecimalsForToken.js.map

package/src/utils/misc/getDecimalsForToken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDecimalsForToken.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/getDecimalsForToken.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAsE;AACtE,6CAA4C;AAC5C,uCAAiD;AACjD,wCAKoB;AACpB,oDAAsD;AACtD,gCAAsD;AACtD,sDAAuE;AACvE,uDAAyE;AACzE,oDAAmE;AAInE,SAAsB,mBAAmB,CACvC,OAAe,EACf,SAAwB;;QAExB,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,MAAM,MAAM,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAChC,OAAO,IAAA,yBAAgB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC3C,CAAC;YACD,KAAK,QAAQ,CAAC,CAAC,CAAC;gBACd,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;gBACjC,OAAO,IAAA,yBAAiB,EAAC,MAAM,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3D,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAClC,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAY,GAAE,CAAC;oBACpC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;wBACzD,KAAK,EAAE,OAAO;qBACf,CAAC,CAAC;oBACH,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;oBACvC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC5C,CAAC;gBACD,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,iCAAiC;oBACjC,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAA,0BAAc,EAAC,0BAAS,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtE,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,kBAAkB,CAChD,OAAO,EACP,uBAAiB,CAClB,CAAc,CAAC;oBAChB,OAAO,SAAS,CAAC,QAAQ,IAAI,IAAI,CAAC;gBACpC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;gBAC9B,OAAO,IAAA,yBAAc,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACzC,CAAC;YACD;gBACE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;CAAA;AA3CD,kDA2CC"}