fix: test

Author: devchenyan

packages/neuron-ui/src/components/Receive/index.tsx

@@ -15,12 +15,14 @@ import { useCopyAndDownloadQrCode, useSwitchAddress } from './hooks'
 
 type AddressTransformWithCopyZoneProps = {
   showAddress: string
+  assetAccountId?: string
   isInShortFormat: boolean
   onClick: () => void
 }
 
 export const AddressQrCodeWithCopyZone = ({
   showAddress,
+  assetAccountId,
   isInShortFormat,
   onClick,
 }: AddressTransformWithCopyZoneProps) => {
@@ -92,7 +94,13 @@ export const AddressQrCodeWithCopyZone = ({
         </div>
       </div>
 
-      {showViewPrivateKey && <ViewPrivateKey address={showAddress} onClose={() => setShowViewPrivateKey(false)} />}
+      {showViewPrivateKey && (
+        <ViewPrivateKey
+          address={showAddress}
+          assetAccountId={assetAccountId}
+          onClose={() => setShowViewPrivateKey(false)}
+        />
+      )}
     </div>
   )
 }

packages/neuron-ui/src/components/SUDTAccountList/index.tsx

@@ -123,6 +123,7 @@ const SUDTAccountList = () => {
           break
         }
         setReceiveData({
+          acccountId: account.accountId,
           address: account.address,
           accountName: account.accountName ?? DEFAULT_SUDT_FIELDS.accountName,
           tokenName: account.tokenName ?? DEFAULT_SUDT_FIELDS.tokenName,

packages/neuron-ui/src/components/SUDTReceiveDialog/index.tsx

@@ -13,6 +13,7 @@ const { DEFAULT_SUDT_FIELDS } = CONSTANTS
 
 export interface DataProps {
   address: string
+  acccountId: string
   accountName: string
   tokenName: string
   symbol: string
@@ -21,7 +22,7 @@ export interface DataProps {
 const SUDTReceiveDialog = ({ data, onClose }: { data: DataProps; onClose?: () => void }) => {
   const [t] = useTranslation()
   const [isInShortFormat, setIsInShortFormat] = useState(false)
-  const { address, accountName, tokenName, symbol } = data
+  const { address, acccountId, accountName, tokenName, symbol } = data
 
   const displayedAddr = isInShortFormat ? addressToAddress(address, { deprecated: true }) : address
 
@@ -52,6 +53,7 @@ const SUDTReceiveDialog = ({ data, onClose }: { data: DataProps; onClose?: () =>
 
         <AddressQrCodeWithCopyZone
           showAddress={displayedAddr}
+          assetAccountId={acccountId}
           isInShortFormat={isInShortFormat}
           onClick={() => setIsInShortFormat(is => !is)}
         />

packages/neuron-ui/src/components/ViewPrivateKey/index.tsx

@@ -9,7 +9,15 @@ import { Attention, Copy } from 'widgets/Icons/icon'
 import { getPrivateKeyByAddress } from 'services/remote'
 import styles from './viewPrivateKey.module.scss'
 
-const ViewPrivateKey = ({ onClose, address }: { onClose?: () => void; address?: string }) => {
+const ViewPrivateKey = ({
+  onClose,
+  address,
+  assetAccountId,
+}: {
+  onClose?: () => void
+  address?: string
+  assetAccountId?: string
+}) => {
   const [t] = useTranslation()
   const [password, setPassword] = useState('')
   const [error, setError] = useState('')
@@ -45,6 +53,7 @@ const ViewPrivateKey = ({ onClose, address }: { onClose?: () => void; address?:
       setIsLoading(true)
       getPrivateKeyByAddress({
         walletID,
+        assetAccountId,
         address,
         password,
       })

packages/neuron-ui/src/stories/SUDTReceiveDialog.stories.tsx

@@ -14,6 +14,7 @@ type Story = StoryObj<typeof SUDTReceiveDialog>
 export const Default: Story = {
   args: {
     data: {
+      acccountId: '1',
       address: 'ckt1q9gry5zg8stq8ruq5wfz3lm5wn2k7qw3ulsfmdhe98f2j1',
       accountName: 'account name',
       tokenName: 'token name',

packages/neuron-ui/src/types/Controller/index.d.ts

@@ -186,6 +186,7 @@ declare namespace Controller {
 
   interface GetPrivateKeyParams {
     walletID: string
+    assetAccountId?: string
     address?: string
     password: string
   }

packages/neuron-wallet/src/controllers/api.ts

@@ -440,9 +440,10 @@ export default class ApiController {
       return this.#walletsController.getAllAddresses(id)
     })
 
-    handle('get-private-key-by-address', async (_, { walletID, password, address }) => {
+    handle('get-private-key-by-address', async (_, { walletID, assetAccountId, password, address }) => {
       return this.#walletsController.getPrivateKeyByAddress({
         walletID,
+        assetAccountId,
         password,
         address,
       })

packages/neuron-wallet/src/controllers/wallets.ts

@@ -702,15 +702,18 @@ export default class WalletsController {
 
   public async getPrivateKeyByAddress({
     walletID,
+    assetAccountId,
     password,
     address,
   }: {
     walletID: string
+    assetAccountId?: string
     password: string
     address?: string
   }) {
     const privateKey = await AddressService.getPrivateKeyByAddress({
       walletID,
+      assetAccountId,
       password,
       address,
     })

packages/neuron-wallet/src/services/addresses.ts

@@ -452,21 +452,25 @@ export default class AddressService {
 
   public static async getPrivateKeyByAddress({
     walletID,
+    assetAccountId,
     password,
     address,
   }: {
     walletID: string
+    assetAccountId?: string
     password: string
     address?: string
   }): Promise<string> {
     const wallet = WalletService.getInstance().get(walletID)
-
     const addresses = await AddressService.getAddressesByWalletId(walletID)
     let addr = address ? addresses.find(addr => addr.address === address) : addresses[0]
 
-    if (!addr) {
-      const usedBlake160s = new Set(await AssetAccountService.blake160sOfAssetAccounts())
-      addr = addresses.find(a => !usedBlake160s.has(a.blake160))!
+    if (assetAccountId) {
+      const assetAccount = await AssetAccountService.getAccount({ walletID, id: Number(assetAccountId) })
+      if (!assetAccount) {
+        throw new AddressNotFound()
+      }
+      addr = addresses.find(a => a.blake160 === assetAccount.blake160)
     }
 
     if (!addr) {

packages/neuron-wallet/tests/services/address.test.ts

@@ -4,6 +4,7 @@ import OutputEntity from '../../src/database/chain/entities/output'
 import { bytes } from '@ckb-lumos/lumos/codec'
 import { hd } from '@ckb-lumos/lumos'
 import { Address } from '../../src/models/address'
+import AssetAccount from '../../src/models/asset-account'
 import Transaction from '../../src/database/chain/entities/transaction'
 import { TransactionStatus } from '../../src/models/chain/transaction'
 import { when } from 'jest-when'
@@ -12,8 +13,7 @@ import { closeConnection, getConnection, initConnection } from '../setupAndTeard
 import { NetworkType } from '../../src/models/network'
 import SignMessage from '../../src/services/sign-message'
 import WalletService from '../../src/services/wallets'
-
-jest.setTimeout(15000)
+import AssetAccountService from '../../src/services/asset-account-service'
 
 const { AddressType, AccountExtendedPublicKey } = hd
 
@@ -720,11 +720,13 @@ describe('integration tests for AddressService', () => {
       const message = 'Hello World'
       let address = 'ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwe5xyvcxv95l22x8c5ra8tkc0jgxhvrqsda3p3k'
 
-      beforeEach(() => {
+      let walletID = ''
+
+      beforeAll(() => {
+        jest.setTimeout(15000)
+
         walletService.clearAll()
-      })
 
-      it('return private key', async () => {
         const seed = hd.mnemonic.mnemonicToSeedSync(mnemonic)
         const masterKeychain = hd.Keychain.fromSeed(seed)
         const extendedKey = new hd.ExtendedPrivateKey(
@@ -746,9 +748,11 @@ describe('integration tests for AddressService', () => {
           extendedKey: accountExtendedPublicKey.serialize(),
           keystore,
         })
+        walletID = wallet.id
+      })
 
-        const addresses = await wallet.checkAndGenerateAddresses(false, 5, 5)
-
+      it('hdWallet address', async () => {
+        const addresses = await walletService.get(walletID).checkAndGenerateAddresses(false, 5, 5)
         if (addresses) {
           const crypto = require('crypto')
           const randomIndex = crypto.randomInt(addresses.length)
@@ -757,22 +761,58 @@ describe('integration tests for AddressService', () => {
         }
 
         const privateKey = await AddressService.getPrivateKeyByAddress({
-          walletID: wallet.id,
-          password: password,
+          walletID,
+          password,
           address,
         })
 
         // @ts-ignore: Private method
         const sig = SignMessage.signByPrivateKey(privateKey, message)
         const signature = await SignMessage.sign({
-          walletID: wallet.id,
-          password: password,
-          message: message,
+          walletID,
+          password,
+          message,
           address,
         })
 
         expect(sig).toEqual(signature)
       })
+
+      it('asset account address', async () => {
+        const addresses = await walletService.get(walletID).getNextReceivingAddresses()
+        const usedBlake160s = new Set(await AssetAccountService.blake160sOfAssetAccounts())
+        const addrObj = addresses.find(a => !usedBlake160s.has(a.blake160))
+
+        if (addrObj) {
+          const assetAccount = AssetAccount.fromObject({
+            tokenID: 'CKBytes',
+            symbol: 'ckb',
+            tokenName: 'ckb',
+            decimal: '0',
+            balance: '0',
+            accountName: 'ckb',
+            blake160: addrObj.blake160,
+          })
+
+          const privateKey = await AddressService.getPrivateKeyByAddress({
+            walletID,
+            accountId: assetAccount.id,
+            password,
+            address,
+          })
+
+          // @ts-ignore: Private method
+          const sig = SignMessage.signByPrivateKey(privateKey, message)
+          const signature = await SignMessage.sign({
+            walletID,
+            password,
+            message,
+            address,
+          })
+
+          expect(sig).toEqual(signature)
+        }
+      })
     })
   })
 })