@xchainjs/xchain-thorchain 0.21.0 → 0.21.1

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v.0.21.1 (2022-02-04)
+
+## Fix
+
+- Fix chain id for `testnet` #477
+
+## Add
+
+- Helper `isChainId`
+- `enum ChainId`
+
 # v.0.21.0 (2022-02-02)
 
 ## Breaking change

package/lib/index.esm.js

@@ -198,6 +198,19 @@ var getPrefix = function (network) {
             return 'tthor';
     }
 };
+var ChainId;
+(function (ChainId) {
+    ChainId["Mainnet"] = "thorchain";
+    ChainId["Stagenet"] = "thorchain-stagenet";
+    ChainId["Testnet"] = "thorchain-v1";
+})(ChainId || (ChainId = {}));
+/**
+ * Type guard to check whether string is a valid `ChainId`
+ *
+ * @param {string} id Chain id.
+ * @returns {boolean} `true` or `false`
+ */
+var isChainId = function (id) { return Object.values(ChainId).includes(id); };
 /**
  * Get the chain id.
  *
@@ -208,11 +221,11 @@ var getPrefix = function (network) {
 var getChainId = function (network) {
     switch (network) {
         case Network.Mainnet:
-            return 'thorchain';
+            return ChainId.Mainnet;
         case Network.Stagenet:
-            return 'thorchain-stagenet';
+            return ChainId.Stagenet;
         case Network.Testnet:
-            return 'thorchain';
+            return ChainId.Testnet;
     }
 };
 /**
@@ -306,7 +319,7 @@ var buildDepositTx = function (msgNativeTx, nodeUrl) { return __awaiter(void 0,
             case 1:
                 data = (_c.sent()).data;
                 chainId = data.default_node_info.network;
-                if (!chainId || !(chainId == 'thorchain' || chainId == 'thorchain-stagenet'))
+                if (!chainId || !isChainId(chainId))
                     throw new Error('invalid network');
                 return [4 /*yield*/, axios.post(nodeUrl + "/thorchain/deposit", {
                         coins: msgNativeTx.coins,
@@ -1011,4 +1024,4 @@ var Client = /** @class */ (function () {
     return Client;
 }());
 
-export { Client, DECIMAL, DEFAULT_GAS_VALUE, DEPOSIT_GAS_VALUE, MAX_TX_COUNT, MsgNativeTx, assetFromDenom, buildDepositTx, getBalance, getChainId, getDefaultClientUrl, getDefaultExplorerUrls, getDefaultFees, getDenom, getDepositTxDataFromLogs, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getTxType, isAssetRuneNative, isBroadcastSuccess, isMsgMultiSend, isMsgSend, msgNativeTxFromJson, registerCodecs };
+export { ChainId, Client, DECIMAL, DEFAULT_GAS_VALUE, DEPOSIT_GAS_VALUE, MAX_TX_COUNT, MsgNativeTx, assetFromDenom, buildDepositTx, getBalance, getChainId, getDefaultClientUrl, getDefaultExplorerUrls, getDefaultFees, getDenom, getDepositTxDataFromLogs, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getTxType, isAssetRuneNative, isBroadcastSuccess, isChainId, isMsgMultiSend, isMsgSend, msgNativeTxFromJson, registerCodecs };

package/lib/index.js

@@ -206,6 +206,18 @@ var getPrefix = function (network) {
             return 'tthor';
     }
 };
+(function (ChainId) {
+    ChainId["Mainnet"] = "thorchain";
+    ChainId["Stagenet"] = "thorchain-stagenet";
+    ChainId["Testnet"] = "thorchain-v1";
+})(exports.ChainId || (exports.ChainId = {}));
+/**
+ * Type guard to check whether string is a valid `ChainId`
+ *
+ * @param {string} id Chain id.
+ * @returns {boolean} `true` or `false`
+ */
+var isChainId = function (id) { return Object.values(exports.ChainId).includes(id); };
 /**
  * Get the chain id.
  *
@@ -216,11 +228,11 @@ var getPrefix = function (network) {
 var getChainId = function (network) {
     switch (network) {
         case xchainClient.Network.Mainnet:
-            return 'thorchain';
+            return exports.ChainId.Mainnet;
         case xchainClient.Network.Stagenet:
-            return 'thorchain-stagenet';
+            return exports.ChainId.Stagenet;
         case xchainClient.Network.Testnet:
-            return 'thorchain';
+            return exports.ChainId.Testnet;
     }
 };
 /**
@@ -314,7 +326,7 @@ var buildDepositTx = function (msgNativeTx, nodeUrl) { return __awaiter(void 0,
             case 1:
                 data = (_c.sent()).data;
                 chainId = data.default_node_info.network;
-                if (!chainId || !(chainId == 'thorchain' || chainId == 'thorchain-stagenet'))
+                if (!chainId || !isChainId(chainId))
                     throw new Error('invalid network');
                 return [4 /*yield*/, axios__default['default'].post(nodeUrl + "/thorchain/deposit", {
                         coins: msgNativeTx.coins,
@@ -1041,6 +1053,7 @@ exports.getPrefix = getPrefix;
 exports.getTxType = getTxType;
 exports.isAssetRuneNative = isAssetRuneNative;
 exports.isBroadcastSuccess = isBroadcastSuccess;
+exports.isChainId = isChainId;
 exports.isMsgMultiSend = isMsgMultiSend;
 exports.isMsgSend = isMsgSend;
 exports.msgNativeTxFromJson = msgNativeTxFromJson;

package/lib/util.d.ts

@@ -60,6 +60,18 @@ export declare const isBroadcastSuccess: (response: unknown) => boolean;
  *
  **/
 export declare const getPrefix: (network: Network) => "thor" | "sthor" | "tthor";
+export declare enum ChainId {
+    Mainnet = "thorchain",
+    Stagenet = "thorchain-stagenet",
+    Testnet = "thorchain-v1"
+}
+/**
+ * Type guard to check whether string is a valid `ChainId`
+ *
+ * @param {string} id Chain id.
+ * @returns {boolean} `true` or `false`
+ */
+export declare const isChainId: (id: string) => id is ChainId;
 /**
  * Get the chain id.
  *
@@ -67,7 +79,7 @@ export declare const getPrefix: (network: Network) => "thor" | "sthor" | "tthor"
  * @returns {string} The chain id based on the network.
  *
  */
-export declare const getChainId: (network: Network) => "thorchain" | "thorchain-stagenet";
+export declare const getChainId: (network: Network) => ChainId;
 /**
  * Register Codecs based on the prefix.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",