refactor: remove smartpay provider (#12280)

* refactor: remove smartpay provider

* fix: linter

* chore: remove type

* fix: linter

* fix: bugfix

* chore: type check

* fix: eslint

* fix: linter

---------

Co-authored-by: nuanyang233 <nuanyang233@users.noreply.github.com>
Co-authored-by: Jack-Works <Jack-Works@users.noreply.github.com>

Author: nuanyang233

packages/icons/general/SmartPay.svg

@@ -1,8 +1,7 @@
 import { getBackupSummary, normalizeBackup, type BackupSummary } from '@masknet/backup-format'
 import { restoreNormalizedBackup } from './internal_restore.js'
 import { Result } from 'ts-results-es'
-import { SmartPayBundler, SmartPayOwner } from '@masknet/web3-providers'
-import { compact, sum } from 'lodash-es'
+import { sum } from 'lodash-es'
 import { bytesToHex, privateToPublic, publicToAddress } from '@ethereumjs/util'
 import { fromBase64URL } from '@masknet/shared-base'
 
@@ -23,11 +22,9 @@ export async function generateBackupSummary(raw: string) {
 
         const wallets = backup.wallets.map((x) => x.address)
 
-        const chainId = await SmartPayBundler.getSupportedChainId()
-        const accounts = await SmartPayOwner.getAccountsByOwners(chainId, [...compact(personas), ...wallets])
         return {
             ...getBackupSummary(backup),
-            countOfWallets: sum([accounts.filter((x) => x.deployed).length, wallets.length]),
+            countOfWallets: sum([wallets.length]),
         }
     })
 }

packages/icons/icon-generated-as-jsx.js

