Skip to content

fix(solana): unknown tokens show in assets list in dashboard #5662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UncleBill merged 1 commit into from
Feb 17, 2022
Merged

fix(solana): unknown tokens show in assets list in dashboard #5662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/mask/src/components/shared/ApplicationBoard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp
new URL('./assets/savings.png', import.meta.url).toString(),
onSavingsDialogOpen,
undefined,
false,
isNotEvm,
),
createEntry(
'Swap',
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/Solana/src/UI/components/ProviderIconClickBait.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function ProviderIconClickBait({
onClick?.(network, provider)
const rsp = await bridgedSolanaProvider.connect()
if (rsp?.publicKey) {
const base58Key = hexToBase58(rsp.publicKey._bn)
const base58Key = typeof rsp.publicKey === 'string' ? rsp.publicKey : hexToBase58(rsp.publicKey._bn)
const storage = getStorage()
await storage.publicKey.setValue(base58Key)
await storage.network.setValue(network.chainId)
Expand Down
31 changes: 17 additions & 14 deletions packages/plugins/Solana/src/apis/getFungibleAssets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Pagination, Web3Plugin, CurrencyType } from '@masknet/plugin-infra'
import { ChainId, getTokenConstants } from '@masknet/web3-shared-solana'
import { CoinGecko } from '@masknet/web3-providers'
import { createFungibleAsset, createFungibleToken } from '../helpers'
import { TokenListProvider, TokenInfo } from '@solana/spl-token-registry'
import { TokenListProvider } from '@solana/spl-token-registry'
import { GetAccountInfoResponse, GetProgramAccountsResponse, requestRPC, SPL_TOKEN_PROGRAM_ID } from './shared'

async function getSolanaBalance(chainId: ChainId, account: string) {
Expand Down Expand Up @@ -45,19 +45,22 @@ async function getSplTokenList(chainId: ChainId, account: string) {
const tokenListProvider = new TokenListProvider()
const provider = await tokenListProvider.resolve()
const tokenList = provider.filterByChainId(chainId).getList()
return data.result
.filter((x) => x.account.data.parsed.info.tokenAmount.decimals !== 0) // Filter out non fun.
.map((x) => {
const info = x.account.data.parsed.info
const token = tokenList.find((y) => y.address === info.mint) ?? ({} as TokenInfo)
const name = token.name || 'Unknown Token'
const symbol = token.symbol || 'Unknown Token'
return createFungibleAsset(
createFungibleToken(chainId, info.mint, name, symbol, info.tokenAmount.decimals),
info.tokenAmount.amount,
token.logoURI,
)
})
const splTokens: Web3Plugin.Asset[] = []
data.result.forEach((x) => {
const info = x.account.data.parsed.info
const token = tokenList.find((y) => y.address === info.mint)

@guanbinrui guanbinrui Feb 15, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it need a Solana flavored isSameAddress?

@UncleBill UncleBill Feb 15, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.
After doing little research, come out with: address in Solana, or public key, is usually encoded in base64base58, that means it's case-sensitive.

const isSafe = info.tokenAmount.decimals !== 0 && token !== undefined
if (!isSafe) return
const name = token.name || 'Unknown Token'
const symbol = token.symbol || 'Unknown Token'
const splToken = createFungibleAsset(
createFungibleToken(chainId, info.mint, name, symbol, info.tokenAmount.decimals),
info.tokenAmount.amount,
token.logoURI,
)
splTokens.push(splToken)
})
return splTokens
}

export async function getFungibleAssets(
Expand Down