Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions packages/adapters/tron/src/adapter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import type { Adapter } from '@tronweb3/tronwallet-abstract-adapter'
import UniversalProvider from '@walletconnect/universal-provider'

import { type ChainNamespace, ConstantsUtil, UserRejectedRequestError } from '@reown/appkit-common'
import {
type ChainNamespace,
ConstantsUtil,
NumberUtil,
UserRejectedRequestError
} from '@reown/appkit-common'
import {
AdapterBlueprint,
BlockchainApiController,
Expand Down Expand Up @@ -303,13 +308,22 @@ export class TronAdapter extends AdapterBlueprint<TronConnector> {
}

try {
const response = await BlockchainApiController.getBalance(address, caipNetworkId)
const trxBalance = response.balances.find(b => b.symbol === 'TRX')
const response = await BlockchainApiController.getAddressBalance<{
data: { balance: number }[]
}>({
caipNetworkId,
address,
method: 'tron_getAddressBalance',
params: [{ address }]
})

return {
balance: trxBalance?.quantity.numeric ?? '0',
symbol: 'TRX'
}
const balanceInSun = response?.data?.[0]?.balance ?? 0

const formattedBalance = NumberUtil.bigNumber(balanceInSun)
.div(10 ** 6)
.toString()

return { balance: formattedBalance, symbol: 'TRX' }
} catch (error) {
// eslint-disable-next-line no-console
console.error('[TronAdapter] getBalance error:', error)
Expand Down
6 changes: 3 additions & 3 deletions packages/appkit-utils/src/PresetsUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ export const PresetsUtil = {
// TON Testnet
'-3': '20f673c0-095e-49b2-07cf-eb5049dcf600',
// TRON
'0x2b6653dc': 'dd9de794-d4ce-4c94-682f-a367f926d500',
'0x2b6653dc': '3502bb86-cc4e-420f-a387-59ea63a28b00',
// TRON Shasta Testnet
'0x94a9059e': 'dd9de794-d4ce-4c94-682f-a367f926d500',
'0x94a9059e': '3502bb86-cc4e-420f-a387-59ea63a28b00',
// TRON Nile Testnet
'0xcd8690dc': 'dd9de794-d4ce-4c94-682f-a367f926d500'
'0xcd8690dc': '3502bb86-cc4e-420f-a387-59ea63a28b00'
} as Record<string, string>,

ConnectorImageIds: {
Expand Down
13 changes: 9 additions & 4 deletions packages/controllers/src/controllers/BlockchainApiController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,15 +298,20 @@ export const BlockchainApiController = {
})
},

async getAddressBalance({ caipNetworkId, address }: BlockchainApiGetAddressBalanceRequest) {
async getAddressBalance<T = string>({
caipNetworkId,
address,
method = 'getAddressBalance',
params
}: BlockchainApiGetAddressBalanceRequest) {
return state.api
.post<BlockchainApiGetAddressBalanceResponse>({
.post<BlockchainApiGetAddressBalanceResponse<T>>({
path: `/v1?chainId=${caipNetworkId}&projectId=${OptionsController.state.projectId}`,
body: {
id: '1',
jsonrpc: '2.0',
method: 'getAddressBalance',
params: { address }
method,
params: params ?? { address }
}
})
.then(result => result.result)
Expand Down
6 changes: 4 additions & 2 deletions packages/controllers/src/utils/TypeUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,13 @@ export interface BlockchainApiSwapTokensRequest {
export interface BlockchainApiGetAddressBalanceRequest {
caipNetworkId: string
address: string
method?: string
params?: unknown
}

export interface BlockchainApiGetAddressBalanceResponse {
export interface BlockchainApiGetAddressBalanceResponse<T = string> {
ok: boolean
result: string
result: T
jsonrpc: string
id: string
}
Expand Down