@xchainjs/xchain-thorchain 0.21.1 → 0.22.2

package/CHANGELOG.md

@@ -1,3 +1,37 @@
+# v0.22.2 (2022-02-17)
+
+## Fix
+
+- Request fees from THORChain and use `defaultFees` in case of server errors only
+- Fix `defaultFees` to be 0.02 RUNE
+
+# v0.22.1 (2022-02-16)
+
+## Fix
+
+- Increase limit for `DEFAULT_GAS_VALUE` from 2000000 to 3000000 to accommodate recent increases in gas used that go above the old limit
+
+# v0.22.0 (2022-02-06)
+
+## Add
+
+- Option to pass `ChainIds` into constructor
+- getter / setter for `chainId` in `Client`
+
+## Breaking change
+
+- `buildDepositTx` needs `chainId` to be passed - all params are set as object
+- Remove `enum ChainId` + `getChainId` + `isChainId` from `utils`
+
+# v0.21.2 (2022-02-04)
+
+## Fix
+
+- Use latest axios@0.25.0
+- xchain-client@0.11.1
+- @xchainjs/xchain-util@0.5.1
+- @xchainjs/xchain-cosmos@0.16.1
+
 # v.0.21.1 (2022-02-04)
 
 ## Fix

package/lib/client.d.ts

@@ -3,7 +3,7 @@ import { CosmosSDKClient, RPCTxResult } from '@xchainjs/xchain-cosmos';
 import { Asset } from '@xchainjs/xchain-util';
 import { PrivKey, PubKey } from 'cosmos-client';
 import { StdTx } from 'cosmos-client/x/auth';
-import { ClientUrl, DepositParam, ExplorerUrls, NodeUrl, ThorchainClientParams, TxOfflineParams } from './types';
+import { ChainId, ClientUrl, DepositParam, ExplorerUrls, NodeUrl, ThorchainClientParams, TxOfflineParams } from './types';
 /**
  * Interface for custom Thorchain client
  */
