Merge branch 'develop' into rc/v0.1.0-alpha.0

Author: ashchan

packages/neuron-ui/package.json

@@ -41,6 +41,7 @@
     "grommet-icons": "4.2.0",
     "history": "4.9.0",
     "i18next": "15.1.3",
+    "office-ui-fabric-react": "7.6.1",
     "qr.js": "0.0.0",
     "react": "16.8.6",
     "react-bootstrap": "1.0.0-beta.9",

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

@@ -1,4 +1,5 @@
 import React from 'react'
+import { PrimaryButton } from 'office-ui-fabric-react'
 import styled from 'styled-components'
 
 const ContentPanel = styled.div`
@@ -10,7 +11,13 @@ const ContentPanel = styled.div`
 `
 
 const General = () => {
-  return <ContentPanel />
+  return (
+    <ContentPanel>
+      <PrimaryButton data-automation-id="test" disabled={false} checked={false} allowDisabledFocus>
+        This is a temporary button
+      </PrimaryButton>
+    </ContentPanel>
+  )
 }
 
 export default General

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

@@ -44,10 +44,6 @@ const Transaction = (props: React.PropsWithoutRef<ContentProps & RouteComponentP
         </Card.Header>
         <Card.Body>
           {errorMsgs.transaction ? <Alert variant="warning">{t(`messages.${errorMsgs.transaction}`)}</Alert> : null}
-          <Card.Text>
-            <b>{`${t('history.amount')}: `}</b>
-            {transaction.value}
-          </Card.Text>
           <Card.Text>
             <div>
               <b>{`${t('history.date')}: `}</b>

packages/neuron-wallet/src/controllers/app/index.ts

@@ -100,7 +100,7 @@ export default class AppController {
   }
 
   public static navTo(url: string) {
-    windowManager.sendToFocusedWindow(Channel.App, 'navTo', {
+    windowManager.sendToMainWindow(Channel.App, 'navTo', {
       status: ResponseCode.Success,
       result: url,
     })
@@ -202,7 +202,7 @@ export default class AppController {
         preload: path.join(__dirname, '../../startup/preload.js'),
       },
     })
-    win.loadURL(`${env.mainURL}/#/transaction/${hash}`)
+    win.loadURL(`${env.mainURL}#/transaction/${hash}`)
     win.on('ready-to-show', () => {
       win.show()
       win.focus()

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

@@ -7,6 +7,7 @@ import WalletsService from '../services/wallets'
 import { Controller as ControllerDecorator, CatchControllerError } from '../decorators'
 import { Channel, ResponseCode } from '../utils/const'
 import { TransactionNotFound, CurrentWalletNotSet, ServiceHasNoResponse } from '../exceptions'
+import LockUtils from '../models/lock-utils'
 
 /**
  * @class TransactionsController
@@ -60,6 +61,31 @@ export default class TransactionsController {
 
     if (!transaction) throw new TransactionNotFound(hash)
 
+    const wallet = WalletsService.getInstance().getCurrent()
+    if (!wallet) throw new CurrentWalletNotSet()
+    const addresses: string[] = (await AddressService.allAddressesByWalletId(wallet.id)).map(addr => addr.address)
+    const lockHashes: string[] = await Promise.all(
+      addresses.map(async addr => {
+        return LockUtils.addressToLockHash(addr)
+      })
+    )
+
+    const outputCapacities: bigint = transaction
+      .outputs!.filter(o => lockHashes.includes(o.lockHash!))
+      .map(o => BigInt(o.capacity))
+      .reduce((result, c) => result + c, BigInt(0))
+    const inputCapacities: bigint = transaction
+      .inputs!.filter(i => {
+        if (i.lockHash) {
+          return lockHashes.includes(i.lockHash)
+        }
+        return false
+      })
+      .map(i => BigInt(i.capacity))
+      .reduce((result, c) => result + c, BigInt(0))
+    const value: bigint = outputCapacities - inputCapacities
+    transaction.value = value.toString()
+
     return {
       status: ResponseCode.Success,
       result: transaction,

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

@@ -88,6 +88,9 @@ export default class WalletsController {
       extendedKey: accountExtendedPublicKey.serialize(),
       keystore,
     })
+
+    await walletsService.generateAddressesById(wallet.id)
+
     return {
       status: ResponseCode.Success,
       result: {
@@ -107,16 +110,11 @@ export default class WalletsController {
     password: string
     mnemonic: string
   }): Promise<Controller.Response<Omit<WalletProperties, 'extendedKey'>>> {
-    const response = await WalletsController.importMnemonic({
+    return WalletsController.importMnemonic({
       name,
       password,
       mnemonic,
     })
-    if (response && response.result) {
-      const walletId = response.result.id
-      await walletsService.generateAddressesById(walletId)
-    }
-    return response
   }
 
   @CatchControllerError

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

@@ -4,7 +4,7 @@ import { AddressType } from '../../models/keys/address'
 import { getConnection } from './ormconfig'
 import TransactionsService from '../../services/transactions'
 import CellsService from '../../services/cells'
-import LockUtils from '../../utils/lock-utils'
+import LockUtils from '../../models/lock-utils'
 
 export interface Address {
   walletId: string

packages/neuron-wallet/src/database/chain/meta-info.ts

@@ -0,0 +1,19 @@
+import FileService from '../../services/file'
+import { SystemScript } from '../../models/lock-utils'
+
+const moduleName = 'cells'
+const fileName = 'meta-info.json'
+
+export interface MetaInfo {
+  genesisBlockHash: string
+  systemScriptInfo: SystemScript
+}
+
+export const updateMetaInfo = (metaInfo: MetaInfo) => {
+  FileService.getInstance().writeFileSync(moduleName, fileName, JSON.stringify(metaInfo))
+}
+
+export const getMetaInfo = (): MetaInfo => {
+  const info = FileService.getInstance().readFileSync(moduleName, fileName)
+  return JSON.parse(info)
+}

packages/neuron-wallet/src/main.ts

@@ -4,31 +4,30 @@ import i18n from './utils/i18n'
 import { updateApplicationMenu } from './utils/application-menu'
 
 import Router from './router'
-import createWindow from './startup/create-window'
+import WindowManager from './models/window-manager'
+import createMainWindow from './startup/create-main-window'
 import createSyncBlockTask from './startup/sync-block-task/create'
 import initConnection from './database/address/ormconfig'
 import WalletsService from './services/wallets'
 
 const walletsService = WalletsService.getInstance()
 
-let mainWindow: Electron.BrowserWindow | null
-
 const router = new Router()
 
 Object.defineProperty(app, 'router', {
   value: router,
 })
 
 const openWindow = () => {
-  if (!mainWindow) {
-    mainWindow = createWindow()
-    mainWindow.on('closed', () => {
+  if (!WindowManager.mainWindow) {
+    WindowManager.mainWindow = createMainWindow()
+    WindowManager.mainWindow.on('closed', () => {
       if (process.platform !== 'darwin') {
         app.quit()
       }
-      if (mainWindow) {
-        mainWindow.removeAllListeners()
-        mainWindow = null
+      if (WindowManager.mainWindow) {
+        WindowManager.mainWindow.removeAllListeners()
+        WindowManager.mainWindow = null
       }
     })
   }

…es/neuron-wallet/src/utils/lock-utils.ts …s/neuron-wallet/src/models/lock-utils.tspackages/neuron-wallet/src/utils/lock-utils.ts renamed to packages/neuron-wallet/src/models/lock-utils.ts packages/neuron-wallet/src/utils/lock-utils.ts renamed to packages/neuron-wallet/src/models/lock-utils.ts

@@ -4,10 +4,15 @@ import env from '../env'
 
 const { core } = NodeService.getInstance()
 
+export interface SystemScript {
+  codeHash: string
+  outPoint: OutPoint
+}
+
 export default class LockUtils {
-  static systemScriptInfo: { codeHash: string; outPoint: OutPoint } | undefined
+  static systemScriptInfo: SystemScript | undefined
 
-  static async systemScript() {
+  static async systemScript(): Promise<SystemScript> {
     if (this.systemScriptInfo) {
       return this.systemScriptInfo
     }
@@ -47,6 +52,10 @@ export default class LockUtils {
     return systemScriptInfo
   }
 
+  static setSystemScript(info: SystemScript) {
+    LockUtils.systemScriptInfo = info
+  }
+
   // use SDK lockScriptToHash
   static lockScriptToHash = (lock: Script) => {
     const codeHash: string = lock!.codeHash!