@xchainjs/xchain-thorchain 0.22.1 → 0.22.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 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

package/lib/client.d.ts

@@ -232,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';
@@ -259,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);
 };
 /**
@@ -864,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))) {
@@ -893,12 +895,12 @@ var Client = /** @class */ (function () {
                                 nodeUrl: this.getClientUrl().node,
                                 chainId: this.getChainId(),
                             })];
-                    case 2:
+                    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 : ''];
                 }
             });
         });
@@ -1017,14 +1019,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.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*/];
+                }
             });
         });
     };

package/lib/index.js

@@ -267,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);
 };
 /**
@@ -872,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))) {
@@ -901,12 +903,12 @@ var Client = /** @class */ (function () {
                                 nodeUrl: this.getClientUrl().node,
                                 chainId: this.getChainId(),
                             })];
-                    case 2:
+                    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 : ''];
                 }
             });
         });
@@ -1025,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*/];
+                }
             });
         });
     };

package/lib/types/client-types.d.ts

@@ -38,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/package.json

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