@@ -21,6 +21,7 @@ declare class Client implements ThorchainClient, XChainClient {
     private network;
     private clientUrl;
     private explorerUrls;
+    private chainIds;
     private phrase;
     private rootDerivationPaths;
     private cosmosClient;
@@ -34,7 +35,7 @@ declare class Client implements ThorchainClient, XChainClient {
      *
      * @throws {"Invalid phrase"} Thrown if the given phase is invalid.
      */
-    constructor({ network, phrase, clientUrl, explorerUrls, rootDerivationPaths, }: XChainClientParams & ThorchainClientParams);
+    constructor({ network, phrase, clientUrl, explorerUrls, rootDerivationPaths, chainIds, }: XChainClientParams & ThorchainClientParams);
     /**
      * Purge client.
      *
@@ -83,6 +84,23 @@ declare class Client implements ThorchainClient, XChainClient {
      * @returns {string} The explorer url for thorchain based on the current network.
      */
     getExplorerUrl(): string;
+    /**
+     * Sets chain id
+     *
+     * @param {ChainId} chainId Chain id to update
+     * @param {Network} network (optional) Network for given chainId. If `network`not set, current network of the client is used
+     *
+     * @returns {void}
+     */
+    setChainId(chainId: ChainId, network?: Network): void;
+    /**
+     * Gets chain id
+     *
+     * @param {Network} network (optional) Network to get chain id from. If `network`not set, current network of the client is used
+     *
+     * @returns {ChainId} Chain id based on the current network.
+     */
+    getChainId(network?: Network): ChainId;
     /**
      * Get cosmos client
      * @returns {CosmosSDKClient} current cosmos client
@@ -214,7 +232,7 @@ declare class Client implements ThorchainClient, XChainClient {
      */
     transferOffline({ walletIndex, asset, amount, recipient, memo, from_rune_balance, from_asset_balance, from_account_number, from_sequence, }: TxOfflineParams): Promise<StdTx>;
     /**
-     * Get the fees.
+     * Gets fees from Node
      *
      * @returns {Fees}
      */

package/lib/index.esm.js

@@ -1,7 +1,7 @@
 import { Network, TxType, singleFee, FeeType } from '@xchainjs/xchain-client';
 import { CosmosSDKClient } from '@xchainjs/xchain-cosmos';
 import { validatePhrase } from '@xchainjs/xchain-crypto';
-import { assetToString, AssetRuneNative, isSynthAsset, assetFromString, baseAmount } from '@xchainjs/xchain-util';
+import { assetToString, AssetRuneNative, isSynthAsset, assetFromString, baseAmount, assetToBase, assetAmount } from '@xchainjs/xchain-util';
 import axios from 'axios';
 import { AccAddress, Msg, codec } from 'cosmos-client';
 import { StdTx } from 'cosmos-client/x/auth';
@@ -115,7 +115,7 @@ var msgNativeTxFromJson = function (value) {
 };
 
 var DECIMAL = 8;
-var DEFAULT_GAS_VALUE = '2000000';
+var DEFAULT_GAS_VALUE = '3000000';
 var DEPOSIT_GAS_VALUE = '500000000';
 var MAX_TX_COUNT = 100;
 /**
@@ -198,36 +198,6 @@ 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.
- *
- * @param {Network} network
- * @returns {string} The chain id based on the network.
- *
- */
-var getChainId = function (network) {
-    switch (network) {
-        case Network.Mainnet:
-            return ChainId.Mainnet;
-        case Network.Stagenet:
-            return ChainId.Stagenet;
-        case Network.Testnet:
-            return ChainId.Testnet;
-    }
-};
 /**
  * Register Codecs based on the prefix.
  *
@@ -289,7 +259,7 @@ var getDepositTxDataFromLogs = function (logs, address) {
  * @returns {Fees} The default fee.
  */
 var getDefaultFees = function () {
-    var fee = baseAmount(DEFAULT_GAS_VALUE, DECIMAL);
+    var fee = assetToBase(assetAmount(0.02 /* 0.02 RUNE */, DECIMAL));
     return singleFee(FeeType.FlatFee, fee);
 };
 /**
@@ -305,46 +275,52 @@ var getTxType = function (txData, encoding) {
 /**
  * Structure StdTx from MsgNativeTx.
  *
- * @param {string} txId The transaction id.
+ * @param {MsgNativeTx} msgNativeTx Msg of type `MsgNativeTx`.
+ * @param {string} nodeUrl Node url
+ * @param {chainId} ChainId Chain id of the network
+ *
  * @returns {Tx} The transaction details of the given transaction id.
  *
  * @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 data, chainId, response, fee, unsignedStdTx;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            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 || !isChainId(chainId))
-                    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');
-                fee = (_b = (_a = response.value) === null || _a === void 0 ? void 0 : _a.fee) !== null && _b !== void 0 ? _b : { amount: [] };
-                unsignedStdTx = StdTx.fromJSON({
-                    msg: response.value.msg,
-                    // override fee
-                    fee: __assign(__assign({}, fee), { gas: DEPOSIT_GAS_VALUE }),
-                    signatures: [],
-                    memo: '',
-                });
-                return [2 /*return*/, unsignedStdTx];
-        }
+var buildDepositTx = function (_a) {
+    var msgNativeTx = _a.msgNativeTx, nodeUrl = _a.nodeUrl, chainId = _a.chainId;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var data, networkChainId, response, fee, unsignedStdTx;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, axios.get(nodeUrl + "/cosmos/base/tendermint/v1beta1/node_info")];
+                case 1:
+                    data = (_d.sent()).data;
+                    networkChainId = data.default_node_info.network;
+                    if (!networkChainId || chainId !== networkChainId)
+                        throw new Error("Invalid network (asked: " + chainId + " / returned: " + networkChainId);
+                    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 = (_d.sent()).data;
+                    if (!response || !response.value)
+                        throw new Error('Invalid client url');
+                    fee = (_c = (_b = response.value) === null || _b === void 0 ? void 0 : _b.fee) !== null && _c !== void 0 ? _c : { amount: [] };
+                    unsignedStdTx = StdTx.fromJSON({
+                        msg: response.value.msg,
+                        // override fee
+                        fee: __assign(__assign({}, fee), { gas: DEPOSIT_GAS_VALUE }),
+                        signatures: [],
+                        memo: '',
+                    });
+                    return [2 /*return*/, unsignedStdTx];
+            }
+        });
     });
