@xchainjs/xchain-thorchain 0.20.0 → 0.20.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.20.1 (2022-01-11)
+
+## Fix
+
+- Get chain ID from THORNode before posting to deposit handler.
+
 # v.0.20.0 (2021-12-29)
 
 ## Breaking change

package/lib/index.esm.js

@@ -200,9 +200,20 @@ var getPrefix = function (network) {
 /**
  * Get the chain id.
  *
+ * @param {Network} network
  * @returns {string} The chain id based on the network.
+ *
  */
-var getChainId = function () { return 'thorchain'; };
+var getChainId = function (network) {
+    switch (network) {
+        case Network.Mainnet:
+            return 'thorchain';
+        case Network.Stagenet:
+            return 'thorchain-stagenet';
+        case Network.Testnet:
+            return 'thorchain';
+    }
+};
 /**
  * Register Codecs based on the prefix.
  *
@@ -286,19 +297,25 @@ var getTxType = function (txData, encoding) {
  * @throws {"Invalid client url"} Thrown if the client url is an invalid one.
  */
 var buildDepositTx = function (msgNativeTx, nodeUrl) { return __awaiter(void 0, void 0, void 0, function () {
-    var response, fee, unsignedStdTx;
+    var data, chainId, response, fee, unsignedStdTx;
     var _a, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
-            case 0: return [4 /*yield*/, axios.post(nodeUrl + "/thorchain/deposit", {
-                    coins: msgNativeTx.coins,
-                    memo: msgNativeTx.memo,
-                    base_req: {
-                        chain_id: getChainId(),
-                        from: msgNativeTx.signer,
-                    },
-                })];
+            case 0: return [4 /*yield*/, axios.get(nodeUrl + "/cosmos/base/tendermint/v1beta1/node_info")];
             case 1:
+                data = (_c.sent()).data;
+                chainId = data.default_node_info.network;
+                if (!chainId || !(chainId == 'thorchain' || chainId == 'thorchain-stagenet'))
+                    throw new Error('invalid network');
+                return [4 /*yield*/, axios.post(nodeUrl + "/thorchain/deposit", {
+                        coins: msgNativeTx.coins,
+                        memo: msgNativeTx.memo,
+                        base_req: {
+                            chain_id: chainId,
+                            from: msgNativeTx.signer,
+                        },
+                    })];
+            case 2:
                 response = (_c.sent()).data;
                 if (!response || !response.value)
                     throw new Error('Invalid client url');
@@ -541,7 +558,7 @@ var Client = /** @class */ (function () {
         this.rootDerivationPaths = rootDerivationPaths;
         this.cosmosClient = new CosmosSDKClient({
             server: this.getClientUrl().node,
-            chainId: getChainId(),
+            chainId: getChainId(this.network),
             prefix: getPrefix(this.network),
         });
         if (phrase)

package/lib/index.js

@@ -208,9 +208,20 @@ var getPrefix = function (network) {
 /**
  * Get the chain id.
  *
+ * @param {Network} network
  * @returns {string} The chain id based on the network.
+ *
  */
-var getChainId = function () { return 'thorchain'; };
+var getChainId = function (network) {
+    switch (network) {
+        case xchainClient.Network.Mainnet:
+            return 'thorchain';
+        case xchainClient.Network.Stagenet:
+            return 'thorchain-stagenet';
+        case xchainClient.Network.Testnet:
+            return 'thorchain';
+    }
+};
 /**
  * Register Codecs based on the prefix.
  *
@@ -294,19 +305,25 @@ var getTxType = function (txData, encoding) {
  * @throws {"Invalid client url"} Thrown if the client url is an invalid one.
  */
 var buildDepositTx = function (msgNativeTx, nodeUrl) { return __awaiter(void 0, void 0, void 0, function () {
-    var response, fee, unsignedStdTx;
+    var data, chainId, response, fee, unsignedStdTx;
     var _a, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
-            case 0: return [4 /*yield*/, axios__default['default'].post(nodeUrl + "/thorchain/deposit", {
-                    coins: msgNativeTx.coins,
-                    memo: msgNativeTx.memo,
-                    base_req: {
-                        chain_id: getChainId(),
-                        from: msgNativeTx.signer,
-                    },
-                })];
+            case 0: return [4 /*yield*/, axios__default['default'].get(nodeUrl + "/cosmos/base/tendermint/v1beta1/node_info")];
             case 1:
+                data = (_c.sent()).data;
+                chainId = data.default_node_info.network;
+                if (!chainId || !(chainId == 'thorchain' || chainId == 'thorchain-stagenet'))
+                    throw new Error('invalid network');
+                return [4 /*yield*/, axios__default['default'].post(nodeUrl + "/thorchain/deposit", {
+                        coins: msgNativeTx.coins,
+                        memo: msgNativeTx.memo,
+                        base_req: {
+                            chain_id: chainId,
+                            from: msgNativeTx.signer,
+                        },
+                    })];
+            case 2:
                 response = (_c.sent()).data;
                 if (!response || !response.value)
                     throw new Error('Invalid client url');
@@ -549,7 +566,7 @@ var Client = /** @class */ (function () {
         this.rootDerivationPaths = rootDerivationPaths;
         this.cosmosClient = new xchainCosmos.CosmosSDKClient({
             server: this.getClientUrl().node,
-            chainId: getChainId(),
+            chainId: getChainId(this.network),
             prefix: getPrefix(this.network),
         });
         if (phrase)

package/lib/util.d.ts

@@ -63,9 +63,11 @@ export declare const getPrefix: (network: Network) => "thor" | "sthor" | "tthor"
 /**
  * Get the chain id.
  *
+ * @param {Network} network
  * @returns {string} The chain id based on the network.
+ *
  */
-export declare const getChainId: () => string;
+export declare const getChainId: (network: Network) => "thorchain" | "thorchain-stagenet";
 /**
  * Register Codecs based on the prefix.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -52,4 +52,4 @@
     "axios": "^0.21.0",
     "cosmos-client": "0.39.2"
   }
-}
+}