[Release] Hotfix 2.20.1 => 2.20.2 (patch) (#9630)

guanbinrui · UncleBill · zhouhanseng · web-flow · commit f8c268c8ca19 · 2023-05-20T00:57:05.000+08:00
* chore: bump version to 2.20.2 * fix: mf-4191 mf-4192 update firefly(MaskX) sources allowed list (#9631) mf-4191 mf-4192 * fix(trending): price change default 24h (#9636) * fix: avatar realm render conflict (#9637) * fix: avatar realm render conflict * fix: avatar realm render conflict * fix: mf-4197 verify twiter handle by address (#9633) * fix: mf-4185 add more icons for address (#9638) --------- Co-authored-by: UncleBill <billbill290@gmail.com> Co-authored-by: Hancheng Zhou <z308114274@gmail.com>
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.20.1",
+  "version": "2.20.2",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
diff --git a/packages/mask/src/components/shared/AvatarBadge/AvatarBadge.tsx b/packages/mask/src/components/shared/AvatarBadge/AvatarBadge.tsx
@@ -1,25 +1,37 @@
 import type { FC } from 'react'
-import type { IconButtonProps } from '@mui/material'
-import type { SocialIdentity } from '@masknet/shared-base'
+import { type IconButtonProps, Box } from '@mui/material'
+import { NetworkPluginID, type SocialAccount, type SocialIdentity } from '@masknet/shared-base'
 import { useCollectionByTwitterHandler } from '../../../plugins/Trader/trending/useTrending.js'
 import { CollectionProjectAvatarBadge } from './CollectionProjectAvatarBadge.js'
 import { ProfileAvatarBadge } from './ProfileAvatarBadge.js'
+import type { Web3Helper } from '@masknet/web3-helpers'
 
 interface Props extends IconButtonProps {
     userId: string
     identity?: SocialIdentity
+    socialAccounts?: Array<SocialAccount<Web3Helper.ChainIdAll>>
 }
-export const AvatarBadge: FC<Props> = ({ userId, identity }) => {
+export const AvatarBadge: FC<Props> = ({ userId, identity, socialAccounts }) => {
     const { value: collectionList } = useCollectionByTwitterHandler(userId)
     if (collectionList?.[0]) {
         return (
-            <CollectionProjectAvatarBadge
-                userId={userId}
-                address={collectionList?.[0].address ?? ''}
-                identity={identity}
-            />
+            <Box display="flex" alignItems="top" justifyContent="center">
+                <div style={{ display: 'flex', alignItems: 'top', justifyContent: 'center' }}>
+                    <CollectionProjectAvatarBadge
+                        userId={userId}
+                        address={collectionList?.[0].address ?? ''}
+                        identity={identity}
+                    />
+                </div>
+            </Box>
         )
     }
 
-    return <ProfileAvatarBadge userId={userId} />
+    return socialAccounts?.filter((x) => x.pluginID === NetworkPluginID.PLUGIN_EVM).length ? (
+        <Box display="flex" alignItems="top" justifyContent="center">
+            <div style={{ display: 'flex', alignItems: 'top', justifyContent: 'center' }}>
+                <ProfileAvatarBadge userId={userId} />
+            </div>
+        </Box>
+    ) : null
 }
diff --git a/packages/mask/src/manifest.json b/packages/mask/src/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "Mask Network",
-    "version": "2.20.1",
+    "version": "2.20.2",
     "manifest_version": 2,
     "permissions": ["storage", "downloads", "webNavigation", "activeTab"],
     "optional_permissions": ["<all_urls>", "notifications", "clipboardRead"],
diff --git a/packages/mask/src/plugins/ProfileCard/SNSAdaptor/index.tsx b/packages/mask/src/plugins/ProfileCard/SNSAdaptor/index.tsx
@@ -1,8 +1,7 @@
 import { Trans } from 'react-i18next'
 import { Icons } from '@masknet/icons'
 import type { Plugin } from '@masknet/plugin-infra'
-import { type EnhanceableSite, NetworkPluginID } from '@masknet/shared-base'
-import { Box } from '@mui/material'
+import { type EnhanceableSite } from '@masknet/shared-base'
 import { base } from '../base.js'
 import { PLUGIN_ID, SNS_RSS3_FIELD_KEY_MAP } from '../constants.js'
 import { setupContext } from '../context.js'
@@ -41,23 +40,22 @@ const sns: Plugin.SNSAdaptor.Definition = {
         label: 'Web3 Profile Card',
         priority: 99999,
         UI: {
-            Decorator({ identity }) {
+            Decorator: function ProfileAvatarRealmDecorator({ identity, socialAccounts }) {
                 if (!identity?.identifier?.userId) return null
                 const rss3Key = SNS_RSS3_FIELD_KEY_MAP[identity.identifier.network as EnhanceableSite]
                 if (!rss3Key) return null
                 return (
-                    <Box display="flex" alignItems="top" justifyContent="center">
-                        <div style={{ display: 'flex', alignItems: 'top', justifyContent: 'center' }}>
-                            <AvatarBadge userId={identity.identifier.userId} identity={identity} />
-                        </div>
-                    </Box>
+                    <AvatarBadge
+                        userId={identity.identifier.userId}
+                        identity={identity}
+                        socialAccounts={socialAccounts}
+                    />
                 )
             },
         },
         Utils: {
-            shouldDisplay(_, socialAccounts) {
-                if (!socialAccounts?.length) return false
-                return !!socialAccounts.filter((x) => x.pluginID === NetworkPluginID.PLUGIN_EVM).length
+            shouldDisplay() {
+                return true
             },
         },
     },
diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/index.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/index.tsx
@@ -1,6 +1,4 @@
 import { Trans } from 'react-i18next'
-import { Box } from '@mui/material'
-import { useIsMinimalMode } from '@masknet/plugin-infra/content-script'
 import type { Plugin } from '@masknet/plugin-infra'
 import { base } from '../base.js'
 import { TrendingView } from './trending/TrendingView.js'
@@ -15,8 +13,6 @@ import { CrossIsolationMessages, NetworkPluginID, PluginID } from '@masknet/shar
 import type { ChainId } from '@masknet/web3-shared-evm'
 import { SearchResultType } from '@masknet/web3-shared-base'
 import type { Web3Helper } from '@masknet/web3-helpers'
-import { CollectionProjectAvatarBadge } from '../../../components/shared/AvatarBadge/CollectionProjectAvatarBadge.js'
-import { useCollectionByTwitterHandler } from '../../../plugins/Trader/trending/useTrending.js'
 
 function openDialog() {
     return CrossIsolationMessages.events.swapDialogEvent.sendToLocal({
@@ -116,33 +112,6 @@ const sns: Plugin.SNSAdaptor.Definition<ChainId> = {
         backgroundGradient:
             'linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.8) 100%), linear-gradient(90deg, rgba(28, 104, 243, 0.2) 0%, rgba(254, 156, 0, 0.2) 100%), #FFFFFF;',
     },
-    AvatarRealm: {
-        ID: `${base.ID}_nft_project_card`,
-        label: 'Web3 Profile Card',
-        priority: 99999,
-        UI: {
-            Decorator({ userId, identity }) {
-                const { value: collectionList } = useCollectionByTwitterHandler(userId)
-                const isMinimalMode = useIsMinimalMode(PluginID.Web3ProfileCard)
-                if (!userId || !collectionList?.[0] || isMinimalMode) return null
-
-                return (
-                    <Box display="flex" alignItems="top" justifyContent="center">
-                        <CollectionProjectAvatarBadge
-                            userId={userId}
-                            address={collectionList?.[0].address ?? ''}
-                            identity={identity}
-                        />
-                    </Box>
-                )
-            },
-        },
-        Utils: {
-            shouldDisplay(_, socialAccounts) {
-                return !socialAccounts?.length
-            },
-        },
-    },
 }
 
 export default sns
diff --git a/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx b/packages/mask/src/plugins/Trader/SNSAdaptor/trending/TrendingViewDeck.tsx
@@ -358,7 +358,7 @@ export function TrendingViewDeck(props: TrendingViewDeckProps) {
                                     {isNFT ? null : (
                                         <PriceChanged
                                             amount={
-                                                market?.price_change_percentage_1h_in_currency ??
+                                                market?.price_change_percentage_24h_in_currency ??
                                                 market?.price_change_24h ??
                                                 0
                                             }
diff --git a/packages/plugins/EVM/src/state/IdentityService.ts b/packages/plugins/EVM/src/state/IdentityService.ts
@@ -12,7 +12,17 @@ import {
     type SocialAddress,
     type SocialIdentity,
 } from '@masknet/shared-base'
-import { ENS, Lens, MaskX, NextIDProof, NextIDStorageProvider, RSS3, SpaceID, Twitter } from '@masknet/web3-providers'
+import {
+    ENS,
+    Firefly,
+    Lens,
+    MaskX,
+    NextIDProof,
+    NextIDStorageProvider,
+    RSS3,
+    SpaceID,
+    Twitter,
+} from '@masknet/web3-providers'
 import { captureAsyncTransaction } from '@masknet/web3-providers/helpers'
 import { MaskX_BaseAPI } from '@masknet/web3-providers/types'
 import { ChainId, isValidAddress, isZeroAddress } from '@masknet/web3-shared-evm'
@@ -82,10 +92,13 @@ const resolveMaskXAddressType = createLookupTableResolver<MaskX_BaseAPI.SourceTy
     {
         [MaskX_BaseAPI.SourceType.CyberConnect]: SocialAddressType.CyberConnect,
         [MaskX_BaseAPI.SourceType.Firefly]: SocialAddressType.Firefly,
+        [MaskX_BaseAPI.SourceType.HandWriting]: SocialAddressType.Firefly,
         [MaskX_BaseAPI.SourceType.Leaderboard]: SocialAddressType.Leaderboard,
         [MaskX_BaseAPI.SourceType.OpenSea]: SocialAddressType.OpenSea,
         [MaskX_BaseAPI.SourceType.Sybil]: SocialAddressType.Sybil,
+        [MaskX_BaseAPI.SourceType.Uniswap]: SocialAddressType.Sybil,
         [MaskX_BaseAPI.SourceType.RSS3]: SocialAddressType.RSS3,
+        [MaskX_BaseAPI.SourceType.TwitterHexagon]: SocialAddressType.TwitterBlue,
     },
     (x) => {
         throw new Error(`Unknown source type: ${x}`)
@@ -242,16 +255,8 @@ export class IdentityService extends IdentityServiceState<ChainId> {
         if (!userId) return
 
         const response = await MaskX.getIdentitiesExact(userId, MaskX_BaseAPI.PlatformType.Twitter)
-        const sourceTypes = [
-            MaskX_BaseAPI.SourceType.CyberConnect,
-            MaskX_BaseAPI.SourceType.Firefly,
-            MaskX_BaseAPI.SourceType.Leaderboard,
-            MaskX_BaseAPI.SourceType.OpenSea,
-            MaskX_BaseAPI.SourceType.Sybil,
-            MaskX_BaseAPI.SourceType.RSS3,
-        ]
         const results = response.records.filter((x) => {
-            if (!isValidAddress(x.web3_addr) || !sourceTypes.includes(x.source)) return false
+            if (!isValidAddress(x.web3_addr) || !x.is_verified) return false
 
             try {
                 // detect if a valid data source
@@ -267,13 +272,9 @@ export class IdentityService extends IdentityServiceState<ChainId> {
                 try {
                     const name = await ENS.reverse(y.web3_addr)
 
-                    return this.createSocialAddress(
-                        resolveMaskXAddressType(y.source),
-                        y.web3_addr,
-                        name ?? y.sns_handle,
-                    )
+                    return this.createSocialAddress(resolveMaskXAddressType(y.source), y.web3_addr, name)
                 } catch {
-                    return this.createSocialAddress(resolveMaskXAddressType(y.source), y.web3_addr, y.sns_handle)
+                    return this.createSocialAddress(resolveMaskXAddressType(y.source), y.web3_addr)
                 }
             }),
         )
@@ -282,6 +283,7 @@ export class IdentityService extends IdentityServiceState<ChainId> {
 
     override async getFromRemote(identity: SocialIdentity, includes?: SocialAddressType[]) {
         const socialAddressFromMaskX = this.getSocialAddressesFromMaskX(identity)
+        const socialAddressFromNextID = this.getSocialAddressesFromNextID(identity)
         const allSettled = await Promise.allSettled([
             captureAsyncTransaction('getSocialAddressFromBio', this.getSocialAddressFromBio(identity)),
             captureAsyncTransaction('getSocialAddressFromENS', this.getSocialAddressFromENS(identity)),
@@ -292,28 +294,25 @@ export class IdentityService extends IdentityServiceState<ChainId> {
             ),
             captureAsyncTransaction('getSocialAddressFromCrossbell', this.getSocialAddressFromCrossbell(identity)),
             captureAsyncTransaction('getSocialAddressFromTwitterBlue', this.getSocialAddressFromTwitterBlue(identity)),
-            captureAsyncTransaction('getSocialAddressesFromNextID', this.getSocialAddressesFromNextID(identity)),
+            captureAsyncTransaction('getSocialAddressesFromNextID', socialAddressFromNextID),
             captureAsyncTransaction('getSocialAddressesFromMaskX', socialAddressFromMaskX),
             captureAsyncTransaction('getSocialAddressFromLens', this.getSocialAddressFromLens(identity)),
         ])
         const identities_ = compact(allSettled.flatMap((x) => (x.status === 'fulfilled' ? x.value : [])))
 
         const identities = uniqBy(identities_, (x) => [x.type, x.label, x.address.toLowerCase()].join('_'))
-        const [identitiesFromNextID, trustedAccounts] = await Promise.all([
-            this.getSocialAddressesFromNextID(identity),
-            socialAddressFromMaskX,
-        ])
-        const trustedAddresses = trustedAccounts?.map((x) => x.address.toLowerCase()) ?? []
-        const identitiesAddressesFromNextID = identitiesFromNextID.map((y) => y.address.toLowerCase())
-
-        return uniqBy(
-            identities
-                .filter((x) => {
-                    const address = x.address.toLowerCase()
-                    return !identitiesAddressesFromNextID.includes(address) && trustedAddresses.includes(address)
-                })
-                .concat(identitiesFromNextID),
-            (x) => x.address.toLowerCase(),
+        const identitiesFromNextID = await socialAddressFromNextID
+
+        const handle = identity.identifier?.userId
+        const verifiedResult = await Promise.allSettled(
+            uniqBy(identities, (x) => x.address.toLowerCase()).map(async (x) => {
+                const address = x.address.toLowerCase()
+                const isReliable = await Firefly.verifyTwitterHandlerByAddress(address, handle)
+                return isReliable ? address : null
+            }),
         )
+        const trustedAddresses = compact(verifiedResult.map((x) => (x.status === 'fulfilled' ? x.value : null)))
+
+        return identities.filter((x) => trustedAddresses.includes(x.address.toLowerCase())).concat(identitiesFromNextID)
     }
 }
diff --git a/packages/shared/src/UI/components/AccountIcon/index.tsx b/packages/shared/src/UI/components/AccountIcon/index.tsx
@@ -85,15 +85,9 @@ export function AccountIcon({ socialAccount, classes: externalClasses }: Account
               }
             : undefined
 
-    const fromTwitter = [
-        SocialAddressType.Address,
-        SocialAddressType.ENS,
-        SocialAddressType.SPACE_ID,
-        SocialAddressType.RSS3,
-        SocialAddressType.SOL,
-        SocialAddressType.TwitterBlue,
-        SocialAddressType.Lens,
-    ].find((x) => supportedAddressTypes.includes(x))
+    const fromTwitter = [SocialAddressType.Address, SocialAddressType.ENS, SocialAddressType.TwitterBlue].find((x) =>
+        supportedAddressTypes.includes(x),
+    )
 
     return (
         <>
@@ -200,6 +194,26 @@ export function AccountIcon({ socialAccount, classes: externalClasses }: Account
                     />
                 </AccountTooltips>
             ) : null}
+
+            {supportedAddressTypes.includes(SocialAddressType.SPACE_ID) ? (
+                <AccountTooltips type={SocialAddressType.SPACE_ID}>
+                    <Icons.SpaceId
+                        className={cx(classes.actionIcon, classes.icon, classes.roundedIcon)}
+                        size={18}
+                        style={iconStyle}
+                    />
+                </AccountTooltips>
+            ) : null}
+
+            {supportedAddressTypes.includes(SocialAddressType.Lens) ? (
+                <AccountTooltips type={SocialAddressType.Lens}>
+                    <Icons.Lens
+                        className={cx(classes.actionIcon, classes.icon, classes.roundedIcon)}
+                        size={18}
+                        style={iconStyle}
+                    />
+                </AccountTooltips>
+            ) : null}
         </>
     )
 }
diff --git a/packages/web3-providers/src/Firefly/constants.ts b/packages/web3-providers/src/Firefly/constants.ts
@@ -1 +1,2 @@
 export const BASE_URL = 'https://mask-network.firefly.land/v1'
+export const TWITTER_HANDLER_VERIFY_URL = 'https://twitter-handler-proxy.r2d2.to'
diff --git a/packages/web3-providers/src/Firefly/index.ts b/packages/web3-providers/src/Firefly/index.ts
@@ -1,5 +1,5 @@
 import urlcat from 'urlcat'
-import { BASE_URL } from './constants.js'
+import { BASE_URL, TWITTER_HANDLER_VERIFY_URL } from './constants.js'
 import { fetchJSON } from '../entry-helpers.js'
 import type { FireflyBaseAPI } from '../entry-types.js'
 
@@ -14,4 +14,17 @@ export class FireflyAPI implements FireflyBaseAPI.Provider {
         if (result.code !== 200) return []
         return result.data
     }
+    async verifyTwitterHandlerByAddress(address: string, handler?: string): Promise<boolean> {
+        if (!handler || !address) return false
+        const response = await fetchJSON<FireflyBaseAPI.VerifyTwitterResult>(
+            urlcat(TWITTER_HANDLER_VERIFY_URL, '/v1/relation/handles', {
+                wallet: address.toLowerCase(),
+                isVerified: true,
+            }),
+        )
+
+        if ('error' in response) return false
+
+        return response.data.includes(handler) || response.data.filter(Boolean).length === 0
+    }
 }
diff --git a/packages/web3-providers/src/NextID/constants.ts b/packages/web3-providers/src/NextID/constants.ts
@@ -4,4 +4,3 @@ export const KV_BASE_URL_PROD = 'https://kv-service.next.id'
 export const PROOF_BASE_URL_DEV = 'https://proof-service.nextnext.id/'
 export const PROOF_BASE_URL_PROD = 'https://proof-service.next.id/'
 export const RELATION_SERVICE_URL = 'https://relation-service.next.id/'
-export const TWITTER_HANDLER_VERIFY_URL = 'https://twitter-handler-proxy.r2d2.to'
diff --git a/packages/web3-providers/src/NextID/proof.ts b/packages/web3-providers/src/NextID/proof.ts
@@ -14,12 +14,7 @@ import {
     type NextIDEnsRecord,
     createBindingProofFromProfileQuery,
 } from '@masknet/shared-base'
-import {
-    PROOF_BASE_URL_DEV,
-    PROOF_BASE_URL_PROD,
-    RELATION_SERVICE_URL,
-    TWITTER_HANDLER_VERIFY_URL,
-} from './constants.js'
+import { PROOF_BASE_URL_DEV, PROOF_BASE_URL_PROD, RELATION_SERVICE_URL } from './constants.js'
 import { staleNextIDCached } from './helpers.js'
 import PRESET_LENS from './preset-lens.json'
 import { fetchJSON } from '../entry-helpers.js'
@@ -424,23 +419,6 @@ export class NextIDProofAPI implements NextIDBaseAPI.Proof {
               }
             : null
     }
-
-    async verifyTwitterHandlerByAddress(address: string, handler: string): Promise<boolean> {
-        const response = await fetchJSON<{
-            statusCode: number
-            data?: string[]
-            error?: string
-        }>(
-            urlcat(TWITTER_HANDLER_VERIFY_URL, '/v1/relation/handles', {
-                wallet: address.toLowerCase(),
-                isVerified: true,
-            }),
-        )
-
-        if (response.error || !handler || !address) return false
-
-        return response.data?.includes(handler) || response.data?.filter((x) => x).length === 0
-    }
 }
 
 // Group all ens
diff --git a/packages/web3-providers/src/types/Firefly.ts b/packages/web3-providers/src/types/Firefly.ts
diff --git a/packages/web3-providers/src/types/MaskX.ts b/packages/web3-providers/src/types/MaskX.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Mask Network",`
`3`		`- "version": "2.20.1",`
	`3`	`+ "version": "2.20.2",`
`4`	`4`	`"manifest_version": 2,`
`5`	`5`	`"permissions": ["storage", "downloads", "webNavigation", "activeTab"],`
`6`	`6`	`"optional_permissions": ["<all_urls>", "notifications", "clipboardRead"],`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ export function TrendingViewDeck(props: TrendingViewDeckProps) {`
`358`	`358`	`{isNFT ? null : (`
`359`	`359`	`<PriceChanged`
`360`	`360`	`amount={`
`361`		`- market?.price_change_percentage_1h_in_currency ??`
	`361`	`+ market?.price_change_percentage_24h_in_currency ??`
`362`	`362`	`market?.price_change_24h ??`
`363`	`363`	`0`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`export const BASE_URL = 'https://mask-network.firefly.land/v1'`
	`2`	`+export const TWITTER_HANDLER_VERIFY_URL = 'https://twitter-handler-proxy.r2d2.to'`