-}); };
+};
 /**
  * Get the balance of a given address.
  *
@@ -493,13 +469,17 @@ var Client = /** @class */ (function () {
      * @throws {"Invalid phrase"} Thrown if the given phase is invalid.
      */
     function Client(_a) {
-        var _b;
+        var _b, _c;
         var _this = this;
-        var _c = _a.network, network = _c === void 0 ? Network.Testnet : _c, phrase = _a.phrase, clientUrl = _a.clientUrl, explorerUrls = _a.explorerUrls, _d = _a.rootDerivationPaths, rootDerivationPaths = _d === void 0 ? (_b = {},
+        var _d = _a.network, network = _d === void 0 ? Network.Testnet : _d, phrase = _a.phrase, clientUrl = _a.clientUrl, explorerUrls = _a.explorerUrls, _e = _a.rootDerivationPaths, rootDerivationPaths = _e === void 0 ? (_b = {},
             _b[Network.Mainnet] = "44'/931'/0'/0/",
             _b[Network.Stagenet] = "44'/931'/0'/0/",
             _b[Network.Testnet] = "44'/931'/0'/0/",
-            _b) : _d;
+            _b) : _e, _f = _a.chainIds, chainIds = _f === void 0 ? (_c = {},
+            _c[Network.Mainnet] = 'thorchain',
+            _c[Network.Stagenet] = 'thorchain-stagenet',
+            _c[Network.Testnet] = 'thorchain-v1',
+            _c) : _f;
         this.phrase = '';
         /**
          * Get transaction history of a given address with pagination options.
@@ -569,10 +549,11 @@ var Client = /** @class */ (function () {
         this.network = network;
         this.clientUrl = clientUrl || getDefaultClientUrl();
         this.explorerUrls = explorerUrls || getDefaultExplorerUrls();
+        this.chainIds = chainIds;
         this.rootDerivationPaths = rootDerivationPaths;
         this.cosmosClient = new CosmosSDKClient({
             server: this.getClientUrl().node,
-            chainId: getChainId(this.network),
+            chainId: this.getChainId(this.network),
             prefix: getPrefix(this.network),
         });
         if (phrase)
@@ -644,6 +625,28 @@ var Client = /** @class */ (function () {
     Client.prototype.getExplorerUrl = function () {
         return this.explorerUrls.root[this.network];
     };
+    /**
+     * Sets chain id
+     *
+     * @param {ChainId} chainId Chain id to update
+     * @param {Network} network (optional) Network for given chainId. If `network`not set, current network of the client is used
+     *
+     * @returns {void}
+     */
+    Client.prototype.setChainId = function (chainId, network) {
+        var _a;
+        this.chainIds = __assign(__assign({}, this.chainIds), (_a = {}, _a[network || this.network] = chainId, _a));
+    };
+    /**
+     * Gets chain id
+     *
+     * @param {Network} network (optional) Network to get chain id from. If `network`not set, current network of the client is used
+     *
+     * @returns {ChainId} Chain id based on the current network.
+     */
+    Client.prototype.getChainId = function (network) {
+        return this.chainIds[network || this.network];
+    };
     /**
      * Get cosmos client
      * @returns {CosmosSDKClient} current cosmos client
@@ -861,7 +864,9 @@ var Client = /** @class */ (function () {
                             var assetInList = _a.asset;
                             return assetToString(assetInList) === assetToString(asset);
                         })[0]) === null || _d === void 0 ? void 0 : _d.amount) !== null && _e !== void 0 ? _e : baseAmount(0, DECIMAL);
-                        fee = baseAmount(DEFAULT_GAS_VALUE, DECIMAL);
+                        return [4 /*yield*/, this.getFees()];
+                    case 2:
+                        fee = (_k.sent()).average;
                         if (isAssetRuneNative(asset)) {
                             // amount + fee < runeBalance
                             if (runeBalance.lt(amount.plus(fee))) {
@@ -885,13 +890,17 @@ var Client = /** @class */ (function () {
                             memo: memo,
                             signer: signer,
                         });
-                        return [4 /*yield*/, buildDepositTx(msgNativeTx, this.getClientUrl().node)];
-                    case 2:
+                        return [4 /*yield*/, buildDepositTx({
+                                msgNativeTx: msgNativeTx,
+                                nodeUrl: this.getClientUrl().node,
+                                chainId: this.getChainId(),
+                            })];
+                    case 3:
                         unsignedStdTx = _k.sent();
                         privateKey = this.getPrivKey(walletIndex);
                         accAddress = AccAddress.fromBech32(signer);
                         return [4 /*yield*/, this.cosmosClient.signAndBroadcast(unsignedStdTx, privateKey, accAddress)];
-                    case 3: return [2 /*return*/, (_g = (_f = (_k.sent())) === null || _f === void 0 ? void 0 : _f.txhash) !== null && _g !== void 0 ? _g : ''];
+                    case 4: return [2 /*return*/, (_g = (_f = (_k.sent())) === null || _f === void 0 ? void 0 : _f.txhash) !== null && _g !== void 0 ? _g : ''];
                 }
             });
         });
@@ -1010,18 +1019,35 @@ var Client = /** @class */ (function () {
         });
     };
     /**
-     * Get the fees.
+     * Gets fees from Node
      *
      * @returns {Fees}
      */
     Client.prototype.getFees = function () {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, getDefaultFees()];
+            var fee, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, axios.get(this.getClientUrl().node + "/thorchain/constants")
+                            // validate data
+                        ];
+                    case 1:
+                        fee = (_b.sent()).data.int_64_values.NativeTransactionFee;
+                        // validate data
+                        if (!fee || isNaN(fee) || fee < 0)
+                            throw Error("Invalid fee: " + fee.toString());
+                        return [2 /*return*/, singleFee(FeeType.FlatFee, baseAmount(fee))];
+                    case 2:
+                        _a = _b.sent();
+                        return [2 /*return*/, getDefaultFees()];
+                    case 3: return [2 /*return*/];
+                }
             });
         });
     };
     return Client;
 }());
 
