@xchainjs/xchain-thorchain 0.20.0 → 0.21.2

package/CHANGELOG.md

@@ -1,3 +1,50 @@
+# 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
+
+- Fix chain id for `testnet` #477
+
+## Add
+
+- Helper `isChainId`
+- `enum ChainId`
+
+# v.0.21.0 (2022-02-02)
+
+## Breaking change
+
+- Remove `getDenomWithChain`
+- Rename `getAsset` -> `assetFromDenom` (incl. fix to get synth asset properly)
+
+## Update
+
+- xchain-util@0.5.0
+- xchain-cosmos@0.16.0
+
+## Add
+
+- `isAssetNativeRune` helper
+- Add `TxOfflineParams` type
+
+## Fix
+
+- Fix synth notation in `transfer|transferOffline|deposit` #473
+
+# 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/client.d.ts

@@ -1,9 +1,9 @@
 import { Address, Balance, Fees, Network, Tx, TxHash, TxHistoryParams, TxParams, TxsPage, XChainClient, XChainClientParams } from '@xchainjs/xchain-client';
-import { CosmosSDKClient, RPCTxResult, TxOfflineParams } from '@xchainjs/xchain-cosmos';
+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 } from './types';
+import { ClientUrl, DepositParam, ExplorerUrls, NodeUrl, ThorchainClientParams, TxOfflineParams } from './types';
 /**
  * Interface for custom Thorchain client
  */
