fix: sign stuff with web3-eth-accounts (#10394)

* fix: sign stuff with web3-eth-accounts

* fix: markdownlint

---------

Co-authored-by: guanbinrui <guanbinrui@users.noreply.github.com>

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

@@ -2,11 +2,11 @@ import { useCallback, useMemo } from 'react'
 import { Card, Typography, Box } from '@mui/material'
 import { Stack } from '@mui/system'
 import { LoadingBase, makeStyles, parseColor } from '@masknet/theme'
-import { ChainId } from '@masknet/web3-shared-evm'
+import { ChainId, signMessage } from '@masknet/web3-shared-evm'
 import { RedPacketStatus, type RedPacketJSONPayload } from '@masknet/web3-providers/types'
 import { formatBalance, isZero, TokenType } from '@masknet/web3-shared-base'
 import { NetworkPluginID, isFacebook, isTwitter } from '@masknet/shared-base'
-import { ChainResolver, NetworkResolver, Web3 } from '@masknet/web3-providers'
+import { ChainResolver, NetworkResolver } from '@masknet/web3-providers'
 import { useChainContext, useNetworkContext } from '@masknet/web3-hooks-base'
 import { TransactionConfirmModal } from '@masknet/shared'
 import { usePostLink, useSiteAdaptorContext } from '@masknet/plugin-infra/content-script'
@@ -158,9 +158,7 @@ export function RedPacket(props: RedPacketProps) {
         payload.contract_version,
         account,
         payload.rpid,
-        payload.contract_version > 3
-            ? Web3.getWeb3().eth.accounts.sign(account, payload.password).signature
-            : payload.password,
+        payload.contract_version > 3 ? signMessage(account, payload.password).signature : payload.password,
         payloadChainId,
     )
 

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

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo } from 'react'
 import { makeStyles, ActionButton, LoadingBase, parseColor, ShadowRootTooltip, useDetectOverflow } from '@masknet/theme'
-import type { ChainId } from '@masknet/web3-shared-evm'
+import { signMessage, type ChainId } from '@masknet/web3-shared-evm'
 import { type RedPacketNftJSONPayload } from '@masknet/web3-providers/types'
 import { Card, Typography, Button, Box } from '@mui/material'
 import {
@@ -11,7 +11,7 @@ import {
     TransactionConfirmModal,
 } from '@masknet/shared'
 import { useChainContext, useNetworkContext, useNonFungibleAsset } from '@masknet/web3-hooks-base'
-import { NetworkResolver, Web3 } from '@masknet/web3-providers'
+import { NetworkResolver } from '@masknet/web3-providers'
 import { TokenType } from '@masknet/web3-shared-base'
 import { usePostLink, useSiteAdaptorContext } from '@masknet/plugin-infra/content-script'
 import { NetworkPluginID, CrossIsolationMessages, isTwitter, isFacebook } from '@masknet/shared-base'
@@ -203,7 +203,7 @@ export function RedPacketNft({ payload }: RedPacketNftProps) {
     const [{ loading: isClaiming }, claimCallback] = useClaimNftRedpacketCallback(
         payload.id,
         availability?.totalAmount,
-        Web3.getWeb3().eth.accounts.sign(account, payload.privateKey).signature ?? '',
+        signMessage(account, payload.privateKey).signature ?? '',
     )
     const [showTooltip, textRef] = useDetectOverflow()
 

packages/web3-providers/src/Web3/EVM/apis/ConnectionReadonlyAPI.ts

@@ -26,6 +26,7 @@ import {
     isCryptoPunksContractAddress,
     getEthereumConstant,
     getTokenConstant,
+    createAccount,
 } from '@masknet/web3-shared-evm'
 import {
     type FungibleToken,
@@ -445,7 +446,7 @@ export class ConnectionReadonlyAPI
 
     createAccount(initial?: ConnectionOptions_Base<ChainId, ProviderType, Transaction> | undefined): Account<ChainId> {
         const options = this.ConnectionOptions.fill(initial)
-        const account = this.getWeb3().eth.accounts.create()
+        const account = createAccount()
         return {
             account: account.address,
             chainId: options.chainId,

packages/web3-providers/src/Web3/EVM/apis/SignerAPI.ts

@@ -1,12 +1,9 @@
 import * as _metamask_eth_sig_util from /* webpackDefer: true */ '@metamask/eth-sig-util'
-import type { Transaction } from '@masknet/web3-shared-evm'
+import { signTransaction, type Transaction } from '@masknet/web3-shared-evm'
 import { SignType, toHex } from '@masknet/shared-base'
-import { ConnectionReadonlyAPI } from './ConnectionReadonlyAPI.js'
 import type { SignerAPI_Base } from '../../../entry-types.js'
 
 export class SignerAPI implements SignerAPI_Base.Provider {
-    private Web3 = new ConnectionReadonlyAPI()
-
     async sign<T>(type: SignType, key: Buffer, message: T): Promise<string> {
         switch (type) {
             case SignType.Message:
@@ -26,12 +23,10 @@ export class SignerAPI implements SignerAPI_Base.Provider {
                 const chainId = transaction.chainId
                 if (!chainId) throw new Error('Invalid chain id.')
 
-                const { rawTransaction } = await this.Web3.getWeb3({
-                    chainId,
-                }).eth.accounts.signTransaction(transaction, toHex(key))
+                const { rawTransaction } = await signTransaction(transaction, toHex(key))
                 if (!rawTransaction) throw new Error('Failed to sign transaction.')
-
                 return rawTransaction
+
             default:
                 throw new Error(`Unknown sign type: ${type}.`)
         }

packages/web3-shared/evm/package.json

@@ -36,6 +36,7 @@
     "web3-core": "1.8.0",
     "web3-core-helpers": "1.8.0",
     "web3-eth-abi": "1.8.0",
+    "web3-eth-accounts": "1.8.0",
     "web3-eth-contract": "1.8.0",
     "web3-utils": "1.8.0"
   },

packages/web3-shared/evm/src/helpers/createAccount.ts

@@ -0,0 +1,6 @@
+import Accounts from 'web3-eth-accounts'
+
+export function createAccount() {
+    const accounts = new (Accounts as unknown as new () => Accounts.Accounts)()
+    return accounts.create()
+}

packages/web3-shared/evm/src/helpers/signMessage.ts

@@ -0,0 +1,6 @@
+import Accounts from 'web3-eth-accounts'
+
+export function signMessage(message: string, privateKey: string) {
+    const accounts = new (Accounts as unknown as new () => Accounts.Accounts)()
+    return accounts.sign(message, privateKey)
+}

packages/web3-shared/evm/src/helpers/signTransaction.ts

@@ -0,0 +1,8 @@
+import { toHex } from 'web3-utils'
+import Accounts from 'web3-eth-accounts'
+import type { Transaction } from '../types/index.js'
+
+export function signTransaction(transaction: Transaction, privateKey: string) {
+    const accounts = new (Accounts as unknown as new () => Accounts.Accounts)()
+    return accounts.signTransaction(transaction, toHex(privateKey))
+}

packages/web3-shared/evm/src/index.ts

@@ -32,6 +32,9 @@ export * from './helpers/token.js'
 export * from './helpers/isRiskyMethodType.js'
 export * from './helpers/isReadonlyMethodType.js'
 export * from './helpers/isMaskOnlyMethodType.js'
+export * from './helpers/createAccount.js'
+export * from './helpers/signTransaction.js'
+export * from './helpers/signMessage.js'
 
 export * from './libs/index.js'
 export * from './types/index.js'