chore: update solana redpacket idl (#12055)

Author: swkatmask

cspell.json

@@ -240,5 +240,5 @@
     ],
     "ignoreRegExpList": ["/[A-Za-z0-9]{44}/", "/[A-Za-z0-9]{46}/", "/[A-Za-z0-9]{59}/"],
     "overrides": [],
-    "words": ["cashtags", "endregion", "linkedin", "luma", "muln", "tiktok", "tweetnacl", "waitlist", "youtube"]
+    "words": ["cashtags", "endregion", "linkedin", "luma", "muln", "tiktok", "tweetnacl", "txid", "waitlist", "youtube"]
 }

packages/mask/content-script/components/CompositionDialog/Composition.tsx

@@ -3,7 +3,14 @@ import { useAsync } from 'react-use'
 import { DialogContent, alpha } from '@mui/material'
 import { makeStyles } from '@masknet/theme'
 import { useCurrentPersonaConnectStatus, InjectedDialog, PersonaAction } from '@masknet/shared'
-import { CrossIsolationMessages, EMPTY_OBJECT, MaskMessages, currentPersonaIdentifier } from '@masknet/shared-base'
+import {
+    CrossIsolationMessages,
+    EMPTY_OBJECT,
+    MaskMessages,
+    RedPacketMetaKey,
+    SolanaRedPacketMetaKey,
+    currentPersonaIdentifier,
+} from '@masknet/shared-base'
 import { useValueRef } from '@masknet/shared-base-ui'
 import { Telemetry } from '@masknet/web3-telemetry'
 import { EventID, EventType } from '@masknet/web3-telemetry/types'
@@ -110,7 +117,8 @@ export function Composition({ type = 'timeline', requireClipboardPermission }: P
         })
     }, [open])
 
-    const onSubmit_ = useSubmit(onClose, reason)
+    const hasRedpacket = Object.keys(initialMeta).some((x) => [RedPacketMetaKey, SolanaRedPacketMetaKey].includes(x))
+    const onSubmit_ = useSubmit(onClose, reason, hasRedpacket)
 
     const UI = useRef<CompositionRef>(null)
     const networkSupport = activatedSiteAdaptorUI!.injection.newPostComposition?.supportedOutputTypes

packages/mask/content-script/components/CompositionDialog/useSubmit.ts

@@ -19,7 +19,7 @@ import { SteganographyPayload } from './SteganographyPayload.js'
 import { msg } from '@lingui/core/macro'
 import { useLingui, type I18nContext } from '@lingui/react'
 
-export function useSubmit(onClose: () => void, reason: 'timeline' | 'popup' | 'reply') {
+export function useSubmit(onClose: () => void, reason: 'timeline' | 'popup' | 'reply', hasRedpacket?: boolean) {
     const { _ } = useLingui()
     const lastRecognizedIdentity = useLastRecognizedIdentity()
 
@@ -63,7 +63,7 @@ export function useSubmit(onClose: () => void, reason: 'timeline' | 'popup' | 'r
                 // Don't await this, otherwise the dialog won't disappear
                 activatedSiteAdaptorUI?.automation.nativeCompositionDialog?.attachImage?.(mediaObject, {
                     recover: true,
-                    relatedTextPayload: `${decoratedText || defaultText} #MaskLuckyDrop`,
+                    relatedTextPayload: `${decoratedText || defaultText} ${hasRedpacket ? '#MaskLuckyDrop' : ''}`,
                     reason,
                 })
             } else {

packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedPacket/SolanaRedPacketFrame.tsx

@@ -15,10 +15,7 @@ export function SolanaRedPacketFrame({ payload }: Omit<SolanaRedPacketCardProps,
             if (draft.token) {
                 draft.token.runtime = NetworkPluginID.PLUGIN_SOLANA
             }
-            if (!draft.accountId) {
-                draft.accountId = draft.rpid.replace(/^solana-/, '')
-            }
-            draft.network = 'devnet'
+            draft.accountId = draft.rpid
         })
     }, [payload])
     const payloadChainId =

packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedPacket/hooks/useAvailability.ts