-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 };
+export { Client, DECIMAL, DEFAULT_GAS_VALUE, DEPOSIT_GAS_VALUE, MAX_TX_COUNT, MsgNativeTx, assetFromDenom, buildDepositTx, getBalance, getDefaultClientUrl, getDefaultExplorerUrls, getDefaultFees, getDenom, getDepositTxDataFromLogs, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getTxType, isAssetRuneNative, isBroadcastSuccess, isMsgMultiSend, isMsgSend, msgNativeTxFromJson, registerCodecs };

package/lib/index.js

@@ -123,7 +123,7 @@ var msgNativeTxFromJson = function (value) {
 };
 
 var DECIMAL = 8;
-var DEFAULT_GAS_VALUE = '2000000';
+var DEFAULT_GAS_VALUE = '3000000';
 var DEPOSIT_GAS_VALUE = '500000000';
 var MAX_TX_COUNT = 100;
 /**
@@ -206,35 +206,6 @@ 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.
- *
- * @param {Network} network
- * @returns {string} The chain id based on the network.
- *
- */
-var getChainId = function (network) {
-    switch (network) {
-        case xchainClient.Network.Mainnet:
-            return exports.ChainId.Mainnet;
-        case xchainClient.Network.Stagenet:
-            return exports.ChainId.Stagenet;
-        case xchainClient.Network.Testnet:
-            return exports.ChainId.Testnet;
-    }
-};
 /**
  * Register Codecs based on the prefix.
  *
@@ -296,7 +267,7 @@ var getDepositTxDataFromLogs = function (logs, address) {
  * @returns {Fees} The default fee.
  */
 var getDefaultFees = function () {
-    var fee = xchainUtil.baseAmount(DEFAULT_GAS_VALUE, DECIMAL);
+    var fee = xchainUtil.assetToBase(xchainUtil.assetAmount(0.02 /* 0.02 RUNE */, DECIMAL));
     return xchainClient.singleFee(xchainClient.FeeType.FlatFee, fee);
 };
 /**
@@ -312,46 +283,52 @@ var getTxType = function (txData, encoding) {
 /**
  * Structure StdTx from MsgNativeTx.
  *
- * @param {string} txId The transaction id.
+ * @param {MsgNativeTx} msgNativeTx Msg of type `MsgNativeTx`.
+ * @param {string} nodeUrl Node url
+ * @param {chainId} ChainId Chain id of the network
+ *
  * @returns {Tx} The transaction details of the given transaction id.
  *
  * @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 data, chainId, response, fee, unsignedStdTx;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            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 || !isChainId(chainId))
-                    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');
-                fee = (_b = (_a = response.value) === null || _a === void 0 ? void 0 : _a.fee) !== null && _b !== void 0 ? _b : { amount: [] };
-                unsignedStdTx = auth.StdTx.fromJSON({
-                    msg: response.value.msg,
-                    // override fee
-                    fee: __assign(__assign({}, fee), { gas: DEPOSIT_GAS_VALUE }),
-                    signatures: [],
-                    memo: '',
-                });
-                return [2 /*return*/, unsignedStdTx];
-        }
+var buildDepositTx = function (_a) {
+    var msgNativeTx = _a.msgNativeTx, nodeUrl = _a.nodeUrl, chainId = _a.chainId;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var data, networkChainId, response, fee, unsignedStdTx;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, axios__default['default'].get(nodeUrl + "/cosmos/base/tendermint/v1beta1/node_info")];
+                case 1:
+                    data = (_d.sent()).data;
+                    networkChainId = data.default_node_info.network;
+                    if (!networkChainId || chainId !== networkChainId)
+                        throw new Error("Invalid network (asked: " + chainId + " / returned: " + networkChainId);
+                    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 = (_d.sent()).data;
+                    if (!response || !response.value)
+                        throw new Error('Invalid client url');
+                    fee = (_c = (_b = response.value) === null || _b === void 0 ? void 0 : _b.fee) !== null && _c !== void 0 ? _c : { amount: [] };
+                    unsignedStdTx = auth.StdTx.fromJSON({
+                        msg: response.value.msg,
+                        // override fee
+                        fee: __assign(__assign({}, fee), { gas: DEPOSIT_GAS_VALUE }),
+                        signatures: [],
+                        memo: '',
+                    });
+                    return [2 /*return*/, unsignedStdTx];
+            }
+        });
     });
