Merge branch 'main' into add/hyperliquid-evm

router-protocol · Jan 3, 2025 · 83beaca · 83beaca
2 parents 6ed8a7b + 66859c0
commit 83beaca
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 14 deletions.
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -24,6 +24,12 @@
 
 - feat: add hyperliquid
 
+## 1.15.15
+
+### Patch Changes
+
+- fix tron switch network call
+
 ## 1.15.14
 
 ### Patch Changes

diff --git a/packages/react/src/actions/cosmos/getCosmosToken.ts b/packages/react/src/actions/cosmos/getCosmosToken.ts
@@ -1,5 +1,6 @@
 import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
 import { maxInt256 } from 'viem';
+import { RouterLCDBalancesResponse } from '../../types/cosmos.js';
 import { ChainData, ConnectionOrConfig, CosmsosChainType } from '../../types/index.js';
 import { areTokensEqual, formatTokenAddress, isNativeOrFactoryToken } from '../../utils/index.js';
 
@@ -45,9 +46,14 @@ export const getCosmosTokenBalanceAndAllowance = async ({
   allowance: bigint;
 }> => {
   if (chain.id === 'router_9600-1') {
-    const { getNetworkInfo, ChainGrpcWasmApi, ChainGrpcBankApi, getRouterSignerAddress, toUtf8 } = await import(
-      '@routerprotocol/router-chain-sdk-ts'
-    );
+    const {
+      getNetworkInfo,
+      getEndpointsForNetwork,
+      getNetworkType,
+      restFetcher,
+      ChainGrpcBankApi,
+      getRouterSignerAddress,
+    } = await import('@routerprotocol/router-chain-sdk-ts');
 
     const network = getNetworkInfo(chain.extra?.environment);
     if (token === 'route') {
@@ -68,24 +74,24 @@ export const getCosmosTokenBalanceAndAllowance = async ({
         allowance: maxInt256,
       };
     } else {
-      const wasmClient = new ChainGrpcWasmApi(network.grpcEndpoint);
-
+      const networkEnvironment = chain.id === 'router_9600-1' ? 'mainnet' : 'testnet';
+      const lcdEndpoint = getEndpointsForNetwork(getNetworkType(networkEnvironment)).lcdEndpoint;
       const address = getRouterSignerAddress(account);
       if (!address) {
         throw new Error(`Invalid address to convert to Router: ${account}`);
       }
 
-      const balance = await wasmClient.fetchSmartContractState(
-        token,
-        toUtf8(
-          JSON.stringify({
-            balance: { address },
-          }),
-        ),
+      const balancesData: RouterLCDBalancesResponse = await restFetcher(
+        `${lcdEndpoint}/cosmos/bank/v1beta1/balances/${address}?pagination.limit=1000`,
       );
+      const tokenBalance = balancesData.balances.find((balance) => balance.denom === token);
+
+      if (!tokenBalance) {
+        throw new Error(`Failed to fetch balance for token: ${token}`);
+      }
 
       return {
-        balance: BigInt(balance.data.balance),
+        balance: BigInt(tokenBalance.amount),
         allowance: maxInt256,
       };
     }

diff --git a/packages/react/src/hooks/useNetwork.ts b/packages/react/src/hooks/useNetwork.ts
@@ -43,8 +43,9 @@ export const useNetwork = () => {
         return chains.find((chain) => chain.id === switchedChain.id);
       }
       if (chain.type === 'tron') {
+        // convert chain id
         try {
-          await (connector as WalletInstance<'tron'>).switchChain(chain.tronName);
+          await (connector as WalletInstance<'tron'>).switchChain(chain.trxId);
         } catch (e) {
           if (e === WalletSwitchChainError) {
             console.error('Switch chain is not supported');

diff --git a/packages/react/src/types/cosmos.ts b/packages/react/src/types/cosmos.ts
@@ -0,0 +1,9 @@
+import { Coin } from '@routerprotocol/router-chain-sdk-ts';
+
+export type RouterLCDBalancesResponse = {
+  balances: Coin[];
+  pagination: {
+    next_string: string | null;
+    total: string;
+  };
+};