Skip to content
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.

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

use token registry for non existing images #430

Merged
merged 1 commit into from
Aug 16, 2023
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"@shopify/restyle": "1.8.0",
"@solana/spl-account-compression": "0.1.4",
"@solana/spl-token": "0.3.6",
"@solana/spl-token-registry": "^0.2.4574",
"@solana/wallet-adapter-react": "^0.15.33",
"@solana/wallet-standard-features": "1.0.0",
"@solana/web3.js": "1.64.0",
Expand Down
15 changes: 9 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { AccountContext } from '@helium/account-fetch-cache-hooks'
import { DarkTheme, NavigationContainer } from '@react-navigation/native'
import MapboxGL from '@rnmapbox/maps'
import { ThemeProvider } from '@shopify/restyle'
import { TokenListProvider } from '@storage/TokenListProvider'
import TokensProvider from '@storage/TokensProvider'
import globalStyles from '@theme/globalStyles'
import { darkThemeColors, lightThemeColors, theme } from '@theme/theme'
Expand Down Expand Up @@ -125,12 +126,14 @@ const App = () => {
ref={navigationRef}
>
<BalanceProvider>
<TokensProvider>
<WalletSignProvider>
<NetworkAwareStatusBar />
<RootNavigator />
</WalletSignProvider>
</TokensProvider>
<TokenListProvider>
<TokensProvider>
<WalletSignProvider>
<NetworkAwareStatusBar />
<RootNavigator />
</WalletSignProvider>
</TokensProvider>
</TokenListProvider>
</BalanceProvider>
</NavigationContainer>
<SecurityScreen
Expand Down
36 changes: 33 additions & 3 deletions src/hooks/useMetaplexMetadata.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { TypedAccountParser } from '@helium/account-fetch-cache'
import { useAccount } from '@helium/account-fetch-cache-hooks'
import {
JsonMetadata,
Metadata,
parseMetadataAccount,
sol,
Expand All @@ -11,6 +12,8 @@ import { AccountInfo, PublicKey } from '@solana/web3.js'
import axios from 'axios'
import { useMemo } from 'react'
import { useAsync } from 'react-async-hook'
import { TokenInfo } from '@solana/spl-token-registry'
import { useTokenList } from './useTokenList'

const MPL_PID = new PublicKey('metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s')

Expand Down Expand Up @@ -52,6 +55,22 @@ export function getMetadataId(mint: PublicKey): PublicKey {
)[0]
}

export const tokenInfoToMetadata = (
tokenInfo: TokenInfo | null | undefined,
): JsonMetadata | undefined => {
if (!tokenInfo) return undefined

return {
json: {
name: tokenInfo.name,
symbol: tokenInfo.symbol,
image: tokenInfo.logoURI,
},
symbol: tokenInfo.symbol,
name: tokenInfo.name,
}
}

export function useMetaplexMetadata(mint: PublicKey | undefined): {
loading: boolean
metadata: Metadata | undefined
Expand All @@ -60,6 +79,14 @@ export function useMetaplexMetadata(mint: PublicKey | undefined): {
symbol: string | undefined
name: string | undefined
} {
const tokenList = useTokenList()
const tokenListToken = useMemo(() => {
if (mint) {
return tokenList?.get(mint.toBase58())
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [tokenList, mint?.toBase58()])

const metadataAddr = useMemo(() => {
if (mint) {
return getMetadataId(mint)
Expand All @@ -72,6 +99,7 @@ export function useMetaplexMetadata(mint: PublicKey | undefined): {
METADATA_PARSER,
true,
)

const { result: json, loading: jsonLoading } = useAsync(getMetadata, [
metadataAcc?.uri,
])
Expand All @@ -93,9 +121,11 @@ export function useMetaplexMetadata(mint: PublicKey | undefined): {

return {
loading: jsonLoading || loading,
json: json?.data,
json: tokenListToken
? tokenInfoToMetadata(tokenListToken)?.json
: json?.data,
metadata: metadataAcc,
symbol: json?.data.symbol || metadataAcc?.symbol,
name: json?.data.name || metadataAcc?.name,
symbol: tokenListToken?.symbol || json?.data.symbol || metadataAcc?.symbol,
name: tokenListToken?.name || json?.data.name || metadataAcc?.name,
}
}
6 changes: 6 additions & 0 deletions src/hooks/useTokenList.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { useContext } from 'react'
import { TokenListContext } from '../storage/TokenListProvider'

export const useTokenList = () => {
return useContext(TokenListContext)
}
33 changes: 33 additions & 0 deletions src/storage/TokenListProvider.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import {
TokenListProvider as Provider,
TokenInfo,
ENV,
} from '@solana/spl-token-registry'
import React, { ReactNode, useEffect, useState } from 'react'

export const TokenListContext = React.createContext<
Map<string, TokenInfo> | undefined
>(undefined)

export const TokenListProvider = ({ children }: { children: ReactNode }) => {
const [tokenMap, setTokenMap] = useState<Map<string, TokenInfo>>(new Map())

useEffect(() => {
new Provider().resolve().then((tokens) => {
const tokenList = tokens.filterByChainId(ENV.MainnetBeta).getList()

setTokenMap(
tokenList.reduce((map, item) => {
map.set(item.address, item)
return map
}, new Map()),
)
})
}, [setTokenMap])

return (
<TokenListContext.Provider value={tokenMap}>
{children}
</TokenListContext.Provider>
)
}
19 changes: 19 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3813,6 +3813,13 @@
js-sha3 "^0.8.0"
typescript-collections "^1.3.3"

"@solana/spl-token-registry@^0.2.4574":
version "0.2.4574"
resolved "https://registry.yarnpkg.com/@solana/spl-token-registry/-/spl-token-registry-0.2.4574.tgz#13f4636b7bec90d2bb43bbbb83512cd90d2ce257"
integrity sha512-JzlfZmke8Rxug20VT/VpI2XsXlsqMlcORIUivF+Yucj7tFi7A0dXG7h+2UnD0WaZJw8BrUz2ABNkUnv89vbv1A==
dependencies:
cross-fetch "3.0.6"

"@solana/[email protected]":
version "0.3.6"
resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.3.6.tgz#35473ad2ed71fe91e5754a2ac72901e1b8b26a42"
Expand Down Expand Up @@ -7029,6 +7036,13 @@ create-require@^1.1.0:
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==

[email protected]:
version "3.0.6"
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c"
integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==
dependencies:
node-fetch "2.6.1"

cross-fetch@^3.1.5:
version "3.1.5"
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
Expand Down Expand Up @@ -12021,6 +12035,11 @@ node-fetch@2, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetc
dependencies:
whatwg-url "^5.0.0"

[email protected]:
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==

[email protected]:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
Expand Down
Loading