@@ -3,10 +3,7 @@ import type { EIP2255Permission } from '@masknet/sdk'
 import type { LegacyWalletRecord } from '@masknet/shared-base'
 
 export interface RequestPayload extends JsonRpcPayload {
-    owner?: string
     identifier?: string
-    paymentToken?: string
-    allowMaskAsGas?: boolean
 }
 interface UnconfirmedRequestChunkRecord {
     /** A chunk of unconfirmed rpc requests */

packages/icons/icon-generated-as-url.js

@@ -1,12 +1,11 @@
 import type { JsonRpcPayload } from 'web3-core-helpers'
 import { ECKeyIdentifier, type SignType } from '@masknet/shared-base'
-import { EVMRequestReadonly, SmartPayAccount, EVMWeb3Readonly } from '@masknet/web3-providers'
+import { EVMRequestReadonly, EVMWeb3Readonly } from '@masknet/web3-providers'
 import {
     ChainId,
     createJsonRpcResponse,
     ErrorEditor,
     EthereumMethodType,
-    isValidAddress,
     PayloadEditor,
     type TransactionOptions,
     Signer,
@@ -18,7 +17,7 @@ import { signWithPersona } from '../../identity/persona/sign.js'
  * The entrance of all RPC requests to MaskWallet.
  */
 export async function send(payload: JsonRpcPayload, options?: TransactionOptions) {
-    const { owner, paymentToken, providerURL } = options ?? {}
+    const { owner, providerURL } = options ?? {}
     const {
         pid = 0,
         from,
@@ -40,22 +39,13 @@ export async function send(payload: JsonRpcPayload, options?: TransactionOptions
             if (!signableConfig) throw new Error('No transaction to be sent.')
 
             try {
-                if (owner && paymentToken) {
-                    return createJsonRpcResponse(
-                        pid,
-                        await SmartPayAccount.sendTransaction(chainId, owner, signableConfig, signer, {
-                            paymentToken,
-                        }),
-                    )
-                } else {
-                    return createJsonRpcResponse(
-                        pid,
-                        await EVMWeb3Readonly.sendSignedTransaction(await signer.signTransaction(signableConfig), {
-                            chainId,
-                            providerURL,
-                        }),
-                    )
-                }
+                return createJsonRpcResponse(
+                    pid,
+                    await EVMWeb3Readonly.sendSignedTransaction(await signer.signTransaction(signableConfig), {
+                        chainId,
+                        providerURL,
+                    }),
+                )
             } catch (error) {
                 throw ErrorEditor.from(error, null, 'Failed to send transaction.').error
             }
@@ -81,14 +71,6 @@ export async function send(payload: JsonRpcPayload, options?: TransactionOptions
             } catch (error) {
                 throw ErrorEditor.from(error, null, 'Failed to sign transaction.').error
             }
-        case EthereumMethodType.MASK_DEPLOY:
-            try {
-                const [owner] = payload.params as [string]
-                if (!isValidAddress(owner)) throw new Error('Invalid sender address.')
-                return createJsonRpcResponse(pid, await SmartPayAccount.deploy(chainId, owner, signer))
-            } catch (error) {
-                throw ErrorEditor.from(error, null, 'Failed to deploy.').error
-            }
         default:
             try {
                 const result = await EVMRequestReadonly.request(

packages/mask/background/services/backup/restore.ts

@@ -4,13 +4,12 @@ import { useAsync, useAsyncFn } from 'react-use'
 import urlcat from 'urlcat'
 import { toBlob } from 'html-to-image'
 import { Icons } from '@masknet/icons'
-import { timeout } from '@masknet/kit'
 import { CopyButton } from '@masknet/shared'
 import { DashboardRoutes } from '@masknet/shared-base'
 import { makeStyles } from '@masknet/theme'
 import { useWallets } from '@masknet/web3-hooks-base'
-import { MaskWalletProvider, EVMWeb3 } from '@masknet/web3-providers'
-import { generateNewWalletName, isSameAddress } from '@masknet/web3-shared-base'
+import { EVMWeb3 } from '@masknet/web3-providers'
+import { generateNewWalletName } from '@masknet/web3-shared-base'
 import { ProviderType } from '@masknet/web3-shared-evm'
 import { Telemetry } from '@masknet/web3-telemetry'
 import { EventID, EventType } from '@masknet/web3-telemetry/types'
@@ -166,17 +165,6 @@ const useStyles = makeStyles()((theme) => ({
     },
 }))
 
-async function pollResult(address: string) {
-    const subscription = MaskWalletProvider.subscription.wallets
-    if (subscription.getCurrentValue().find((x) => isSameAddress(x.address, address))) return
-    const { promise, resolve } = Promise.withResolvers()
-    const unsubscribe = subscription.subscribe(() => {
-        if (!subscription.getCurrentValue().find((x) => isSameAddress(x.address, address))) return
-        resolve(true)
-    })
-    return timeout(promise, 10_000, 'It takes too long to create a wallet. You might try again.').finally(unsubscribe)
-}
-
 export const Component = memo(function CreateMnemonic() {
     const location = useLocation()
     const navigate = useNavigate()
@@ -216,7 +204,6 @@ export const Component = memo(function CreateMnemonic() {
         const result = await handlePasswordAndWallets(location.state?.password, location.state?.isReset)
         if (!result) return
         const address = await Services.Wallet.createWalletFromMnemonicWords(walletName, words.join(' '))
-        await pollResult(address)
         await EVMWeb3.connect({
             silent: true,
             providerType: ProviderType.MaskWallet,

packages/mask/background/services/wallet/database/types.ts

@@ -1,13 +1,12 @@
 import { useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { useCustomSnackbar } from '@masknet/theme'
-import { DashboardRoutes, EMPTY_LIST, type ECKeyIdentifier, type EC_Public_JsonWebKey } from '@masknet/shared-base'
+import { DashboardRoutes, type ECKeyIdentifier, type EC_Public_JsonWebKey } from '@masknet/shared-base'
 import Services from '#services'
 import { PersonaNameUI } from './PersonaNameUI.js'
 import { useCreatePersonaByPrivateKey, useCreatePersonaV2 } from '../../../hooks/useCreatePersonaV2.js'
 import { delay } from '@masknet/kit'
 import { useAsync, useAsyncFn } from 'react-use'
-import { SmartPayBundler, SmartPayOwner } from '@masknet/web3-providers'
 import urlcat from 'urlcat'
 import { Trans } from '@lingui/react/macro'
 
@@ -53,10 +52,6 @@ export function Component() {
                     return
                 }
 
-                const chainId = await SmartPayBundler.getSupportedChainId()
-                const accounts =
-                    result?.address ? await SmartPayOwner.getAccountsByOwner(chainId, result.address) : EMPTY_LIST
-
                 let identifier: ECKeyIdentifier
                 if (state.mnemonic) {
                     identifier = await createPersona(state.mnemonic.join(' '), personaName)
@@ -73,7 +68,7 @@ export function Component() {
                 await delay(300)
                 navigate(
                     urlcat(DashboardRoutes.SignUpPersonaOnboarding, {
-                        count: accounts.filter((x) => x.deployed).length,
+                        count: 0,
                     }),
                     { replace: true },
                 )

packages/mask/background/services/wallet/services/send.ts

@@ -4,21 +4,20 @@ import { BigNumber } from 'bignumber.js'
 import { Box } from '@mui/system'
 import { Button, Typography, useTheme } from '@mui/material'
 import { Icons } from '@masknet/icons'
-import { FormattedBalance, FormattedCurrency, useGasCurrencyMenu } from '@masknet/shared'
+import { FormattedBalance, FormattedCurrency } from '@masknet/shared'
 import { NetworkPluginID } from '@masknet/shared-base'
 import {
     useChainContext,
     useChainIdSupport,
-    useFungibleToken,
-    useFungibleTokenPrice,
     useGasLimitRange,
     useGasOptions,
+    useNativeToken,
     useNativeTokenAddress,
+    useNativeTokenPrice,
 } from '@masknet/web3-hooks-base'
 import { GasOptionType, ZERO, formatBalance, formatCurrency, scale10, toFixed } from '@masknet/web3-shared-base'
 import { type GasConfig, type ChainId, formatWeiToEther } from '@masknet/web3-shared-evm'
 import { useGasOptionsMenu } from '../../hooks/index.js'
-import { useGasRatio } from '../../hooks/useGasRatio.js'
 import { Trans } from '@lingui/react/macro'
 
 interface GasSettingMenuProps {
@@ -27,28 +26,19 @@ interface GasSettingMenuProps {
     defaultChainId?: ChainId
     disable?: boolean
     onChange?: (config: GasConfig) => void
-    onPaymentTokenChange?: (paymentToken: string) => void
-    /** Payment token address */
-    paymentToken?: string
-    owner?: string
-    allowMaskAsGas?: boolean
 }
 
 export const GasSettingMenu = memo<GasSettingMenuProps>(function GasSettingMenu({
     defaultGasLimit,
     defaultChainId,
     defaultGasConfig,
-    paymentToken,
     disable,
-    allowMaskAsGas,
-    owner,
     onChange,
-    onPaymentTokenChange,
 }) {
     const theme = useTheme()
 
     const { chainId } = useChainContext<NetworkPluginID.PLUGIN_EVM>({ chainId: defaultChainId })
-    const gasRatio = useGasRatio(paymentToken)
+
     const [gasConfig = defaultGasConfig, setGasConfig] = useState<GasConfig | undefined>()
     const [, chainDefaultGasLimit] = useGasLimitRange(NetworkPluginID.PLUGIN_EVM, { chainId })
     const gasLimit = gasConfig?.gas || defaultGasLimit || chainDefaultGasLimit
@@ -66,13 +56,7 @@ export const GasSettingMenu = memo<GasSettingMenuProps>(function GasSettingMenu(
         [onChange],
     )
 
-    const [menu, openMenu] = useGasOptionsMenu(gasLimit, !disable ? handleChange : noop, paymentToken)
-
-    const [paymentTokenMenu, openPaymentTokenMenu] = useGasCurrencyMenu(
-        NetworkPluginID.PLUGIN_EVM,
-        onPaymentTokenChange ?? noop,
-        paymentToken,
-    )
+    const [menu, openMenu] = useGasOptionsMenu(gasLimit, !disable ? handleChange : noop)
 
     const { data: gasOptions } = useGasOptions(NetworkPluginID.PLUGIN_EVM, { chainId })
 
@@ -102,17 +86,9 @@ export const GasSettingMenu = memo<GasSettingMenuProps>(function GasSettingMenu(
 
     const nativeTokenAddress = useNativeTokenAddress(NetworkPluginID.PLUGIN_EVM, { chainId })
 
-    const { data: token } = useFungibleToken(
-        NetworkPluginID.PLUGIN_EVM,
-        paymentToken ? paymentToken : nativeTokenAddress,
-        undefined,
-        { chainId },
-    )
+    const { data: token } = useNativeToken(NetworkPluginID.PLUGIN_EVM, { chainId })
 
-    const { data: tokenPrice } = useFungibleTokenPrice(
-        NetworkPluginID.PLUGIN_EVM,
-        paymentToken ? paymentToken : nativeTokenAddress,
-    )
+    const { data: tokenPrice } = useNativeTokenPrice(NetworkPluginID.PLUGIN_EVM, { chainId })
 
     const gasOptionName = (() => {
         switch (gasOptionType) {
@@ -132,9 +108,8 @@ export const GasSettingMenu = memo<GasSettingMenuProps>(function GasSettingMenu(
         const maxGasPrice = 'maxFeePerGas' in gasConfig ? gasConfig.maxFeePerGas : gasConfig.gasPrice
         if (!maxGasPrice) return ZERO
         const maxPriceUsed = new BigNumber(maxGasPrice).times(gasLimit)
-        if (!gasRatio) return toFixed(maxPriceUsed, 0)
-        return toFixed(maxPriceUsed.multipliedBy(gasRatio), 0)
-    }, [gasConfig, gasLimit, gasRatio])
+        return toFixed(maxPriceUsed, 0)
+    }, [gasConfig, gasLimit])
 
     return (
         <Box display="flex" alignItems="center">
@@ -178,12 +153,6 @@ export const GasSettingMenu = memo<GasSettingMenuProps>(function GasSettingMenu(
                     <Icons.Candle size={12} />
                 </Button>
             :   null}
-            {owner && allowMaskAsGas ?
-                <>
-                    <Icons.ArrowDrop size={20} sx={{ ml: 0.5, cursor: 'pointer' }} onClick={openPaymentTokenMenu} />
-                    {paymentTokenMenu}
-                </>
-            :   null}
             {menu}
         </Box>
     )

packages/mask/dashboard/pages/CreateMaskWallet/CreateMnemonic/index.tsx

@@ -82,7 +82,7 @@ export const CollectionList = memo<CollectionListProps>(function CollectionList(
             {tokens.length ?
                 tokens.map((x, index) => {
                     const isSelected = isSameNFT(pluginID, x, selected)
-                    const disabled = (selected && !isSelected) || wallet?.owner
+                    const disabled = selected && !isSelected
                     return (
                         <CollectibleCard
                             className={cx(classes.item, disabled ? classes.disabled : undefined)}