-}); };
+};
 /**
  * Get the balance of a given address.
  *
@@ -500,13 +477,17 @@ var Client = /** @class */ (function () {
      * @throws {"Invalid phrase"} Thrown if the given phase is invalid.
      */
     function Client(_a) {
-        var _b;
+        var _b, _c;
         var _this = this;
-        var _c = _a.network, network = _c === void 0 ? xchainClient.Network.Testnet : _c, phrase = _a.phrase, clientUrl = _a.clientUrl, explorerUrls = _a.explorerUrls, _d = _a.rootDerivationPaths, rootDerivationPaths = _d === void 0 ? (_b = {},
+        var _d = _a.network, network = _d === void 0 ? xchainClient.Network.Testnet : _d, phrase = _a.phrase, clientUrl = _a.clientUrl, explorerUrls = _a.explorerUrls, _e = _a.rootDerivationPaths, rootDerivationPaths = _e === void 0 ? (_b = {},
             _b[xchainClient.Network.Mainnet] = "44'/931'/0'/0/",
             _b[xchainClient.Network.Stagenet] = "44'/931'/0'/0/",
             _b[xchainClient.Network.Testnet] = "44'/931'/0'/0/",
-            _b) : _d;
+            _b) : _e, _f = _a.chainIds, chainIds = _f === void 0 ? (_c = {},
+            _c[xchainClient.Network.Mainnet] = 'thorchain',
+            _c[xchainClient.Network.Stagenet] = 'thorchain-stagenet',
+            _c[xchainClient.Network.Testnet] = 'thorchain-v1',
+            _c) : _f;
         this.phrase = '';
         /**
          * Get transaction history of a given address with pagination options.
@@ -576,10 +557,11 @@ var Client = /** @class */ (function () {
         this.network = network;
         this.clientUrl = clientUrl || getDefaultClientUrl();
         this.explorerUrls = explorerUrls || getDefaultExplorerUrls();
+        this.chainIds = chainIds;
         this.rootDerivationPaths = rootDerivationPaths;
         this.cosmosClient = new xchainCosmos.CosmosSDKClient({
             server: this.getClientUrl().node,
-            chainId: getChainId(this.network),
+            chainId: this.getChainId(this.network),
             prefix: getPrefix(this.network),
         });
         if (phrase)
@@ -651,6 +633,28 @@ var Client = /** @class */ (function () {
     Client.prototype.getExplorerUrl = function () {
         return this.explorerUrls.root[this.network];
     };
+    /**
+     * Sets chain id
+     *
+     * @param {ChainId} chainId Chain id to update
+     * @param {Network} network (optional) Network for given chainId. If `network`not set, current network of the client is used
+     *
+     * @returns {void}
+     */
+    Client.prototype.setChainId = function (chainId, network) {
+        var _a;
+        this.chainIds = __assign(__assign({}, this.chainIds), (_a = {}, _a[network || this.network] = chainId, _a));
+    };
+    /**
+     * Gets chain id
+     *
+     * @param {Network} network (optional) Network to get chain id from. If `network`not set, current network of the client is used
+     *
+     * @returns {ChainId} Chain id based on the current network.
+     */
+    Client.prototype.getChainId = function (network) {
+        return this.chainIds[network || this.network];
+    };
     /**
      * Get cosmos client
      * @returns {CosmosSDKClient} current cosmos client
@@ -868,7 +872,9 @@ var Client = /** @class */ (function () {
                             var assetInList = _a.asset;
                             return xchainUtil.assetToString(assetInList) === xchainUtil.assetToString(asset);
                         })[0]) === null || _d === void 0 ? void 0 : _d.amount) !== null && _e !== void 0 ? _e : xchainUtil.baseAmount(0, DECIMAL);
-                        fee = xchainUtil.baseAmount(DEFAULT_GAS_VALUE, DECIMAL);
+                        return [4 /*yield*/, this.getFees()];
+                    case 2:
+                        fee = (_k.sent()).average;
                         if (isAssetRuneNative(asset)) {
                             // amount + fee < runeBalance
                             if (runeBalance.lt(amount.plus(fee))) {
@@ -892,13 +898,17 @@ var Client = /** @class */ (function () {
                             memo: memo,
                             signer: signer,
                         });
-                        return [4 /*yield*/, buildDepositTx(msgNativeTx, this.getClientUrl().node)];
-                    case 2:
+                        return [4 /*yield*/, buildDepositTx({
+                                msgNativeTx: msgNativeTx,
+                                nodeUrl: this.getClientUrl().node,
+                                chainId: this.getChainId(),
+                            })];
+                    case 3:
                         unsignedStdTx = _k.sent();
                         privateKey = this.getPrivKey(walletIndex);
                         accAddress = cosmosClient.AccAddress.fromBech32(signer);
                         return [4 /*yield*/, this.cosmosClient.signAndBroadcast(unsignedStdTx, privateKey, accAddress)];
-                    case 3: return [2 /*return*/, (_g = (_f = (_k.sent())) === null || _f === void 0 ? void 0 : _f.txhash) !== null && _g !== void 0 ? _g : ''];
+                    case 4: return [2 /*return*/, (_g = (_f = (_k.sent())) === null || _f === void 0 ? void 0 : _f.txhash) !== null && _g !== void 0 ? _g : ''];
                 }
             });
         });
@@ -1017,14 +1027,31 @@ var Client = /** @class */ (function () {
         });
     };
     /**
-     * Get the fees.
+     * Gets fees from Node
      *
      * @returns {Fees}
      */
     Client.prototype.getFees = function () {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, getDefaultFees()];
+            var fee, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, axios__default['default'].get(this.getClientUrl().node + "/thorchain/constants")
+                            // validate data
+                        ];
+                    case 1:
+                        fee = (_b.sent()).data.int_64_values.NativeTransactionFee;
+                        // validate data
+                        if (!fee || isNaN(fee) || fee < 0)
+                            throw Error("Invalid fee: " + fee.toString());
+                        return [2 /*return*/, xchainClient.singleFee(xchainClient.FeeType.FlatFee, xchainUtil.baseAmount(fee))];
+                    case 2:
+                        _a = _b.sent();
+                        return [2 /*return*/, getDefaultFees()];
+                    case 3: return [2 /*return*/];
+                }
             });
         });
     };