@@ -212,7 +212,7 @@ declare class Client implements ThorchainClient, XChainClient {
      * @param {TxOfflineParams} params The transfer offline options.
      * @returns {StdTx} The signed transaction.
      */
-    transferOffline({ walletIndex, asset, amount, recipient, memo, from_balance, from_account_number, from_sequence, }: TxOfflineParams): Promise<StdTx>;
+    transferOffline({ walletIndex, asset, amount, recipient, memo, from_rune_balance, from_asset_balance, from_account_number, from_sequence, }: TxOfflineParams): Promise<StdTx>;
     /**
      * Get the fees.
      *

package/lib/index.esm.js

@@ -1,7 +1,7 @@
-import { Network, TxType, singleFee, FeeType, FeeOption } from '@xchainjs/xchain-client';
+import { Network, TxType, singleFee, FeeType } from '@xchainjs/xchain-client';
 import { CosmosSDKClient } from '@xchainjs/xchain-cosmos';
 import { validatePhrase } from '@xchainjs/xchain-crypto';
-import { assetToString, AssetRuneNative, Chain, assetFromString, baseAmount } from '@xchainjs/xchain-util';
+import { assetToString, AssetRuneNative, isSynthAsset, assetFromString, baseAmount } from '@xchainjs/xchain-util';
 import axios from 'axios';
 import { AccAddress, Msg, codec } from 'cosmos-client';
 import { StdTx } from 'cosmos-client/x/auth';
@@ -119,24 +119,25 @@ var DEFAULT_GAS_VALUE = '2000000';
 var DEPOSIT_GAS_VALUE = '500000000';
 var MAX_TX_COUNT = 100;
 /**
- * Get denomination from Asset
+ * Checks whether an asset is `AssetRuneNative`
  *
  * @param {Asset} asset
- * @returns {string} The denomination of the given asset.
+ * @returns {boolean} `true` or `false`
  */
-var getDenom = function (asset) {
-    if (assetToString(asset) === assetToString(AssetRuneNative))
-        return 'rune';
-    return asset.symbol;
-};
+var isAssetRuneNative = function (asset) { return assetToString(asset) === assetToString(AssetRuneNative); };
+var DENOM_RUNE_NATIVE = 'rune';
 /**
- * Get denomination with chainname from Asset
+ * Get denomination from Asset
  *
  * @param {Asset} asset
- * @returns {string} The denomination with chainname of the given asset.
+ * @returns {string} The denomination of the given asset.
  */
-var getDenomWithChain = function (asset) {
-    return Chain.THORChain + "." + asset.symbol.toUpperCase();
+var getDenom = function (asset) {
+    if (isAssetRuneNative(asset))
+        return DENOM_RUNE_NATIVE;
+    if (isSynthAsset(asset))
+        return assetToString(asset).toLowerCase();
+    return asset.symbol.toLowerCase();
 };
 /**
  * Get Asset from denomination
@@ -144,10 +145,10 @@ var getDenomWithChain = function (asset) {
  * @param {string} denom
  * @returns {Asset|null} The asset of the given denomination.
  */
-var getAsset = function (denom) {
-    if (denom === getDenom(AssetRuneNative))
+var assetFromDenom = function (denom) {
+    if (denom === DENOM_RUNE_NATIVE)
         return AssetRuneNative;
-    return assetFromString(Chain.THORChain + "." + denom.toUpperCase());
+    return assetFromString(denom.toUpperCase());
 };
 /**
  * Type guard for MsgSend
@@ -197,12 +198,36 @@ 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 () { return 'thorchain'; };
+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.
  *
@@ -286,19 +311,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 || !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');
@@ -334,7 +365,7 @@ var getBalance = function (_a) {
                     balances = _b.sent();
                     return [2 /*return*/, balances
                             .map(function (balance) { return ({
-                            asset: (balance.denom && getAsset(balance.denom)) || AssetRuneNative,
+                            asset: (balance.denom && assetFromDenom(balance.denom)) || AssetRuneNative,
                             amount: baseAmount(balance.amount, DECIMAL),
                         }); })
                             .filter(function (balance) { return !assets || assets.filter(function (asset) { return assetToString(balance.asset) === assetToString(asset); }).length; })];
@@ -541,7 +572,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)
@@ -813,23 +844,41 @@ var Client = /** @class */ (function () {
      * @throws {"failed to broadcast transaction"} Thrown if failed to broadcast transaction.
      */
     Client.prototype.deposit = function (_a) {
-        var _b, _c;
-        var _d = _a.walletIndex, walletIndex = _d === void 0 ? 0 : _d, _e = _a.asset, asset = _e === void 0 ? AssetRuneNative : _e, amount = _a.amount, memo = _a.memo;
+        var _b, _c, _d, _e, _f, _g;
+        var _h = _a.walletIndex, walletIndex = _h === void 0 ? 0 : _h, _j = _a.asset, asset = _j === void 0 ? AssetRuneNative : _j, amount = _a.amount, memo = _a.memo;
         return __awaiter(this, void 0, void 0, function () {
-            var assetBalance, signer, msgNativeTx, unsignedStdTx, privateKey, accAddress;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0: return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex), [asset])];
+            var balances, runeBalance, assetBalance, fee, signer, msgNativeTx, unsignedStdTx, privateKey, accAddress;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
+                    case 0: return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex))];
                     case 1:
