refactor: internalSend

packages/dashboard/src/API.tsx

@@ -23,7 +23,6 @@ export interface PluginServices {
             derivationPath?: string,
             initialPassword?: string | undefined,
         ): Promise<string>
-        updateMaskAccount(options: { account?: string | undefined }): Promise<void>
         resolveMaskAccount(accounts: MaskAccount[]): Promise<void>
         verifyPassword(unverifiedPassword: string): Promise<boolean>
     }

packages/dashboard/src/pages/CreateMaskWallet/components/CreateMnemonic/index.tsx

@@ -108,23 +108,23 @@ const CreateMnemonic = memo(() => {
             await PluginServices.Wallet.setPassword(password)
         }
 
-        const address_ = await PluginServices.Wallet.recoverWalletFromMnemonic(
+        const address = await PluginServices.Wallet.recoverWalletFromMnemonic(
             name,
             words.join(' '),
             `${HD_PATH_WITHOUT_INDEX_ETHEREUM}/0`,
         )
 
         await connection?.connect({
-            account: address_,
+            account: address,
             chainId: ChainId.Mainnet,
         })
         await PluginServices.Wallet.resolveMaskAccount([
             {
-                address: address_,
+                address,
             },
         ])
 
-        return address_
+        return address
     }, [location.search, words, resetCallback, hasPassword, searchParams, connection])
 
     const onClose = useCallback(() => {

packages/dashboard/src/pages/Personas/hooks/useOperateBindingProof.ts

@@ -17,7 +17,8 @@ export function useDeleteBound() {
                 platform as NextIDPlatform,
             )
             if (!payload) throw new Error('Failed to create persona payload.')
-            const signResult = await Services.Identity.generatePersonalSignResult(
+            const signResult = await Services.Identity.generateSignResult(
+                'message',
                 persona_.identifier,
                 payload.signPayload,
             )

packages/mask/background/services/identity/persona/sign.ts

@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid'
-import { keccakFromString, ecsign, bufferToHex, toRpcSig, privateToPublic, publicToAddress } from 'ethereumjs-util'
-import { encodeText, timeout } from '@masknet/kit'
+import { bufferToHex, privateToPublic, publicToAddress } from 'ethereumjs-util'
+import { timeout } from '@masknet/kit'
 import { personalSign } from '@metamask/eth-sig-util'
 import type { Transaction } from '@masknet/web3-shared-evm'
 import { Web3 } from '@masknet/web3-providers'
@@ -40,16 +40,7 @@ export async function signWithPersona<T>({
         'Timeout',
     )
 
-    switch (method) {
-        case 'eth':
-            return generateEthSignResult(signer, message as string)
-        case 'personal':
-            return generatePersonalSignResult(signer, message as string)
-        case 'transaction':
-            return generateTransactionSignResult(signer, message as Transaction)
-        default:
-            throw new Error(`Unknown sign method: ${method}.`)
-    }
+    return generateSignResult<T>(method, signer, message)
 }
 
 export async function generateSignResult<T>(
@@ -58,10 +49,8 @@ export async function generateSignResult<T>(
     message: T,
 ): Promise<PersonaSignResult> {
     switch (method) {
-        case 'eth':
-            return generateEthSignResult(signer, message as string)
-        case 'personal':
-            return generatePersonalSignResult(signer, message as string)
+        case 'message':
+            return generateMessageSignResult(signer, message as string)
         case 'transaction':
             return generateTransactionSignResult(signer, message as Transaction)
         default:
@@ -70,12 +59,12 @@ export async function generateSignResult<T>(
 }
 
 /**
- * Sign a raw message (eth sign)
+ * Sign a message in EVM way
  * @param signer
  * @param message
  * @returns
  */
-export async function generateEthSignResult(signer: ECKeyIdentifier, message: string) {
+export async function generateMessageSignResult(signer: ECKeyIdentifier, message: string) {
     const persona = (await queryPersonasWithPrivateKey()).find((x) => x.identifier === signer)
     if (!persona) throw new Error('Persona not found')
     const privateKey = Buffer.from(fromBase64URL(persona.privateKey.d!))
@@ -89,28 +78,6 @@ export async function generateEthSignResult(signer: ECKeyIdentifier, message: st
     }
 }
 
-/**
- * Sign as an EVM message (personal sign)
- * @param signer
- * @param message
- * @returns
- */
-export async function generatePersonalSignResult(signer: ECKeyIdentifier, message: string) {
-    const persona = (await queryPersonasWithPrivateKey()).find((x) => x.identifier === signer)
-    if (!persona) throw new Error('Persona not found')
-
-    const length = encodeText(message).length
-    const messageHash = keccakFromString(`\x19Ethereum Signed Message:\n${length}${message}`, 256)
-    const privateKey = Buffer.from(fromBase64URL(persona.privateKey.d!))
-    const signature = ecsign(messageHash, privateKey)
-
-    return {
-        persona: persona.identifier,
-        signature: toRpcSig(signature.v, signature.r, signature.s),
-        address: bufferToHex(publicToAddress(privateToPublic(privateKey))),
-    }
-}
-
 /**
  * Sign an EVM transaction
  * @param signer

packages/mask/src/components/DataSource/useNextIDVerify.ts

@@ -25,7 +25,8 @@ export function useNextIDVerify() {
                 languageSettings.value ?? 'default',
             )
             if (!payload) throw new Error('Failed to create persona payload.')
-            const signResult = await Services.Identity.generatePersonalSignResult(
+            const signResult = await Services.Identity.generateSignResult(
+                'message',
                 persona.identifier,
                 payload.signPayload,
             )

packages/mask/src/extension/mask-sdk/bridge/index.ts

@@ -5,7 +5,7 @@ import { SNSMethods } from './sns_context.js'
 export const maskSDKServer: BridgeAPI = {
     async persona_sign_web3(message) {
         const result = await Services.Identity.signWithPersona({
-            method: 'personal',
+            method: 'message',
             message: String(message),
         })
         return result.signature

packages/mask/src/extension/popups/pages/Personas/AccountDetail/index.tsx

@@ -58,7 +58,8 @@ const AccountDetail = memo(() => {
 
             if (!result) return
 
-            const signature = await Service.Identity.generatePersonalSignResult(
+            const signature = await Service.Identity.generateSignResult(
+                'message',
                 currentPersona.identifier,
                 result.signPayload,
             )

packages/mask/src/extension/popups/pages/Personas/ConnectedWallets/index.tsx

@@ -87,7 +87,8 @@ const ConnectedWallets = memo(() => {
 
                 if (!result) return
 
-                const signature = await Service.Identity.generatePersonalSignResult(
+                const signature = await Service.Identity.generateSignResult(
+                    'message',
                     currentPersona.identifier,
                     result.signPayload,
                 )

packages/mask/src/extension/popups/pages/Personas/PersonaSignRequest/index.tsx

@@ -1,4 +1,5 @@
 import { memo, useEffect, useState } from 'react'
+import { useAsyncFn } from 'react-use'
 import { makeStyles } from '@masknet/theme'
 import { Button, Typography } from '@mui/material'
 import { MaskMessages, useI18N } from '../../../../../utils/index.js'
@@ -7,7 +8,6 @@ import { PersonaInformation, PopupRoutes } from '@masknet/shared-base'
 import { usePersonasFromDB } from '../../../../../components/DataSource/usePersonasFromDB.js'
 import { PersonaContext } from '../hooks/usePersonaContext.js'
 import { MethodAfterPersonaSign } from '../../Wallet/type.js'
-import { useAsyncFn } from 'react-use'
 import Services from '../../../../service.js'
 import { useTitle } from '../../../hook/useTitle.js'
 
@@ -120,7 +120,7 @@ const PersonaSignRequest = memo(() => {
         switch (method) {
             case MethodAfterPersonaSign.DISCONNECT_NEXT_ID:
                 if (!message) break
-                const signatureResult = await Services.Identity.generatePersonalSignResult(selectedPersona, message)
+                const signatureResult = await Services.Identity.generateSignResult('message', selectedPersona, message)
 
                 const profileIdentifier = url.get('profileIdentifier')
                 const platform = url.get('platform')

packages/mask/src/extension/popups/pages/Personas/VerifyWallet/index.tsx

@@ -88,7 +88,8 @@ const VerifyWallet = memo(() => {
     const [{ value: signature }, personaSilentSign] = useAsyncFn(async () => {
         if (!payload || !currentPersona?.identifier) return
         try {
-            const signResult = await Services.Identity.generatePersonalSignResult(
+            const signResult = await Services.Identity.generateSignResult(
+                'message',
                 currentPersona.identifier,
                 payload.signPayload,
             )

packages/mask/src/extension/popups/pages/Wallet/AddDeriveWallet/index.tsx

@@ -113,7 +113,7 @@ const AddDeriveWallet = memo(() => {
                 `${HD_PATH_WITHOUT_INDEX_ETHEREUM}/${firstPath}`,
             )
 
-            const wallets = await Promise.all(
+            await Promise.all(
                 unDeriveWallets
                     .slice(1)
                     .map(async (pathIndex) =>
@@ -126,7 +126,7 @@ const AddDeriveWallet = memo(() => {
             )
 
             if (!currentMaskWalletAccountSettings.value) {
-                connection?.connect({ account: firstWallet })
+                await connection?.connect({ account: firstWallet })
             }
         }
         navigate(PopupRoutes.Wallet, { replace: true })

packages/mask/src/extension/popups/pages/Wallet/ConnectWallet/index.tsx

@@ -79,7 +79,7 @@ const ConnectWalletPage = memo(() => {
         ) => {
             if (provider.type === ProviderType.MaskWallet) {
                 const connection = Connection?.getConnection?.()
-                if (connection) connection.disconnect()
+                if (connection) await connection.disconnect()
                 if (isLocked && !getLockStatusLoading) {
                     navigate(urlcat(PopupRoutes.Unlock, { from: PopupRoutes.SelectWallet, goBack: true, popup: true }))
                     return

packages/mask/src/extension/popups/pages/Wallet/DeleteWallet/index.tsx

@@ -111,7 +111,7 @@ const DeleteWallet = memo(() => {
             try {
                 await Wallet?.removeWallet?.(wallet.address, password)
 
-                connection?.connect({
+                await connection?.connect({
                     account: first(Wallet?.wallets?.getCurrentValue())?.address ?? '',
                 })
 

packages/mask/src/extension/popups/pages/Wallet/SelectWallet/index.tsx

@@ -132,7 +132,7 @@ const SelectWallet = memo(() => {
         }
 
         const wallet = wallets.find((x) => isSameAddress(x.address, selected))
-        connection?.connect({
+        await connection?.connect({
             // TODO: Just for test, will remove this logic
             chainId: wallet?.owner ? ChainId.Mumbai : chainId,
             account: selected,

packages/mask/src/extension/popups/pages/Wallet/WalletRecovery/index.tsx

@@ -131,7 +131,7 @@ const WalletRecovery = memo(() => {
 
                 // Set default wallet
                 if (wallet) {
-                    connection?.connect({
+                    await connection?.connect({
                         account: wallet.address,
                         chainId: ChainId.Mainnet,
                     })

packages/mask/src/plugins/NextID/hooks/usePersonaSign.ts

@@ -7,7 +7,7 @@ export function usePersonaSign(message?: string, currentIdentifier?: ECKeyIdenti
         if (!message || !currentIdentifier) return
         try {
             return await Services.Identity.signWithPersona({
-                method: 'eth',
+                method: 'message',
                 message,
                 identifier: currentIdentifier,
             })

packages/mask/src/plugins/Tips/components/TokenSection/useGasLimit.ts

@@ -27,6 +27,7 @@ export function useGasLimit(fallback = 50000) {
             account,
         })
         if (!connection || !token?.address) return fallback
+
         const web3 = connection.getWeb3({
             chainId,
             account,

packages/mask/src/plugins/Trader/SNSAdaptor/trending/TagInspector.tsx

@@ -3,12 +3,38 @@ import { Web3ContextProvider } from '@masknet/web3-hooks-base'
 import { NetworkPluginID } from '@masknet/shared-base'
 import { ChainId } from '@masknet/web3-shared-evm'
 import type { Web3Helper } from '@masknet/web3-helpers'
+import { useValueRef } from '@masknet/shared-base-ui'
 import { TrendingPopper } from './TrendingPopper.js'
 import { TrendingView } from './TrendingView.js'
 import { decentralizedSearchSettings } from '../../../../../shared/legacy-settings/settings.js'
-import { useValueRef } from '@masknet/shared-base-ui'
 import { TrendingViewProvider } from './context.js'
 
+interface TrendingViewWrapperProps {
+    resultList: Web3Helper.TokenResultAll[]
+    address?: string
+    isNFTProjectPopper?: boolean
+    reposition?: () => void
+}
+
+function TrendingViewWrapper({ resultList, reposition, address, isNFTProjectPopper }: TrendingViewWrapperProps) {
+    const [result, setResult] = useState(resultList[0])
+    return (
+        <TrendingViewProvider
+            isNFTProjectPopper={Boolean(isNFTProjectPopper)}
+            isProfilePage={false}
+            isTokenTagPopper={!isNFTProjectPopper}
+            isPreciseSearch={false}>
+            <TrendingView
+                setResult={setResult}
+                result={result}
+                resultList={resultList}
+                onUpdate={reposition}
+                address={address}
+            />
+        </TrendingViewProvider>
+    )
+}
+
 export interface TagInspectorProps {}
 
 export function TagInspector(props: TagInspectorProps) {
@@ -30,23 +56,3 @@ export function TagInspector(props: TagInspectorProps) {
         </Web3ContextProvider>
     )
 }
-
-interface TrendingViewWrapperProps {
-    resultList: Web3Helper.TokenResultAll[]
-    address?: string
-    isNFTProjectPopper?: boolean
-}
-
-function TrendingViewWrapper({ resultList, address, isNFTProjectPopper }: TrendingViewWrapperProps) {
-    const [result, setResult] = useState<Web3Helper.TokenResultAll>()
-    const current = result ?? resultList[0]
-    return (
-        <TrendingViewProvider
-            isNFTProjectPopper={Boolean(isNFTProjectPopper)}
-            isProfilePage={false}
-            isTokenTagPopper={!isNFTProjectPopper}
-            isPreciseSearch={false}>
-            <TrendingView setResult={setResult} result={current} resultList={resultList} address={address} />
-        </TrendingViewProvider>
-    )
-}

packages/mask/src/plugins/Wallet/services/account.ts

@@ -1,35 +1,5 @@
-import { first } from 'lodash-es'
 import { defer, DeferTuple } from '@masknet/kit'
 import type { ECKeyIdentifier, EnhanceableSite, ExtensionSite } from '@masknet/shared-base'
-import { ChainId, isValidAddress } from '@masknet/web3-shared-evm'
-import {
-    currentMaskWalletAccountSettings,
-    currentMaskWalletChainIdSettings,
-} from '../../../../shared/legacy-settings/wallet-settings.js'
-import { WalletRPC } from '../messages.js'
-
-export async function setDefaultMaskAccount() {
-    if (currentMaskWalletAccountSettings.value) return
-    const wallets = await WalletRPC.getWallets()
-    const address = first(wallets)?.address
-    if (!address) return
-    await updateMaskAccount({
-        account: address,
-    })
-}
-
-export async function updateMaskAccount(options: { account?: string; chainId?: ChainId }) {
-    const { account, chainId } = options
-    if (chainId) currentMaskWalletChainIdSettings.value = chainId
-    if (isValidAddress(account)) {
-        currentMaskWalletAccountSettings.value = account
-        await resolveMaskAccount([
-            {
-                address: account,
-            },
-        ])
-    }
-}
 
 const recordSites = new Map<EnhanceableSite | ExtensionSite, boolean>()