Refactor wallet store

.eslintrc.js

@@ -52,7 +52,8 @@ module.exports = {
     "no-plusplus": [0],
     "no-console": [2, {
       "allow": ["warn", "error", "info"]
-    }]
+    }],
+    "lines-between-class-members": ["error", "always", { exceptAfterSingleLine: true }]
   },
   "globals": {
     "BigInt": "readonly"

packages/neuron-wallet/package.json

@@ -56,7 +56,6 @@
     "bip39": "3.0.2",
     "chalk": "2.4.2",
     "crypto-browserify": "3.12.0",
-    "electron-store": "3.2.0",
     "electron-window-state": "5.0.3",
     "i18next": "15.0.5",
     "reflect-metadata": "0.1.13",
@@ -73,7 +72,6 @@
     "@nervosnetwork/neuron-ui": "0.1.0",
     "@types/bip39": "2.4.2",
     "@types/electron-devtools-installer": "2.2.0",
-    "@types/electron-store": "1.3.0",
     "@types/sqlite3": "3.1.5",
     "@types/uuid": "3.4.4",
     "devtron": "1.4.0",

packages/neuron-wallet/src/app.ts

@@ -1,8 +1,10 @@
+import path from 'path'
+import os from 'os'
 import { app as electronApp } from 'electron'
 
 const fakeApp = {
-  getPath(path: string): string {
-    return path
+  getPath(aPath: string): string {
+    return path.join(os.tmpdir(), aPath)
   },
 }
 const app = electronApp || fakeApp

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

@@ -1,5 +1,4 @@
-import WalletsService from '../services/wallets'
-import { WalletData } from '../store/walletStore'
+import WalletsService, { Wallet, WalletProperties } from '../services/wallets'
 import { ChannelResponse, ResponseCode } from '.'
 import windowManage from '../utils/windowManage'
 import { Channel } from '../utils/const'
@@ -22,7 +21,7 @@ export enum WalletsMethod {
 class WalletsController {
   static service = new WalletsService()
 
-  public static getAll = (): ChannelResponse<WalletData[]> => {
+  public static getAll = (): ChannelResponse<Wallet[]> => {
     const wallets = WalletsController.service.getAll()
     if (wallets) {
       return {
@@ -36,7 +35,7 @@ class WalletsController {
     }
   }
 
-  public static get = (id: string): ChannelResponse<WalletData> => {
+  public static get = (id: string): ChannelResponse<Wallet> => {
     const wallet = WalletsController.service.get(id)
     if (wallet) {
       return {
@@ -76,7 +75,7 @@ class WalletsController {
     mnemonic: string
     receivingAddressNumber: number
     changeAddressNumber: number
-  }): Promise<ChannelResponse<WalletData>> => {
+  }): Promise<ChannelResponse<Wallet>> => {
     try {
       const key = await Key.fromMnemonic(mnemonic, password, receivingAddressNumber, changeAddressNumber)
       const wallet = WalletsController.service.create({
@@ -109,7 +108,7 @@ class WalletsController {
     mnemonic: string
     receivingAddressNumber: number
     changeAddressNumber: number
-  }): Promise<ChannelResponse<WalletData>> => {
+  }): Promise<ChannelResponse<Wallet>> => {
     const res = await WalletsController.importMnemonic({
       name,
       password,
@@ -132,7 +131,7 @@ class WalletsController {
     keystore: string
     receivingAddressNumber: number
     changeAddressNumber: number
-  }): ChannelResponse<WalletData> => {
+  }): ChannelResponse<Wallet> => {
     try {
       const key = Key.fromKeystore(keystore, password, receivingAddressNumber, changeAddressNumber)
       const wallet = WalletsController.service.create({
@@ -153,6 +152,7 @@ class WalletsController {
     }
   }
 
+  // TODO: update addresses?
   public static update = ({
     id,
     name,
@@ -163,17 +163,17 @@ class WalletsController {
     password: string
     name: string
     newPassword?: string
-  }): ChannelResponse<WalletData> => {
+  }): ChannelResponse<Wallet> => {
     try {
       const wallet = WalletsController.service.get(id)
       if (wallet) {
         if (WalletsController.service.validate({ id, password })) {
-          wallet.name = name
+          const props: WalletProperties = { name, addresses: wallet.addresses, keystore: null }
           if (newPassword) {
-            const key = Key.fromKeystore(JSON.stringify(wallet!.keystore), password)
-            wallet.keystore = key.toKeystore(JSON.stringify(key.keysData!), newPassword)
+            const key = Key.fromKeystore(JSON.stringify(wallet!.loadKeystore()), password)
+            props.keystore = key.toKeystore(JSON.stringify(key.keysData!), newPassword)
           }
-          WalletsController.service.update(id, wallet)
+          WalletsController.service.update(id, props)
           windowManage.broadcast(Channel.Wallets, WalletsMethod.GetAll, WalletsController.getAll())
           return {
             status: ResponseCode.Success,
@@ -204,7 +204,7 @@ class WalletsController {
           status: ResponseCode.Success,
           result: {
             allWallets: WalletsController.service.getAll(),
-            activeWallet: WalletsController.service.getActive(),
+            activeWallet: WalletsController.service.getCurrent(),
           },
         }
       }
@@ -235,8 +235,8 @@ class WalletsController {
   }
 
   public static getActive = () => {
-    try {
-      const activeWallet = WalletsController.service.getActive()
+    const activeWallet = WalletsController.service.getCurrent()
+    if (activeWallet) {
       return {
         status: ResponseCode.Success,
         result: {
@@ -247,21 +247,21 @@ class WalletsController {
           },
         },
       }
-    } catch (e) {
-      return {
-        status: ResponseCode.Fail,
-        msg: 'No active wallet',
-      }
+    }
+
+    return {
+      status: ResponseCode.Fail,
+      msg: 'No active wallet',
     }
   }
 
   public static activate = (id: string) => {
-    const success = WalletsController.service.setActive(id)
+    const success = WalletsController.service.setCurrent(id)
     if (success) {
       windowManage.broadcast(Channel.Wallets, WalletsMethod.GetActive, WalletsController.getActive())
       return {
         status: ResponseCode.Success,
-        result: WalletsController.service.getActive(),
+        result: WalletsController.service.getCurrent(),
       }
     }
     return {

packages/neuron-wallet/src/keys/key.ts

@@ -3,7 +3,7 @@ import * as bip39 from 'bip39'
 import crypto from 'crypto-browserify'
 import scryptsy from 'scrypt.js'
 import SHA3 from 'sha3'
-import { v4 } from 'uuid'
+import { v4 as uuid } from 'uuid'
 import Address, { HDAddress } from '../services/addresses'
 import { Keystore, KdfParams, KeysData } from './keystore'
 
@@ -193,7 +193,7 @@ export default class Key {
       .replace('0x', '')
     return {
       version: 0,
-      id: v4(),
+      id: uuid(),
       crypto: {
         ciphertext: ciphertext.toString('hex'),
         cipherparams: {

packages/neuron-wallet/src/mock.ts

@@ -1,4 +1,4 @@
-import { v4 } from 'uuid'
+import { v4 as uuid } from 'uuid'
 
 export const transactions = Array.from({
   length: 200,
@@ -27,7 +27,7 @@ export interface Wallet {
 
 const generateWallet = () => {
   const walletName = `wallet${parseInt((Math.random() * 1000).toString(), 10)}`
-  const walletID = v4()
+  const walletID = uuid()
   return {
     name: walletName,
     id: walletID,

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

@@ -1,9 +1,8 @@
 import TransactionsService from './transactions'
+import WalletService from './wallets'
+import nodeService from '../startup/nodeService'
 import HD from '../keys/hd'
 import { KeysData } from '../keys/keystore'
-// TODO: Should use service
-import WalletStore from '../store/walletStore'
-import nodeService from '../startup/nodeService'
 
 const {
   utils: { AddressPrefix, AddressType: Type, AddressBinIdx, pubkeyToAddress },
@@ -67,7 +66,7 @@ class Address {
   }
 
   public static allAddresses = () =>
-    new WalletStore().getAllWallets().reduce((total: HDAddress[], cur) => {
+    new WalletService().getAll().reduce((total: HDAddress[], cur) => {
       return [...total, ...cur.addresses.change, ...cur.addresses.receiving]
     }, [])
 

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

@@ -1,4 +1,4 @@
-import { v4 } from 'uuid'
+import { v4 as uuid } from 'uuid'
 import Store from '../utils/store'
 import env from '../env'
 
@@ -83,7 +83,7 @@ export default class NetworksService extends Store {
       throw new Error('Network name exists')
     }
     const newOne = {
-      id: v4(),
+      id: uuid(),
       name,
       remote,
       type,