[Release] Hotfix 2.33.1 => 2.33.2 (patch) (#12233)

* chore: bump version to 2.33.2

* fix: mf-6715 update firefly domain (#12227)

* fix(farcaster): mf-6717 use username for farcaster identity (#12232)

* fix(RSS3): mf-6716 remove rss3 profile fetching (#12234)

Remove RSS3.getProfiles API usage from avatar component and DSearch provider.

---------

Co-authored-by: Wukong Sun <[email protected]>

Author: guanbinrui

package.json

@@ -7,7 +7,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.33.0",
+  "version": "2.33.2",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {

packages/plugins/RSS3/src/SiteAdaptor/components/UserAvatar/index.tsx

@@ -1,23 +1,8 @@
-import { EthereumBlockie, Image } from '@masknet/shared'
+import { EthereumBlockie } from '@masknet/shared'
 import { makeStyles } from '@masknet/theme'
-import { RSS3 } from '@masknet/web3-providers'
-import { resolveIPFS_URL } from '@masknet/web3-shared-base'
-import { isValidAddress } from '@masknet/web3-shared-evm'
-import { useQuery } from '@tanstack/react-query'
 import { memo, type HTMLProps } from 'react'
 
 const useStyles = makeStyles<{ size: number }>()((theme, { size }) => ({
-    container: {
-        display: 'inline-block !important',
-        width: size,
-        height: size,
-        borderRadius: '50%',
-        overflow: 'hidden',
-    },
-    fallbackImage: {
-        width: size,
-        height: size,
-    },
     blockie: {
         width: size,
         height: size,
@@ -32,33 +17,5 @@ interface Props extends HTMLProps<HTMLImageElement> {
 }
 export const UserAvatar = memo(function UserAvatar({ identity, size = 20, ...rest }: Props) {
     const { classes } = useStyles({ size })
-    const { data: profile } = useQuery({
-        queryKey: ['rss3-profiles', identity],
-        queryFn: async () => {
-            if (!identity || isValidAddress(identity)) return null
-            const profiles = await RSS3.getProfiles(identity)
-            if (!profiles.length) return null
-            return profiles.find((x) => x.handle === identity) || null
-        },
-    })
-    const url = profile?.profile_uri?.[0]
-    if (!url) {
-        return (
-            <EthereumBlockie
-                address={identity || profile?.address || ''}
-                classes={{ icon: classes.blockie }}
-                style={rest.style}
-            />
-        )
-    }
-    return (
-        <Image
-            classes={{ container: classes.container, fallbackImage: classes.fallbackImage }}
-            src={resolveIPFS_URL(url)}
-            width={size}
-            height={size}
-            {...rest}
-            containerProps={{ style: rest.style }}
-        />
-    )
+    return <EthereumBlockie address={identity || ''} classes={{ icon: classes.blockie }} style={rest.style} />
 })

packages/vitest-setup/handlers/DSearch.ts

@@ -135,76 +135,4 @@ export const DSearchHandlers = [
             { status: 200 },
         )
     }),
-
-    http.get(`${rss3BaseURL}/datasets/domains/profiles`, () => {
-        return HttpResponse.json([
-            {
-                address: '0x934b510d4c9103e6a87aef13b816fb080286d649',
-                network: 'crossbell',
-                platform: 'Crossbell',
-                source: 'Crossbell',
-                name: 'Suji Yan',
-                handle: 'suji.csb',
-                bio: 'Founder Mask Network $Mask; maintain mstdn.jp mastodon.cloud ; Engineer; Journalist; 💪FOSS/Anti996; 中文/日本語 mask.io',
-                url: 'https://crossbell.io/@suji',
-                profile_uri: ['https://ipfs.io/ipfs/QmeYWaMUekPthkMnb5FMkiPLBTfu1PLkQFvZM3a7oftzNu/'],
-            },
-            {
-                address: '0x934b510d4c9103e6a87aef13b816fb080286d649',
-                network: 'farcaster',
-                platform: 'Farcaster',
-                source: 'Farcaster',
-                name: 'Suji Yan',
-                handle: 'suji',
-                bio: 'Mask.io / suji_yan.twitter',
-                url: 'https://www.discove.xyz/@suji',
-            },
-            {
-                address: '0x934b510d4c9103e6a87aef13b816fb080286d649',
-                network: 'ethereum',
-                platform: 'ENS Registrar',
-                source: 'ENS Registrar',
-                name: 'sujiyan',
-                handle: 'sujiyan.eth',
-                bio: '',
-                url: 'https://mask.io',
-                expire_at: '2027-01-30T04:49:54Z',
-                profile_uri: ['https://i.imgur.com/rkMlngS_d.webp?maxwidth=640&shape=thumb&fidelity=medium'],
-            },
-            {
-                address: '0x934b510d4c9103e6a87aef13b816fb080286d649',
-                network: 'crossbell',
-                platform: 'Crossbell',
-                source: 'Crossbell',
-                name: '',
-                handle: 'sujiyan.csb',
-                bio: '',
-                url: 'https://crossbell.io/@sujiyan',
-            },
-            {
-                address: '0x934b510d4c9103e6a87aef13b816fb080286d649',
-                network: 'binance_smart_chain',
-                platform: 'Space ID',
-                source: 'Space ID',
-                name: 'sujiyan',
-                handle: 'sujiyan.bnb',
-                bio: '',
-                expire_at: '2023-09-18T03:44:56Z',
-                profile_uri: [
-                    'https://meta.image.space.id/image/mainnet/1724643242156410158978553366859696090187901297468846704390299624367871799562.svg',
-                ],
-            },
-            {
-                address: '0x934b510d4c9103e6a87aef13b816fb080286d649',
-                network: 'polygon',
-                platform: 'Lens',
-                source: 'Lens',
-                name: 'Suji Yan',
-                handle: 'sujiyan.lens',
-                bio: 'Mask.io',
-                url: 'https://lenster.xyz/u/sujiyan.lens',
-                profile_uri: ['https://ipfs.io/ipfs/QmeYWaMUekPthkMnb5FMkiPLBTfu1PLkQFvZM3a7oftzNu'],
-            },
-        ])
-    }),
 ]

packages/web3-providers/src/DSearch/index.ts

@@ -38,7 +38,6 @@ import { CoinGeckoSearchAPI } from '../CoinGecko/apis/DSearchAPI.js'
 import { CoinGeckoTrending } from '../CoinGecko/apis/TrendingAPI.js'
 import { ENS } from '../ENS/index.js'
 import { NFTScanCollectionSearchAPI, NFTScanSearchAPI } from '../NFTScan/apis/DSearchAPI.js'
-import { PlatformToChainIdMap } from '../RSS3/constants.js'
 import { RSS3 } from '../RSS3/index.js'
 import { SpaceID } from '../SpaceID/index.js'
 import { DSEARCH_BASE_URL } from './constants.js'
@@ -140,25 +139,6 @@ class DSearchAPI<ChainId = Web3Helper.ChainIdAll, SchemaType = Web3Helper.Schema
         ]
     }
 
-    private async searchRSS3Handle(handle: string): Promise<Array<DomainResult<ChainId>>> {
-        const profiles = await RSS3.getProfiles(handle)
-        return profiles
-            .filter((x) => x.handle === handle)
-            .map((profile) => {
-                const chainId = PlatformToChainIdMap[profile.network] as ChainId
-                if (!chainId) console.error(`Not chain id configured for network ${profile.network}`)
-
-                return {
-                    type: SearchResultType.Domain,
-                    pluginID: NetworkPluginID.PLUGIN_EVM,
-                    chainId,
-                    keyword: handle,
-                    domain: profile.handle,
-                    address: profile.address,
-                }
-            })
-    }
-
     private async searchRSS3NameService(handle: string): Promise<Array<DomainResult<ChainId>>> {
         const result = await RSS3.getNameService(handle)
         if (!result) return []
@@ -454,14 +434,6 @@ class DSearchAPI<ChainId = Web3Helper.ChainIdAll, SchemaType = Web3Helper.Schema
         const { word, field } = this.parseKeyword(lowerKeyword)
         if (word && ['token', 'twitter'].includes(field ?? '')) return this.searchTokenByName(word) as Promise<T[]>
 
-        // vitalik.lens, vitalik.bit, etc. including ENS BNB
-        // Can't get .bit domain via RSS3 profile API.
-        if (isValidHandle(lowerKeyword) && !lowerKeyword.endsWith('.bit')) {
-            if (lowerKeyword.endsWith('.eth')) Telemetry.captureEvent(EventType.Access, EventID.EntryTimelineDsearchEns)
-            else Telemetry.captureEvent(EventType.Access, EventID.EntryTimelineDsearchName)
-            const domains = (await this.searchRSS3Handle(lowerKeyword)) as T[]
-            if (domains.length) return domains
-        }
         if (lowerKeyword.endsWith('.bit')) {
             Telemetry.captureEvent(EventType.Access, EventID.EntryTimelineDsearchName)
             return this.searchRSS3NameService(lowerKeyword) as Promise<T[]>

packages/web3-providers/src/RSS3/apis/RSS3API.ts

@@ -1,6 +1,6 @@
 import { createIndicator, createNextIndicator, createPageable } from '@masknet/shared-base'
 import { queryClient } from '@masknet/shared-base-ui'
-import { isValidAddress, type ChainId } from '@masknet/web3-shared-evm'
+import { type ChainId } from '@masknet/web3-shared-evm'
 import { Telemetry } from '@masknet/web3-telemetry'
 import { ExceptionID, ExceptionType } from '@masknet/web3-telemetry/types'
 import * as RSS3Next from /* webpackDefer: true */ 'rss3-next'
@@ -127,19 +127,6 @@ export class RSS3 {
         )
     }
 
-    static async getProfiles(account: string | undefined) {
-        if (!account) return []
-        if (!account.includes('.') && !isValidAddress(account)) return []
-        const url = urlcat(RSS3_ENDPOINT, '/datasets/domains/profiles', {
-            account,
-        })
-
-        const response = await fetchFromRSS3<RSS3BaseAPI.ProfilesResponse | { error: string }>(url)
-        if ('error' in response) return []
-
-        return response
-    }
-
     static async getNameService(handle: string) {
         const url = urlcat(RSS3_ENDPOINT, '/ns/:handle', {
             handle,