fix(solana): add getNonFungibleToken for connection

cspell.json

@@ -13,6 +13,9 @@
         "pnpm-lock.yaml"
     ],
     "words": [
+        "raydium",
+        "blockhash",
+        "sysvar",
         "aave",
         "adai",
         "addrs",

packages/.eslintrc.json

@@ -61,7 +61,6 @@
         "unicorn/no-new-buffer": "error",
         "unicorn/no-thenable": "error",
         "unicorn/no-useless-promise-resolve-reject": "error",
-        "unicorn/no-array-reduce": ["error", { "allowSimpleOperations": false }],
         "unicorn/prefer-add-event-listener": "error",
         "unicorn/prefer-date-now": "error",
         "unicorn/prefer-dom-node-dataset": "error",

packages/mask/package.json

@@ -46,6 +46,8 @@
     "@masknet/web3-providers": "workspace:*",
     "@masknet/web3-shared-base": "workspace:*",
     "@masknet/web3-shared-evm": "workspace:*",
+    "@masknet/web3-shared-solana": "workspace:*",
+    "@masknet/web3-shared-flow": "workspace:*",
     "@metamask/eth-sig-util": "^4.0.0",
     "@msgpack/msgpack": "^2.7.2",
     "@servie/events": "^3.0.0",

packages/mask/src/components/shared/NetworkTab.tsx

@@ -1,7 +1,8 @@
+import { useWeb3State, Web3Helper } from '@masknet/plugin-infra/web3'
 import { makeStyles, MaskColorVar, useStylesExtends } from '@masknet/theme'
 import AbstractTab, { AbstractTabProps } from './AbstractTab'
-import { ChainId, chainResolver } from '@masknet/web3-shared-evm'
 import { isDashboardPage } from '@masknet/shared-base'
+import type { NetworkPluginID } from '@masknet/web3-shared-base'
 
 interface StyleProps {
     chainLength: number
@@ -43,23 +44,25 @@ const useStyles = makeStyles<StyleProps>()((theme, props) => ({
     },
 }))
 
-interface NetworkTabProps extends withClasses<'tab' | 'tabs' | 'tabPanel' | 'indicator' | 'focusTab' | 'tabPaper'> {
-    chains: ChainId[]
-    setChainId: (chainId: ChainId) => void
-    chainId: ChainId
+interface NetworkTabProps<T extends NetworkPluginID>
+    extends withClasses<'tab' | 'tabs' | 'tabPanel' | 'indicator' | 'focusTab' | 'tabPaper'> {
+    chains: Array<Web3Helper.Definition[T]['ChainId']>
+    setChainId: (chainId: Web3Helper.Definition[T]['ChainId']) => void
+    chainId: Web3Helper.Definition[T]['ChainId']
 }
-export function NetworkTab(props: NetworkTabProps) {
+export function NetworkTab<T extends NetworkPluginID = NetworkPluginID.PLUGIN_EVM>(props: NetworkTabProps<T>) {
+    const { Others } = useWeb3State<'all'>()
     const isDashboard = isDashboardPage()
     const classes = useStylesExtends(useStyles({ chainLength: props.chains.length, isDashboard }), props)
     const { chainId, setChainId, chains } = props
-    const createTabItem = (name: string, chainId: ChainId) => ({
+    const createTabItem = (name: string, chainId: Web3Helper.Definition[T]['ChainId']) => ({
         label: <span>{name}</span>,
         sx: { p: 0 },
         cb: () => setChainId(chainId),
     })
 
     const tabProps: AbstractTabProps = {
-        tabs: chains.map((chainId) => createTabItem(chainResolver.chainName(chainId) ?? 'Unknown', chainId)),
+        tabs: chains.map((chainId) => createTabItem(Others?.chainResolver.chainName(chainId) ?? 'Unknown', chainId)),
         index: chains.indexOf(chainId),
         classes,
         hasOnlyOneChild: true,

packages/mask/src/plugins/Tips/components/NFTSection/NFTList.tsx

@@ -1,8 +1,7 @@
-import { useChainId, useWeb3State } from '@masknet/plugin-infra/web3'
+import { useChainId, useCurrentWeb3NetworkPluginID, useWeb3State, Web3Helper } from '@masknet/plugin-infra/web3'
 import { NFTCardStyledAssetPlayer } from '@masknet/shared'
 import { makeStyles, ShadowRootTooltip } from '@masknet/theme'
 import { isSameAddress, NetworkPluginID, NonFungibleToken } from '@masknet/web3-shared-base'
-import type { ChainId, SchemaType } from '@masknet/web3-shared-evm'
 import { Checkbox, Link, List, ListItem, Radio } from '@mui/material'
 import classnames from 'classnames'
 import { noop } from 'lodash-unified'
@@ -11,8 +10,8 @@ import type { TipNFTKeyPair } from '../../types'
 
 interface Props {
     selectedPairs: TipNFTKeyPair[]
-    tokens: Array<NonFungibleToken<ChainId, SchemaType>>
-    onChange?: (id: string | null, contractAddress: string) => void
+    tokens: Array<Web3Helper.NonFungibleAssetScope<'all'>>
+    onChange?: (id: string | null, contractAddress?: string) => void
     limit?: number
     className: string
 }
@@ -86,12 +85,12 @@ const useStyles = makeStyles()((theme) => ({
 }))
 
 interface NFTItemProps {
-    token: NonFungibleToken<ChainId, SchemaType>
+    token: NonFungibleToken<Web3Helper.ChainIdAll, Web3Helper.SchemaTypeAll>
 }
 
 export const NFTItem: FC<NFTItemProps> = ({ token }) => {
     const { classes } = useStyles()
-    const chainId = useChainId(NetworkPluginID.PLUGIN_EVM)
+    const chainId = useChainId()
     return (
         <NFTCardStyledAssetPlayer
             chainId={chainId}
@@ -107,25 +106,30 @@ export const NFTItem: FC<NFTItemProps> = ({ token }) => {
     )
 }
 
-const includes = (pairs: TipNFTKeyPair[], pair: TipNFTKeyPair): boolean => {
-    return !!pairs.find(([address, tokenId]) => isSameAddress(address, pair[0]) && tokenId === pair[1])
-}
-
 export const NFTList: FC<Props> = ({ selectedPairs, tokens, onChange, limit = 1, className }) => {
     const { classes } = useStyles()
 
     const isRadio = limit === 1
     const reachedLimit = selectedPairs.length >= limit
 
     const toggleItem = useCallback(
-        (currentId: string | null, contractAddress: string) => {
+        (currentId: string | null, contractAddress?: string) => {
             onChange?.(currentId, contractAddress)
         },
         [onChange, isRadio, reachedLimit],
     )
+    const pluginId = useCurrentWeb3NetworkPluginID()
+    const includes =
+        pluginId === NetworkPluginID.PLUGIN_EVM
+            ? (pairs: TipNFTKeyPair[], pair: TipNFTKeyPair): boolean => {
+                  return !!pairs.find(([address, tokenId]) => isSameAddress(address, pair[0]) && tokenId === pair[1])
+              }
+            : (pairs: TipNFTKeyPair[], pair: TipNFTKeyPair): boolean => {
+                  return !!pairs.find(([, tokenId]) => tokenId === pair[1])
+              }
 
     const SelectComponent = isRadio ? Radio : Checkbox
-    const { Others } = useWeb3State(NetworkPluginID.PLUGIN_EVM)
+    const { Others } = useWeb3State()
 
     return (
         <List className={classnames(classes.list, className)}>
@@ -161,11 +165,11 @@ export const NFTList: FC<Props> = ({ selectedPairs, tokens, onChange, limit = 1,
                                 onChange={noop}
                                 disabled={disabled}
                                 onClick={() => {
-                                    if (disabled || !token.contract?.address) return
+                                    if (disabled) return
                                     if (selected) {
                                         toggleItem(null, '')
                                     } else {
-                                        toggleItem(token.tokenId, token.contract.address)
+                                        toggleItem(token.tokenId, token.contract?.address)
                                     }
                                 }}
                                 className={classes.checkbox}

packages/mask/src/plugins/Tips/components/NFTSection/index.tsx

@@ -7,7 +7,7 @@ import classnames from 'classnames'
 import { uniqWith } from 'lodash-unified'
 import { FC, HTMLProps, useEffect, useMemo, useState } from 'react'
 import { useTimeoutFn } from 'react-use'
-import { useTip } from '../../contexts'
+import { TargetRuntimeContext, useTip } from '../../contexts'
 import { useI18N } from '../../locales'
 import type { TipNFTKeyPair } from '../../types'
 import { NFTList } from './NFTList'
@@ -56,27 +56,38 @@ interface Props extends HTMLProps<HTMLDivElement> {
 }
 
 export const NFTSection: FC<Props> = ({ className, onAddToken, onEmpty, ...rest }) => {
-    const { erc721Address, erc721TokenId, setErc721TokenId, setErc721Address } = useTip()
+    const {
+        nonFungibleTokenAddress: tokenAddress,
+        nonFungibleTokenId: tokenId,
+        setNonFungibleTokenId,
+        setNonFungibleTokenAddress,
+    } = useTip()
     const { classes } = useStyles()
     const t = useI18N()
-    const selectedPairs: TipNFTKeyPair[] = useMemo(
-        () => (erc721Address && erc721TokenId ? [[erc721Address, erc721TokenId]] : []),
-        [erc721TokenId, erc721TokenId],
-    )
+    const selectedPairs: TipNFTKeyPair[] = useMemo(() => (tokenId ? [[tokenAddress, tokenId]] : []), [tokenId, tokenId])
     // Cannot get the loading status of fetching via websocket
     // loading status of `useAsyncRetry` is not the real status
     const [guessLoading, setGuessLoading] = useState(true)
     useTimeoutFn(() => {
         setGuessLoading(false)
     }, 10000)
 
-    const { value: fetchedTokens = EMPTY_LIST, loading } = useNonFungibleAssets(NetworkPluginID.PLUGIN_EVM)
+    const { targetChainId: chainId, pluginId } = TargetRuntimeContext.useContainer()
+    const { value: fetchedTokens = EMPTY_LIST, loading } = useNonFungibleAssets(pluginId, undefined, {
+        chainId,
+    })
 
+    const isEvm = pluginId === NetworkPluginID.PLUGIN_EVM
     const tokens = useMemo(() => {
-        return uniqWith(fetchedTokens, (v1, v2) => {
-            return isSameAddress(v1.contract?.address, v2.contract?.address) && v1.tokenId === v2.tokenId
-        })
-    }, [fetchedTokens])
+        return uniqWith(
+            fetchedTokens,
+            isEvm
+                ? (v1, v2) => {
+                      return isSameAddress(v1.contract?.address, v2.contract?.address) && v1.tokenId === v2.tokenId
+                  }
+                : (v1, v2) => v1.tokenId === v2.tokenId,
+        )
+    }, [fetchedTokens, isEvm])
 
     const showLoadingIndicator = tokens.length === 0 && !loading && !guessLoading
 
@@ -95,8 +106,8 @@ export const NFTSection: FC<Props> = ({ className, onAddToken, onEmpty, ...rest
                                 selectedPairs={selectedPairs}
                                 tokens={tokens}
                                 onChange={(id, address) => {
-                                    setErc721TokenId(id)
-                                    setErc721Address(address)
+                                    setNonFungibleTokenId(id)
+                                    setNonFungibleTokenAddress(address || '')
                                 }}
                             />
                         )
@@ -112,9 +123,11 @@ export const NFTSection: FC<Props> = ({ className, onAddToken, onEmpty, ...rest
                     return (
                         <div className={classes.statusBox}>
                             <Typography className={classes.loadingText}>{t.tip_empty_nft()}</Typography>
-                            <Button variant="text" onClick={onAddToken}>
-                                {t.tip_add_collectibles()}
-                            </Button>
+                            {isEvm ? (
+                                <Button variant="text" onClick={onAddToken}>
+                                    {t.tip_add_collectibles()}
+                                </Button>
+                            ) : null}
                         </div>
                     )
                 })()}

packages/mask/src/plugins/Tips/components/TipButton.tsx

@@ -1,14 +1,17 @@
 import { TipCoin } from '@masknet/icons'
 import { usePostInfoDetails } from '@masknet/plugin-infra/content-script'
+import { useCurrentWeb3NetworkPluginID, useSocialAddressListAll } from '@masknet/plugin-infra/web3'
 import { EMPTY_LIST, NextIDPlatform, ProfileIdentifier } from '@masknet/shared-base'
 import { makeStyles, ShadowRootTooltip } from '@masknet/theme'
 import { NextIDProof } from '@masknet/web3-providers'
+import { NetworkPluginID } from '@masknet/web3-shared-base'
 import type { TooltipProps } from '@mui/material'
 import classnames from 'classnames'
 import { uniq } from 'lodash-unified'
 import { FC, HTMLProps, MouseEventHandler, useCallback, useEffect, useMemo } from 'react'
 import { useAsyncRetry } from 'react-use'
 import { MaskMessages } from '../../../../shared'
+import { useCurrentVisitingIdentity } from '../../../components/DataSource/useActivatedUI'
 import Services from '../../../extension/service'
 import { activatedSocialNetworkUI } from '../../../social-network'
 import { usePublicWallets } from '../hooks/usePublicWallets'
@@ -73,14 +76,28 @@ export const TipButton: FC<Props> = ({
         return Services.Identity.queryPersonaByProfile(receiver)
     }, [receiver])
 
+    const pluginId = useCurrentWeb3NetworkPluginID()
     const {
         value: isAccountVerified,
         loading: loadingVerifyInfo,
         retry: retryLoadVerifyInfo,
     } = useAsyncRetry(() => {
+        if (pluginId !== NetworkPluginID.PLUGIN_EVM) return Promise.resolve(true)
         if (!receiverPersona?.identifier.publicKeyAsHex || !receiver?.userId) return Promise.resolve(false)
         return NextIDProof.queryIsBound(receiverPersona.identifier.publicKeyAsHex, platform, receiver.userId, true)
-    }, [receiverPersona?.identifier.publicKeyAsHex, platform, receiver?.userId])
+    }, [pluginId, receiverPersona?.identifier.publicKeyAsHex, platform, receiver?.userId])
+    const visitingIdentity = useCurrentVisitingIdentity()
+
+    const isVisitingUser = visitingIdentity.identifier?.userId === receiver?.userId
+    const isRuntimeAvailable = useMemo(() => {
+        switch (pluginId) {
+            case NetworkPluginID.PLUGIN_EVM:
+                return true
+            case NetworkPluginID.PLUGIN_SOLANA:
+                return isVisitingUser
+        }
+        return false
+    }, [pluginId, isVisitingUser])
 
     useEffect(() => {
         return MaskMessages.events.ownProofChanged.on(() => {
@@ -89,12 +106,21 @@ export const TipButton: FC<Props> = ({
     }, [])
 
     const publicWallets = usePublicWallets(receiver || undefined)
-    const allAddresses = useMemo(() => uniq([...publicWallets, ...addresses]), [publicWallets, addresses])
+    const { value: socialAddressList = EMPTY_LIST } = useSocialAddressListAll(visitingIdentity)
+    const allAddresses = useMemo(() => {
+        switch (pluginId) {
+            case NetworkPluginID.PLUGIN_EVM:
+                return uniq([...publicWallets, ...addresses])
+            case NetworkPluginID.PLUGIN_SOLANA:
+                return socialAddressList.filter((x) => x.networkSupporterPluginID === pluginId).map((x) => x.address)
+        }
+        return EMPTY_LIST
+    }, [pluginId, publicWallets, addresses, socialAddressList])
 
     const isChecking = loadingPersona || loadingVerifyInfo
-    const disabled = isChecking || !isAccountVerified || allAddresses.length === 0
+    const disabled = isChecking || !isAccountVerified || allAddresses.length === 0 || !isRuntimeAvailable
 
-    const sendTip: MouseEventHandler<HTMLDivElement> = useCallback(
+    const createTipTask: MouseEventHandler<HTMLDivElement> = useCallback(
         async (evt) => {
             evt.stopPropagation()
             evt.preventDefault()
@@ -107,12 +133,20 @@ export const TipButton: FC<Props> = ({
         },
         [disabled, allAddresses, receiver?.userId],
     )
+
+    useEffect(() => {
+        PluginNextIDMessages.tipTaskUpdate.sendToLocal({
+            recipientSnsId: receiver?.userId,
+            addresses: allAddresses,
+        })
+    }, [receiver?.userId, allAddresses])
+
     const dom = (
         <div
             className={classnames(className, classes.tipButton, disabled ? classes.disabled : null)}
             {...rest}
             role="button"
-            onClick={sendTip}>
+            onClick={createTipTask}>
             <TipCoin viewBox="0 0 24 24" />
             {children}
         </div>