refactor: replace models/keys with lumos hd

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

@@ -2,7 +2,7 @@ import { DeviceInfo, ExtendedPublicKey, PublicKey } from '../services/hardware/c
 import { ResponseCode } from '../utils/const'
 import HardwareWalletService from '../services/hardware'
 import { connectDeviceFailed } from '../exceptions'
-import { AccountExtendedPublicKey } from '../models/keys/key'
+import { AccountExtendedPublicKey } from '@ckb-lumos/hd'
 
 export default class HardwareController {
   public async connectDevice(deviceInfo: DeviceInfo): Promise<Controller.Response<void>> {

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

@@ -1,12 +1,11 @@
 import fs from 'fs'
 import { t } from 'i18next'
+import { Ox } from '../utils/scriptAndAddress'
 import { dialog, SaveDialogReturnValue, BrowserWindow, OpenDialogReturnValue } from 'electron'
 import WalletsService, { Wallet, WalletProperties, FileKeystoreWallet } from '../services/wallets'
 import NetworksService from '../services/networks'
-import Keystore from '../models/keys/keystore'
-import Keychain from '../models/keys/keychain'
-import { validateMnemonic, mnemonicToSeedSync } from '../models/keys/mnemonic'
-import { AccountExtendedPublicKey, ExtendedPrivateKey, generateMnemonic } from '../models/keys/key'
+import { Keychain, Keystore, ExtendedPrivateKey, AccountExtendedPublicKey } from '@ckb-lumos/hd'
+import { generateMnemonic, validateMnemonic, mnemonicToSeedSync } from '@ckb-lumos/hd/lib/mnemonic'
 import CommandSubject from '../models/subjects/command'
 import { ResponseCode } from '../utils/const'
 import {
@@ -106,15 +105,15 @@ export default class WalletsController {
       throw new InvalidMnemonic()
     }
     const extendedKey = new ExtendedPrivateKey(
-      masterKeychain.privateKey.toString('hex'),
-      masterKeychain.chainCode.toString('hex')
+      Ox(masterKeychain.privateKey.toString('hex')),
+      Ox(masterKeychain.chainCode.toString('hex'))
     )
     const keystore = Keystore.create(extendedKey, password)
 
     const accountKeychain = masterKeychain.derivePath(AccountExtendedPublicKey.ckbAccountPath)
     const accountExtendedPublicKey = new AccountExtendedPublicKey(
-      accountKeychain.publicKey.toString('hex'),
-      accountKeychain.chainCode.toString('hex')
+      Ox(accountKeychain.publicKey.toString('hex')),
+      Ox(accountKeychain.chainCode.toString('hex'))
     )
 
     const walletsService = WalletsService.getInstance()
@@ -173,8 +172,8 @@ export default class WalletsController {
     )
     const accountKeychain = masterKeychain.derivePath(AccountExtendedPublicKey.ckbAccountPath)
     const accountExtendedPublicKey = new AccountExtendedPublicKey(
-      accountKeychain.publicKey.toString('hex'),
-      accountKeychain.chainCode.toString('hex')
+      Ox(accountKeychain.publicKey.toString('hex')),
+      Ox(accountKeychain.chainCode.toString('hex'))
     )
 
     const walletsService = WalletsService.getInstance()
@@ -273,7 +272,7 @@ export default class WalletsController {
     walletName,
   }: ExtendedPublicKey & { walletName: string }): Promise<Controller.Response<Wallet>> {
     const device = HardwareWalletService.getInstance().getCurrent()!
-    const accountExtendedPublicKey = new AccountExtendedPublicKey(publicKey, chainCode)
+    const accountExtendedPublicKey = new AccountExtendedPublicKey(Ox(publicKey), Ox(chainCode))
     const walletsService = WalletsService.getInstance()
     const wallet = walletsService.create({
       device: device.deviceInfo,

packages/neuron-wallet/src/database/address/meta.ts

@@ -1,6 +1,6 @@
 import { bytes } from '@ckb-lumos/codec'
 import { Address, AddressVersion } from '../../models/address'
-import { AddressType } from '../../models/keys/address'
+import { AddressType } from '@ckb-lumos/hd'
 import Script from '../../models/chain/script'
 import SystemScriptInfo from '../../models/system-script-info'
 import AssetAccountInfo from '../../models/asset-account-info'

packages/neuron-wallet/src/database/chain/entities/hd-public-key-info.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryGeneratedColumn, Index, CreateDateColumn } from 'typeorm'
 import HdPublicKeyInfoModel from '../../../models/keys/hd-public-key-info'
-import { AddressType } from '../../../models/keys/address'
+import { AddressType } from '@ckb-lumos/hd'
 
 @Entity()
 export default class HdPublicKeyInfo {

packages/neuron-wallet/src/models/address.ts

@@ -1,4 +1,4 @@
-import { AddressType } from '../models/keys/address'
+import { AddressType } from '@ckb-lumos/hd'
 
 export enum AddressVersion {
   Testnet = 'testnet',

packages/neuron-wallet/src/models/keys/hd-public-key-info.ts

@@ -1,7 +1,7 @@
+import { AddressType, AccountExtendedPublicKey } from '@ckb-lumos/hd'
 import { scriptToAddress } from '../../utils/scriptAndAddress'
 import SystemScriptInfo from '../../models/system-script-info'
 import NetworksService from '../../services/networks'
-import Address, { AddressType } from './address'
 
 export default class HdPublicKeyInfoModel {
   public walletId: string
@@ -22,7 +22,7 @@ export default class HdPublicKeyInfoModel {
   }
 
   public get path(): string {
-    return Address.pathFor(this.addressType, this.addressIndex)
+    return AccountExtendedPublicKey.pathFor(this.addressType, this.addressIndex)
   }
 
   constructor(