carbon-js-sdk 0.11.0 → 0.11.1

package/lib/clients/TokenClient.d.ts

@@ -16,6 +16,7 @@ declare class TokenClient {
     readonly bridges: BridgeMap;
     readonly symbols: TypeUtils.SimpleMap<string>;
     readonly usdValues: TypeUtils.SimpleMap<BigNumber>;
+    readonly commonAssetNames: TypeUtils.SimpleMap<string>;
     readonly geckoTokenNames: TypeUtils.SimpleMap<string>;
     initialUsdValuesLoaded: boolean;
     private additionalGeckoDenoms;
@@ -23,13 +24,14 @@ declare class TokenClient {
     static instance(query: CarbonQueryClient, configProvider: NetworkConfigProvider): TokenClient;
     initialize(): Promise<void>;
     registerGeckoIdMap(map: TypeUtils.SimpleMap<string>): void;
+    getCommonDenom(denom: string): string;
     getDecimals(denom: string): number | undefined;
     getBlockchain(denom: string): BlockchainUtils.Blockchain | BlockchainUtils.BlockchainV2 | undefined;
     getBlockchainV2(denom: string | undefined): BlockchainUtils.BlockchainV2 | undefined;
     /**
      * use getTokenName directly instead
      * @deprecated
-     */
+    */
     getSymbol(denom: string): string;
     getUSDValue(denom: string): BigNumber | undefined;
     toHuman(denom: string, unitlessAmt: BigNumber): BigNumber;
@@ -80,6 +82,6 @@ declare class TokenClient {
     processTokenPrices(tokenPrices: Carbon.Pricing.TokenPrice[]): TypeUtils.SimpleMap<BigNumber>;
     getUSDValuesFromPricingModule(): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getDenomToGeckoIdMap(): Promise<TypeUtils.SimpleMap<string>>;
-    setGeckoTokenNames(): void;
+    setCommonAssetConfig(): void;
 }
 export default TokenClient;

package/lib/clients/TokenClient.js

@@ -51,6 +51,7 @@ class TokenClient {
         this.bridges = { polynetwork: [], ibc: [] };
         this.symbols = {};
         this.usdValues = {};
+        this.commonAssetNames = constant_1.CommonAssetName;
         this.geckoTokenNames = constant_1.CoinGeckoTokenNames;
         this.initialUsdValuesLoaded = false;
         this.additionalGeckoDenoms = {};
@@ -67,7 +68,7 @@ class TokenClient {
     }
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.setGeckoTokenNames();
+            this.setCommonAssetConfig();
             try {
                 yield Promise.all([
                     this.reloadTokens(),
@@ -86,6 +87,10 @@ class TokenClient {
     registerGeckoIdMap(map) {
         this.additionalGeckoDenoms = Object.assign(Object.assign({}, this.additionalGeckoDenoms), map);
     }
+    getCommonDenom(denom) {
+        var _a;
+        return (_a = this.commonAssetNames[denom]) !== null && _a !== void 0 ? _a : denom;
+    }
     getDecimals(denom) {
         var _a, _b, _c;
         return (_c = ((_b = (_a = this.tokens[denom]) !== null && _a !== void 0 ? _a : this.poolTokens[denom]) !== null && _b !== void 0 ? _b : this.cdpTokens[denom])) === null || _c === void 0 ? void 0 : _c.decimals.toNumber();
@@ -122,10 +127,14 @@ class TokenClient {
     /**
      * use getTokenName directly instead
      * @deprecated
-     */
+    */
     getSymbol(denom) {
-        var _a;
-        return (_a = this.symbols[denom]) !== null && _a !== void 0 ? _a : denom;
+        var _a, _b;
+        if (TokenClient.isCdpToken(denom)) {
+            return (_a = this.symbols[denom]) !== null && _a !== void 0 ? _a : denom;
+        }
+        const commonDenom = this.getCommonDenom(denom);
+        return (_b = this.symbols[commonDenom]) !== null && _b !== void 0 ? _b : commonDenom.toUpperCase();
     }
     getUSDValue(denom) {
         return this.usdValues[denom];
@@ -170,13 +179,13 @@ class TokenClient {
         });
     }
     getTokenName(denom, overrideMap) {
-        var _a, _b;
+        var _a;
         if (typeof denom !== "string")
             return "";
         if (!TokenClient.isIBCDenom(denom) && !TokenClient.isCdpIbcDenom(denom)) {
             denom = denom.toLowerCase();
         }
-        const symbol = (_a = this.symbols[denom]) !== null && _a !== void 0 ? _a : denom;
+        const symbol = this.getSymbol(denom);
         if (TokenClient.isPoolTokenLegacy(denom)) {
             const match = symbol.match(/^([a-z\d.-/]+)-(\d+)-([a-z\d.-/]+)-(\d+)-lp\d+$/i);
             // inconsistent implementation of isPoolToken, exit
@@ -191,7 +200,7 @@ class TokenClient {
         if (TokenClient.isIBCDenom(denom)) {
             const splitDenom = denom.split("/");
             denom = `${splitDenom[0].toLowerCase()}/${splitDenom[1].toUpperCase()}`;
-            return (_b = this.symbols[denom]) !== null && _b !== void 0 ? _b : denom.toUpperCase();
+            return (_a = this.symbols[denom]) !== null && _a !== void 0 ? _a : denom.toUpperCase();
         }
         if (SYMBOL_OVERRIDE[symbol]) {
             return SYMBOL_OVERRIDE[symbol];
@@ -661,12 +670,21 @@ class TokenClient {
             return tokens;
         });
     }
-    setGeckoTokenNames() {
+    setCommonAssetConfig() {
         // whitelisted ibc tokens
         ibc_1.ibcWhitelist.forEach((chainId) => {
+            var _a;
             const currencies = util_1.IBCUtils.EmbedChainInfos[chainId].currencies;
+            const channelObj = (_a = ibc_1.swthChannels[chainId]) === null || _a === void 0 ? void 0 : _a.ibc;
             currencies.forEach((asset) => {
+                var _a, _b;
+                const channel = asset.coinMinimalDenom !== "swth" ? (_a = channelObj === null || channelObj === void 0 ? void 0 : channelObj.sourceChannel) !== null && _a !== void 0 ? _a : "channel-0" : (_b = channelObj === null || channelObj === void 0 ? void 0 : channelObj.dstChannel) !== null && _b !== void 0 ? _b : "channel-0";
+                const assetDenom = TokenClient.isIBCDenom(asset.coinMinimalDenom)
+                    ? asset.coinMinimalDenom
+                    : util_1.IBCUtils.makeIBCMinimalDenom(channel, asset.coinMinimalDenom);
                 const symbolSmall = asset.coinDenom.toLowerCase();
+                if (!this.commonAssetNames[assetDenom])
+                    this.commonAssetNames[assetDenom] = symbolSmall;
                 if (asset.coinGeckoId && !this.geckoTokenNames[symbolSmall])
                     this.geckoTokenNames[symbolSmall] = asset.coinGeckoId;
             });

package/package.json

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