-                        assetBalance = _f.sent();
-                        if (assetBalance.length === 0 || assetBalance[0].amount.amount().lt(amount.amount().plus(DEFAULT_GAS_VALUE))) {
-                            throw new Error('insufficient funds');
+                        balances = _k.sent();
+                        runeBalance = (_c = (_b = balances.filter(function (_a) {
+                            var asset = _a.asset;
+                            return isAssetRuneNative(asset);
+                        })[0]) === null || _b === void 0 ? void 0 : _b.amount) !== null && _c !== void 0 ? _c : baseAmount(0, DECIMAL);
+                        assetBalance = (_e = (_d = balances.filter(function (_a) {
+                            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);
+                        if (isAssetRuneNative(asset)) {
+                            // amount + fee < runeBalance
+                            if (runeBalance.lt(amount.plus(fee))) {
+                                throw new Error('insufficient funds');
+                            }
+                        }
+                        else {
+                            // amount < assetBalances && runeBalance < fee
+                            if (assetBalance.lt(amount) || runeBalance.lt(fee)) {
+                                throw new Error('insufficient funds');
+                            }
                         }
                         signer = this.getAddress(walletIndex);
                         msgNativeTx = msgNativeTxFromJson({
                             coins: [
                                 {
-                                    asset: getDenomWithChain(asset),
+                                    asset: isAssetRuneNative(asset) ? assetToString(AssetRuneNative) : getDenom(asset),
                                     amount: amount.amount().toString(),
                                 },
                             ],
@@ -838,11 +887,11 @@ var Client = /** @class */ (function () {
                         });
                         return [4 /*yield*/, buildDepositTx(msgNativeTx, this.getClientUrl().node)];
                     case 2:
-                        unsignedStdTx = _f.sent();
+                        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*/, (_c = (_b = (_f.sent())) === null || _b === void 0 ? void 0 : _b.txhash) !== null && _c !== void 0 ? _c : ''];
+                    case 3: return [2 /*return*/, (_g = (_f = (_k.sent())) === null || _f === void 0 ? void 0 : _f.txhash) !== null && _g !== void 0 ? _g : ''];
                 }
             });
         });
@@ -854,22 +903,39 @@ var Client = /** @class */ (function () {
      * @returns {TxHash} The transaction hash.
      */
     Client.prototype.transfer = function (_a) {
-        var _b = _a.walletIndex, walletIndex = _b === void 0 ? 0 : _b, _c = _a.asset, asset = _c === void 0 ? AssetRuneNative : _c, amount = _a.amount, recipient = _a.recipient, memo = _a.memo;
+        var _b, _c, _d, _e;
+        var _f = _a.walletIndex, walletIndex = _f === void 0 ? 0 : _f, _g = _a.asset, asset = _g === void 0 ? AssetRuneNative : _g, amount = _a.amount, recipient = _a.recipient, memo = _a.memo;
         return __awaiter(this, void 0, void 0, function () {
-            var assetBalance, fee, transferResult;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var balances, runeBalance, assetBalance, fee, transferResult;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         registerCodecs(getPrefix(this.network));
-                        return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex), [asset])];
+                        return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex))];
                     case 1:
