fix: always return gas asset in balance (#1611)

Author: ice-chillios

.changeset/seven-meals-sin.md

@@ -0,0 +1,6 @@
+---
+"@swapkit/toolboxes": patch
+"@swapkit/wallets": patch
+---
+
+Always return gas asset of chain

packages/toolboxes/src/radix/index.ts

@@ -18,7 +18,13 @@ export function radixValidateAddress(address: string) {
 function getBalance({ networkApi }: { networkApi: GatewayApiClient }) {
   return async function getBalance(address: string) {
     const fungibleResources = await fetchFungibleResources({ address, networkApi });
-    const fungibleBalances = convertResourcesToBalances({ networkApi, resources: fungibleResources });
+    const fungibleBalances = await convertResourcesToBalances({ networkApi, resources: fungibleResources });
+
+    const hasNativeAsset = fungibleBalances.some((asset) => asset.isGasAsset);
+    if (!hasNativeAsset) {
+      return [AssetValue.from({ chain: Chain.Radix }), ...fungibleBalances];
+    }
+
     return fungibleBalances;
   };
 }

packages/toolboxes/src/solana/toolbox.ts

@@ -67,17 +67,11 @@ async function getSolanaBalance(address: string) {
   const { PublicKey } = await import("@solana/web3.js");
   const { TOKEN_PROGRAM_ID } = await import("@solana/spl-token");
   const publicKey = new PublicKey(address);
+  const { baseDecimal } = getChainConfig(Chain.Solana);
 
-  const balances: AssetValue[] = [];
-
-  // Get SOL balance
   const solBalance = await connection.getBalance(publicKey);
-  if (solBalance > 0) {
-    const { baseDecimal } = getChainConfig(Chain.Solana);
-    balances.push(AssetValue.from({ chain: Chain.Solana, fromBaseDecimal: baseDecimal, value: solBalance }));
-  }
+  const balances = [AssetValue.from({ chain: Chain.Solana, fromBaseDecimal: baseDecimal, value: solBalance || 0 })];
 
-  // Get token balances
   const tokenAccounts = await connection.getParsedTokenAccountsByOwner(publicKey, { programId: TOKEN_PROGRAM_ID });
 
   for (const { account } of tokenAccounts.value) {

packages/toolboxes/src/substrate/balance.ts

@@ -29,7 +29,7 @@ export async function getSubstrateBalance(
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     console.error(`Error fetching substrate balance: ${errorMessage}`);
-    return [];
+    return [gasAsset.set(0)];
   }
 }
 
@@ -66,7 +66,7 @@ export async function getChainflipBalance(
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     console.error(`Error fetching chainflip balance: ${errorMessage}`);
-    return [];
+    return [gasAsset.set(0)];
   }
 }
 

packages/toolboxes/src/sui/toolbox.ts

@@ -40,10 +40,11 @@ export async function getSuiToolbox({ provider: providerParam, ...signerParams }
       throw new SwapKitError("toolbox_sui_address_required" as any);
     }
 
+    const { baseDecimal: fromBaseDecimal, chain } = getChainConfig(Chain.Sui);
+
     try {
       const suiClient = await getSuiClient();
       const { totalBalance } = await suiClient.getBalance({ owner: addressToQuery });
-      const { baseDecimal: fromBaseDecimal, chain } = getChainConfig(Chain.Sui);
 
       const suiBalances = [AssetValue.from({ chain, fromBaseDecimal, value: totalBalance })];
 
@@ -60,8 +61,8 @@ export async function getSuiToolbox({ provider: providerParam, ...signerParams }
       }
 
       return suiBalances;
-    } catch (error) {
-      throw new SwapKitError("toolbox_sui_balance_error" as any, { error });
+    } catch {
+      return [AssetValue.from({ chain })];
     }
   }
 

packages/toolboxes/src/ton/toolbox.ts

@@ -52,8 +52,8 @@ export async function getTONToolbox(toolboxParams: TONToolboxParams = {}) {
     try {
       const balance = await client.getBalance(Address.parse(address));
       return [AssetValue.from({ chain: Chain.Ton, value: SwapKitNumber.fromBigInt(balance, baseDecimal) })];
-    } catch (error) {
-      throw new SwapKitError("core_wallet_connection_not_found", { error });
+    } catch {
+      return [AssetValue.from({ chain: Chain.Ton })];
     }
   }
 

packages/toolboxes/src/utils.ts

@@ -20,8 +20,15 @@ export function getBalance<T extends Chain>(chain: T) {
   return async function getBalance(address: string, scamFilter = true) {
     const balances = await SwapKitApi.getChainBalance({ address, chain, scamFilter });
     const { baseDecimal } = getChainConfig(chain);
-    return balances.map(({ identifier, value, decimal }) => {
+    const assetValues = balances.map(({ identifier, value, decimal }) => {
       return new AssetValue({ decimal: decimal || baseDecimal, identifier, value });
     });
+
+    const hasNativeAsset = assetValues.some((asset) => asset.isGasAsset);
+    if (!hasNativeAsset) {
+      return [AssetValue.from({ chain }), ...assetValues];
+    }
+
+    return assetValues;
   };
 }

packages/wallets/src/radix/index.ts

@@ -124,6 +124,11 @@ async function getBalance(address: string): Promise<AssetValue[]> {
     }
   }
 
+  const hasNativeAsset = balances.some((asset) => asset.isGasAsset);
+  if (!hasNativeAsset) {
+    return [AssetValue.from({ chain: Chain.Radix }), ...balances];
+  }
+
   return balances;
 }