Firefly PC v5.2.0

package.json

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

packages/mask/.webpack/config.ts

@@ -41,16 +41,6 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise<webp
     const polyfillFolder = join(nonWebpackJSFiles, './polyfill')
 
     const pnpmPatches = readdir(patchesDir).then((files) => files.map((x) => join(patchesDir, x)))
-
-    let WEB3_CONSTANTS_RPC = process.env.WEB3_CONSTANTS_RPC || ''
-    if (WEB3_CONSTANTS_RPC) {
-        try {
-            if (typeof JSON.parse(WEB3_CONSTANTS_RPC) === 'object') {
-                console.error("Environment variable WEB3_CONSTANTS_RPC should be JSON.stringify'ed twice")
-                WEB3_CONSTANTS_RPC = JSON.stringify(WEB3_CONSTANTS_RPC)
-            }
-        } catch (err) {}
-    }
     const baseConfig = {
         name: 'mask',
         // to set a correct base path for source map
@@ -201,11 +191,10 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise<webp
             new EnvironmentPlugin({
                 NODE_ENV: productionLike ? 'production' : flags.mode,
                 NODE_DEBUG: false,
-                /** JSON.stringify twice */
-                WEB3_CONSTANTS_RPC: WEB3_CONSTANTS_RPC,
+                WEB3_CONSTANTS_RPC: process.env.WEB3_CONSTANTS_RPC || '{}',
                 MASK_SENTRY_DSN: process.env.MASK_SENTRY_DSN || '',
-                MASK_SENTRY: process.env.MASK_SENTRY || JSON.stringify('disabled'),
-                MASK_MIXPANEL: process.env.MASK_MIXPANEL || JSON.stringify('disabled'),
+                MASK_SENTRY: process.env.MASK_SENTRY || 'disabled',
+                MASK_MIXPANEL: process.env.MASK_MIXPANEL || 'disabled',
                 NEXT_PUBLIC_FIREFLY_API_URL: process.env.NEXT_PUBLIC_FIREFLY_API_URL || '',
             }),
             new DefinePlugin({

packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/OperationFooter.tsx

@@ -30,6 +30,7 @@ interface OperationFooterProps {
     chainId?: ChainId
     canClaim: boolean
     canRefund: boolean
+    canShare?: boolean
     /** Is claiming or checking claim status */
     isClaiming: boolean
     isRefunding: boolean
@@ -40,6 +41,7 @@ export function OperationFooter({
     chainId,
     canClaim,
     canRefund,
+    canShare = true,
     isClaiming,
     isRefunding,
     onShare,
@@ -97,7 +99,7 @@ export function OperationFooter({
     return (
         <Box style={{ flex: 1, padding: 12 }}>
             <Box className={classes.footer}>
-                {canRefund ? null : (
+                {canRefund || !canShare ? null : (
                     <ActionButton
                         fullWidth
                         variant="roundedDark"

packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx

@@ -189,7 +189,7 @@ export const RedPacket = memo(function RedPacket({ payload }: RedPacketProps) {
     const [{ loading: isClaiming, value: claimTxHash }, claimCallback] = useClaimCallback(account, payload)
     const site = usePostInfoDetails.site()
     const source = usePostInfoDetails.source()
-    const platform = source?.toLowerCase() as 'lens' | 'farcaster'
+    const platform = source?.toLowerCase() as 'lens' | 'farcaster' | 'twitter'
     const isOnFirefly = site === EnhanceableSite.Firefly
     const postUrl = usePostInfoDetails.url()
     const handle = usePostInfoDetails.handle()
@@ -201,7 +201,7 @@ export const RedPacket = memo(function RedPacket({ payload }: RedPacketProps) {
     const getShareText = useCallback(
         (hasClaimed: boolean) => {
             if (isOnFirefly) {
-                const context = hasClaimed ? (`${platform}_claimed` as 'lens_claimed' | 'farcaster_claimed') : platform
+                const context = hasClaimed ? (`${platform}_claimed` as const) : platform
                 return t.share_on_firefly({
                     context,
                     sender: handle ?? '',
@@ -435,6 +435,7 @@ export const RedPacket = memo(function RedPacket({ payload }: RedPacketProps) {
                     chainId={payloadChainId}
                     canClaim={canClaim}
                     canRefund={canRefund}
+                    canShare={platform !== 'twitter'}
                     isClaiming={isClaiming || checkingClaimStatus}
                     isRefunding={isRefunding}
                     onShare={handleShare}

packages/plugins/RedPacket/src/SiteAdaptor/hooks/useClaimStrategyStatus.ts

@@ -21,7 +21,7 @@ export function useClaimStrategyStatus(payload: RedPacketJSONPayload | RedPacket
         enabled: !signedMessage && !!platform,
         queryKey: ['red-packet', 'claim-strategy', rpid, platform, account, me],
         queryFn: async () => {
-            if (!platform) return null
+            if (!platform || !account) return null
             return FireflyRedPacket.checkClaimStrategyStatus({
                 rpid,
                 profile: {

packages/plugins/RedPacket/src/SiteAdaptor/hooks/useSignedMessage.ts

@@ -38,7 +38,7 @@ export function useSignedMessage(
             } catch {}
             if (version <= 3) return password
             if (password) return signMessage(account, password).signature
-            if (!profile) return ''
+            if (!profile || !account) return ''
             return FireflyRedPacket.createClaimSignature({
                 rpid,
                 profile,

packages/plugins/RedPacket/src/locales/en-US.json

@@ -168,8 +168,10 @@
     "share_on_firefly$default": "🤑 Check this Lucky Drop  🧧💰✨ sent by @{{- sender }} .\n\nGrow your followers and engagement with Lucky Drop on Firefly mobile app or http://firefly.mask.social !\n\nClaim on: {{- link }}",
     "share_on_firefly$lens": "🤑 Check this Lucky Drop  🧧💰✨ sent by @{{- sender }} .\n\nGrow your followers and engagement with Lucky Drop on Firefly mobile app or http://firefly.mask.social !\n\nClaim on Lens: {{- link }}",
     "share_on_firefly$farcaster": "🤑 Check this Lucky Drop  🧧💰✨ sent by @{{- sender }} .\n\nGrow your followers and engagement with Lucky Drop on Firefly mobile app or http://firefly.mask.social !\n\nClaim on Farcaster: {{- link }}",
+    "share_on_firefly$twitter": "🤑 Check this Lucky Drop  🧧💰✨ sent by @{{- sender }} .\n\nGrow your followers and engagement with Lucky Drop on Firefly mobile app or http://firefly.mask.social !\n\nClaim on Twitter: {{- link }}",
     "share_on_firefly$lens_claimed": "🤑 Just claimed a #LuckyDrop  🧧💰✨ on https://firefly.mask.social from @{{- sender }} ! \n\nClaim on Lens: {{- link }}",
     "share_on_firefly$farcaster_claimed": "🤑 Just claimed a #LuckyDrop  🧧💰✨ on https://firefly.mask.social from @{{- sender }} ! \n\nClaim on Farcaster: {{- link }}",
+    "share_on_firefly$twitter_claimed": "🤑 Just claimed a #LuckyDrop  🧧💰✨ on https://firefly.mask.social from @{{- sender }} ! \n\nClaim on Twitter: {{- link }}",
     "no_claim_data": "No claims yet for this Lucky Drop",
     "no_claim_history_data": "No Lucky Drops claimed",
     "no_sent_history_data": "<div>No Lucky Drops created.</div> <div>Select 🎁 when you compose a post to start your first drop.<div>",

packages/plugins/Trader/src/SiteAdaptor/trending/PriceChart.tsx

@@ -1,4 +1,4 @@
-import { useRef } from 'react'
+import { useRef, useMemo } from 'react'
 import { Stack, Typography } from '@mui/material'
 import { LoadingBase, makeStyles } from '@masknet/theme'
 import { openWindow } from '@masknet/shared-base-ui'
@@ -53,28 +53,29 @@ export function PriceChart(props: PriceChartProps) {
     const { classes } = useStyles(props, { props })
     const rootRef = useRef<HTMLDivElement>(null)
     const svgRef = useRef<SVGSVGElement>(null)
+    const { stats, loading, currency, coin, children } = props
 
     useDimension(svgRef, DEFAULT_DIMENSION)
 
-    usePriceLineChart(
-        svgRef,
-        props.stats.map(([date, price]) => ({
+    const data = useMemo(() => {
+        return stats.map(([date, price]) => ({
             date: new Date(date),
             value: price,
-        })),
-        DEFAULT_DIMENSION,
-        'x-trader-price-line-chart',
-        { sign: props.currency.name ?? 'USD' },
-    )
+        }))
+    }, [stats])
+
+    usePriceLineChart(svgRef, data, DEFAULT_DIMENSION, 'x-trader-price-line-chart', {
+        sign: currency.name ?? 'USD',
+    })
 
     return (
         <div className={classes.root} ref={rootRef}>
-            {props.loading && props.stats.length ?
+            {loading && stats.length ?
                 <LoadingBase className={classes.progress} color="primary" size={15} />
             :   null}
 
             <Stack gap={2}>
-                {props.stats.length ?
+                {stats.length ?
                     <svg
                         className={classes.svg}
                         ref={svgRef}
@@ -83,14 +84,14 @@ export function PriceChart(props: PriceChartProps) {
                         viewBox={`0 0 ${DEFAULT_DIMENSION.width} ${DEFAULT_DIMENSION.height}`}
                         preserveAspectRatio="xMidYMid meet"
                         onClick={() => {
-                            props.stats.length && openWindow(props.coin?.platform_url)
+                            stats.length && openWindow(coin?.platform_url)
                         }}
                     />
                 :   <Typography className={classes.placeholder} align="center" color="textSecondary">
                         {t.plugin_trader_no_data()}
                     </Typography>
                 }
-                {props.children}
+                {children}
             </Stack>
         </div>
     )

packages/shared-base/src/Pageable/index.ts

@@ -11,6 +11,8 @@ export interface Pageable<Item, Indicator = unknown> {
     nextIndicator?: Indicator
     /** items data */
     data: Item[]
+    /** items total */
+    total?: number
 }
 
 export interface PageIndicator {
@@ -51,21 +53,24 @@ export function createPageable<Item, Indicator = PageIndicator>(
     data: Item[],
     indicator: Indicator,
     nextIndicator?: Indicator,
-) {
+    total?: number,
+): Pageable<Item, Indicator> {
     // with next page
     if (typeof nextIndicator !== 'undefined') {
         return {
             __type__: $Pageable,
             data,
             indicator,
             nextIndicator,
+            total,
         }
     }
     // without next page
     return {
         __type__: $Pageable,
         data,
         indicator,
+        total,
     }
 }
 

packages/shared-base/src/Sniffings/index.ts

@@ -3,8 +3,8 @@ enum SiteHost {
     Facebook = 'facebook.com',
 }
 
-const navigator_ = process.env.NODE_ENV === 'test' ? null : navigator
-const location_ = process.env.NODE_ENV === 'test' ? null : location
+const navigator_ = typeof navigator === 'undefined' ? null : navigator
+const location_ = typeof location === 'undefined' ? null : location
 
 const isChromium = navigator_?.userAgent.includes('Chrome') || navigator_?.userAgent.includes('Chromium')
 

packages/shared/src/hooks/useLineChart/index.ts

@@ -1,9 +1,8 @@
+import { alpha, useTheme } from '@mui/material'
 import * as d3 from 'd3'
+import { format } from 'date-fns'
 import { useEffect, type RefObject } from 'react'
-import stringify from 'json-stable-stringify'
 import type { Dimension } from '../useDimension.js'
-import { format } from 'date-fns'
-import { alpha, useTheme } from '@mui/material'
 import { fixOverPosition } from './utils.js'
 
 // TODO chart morph transform
@@ -244,5 +243,5 @@ export function useLineChart(
         })
 
         d3.select(svgRef.current).on('mouseleave', hide)
-    }, [svgRef.current, data.length, stringify(dimension), tickFormat, formatTooltip])
+    }, [svgRef.current, data, dimension, tickFormat, formatTooltip])
 }

packages/web3-providers/src/CoinGecko/constants.ts

@@ -24,6 +24,8 @@ export const COINGECKO_CHAIN_ID_LIST = [
     ChainId.Cronos,
     ChainId.BitTorrent,
     ChainId.Boba,
+    ChainId.Metis,
+    ChainId.Scroll,
 ]
 
 if (process.env.NODE_ENV === 'development') {

packages/web3-providers/src/CoinGecko/helpers.ts

@@ -6,7 +6,7 @@ import { ChainId as ChainIdSolana } from '@masknet/web3-shared-solana'
 export const resolveCoinGeckoChainId = createLookupTableResolver<string, Web3Helper.ChainIdAll | undefined>(
     {
         ethereum: ChainId.Mainnet,
-        'binance-smart-chain': ChainId.BSCT,
+        'binance-smart-chain': ChainId.BSC,
         'polygon-pos': ChainId.Matic,
         solana: ChainIdSolana.Mainnet,
         astar: ChainId.Astar,

packages/web3-providers/src/Firefly/RedPacket.ts

@@ -6,6 +6,7 @@ import {
     type PageIndicator,
     getSiteType,
     EnhanceableSite,
+    EMPTY_LIST,
 } from '@masknet/shared-base'
 import urlcat from 'urlcat'
 import { fetchJSON } from '../entry-helpers.js'
@@ -179,6 +180,9 @@ export class FireflyRedPacket {
         platform: FireflyRedPacketAPI.SourceType,
         indicator?: PageIndicator,
     ): Promise<Pageable<R, PageIndicator>> {
+        if (!from) {
+            return createPageable(EMPTY_LIST, createIndicator(indicator))
+        }
         const url = urlcat(FIREFLY_ROOT_URL, '/v1/redpacket/history', {
             address: from,
             redpacketType: actionType,

packages/web3-providers/src/GoPlusLabs/rules.ts

@@ -194,7 +194,7 @@ export const SecurityMessages: SecurityMessage[] = [
         level: SecurityMessageLevel.Safe,
         condition: (info: SecurityAPI.TokenSecurityType) => info.transfer_pausable === '0',
         titleKey: 'risk_no_code_transfer_pausable_title',
-        messageKey: 'risk_no_code_transfer_pausable_title',
+        messageKey: 'risk_no_code_transfer_pausable_body',
         shouldHide: isUnset('transfer_pausable'),
     },
     {

packages/web3-providers/src/SimpleHash/apis/EVM.ts

@@ -94,6 +94,65 @@ class SimpleHashAPI_EVM implements NonFungibleTokenAPI.Provider<ChainId, SchemaT
         return asset
     }
 
+    async getOwnersByContract(
+        address: string,
+        { chainId = ChainId.Mainnet, indicator, size = 20 }: BaseHubOptions<ChainId> = {},
+    ) {
+        const chain = resolveChain(NetworkPluginID.PLUGIN_EVM, chainId)
+        const path = urlcat('/api/v0/nfts/owners/:chain/:contract_address', {
+            chain,
+            contract_address: address,
+            cursor: indicator?.id || undefined,
+            limit: size,
+        })
+        const response = await fetchFromSimpleHash<{ next_cursor: string; owners: SimpleHash.Owner[] }>(path)
+        return createPageable(
+            response.owners,
+            indicator,
+            response.next_cursor ? createNextIndicator(indicator, response.next_cursor) : undefined,
+        )
+    }
+
+    async getPoapEvent(eventId: number, { indicator, size = 20 }: Omit<BaseHubOptions<ChainId>, 'chainId'> = {}) {
+        const path = urlcat('/api/v0/nfts/poap_event/:event_id', {
+            cursor: indicator?.id || undefined,
+            limit: size,
+            event_id: eventId,
+            count: 1,
+        })
+        const response = await fetchFromSimpleHash<{ next_cursor: string; nfts: SimpleHash.Asset[]; count?: number }>(
+            path,
+        )
+        return createPageable(
+            response.nfts,
+            indicator,
+            response.next_cursor ? createNextIndicator(indicator, response.next_cursor) : undefined,
+            response.count,
+        )
+    }
+
+    async getTopCollectorsByContract(
+        address: string,
+        { chainId = ChainId.Mainnet, indicator, size = 20 }: BaseHubOptions<ChainId> = {},
+    ) {
+        const chain = resolveChain(NetworkPluginID.PLUGIN_EVM, chainId)
+        const path = urlcat('/api/v0/nfts/top_collectors/:chain/:contract_address', {
+            chain,
+            contract_address: address,
+            cursor: indicator?.id || undefined,
+            limit: size,
+            include_owner_image: '1',
+        })
+        const response = await fetchFromSimpleHash<{ next_cursor: string; top_collectors: SimpleHash.TopCollector[] }>(
+            path,
+        )
+        return createPageable(
+            response.top_collectors,
+            indicator,
+            response.next_cursor ? createNextIndicator(indicator, response.next_cursor) : undefined,
+        )
+    }
+
     async getCollectionOverview(chainId: ChainId, id: string): Promise<NonFungibleCollectionOverview | undefined> {
         // SimpleHash collection id is not address
         if (isValidAddress(id)) return
@@ -120,15 +179,24 @@ class SimpleHashAPI_EVM implements NonFungibleTokenAPI.Provider<ChainId, SchemaT
         }
     }
 
-    async getAssets(account: string, { chainId = ChainId.Mainnet, indicator }: BaseHubOptions<ChainId> = {}) {
+    async getAssets(
+        account: string,
+        {
+            chainId = ChainId.Mainnet,
+            indicator,
+            contractAddress = '',
+        }: BaseHubOptions<ChainId> & {
+            contractAddress?: string
+        } = {},
+    ) {
         const chain = resolveChain(NetworkPluginID.PLUGIN_EVM, chainId)
         if (!account || !isValidChainId(chainId) || !chain) {
             return createPageable(EMPTY_LIST, createIndicator(indicator))
         }
         const path = urlcat('/api/v0/nfts/owners', {
             chains: chain,
             wallet_addresses: account,
-            contract_addresses: '',
+            contract_addresses: contractAddress,
             cursor: typeof indicator?.index !== 'undefined' && indicator.index !== 0 ? indicator.id : undefined,
         })