feat: Use rpc in chainsConfig to get balance

bnb-chain · Dec 17, 2024 · 0a61381 · 0a61381
1 parent 3f69a66
commit 0a61381
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 5 deletions.
diff --git a/.release/.changeset/gorgeous-lies-dance.md b/.release/.changeset/gorgeous-lies-dance.md
@@ -0,0 +1,5 @@
+---
+"@bnb-chain/canonical-bridge-widget": patch
+---
+
+Use rpc in chainsConfig to get balance
diff --git a/.release/.changeset/pre.json b/.release/.changeset/pre.json
@@ -7,6 +7,7 @@
   },
   "changesets": [
     "cold-baboons-serve",
+    "gorgeous-lies-dance",
     "happy-insects-give",
     "hip-news-reflect",
     "honest-adults-mate",

diff --git a/apps/canonical-bridge-ui/next-env.d.ts b/apps/canonical-bridge-ui/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
diff --git a/packages/canonical-bridge-widget/CHANGELOG.md b/packages/canonical-bridge-widget/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @bnb-chain/canonical-bridge-widget
 
+## 0.5.14-alpha.5
+
+### Patch Changes
+
+- Use rpc in chainsConfig to get balance
+
 ## 0.5.14-alpha.4
 
 ### Patch Changes

diff --git a/packages/canonical-bridge-widget/package.json b/packages/canonical-bridge-widget/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bnb-chain/canonical-bridge-widget",
-  "version": "0.5.14-alpha.4",
+  "version": "0.5.14-alpha.5",
   "description": "canonical bridge widget",
   "author": "bnb-chain",
   "private": false,

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/components/TokenBalancesProvider.tsx b/packages/canonical-bridge-widget/src/modules/aggregator/components/TokenBalancesProvider.tsx
@@ -11,8 +11,10 @@ import { setIsLoadingTokenBalances, setTokenBalances } from '@/modules/aggregato
 import { useTronWeb } from '@/core/hooks/useTronWeb';
 import { useSolanaAccount } from '@/modules/wallet/hooks/useSolanaAccount';
 import { useTronAccount } from '@/modules/wallet/hooks/useTronAccount';
+import { useAggregator } from '@/modules/aggregator/components/AggregatorProvider';
 
 export function TokenBalancesProvider() {
+  const { chainConfigs } = useAggregator();
   const { address } = useAccount();
   const { address: solanaAddress } = useSolanaAccount();
   const { address: tronAddress } = useTronAccount();
@@ -41,6 +43,7 @@ export function TokenBalancesProvider() {
         evmParams: {
           account: address,
           chain: chains?.find((item) => item.id === fromChain?.id),
+          chainConfig: chainConfigs?.find((item) => item.id === fromChain?.id),
         },
         solanaParams: {
           account: solanaAddress,

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts b/packages/canonical-bridge-widget/src/modules/aggregator/hooks/useSelection.ts
@@ -216,7 +216,7 @@ export function useSelection() {
 }
 
 function useSortedTokens() {
-  const { transferConfig } = useAggregator();
+  const { transferConfig, chainConfigs } = useAggregator();
   const { getTokenPrice } = useTokenPrice();
 
   const { address } = useAccount();
@@ -243,6 +243,7 @@ function useSortedTokens() {
         evmParams: {
           account: address,
           chain: chains?.find((item) => item.id === fromChainId),
+          chainConfig: chainConfigs?.find((item) => item.id === fromChainId),
         },
         solanaParams: {
           account: solanaAddress,

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/shared/getTokenBalances.ts b/packages/canonical-bridge-widget/src/modules/aggregator/shared/getTokenBalances.ts
@@ -5,7 +5,7 @@ import { Connection, LAMPORTS_PER_SOL, PublicKey } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import axios from 'axios';
 
-import { ChainType, IBridgeToken } from '@/modules/aggregator/types';
+import { ChainType, IBridgeToken, IChainConfig } from '@/modules/aggregator/types';
 import { ERC20_TOKEN } from '@/core/contract/abi';
 import { isChainOrTokenCompatible } from '@/modules/aggregator/shared/isChainOrTokenCompatible';
 import { isSameAddress } from '@/core/utils/address';
@@ -23,6 +23,7 @@ export async function getTokenBalances({
   evmParams: {
     account?: string;
     chain?: Chain;
+    chainConfig?: IChainConfig;
   };
   solanaParams: {
     account?: string;
@@ -54,26 +55,30 @@ export async function getTokenBalances({
     account: evmParams.account,
     chain: evmParams.chain,
     tokens: compatibleTokens,
+    chainConfig: evmParams.chainConfig,
   });
 }
 
 async function getEvmTokenBalances({
   account,
   chain,
   tokens,
+  chainConfig,
 }: {
   account?: string;
   chain?: Chain;
   tokens?: IBridgeToken[];
+  chainConfig?: IChainConfig;
 }) {
   try {
     if (!chain || !account || !tokens?.length) {
       return {};
     }
 
+    const rpcUrl = chainConfig?.rpcUrl;
     const client = createPublicClient({
       chain,
-      transport: http(),
+      transport: http(rpcUrl),
     });
 
     const contracts = tokens.map((item) => ({