-                        assetBalance = _d.sent();
+                        balances = _h.sent();
+                        runeBalance = (_c = (_b = balances.filter(function (_a) {
+                            var asset = _a.asset;
+                            return isAssetRuneNative(asset);
+                        })[0]) === null || _b === void 0 ? void 0 : _b.amount) !== null && _c !== void 0 ? _c : baseAmount(0, DECIMAL);
+                        assetBalance = (_e = (_d = balances.filter(function (_a) {
+                            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);
                         return [4 /*yield*/, this.getFees()];
                     case 2:
-                        fee = _d.sent();
-                        if (assetBalance.length === 0 ||
-                            assetBalance[0].amount.amount().lt(amount.amount().plus(fee[FeeOption.Average].amount()))) {
-                            throw new Error('insufficient funds');
+                        fee = (_h.sent()).average;
+                        if (isAssetRuneNative(asset)) {
+                            // amount + fee < runeBalance
+                            if (runeBalance.lt(amount.plus(fee))) {
+                                throw new Error('insufficient funds');
+                            }
+                        }
+                        else {
+                            // amount < assetBalances && runeBalance < fee
+                            if (assetBalance.lt(amount) || runeBalance.lt(fee)) {
+                                throw new Error('insufficient funds');
+                            }
                         }
                         return [4 /*yield*/, this.cosmosClient.transfer({
                                 privkey: this.getPrivKey(walletIndex),
@@ -884,7 +950,7 @@ var Client = /** @class */ (function () {
                                 },
                             })];
                     case 3:
-                        transferResult = _d.sent();
+                        transferResult = _h.sent();
                         if (!isBroadcastSuccess(transferResult)) {
                             throw new Error("failed to broadcast transaction: " + transferResult.txhash);
                         }
@@ -900,7 +966,7 @@ var Client = /** @class */ (function () {
      * @returns {StdTx} The signed transaction.
      */
     Client.prototype.transferOffline = function (_a) {
-        var _b = _a.walletIndex, walletIndex = _b === void 0 ? 0 : _b, _c = _a.asset, asset = _c === void 0 ? AssetRuneNative : _c, amount = _a.amount, recipient = _a.recipient, memo = _a.memo, _d = _a.from_balance, from_balance = _d === void 0 ? baseAmount('0', DECIMAL) : _d, _e = _a.from_account_number, from_account_number = _e === void 0 ? '0' : _e, _f = _a.from_sequence, from_sequence = _f === void 0 ? '0' : _f;
+        var _b = _a.walletIndex, walletIndex = _b === void 0 ? 0 : _b, _c = _a.asset, asset = _c === void 0 ? AssetRuneNative : _c, amount = _a.amount, recipient = _a.recipient, memo = _a.memo, from_rune_balance = _a.from_rune_balance, _d = _a.from_asset_balance, from_asset_balance = _d === void 0 ? baseAmount(0, DECIMAL) : _d, _e = _a.from_account_number, from_account_number = _e === void 0 ? '0' : _e, _f = _a.from_sequence, from_sequence = _f === void 0 ? '0' : _f;
         return __awaiter(this, void 0, void 0, function () {
             var fee, result;
             return __generator(this, function (_g) {
@@ -909,10 +975,18 @@ var Client = /** @class */ (function () {
                         registerCodecs(getPrefix(this.network));
                         return [4 /*yield*/, this.getFees()];
                     case 1:
-                        fee = _g.sent();
-                        if (from_balance === baseAmount('0', DECIMAL) ||
-                            from_balance.amount().lt(amount.amount().plus(fee[FeeOption.Average].amount()))) {
-                            throw new Error('insufficient funds');
+                        fee = (_g.sent()).average;
+                        if (isAssetRuneNative(asset)) {
+                            // amount + fee < runeBalance
+                            if (from_rune_balance.lt(amount.plus(fee))) {
+                                throw new Error('insufficient funds');
+                            }
+                        }
+                        else {
+                            // amount < assetBalances && runeBalance < fee
+                            if (from_asset_balance.lt(amount) || from_rune_balance.lt(fee)) {
+                                throw new Error('insufficient funds');
+                            }
                         }
                         return [4 /*yield*/, this.cosmosClient.transferSignedOffline({
                                 privkey: this.getPrivKey(walletIndex),
@@ -950,4 +1024,4 @@ var Client = /** @class */ (function () {
     return Client;
 }());
 
-export { Client, DECIMAL, DEFAULT_GAS_VALUE, DEPOSIT_GAS_VALUE, MAX_TX_COUNT, MsgNativeTx, buildDepositTx, getAsset, getBalance, getChainId, getDefaultClientUrl, getDefaultExplorerUrls, getDefaultFees, getDenom, getDenomWithChain, getDepositTxDataFromLogs, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getTxType, 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

@@ -127,24 +127,25 @@ var DEFAULT_GAS_VALUE = '2000000';
 var DEPOSIT_GAS_VALUE = '500000000';
 var MAX_TX_COUNT = 100;
 /**
- * Get denomination from Asset
+ * Checks whether an asset is `AssetRuneNative`
  *
  * @param {Asset} asset
- * @returns {string} The denomination of the given asset.
+ * @returns {boolean} `true` or `false`
  */
-var getDenom = function (asset) {
-    if (xchainUtil.assetToString(asset) === xchainUtil.assetToString(xchainUtil.AssetRuneNative))
-        return 'rune';
-    return asset.symbol;
-};
+var isAssetRuneNative = function (asset) { return xchainUtil.assetToString(asset) === xchainUtil.assetToString(xchainUtil.AssetRuneNative); };
+var DENOM_RUNE_NATIVE = 'rune';
 /**
- * Get denomination with chainname from Asset
+ * Get denomination from Asset
  *
  * @param {Asset} asset
- * @returns {string} The denomination with chainname of the given asset.
+ * @returns {string} The denomination of the given asset.
  */
-var getDenomWithChain = function (asset) {
-    return xchainUtil.Chain.THORChain + "." + asset.symbol.toUpperCase();
+var getDenom = function (asset) {
+    if (isAssetRuneNative(asset))
+        return DENOM_RUNE_NATIVE;
+    if (xchainUtil.isSynthAsset(asset))
+        return xchainUtil.assetToString(asset).toLowerCase();
+    return asset.symbol.toLowerCase();
 };
 /**
  * Get Asset from denomination
@@ -152,10 +153,10 @@ var getDenomWithChain = function (asset) {
  * @param {string} denom
  * @returns {Asset|null} The asset of the given denomination.
  */
-var getAsset = function (denom) {
-    if (denom === getDenom(xchainUtil.AssetRuneNative))
+var assetFromDenom = function (denom) {
+    if (denom === DENOM_RUNE_NATIVE)
         return xchainUtil.AssetRuneNative;
-    return xchainUtil.assetFromString(xchainUtil.Chain.THORChain + "." + denom.toUpperCase());
+    return xchainUtil.assetFromString(denom.toUpperCase());
 };
 /**
  * Type guard for MsgSend
@@ -205,12 +206,35 @@ 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 () { return 'thorchain'; };
+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.
  *
@@ -294,19 +318,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 || !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');
@@ -342,7 +372,7 @@ var getBalance = function (_a) {
                     balances = _b.sent();
                     return [2 /*return*/, balances
                             .map(function (balance) { return ({
-                            asset: (balance.denom && getAsset(balance.denom)) || xchainUtil.AssetRuneNative,
+                            asset: (balance.denom && assetFromDenom(balance.denom)) || xchainUtil.AssetRuneNative,
                             amount: xchainUtil.baseAmount(balance.amount, DECIMAL),
                         }); })
                             .filter(function (balance) { return !assets || assets.filter(function (asset) { return xchainUtil.assetToString(balance.asset) === xchainUtil.assetToString(asset); }).length; })];
@@ -549,7 +579,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)
@@ -821,23 +851,41 @@ var Client = /** @class */ (function () {
      * @throws {"failed to broadcast transaction"} Thrown if failed to broadcast transaction.
      */
     Client.prototype.deposit = function (_a) {
-        var _b, _c;
-        var _d = _a.walletIndex, walletIndex = _d === void 0 ? 0 : _d, _e = _a.asset, asset = _e === void 0 ? xchainUtil.AssetRuneNative : _e, amount = _a.amount, memo = _a.memo;
+        var _b, _c, _d, _e, _f, _g;
+        var _h = _a.walletIndex, walletIndex = _h === void 0 ? 0 : _h, _j = _a.asset, asset = _j === void 0 ? xchainUtil.AssetRuneNative : _j, amount = _a.amount, memo = _a.memo;
         return __awaiter(this, void 0, void 0, function () {
-            var assetBalance, signer, msgNativeTx, unsignedStdTx, privateKey, accAddress;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0: return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex), [asset])];
+            var balances, runeBalance, assetBalance, fee, signer, msgNativeTx, unsignedStdTx, privateKey, accAddress;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
+                    case 0: return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex))];
                     case 1:
-                        assetBalance = _f.sent();
-                        if (assetBalance.length === 0 || assetBalance[0].amount.amount().lt(amount.amount().plus(DEFAULT_GAS_VALUE))) {
-                            throw new Error('insufficient funds');
+                        balances = _k.sent();
+                        runeBalance = (_c = (_b = balances.filter(function (_a) {
+                            var asset = _a.asset;
+                            return isAssetRuneNative(asset);
+                        })[0]) === null || _b === void 0 ? void 0 : _b.amount) !== null && _c !== void 0 ? _c : xchainUtil.baseAmount(0, DECIMAL);
+                        assetBalance = (_e = (_d = balances.filter(function (_a) {
+                            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);
+                        if (isAssetRuneNative(asset)) {
+                            // amount + fee < runeBalance
+                            if (runeBalance.lt(amount.plus(fee))) {
+                                throw new Error('insufficient funds');
+                            }
+                        }
+                        else {
+                            // amount < assetBalances && runeBalance < fee
+                            if (assetBalance.lt(amount) || runeBalance.lt(fee)) {
+                                throw new Error('insufficient funds');
+                            }
                         }
                         signer = this.getAddress(walletIndex);
                         msgNativeTx = msgNativeTxFromJson({
                             coins: [
                                 {
-                                    asset: getDenomWithChain(asset),
+                                    asset: isAssetRuneNative(asset) ? xchainUtil.assetToString(xchainUtil.AssetRuneNative) : getDenom(asset),
                                     amount: amount.amount().toString(),
                                 },
                             ],
@@ -846,11 +894,11 @@ var Client = /** @class */ (function () {
                         });
                         return [4 /*yield*/, buildDepositTx(msgNativeTx, this.getClientUrl().node)];
                     case 2:
-                        unsignedStdTx = _f.sent();
+                        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*/, (_c = (_b = (_f.sent())) === null || _b === void 0 ? void 0 : _b.txhash) !== null && _c !== void 0 ? _c : ''];
+                    case 3: return [2 /*return*/, (_g = (_f = (_k.sent())) === null || _f === void 0 ? void 0 : _f.txhash) !== null && _g !== void 0 ? _g : ''];
                 }
             });
         });
@@ -862,22 +910,39 @@ var Client = /** @class */ (function () {
      * @returns {TxHash} The transaction hash.
      */
     Client.prototype.transfer = function (_a) {
-        var _b = _a.walletIndex, walletIndex = _b === void 0 ? 0 : _b, _c = _a.asset, asset = _c === void 0 ? xchainUtil.AssetRuneNative : _c, amount = _a.amount, recipient = _a.recipient, memo = _a.memo;
+        var _b, _c, _d, _e;
+        var _f = _a.walletIndex, walletIndex = _f === void 0 ? 0 : _f, _g = _a.asset, asset = _g === void 0 ? xchainUtil.AssetRuneNative : _g, amount = _a.amount, recipient = _a.recipient, memo = _a.memo;
         return __awaiter(this, void 0, void 0, function () {
-            var assetBalance, fee, transferResult;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var balances, runeBalance, assetBalance, fee, transferResult;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         registerCodecs(getPrefix(this.network));
-                        return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex), [asset])];
+                        return [4 /*yield*/, this.getBalance(this.getAddress(walletIndex))];
                     case 1:
-                        assetBalance = _d.sent();
+                        balances = _h.sent();
+                        runeBalance = (_c = (_b = balances.filter(function (_a) {
+                            var asset = _a.asset;
+                            return isAssetRuneNative(asset);
+                        })[0]) === null || _b === void 0 ? void 0 : _b.amount) !== null && _c !== void 0 ? _c : xchainUtil.baseAmount(0, DECIMAL);
+                        assetBalance = (_e = (_d = balances.filter(function (_a) {
+                            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);
                         return [4 /*yield*/, this.getFees()];
                     case 2:
-                        fee = _d.sent();
-                        if (assetBalance.length === 0 ||
-                            assetBalance[0].amount.amount().lt(amount.amount().plus(fee[xchainClient.FeeOption.Average].amount()))) {
-                            throw new Error('insufficient funds');
+                        fee = (_h.sent()).average;
+                        if (isAssetRuneNative(asset)) {
+                            // amount + fee < runeBalance
+                            if (runeBalance.lt(amount.plus(fee))) {
+                                throw new Error('insufficient funds');
+                            }
+                        }
+                        else {
+                            // amount < assetBalances && runeBalance < fee
+                            if (assetBalance.lt(amount) || runeBalance.lt(fee)) {
+                                throw new Error('insufficient funds');
+                            }
                         }
                         return [4 /*yield*/, this.cosmosClient.transfer({
                                 privkey: this.getPrivKey(walletIndex),
@@ -892,7 +957,7 @@ var Client = /** @class */ (function () {
                                 },
                             })];
                     case 3:
-                        transferResult = _d.sent();
+                        transferResult = _h.sent();
                         if (!isBroadcastSuccess(transferResult)) {
                             throw new Error("failed to broadcast transaction: " + transferResult.txhash);
                         }
@@ -908,7 +973,7 @@ var Client = /** @class */ (function () {
      * @returns {StdTx} The signed transaction.
      */
     Client.prototype.transferOffline = function (_a) {
-        var _b = _a.walletIndex, walletIndex = _b === void 0 ? 0 : _b, _c = _a.asset, asset = _c === void 0 ? xchainUtil.AssetRuneNative : _c, amount = _a.amount, recipient = _a.recipient, memo = _a.memo, _d = _a.from_balance, from_balance = _d === void 0 ? xchainUtil.baseAmount('0', DECIMAL) : _d, _e = _a.from_account_number, from_account_number = _e === void 0 ? '0' : _e, _f = _a.from_sequence, from_sequence = _f === void 0 ? '0' : _f;
+        var _b = _a.walletIndex, walletIndex = _b === void 0 ? 0 : _b, _c = _a.asset, asset = _c === void 0 ? xchainUtil.AssetRuneNative : _c, amount = _a.amount, recipient = _a.recipient, memo = _a.memo, from_rune_balance = _a.from_rune_balance, _d = _a.from_asset_balance, from_asset_balance = _d === void 0 ? xchainUtil.baseAmount(0, DECIMAL) : _d, _e = _a.from_account_number, from_account_number = _e === void 0 ? '0' : _e, _f = _a.from_sequence, from_sequence = _f === void 0 ? '0' : _f;
         return __awaiter(this, void 0, void 0, function () {
             var fee, result;
             return __generator(this, function (_g) {
@@ -917,10 +982,18 @@ var Client = /** @class */ (function () {
                         registerCodecs(getPrefix(this.network));
                         return [4 /*yield*/, this.getFees()];
                     case 1:
-                        fee = _g.sent();
-                        if (from_balance === xchainUtil.baseAmount('0', DECIMAL) ||
-                            from_balance.amount().lt(amount.amount().plus(fee[xchainClient.FeeOption.Average].amount()))) {
-                            throw new Error('insufficient funds');
+                        fee = (_g.sent()).average;
+                        if (isAssetRuneNative(asset)) {
+                            // amount + fee < runeBalance
+                            if (from_rune_balance.lt(amount.plus(fee))) {
+                                throw new Error('insufficient funds');
+                            }
+                        }
+                        else {
+                            // amount < assetBalances && runeBalance < fee
+                            if (from_asset_balance.lt(amount) || from_rune_balance.lt(fee)) {
+                                throw new Error('insufficient funds');
+                            }
                         }
                         return [4 /*yield*/, this.cosmosClient.transferSignedOffline({
                                 privkey: this.getPrivKey(walletIndex),
@@ -964,22 +1037,23 @@ exports.DEFAULT_GAS_VALUE = DEFAULT_GAS_VALUE;
 exports.DEPOSIT_GAS_VALUE = DEPOSIT_GAS_VALUE;
 exports.MAX_TX_COUNT = MAX_TX_COUNT;
 exports.MsgNativeTx = MsgNativeTx;
+exports.assetFromDenom = assetFromDenom;
 exports.buildDepositTx = buildDepositTx;
-exports.getAsset = getAsset;
 exports.getBalance = getBalance;
 exports.getChainId = getChainId;
 exports.getDefaultClientUrl = getDefaultClientUrl;
 exports.getDefaultExplorerUrls = getDefaultExplorerUrls;
 exports.getDefaultFees = getDefaultFees;
 exports.getDenom = getDenom;
-exports.getDenomWithChain = getDenomWithChain;
 exports.getDepositTxDataFromLogs = getDepositTxDataFromLogs;
 exports.getExplorerAddressUrl = getExplorerAddressUrl;
 exports.getExplorerTxUrl = getExplorerTxUrl;
 exports.getExplorerUrl = getExplorerUrl;
 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

@@ -1,4 +1,4 @@
-import { Network, Tx } from '@xchainjs/xchain-client';
+import { Network, Tx, TxParams } from '@xchainjs/xchain-client';
 import { Asset, BaseAmount } from '@xchainjs/xchain-util';
 export declare type NodeUrl = {
     node: string;
@@ -22,3 +22,16 @@ export declare type DepositParam = {
     memo: string;
 };
 export declare type TxData = Pick<Tx, 'from' | 'to' | 'type'>;
+export declare type TxOfflineParams = TxParams & {
+    /**
+     * Balance of Rune to send from
+     */
+    from_rune_balance: BaseAmount;
+    /**
+     * Balance of asset to send from
+     * Optional: It can be ignored if asset to send from is RUNE
+     */
+    from_asset_balance?: BaseAmount;
+    from_account_number: string;
+    from_sequence: string;
+};

package/lib/util.d.ts

@@ -11,26 +11,26 @@ export declare const DEFAULT_GAS_VALUE = "2000000";
 export declare const DEPOSIT_GAS_VALUE = "500000000";
 export declare const MAX_TX_COUNT = 100;
 /**
- * Get denomination from Asset
+ * Checks whether an asset is `AssetRuneNative`
  *
  * @param {Asset} asset
- * @returns {string} The denomination of the given asset.
+ * @returns {boolean} `true` or `false`
  */
-export declare const getDenom: (asset: Asset) => string;
+export declare const isAssetRuneNative: (asset: Asset) => boolean;
 /**
- * Get denomination with chainname from Asset
+ * Get denomination from Asset
  *
  * @param {Asset} asset
- * @returns {string} The denomination with chainname of the given asset.
+ * @returns {string} The denomination of the given asset.
  */
-export declare const getDenomWithChain: (asset: Asset) => string;
+export declare const getDenom: (asset: Asset) => string;
 /**
  * Get Asset from denomination
  *
  * @param {string} denom
  * @returns {Asset|null} The asset of the given denomination.
  */
-export declare const getAsset: (denom: string) => Asset | null;
+export declare const assetFromDenom: (denom: string) => Asset | null;
 /**
  * Type guard for MsgSend
  *
@@ -60,12 +60,26 @@ 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: () => string;
+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.20.0",
+  "version": "0.21.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.15.0",
+    "@xchainjs/xchain-client": "^0.11.1",
+    "@xchainjs/xchain-cosmos": "^0.16.1",
     "@xchainjs/xchain-crypto": "^0.2.4",
-    "@xchainjs/xchain-util": "^0.3.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.15.0",
+    "@xchainjs/xchain-client": "^0.11.1",
+    "@xchainjs/xchain-cosmos": "^0.16.1",
     "@xchainjs/xchain-crypto": "^0.2.4",
-    "@xchainjs/xchain-util": "^0.3.0",
-    "axios": "^0.21.0",
+    "@xchainjs/xchain-util": "^0.5.1",
+    "axios": "^0.25.0",
     "cosmos-client": "0.39.2"
   }
 }