carbon-js-sdk 0.3.39 → 0.3.40

package/lib/clients/TokenClient.d.ts

@@ -1,4 +1,4 @@
-import { Token } from "../codec";
+import { Token, TokenPrice } from "../codec";
 import { NetworkConfigProvider } from "../constant";
 import { FeeQuote } from "../hydrogen/feeQuote";
 import { BlockchainUtils, TypeUtils } from "../util";
@@ -57,6 +57,8 @@ declare class TokenClient {
     reloadDenomGeckoMap(): Promise<void>;
     reloadUSDValues(denoms?: string[]): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getUSDValuesFromCoinGecko(geckoIds: string[]): Promise<any>;
+    processTokenPrices(tokenPrices: TokenPrice[]): TypeUtils.SimpleMap<BigNumber>;
+    getUSDValuesFromPricingModule(): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getDenomToGeckoIdMap(): Promise<TypeUtils.SimpleMap<string>>;
     setCommonAssetConfig(): void;
 }

package/lib/clients/TokenClient.js

@@ -415,25 +415,30 @@ class TokenClient {
             this.usdValues.iusd = number_1.BN_ONE;
             //Get corresponding geckoId for denoms and removes any duplicated geckoIds (espeically for different wrapped tokens as they correspond to the same geckoId(same price))
             const geckoIds = denoms.reduce((coinIds, denom) => {
-                var _a;
-                const geckoId = (_a = this.geckoTokenNames[denom]) !== null && _a !== void 0 ? _a : denom;
+                // To ensure that ibc denoms are not added to the gecko ids list, the default is removed.
+                const geckoId = this.geckoTokenNames[denom];
                 if (geckoId && !coinIds.includes(geckoId)) {
                     coinIds.push(geckoId);
                 }
                 return coinIds;
             }, []);
             const geckoIdToUsdPriceMap = yield this.getUSDValuesFromCoinGecko(geckoIds);
+            const carbonTokenPrices = yield this.getUSDValuesFromPricingModule();
             const uscStablecoin = this.getNativeStablecoin();
             //store price based on denoms
             for (const denom of denoms) {
+                const carbonTokenPrice = carbonTokenPrices[denom];
+                // if token price in pricing module exists for denom, return that as usd price first
+                // else check coingecko
+                if (carbonTokenPrice) {
+                    this.usdValues[denom] = carbonTokenPrice;
+                    continue;
+                }
                 const coinId = (_a = this.geckoTokenNames[denom]) !== null && _a !== void 0 ? _a : denom;
                 const price = util_1.NumberUtils.bnOrZero((_b = geckoIdToUsdPriceMap === null || geckoIdToUsdPriceMap === void 0 ? void 0 : geckoIdToUsdPriceMap[coinId]) === null || _b === void 0 ? void 0 : _b.usd);
                 if (price.gt(0)) {
-                    if (denom === (uscStablecoin === null || uscStablecoin === void 0 ? void 0 : uscStablecoin.denom)) {
-                        this.usdValues[denom] = constant_1.uscUsdValue;
-                        continue;
-                    }
-                    this.usdValues[denom] = price;
+                    // if denom is usc, then return uscUsdValue, else return coingecko usd price
+                    this.usdValues[denom] = denom === (uscStablecoin === null || uscStablecoin === void 0 ? void 0 : uscStablecoin.denom) ? constant_1.uscUsdValue : price;
                 }
             }
             return this.usdValues;
@@ -441,10 +446,45 @@ class TokenClient {
     }
     getUSDValuesFromCoinGecko(geckoIds) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield util_1.FetchUtils.fetch(`https://coingecko-proxy.dem.exchange/price?ids=${geckoIds.join(",")}&vs_currencies=usd`);
+            const response = yield util_1.FetchUtils.fetch(`https://coingecko-proxy.dem.exchange/api/v3/simple/price?ids=${geckoIds.join(",")}&vs_currencies=usd`);
             return yield response.json();
         });
     }
+    processTokenPrices(tokenPrices) {
+        return tokenPrices.reduce((prevPrices, price) => {
+            const newPrev = prevPrices;
+            newPrev[price.denom] = number_1.bnOrZero(price.twap).shiftedBy(-constant_1.decTypeDecimals);
+            return newPrev;
+        }, {});
+    }
+    getUSDValuesFromPricingModule() {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            const initTokenPrices = yield this.query.pricing.TokenPriceAll({
+                pagination: {
+                    limit: new long_1.default(10000),
+                    offset: new long_1.default(0),
+                    key: new Uint8Array(),
+                    countTotal: true,
+                    reverse: false,
+                },
+            });
+            if (((_a = initTokenPrices.pagination) === null || _a === void 0 ? void 0 : _a.total) && ((_b = initTokenPrices.pagination) === null || _b === void 0 ? void 0 : _b.total.lt(10000))) {
+                const tokenPricesMap = this.processTokenPrices(initTokenPrices.tokenPrices);
+                return tokenPricesMap;
+            }
+            const fullTokenPrices = yield this.query.pricing.TokenPriceAll({
+                pagination: {
+                    limit: (_d = (_c = initTokenPrices.pagination) === null || _c === void 0 ? void 0 : _c.total) !== null && _d !== void 0 ? _d : new long_1.default(0),
+                    offset: new long_1.default(0),
+                    key: new Uint8Array(),
+                    countTotal: true,
+                    reverse: false,
+                },
+            });
+            return this.processTokenPrices(fullTokenPrices.tokenPrices);
+        });
+    }
     getDenomToGeckoIdMap() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.3.39",
+  "version": "0.3.40",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",