@@ -1040,7 +1067,6 @@ exports.MsgNativeTx = MsgNativeTx;
 exports.assetFromDenom = assetFromDenom;
 exports.buildDepositTx = buildDepositTx;
 exports.getBalance = getBalance;
-exports.getChainId = getChainId;
 exports.getDefaultClientUrl = getDefaultClientUrl;
 exports.getDefaultExplorerUrls = getDefaultExplorerUrls;
 exports.getDefaultFees = getDefaultFees;
@@ -1053,7 +1079,6 @@ 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/types/client-types.d.ts

@@ -11,9 +11,12 @@ export declare type ExplorerUrls = {
     address: ExplorerUrl;
 };
 export declare type ExplorerUrl = Record<Network, string>;
+export declare type ChainId = string;
+export declare type ChainIds = Record<Network, ChainId>;
 export declare type ThorchainClientParams = {
     clientUrl?: ClientUrl;
     explorerUrls?: ExplorerUrls;
+    chainIds?: ChainIds;
 };
 export declare type DepositParam = {
     walletIndex?: number;
@@ -35,3 +38,11 @@ export declare type TxOfflineParams = TxParams & {
     from_account_number: string;
     from_sequence: string;
 };
+/**
+ * Response from `thorchain/constants` endpoint
+ */
+export declare type ThorchainConstantsResponse = {
+    int_64_values: {
+        NativeTransactionFee: number;
+    };
+};

package/lib/util.d.ts

@@ -4,10 +4,10 @@ import { Asset } from '@xchainjs/xchain-util';
 import { Msg } from 'cosmos-client';
 import { StdTx } from 'cosmos-client/x/auth';
 import { MsgMultiSend, MsgSend } from 'cosmos-client/x/bank';
-import { ClientUrl, ExplorerUrls, TxData } from './types';
+import { ChainId, ClientUrl, ExplorerUrls, TxData } from './types';
 import { MsgNativeTx } from './types/messages';
 export declare const DECIMAL = 8;
-export declare const DEFAULT_GAS_VALUE = "2000000";
+export declare const DEFAULT_GAS_VALUE = "3000000";
 export declare const DEPOSIT_GAS_VALUE = "500000000";
 export declare const MAX_TX_COUNT = 100;
 /**
@@ -60,26 +60,6 @@ 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.
- *
- * @param {Network} network
- * @returns {string} The chain id based on the network.
- *
- */
-export declare const getChainId: (network: Network) => ChainId;
 /**
  * Register Codecs based on the prefix.
  *
@@ -111,12 +91,19 @@ export declare const getTxType: (txData: string, encoding: 'base64' | 'hex') =>
 /**
  * Structure StdTx from MsgNativeTx.
  *
- * @param {string} txId The transaction id.
+ * @param {MsgNativeTx} msgNativeTx Msg of type `MsgNativeTx`.
+ * @param {string} nodeUrl Node url
+ * @param {chainId} ChainId Chain id of the network
+ *
  * @returns {Tx} The transaction details of the given transaction id.
  *
  * @throws {"Invalid client url"} Thrown if the client url is an invalid one.
  */
-export declare const buildDepositTx: (msgNativeTx: MsgNativeTx, nodeUrl: string) => Promise<StdTx>;
+export declare const buildDepositTx: ({ msgNativeTx, nodeUrl, chainId, }: {
+    msgNativeTx: MsgNativeTx;
+    nodeUrl: string;
+    chainId: ChainId;
+}) => Promise<StdTx>;
 /**
  * Get the balance of a given address.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain",
-  "version": "0.21.1",
+  "version": "0.22.2",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -33,11 +33,11 @@
   },
   "devDependencies": {
     "@types/big.js": "^6.0.0",
-    "@xchainjs/xchain-client": "^0.11.0",
-    "@xchainjs/xchain-cosmos": "^0.16.0",
+    "@xchainjs/xchain-client": "^0.11.1",
+    "@xchainjs/xchain-cosmos": "^0.16.1",
     "@xchainjs/xchain-crypto": "^0.2.4",
-    "@xchainjs/xchain-util": "^0.5.0",
-    "axios": "^0.21.0",
+    "@xchainjs/xchain-util": "^0.5.1",
+    "axios": "^0.25.0",
     "cosmos-client": "0.39.2",
     "nock": "^13.0.5"
   },
@@ -45,11 +45,11 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@xchainjs/xchain-client": "^0.11.0",
-    "@xchainjs/xchain-cosmos": "^0.16.0",
+    "@xchainjs/xchain-client": "^0.11.1",
+    "@xchainjs/xchain-cosmos": "^0.16.1",
     "@xchainjs/xchain-crypto": "^0.2.4",
-    "@xchainjs/xchain-util": "^0.5.0",
-    "axios": "^0.21.0",
+    "@xchainjs/xchain-util": "^0.5.1",
+    "axios": "^0.25.0",
     "cosmos-client": "0.39.2"
   }
 }