@@ -12,11 +12,11 @@ export function useSolanaAvailability(payload: SolanaRedPacketJSONPayload, chain
     const account = useAccount(NetworkPluginID.PLUGIN_SOLANA)
 
     const { data, refetch: checkAvailability } = useQuery({
-        queryKey: ['red-packet', 'solana-availability', payload.accountId, payload.network],
+        queryKey: ['red-packet', 'solana-availability', payload.rpid, payload.network],
         queryFn: async () => {
-            if (!payload.accountId) return null
+            if (!payload.rpid) return null
             const program = await getRpProgram(payload.network)
-            const result = await program.account.redPacket.fetch(payload.accountId)
+            const result = await program.account.redPacket.fetch(payload.rpid)
             return result
         },
         refetchInterval(query) {
@@ -32,7 +32,7 @@ export function useSolanaAvailability(payload: SolanaRedPacketJSONPayload, chain
 
     const { data: claimRecord, refetch: checkClaimRecord } = useClaimRecord(
         account,
-        payload.accountId,
+        payload.rpid,
         payload?.network ?? 'mainnet-beta',
     )
     const refresh = useCallback(() => {

packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedpacketDialog/CreateRedpacket.tsx

@@ -1,6 +1,6 @@
-import { Trans } from '@lingui/react/macro'
 import { msg } from '@lingui/core/macro'
 import { useLingui } from '@lingui/react'
+import { Trans } from '@lingui/react/macro'
 import { Icons } from '@masknet/icons'
 import {
     FormattedBalance,
@@ -11,9 +11,10 @@ import {
     useAvailableBalance,
     WalletConnectedBoundary,
 } from '@masknet/shared'
-import { EnhanceableSite, getEnhanceableSiteType, NetworkPluginID } from '@masknet/shared-base'
+import { NetworkPluginID } from '@masknet/shared-base'
 import { ActionButton, makeStyles, RadioIndicator } from '@masknet/theme'
 import { useChainContext, useEnvironmentContext, useNativeTokenPrice } from '@masknet/web3-hooks-base'
+import { SolanaChainResolver } from '@masknet/web3-providers'
 import {
     formatBalance,
     formatCurrency,
@@ -24,17 +25,18 @@ import {
     rightShift,
     ZERO,
 } from '@masknet/web3-shared-base'
-import { isNativeTokenAddress, type ChainId, type SchemaType } from '@masknet/web3-shared-solana'
+import { type ChainId, isNativeTokenAddress, type SchemaType } from '@masknet/web3-shared-solana'
 import { alpha, Box, InputBase, inputBaseClasses, Typography, useTheme } from '@mui/material'
+import type { Cluster } from '@solana/web3.js'
 import { BigNumber } from 'bignumber.js'
 import { type ChangeEvent, useCallback, useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
 import {
     MAX_CUSTOM_THEMES,
-    SOL_REDPACKET_MAX_SHARES,
     RED_PACKET_MIN_SHARES,
     RoutePaths,
     SOL_REDPACKET_CREATE_DEFAULT_GAS,
+    SOL_REDPACKET_MAX_SHARES,
 } from '../../constants.js'
 import { PreviewRedPacket } from '../components/PreviewRedPacket.js'
 import { useSolRedpacket } from '../contexts/SolRedpacketContext.js'
@@ -172,9 +174,7 @@ const useStyles = makeStyles()((theme) => ({
 
 export function CreateSolRedPacket() {
     const { _ } = useLingui()
-    const { account } = useChainContext()
-    const { chainId, setChainId } = useChainContext()
-    const isFirefly = getEnhanceableSiteType() === EnhanceableSite.Firefly
+    const { account, chainId, setChainId } = useChainContext<NetworkPluginID.PLUGIN_SOLANA>()
     const { classes, cx } = useStyles()
     const theme = useTheme()
     const navigate = useNavigate()
@@ -243,6 +243,7 @@ export function CreateSolRedPacket() {
     const totalAmount = multipliedBy(amount, isRandom ? 1 : (shares ?? '0'))
     const minTotalAmount = new BigNumber(isRandom ? 1 : (shares ?? 0))
     const isDivisible = !totalAmount.dividedBy(shares).isLessThan(1)
+    const cluster = SolanaChainResolver.network(chainId) as Cluster
 
     // balance
     const { data: defaultGasFee = ZERO, isFetching: estimateGasLoading } = useEstimateGasWithCreateSolRedpacket(
@@ -254,6 +255,7 @@ export function CreateSolRedPacket() {
         message,
         creator,
         token,
+        cluster,
     )
 
     const gasFee = defaultGasFee.multipliedBy(isNativeTokenAddress(token?.address) ? 5 : 10)

packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedpacketDialog/MainDialog.tsx

@@ -3,13 +3,11 @@ import { DialogContent } from '@mui/material'
 import { MemoryRouter } from 'react-router-dom'
 
 import { RestorableScrollContext } from '@masknet/shared'
-import { SOLWeb3ContextProvider } from '@masknet/web3-hooks-base'
 import { RoutePaths } from '../../constants.js'
 import { RouterDialog } from '../components/RouterDialog.js'
 import { SolRedPacketRoutes } from './Routes.js'
 import { SOLRedPacketProvider } from '../contexts/SolRedpacketContext.js'
 import { RedPacketTabs } from '../../types.js'
-import { ChainId } from '@masknet/web3-shared-solana'
 
 interface RedPacketDialogProps {
     onClose: () => void
@@ -48,27 +46,25 @@ export function SolRedPacketMainDialog({ onClose }: RedPacketDialogProps) {
 
     return (
         <MemoryRouter initialEntries={initialEntries} initialIndex={initialIndex}>
-            <SOLWeb3ContextProvider chainId={ChainId.Devnet}>
-                <SOLRedPacketProvider>
-                    <RouterDialog
-                        pageMap={{
-                            [RedPacketTabs.tokens]: RoutePaths.CreateSolanaRedPacket,
-                            [RedPacketTabs.collectibles]: RoutePaths.CreateNftRedPacket,
-                        }}
-                        open
-                        onClose={onClose}
-                        classes={{ paper: classes.paper }}
-                        maxWidth="xs"
-                        fullWidth
-                        independent>
-                        <DialogContent className={classes.content}>
-                            <RestorableScrollContext>
-                                <SolRedPacketRoutes />
-                            </RestorableScrollContext>
-                        </DialogContent>
-                    </RouterDialog>
-                </SOLRedPacketProvider>
-            </SOLWeb3ContextProvider>
+            <SOLRedPacketProvider>
+                <RouterDialog
+                    pageMap={{
+                        [RedPacketTabs.tokens]: RoutePaths.CreateSolanaRedPacket,
+                        [RedPacketTabs.collectibles]: RoutePaths.CreateNftRedPacket,
+                    }}
+                    open
+                    onClose={onClose}
+                    classes={{ paper: classes.paper }}
+                    maxWidth="xs"
+                    fullWidth
+                    independent>
+                    <DialogContent className={classes.content}>
+                        <RestorableScrollContext>
+                            <SolRedPacketRoutes />
+                        </RestorableScrollContext>
+                    </DialogContent>
+                </RouterDialog>
+            </SOLRedPacketProvider>
         </MemoryRouter>
     )
 }

packages/plugins/RedPacket/src/SiteAdaptor/SolanaRedpacketDialog/RedpacketConfirm.tsx

@@ -124,6 +124,7 @@ export function SolanaRedPacketConfirm() {
         })
     }, [settings, isNativeToken])
 
+    const cluster = SolanaChainResolver.network(chainId) as SolanaWeb3.Cluster
     const { data: defaultGasFee = ZERO, isLoading: estimateLoading } = useEstimateGasWithCreateSolRedpacket(
         shares,
         new BigNumber(settings.total).toNumber(),
@@ -132,6 +133,7 @@ export function SolanaRedPacketConfirm() {
         message,
         creator,
         token,
+        cluster,
     )
 
     const gasFee = defaultGasFee.multipliedBy(isNativeToken ? 5 : 10)
@@ -142,7 +144,7 @@ export function SolanaRedPacketConfirm() {
         const claimer = new SolanaWeb3.PublicKey(publicKey)
         const total = new BigNumber(settings.total).toNumber()
         const tokenMint = token?.address ? new SolanaWeb3.PublicKey(token.address) : null
-        const tokenProgram = tokenMint ? await getTokenProgram(tokenMint) : undefined
+        const tokenProgram = tokenMint ? await getTokenProgram(tokenMint, cluster) : undefined
 
         const result = await (isNativeToken ?
             createWithNativeToken(
@@ -154,6 +156,7 @@ export function SolanaRedPacketConfirm() {
                 claimer,
                 creator,
                 message,
+                cluster,
             )
         : tokenMint ?
             createWithSplToken(
@@ -166,6 +169,7 @@ export function SolanaRedPacketConfirm() {
                 claimer,
                 creator,
                 message,
+                cluster,
             )
         :   null)
         if (!result) return
@@ -185,7 +189,7 @@ export function SolanaRedPacketConfirm() {
             duration: DEFAULT_DURATION,
             creation_time: Date.now(),
             token,
-            network: SolanaChainResolver.network(chainId),
+            network: cluster,
             contract_address: idl.address,
             contract_version: 4,
             txid: result.signature,

packages/plugins/RedPacket/src/SiteAdaptor/helpers/createWithNativeToken.ts

@@ -1,8 +1,9 @@
 import { BN, web3 } from '@coral-xyz/anchor'
+import { ZERO } from '@masknet/web3-shared-base'
+import type { Cluster } from '@solana/web3.js'
+import { BigNumber } from 'bignumber.js'
 import { getRpProgram } from './getRpProgram.js'
 import { getSolanaConnection } from './getSolanaProvider.js'
-import { BigNumber } from 'bignumber.js'
-import { ZERO } from '@masknet/web3-shared-base'
 
 const MAX_NUM = 200 // Maximum number of red packets (constant)
 
@@ -16,13 +17,14 @@ export async function createWithNativeToken(
     pubkeyForClaimSignature: web3.PublicKey, // Public key to be used for claim signature
     author: string, // Author of the red packet
     message: string, // Message to be included in the red packet
+    cluster: Cluster | undefined,
 ) {
     // Ensure the totalNumber and totalAmount are within the acceptable range
     if (totalNumber > MAX_NUM) {
         throw new Error(`Total number of red packets cannot exceed ${MAX_NUM}`)
     }
 
-    const program = await getRpProgram()
+    const program = await getRpProgram(cluster)
 
     const createTime = Math.floor(Date.now() / 1000)
     const nativeTokenRedPacket = web3.PublicKey.findProgramAddressSync(
@@ -66,10 +68,11 @@ export async function getEstimatedGasByCreateWithNativeToken(
     pubkeyForClaimSignature: web3.PublicKey,
     message: string,
     author: string,
+    cluster: Cluster | undefined,
 ): Promise<BigNumber> {
-    const program = await getRpProgram()
+    const program = await getRpProgram(cluster)
     const createTime = Math.floor(Date.now() / 1000)
-    const connection = await getSolanaConnection('devnet')
+    const connection = await getSolanaConnection(cluster)
 
     const transaction = await program.methods
         .createRedPacketWithNativeToken(

packages/plugins/RedPacket/src/SiteAdaptor/helpers/createWithSplToken.ts

@@ -1,6 +1,7 @@
 import { BN, web3 } from '@coral-xyz/anchor'
 import { ZERO } from '@masknet/web3-shared-base'
 import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token'
+import type { Cluster } from '@solana/web3.js'
 import { BigNumber } from 'bignumber.js'
 import { getRpProgram } from './getRpProgram.js'
 import { getSolanaConnection } from './getSolanaProvider.js'
@@ -17,18 +18,19 @@ export async function createWithSplToken(
     pubkeyForClaimSignature: web3.PublicKey,
     author: string,
     message: string,
+    cluster: Cluster | undefined,
 ) {
     // Ensure the totalNumber and totalAmount are within the acceptable range
     if (totalNumber > MAX_NUM) {
         throw new Error(`Total number of red packets cannot exceed ${MAX_NUM}`)
     }
 
-    const program = await getRpProgram()
+    const program = await getRpProgram(cluster)
 
-    const tokenAccount = await getTokenAccount(tokenMint)
+    const tokenAccount = await getTokenAccount(tokenMint, cluster)
     if (!tokenAccount) throw new Error('Token account not found')
 
-    const tokenProgram = await getTokenProgram(tokenMint)
+    const tokenProgram = await getTokenProgram(tokenMint, cluster)
     if (!tokenProgram) throw new Error('Token program not found')
 
     const createTime = Math.floor(Date.now() / 1000)
@@ -81,20 +83,21 @@ export async function getEstimatedGasByCreateWithSplToken(
     pubkeyForClaimSignature: web3.PublicKey,
     message: string,
     author: string,
+    cluster: Cluster | undefined,
 ) {
     // Ensure the totalNumber and totalAmount are within the acceptable range
     if (totalNumber > MAX_NUM) {
         throw new Error(`Total number of red packets cannot exceed ${MAX_NUM}`)
     }
 
-    const program = await getRpProgram()
+    const program = await getRpProgram(cluster)
 
     const connection = await getSolanaConnection('devnet')
 
-    const tokenAccount = await getTokenAccount(tokenMint)
+    const tokenAccount = await getTokenAccount(tokenMint, cluster)
     if (!tokenAccount) throw new Error('Token account not found')
 
-    const tokenProgram = await getTokenProgram(tokenMint)
+    const tokenProgram = await getTokenProgram(tokenMint, cluster)
     if (!tokenProgram) throw new Error('Token program not found')
 
     const createTime = Math.floor(Date.now() / 1000)