@xchainjs/xchain-radix 1.1.0 → 1.1.2

package/lib/client.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { Curve, PrivateKey } from '@radixdlt/radix-engine-toolkit';
 import { AssetInfo, BaseXChainClient, Fees, Network, PreparedTx, TxHistoryParams, XChainClientParams } from '@xchainjs/xchain-client';
-import { Address } from '@xchainjs/xchain-util';
+import { Address, TokenAsset } from '@xchainjs/xchain-util';
 import { RadixSpecificClient } from './radix-client';
-import { Balance, CompatibleAsset, Tx, TxParams, TxsPage } from './types/radix';
+import { Balance, Tx, TxParams, TxsPage } from './types/radix';
 /**
  * Custom Radix client
  */
@@ -67,7 +67,7 @@ export default class Client extends BaseXChainClient {
      * @param {Asset[]} assets - Assets to retrieve the balance for (optional).
      * @returns {Promise<Balance[]>} An array containing the balance of the address.
      */
-    getBalance(address: Address, assets?: CompatibleAsset[]): Promise<Balance[]>;
+    getBalance(address: Address, assets?: TokenAsset[]): Promise<Balance[]>;
     /**
      * Get transaction history of a given address with pagination options.
      * @param {TxHistoryParams} params The options to get transaction history. (optional)

package/lib/const.d.ts

@@ -8,7 +8,7 @@ export declare const RadixChain: "XRD";
 export declare const MAINNET_GATEWAY_URL = "https://mainnet.radixdlt.com";
 export declare const STOKENET_GATEWAY_URL = "https://stokenet.radixdlt.com";
 export declare const XRD_DECIMAL = 18;
-export declare const RADIX_ASSET_RESOURCE = "resource_tdx_2_1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxtfd2jc";
+export declare const RADIX_ASSET_RESOURCE = "resource_rdx1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxradxrd";
 export declare const AssetXRD: Asset;
 export declare const xrdRootDerivationPaths: RootDerivationPaths;
 export declare const bech32Networks: {

package/lib/index.esm.js

@@ -13906,7 +13906,7 @@ const RadixChain = 'XRD';
 const MAINNET_GATEWAY_URL = 'https://mainnet.radixdlt.com';
 const STOKENET_GATEWAY_URL = 'https://stokenet.radixdlt.com';
 const XRD_DECIMAL = 18;
-const RADIX_ASSET_RESOURCE = 'resource_tdx_2_1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxtfd2jc';
+const RADIX_ASSET_RESOURCE = 'resource_rdx1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxradxrd';
 const AssetXRD = {
     symbol: `XRD`,
     ticker: 'XRD',
@@ -14011,21 +14011,22 @@ class RadixSpecificClient {
                 });
                 batch.forEach((item) => {
                     if (item.aggregation_level === 'Global') {
-                        const asset = {
-                            chain: RadixChain,
-                            symbol: item.resource_address,
-                            ticker: item.resource_address,
-                            type: AssetType.TOKEN,
-                        };
+                        const asset = item.resource_address === RADIX_ASSET_RESOURCE
+                            ? AssetXRD
+                            : {
+                                chain: RadixChain,
+                                symbol: item.resource_address,
+                                ticker: item.resource_address,
+                                type: AssetType.TOKEN,
+                            };
                         const divisibility = divisibilities.get(item.resource_address) || 0;
                         // We need to do this because item.amount can be either string or number
                         // depending on the type of resource
                         const amount = typeof item.amount === 'string' ? parseFloat(item.amount) : item.amount;
-                        const balance = {
-                            asset: asset,
+                        balances.push({
+                            asset,
                             amount: assetToBase(assetAmount(amount, divisibility)),
-                        };
-                        balances.push(balance);
+                        });
                     }
                 });
             }
@@ -14455,7 +14456,8 @@ class Client extends BaseXChainClient {
             if (!assets) {
                 return balances;
             }
-            const filteredBalances = balances.filter((balance) => assets.some((asset) => balance.asset.symbol === asset.symbol));
+            const filteredBalances = balances.filter((balance) => eqAsset(balance.asset, this.getAssetInfo().asset) ||
+                assets.some((asset) => balance.asset.symbol === asset.symbol));
             return filteredBalances;
         });
     }

package/lib/index.js

@@ -13918,7 +13918,7 @@ const RadixChain = 'XRD';
 const MAINNET_GATEWAY_URL = 'https://mainnet.radixdlt.com';
 const STOKENET_GATEWAY_URL = 'https://stokenet.radixdlt.com';
 const XRD_DECIMAL = 18;
-const RADIX_ASSET_RESOURCE = 'resource_tdx_2_1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxtfd2jc';
+const RADIX_ASSET_RESOURCE = 'resource_rdx1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxradxrd';
 const AssetXRD = {
     symbol: `XRD`,
     ticker: 'XRD',
@@ -14023,21 +14023,22 @@ class RadixSpecificClient {
                 });
                 batch.forEach((item) => {
                     if (item.aggregation_level === 'Global') {
-                        const asset = {
-                            chain: RadixChain,
-                            symbol: item.resource_address,
-                            ticker: item.resource_address,
-                            type: xchainUtil.AssetType.TOKEN,
-                        };
+                        const asset = item.resource_address === RADIX_ASSET_RESOURCE
+                            ? AssetXRD
+                            : {
+                                chain: RadixChain,
+                                symbol: item.resource_address,
+                                ticker: item.resource_address,
+                                type: xchainUtil.AssetType.TOKEN,
+                            };
                         const divisibility = divisibilities.get(item.resource_address) || 0;
                         // We need to do this because item.amount can be either string or number
                         // depending on the type of resource
                         const amount = typeof item.amount === 'string' ? parseFloat(item.amount) : item.amount;
-                        const balance = {
-                            asset: asset,
+                        balances.push({
+                            asset,
                             amount: xchainUtil.assetToBase(xchainUtil.assetAmount(amount, divisibility)),
-                        };
-                        balances.push(balance);
+                        });
                     }
                 });
             }
@@ -14467,7 +14468,8 @@ class Client extends xchainClient.BaseXChainClient {
             if (!assets) {
                 return balances;
             }
-            const filteredBalances = balances.filter((balance) => assets.some((asset) => balance.asset.symbol === asset.symbol));
+            const filteredBalances = balances.filter((balance) => xchainUtil.eqAsset(balance.asset, this.getAssetInfo().asset) ||
+                assets.some((asset) => balance.asset.symbol === asset.symbol));
             return filteredBalances;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-radix",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Custom Radix client and utilities used by XChainJS clients",
   "keywords": [
     "XRD",
@@ -40,9 +40,9 @@
   "dependencies": {
     "@radixdlt/babylon-gateway-api-sdk": "^1.4.1",
     "@radixdlt/radix-engine-toolkit": "^1.0.3",
-    "@xchainjs/xchain-client": "1.0.3",
+    "@xchainjs/xchain-client": "1.0.4",
     "@xchainjs/xchain-crypto": "0.3.4",
-    "@xchainjs/xchain-util": "1.0.2",
+    "@xchainjs/xchain-util": "1.0.3",
     "bech32": "^2.0.0",
     "bip32": "^4.0.0",
     "bip39": "^3.1.0",