carbon-js-sdk 0.3.51 → 0.3.53-dev.1

package/lib/provider/metamask/MetaMask.js

@@ -35,35 +35,35 @@ const blockchain_1 = require("../../util/blockchain");
 const ethers_1 = require("ethers");
 const ethSignUtils = __importStar(require("eth-sig-util"));
 const CONTRACT_HASH = {
-    [blockchain_1.Blockchain.Ethereum]: {
+    Ethereum: {
         // use same rinkeby contract for all non-mainnet uses
         [constant_1.Network.TestNet]: "0x086e1b5f67c0f7ca8eb202d35553e27e964899e2",
         [constant_1.Network.DevNet]: "0x086e1b5f67c0f7ca8eb202d35553e27e964899e2",
         [constant_1.Network.LocalHost]: "0x086e1b5f67c0f7ca8eb202d35553e27e964899e2",
         [constant_1.Network.MainNet]: "0xf4552877A40c1527D38970F170993660084D4541",
     },
-    [blockchain_1.Blockchain.BinanceSmartChain]: {
+    ['Binance Smart Chain']: {
         // use same testnet contract for all non-mainnet uses
         [constant_1.Network.TestNet]: "0x06E949ec2d6737ff57859CdcE426C5b5CA2Fc085",
         [constant_1.Network.DevNet]: "0x06E949ec2d6737ff57859CdcE426C5b5CA2Fc085",
         [constant_1.Network.LocalHost]: "0x06E949ec2d6737ff57859CdcE426C5b5CA2Fc085",
         [constant_1.Network.MainNet]: "0x3786d94AC6B15FE2eaC72c3CA78cB82578Fc66f4",
     },
-    [blockchain_1.Blockchain.Arbitrum]: {
+    Arbitrum: {
         // use same testnet contract for all non-mainnet uses
         [constant_1.Network.TestNet]: "",
         [constant_1.Network.DevNet]: "",
         [constant_1.Network.LocalHost]: "",
         [constant_1.Network.MainNet]: "0x43138036d1283413035b8eca403559737e8f7980",
     },
-    [blockchain_1.Blockchain.Polygon]: {
+    Polygon: {
         // use same testnet contract for all non-mainnet uses
         [constant_1.Network.TestNet]: "",
         [constant_1.Network.DevNet]: "",
         [constant_1.Network.LocalHost]: "",
         [constant_1.Network.MainNet]: "0x61B9503Fe023E1F1Dd0ab7417923cB0A41DD9E0c",
     },
-    [blockchain_1.Blockchain.Okc]: {
+    OKC: {
         // use same testnet contract for all non-mainnet uses
         [constant_1.Network.TestNet]: "",
         [constant_1.Network.DevNet]: "",
@@ -207,18 +207,18 @@ const OKC_TESTNET = {
 class MetaMask {
     constructor(network) {
         this.network = network;
-        this.blockchain = blockchain_1.Blockchain.Ethereum;
+        this.blockchain = 'Ethereum';
     }
-    static getNetworkParams(network, blockchain = blockchain_1.Blockchain.Ethereum) {
+    static getNetworkParams(network, blockchain = 'Ethereum') {
         if (network === constant_1.Network.MainNet) {
             switch (blockchain) {
-                case blockchain_1.Blockchain.BinanceSmartChain:
+                case 'Binance Smart Chain':
                     return BSC_MAINNET;
-                case blockchain_1.Blockchain.Arbitrum:
+                case 'Arbitrum':
                     return ARBITRUM_MAINNET;
-                case blockchain_1.Blockchain.Polygon:
+                case 'Polygon':
                     return POLYGON_MAINNET;
-                case blockchain_1.Blockchain.Okc:
+                case 'OKC':
                     return OKC_MAINNET;
                 default:
                     // metamask should come with Ethereum configs
@@ -226,42 +226,42 @@ class MetaMask {
             }
         }
         switch (blockchain) {
-            case blockchain_1.Blockchain.BinanceSmartChain:
+            case 'Binance Smart Chain':
                 return BSC_TESTNET;
-            case blockchain_1.Blockchain.Arbitrum:
+            case 'Arbitrum':
                 return ARBITRUM_TESTNET;
-            case blockchain_1.Blockchain.Polygon:
+            case 'Polygon':
                 return POLYGON_TESTNET;
-            case blockchain_1.Blockchain.Okc:
+            case 'OKC':
                 return OKC_TESTNET;
             default:
                 // metamask should come with Ethereum configs
                 return ETH_TESTNET;
         }
     }
-    static getRequiredChainId(network, blockchain = blockchain_1.Blockchain.Ethereum) {
+    static getRequiredChainId(network, blockchain = 'Ethereum') {
         if (network === constant_1.Network.MainNet) {
             switch (blockchain) {
-                case blockchain_1.Blockchain.BinanceSmartChain:
+                case 'Binance Smart Chain':
                     return 56;
-                case blockchain_1.Blockchain.Arbitrum:
+                case 'Arbitrum':
                     return 42161;
-                case blockchain_1.Blockchain.Polygon:
+                case 'Polygon':
                     return 137;
-                case blockchain_1.Blockchain.Okc:
+                case 'OKC':
                     return 66;
                 default:
                     return 1;
             }
         }
         switch (blockchain) {
-            case blockchain_1.Blockchain.BinanceSmartChain:
+            case 'Binance Smart Chain':
                 return 97;
-            case blockchain_1.Blockchain.Arbitrum:
+            case 'Arbitrum':
                 return 421611;
-            case blockchain_1.Blockchain.Polygon:
+            case 'Polygon':
                 return 80001;
-            case blockchain_1.Blockchain.Okc:
+            case 'OKC':
                 return 65;
             default:
                 return 5;
@@ -284,7 +284,7 @@ class MetaMask {
         return __awaiter(this, void 0, void 0, function* () {
             const chainIdHex = (yield ((_a = this.getAPI()) === null || _a === void 0 ? void 0 : _a.request({ method: "eth_chainId" })));
             const chainId = !!chainIdHex ? parseInt(chainIdHex, 16) : undefined;
-            const blockchain = blockchain_1.getBlockchainFromChain(chainId);
+            const blockchain = blockchain_1.getBlockchainFromChainV2(chainId);
             this.blockchain = blockchain;
             return { chainId, blockchain };
         });
@@ -426,45 +426,45 @@ class MetaMask {
         // set correct blockchain given the chain ID
         if (network === constant_1.Network.MainNet) {
             if (currentChainId === 1) {
-                this.blockchain = blockchain_1.Blockchain.Ethereum;
+                this.blockchain = 'Ethereum';
                 return currentChainId;
             }
             if (currentChainId === 56) {
-                this.blockchain = blockchain_1.Blockchain.BinanceSmartChain;
+                this.blockchain = 'Binance Smart Chain';
                 return currentChainId;
             }
             if (currentChainId === 42161) {
-                this.blockchain = blockchain_1.Blockchain.Arbitrum;
+                this.blockchain = 'Arbitrum';
                 return currentChainId;
             }
             if (currentChainId === 137) {
-                this.blockchain = blockchain_1.Blockchain.Polygon;
+                this.blockchain = 'Polygon';
                 return currentChainId;
             }
             if (currentChainId === 66) {
-                this.blockchain = blockchain_1.Blockchain.Okc;
+                this.blockchain = 'OKC';
                 return currentChainId;
             }
             return 1;
         }
         if (currentChainId === 5) {
-            this.blockchain = blockchain_1.Blockchain.Ethereum;
+            this.blockchain = 'Ethereum';
             return currentChainId;
         }
         if (currentChainId === 97) {
-            this.blockchain = blockchain_1.Blockchain.BinanceSmartChain;
+            this.blockchain = 'Binance Smart Chain';
             return currentChainId;
         }
         if (currentChainId === 421611) {
-            this.blockchain = blockchain_1.Blockchain.Arbitrum;
+            this.blockchain = 'Arbitrum';
             return currentChainId;
         }
         if (currentChainId === 80001) {
-            this.blockchain = blockchain_1.Blockchain.Polygon;
+            this.blockchain = 'Polygon';
             return currentChainId;
         }
         if (currentChainId === 65) {
-            this.blockchain = blockchain_1.Blockchain.Okc;
+            this.blockchain = 'OKC';
             return currentChainId;
         }
         // Deal with cases where users are logging in to devnet using mainnet chains

package/lib/util/blockchain.d.ts

@@ -1,3 +1,5 @@
+import { TokenClient } from '../clients';
+import { Bridge } from '../codec';
 import { Network } from "../constant/network";
 import { SimpleMap } from "./type";
 export declare enum Blockchain {
@@ -34,10 +36,15 @@ export declare enum Blockchain {
     OmniFlixHub = "omniflixhub",
     Agoric = "agoric"
 }
+export declare type BlockchainV2 = ReturnType<TokenClient['getAllBlockchainNames']>[number] | "Native" | "Carbon" | "Tradehub" | "Ibc" | "Polynetwork";
 export declare const BRIDGE_IDS: {
     polynetwork: number;
     ibc: number;
 };
+export interface BridgeMap {
+    polynetwork: Bridge[];
+    ibc: Bridge[];
+}
 export declare type ChainIds = SimpleMap<number>;
 export declare const ChainNames: {
     readonly 1: "MainNet";
@@ -63,3 +70,5 @@ export declare function parseBlockchain(value: string | null): Blockchain | null
 export declare function getChainFromID(id: number): string | undefined;
 export declare const getBlockchainFromChain: (chainId?: number | undefined) => Blockchain.Ethereum | Blockchain.BinanceSmartChain | Blockchain.Zilliqa | Blockchain.Arbitrum | Blockchain.Polygon | Blockchain.Okc | undefined;
 export declare const blockchainForChainId: (chainId?: number | undefined, network?: Network) => Blockchain | undefined;
+export declare const getBlockchainFromChainV2: (chainId?: number | undefined) => "Binance Smart Chain" | "Ethereum" | "Arbitrum" | "Polygon" | "Okc" | "Zilliqa" | undefined;
+export declare const blockchainForChainIdV2: (chainId?: number | undefined, network?: Network) => Blockchain | BlockchainV2 | undefined;

package/lib/util/blockchain.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.blockchainForChainId = exports.getBlockchainFromChain = exports.getChainFromID = exports.parseBlockchain = exports.chainIdsByBlockchain = exports.CHAIN_IDS_TEST = exports.CHAIN_IDS_DEV = exports.CHAIN_IDS = exports.ChainNames = exports.BRIDGE_IDS = exports.Blockchain = void 0;
+exports.blockchainForChainIdV2 = exports.getBlockchainFromChainV2 = exports.blockchainForChainId = exports.getBlockchainFromChain = exports.getChainFromID = exports.parseBlockchain = exports.chainIdsByBlockchain = exports.CHAIN_IDS_TEST = exports.CHAIN_IDS_DEV = exports.CHAIN_IDS = exports.ChainNames = exports.BRIDGE_IDS = exports.Blockchain = void 0;
 const network_1 = require("../constant/network");
 var Blockchain;
 (function (Blockchain) {
@@ -259,3 +259,145 @@ const blockchainForChainId = (chainId, network = network_1.Network.MainNet) => {
     }
 };
 exports.blockchainForChainId = blockchainForChainId;
+const getBlockchainFromChainV2 = (chainId) => {
+    switch (chainId) {
+        case 1:
+        case 3:
+        case 4:
+        case 5:
+            return 'Ethereum';
+        case 56:
+        case 97:
+            return 'Binance Smart Chain';
+        case 65:
+        case 66:
+            return 'Okc';
+        case 137:
+        case 80001:
+            return 'Polygon';
+        case 110:
+        case 111:
+            return 'Zilliqa';
+        case 42161:
+        case 421611:
+            return 'Arbitrum';
+    }
+    return undefined;
+};
+exports.getBlockchainFromChainV2 = getBlockchainFromChainV2;
+const blockchainForChainIdV2 = (chainId, network = network_1.Network.MainNet) => {
+    switch (network) {
+        case network_1.Network.MainNet:
+            switch (chainId) {
+                case 0:
+                    return "Native";
+                case 1:
+                    return "Bitcoin";
+                case 2:
+                    return "Ethereum";
+                case 4:
+                    return "Neo";
+                case 6:
+                    return "Binance Smart Chain";
+                case 14:
+                    return "Neo3";
+                case 9: /* FALLTHROUGH */
+                case 18:
+                    return "Zilliqa";
+                case 12: /* FALLTHROUGH */
+                case 66:
+                    return 'Okc';
+                case 17: /* FALLTHROUGH */
+                case 137:
+                    return 'Polygon';
+                case 244:
+                    return "Osmosis";
+                case 13: /* FALLTHROUGH */
+                case 245:
+                    return "Terra Classic";
+                case 246:
+                    return "Cosmos Hub";
+                case 5: /* FALLTHROUGH */
+                case 247:
+                    return "Juno";
+                case 7: /* FALLTHROUGH */
+                case 248:
+                    return "Evmos";
+                case 8: /* FALLTHROUGH */
+                case 249:
+                    return "Axelar";
+                case 313:
+                    return "Stride";
+                case 314:
+                    return "Kujira";
+                case 315:
+                    return "Terra";
+                case 316:
+                    return "Quicksilver";
+                case 12: /* FALLTHROUGH */
+                case 317:
+                    return "Comdex";
+                case 318:
+                    return "Stafihub";
+                case 15: /* FALLTHROUGH */
+                case 319:
+                    return "Persistence Core";
+                case 16: /* FALLTHROUGH */
+                case 320:
+                    return "Stargaze";
+                case 321:
+                    return "Canto";
+                case 322:
+                    return "OmniFlix Hub";
+                case 323:
+                    return "Agoric";
+                case 19: /* FALLTHROUGH */
+                case 42161:
+                    return "Arbitrum";
+                default:
+                    return undefined;
+            }
+        case network_1.Network.TestNet:
+            switch (chainId) {
+                case 1:
+                    return "Bitcoin";
+                case 0:
+                case 5:
+                    return "Carbon";
+                case 79:
+                    return "Binance Smart Chain";
+                case 88:
+                    return "Neo3";
+                case 111:
+                    return "Zilliqa";
+                case 2: /* FALLTHROUGH */
+                case 502:
+                    return "Ethereum";
+                default:
+                    return undefined;
+            }
+        case network_1.Network.DevNet:
+            switch (chainId) {
+                case 0:
+                    return 'Carbon';
+                case 1:
+                    return 'Bitcoin';
+                case 2:
+                case 350:
+                    return "Ethereum";
+                case 5:
+                    return "Neo";
+                case 79:
+                    return "Binance Smart Chain";
+                case 111:
+                    return 'Zilliqa';
+                default:
+                    return undefined;
+            }
+        case network_1.Network.LocalHost:
+            return undefined;
+        default:
+            return undefined;
+    }
+};
+exports.blockchainForChainIdV2 = blockchainForChainIdV2;

package/lib/util/ibc.d.ts

@@ -1,13 +1,13 @@
 import { ChainInfoExplorerTmRpc, ChainIds, GasPriceStep, AssetListObj } from "../constant";
 import { AppCurrency } from "@keplr-wallet/types";
-import { Blockchain } from "./blockchain";
+import { BlockchainV2 } from "./blockchain";
 import { SimpleMap } from "./type";
 export declare function makeIBCMinimalDenom(sourceChannelId: string, coinMinimalDenom: string): string;
 export declare const EmbedChainInfos: SimpleMap<ChainInfoExplorerTmRpc>;
 export declare const totalAssetObj: AssetListObj;
-export declare const ChainIdBlockchainMap: SimpleMap<Blockchain>;
-export declare const getIbcChainFromBlockchain: (blockchain: Blockchain | undefined) => ChainIds | undefined;
-export declare const BlockchainMap: SimpleMap<Blockchain | undefined>;
+export declare const ChainIdBlockchainMap: SimpleMap<BlockchainV2>;
+export declare const getIbcChainFromBlockchain: (blockchain: BlockchainV2 | undefined) => ChainIds | undefined;
+export declare const BlockchainMap: SimpleMap<string | undefined>;
 export interface ChainIdOutput {
     identifier: string;
     version: number;

package/lib/util/ibc.js

@@ -4,7 +4,6 @@ exports.isCw20Token = exports.calculateMaxFee = exports.parseChainId = exports.B
 const constant_1 = require("../constant");
 const provider_1 = require("../provider");
 const crypto_1 = require("@keplr-wallet/crypto");
-const blockchain_1 = require("./blockchain");
 // Create IBC minimal denom
 function makeIBCMinimalDenom(sourceChannelId, coinMinimalDenom) {
     const sourceChannelIdProcess = sourceChannelId.indexOf("transfer/") === 0 ? sourceChannelId.split("/").splice(1).join("/") : sourceChannelId;
@@ -47,23 +46,23 @@ exports.totalAssetObj = Object.values(exports.EmbedChainInfos).reduce((prev, cha
     return newAssetObj;
 }, {});
 exports.ChainIdBlockchainMap = {
-    [constant_1.ChainIds.Osmosis]: blockchain_1.Blockchain.Osmosis,
-    [constant_1.ChainIds.Terra]: blockchain_1.Blockchain.Terra,
-    [constant_1.ChainIds.CosmosHub]: blockchain_1.Blockchain.CosmosHub,
-    [constant_1.ChainIds.Juno]: blockchain_1.Blockchain.Juno,
-    [constant_1.ChainIds.Evmos]: blockchain_1.Blockchain.Evmos,
-    [constant_1.ChainIds.Axelar]: blockchain_1.Blockchain.Axelar,
-    [constant_1.ChainIds.Stride]: blockchain_1.Blockchain.Stride,
-    [constant_1.ChainIds.Kujira]: blockchain_1.Blockchain.Kujira,
-    [constant_1.ChainIds.Terra2]: blockchain_1.Blockchain.Terra2,
-    [constant_1.ChainIds.Quicksilver]: blockchain_1.Blockchain.Quicksilver,
-    [constant_1.ChainIds.Comdex]: blockchain_1.Blockchain.Comdex,
-    [constant_1.ChainIds.StafiHub]: blockchain_1.Blockchain.StafiHub,
-    [constant_1.ChainIds.Persistence]: blockchain_1.Blockchain.Persistence,
-    [constant_1.ChainIds.Stargaze]: blockchain_1.Blockchain.Stargaze,
-    [constant_1.ChainIds.Canto]: blockchain_1.Blockchain.Canto,
-    [constant_1.ChainIds.OmniFlixHub]: blockchain_1.Blockchain.OmniFlixHub,
-    [constant_1.ChainIds.Agoric]: blockchain_1.Blockchain.Agoric,
+    [constant_1.ChainIds.Osmosis]: "Osmosis",
+    [constant_1.ChainIds.Terra]: "Terra",
+    [constant_1.ChainIds.CosmosHub]: "Cosmos Hub",
+    [constant_1.ChainIds.Juno]: "Juno",
+    [constant_1.ChainIds.Evmos]: "Evmos",
+    [constant_1.ChainIds.Axelar]: "Axelar",
+    [constant_1.ChainIds.Stride]: "Stride",
+    [constant_1.ChainIds.Kujira]: "Kujira",
+    [constant_1.ChainIds.Terra2]: "Terra (CW20)",
+    [constant_1.ChainIds.Quicksilver]: "Quicksilver",
+    [constant_1.ChainIds.Comdex]: "Comdex",
+    [constant_1.ChainIds.StafiHub]: "Stafihub",
+    [constant_1.ChainIds.Persistence]: "Persistence Core",
+    [constant_1.ChainIds.Stargaze]: "Stargaze",
+    [constant_1.ChainIds.Canto]: "Canto",
+    [constant_1.ChainIds.OmniFlixHub]: "Omniflix Hub",
+    [constant_1.ChainIds.Agoric]: "Agoric",
 };
 const getIbcChainFromBlockchain = (blockchain) => {
     let ibcChain = undefined;

package/package.json

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