@xchainjs/xchain-wallet 0.1.16 → 0.1.18

package/lib/index.d.ts

@@ -6,3 +6,4 @@ import { Wallet } from './wallet';
  * Export Wallet module
  */
 export { Wallet };
+export { ChainBalances, EvmTxParams, UtxoTxParams } from './types';

package/lib/index.esm.js

@@ -142,16 +142,15 @@ class Wallet {
      * @param {Chain[]} chains Optional chains to get addresses for, if not provided, returns all wallet addresses
      * @returns Addresses mapped by chain
      */
-    getAddresses(chains) {
+    getAddresses(chains = Object.keys(this.clients)) {
         return __awaiter(this, void 0, void 0, function* () {
-            const _chains = chains || Object.keys(this.clients);
-            const tasks = _chains.map((chain) => {
+            const tasks = chains.map((chain) => {
                 return this.getAddress(chain);
             });
             const walletAddresses = {};
             const addresses = yield Promise.all(tasks);
             addresses.map((walletAddress, index) => {
-                walletAddresses[_chains[index]] = walletAddress;
+                walletAddresses[chains[index]] = walletAddress;
             });
             return walletAddresses;
         });
@@ -183,16 +182,22 @@ class Wallet {
      * @param {Assets[]} assets - Optional. Assets of which return the balance
      * @returns {Record<Chain, Balance[]>} Balances by chain
      */
-    getBalances(assets) {
+    getBalances(assets = Object.keys(this.clients).reduce((prev, client) => {
+        prev[client] = undefined;
+        return prev;
+    }, {})) {
         return __awaiter(this, void 0, void 0, function* () {
-            const chains = assets ? Array.from(new Set(assets.map((asset) => asset.chain))) : Object.keys(this.clients);
-            const tasks = chains.map((chain) => __awaiter(this, void 0, void 0, function* () {
-                return yield this.getBalance(chain, assets === null || assets === void 0 ? void 0 : assets.filter((asset) => asset.chain === chain));
-            }));
             const walletBalances = {};
-            const balances = yield Promise.all(tasks);
-            balances.map((chainBalance, index) => {
-                walletBalances[chains[index]] = chainBalance;
+            const chains = Object.keys(assets);
+            const results = yield Promise.allSettled(chains.map((chain) => {
+                return this.getBalance(chain, assets[chain]);
+            }));
+            results.forEach((chainBalance, index) => {
+                if (chainBalance.status === 'fulfilled') {
+                    walletBalances[chains[index]] = { status: 'fulfilled', balances: chainBalance.value };
+                }
+                else if (chainBalance.status === 'rejected')
+                    walletBalances[chains[index]] = { status: 'rejected', reason: chainBalance.reason };
             });
             return walletBalances;
         });
@@ -227,16 +232,15 @@ class Wallet {
      * @param {Chain[]} chains - Optional. Chain of which return the transaction history
      * @returns {TxsPage} the chain transaction history
      */
-    getTransactionsHistories(chains) {
+    getTransactionsHistories(chains = Object.keys(this.clients)) {
         return __awaiter(this, void 0, void 0, function* () {
-            const _chains = chains || Object.keys(this.clients);
-            const tasks = _chains.map((chain) => __awaiter(this, void 0, void 0, function* () {
+            const tasks = chains.map((chain) => __awaiter(this, void 0, void 0, function* () {
                 return this.getTransactionsHistory(chain);
             }));
             const walletHistories = {};
             const histories = yield Promise.all(tasks);
             histories.map((history, index) => {
-                walletHistories[_chains[index]] = history;
+                walletHistories[chains[index]] = history;
             });
             return walletHistories;
         });

package/lib/index.js

@@ -146,16 +146,15 @@ class Wallet {
      * @param {Chain[]} chains Optional chains to get addresses for, if not provided, returns all wallet addresses
      * @returns Addresses mapped by chain
      */
-    getAddresses(chains) {
+    getAddresses(chains = Object.keys(this.clients)) {
         return __awaiter(this, void 0, void 0, function* () {
-            const _chains = chains || Object.keys(this.clients);
-            const tasks = _chains.map((chain) => {
+            const tasks = chains.map((chain) => {
                 return this.getAddress(chain);
             });
             const walletAddresses = {};
             const addresses = yield Promise.all(tasks);
             addresses.map((walletAddress, index) => {
-                walletAddresses[_chains[index]] = walletAddress;
+                walletAddresses[chains[index]] = walletAddress;
             });
             return walletAddresses;
         });
@@ -187,16 +186,22 @@ class Wallet {
      * @param {Assets[]} assets - Optional. Assets of which return the balance
      * @returns {Record<Chain, Balance[]>} Balances by chain
      */
-    getBalances(assets) {
+    getBalances(assets = Object.keys(this.clients).reduce((prev, client) => {
+        prev[client] = undefined;
+        return prev;
+    }, {})) {
         return __awaiter(this, void 0, void 0, function* () {
-            const chains = assets ? Array.from(new Set(assets.map((asset) => asset.chain))) : Object.keys(this.clients);
-            const tasks = chains.map((chain) => __awaiter(this, void 0, void 0, function* () {
-                return yield this.getBalance(chain, assets === null || assets === void 0 ? void 0 : assets.filter((asset) => asset.chain === chain));
-            }));
             const walletBalances = {};
-            const balances = yield Promise.all(tasks);
-            balances.map((chainBalance, index) => {
-                walletBalances[chains[index]] = chainBalance;
+            const chains = Object.keys(assets);
+            const results = yield Promise.allSettled(chains.map((chain) => {
+                return this.getBalance(chain, assets[chain]);
+            }));
+            results.forEach((chainBalance, index) => {
+                if (chainBalance.status === 'fulfilled') {
+                    walletBalances[chains[index]] = { status: 'fulfilled', balances: chainBalance.value };
+                }
+                else if (chainBalance.status === 'rejected')
+                    walletBalances[chains[index]] = { status: 'rejected', reason: chainBalance.reason };
             });
             return walletBalances;
         });
@@ -231,16 +236,15 @@ class Wallet {
      * @param {Chain[]} chains - Optional. Chain of which return the transaction history
      * @returns {TxsPage} the chain transaction history
      */
-    getTransactionsHistories(chains) {
+    getTransactionsHistories(chains = Object.keys(this.clients)) {
         return __awaiter(this, void 0, void 0, function* () {
-            const _chains = chains || Object.keys(this.clients);
-            const tasks = _chains.map((chain) => __awaiter(this, void 0, void 0, function* () {
+            const tasks = chains.map((chain) => __awaiter(this, void 0, void 0, function* () {
                 return this.getTransactionsHistory(chain);
             }));
             const walletHistories = {};
             const histories = yield Promise.all(tasks);
             histories.map((history, index) => {
-                walletHistories[_chains[index]] = history;
+                walletHistories[chains[index]] = history;
             });
             return walletHistories;
         });

package/lib/types.d.ts

@@ -1,6 +1,6 @@
-import { TxParams as BaseTxParams } from '@xchainjs/xchain-client';
+import { Balance, TxParams as BaseTxParams } from '@xchainjs/xchain-client';
 import { TxParams as BaseEvmTxParams } from '@xchainjs/xchain-evm';
-import { Asset, BaseAmount } from '@xchainjs/xchain-util';
+import { Asset, BaseAmount, Chain } from '@xchainjs/xchain-util';
 /**
  * UTXO transfer params
  */
@@ -14,3 +14,22 @@ export type UtxoTxParams = BaseTxParams & {
 export type EvmTxParams = BaseEvmTxParams & {
     asset: Asset;
 };
+/**
+ * Fulfilled balance from a Chain
+ */
+type FulfilledBalance = {
+    status: 'fulfilled';
+    balances: Balance[];
+};
+/**
+ * Rejected balance from a Chain
+ */
+type RejectedBalance = {
+    status: 'rejected';
+    reason: string;
+};
+/**
+ * Balances by chain, which can be fulfilled or rejected
+ */
+export type ChainBalances = Record<Chain, FulfilledBalance | RejectedBalance>;
+export {};

package/lib/wallet.d.ts

@@ -5,7 +5,7 @@ import { AssetInfo, Balance, FeeOption, Fees, Network, Protocol, Tx, TxHash, Txs
 import { GasPrices } from '@xchainjs/xchain-evm';
 import { DepositParam } from '@xchainjs/xchain-mayachain';
 import { Address, Asset, BaseAmount, Chain } from '@xchainjs/xchain-util';
-import { EvmTxParams, UtxoTxParams } from './types';
+import { ChainBalances, EvmTxParams, UtxoTxParams } from './types';
 export type NodeUrls = Record<Network, string>;
 export declare class Wallet {
     private clients;
@@ -82,7 +82,7 @@ export declare class Wallet {
      * @param {Assets[]} assets - Optional. Assets of which return the balance
      * @returns {Record<Chain, Balance[]>} Balances by chain
      */
-    getBalances(assets?: Asset[]): Promise<Record<Chain, Balance[]>>;
+    getBalances(assets?: Record<Chain, Asset[] | undefined>): Promise<ChainBalances>;
     /**
      * Get transaction data from hash
      * @param {Chain} chain - Chain in which the transaction was done

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xchainjs/xchain-wallet",
   "description": "XChainjs clients wrapper to work with several chains at the same time",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "lib/index.esm.js",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@xchainjs/xchain-client": "0.16.7",
     "@xchainjs/xchain-evm": "0.6.3",
-    "@xchainjs/xchain-mayachain": "1.0.8",
-    "@xchainjs/xchain-thorchain": "1.0.11",
+    "@xchainjs/xchain-mayachain": "1.0.10",
+    "@xchainjs/xchain-thorchain": "1.1.0",
     "@xchainjs/xchain-util": "0.13.6",
     "@xchainjs/xchain-utxo": "0.1.9"
   },