From 96b4ef6c4d2fdfa71d0be65e7172c53b855852a1 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Tue, 12 Nov 2019 23:37:39 +0800
Subject: [PATCH 01/35] feat(neuron-ui): add border color on dao records

---
 .../neuron-ui/src/components/CustomRows/DAORecordRow.tsx    | 2 +-
 .../src/components/CustomRows/daoRecordRow.module.scss      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
index 80ee774f10..1490b2cf1e 100644
--- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
+++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -82,7 +82,7 @@ const DAORecord = ({
   }
 
   return (
-    <div className={styles.daoRecord}>
+    <div className={`${styles.daoRecord} ${depositOutPoint ? styles.isClaim : ''}`}>
       <div className={styles.primaryInfo}>
         <div>{interest >= BigInt(0) ? `${shannonToCKBFormatter(interest.toString()).toString()} CKB` : ''}</div>
         <div>{`${shannonToCKBFormatter(capacity)} CKB`}</div>
diff --git a/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss b/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss
index 7a2bede64c..d9a0f1b74e 100644
--- a/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss
+++ b/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss
@@ -2,9 +2,10 @@
   display: flex;
   flex-direction: column;
   border: 1px solid #000;
-  border-radius: 5px;
+  border-radius: 2px;
   margin: 10px 0;
   padding: 5px 15px;
+  border-left: 5px solid green;
 
   .primaryInfo,
   .secondaryInfo {
@@ -32,4 +33,7 @@
     color: #666;
   }
 
+  &.isClaim {
+    border-left-color: blue;
+  }
 }

From e8398b6dafb66b8781a2822262a242b9b49278cf Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Tue, 12 Nov 2019 23:59:43 +0800
Subject: [PATCH 02/35] feat(neuron-ui): adjust the order of dao records

---
 .../src/states/stateProvider/actionCreators/wallets.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
index 1a44e0961e..a2a155b70f 100644
--- a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
+++ b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts
@@ -271,9 +271,17 @@ export const backupWallet = (params: Controller.BackupWalletParams) => (dispatch
 export const updateNervosDaoData = (walletID: Controller.GetNervosDaoDataParams) => (dispatch: StateDispatch) => {
   getNervosDaoData(walletID).then(res => {
     if (res.status === 1) {
+      const withdrawList = res.result
+        .filter((r: State.NervosDAORecord) => !r.depositOutPoint)
+        .sort((r1: State.NervosDAORecord, r2: State.NervosDAORecord) => +r2.timestamp - +r1.timestamp)
+
+      const claimList = res.result
+        .filter((r: State.NervosDAORecord) => r.depositOutPoint)
+        .sort((r1: State.NervosDAORecord, r2: State.NervosDAORecord) => +r2.timestamp - +r1.timestamp)
+
       dispatch({
         type: NeuronWalletActions.UpdateNervosDaoData,
-        payload: { records: res.result },
+        payload: { records: [...claimList, ...withdrawList] },
       })
     } else {
       addNotification(failureResToNotification(res))(dispatch)

From cd44e43fc997c8285c01ce8070ed9cdca08c5b76 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 00:40:42 +0800
Subject: [PATCH 03/35] feat(neuron-ui): update the info and message of nervos
 dao

---
 .../components/CustomRows/DAORecordRow.tsx    |  6 ++++-
 .../components/NervosDAO/WithdrawDialog.tsx   | 25 ++++++++++++++-----
 packages/neuron-ui/src/locales/en.json        |  3 ++-
 packages/neuron-ui/src/locales/zh.json        |  3 ++-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
index 1490b2cf1e..65cf1e18ea 100644
--- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
+++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -84,7 +84,11 @@ const DAORecord = ({
   return (
     <div className={`${styles.daoRecord} ${depositOutPoint ? styles.isClaim : ''}`}>
       <div className={styles.primaryInfo}>
-        <div>{interest >= BigInt(0) ? `${shannonToCKBFormatter(interest.toString()).toString()} CKB` : ''}</div>
+        <div>
+          {interest >= BigInt(0)
+            ? `${depositOutPoint ? '' : '~'}${shannonToCKBFormatter(interest.toString()).toString()} CKB`
+            : ''}
+        </div>
         <div>{`${shannonToCKBFormatter(capacity)} CKB`}</div>
         <div>
           <DefaultButton
diff --git a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
index 77c77b2760..639579facf 100644
--- a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Dialog, DialogFooter, DefaultButton, PrimaryButton, DialogType } from 'office-ui-fabric-react'
+import { Dialog, DialogFooter, DefaultButton, PrimaryButton, DialogType, Text } from 'office-ui-fabric-react'
 import { useTranslation } from 'react-i18next'
 import { shannonToCKBFormatter, localNumberFormatter } from 'utils/formatters'
 import { ckbCore } from 'services/chain'
@@ -65,6 +65,14 @@ const WithdrawDialog = ({
     blocks: localNumberFormatter(currentEpochInfo.length - currentEpochInfo.index),
     days: localNumberFormatter(epochs / BigInt(6)),
   })
+  const alert =
+    epochs <= BigInt(5)
+      ? t('nervos-dao.withdraw-alert', {
+          epochs,
+          nextLeftEpochs: epochs + BigInt(180),
+          days: (epochs + BigInt(180)) / BigInt(6),
+        })
+      : ''
   return (
     <Dialog
       hidden={!record}
@@ -77,20 +85,25 @@ const WithdrawDialog = ({
     >
       {record ? (
         <>
-          <div>
+          <Text as="p" variant="large" block>
             <span>{`${t('nervos-dao.deposit')}: `}</span>
             <span>{`${shannonToCKBFormatter(record.capacity)} CKB`}</span>
-          </div>
-          <div>
+          </Text>
+          <Text as="p" variant="large" block>
             <span>{`${t('nervos-dao.interest')}: `}</span>
             <span>
               {withdrawValue
                 ? `${shannonToCKBFormatter((BigInt(withdrawValue) - BigInt(record.capacity)).toString())} CKB`
                 : ''}
             </span>
-          </div>
+          </Text>
           <div>
-            <span>{message}</span>
+            <Text as="p" variant="medium" block>
+              {message}
+            </Text>
+            <Text as="p" variant="xSmall" block styles={{ root: { color: 'red' } }}>
+              {alert}
+            </Text>
           </div>
         </>
       ) : null}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index fc7c0ceb05..eae60e6c0b 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -332,7 +332,8 @@
       "withdrawing-action-label": "Claim",
       "minimal-fee-required": "The minimum deposit capacity is {{minimal}} CKB",
       "interest-accumulated": "{{blockNumber}} blocks interest accumulated",
-      "blocks-left": "{{epochs}} epochs {{blocks}} blocks left(~{{days}} days)"
+      "blocks-left": "{{epochs}} epochs {{blocks}} blocks left(~{{days}} days)",
+      "withdraw-alert": "Alert: these are only {{epochs}} epochs left before the next start withdrawing epoch number conforming to Nervos DAO, and it is possible that you have to do the withdraw after the next period(~{{days}}) due to the jam on CKB."
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 9decdf7c3e..0801e499f7 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -332,7 +332,8 @@
       "withdrawing-action-label": "Claim",
       "minimal-fee-required": "存入金额应不少于 {{minimal}} CKB",
       "interest-accumulated": "已累计 {{blockNumber}} 个块的利息",
-      "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)"
+      "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)",
+      "withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险"
     }
   }
 }

From 15d0cc8e1a803cd24f433d3e5d139ad3a501f1b4 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 01:27:05 +0800
Subject: [PATCH 04/35] feat(neuron-ui): add an alert when past epochs are less
 than 5

---
 .../components/CustomRows/DAORecordRow.tsx    | 36 +++++++++++++++++--
 .../src/components/NervosDAO/index.tsx        |  6 ++--
 .../neuron-ui/src/components/Send/index.tsx   |  3 +-
 packages/neuron-ui/src/locales/en.json        |  4 ++-
 packages/neuron-ui/src/locales/zh.json        |  4 ++-
 5 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
index 65cf1e18ea..2e8faf0d3b 100644
--- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
+++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -1,7 +1,8 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, useMemo } from 'react'
 import { DefaultButton } from 'office-ui-fabric-react'
 import { useTranslation } from 'react-i18next'
 import { ckbCore, getBlockByNumber } from 'services/chain'
+import { showMessage } from 'services/remote'
 import calculateAPY from 'utils/calculateAPY'
 import { shannonToCKBFormatter, uniformTimeFormatter, localNumberFormatter } from 'utils/formatters'
 import calculateClaimEpochNumber from 'utils/calculateClaimEpochNumber'
@@ -21,12 +22,14 @@ const DAORecord = ({
   depositOutPoint,
   epoch,
   withdraw,
+  connectionStatus,
 }: State.NervosDAORecord & {
   actionLabel: string
   onClick: any
   tipBlockNumber: string
   epoch: string
   withdraw: string | null
+  connectionStatus: 'online' | 'offline'
 }) => {
   const [t] = useTranslation()
   const [withdrawingEpoch, setWithdrawingEpoch] = useState('')
@@ -34,6 +37,13 @@ const DAORecord = ({
 
   useEffect(() => {
     if (!depositOutPoint) {
+      getBlockByNumber(BigInt(blockNumber))
+        .then(b => {
+          setDepositEpoch(b.header.epoch)
+        })
+        .catch((err: Error) => {
+          console.error(err)
+        })
       return
     }
     const depositBlockNumber = ckbCore.utils.bytesToHex(ckbCore.utils.hexToBytes(daoData).reverse())
@@ -81,6 +91,26 @@ const DAORecord = ({
     }
   }
 
+  const onActionClick = useMemo(() => {
+    const currentEpochInfo = epochParser(epoch)
+    const thresholdEpoch = withdrawingEpoch || depositEpoch
+    if (thresholdEpoch) {
+      const thresholdEpochInfo = epochParser(thresholdEpoch)
+      if (thresholdEpochInfo.number + BigInt(4) >= currentEpochInfo.number) {
+        return () =>
+          showMessage(
+            {
+              title: t('nervos-dao.insufficient-period-alert-title'),
+              message: t('nervos-dao.insufficient-period-alert-title'),
+              detail: t('nervos-dao.insufficient-period-alert-message'),
+            },
+            () => {}
+          )
+      }
+    }
+    return onClick
+  }, [onClick, epoch, depositEpoch, withdrawingEpoch])
+
   return (
     <div className={`${styles.daoRecord} ${depositOutPoint ? styles.isClaim : ''}`}>
       <div className={styles.primaryInfo}>
@@ -95,8 +125,8 @@ const DAORecord = ({
             text={actionLabel}
             data-tx-hash={txHash}
             data-index={index}
-            onClick={onClick}
-            disabled={depositOutPoint && !ready}
+            onClick={onActionClick}
+            disabled={connectionStatus === 'offline' || (depositOutPoint && !ready)}
             styles={{
               flexContainer: {
                 pointerEvents: 'none',
diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index ccc909dd55..023cbde296 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -33,6 +33,7 @@ const NervosDAO = ({
   wallet,
   dispatch,
   nervosDAO: { records },
+  chain: { connectionStatus },
 }: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps>) => {
   const [t] = useTranslation()
   const [depositValue, setDepositValue] = useState(`${MIN_DEPOSIT_AMOUNT}`)
@@ -226,13 +227,14 @@ const NervosDAO = ({
                 onClick={onActionClick}
                 tipBlockNumber={tipBlockNumber}
                 epoch={epoch}
+                connectionStatus={connectionStatus}
               />
             )
           })}
         </Stack>
       </>
     )
-  }, [records, withdrawList, t, onActionClick, tipBlockNumber, epoch])
+  }, [records, withdrawList, t, onActionClick, tipBlockNumber, epoch, connectionStatus])
 
   const free = BigInt(wallet.balance)
   const locked = withdrawList.reduce((acc, w) => acc + BigInt(w || 0), BigInt(0))
@@ -271,7 +273,7 @@ const NervosDAO = ({
           <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 15 }}>
             <DefaultButton
               text={t('nervos-dao.deposit')}
-              disabled={sending}
+              disabled={connectionStatus === 'offline' || sending}
               onClick={() => setShowDepositDialog(true)}
             />
             <TooltipHost
diff --git a/packages/neuron-ui/src/components/Send/index.tsx b/packages/neuron-ui/src/components/Send/index.tsx
index 79447fbaf6..d6361f09c0 100644
--- a/packages/neuron-ui/src/components/Send/index.tsx
+++ b/packages/neuron-ui/src/components/Send/index.tsx
@@ -38,6 +38,7 @@ const Send = ({
     loadings: { sending = false },
   },
   wallet: { id: walletID = '', balance = '' },
+  chain: { connectionStatus },
   dispatch,
 }: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps<{ address: string }>>) => {
   const { t } = useTranslation()
@@ -234,7 +235,7 @@ const Send = ({
           <PrimaryButton
             type="submit"
             onClick={onSubmit(walletID)}
-            disabled={sending || !!errorMessageUnderTotal || !send.generatedTx}
+            disabled={connectionStatus === 'offline' || sending || !!errorMessageUnderTotal || !send.generatedTx}
             text={t('send.send')}
           />
         )}
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index eae60e6c0b..0db1b58bc4 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -333,7 +333,9 @@
       "minimal-fee-required": "The minimum deposit capacity is {{minimal}} CKB",
       "interest-accumulated": "{{blockNumber}} blocks interest accumulated",
       "blocks-left": "{{epochs}} epochs {{blocks}} blocks left(~{{days}} days)",
-      "withdraw-alert": "Alert: these are only {{epochs}} epochs left before the next start withdrawing epoch number conforming to Nervos DAO, and it is possible that you have to do the withdraw after the next period(~{{days}}) due to the jam on CKB."
+      "withdraw-alert": "Alert: these are only {{epochs}} epochs left before the next start withdrawing epoch number conforming to Nervos DAO, and it is possible that you have to do the withdraw after the next period(~{{days}}) due to the jam on CKB.",
+      "insufficient-period-alert-title": "Insufficient Period",
+      "insufficient-period-alert-message": "Nervos DAO needs at least 4 epochs to handle your request."
     }
   }
 }
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 0801e499f7..732dd1e728 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -333,7 +333,9 @@
       "minimal-fee-required": "存入金额应不少于 {{minimal}} CKB",
       "interest-accumulated": "已累计 {{blockNumber}} 个块的利息",
       "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)",
-      "withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险"
+      "withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险",
+      "insufficient-alert-title": "Insufficient Period",
+      "insufficient-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作"
     }
   }
 }

From 7e9e9e3ecf9fbc4a3faff5e4bfeb1276e09fd42f Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 01:55:59 +0800
Subject: [PATCH 05/35] feat(neuron-ui): remove the user-confirmation from
 phase2 of nervos dao

---
 .../components/CustomRows/DAORecordRow.tsx    |  2 +-
 .../components/NervosDAO/WithdrawDialog.tsx   |  2 +
 .../src/components/NervosDAO/index.tsx        | 59 ++++++++++++++-----
 .../src/components/Transaction/index.tsx      |  2 +-
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
index 2e8faf0d3b..564aaf4764 100644
--- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
+++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -109,7 +109,7 @@ const DAORecord = ({
       }
     }
     return onClick
-  }, [onClick, epoch, depositEpoch, withdrawingEpoch])
+  }, [onClick, epoch, depositEpoch, withdrawingEpoch, t])
 
   return (
     <div className={`${styles.daoRecord} ${depositOutPoint ? styles.isClaim : ''}`}>
diff --git a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
index 639579facf..b0f3d49861 100644
--- a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
@@ -65,6 +65,7 @@ const WithdrawDialog = ({
     blocks: localNumberFormatter(currentEpochInfo.length - currentEpochInfo.index),
     days: localNumberFormatter(epochs / BigInt(6)),
   })
+
   const alert =
     epochs <= BigInt(5)
       ? t('nervos-dao.withdraw-alert', {
@@ -73,6 +74,7 @@ const WithdrawDialog = ({
           days: (epochs + BigInt(180)) / BigInt(6),
         })
       : ''
+
   return (
     <Dialog
       hidden={!record}
diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index 023cbde296..a1120c5431 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -117,19 +117,11 @@ const NervosDAO = ({
   const onWithdrawDialogSubmit = () => {
     setErrorMessage('')
     if (activeRecord) {
-      ;(activeRecord.depositOutPoint
-        ? generateClaimTx({
-            walletID: wallet.id,
-            withdrawingOutPoint: activeRecord.outPoint,
-            depositOutPoint: activeRecord.depositOutPoint,
-            feeRate: `${MEDIUM_FEE_RATE}`,
-          })
-        : generateWithdrawTx({
-            walletID: wallet.id,
-            outPoint: activeRecord.outPoint,
-            feeRate: `${MEDIUM_FEE_RATE}`,
-          })
-      )
+      generateWithdrawTx({
+        walletID: wallet.id,
+        outPoint: activeRecord.outPoint,
+        feeRate: `${MEDIUM_FEE_RATE}`,
+      })
         .then((res: any) => {
           if (res.status === 1) {
             dispatch({
@@ -171,10 +163,47 @@ const NervosDAO = ({
       }
       const record = records.find(r => r.outPoint.txHash === outPoint.txHash && r.outPoint.index === outPoint.index)
       if (record) {
-        setActiveRecord(record)
+        if (record.depositOutPoint) {
+          generateClaimTx({
+            walletID: wallet.id,
+            withdrawingOutPoint: record.outPoint,
+            depositOutPoint: record.depositOutPoint,
+            feeRate: `${MEDIUM_FEE_RATE}`,
+          })
+            .then((res: any) => {
+              if (res.status === 1) {
+                dispatch({
+                  type: AppActions.UpdateGeneratedTx,
+                  payload: res.result,
+                })
+                dispatch({
+                  type: AppActions.RequestPassword,
+                  payload: {
+                    walletID: wallet.id,
+                    actionType: 'send',
+                  },
+                })
+              } else {
+                clearGeneratedTx()
+                setErrorMessage(`${typeof res.message === 'string' ? res.message : res.message.content}`)
+              }
+            })
+            .catch((err: Error) => {
+              dispatch({
+                type: AppActions.AddNotification,
+                payload: {
+                  type: 'alert',
+                  timestamp: +new Date(),
+                  content: err.message,
+                },
+              })
+            })
+        } else {
+          setActiveRecord(record)
+        }
       }
     },
-    [records]
+    [records, clearGeneratedTx, dispatch, wallet.id]
   )
 
   const fee = `${shannonToCKBFormatter(
diff --git a/packages/neuron-ui/src/components/Transaction/index.tsx b/packages/neuron-ui/src/components/Transaction/index.tsx
index 8aa66a5740..1c9136507f 100644
--- a/packages/neuron-ui/src/components/Transaction/index.tsx
+++ b/packages/neuron-ui/src/components/Transaction/index.tsx
@@ -254,7 +254,7 @@ const Transaction = () => {
       { label: t('transaction.transaction-hash'), value: transaction.hash || 'none' },
       {
         label: t('transaction.block-number'),
-        value: localNumberFormatter(transaction.blockNumber) || 'none',
+        value: transaction.blockNumber ? localNumberFormatter(transaction.blockNumber) : 'none',
       },
       {
         label: t('transaction.date'),

From c67aa3680912109180f5cbe0990126f486ae379e Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 09:19:34 +0800
Subject: [PATCH 06/35] feat(neuron-ui): remove redundant error messages

---
 packages/neuron-ui/src/components/ImportKeystore/index.tsx | 6 +++---
 packages/neuron-ui/src/components/NetworkEditor/hooks.ts   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/neuron-ui/src/components/ImportKeystore/index.tsx b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
index e1c908c4a0..bf6b9a1443 100644
--- a/packages/neuron-ui/src/components/ImportKeystore/index.tsx
+++ b/packages/neuron-ui/src/components/ImportKeystore/index.tsx
@@ -105,12 +105,12 @@ const ImportKeystore = (props: React.PropsWithoutRef<StateWithDispatch & RouteCo
                   return t(`messages.codes.${ErrorCode.FieldRequired}`, { fieldName: `keystore-${key}` })
                 }
                 if (key === 'name' && isNameUsed) {
-                  return t(`messages.codes.${ErrorCode.FieldUsed}`, { fieldName: `name`, fieldValue: text })
+                  return t(`messages.codes.${ErrorCode.FieldUsed}`, { fieldName: `keystore-name`, fieldValue: '' })
                 }
                 if (text && maxLength && text.length > maxLength) {
                   return t(`messages.codes.${ErrorCode.FieldTooLong}`, {
-                    fieldName: key,
-                    fieldValue: key === 'password' ? '' : text,
+                    fieldName: `keystore-${key}`,
+                    fieldValue: '',
                     length: maxLength,
                   })
                 }
diff --git a/packages/neuron-ui/src/components/NetworkEditor/hooks.ts b/packages/neuron-ui/src/components/NetworkEditor/hooks.ts
index 172926852c..4a07cc5e5c 100644
--- a/packages/neuron-ui/src/components/NetworkEditor/hooks.ts
+++ b/packages/neuron-ui/src/components/NetworkEditor/hooks.ts
@@ -108,7 +108,7 @@ export const useInputs = (editor: EditorType, usedNetworkNames: string[], t: any
           if (typeof res === 'object') {
             return t(`messages.codes.${res.code}`, {
               fieldName: 'name',
-              fieldValue: name,
+              fieldValue: '',
               length: MAX_NETWORK_NAME_LENGTH,
             })
           }

From 3c625985e61e058c9d4038ccc3150dbde9f91153 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 09:52:48 +0800
Subject: [PATCH 07/35] feat(neuron-ui): add more translation of nervos dao

---
 .../src/components/NervosDAO/DepositDialog.tsx      |  2 +-
 packages/neuron-ui/src/locales/en.json              |  3 +--
 packages/neuron-ui/src/locales/zh.json              | 13 ++++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAO/DepositDialog.tsx b/packages/neuron-ui/src/components/NervosDAO/DepositDialog.tsx
index 43e1d8a8b6..216d5ba756 100644
--- a/packages/neuron-ui/src/components/NervosDAO/DepositDialog.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/DepositDialog.tsx
@@ -61,7 +61,7 @@ const DepositDialog = ({
           </Text>
           <Stack>
             <Text as="h2" variant="large">
-              {t('nervos-dao.notice')}
+              {`${t('nervos-dao.notice')}:`}
             </Text>
             {t('nervos-dao.deposit-terms')
               .split('\n')
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 0db1b58bc4..9e2aa0a38b 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -325,9 +325,8 @@
       "proceed": "Proceed",
       "deposit-value": "Deposit",
       "interest": "Interest",
-      "yield": "Yield",
       "notice-wait-time": "Notice: You need to wait {{epochs}} epochs {{blocks}} blocks(~{{days}} days) to claim the saving.",
-      "deposit-terms": "Nervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit",
+      "deposit-terms": "Nervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit.",
       "deposited-action-label": "Withdraw",
       "withdrawing-action-label": "Claim",
       "minimal-fee-required": "The minimum deposit capacity is {{minimal}} CKB",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 732dd1e728..c09d821e65 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -315,8 +315,8 @@
       "deposit-records": "存款记录",
       "apy": "预期年化利率",
       "deposit-at": "存入于{{time}}",
-      "claim": "Claim",
-      "withdraw": "Withdraw",
+      "claim": "取款",
+      "withdraw": "结算",
       "fee": "手续费",
       "deposit-to-nervos-dao": "存入 Nervos DAO",
       "withdraw-from-nervos-dao": "从 Nervos DAO 取出",
@@ -325,16 +325,15 @@
       "proceed": "继续",
       "deposit-value": "存款",
       "interest": "利息",
-      "yield": "Yield",
       "notice-wait-time": "注意: 您需要等待 {{epochs}} epochs {{blocks}} 区块(~{{days}}天)完成最终取款。",
-      "deposit-terms": "Nervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit",
-      "deposited-action-label": "Withdraw",
-      "withdrawing-action-label": "Claim",
+      "deposit-terms": "Nervos DAO 是一个系统层面的去中心化底层设施。您在其中存款是十分安全的。\n根据 Nervos DAO 的协议, 您需要等待至少 180 个 epochs 才能取回您的存款。",
+      "deposited-action-label": "结算",
+      "withdrawing-action-label": "取款",
       "minimal-fee-required": "存入金额应不少于 {{minimal}} CKB",
       "interest-accumulated": "已累计 {{blockNumber}} 个块的利息",
       "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)",
       "withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险",
-      "insufficient-alert-title": "Insufficient Period",
+      "insufficient-alert-title": "未达到要求周期",
       "insufficient-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作"
     }
   }

From 430f6821d7703c36c74b5e26f395b9e6e3e97148 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Wed, 13 Nov 2019 10:17:12 +0800
Subject: [PATCH 08/35] chore: Update release checksums script to reflect
 recent binary paths change

---
 scripts/release-checksums.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/release-checksums.rb b/scripts/release-checksums.rb
index ee0a6398c1..71dbcf2397 100644
--- a/scripts/release-checksums.rb
+++ b/scripts/release-checksums.rb
@@ -6,10 +6,10 @@
 tag = ARGV[0]
 puts "Generating release checksums for #{tag}, this could take a while..."
 
-windows_exe = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}-win-installer.exe"
+windows_exe = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}-setup.exe"
 macos_zip = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}-mac.zip"
-macos_dmg = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}-mac.dmg"
-linux_appimage = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}-linux-x86_64.AppImage"
+macos_dmg = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}.dmg"
+linux_appimage = "https://github.com/nervosnetwork/neuron/releases/download/#{tag}/Neuron-#{tag}-x86_64.AppImage"
 
 def get_sha256_checksum(url)
   content = open(url).read

From f6a32258d1f077873068c25f28013b2157d51dc4 Mon Sep 17 00:00:00 2001
From: classicalliu <classicalliu@gmail.com>
Date: Wed, 13 Nov 2019 10:32:12 +0800
Subject: [PATCH 09/35] chore: only get dao cells in live or failed

---
 packages/neuron-wallet/src/services/cells.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-wallet/src/services/cells.ts b/packages/neuron-wallet/src/services/cells.ts
index 96c1041196..c57912479f 100644
--- a/packages/neuron-wallet/src/services/cells.ts
+++ b/packages/neuron-wallet/src/services/cells.ts
@@ -4,6 +4,7 @@ import { Cell, OutPoint, Input } from 'types/cell-types'
 import { CapacityNotEnough, CapacityNotEnoughForChange } from 'exceptions'
 import { OutputStatus } from './tx/params'
 import FeeMode from 'models/fee-mode'
+import { TransactionStatus } from 'types/cell-types'
 
 export const MIN_CELL_CAPACITY = '6100000000'
 
@@ -43,9 +44,10 @@ export default class CellsService {
       .getRepository(OutputEntity)
       .createQueryBuilder('output')
       .leftJoinAndSelect('output.transaction', 'tx')
-      .where(`output.status <> :deadStatus AND output.daoData IS NOT NULL AND output.lockHash in (:...lockHashes) AND tx.blockNumber IS NOT NULL`, {
+      .where(`(output.status = :liveStatus OR tx.status = :failedStatus) AND output.daoData IS NOT NULL AND output.lockHash in (:...lockHashes) AND tx.blockNumber IS NOT NULL`, {
         lockHashes,
-        deadStatus: OutputStatus.Dead,
+        liveStatus: OutputStatus.Live,
+        failedStatus: TransactionStatus.Failed,
       })
       .orderBy(`CASE output.daoData WHEN '0x0000000000000000' THEN 1 ELSE 0 END`, 'ASC')
       .addOrderBy('tx.timestamp', 'ASC')

From 4f41d9da6cd9c3931d5b9c9f36827965da01bc97 Mon Sep 17 00:00:00 2001
From: classicalliu <classicalliu@gmail.com>
Date: Wed, 13 Nov 2019 10:34:02 +0800
Subject: [PATCH 10/35] fix: dao i18n

---
 packages/neuron-ui/src/locales/zh.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index c09d821e65..5fae21346b 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -333,8 +333,8 @@
       "interest-accumulated": "已累计 {{blockNumber}} 个块的利息",
       "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)",
       "withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险",
-      "insufficient-alert-title": "未达到要求周期",
-      "insufficient-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作"
+      "insufficient-period-alert-title": "未达到要求周期",
+      "insufficient-period-alert-message": "Nervos DAO 要求您在至少 4 个 epochs 后执行此操作"
     }
   }
 }

From 20bbf33c7a0ce3905a046cbabc8789b0a9a2d1eb Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 15:36:55 +0800
Subject: [PATCH 11/35] feat(neuron-ui): use the same style of overview on
 nervos dao overview

---
 .../src/components/NervosDAO/index.tsx        | 21 ++++++++++++-------
 .../src/widgets/PropertyList/index.tsx        |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index a1120c5431..45a0da6ed0 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { Stack, Text, DefaultButton, Icon, TooltipHost, Spinner } from 'office-ui-fabric-react'
+import PropertyList from 'widgets/PropertyList'
 
 import appState from 'states/initStates/app'
 import { AppActions, StateWithDispatch } from 'states/stateProvider/reducer'
@@ -282,6 +283,17 @@ const NervosDAO = ({
     )
   }, [epoch])
 
+  const lockAndFreeProperties = [
+    {
+      label: t('nervos-dao.free'),
+      value: `${shannonToCKBFormatter(`${free}`)} CKB`,
+    },
+    {
+      label: t('nervos-dao.locked'),
+      value: `${shannonToCKBFormatter(`${locked}`)} CKB`,
+    },
+  ]
+
   return (
     <>
       <Stack tokens={{ childrenGap: 15 }} horizontalAlign="stretch">
@@ -290,14 +302,7 @@ const NervosDAO = ({
         </Text>
         <Stack horizontal tokens={{ childrenGap: 15 }}>
           <Stack style={{ minWidth: '250px' }} tokens={{ childrenGap: 10 }}>
-            <Stack horizontalAlign="space-between" horizontal>
-              <Text>{`${t('nervos-dao.free')}: `}</Text>
-              <Text>{`${shannonToCKBFormatter(`${free}`)} CKB`}</Text>
-            </Stack>
-            <Stack horizontalAlign="space-between" horizontal>
-              <Text>{`${t('nervos-dao.locked')}: `}</Text>
-              <Text>{`${shannonToCKBFormatter(`${locked}`)} CKB`}</Text>
-            </Stack>
+            <PropertyList properties={lockAndFreeProperties} />
           </Stack>
           <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 15 }}>
             <DefaultButton
diff --git a/packages/neuron-ui/src/widgets/PropertyList/index.tsx b/packages/neuron-ui/src/widgets/PropertyList/index.tsx
index 9c78471efc..1232ca35e5 100644
--- a/packages/neuron-ui/src/widgets/PropertyList/index.tsx
+++ b/packages/neuron-ui/src/widgets/PropertyList/index.tsx
@@ -28,7 +28,7 @@ const onRenderCell = (item?: Property & CellStyles) =>
       </span>
       <span
         className={styles.value}
-        style={{ width: item.valueWidth || 'auto', fontSize: theme.fonts.small.fontSize }}
+        style={{ width: item.valueWidth || 'auto', fontSize: theme.fonts.small.fontSize, textAlign: 'right' }}
         title={`${item.value}`}
         aria-label={item.label}
       >

From dd0c7dcdc9d6d23d72fc80de3887877114a0edf3 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 17:07:08 +0800
Subject: [PATCH 12/35] feat(neuron-ui): add content in deposit notice

---
 packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx | 2 +-
 packages/neuron-ui/src/locales/en.json                         | 2 +-
 packages/neuron-ui/src/locales/zh.json                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
index b0f3d49861..294da0d95a 100644
--- a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
@@ -100,7 +100,7 @@ const WithdrawDialog = ({
             </span>
           </Text>
           <div>
-            <Text as="p" variant="medium" block>
+            <Text as="p" variant="small" block>
               {message}
             </Text>
             <Text as="p" variant="xSmall" block styles={{ root: { color: 'red' } }}>
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 9e2aa0a38b..f9e2ed2b18 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -326,7 +326,7 @@
       "deposit-value": "Deposit",
       "interest": "Interest",
       "notice-wait-time": "Notice: You need to wait {{epochs}} epochs {{blocks}} blocks(~{{days}} days) to claim the saving.",
-      "deposit-terms": "Nervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit.",
+      "deposit-terms": "Nervos DAO needs 102 CKB for receipt storage, which is not interest-bearing.\nNervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit.",
       "deposited-action-label": "Withdraw",
       "withdrawing-action-label": "Claim",
       "minimal-fee-required": "The minimum deposit capacity is {{minimal}} CKB",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 5fae21346b..66b8bdf8fb 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -326,7 +326,7 @@
       "deposit-value": "存款",
       "interest": "利息",
       "notice-wait-time": "注意: 您需要等待 {{epochs}} epochs {{blocks}} 区块(~{{days}}天)完成最终取款。",
-      "deposit-terms": "Nervos DAO 是一个系统层面的去中心化底层设施。您在其中存款是十分安全的。\n根据 Nervos DAO 的协议, 您需要等待至少 180 个 epochs 才能取回您的存款。",
+      "deposit-terms": "存入 NervosDAO 的资产中需要 102 CKB 作为存款凭证的存储，这部分 CKB 是无法产生利息的。\nNervos DAO 是一个系统层面的去中心化底层设施。您在其中存款是十分安全的。\n根据 Nervos DAO 的协议, 您需要等待至少 180 个 epochs 才能取回您的存款。",
       "deposited-action-label": "结算",
       "withdrawing-action-label": "取款",
       "minimal-fee-required": "存入金额应不少于 {{minimal}} CKB",

From 6003676c7fb01c4ecafbe6650f0e81a8442063e1 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Wed, 13 Nov 2019 17:11:06 +0800
Subject: [PATCH 13/35] refactor: Add a simple json store to persist addresses

---
 .../neuron-wallet/src/database/address/dao.ts | 328 +++++++++---------
 .../neuron-wallet/src/services/addresses.ts   |  35 +-
 .../tests/database/address/balance.test.ts    |  39 +--
 .../tests/database/address/dao.test.ts        |  58 ++--
 .../tests/services/address.test.ts            |  64 ++--
 5 files changed, 227 insertions(+), 297 deletions(-)

diff --git a/packages/neuron-wallet/src/database/address/dao.ts b/packages/neuron-wallet/src/database/address/dao.ts
index b6eed992c4..f39c116dca 100644
--- a/packages/neuron-wallet/src/database/address/dao.ts
+++ b/packages/neuron-wallet/src/database/address/dao.ts
@@ -1,13 +1,12 @@
-import { Not, In } from 'typeorm'
 import { AddressType } from 'models/keys/address'
 import { TransactionsService } from 'services/tx'
 import CellsService from 'services/cells'
 import LockUtils from 'models/lock-utils'
 import { TransactionStatus } from 'types/cell-types'
 import { OutputStatus } from 'services/tx/params'
-import AddressEntity, { AddressVersion } from './entities/address'
-import { getConnection } from './ormconfig'
+import { AddressVersion } from './entities/address'
 import NodeService from 'services/node'
+import Store from 'models/store'
 
 export interface Address {
   walletId: string
@@ -27,24 +26,20 @@ export interface Address {
 }
 
 export default class AddressDao {
-  public static create = async (addresses: Address[]): Promise<AddressEntity[]> => {
-    const addressEntities: AddressEntity[] = addresses.map(address => {
-      const addressEntity = new AddressEntity()
-      addressEntity.walletId = address.walletId
-      addressEntity.address = address.address
-      addressEntity.path = address.path
-      addressEntity.addressType = address.addressType
-      addressEntity.addressIndex = address.addressIndex
-      addressEntity.txCount = address.txCount || 0
-      addressEntity.blake160 = address.blake160
-      addressEntity.version = address.version
-      addressEntity.liveBalance = address.liveBalance || '0'
-      addressEntity.sentBalance = address.sentBalance || '0'
-      addressEntity.pendingBalance = address.pendingBalance || '0'
-      return addressEntity
+  public static create = (addresses: Address[]): Address[] => {
+    const result = addresses.map(address => {
+      address.txCount = address.txCount || 0
+      address.liveBalance = address.liveBalance || '0'
+      address.sentBalance = address.sentBalance || '0'
+      address.pendingBalance = address.pendingBalance || '0'
+      address.balance = (BigInt(address.liveBalance) + BigInt(address.sentBalance)).toString()
+      return address
     })
+    return AddressStore.add(result)
+  }
 
-    return getConnection().manager.save(addressEntities)
+  public static getAll(): Address[] {
+    return AddressStore.getAll()
   }
 
   // txCount include all txs in db
@@ -56,190 +51,177 @@ export default class AddressDao {
   public static updateTxCountAndBalance = async (
     address: string,
     url: string = NodeService.getInstance().core.rpc.node.url
-  ): Promise<AddressEntity[]> => {
-    const addressEntities = await getConnection()
-      .getRepository(AddressEntity)
-      .find({
-        address,
-      })
+  ): Promise<Address[]> => {
+    const all = AddressStore.getAll()
+    const toUpdate = all.filter(value => {
+      return value.address === address
+    })
+    const others = all.filter(value => {
+      return value.address !== address
+    })
 
     const txCount: number = await TransactionsService.getCountByAddressAndStatus(address, [
       TransactionStatus.Pending,
       TransactionStatus.Success,
     ], url)
     const lockUtils = new LockUtils(await LockUtils.systemScript(url))
-    const entities = await Promise.all(
-      addressEntities.map(async entity => {
-        const addressEntity = entity
-        addressEntity.txCount = txCount
-        const lockHashes: string[] = lockUtils.addressToAllLockHashes(addressEntity.address)
-        addressEntity.liveBalance = await CellsService.getBalance(lockHashes, OutputStatus.Live)
-        addressEntity.sentBalance = await CellsService.getBalance(lockHashes, OutputStatus.Sent)
-        addressEntity.pendingBalance = await CellsService.getBalance(lockHashes, OutputStatus.Pending)
-        return addressEntity
+    const result = await Promise.all(
+      toUpdate.map(async entity => {
+        const item = entity
+        item.txCount = txCount
+        const lockHashes: string[] = lockUtils.addressToAllLockHashes(item.address)
+        item.liveBalance = await CellsService.getBalance(lockHashes, OutputStatus.Live)
+        item.sentBalance = await CellsService.getBalance(lockHashes, OutputStatus.Sent)
+        item.pendingBalance = await CellsService.getBalance(lockHashes, OutputStatus.Pending)
+        item.balance = (BigInt(item.liveBalance) + BigInt(item.sentBalance)).toString()
+        return item
       })
     )
 
-    return getConnection().manager.save(entities)
-  }
-
-  public static nextUnusedAddress = async (
-    walletId: string,
-    version: AddressVersion
-  ): Promise<AddressEntity | undefined> => {
-    const addressEntity = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-        version,
-        addressType: AddressType.Receiving,
-        txCount: 0,
-      })
-      .orderBy('address.addressIndex', 'ASC')
-      .getOne()
-
-    return addressEntity
-  }
-
-  public static nextUnusedChangeAddress = async (
-    walletId: string,
-    version: AddressVersion
-  ): Promise<AddressEntity | undefined> => {
-    const addressEntity = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-        version,
-        addressType: AddressType.Change,
-        txCount: 0,
-      })
-      .orderBy('address.addressIndex', 'ASC')
-      .getOne()
+    AddressStore.updateAll(toUpdate.concat(others))
+    return result
+  }
 
-    return addressEntity
+  public static nextUnusedAddress(walletId: string, version: AddressVersion): Address | undefined {
+    const addresses = AddressStore.getAll().filter(value => {
+      return value.walletId === walletId
+        && value.version === version
+        && value.addressType == AddressType.Receiving
+        && value.txCount === 0
+    })
+    return addresses.sort((lhs, rhs) => {
+      return lhs.addressIndex < rhs.addressIndex ? 1 : -1
+    })[0]
   }
 
-  public static allAddresses = async (version: AddressVersion): Promise<AddressEntity[]> => {
-    const addressEntities = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        version,
-      })
-      .getMany()
+  public static nextUnusedChangeAddress(walletId: string, version: AddressVersion): Address | undefined {
+    const addresses = AddressStore.getAll().filter(value => {
+      return value.walletId === walletId
+        && value.version === version
+        && value.addressType == AddressType.Change
+        && value.txCount === 0
+    })
+    return addresses.sort((lhs, rhs) => {
+      return lhs.addressIndex < rhs.addressIndex ? 1 : -1
+    })[0]
+  }
 
-    return addressEntities
+  public static allAddresses(version: AddressVersion): Address[] {
+    const all = AddressStore.getAll()
+    return all.filter(value => {
+      return value.version === version
+    })
   }
 
-  public static allAddressesByWalletId = async (
-    walletId: string,
-    version: AddressVersion
-  ): Promise<AddressEntity[]> => {
-    const addressEntities = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-        version,
-      })
-      .getMany()
-
-    return addressEntities
-  }
-
-  public static usedAddressesByWalletId = async (
-    walletId: string,
-    version: AddressVersion
-  ): Promise<AddressEntity[]> => {
-    const addressEntities = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-        version,
-        txCount: Not(0),
-      })
-      .getMany()
+  public static allAddressesByWalletId(walletId: string, version: AddressVersion): Address[] {
+    const all = AddressStore.getAll()
+    return all.filter(value => {
+      return value.walletId === walletId && value.version === version
+    })
+  }
 
-    return addressEntities
+  public static usedAddressesByWalletId(walletId: string, version: AddressVersion):Address[] {
+    const all = AddressStore.getAll()
+    return all.filter(value => {
+      return value.walletId === walletId
+        && value.version === version
+        && value.txCount !== 0
+    })
   }
 
-  public static findByAddress = async (address: string, walletId: string): Promise<AddressEntity | undefined> => {
-    const addressEntity = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        address,
-        walletId,
-      })
-      .getOne()
+  public static findByAddress(address: string, walletId: string): Address | undefined {
+    return AddressStore.getAll().find(value => {
+      return value.address === address && value.walletId == walletId
+    })
+  }
 
-    return addressEntity
+  public static findByAddresses(addresses: string[]): Address[] {
+    return AddressStore.getAll().filter(value => {
+      return addresses.includes(value.address)
+    })
   }
 
-  public static findByAddresses = async (addresses: string[]) => {
-    const addressEntities = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        address: In(addresses),
-      })
-      .getMany()
-    return addressEntities
-  }
-
-  public static maxAddressIndex = async (
-    walletId: string,
-    addressType: AddressType,
-    version: AddressVersion
-  ): Promise<AddressEntity | undefined> => {
-    const addressEntity = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-        addressType,
-        version,
-      })
-      .orderBy('address.addressIndex', 'DESC')
-      .getOne()
+  public static maxAddressIndex(walletId: string, addressType: AddressType, version: AddressVersion): Address | undefined {
+    const addresses = AddressStore.getAll().filter(value => {
+      return value.walletId === walletId
+        && value.addressType === addressType
+        && value.version === version
+    })
+    return addresses.sort((lhs, rhs) => {
+      return lhs.addressIndex > rhs.addressIndex ? -1 : 1
+    })[0]
+  }
 
-    if (!addressEntity) {
+  public static updateDescription(walletId: string, address: string, description: string): Address | undefined {
+    const item = AddressDao.findByAddress(address, walletId)
+    if (!item) {
       return undefined
     }
+    item.description = description
+    return AddressStore.update(item)
+  }
+
+  public static deleteByWalletId(walletId: string): Address[] {
+    const all = AddressStore.getAll()
+    const toKeep = all.filter(value => {
+      return value.walletId !== walletId
+    })
+    const deleted = all.filter(value => {
+      return value.walletId === walletId
+    })
+    AddressStore.updateAll(toKeep)
 
-    return addressEntity
+    return deleted
   }
 
-  public static updateDescription = async (walletId: string, address: string, description: string) => {
-    const addressEntity = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-        address,
-      })
-      .getOne()
+  public static updateAll(addresses: Address[]) {
+    AddressStore.updateAll(addresses)
+  }
 
-    if (!addressEntity) {
-      return undefined
+  public static deleteAll() {
+    AddressStore.updateAll([])
+  }
+}
+
+/// Persist all addresses as array in `addresses/index.json`.
+class AddressStore {
+  static MODULE_NAME = 'addresses'
+  static ROOT_KEY = 'addresses'
+  static store = new Store(AddressStore.MODULE_NAME, 'index.json', '{}')
+
+  static getAll(): Address[] {
+    const root = AddressStore.store.readSync<Address[]>(AddressStore.ROOT_KEY)
+    return root || []
+  }
+
+  static updateAll(addresses: Address[]) {
+    AddressStore.store.writeSync(AddressStore.ROOT_KEY, addresses)
+  }
+
+  static add(addresses: Address[]): Address[] {
+    const all = AddressStore.getAll()
+    for (let address of addresses) {
+      all.push(address)
     }
-    addressEntity.description = description
-    return getConnection().manager.save(addressEntity)
+
+    AddressStore.updateAll(all)
+
+    return addresses
   }
 
-  public static deleteByWalletId = async (walletId: string) => {
-    const addresses = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .where({
-        walletId,
-      })
-      .getMany()
-    const result = addresses.map(addr => addr.toInterface())
-    await getConnection().manager.remove(addresses)
-    return result
+  static update(address: Address): Address {
+    const all = AddressStore.getAll()
+    const exist = all.findIndex(value => {
+      return value.walletId === address.walletId && value.address === address.address
+    })
+    if (exist !== -1) {
+      all[exist] = address
+    } else {
+      all.push(address)
+    }
+
+    AddressStore.updateAll(all)
+
+    return address
   }
 }
diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
index 101d19cafc..5639ee1910 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -3,7 +3,7 @@ import { AccountExtendedPublicKey } from 'models/keys/key'
 import Address, { AddressType } from 'models/keys/address'
 import LockUtils from 'models/lock-utils'
 import AddressDao, { Address as AddressInterface } from 'database/address/dao'
-import AddressEntity, { AddressVersion } from 'database/address/entities/address'
+import { AddressVersion } from 'database/address/entities/address'
 import AddressCreatedSubject from 'models/subjects/address-created-subject'
 import NodeService from './node'
 import ChainInfo from 'models/chain-info'
@@ -19,7 +19,7 @@ export interface AddressMetaInfo {
 
 export default class AddressService {
   public static isAddressUsed = async (address: string, walletId: string): Promise<boolean> => {
-    const addressEntity = await AddressDao.findByAddress(address, walletId)
+    const addressEntity = AddressDao.findByAddress(address, walletId)
     return !!addressEntity
   }
 
@@ -46,7 +46,7 @@ export default class AddressService {
       ...addresses.testnetChange,
       ...addresses.mainnetChange,
     ]
-    await AddressDao.create(allAddresses)
+    AddressDao.create(allAddresses)
 
     // TODO: notify address created and pass addressWay
     AddressService.notifyAddressCreated(allAddresses, isImporting)
@@ -72,8 +72,8 @@ export default class AddressService {
     changeAddressCount: number = 10
   ) => {
     const addressVersion = AddressService.getAddressVersion()
-    const maxIndexReceivingAddress = await AddressDao.maxAddressIndex(walletId, AddressType.Receiving, addressVersion)
-    const maxIndexChangeAddress = await AddressDao.maxAddressIndex(walletId, AddressType.Change, addressVersion)
+    const maxIndexReceivingAddress = AddressDao.maxAddressIndex(walletId, AddressType.Receiving, addressVersion)
+    const maxIndexChangeAddress = AddressDao.maxAddressIndex(walletId, AddressType.Change, addressVersion)
     if (
       maxIndexReceivingAddress !== undefined &&
       maxIndexReceivingAddress.txCount === 0 &&
@@ -99,7 +99,7 @@ export default class AddressService {
     addresses: string[],
     url: string = NodeService.getInstance().core.rpc.node.url
   ) => {
-    let addrs: AddressEntity[] = []
+    let addrs: Address[] = []
     for (const address of addresses) {
       const ads = await AddressDao.updateTxCountAndBalance(address, url)
       addrs = addrs.concat(ads)
@@ -197,43 +197,37 @@ export default class AddressService {
   public static nextUnusedAddress = async (walletId: string): Promise<AddressInterface | undefined> => {
     const version = AddressService.getAddressVersion()
 
-    const addressEntity = await AddressDao.nextUnusedAddress(walletId, version)
+    const addressEntity = AddressDao.nextUnusedAddress(walletId, version)
     if (!addressEntity) {
       return undefined
     }
-    return addressEntity.toInterface()
+    return addressEntity
   }
 
   public static nextUnusedChangeAddress = async (walletId: string): Promise<AddressInterface | undefined> => {
     const version = AddressService.getAddressVersion()
 
-    const addressEntity = await AddressDao.nextUnusedChangeAddress(walletId, version)
+    const addressEntity = AddressDao.nextUnusedChangeAddress(walletId, version)
     if (!addressEntity) {
       return undefined
     }
-    return addressEntity.toInterface()
+    return addressEntity
   }
 
   public static allAddresses = async (): Promise<AddressInterface[]> => {
     const version = AddressService.getAddressVersion()
 
-    const addressEntities = await AddressDao.allAddresses(version)
-
-    return addressEntities.map(addr => addr.toInterface())
+    return AddressDao.allAddresses(version)
   }
 
   public static allAddressesByWalletId = async (walletId: string): Promise<AddressInterface[]> => {
     const version = AddressService.getAddressVersion()
-    const addressEntities = await AddressDao.allAddressesByWalletId(walletId, version)
-
-    return addressEntities.map(addr => addr.toInterface())
+    return AddressDao.allAddressesByWalletId(walletId, version)
   }
 
   public static usedAddresses = async (walletId: string): Promise<AddressInterface[]> => {
     const version = AddressService.getAddressVersion()
-    const addressEntities = await AddressDao.usedAddressesByWalletId(walletId, version)
-
-    return addressEntities.map(addr => addr.toInterface())
+    return AddressDao.usedAddressesByWalletId(walletId, version)
   }
 
   public static updateDescription = async (walletId: string, address: string, description: string) => {
@@ -245,8 +239,7 @@ export default class AddressService {
   }
 
   public static findByAddresses = async (addresses: string[]) => {
-    const entities = await AddressDao.findByAddresses(addresses)
-    return entities.map(entity => entity.toInterface())
+    return AddressDao.findByAddresses(addresses)
   }
 
   private static getAddressVersion = (): AddressVersion => {
diff --git a/packages/neuron-wallet/tests/database/address/balance.test.ts b/packages/neuron-wallet/tests/database/address/balance.test.ts
index 3abb13f16f..52156d804e 100644
--- a/packages/neuron-wallet/tests/database/address/balance.test.ts
+++ b/packages/neuron-wallet/tests/database/address/balance.test.ts
@@ -1,21 +1,10 @@
-import AddressEntity, { AddressVersion } from '../../../src/database/address/entities/address'
+import { AddressVersion } from '../../../src/database/address/entities/address'
 import { AddressType } from '../../../src/models/keys/address'
-import initConnection, { getConnection } from '../../../src/database/address/ormconfig'
 import AddressDao, { Address } from '../../../src/database/address/dao'
 
 describe('balance', () => {
-  beforeAll(async () => {
-    await initConnection()
-  })
-
-  afterAll(async () => {
-    await getConnection().close()
-  })
-
   beforeEach(async () => {
-    const connection = getConnection()
-    await connection.dropDatabase()
-    await connection.synchronize()
+    AddressDao.deleteAll()
   })
 
   const generateAddress = (
@@ -43,24 +32,24 @@ describe('balance', () => {
 
   it('balance = live + sent - pending', async () => {
     const address = generateAddress('1000', '100', '300')
-    const addrs: AddressEntity[] = await AddressDao.create([address])
+    const addrs: Address[] = await AddressDao.create([address])
     const addr = addrs[0]
-    expect(addr.balance()).toEqual((1000 + 100).toString())
+    expect(addr.balance).toEqual((1000 + 100).toString())
   })
 
   it('the balance returned by the toInterface() is correct', async () => {
     const address = generateAddress('1000', '100', '300')
-    const addrs: AddressEntity[] = await AddressDao.create([address])
+    const addrs: Address[] = AddressDao.create([address])
     const addr = addrs[0]
-    expect(addr.toInterface().balance).toEqual((1000 + 100).toString())
+    expect(addr.balance).toEqual((1000 + 100).toString())
   })
 
   it('sent to others', async () => {
     // have 1000, sent to others 200, and refund 800
     const addresses = [generateAddress('0', '0', '1000'), generateAddress('0', '800', '0')]
 
-    const addrs: AddressEntity[] = await AddressDao.create(addresses)
-    const balance: bigint = addrs.map(addr => BigInt(addr.balance())).reduce((result, c) => result + c, BigInt(0))
+    const addrs: Address[] = await AddressDao.create(addresses)
+    const balance: bigint = addrs.map(addr => BigInt(addr.balance)).reduce((result, c) => result + c, BigInt(0))
 
     expect(balance).toEqual(BigInt(800))
   })
@@ -72,8 +61,8 @@ describe('balance', () => {
       generateAddress('0', '200', '0'),
       generateAddress('0', '800', '0'),
     ]
-    const addrs: AddressEntity[] = await AddressDao.create(addresses)
-    const balance: bigint = addrs.map(addr => BigInt(addr.balance())).reduce((result, c) => result + c, BigInt(0))
+    const addrs: Address[] = await AddressDao.create(addresses)
+    const balance: bigint = addrs.map(addr => BigInt(addr.balance)).reduce((result, c) => result + c, BigInt(0))
 
     expect(balance).toEqual(BigInt(1000))
   })
@@ -82,8 +71,8 @@ describe('balance', () => {
     // have 1000, sent to others 200, and refund 790, with 10 shannon fee
     const addresses = [generateAddress('0', '0', '1000'), generateAddress('0', '790', '0')]
 
-    const addrs: AddressEntity[] = await AddressDao.create(addresses)
-    const balance: bigint = addrs.map(addr => BigInt(addr.balance())).reduce((result, c) => result + c, BigInt(0))
+    const addrs: Address[] = await AddressDao.create(addresses)
+    const balance: bigint = addrs.map(addr => BigInt(addr.balance)).reduce((result, c) => result + c, BigInt(0))
 
     expect(balance).toEqual(BigInt(790))
   })
@@ -96,8 +85,8 @@ describe('balance', () => {
       generateAddress('0', '790', '0'),
     ]
 
-    const addrs: AddressEntity[] = await AddressDao.create(addresses)
-    const balance: bigint = addrs.map(addr => BigInt(addr.balance())).reduce((result, c) => result + c, BigInt(0))
+    const addrs: Address[] = await AddressDao.create(addresses)
+    const balance: bigint = addrs.map(addr => BigInt(addr.balance)).reduce((result, c) => result + c, BigInt(0))
 
     expect(balance).toEqual(BigInt(990))
   })
diff --git a/packages/neuron-wallet/tests/database/address/dao.test.ts b/packages/neuron-wallet/tests/database/address/dao.test.ts
index 2f05b462d5..208271f11b 100644
--- a/packages/neuron-wallet/tests/database/address/dao.test.ts
+++ b/packages/neuron-wallet/tests/database/address/dao.test.ts
@@ -1,6 +1,5 @@
-import AddressEntity, { AddressVersion } from '../../../src/database/address/entities/address'
+import { AddressVersion } from '../../../src/database/address/entities/address'
 import { AddressType } from '../../../src/models/keys/address'
-import initConnection, { getConnection } from '../../../src/database/address/ormconfig'
 import AddressDao, { Address } from '../../../src/database/address/dao'
 
 describe('Address Dao tests', () => {
@@ -49,27 +48,14 @@ describe('Address Dao tests', () => {
     version: AddressVersion.Testnet,
   }
 
-  beforeAll(async () => {
-    await initConnection()
-  })
-
-  afterAll(async () => {
-    await getConnection().close()
-  })
-
   beforeEach(async () => {
-    const connection = getConnection()
-    await connection.dropDatabase()
-    await connection.synchronize()
+    AddressDao.deleteAll()
   })
 
   it('create', async () => {
-    await AddressDao.create([address])
+    AddressDao.create([address])
 
-    const all = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .getMany()
+    const all = AddressDao.getAll()
 
     expect(all.length).toEqual(1)
     expect(all[0].address).toEqual(address.address)
@@ -90,63 +76,63 @@ describe('Address Dao tests', () => {
   // })
 
   it('nextUnusedAddress', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
 
-    const addr = await AddressDao.nextUnusedAddress('1', AddressVersion.Testnet)
+    const addr = AddressDao.nextUnusedAddress('1', AddressVersion.Testnet)
     expect(addr!.address).toEqual(address.address)
 
-    const usedAddr = await AddressDao.nextUnusedAddress('2', AddressVersion.Testnet)
+    const usedAddr = AddressDao.nextUnusedAddress('2', AddressVersion.Testnet)
     expect(usedAddr).toBe(undefined)
 
-    const mainnetAddr = await AddressDao.nextUnusedAddress('1', AddressVersion.Mainnet)
+    const mainnetAddr = AddressDao.nextUnusedAddress('1', AddressVersion.Mainnet)
     expect(mainnetAddr).toBe(undefined)
   })
 
   it('nextUnusedChangeAddress', async () => {
-    await AddressDao.create([address, usedAddress, changeAddress])
+    AddressDao.create([address, usedAddress, changeAddress])
 
-    const addr = await AddressDao.nextUnusedChangeAddress('1', AddressVersion.Testnet)
+    const addr = AddressDao.nextUnusedChangeAddress('1', AddressVersion.Testnet)
     expect(addr!.address).toEqual(changeAddress.address)
 
-    const usedAddr = await AddressDao.nextUnusedAddress('2', AddressVersion.Testnet)
+    const usedAddr = AddressDao.nextUnusedAddress('2', AddressVersion.Testnet)
     expect(usedAddr).toBe(undefined)
 
-    const mainnetAddr = await AddressDao.nextUnusedAddress('1', AddressVersion.Mainnet)
+    const mainnetAddr = AddressDao.nextUnusedAddress('1', AddressVersion.Mainnet)
     expect(mainnetAddr).toBe(undefined)
   })
 
   it('allAddresses', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
 
-    const all = await AddressDao.allAddresses(AddressVersion.Testnet)
+    const all = AddressDao.allAddresses(AddressVersion.Testnet)
 
-    const allMainnet = await AddressDao.allAddresses(AddressVersion.Mainnet)
+    const allMainnet = AddressDao.allAddresses(AddressVersion.Mainnet)
 
     expect(all.length).toEqual(2)
     expect(allMainnet.length).toEqual(0)
   })
 
   it('allAddressesByWalletId', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
 
-    const all = await AddressDao.allAddressesByWalletId('1', AddressVersion.Testnet)
+    const all = AddressDao.allAddressesByWalletId('1', AddressVersion.Testnet)
     expect(all.length).toEqual(1)
   })
 
   it('usedAddressByWalletId', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
 
-    const walletOne = await AddressDao.usedAddressesByWalletId('1', AddressVersion.Testnet)
+    const walletOne = AddressDao.usedAddressesByWalletId('1', AddressVersion.Testnet)
     expect(walletOne.length).toEqual(0)
 
-    const walletTwo = await AddressDao.usedAddressesByWalletId('2', AddressVersion.Testnet)
+    const walletTwo = AddressDao.usedAddressesByWalletId('2', AddressVersion.Testnet)
     expect(walletTwo.length).toEqual(1)
   })
 
   it('findByAddress', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
 
-    const one = await AddressDao.findByAddress(address.address, address.walletId)
+    const one = AddressDao.findByAddress(address.address, address.walletId)
 
     expect(one!.address).toEqual(address.address)
   })
diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index 2fae0cdda5..1d8196bbc8 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -1,6 +1,5 @@
 import AddressService from '../../src/services/addresses'
-import initConnection, { getConnection } from '../../src/database/address/ormconfig'
-import AddressEntity, { AddressVersion } from '../../src/database/address/entities/address'
+import { AddressVersion } from '../../src/database/address/entities/address'
 import AddressDao, { Address } from '../../src/database/address/dao'
 import { AddressType } from '../../src/models/keys/address'
 import { AccountExtendedPublicKey } from '../../src/models/keys/key'
@@ -88,18 +87,8 @@ describe('Key tests with db', () => {
     version: AddressVersion.Testnet,
   }
 
-  beforeAll(async () => {
-    await initConnection()
-  })
-
-  afterAll(async () => {
-    await getConnection().close()
-  })
-
   beforeEach(async () => {
-    const connection = getConnection()
-    await connection.dropDatabase()
-    await connection.synchronize()
+    AddressDao.deleteAll()
   })
 
   const generate = async (id: string = walletId) => {
@@ -113,10 +102,7 @@ describe('Key tests with db', () => {
   it('generateAndSave', async () => {
     await generate()
 
-    const all = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .getMany()
+    const all = AddressDao.getAll()
 
     expect(all.length).toEqual((2 + 1) * 2)
   })
@@ -124,26 +110,23 @@ describe('Key tests with db', () => {
   it('checkAndGenerateSave', async () => {
     await generate()
 
-    const all = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .getMany()
+    const all = AddressDao.getAll()
 
     const usedAll = all
-      .filter(one => one.addressType === AddressType.Receiving)
       .map(one => {
-        const entity = one
-        entity.txCount = 1
-        return entity
+        if (one.addressType === AddressType.Receiving) {
+          const entity = one
+          entity.txCount = 1
+          return entity
+        } else {
+          return one
+        }
       })
-    await getConnection().manager.save(usedAll)
+    AddressDao.updateAll(usedAll)
 
     await checkAndGenerate()
 
-    const final = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .getMany()
+    const final = AddressDao.getAll()
 
     expect(final.length).toEqual((2 + 1) * 2 * 2)
   })
@@ -151,32 +134,29 @@ describe('Key tests with db', () => {
   it('generateAndSave with two wallet', async () => {
     await generate()
     await generate('2')
-    const all = await getConnection()
-      .getRepository(AddressEntity)
-      .createQueryBuilder('address')
-      .getMany()
+    const all = AddressDao.getAll()
 
     expect(all.length).toEqual((2 + 1) * 2 * 2)
   })
 
   it('isAddressUsed', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
     const used = await AddressService.isAddressUsed(address.address, walletId)
     expect(used).toBe(true)
   })
 
   it('nextUnusedAddress', async () => {
-    await AddressDao.create([address, usedAddress, changeAddress])
+    AddressDao.create([address, usedAddress, changeAddress])
     const addr = await AddressService.nextUnusedAddress(walletId)
-    const addrDao = await AddressDao.nextUnusedAddress(walletId, AddressVersion.Testnet)
-    expect(addr).toEqual(addrDao && addrDao.toInterface())
+    const addrDao = AddressDao.nextUnusedAddress(walletId, AddressVersion.Testnet)
+    expect(addr).toEqual(addrDao)
   })
 
   it('nextUnusedChangeAddress', async () => {
-    await AddressDao.create([address, usedAddress, changeAddress])
+    AddressDao.create([address, usedAddress, changeAddress])
     const addr = await AddressService.nextUnusedChangeAddress(walletId)
-    const addrDao = await AddressDao.nextUnusedChangeAddress(walletId, AddressVersion.Testnet)
-    expect(addr).toEqual(addrDao && addrDao.toInterface())
+    const addrDao = AddressDao.nextUnusedChangeAddress(walletId, AddressVersion.Testnet)
+    expect(addr).toEqual(addrDao)
   })
 
   it('allAddresses', async () => {
@@ -194,7 +174,7 @@ describe('Key tests with db', () => {
   })
 
   it('usedAddress', async () => {
-    await AddressDao.create([address, usedAddress])
+    AddressDao.create([address, usedAddress])
 
     const addr = await AddressService.usedAddresses(walletId)
     expect(addr).toEqual([])

From 617a9a3cc513397fcc5677b35d3d61b99bd12a30 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Wed, 13 Nov 2019 17:24:17 +0800
Subject: [PATCH 14/35] feat: Send address db changed event when address store
 updates any content

---
 packages/neuron-wallet/src/database/address/dao.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/neuron-wallet/src/database/address/dao.ts b/packages/neuron-wallet/src/database/address/dao.ts
index f39c116dca..1943392334 100644
--- a/packages/neuron-wallet/src/database/address/dao.ts
+++ b/packages/neuron-wallet/src/database/address/dao.ts
@@ -1,3 +1,4 @@
+import { remote } from 'electron'
 import { AddressType } from 'models/keys/address'
 import { TransactionsService } from 'services/tx'
 import CellsService from 'services/cells'
@@ -7,6 +8,7 @@ import { OutputStatus } from 'services/tx/params'
 import { AddressVersion } from './entities/address'
 import NodeService from 'services/node'
 import Store from 'models/store'
+import AddressDbChangedSubject from 'models/subjects/address-db-changed-subject'
 
 export interface Address {
   walletId: string
@@ -183,6 +185,11 @@ export default class AddressDao {
   }
 }
 
+const isRenderer = process && process.type === 'renderer'
+const addressDbChangedSubject = isRenderer
+  ? remote.require('./models/subjects/address-db-changed-subject').default.getSubject()
+  : AddressDbChangedSubject.getSubject()
+
 /// Persist all addresses as array in `addresses/index.json`.
 class AddressStore {
   static MODULE_NAME = 'addresses'
@@ -196,6 +203,7 @@ class AddressStore {
 
   static updateAll(addresses: Address[]) {
     AddressStore.store.writeSync(AddressStore.ROOT_KEY, addresses)
+    AddressStore.changed()
   }
 
   static add(addresses: Address[]): Address[] {
@@ -224,4 +232,8 @@ class AddressStore {
 
     return address
   }
+
+  static changed() {
+    addressDbChangedSubject.next("Updated")
+  }
 }

From 6f9534040df87df533a431a04ce433a0533656ae Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Wed, 13 Nov 2019 18:08:17 +0800
Subject: [PATCH 15/35] feat: Remove address sqlite db

---
 ormconfig-address.json                        |  21 ----
 package.json                                  |   3 +-
 .../address/{dao.ts => address-dao.ts}        |   6 +-
 .../src/database/address/entities/address.ts  | 116 ------------------
 .../migrations/1561461669542-AddAddress.ts    |  13 --
 .../migrations/1562126909151-extendBalance.ts |  24 ----
 .../1567485550388-AddTotalBalance.ts          |  17 ---
 .../1573458655136-RemoveTotalBalance.ts       |  17 ---
 .../src/database/address/ormconfig.ts         |  51 --------
 .../neuron-wallet/src/listeners/address.ts    |   3 +-
 packages/neuron-wallet/src/main.ts            |   2 -
 .../subjects/address-created-subject.ts       |   2 +-
 .../neuron-wallet/src/services/addresses.ts   |  16 +--
 .../neuron-wallet/src/services/wallets.ts     |   2 +-
 .../src/startup/sync-block-task/indexer.ts    |   2 +-
 .../src/startup/sync-block-task/sync.ts       |   2 +-
 .../src/startup/sync-block-task/task.ts       |   2 -
 .../tests/database/address/balance.test.ts    |   3 +-
 .../tests/database/address/dao.test.ts        |   3 +-
 .../tests/services/address.test.ts            |   3 +-
 20 files changed, 21 insertions(+), 287 deletions(-)
 delete mode 100644 ormconfig-address.json
 rename packages/neuron-wallet/src/database/address/{dao.ts => address-dao.ts} (99%)
 delete mode 100644 packages/neuron-wallet/src/database/address/entities/address.ts
 delete mode 100644 packages/neuron-wallet/src/database/address/migrations/1561461669542-AddAddress.ts
 delete mode 100644 packages/neuron-wallet/src/database/address/migrations/1562126909151-extendBalance.ts
 delete mode 100644 packages/neuron-wallet/src/database/address/migrations/1567485550388-AddTotalBalance.ts
 delete mode 100644 packages/neuron-wallet/src/database/address/migrations/1573458655136-RemoveTotalBalance.ts
 delete mode 100644 packages/neuron-wallet/src/database/address/ormconfig.ts

diff --git a/ormconfig-address.json b/ormconfig-address.json
deleted file mode 100644
index 89b3d7e5ca..0000000000
--- a/ormconfig-address.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "type": "sqlite",
-  "synchronize": false,
-  "migrationsRun": true,
-  "logging": true,
-  "database": "address-dev.sqlite",
-  "entities": [
-     "packages/neuron-wallet/dist/database/address/entities/**/*.js"
-  ],
-  "migrations": [
-     "packages/neuron-wallet/dist/database/address/migrations/**/*.js"
-  ],
-  "subscribers": [
-     "packages/neuron-wallet/dist/database/address/subscriber/**/*.js"
-  ],
-  "cli": {
-     "entitiesDir": "packages/neuron-wallet/src/database/address/entities",
-     "migrationsDir": "packages/neuron-wallet/src/database/address/migrations",
-     "subscribersDir": "packages/neuron-wallet/src/database/address/subscriber"
-  }
-}
diff --git a/package.json b/package.json
index e4d3b62edf..cca3c7e96c 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,7 @@
     "test:e2e": "yarn build && ./scripts/copy-ui-files.sh && lerna run --parallel test:e2e",
     "lint": "lerna run --stream lint",
     "postinstall": "lerna run rebuild:nativemodules",
-    "db:chain": "node ./node_modules/.bin/typeorm",
-    "db:address": "node ./node_modules/.bin/typeorm --config ormconfig-address.json"
+    "db:chain": "node ./node_modules/.bin/typeorm"
   },
   "husky": {
     "hooks": {
diff --git a/packages/neuron-wallet/src/database/address/dao.ts b/packages/neuron-wallet/src/database/address/address-dao.ts
similarity index 99%
rename from packages/neuron-wallet/src/database/address/dao.ts
rename to packages/neuron-wallet/src/database/address/address-dao.ts
index 1943392334..76b6b28b5e 100644
--- a/packages/neuron-wallet/src/database/address/dao.ts
+++ b/packages/neuron-wallet/src/database/address/address-dao.ts
@@ -5,11 +5,15 @@ import CellsService from 'services/cells'
 import LockUtils from 'models/lock-utils'
 import { TransactionStatus } from 'types/cell-types'
 import { OutputStatus } from 'services/tx/params'
-import { AddressVersion } from './entities/address'
 import NodeService from 'services/node'
 import Store from 'models/store'
 import AddressDbChangedSubject from 'models/subjects/address-db-changed-subject'
 
+export enum AddressVersion {
+  Testnet = 'testnet',
+  Mainnet = 'mainnet',
+}
+
 export interface Address {
   walletId: string
   address: string
diff --git a/packages/neuron-wallet/src/database/address/entities/address.ts b/packages/neuron-wallet/src/database/address/entities/address.ts
deleted file mode 100644
index 1cdd995d60..0000000000
--- a/packages/neuron-wallet/src/database/address/entities/address.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { remote } from 'electron'
-import { Entity, BaseEntity, PrimaryColumn, Column, AfterInsert, AfterUpdate, AfterRemove } from 'typeorm'
-import { AddressType } from 'models/keys/address'
-import AddressDbChangedSubject from 'models/subjects/address-db-changed-subject'
-import { Address as AddressInterface } from '../dao'
-
-export enum AddressVersion {
-  Testnet = 'testnet',
-  Mainnet = 'mainnet',
-}
-
-const isRenderer = process && process.type === 'renderer'
-const addressDbChangedSubject = isRenderer
-  ? remote.require('./models/subjects/address-db-changed-subject').default.getSubject()
-  : AddressDbChangedSubject.getSubject()
-
-@Entity()
-export default class Address extends BaseEntity {
-  @PrimaryColumn({
-    type: 'varchar',
-  })
-  address!: string
-
-  @PrimaryColumn({
-    type: 'varchar',
-  })
-  walletId!: string
-
-  @Column({
-    type: 'varchar',
-  })
-  path!: string
-
-  @Column({
-    type: 'int',
-  })
-  addressType!: AddressType
-
-  @Column({
-    type: 'int',
-  })
-  addressIndex!: number
-
-  @Column({
-    type: 'int',
-  })
-  txCount!: number
-
-  @Column({
-    type: 'varchar',
-  })
-  blake160!: string
-
-  @Column({
-    type: 'varchar',
-  })
-  version!: AddressVersion
-
-  @Column({
-    type: 'varchar',
-    nullable: true,
-  })
-  description?: string
-
-  @Column({
-    type: 'varchar',
-  })
-  liveBalance: string = '0'
-
-  @Column()
-  sentBalance: string = '0'
-
-  @Column()
-  pendingBalance: string = '0'
-
-  public balance = (): string => {
-    return (BigInt(this.liveBalance) + BigInt(this.sentBalance)).toString()
-  }
-
-  public toInterface = (): AddressInterface => {
-    return {
-      address: this.address,
-      walletId: this.walletId,
-      path: this.path,
-      addressType: this.addressType,
-      addressIndex: this.addressIndex,
-      txCount: this.txCount,
-      blake160: this.blake160,
-      version: this.version,
-      liveBalance: this.liveBalance,
-      sentBalance: this.sentBalance,
-      pendingBalance: this.pendingBalance,
-      balance: this.balance(),
-      description: this.description,
-    }
-  }
-
-  @AfterInsert()
-  emitInsert() {
-    this.changed('AfterInsert')
-  }
-
-  @AfterUpdate()
-  emitUpdate() {
-    this.changed('AfterUpdate')
-  }
-
-  @AfterRemove()
-  emitRemove() {
-    this.changed('AfterRemove')
-  }
-
-  private changed = (event: string) => {
-    addressDbChangedSubject.next(event)
-  }
-}
diff --git a/packages/neuron-wallet/src/database/address/migrations/1561461669542-AddAddress.ts b/packages/neuron-wallet/src/database/address/migrations/1561461669542-AddAddress.ts
deleted file mode 100644
index 34bccf8ae8..0000000000
--- a/packages/neuron-wallet/src/database/address/migrations/1561461669542-AddAddress.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class AddAddress1561461669542 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`CREATE TABLE "address" ("address" varchar NOT NULL, "walletId" varchar NOT NULL, "path" varchar NOT NULL, "addressType" integer NOT NULL, "addressIndex" integer NOT NULL, "txCount" integer NOT NULL, "blake160" varchar NOT NULL, "version" varchar NOT NULL, "description" varchar, "balance" varchar NOT NULL, PRIMARY KEY ("address", "walletId"))`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-        await queryRunner.query(`DROP TABLE "address"`);
-    }
-
-}
diff --git a/packages/neuron-wallet/src/database/address/migrations/1562126909151-extendBalance.ts b/packages/neuron-wallet/src/database/address/migrations/1562126909151-extendBalance.ts
deleted file mode 100644
index 516d5befbc..0000000000
--- a/packages/neuron-wallet/src/database/address/migrations/1562126909151-extendBalance.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
-
-export class extendBalance1562126909151 implements MigrationInterface {
-
-    public async up(queryRunner: QueryRunner): Promise<any> {
-      await queryRunner.query(`ALTER TABLE 'address' ADD COLUMN 'sentBalance' varchar NOT NULL DEFAULT '0';`)
-      await queryRunner.query(`ALTER TABLE 'address' ADD COLUMN 'pendingBalance' varchar NOT NULL DEFAULT '0';`)
-
-      await queryRunner.changeColumn('address', 'balance', new TableColumn({
-        name: 'liveBalance',
-        type: 'varchar',
-      }))
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<any> {
-      await queryRunner.dropColumn('address', 'sentBalance')
-      await queryRunner.dropColumn('address', 'pendingBalance')
-      await queryRunner.changeColumn('address', 'liveBalance', new TableColumn({
-        name: 'balance',
-        type: 'varchar',
-      }))
-    }
-
-}
diff --git a/packages/neuron-wallet/src/database/address/migrations/1567485550388-AddTotalBalance.ts b/packages/neuron-wallet/src/database/address/migrations/1567485550388-AddTotalBalance.ts
deleted file mode 100644
index 03b3e5df9b..0000000000
--- a/packages/neuron-wallet/src/database/address/migrations/1567485550388-AddTotalBalance.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
-
-export class AddTotalBalance1567485550388 implements MigrationInterface {
-
-  public async up(queryRunner: QueryRunner): Promise<any> {
-    await queryRunner.addColumn('address', new TableColumn({
-      name: 'totalBalance',
-      type: 'varchar',
-      default: '0',
-    }))
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<any> {
-    await queryRunner.dropColumn('address', 'totalBalance')
-  }
-
-}
diff --git a/packages/neuron-wallet/src/database/address/migrations/1573458655136-RemoveTotalBalance.ts b/packages/neuron-wallet/src/database/address/migrations/1573458655136-RemoveTotalBalance.ts
deleted file mode 100644
index 4bc22a5710..0000000000
--- a/packages/neuron-wallet/src/database/address/migrations/1573458655136-RemoveTotalBalance.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
-
-export class RemoveTotalBalance1573458655136 implements MigrationInterface {
-
-  public async up(queryRunner: QueryRunner): Promise<any> {
-    await queryRunner.dropColumn('address', 'totalBalance')
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<any> {
-    await queryRunner.addColumn('address', new TableColumn({
-      name: 'totalBalance',
-      type: 'varchar',
-      default: '0',
-    }))
-  }
-
-}
diff --git a/packages/neuron-wallet/src/database/address/ormconfig.ts b/packages/neuron-wallet/src/database/address/ormconfig.ts
deleted file mode 100644
index 3aa6ee695a..0000000000
--- a/packages/neuron-wallet/src/database/address/ormconfig.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { createConnection, getConnection as ormGetConnection } from 'typeorm'
-import { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'
-import path from 'path'
-
-import env from 'env'
-
-import Address from './entities/address'
-
-import { AddAddress1561461669542 } from './migrations/1561461669542-AddAddress'
-import { extendBalance1562126909151 } from './migrations/1562126909151-extendBalance'
-import { AddTotalBalance1567485550388 } from './migrations/1567485550388-AddTotalBalance'
-import { RemoveTotalBalance1573458655136 } from './migrations/1573458655136-RemoveTotalBalance'
-
-const dbPath = path.join(env.fileBasePath, 'address.sqlite')
-
-const connectionName = 'address'
-
-const connectOptions = (): SqliteConnectionOptions => {
-  const database = env.isTestMode ? ':memory:' : dbPath
-  return {
-    name: connectionName,
-    type: 'sqlite',
-    database,
-    entities: [Address],
-    migrations: [
-      AddAddress1561461669542,
-      extendBalance1562126909151,
-      AddTotalBalance1567485550388,
-      RemoveTotalBalance1573458655136,
-    ],
-    synchronize: false,
-    migrationsRun: true,
-    logging: ['error'],
-  }
-}
-
-export const getConnection = () => {
-  return ormGetConnection(connectionName)
-}
-
-const setBusyTimeout = async () => {
-  await getConnection().manager.query(`PRAGMA busy_timeout = 3000;`)
-}
-
-export const initConnection = async () => {
-  const connectionOptions = connectOptions()
-  await createConnection(connectionOptions)
-  await setBusyTimeout()
-}
-
-export default initConnection
diff --git a/packages/neuron-wallet/src/listeners/address.ts b/packages/neuron-wallet/src/listeners/address.ts
index 6b3994240e..26af7af070 100644
--- a/packages/neuron-wallet/src/listeners/address.ts
+++ b/packages/neuron-wallet/src/listeners/address.ts
@@ -3,6 +3,7 @@ import { ReplaySubject } from 'rxjs'
 import { bufferTime } from 'rxjs/operators'
 import AddressesUsedSubject, { AddressesWithURL } from 'models/subjects/addresses-used-subject'
 import AddressService from 'services/addresses'
+import { Address } from 'database/address/address-dao'
 import WalletService from 'services/wallets'
 import { AccountExtendedPublicKey } from 'models/keys/key'
 
@@ -27,7 +28,7 @@ export const register = () => {
     const url: string = addressesList[addressesList.length - 1].url
     const uniqueAddresses = [...new Set(addresses)]
     const addrs = await AddressService.updateTxCountAndBalances(uniqueAddresses, url)
-    const walletIds: string[] = addrs.map(addr => addr.walletId).filter((value, idx, a) => a.indexOf(value) === idx)
+    const walletIds: string[] = addrs.map(addr => (addr as Address).walletId).filter((value, idx, a) => a.indexOf(value) === idx)
     await Promise.all(
       walletIds.map(async id => {
         const wallet = WalletService.getInstance().get(id)
diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts
index 550f1588eb..bb62cfe71e 100644
--- a/packages/neuron-wallet/src/main.ts
+++ b/packages/neuron-wallet/src/main.ts
@@ -1,7 +1,6 @@
 import { app } from 'electron'
 
 import AppController from 'controllers/app'
-import initConnection from 'database/address/ormconfig'
 import createSyncBlockTask from 'startup/sync-block-task/create'
 import { changeLanguage } from 'utils/i18n'
 
@@ -10,7 +9,6 @@ const appController = new AppController()
 app.on('ready', async () => {
   changeLanguage(app.getLocale())
 
-  await initConnection()
   createSyncBlockTask()
 
   appController.openWindow()
diff --git a/packages/neuron-wallet/src/models/subjects/address-created-subject.ts b/packages/neuron-wallet/src/models/subjects/address-created-subject.ts
index 40f5ab3fc9..63ff7968cd 100644
--- a/packages/neuron-wallet/src/models/subjects/address-created-subject.ts
+++ b/packages/neuron-wallet/src/models/subjects/address-created-subject.ts
@@ -1,5 +1,5 @@
 import { ReplaySubject } from 'rxjs'
-import { Address } from 'database/address/dao'
+import { Address } from 'database/address/address-dao'
 
 export default class AddressCreatedSubject {
   static subject = new ReplaySubject<Address[]>(100)
diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
index 5639ee1910..d3e080ca53 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -2,8 +2,7 @@ import { AddressPrefix } from '@nervosnetwork/ckb-sdk-utils'
 import { AccountExtendedPublicKey } from 'models/keys/key'
 import Address, { AddressType } from 'models/keys/address'
 import LockUtils from 'models/lock-utils'
-import AddressDao, { Address as AddressInterface } from 'database/address/dao'
-import { AddressVersion } from 'database/address/entities/address'
+import AddressDao, { Address as AddressInterface, AddressVersion } from 'database/address/address-dao'
 import AddressCreatedSubject from 'models/subjects/address-created-subject'
 import NodeService from './node'
 import ChainInfo from 'models/chain-info'
@@ -95,16 +94,13 @@ export default class AddressService {
     )
   }
 
-  public static updateTxCountAndBalances = async (
-    addresses: string[],
-    url: string = NodeService.getInstance().core.rpc.node.url
-  ) => {
-    let addrs: Address[] = []
+  public static updateTxCountAndBalances = async (addresses: string[], url: string = NodeService.getInstance().core.rpc.node.url) => {
+    let result: Address[] = []
     for (const address of addresses) {
-      const ads = await AddressDao.updateTxCountAndBalance(address, url)
-      addrs = addrs.concat(ads)
+      const updatedAddress = await AddressDao.updateTxCountAndBalance(address, url)
+      result = result.concat(updatedAddress)
     }
-    return addrs
+    return result
   }
 
   // Generate both receiving and change addresses.
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index 490cc3550e..f3a24f4c11 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -7,7 +7,7 @@ import LockUtils from 'models/lock-utils'
 import { TransactionWithoutHash, Input, OutPoint, WitnessArgs } from 'types/cell-types'
 import ConvertTo from 'types/convert-to'
 import { WalletNotFound, IsRequired, UsedName } from 'exceptions'
-import { Address as AddressInterface } from 'database/address/dao'
+import { Address as AddressInterface } from 'database/address/address-dao'
 import Keychain from 'models/keys/keychain'
 import AddressDbChangedSubject from 'models/subjects/address-db-changed-subject'
 import AddressesUsedSubject from 'models/subjects/addresses-used-subject'
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts b/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
index cb1331ba7c..3300e261ab 100644
--- a/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
+++ b/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
@@ -2,7 +2,7 @@ import { remote } from 'electron'
 import AddressService from 'services/addresses'
 import LockUtils from 'models/lock-utils'
 import IndexerQueue, { LockHashInfo } from 'services/indexer/queue'
-import { Address } from 'database/address/dao'
+import { Address } from 'database/address/address-dao'
 
 import initConnection from 'database/chain/ormconfig'
 import ChainInfo from 'models/chain-info'
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/sync.ts b/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
index decb81948f..3c35053760 100644
--- a/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
+++ b/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
@@ -2,7 +2,7 @@ import { remote } from 'electron'
 import AddressService from 'services/addresses'
 import LockUtils from 'models/lock-utils'
 import BlockListener from 'services/sync/block-listener'
-import { Address } from 'database/address/dao'
+import { Address } from 'database/address/address-dao'
 
 import initConnection from 'database/chain/ormconfig'
 import ChainInfo from 'models/chain-info'
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/task.ts b/packages/neuron-wallet/src/startup/sync-block-task/task.ts
index 9b7d4abc98..31c0226e0f 100644
--- a/packages/neuron-wallet/src/startup/sync-block-task/task.ts
+++ b/packages/neuron-wallet/src/startup/sync-block-task/task.ts
@@ -1,5 +1,4 @@
 import { remote } from 'electron'
-import { initConnection as initAddressConnection } from 'database/address/ormconfig'
 import AddressesUsedSubject from 'models/subjects/addresses-used-subject'
 import { register as registerTxStatusListener } from 'listeners/tx-status'
 import { register as registerAddressListener } from 'listeners/address'
@@ -31,7 +30,6 @@ export const testIndexer = async (url: string): Promise<boolean> => {
 }
 
 export const run = async () => {
-  await initAddressConnection()
   databaseInitSubject.subscribe(async (params: DatabaseInitParams) => {
     const { network, genesisBlockHash, chain } = params
     if (network && genesisBlockHash.startsWith('0x')) {
diff --git a/packages/neuron-wallet/tests/database/address/balance.test.ts b/packages/neuron-wallet/tests/database/address/balance.test.ts
index 52156d804e..c45ef8fd66 100644
--- a/packages/neuron-wallet/tests/database/address/balance.test.ts
+++ b/packages/neuron-wallet/tests/database/address/balance.test.ts
@@ -1,6 +1,5 @@
-import { AddressVersion } from '../../../src/database/address/entities/address'
 import { AddressType } from '../../../src/models/keys/address'
-import AddressDao, { Address } from '../../../src/database/address/dao'
+import AddressDao, { Address, AddressVersion } from '../../../src/database/address/address-dao'
 
 describe('balance', () => {
   beforeEach(async () => {
diff --git a/packages/neuron-wallet/tests/database/address/dao.test.ts b/packages/neuron-wallet/tests/database/address/dao.test.ts
index 208271f11b..ae9b459c2a 100644
--- a/packages/neuron-wallet/tests/database/address/dao.test.ts
+++ b/packages/neuron-wallet/tests/database/address/dao.test.ts
@@ -1,6 +1,5 @@
-import { AddressVersion } from '../../../src/database/address/entities/address'
 import { AddressType } from '../../../src/models/keys/address'
-import AddressDao, { Address } from '../../../src/database/address/dao'
+import AddressDao, { Address, AddressVersion } from '../../../src/database/address/address-dao'
 
 describe('Address Dao tests', () => {
   const address: Address = {
diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index 1d8196bbc8..1746b4d7f1 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -1,6 +1,5 @@
 import AddressService from '../../src/services/addresses'
-import { AddressVersion } from '../../src/database/address/entities/address'
-import AddressDao, { Address } from '../../src/database/address/dao'
+import AddressDao, { Address, AddressVersion } from '../../src/database/address/address-dao'
 import { AddressType } from '../../src/models/keys/address'
 import { AccountExtendedPublicKey } from '../../src/models/keys/key'
 

From dc82cbbfad11948625df6f4c253f1bb235e704a2 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 18:10:22 +0800
Subject: [PATCH 16/35] feat(neuron-ui): add global apy estimation (#1092)

* feat(neuron-ui): add global apy estimation

* test(neuron-ui): fix the test of calculateGlobalAPY
---
 .../src/components/NervosDAO/index.tsx        | 14 +++++-
 .../neuron-ui/src/containers/Main/hooks.ts    |  1 +
 .../neuron-ui/src/states/initStates/app.ts    |  1 +
 .../calculateGlobalAPY/fixtures.ts            | 12 +++++
 .../calculateGlobalAPY/index.test.ts          | 16 +++++++
 packages/neuron-ui/src/types/App/index.d.ts   |  1 +
 .../neuron-ui/src/utils/calculateGlobalAPY.ts | 48 +++++++++++++++++++
 7 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
 create mode 100644 packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts
 create mode 100644 packages/neuron-ui/src/utils/calculateGlobalAPY.ts

diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index a1120c5431..5008c7e700 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -7,6 +7,7 @@ import appState from 'states/initStates/app'
 import { AppActions, StateWithDispatch } from 'states/stateProvider/reducer'
 import { updateNervosDaoData, clearNervosDaoData } from 'states/stateProvider/actionCreators'
 
+import calculateGlobalAPY from 'utils/calculateGlobalAPY'
 import calculateFee from 'utils/calculateFee'
 import { shannonToCKBFormatter, CKBToShannonFormatter } from 'utils/formatters'
 import { MIN_DEPOSIT_AMOUNT, MEDIUM_FEE_RATE, CapacityUnit } from 'utils/const'
@@ -28,6 +29,7 @@ const NervosDAO = ({
     loadings: { sending = false },
     tipBlockNumber,
     tipBlockHash,
+    tipBlockTimestamp,
     epoch,
   },
   wallet,
@@ -41,6 +43,7 @@ const NervosDAO = ({
   const [activeRecord, setActiveRecord] = useState<State.NervosDAORecord | null>(null)
   const [errorMessage, setErrorMessage] = useState('')
   const [withdrawList, setWithdrawList] = useState<(string | null)[]>([])
+  const [globalAPY, setGlobalAPY] = useState(0)
 
   const clearGeneratedTx = useCallback(() => {
     dispatch({
@@ -92,6 +95,14 @@ const NervosDAO = ({
     }
   }, [clearGeneratedTx, dispatch, updateDepositValue, wallet.id])
 
+  useEffect(() => {
+    if (tipBlockTimestamp) {
+      calculateGlobalAPY(tipBlockTimestamp).then(apy => {
+        setGlobalAPY(apy)
+      })
+    }
+  }, [tipBlockTimestamp])
+
   const onDepositDialogDismiss = () => {
     setShowDepositDialog(false)
     setDepositValue(`${MIN_DEPOSIT_AMOUNT}`)
@@ -278,9 +289,10 @@ const NervosDAO = ({
         <Text as="span" variant="small" block>{`Epoch number: ${epochInfo.number}`}</Text>
         <Text as="span" variant="small" block>{`Epoch index: ${epochInfo.index}`}</Text>
         <Text as="span" variant="small" block>{`Epoch length: ${epochInfo.length}`}</Text>
+        <Text as="span" variant="small" block>{`APY: ~${globalAPY}%`}</Text>
       </Stack>
     )
-  }, [epoch])
+  }, [epoch, globalAPY])
 
   return (
     <>
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
index 7bea9fe347..568df8775a 100644
--- a/packages/neuron-ui/src/containers/Main/hooks.ts
+++ b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -40,6 +40,7 @@ export const useSyncChainData = ({ chainURL, dispatch }: { chainURL: string; dis
             payload: {
               tipBlockNumber: `${BigInt(header.number)}`,
               tipBlockHash: header.hash,
+              tipBlockTimestamp: +header.timestamp,
               chain: chainInfo.chain,
               difficulty: `${BigInt(chainInfo.difficulty)}`,
               epoch: chainInfo.epoch,
diff --git a/packages/neuron-ui/src/states/initStates/app.ts b/packages/neuron-ui/src/states/initStates/app.ts
index 690b1e9b43..1eabdd4b18 100644
--- a/packages/neuron-ui/src/states/initStates/app.ts
+++ b/packages/neuron-ui/src/states/initStates/app.ts
@@ -3,6 +3,7 @@ import { CapacityUnit } from 'utils/const'
 const appState: State.App = {
   tipBlockNumber: '',
   tipBlockHash: '',
+  tipBlockTimestamp: 0,
   chain: '',
   difficulty: '',
   epoch: '',
diff --git a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
new file mode 100644
index 0000000000..3b0eb42968
--- /dev/null
+++ b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
@@ -0,0 +1,12 @@
+export default {
+  'return 0 if the genesis block is not loaded': {
+    currentTime: Date.now(),
+    genesisTime: undefined,
+    expectAPY: 0,
+  },
+  'one period and one handrand days': {
+    currentTime: new Date('2023-04-10').getTime(),
+    genesisTime: new Date('2019-01-01').getTime(),
+    expectAPY: 0.02369552868619654,
+  },
+}
diff --git a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts
new file mode 100644
index 0000000000..d82bbc797c
--- /dev/null
+++ b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts
@@ -0,0 +1,16 @@
+import calculateGlobalAPY from 'utils/calculateGlobalAPY'
+import fixtures from './fixtures'
+
+describe('calculate the global apy', () => {
+  const fixtureTable = Object.entries(fixtures).map(([title, { currentTime, genesisTime, expectAPY }]) => [
+    title,
+    currentTime,
+    genesisTime,
+    expectAPY,
+  ])
+
+  test.each(fixtureTable)(`%s`, async (_title, currentTime, genesisTime, expectAPY) => {
+    const apy = await calculateGlobalAPY(currentTime, genesisTime)
+    expect(apy).toBe(expectAPY === 0 ? 0 : +expectAPY.toFixed(2))
+  })
+})
diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts
index e214ee89dd..b45c5513cc 100644
--- a/packages/neuron-ui/src/types/App/index.d.ts
+++ b/packages/neuron-ui/src/types/App/index.d.ts
@@ -75,6 +75,7 @@ declare namespace State {
   interface App {
     tipBlockNumber: string
     tipBlockHash: string
+    tipBlockTimestamp: number
     chain: string
     difficulty: string
     epoch: string
diff --git a/packages/neuron-ui/src/utils/calculateGlobalAPY.ts b/packages/neuron-ui/src/utils/calculateGlobalAPY.ts
new file mode 100644
index 0000000000..4c189275e5
--- /dev/null
+++ b/packages/neuron-ui/src/utils/calculateGlobalAPY.ts
@@ -0,0 +1,48 @@
+import { getBlockByNumber } from '../services/chain'
+
+const INITIAL_OFFER = BigInt(33600000000)
+const SECONDARY_OFFER = BigInt(1344000000)
+const DAYS_PER_PERIOD = 365 * 4 * 1
+const MILLI_SECONDS_PER_DAY = 24 * 3600 * 1000
+const PERIOD_LENGTH = DAYS_PER_PERIOD * MILLI_SECONDS_PER_DAY
+
+let cachedGenesisTimestamp: number | undefined
+
+export default async (now: number, initialTimestamp: number | undefined = cachedGenesisTimestamp) => {
+  let genesisTimestamp = initialTimestamp
+  if (genesisTimestamp === undefined) {
+    genesisTimestamp = await getBlockByNumber('0x0')
+      .then(b => {
+        cachedGenesisTimestamp = +b.header.timestamp
+        return cachedGenesisTimestamp
+      })
+      .catch(() => undefined)
+  }
+  if (genesisTimestamp === undefined || now <= genesisTimestamp) {
+    return 0
+  }
+
+  const pastPeriods = BigInt(now - genesisTimestamp) / BigInt(PERIOD_LENGTH)
+  const pastDays = Math.ceil(((now - genesisTimestamp) % PERIOD_LENGTH) / MILLI_SECONDS_PER_DAY)
+
+  const realSecondaryOffer =
+    BigInt(4) * SECONDARY_OFFER * pastPeriods +
+    (BigInt(4) * SECONDARY_OFFER * BigInt(pastDays)) / BigInt(DAYS_PER_PERIOD)
+
+  let realPrimaryOffer = BigInt(0)
+
+  let PRIMARY_OFFER = INITIAL_OFFER
+  for (let i = 0; i < Number(pastPeriods); i++) {
+    PRIMARY_OFFER /= BigInt(2)
+    const offer = PRIMARY_OFFER
+    realPrimaryOffer += offer
+  }
+
+  PRIMARY_OFFER /= BigInt(2)
+
+  const primaryOfferFraction = (BigInt(pastDays) * PRIMARY_OFFER) / BigInt(DAYS_PER_PERIOD)
+  realPrimaryOffer += primaryOfferFraction
+
+  const totalOffer = INITIAL_OFFER + realPrimaryOffer + realSecondaryOffer
+  return +(Number(SECONDARY_OFFER) / Number(totalOffer)).toFixed(2)
+}

From 543cdd0dc2b7c61dec9466a51fbd88ca9f821c1c Mon Sep 17 00:00:00 2001
From: classicalliu <classicalliu@gmail.com>
Date: Wed, 13 Nov 2019 19:43:39 +0800
Subject: [PATCH 17/35] fix: current block number should be -1 if not start

---
 packages/neuron-wallet/src/services/sync/block-number.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/services/sync/block-number.ts b/packages/neuron-wallet/src/services/sync/block-number.ts
index cd7dad0740..bbf59fb5ac 100644
--- a/packages/neuron-wallet/src/services/sync/block-number.ts
+++ b/packages/neuron-wallet/src/services/sync/block-number.ts
@@ -19,7 +19,7 @@ export default class BlockNumber {
     const blockNumberEntity: SyncInfoEntity | undefined = await this.blockNumber()
 
     if (!blockNumberEntity) {
-      return BigInt(0)
+      return BigInt(-1)
     }
 
     return BigInt(blockNumberEntity.value)

From 4c587a87355e536129067415738ff411541e6cd0 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 19:46:28 +0800
Subject: [PATCH 18/35] feat(neuron-ui): rename deposit record to deposit
 receipt

---
 packages/neuron-ui/src/components/NervosDAO/index.tsx | 2 +-
 packages/neuron-ui/src/locales/en.json                | 2 +-
 packages/neuron-ui/src/locales/zh.json                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index 5008c7e700..cce7dff34e 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -250,7 +250,7 @@ const NervosDAO = ({
     return (
       <>
         <Text as="h2" variant="xxLarge">
-          {t('nervos-dao.deposit-records')}
+          {t('nervos-dao.deposit-receipts')}
         </Text>
         <Stack>
           {records.map((record, i) => {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index f9e2ed2b18..3ad5af6c8a 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -312,7 +312,7 @@
       "free": "Free",
       "locked": "Locked",
       "deposit": "Deposit",
-      "deposit-records": "Deposit Records",
+      "deposit-receipts": "Deposit Receipts",
       "apy": "APY",
       "deposit-at": "Deposit at {{time}}",
       "claim": "Claim",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 66b8bdf8fb..22e3ce0847 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -312,7 +312,7 @@
       "free": "当前可用",
       "locked": "已锁定",
       "deposit": "存入",
-      "deposit-records": "存款记录",
+      "deposit-receipts": "存款凭证",
       "apy": "预期年化利率",
       "deposit-at": "存入于{{time}}",
       "claim": "取款",

From 61eab4fd344feabc920aeb21e2aee9d1a99fa9b2 Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 19:48:54 +0800
Subject: [PATCH 19/35] fix(neuron-ui): add decimal validation on deposit value
 (#1093)

* fix(neuron-ui): add decimal validation on deposit value

* refactor(neuron-ui): use bigint in comparison
---
 .../src/components/NervosDAO/index.tsx        | 48 +++++++++++--------
 packages/neuron-ui/src/locales/en.json        |  3 +-
 packages/neuron-ui/src/locales/zh.json        |  3 +-
 packages/neuron-ui/src/utils/formatters.ts    |  2 +-
 packages/neuron-ui/src/utils/validators.ts    | 22 ++++++---
 5 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index 5008c7e700..e5b9b3fefc 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -10,7 +10,8 @@ import { updateNervosDaoData, clearNervosDaoData } from 'states/stateProvider/ac
 import calculateGlobalAPY from 'utils/calculateGlobalAPY'
 import calculateFee from 'utils/calculateFee'
 import { shannonToCKBFormatter, CKBToShannonFormatter } from 'utils/formatters'
-import { MIN_DEPOSIT_AMOUNT, MEDIUM_FEE_RATE, CapacityUnit } from 'utils/const'
+import { MIN_DEPOSIT_AMOUNT, MEDIUM_FEE_RATE, SHANNON_CKB_RATIO, CapacityUnit } from 'utils/const'
+import { verifyAmount } from 'utils/validators'
 
 import { generateDepositTx, generateWithdrawTx, generateClaimTx } from 'services/remote'
 import { ckbCore } from 'services/chain'
@@ -59,27 +60,34 @@ const NervosDAO = ({
       }
       clearTimeout(timer)
       timer = setTimeout(() => {
-        if (+value < MIN_DEPOSIT_AMOUNT) {
+        setErrorMessage('')
+        clearGeneratedTx()
+
+        const verifyRes = verifyAmount(value)
+        if (verifyRes !== true) {
+          setErrorMessage(t(`messages.codes.${verifyRes.code}`, { fieldName: 'deposit' }))
+          return
+        }
+
+        if (BigInt(CKBToShannonFormatter(value)) < BigInt(MIN_DEPOSIT_AMOUNT * SHANNON_CKB_RATIO)) {
           setErrorMessage(t('nervos-dao.minimal-fee-required', { minimal: MIN_DEPOSIT_AMOUNT }))
-          clearGeneratedTx()
-        } else {
-          setErrorMessage('')
-          generateDepositTx({
-            feeRate: `${MEDIUM_FEE_RATE}`,
-            capacity: CKBToShannonFormatter(value, CapacityUnit.CKB),
-            walletID: wallet.id,
-          }).then(res => {
-            if (res.status === 1) {
-              dispatch({
-                type: AppActions.UpdateGeneratedTx,
-                payload: res.result,
-              })
-            } else {
-              clearGeneratedTx()
-              setErrorMessage(`${typeof res.message === 'string' ? res.message : res.message.content}`)
-            }
-          })
+          return
         }
+
+        generateDepositTx({
+          feeRate: `${MEDIUM_FEE_RATE}`,
+          capacity: CKBToShannonFormatter(value, CapacityUnit.CKB),
+          walletID: wallet.id,
+        }).then(res => {
+          if (res.status === 1) {
+            dispatch({
+              type: AppActions.UpdateGeneratedTx,
+              payload: res.result,
+            })
+          } else {
+            setErrorMessage(`${typeof res.message === 'string' ? res.message : res.message.content}`)
+          }
+        })
       }, 500)
       setDepositValue(value)
     },
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index f9e2ed2b18..ef95c79e96 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -270,7 +270,8 @@
         "mnemonic": "Mnemonic",
         "keystore-path": "Keystore File",
         "keystore-name": "Wallet name",
-        "keystore-password": "Password"
+        "keystore-password": "Password",
+        "deposit": "Deposit"
       },
       "codes": {
         "-3": "",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index 66b8bdf8fb..7592d0bf31 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -270,7 +270,8 @@
         "mnemonic": "助记词",
         "keystore-path": "Keystore 文件",
         "keystore-name": "钱包名称",
-        "keystore-password": "密码"
+        "keystore-password": "密码",
+        "deposit": "存入金额"
       },
       "codes": {
         "-3": "",
diff --git a/packages/neuron-ui/src/utils/formatters.ts b/packages/neuron-ui/src/utils/formatters.ts
index 0240e1a73a..7edb19e965 100644
--- a/packages/neuron-ui/src/utils/formatters.ts
+++ b/packages/neuron-ui/src/utils/formatters.ts
@@ -72,7 +72,7 @@ export const currencyFormatter = (
   return `${integer.replace(/\B(?=(\d{3})+(?!\d))/g, delimiter)}${dot}${decimal} ${unit}`
 }
 
-export const CKBToShannonFormatter = (amount: string = '0', unit: CapacityUnit) => {
+export const CKBToShannonFormatter = (amount: string = '0', unit: CapacityUnit = CapacityUnit.CKB) => {
   if (Number.isNaN(+amount)) {
     console.warn(`Amount is not a valid number`)
     return `${amount} ${unit}`
diff --git a/packages/neuron-ui/src/utils/validators.ts b/packages/neuron-ui/src/utils/validators.ts
index 3d6a5312fc..23727dfd2c 100644
--- a/packages/neuron-ui/src/utils/validators.ts
+++ b/packages/neuron-ui/src/utils/validators.ts
@@ -1,6 +1,14 @@
-import { MAX_NETWORK_NAME_LENGTH } from 'utils/const'
+import {
+  MAX_NETWORK_NAME_LENGTH,
+  MIN_PASSWORD_LENGTH,
+  MAX_PASSWORD_LENGTH,
+  MIN_AMOUNT,
+  MAX_DECIMAL_DIGITS,
+  SHANNON_CKB_RATIO,
+  ErrorCode,
+} from 'utils/const'
+import { CKBToShannonFormatter } from 'utils/formatters'
 import { ckbCore } from 'services/chain'
-import { MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH, MIN_AMOUNT, MAX_DECIMAL_DIGITS, ErrorCode } from './const'
 
 export const verifyAddress = (address: string): boolean => {
   if (typeof address !== 'string' || address.length !== 46) {
@@ -14,27 +22,27 @@ export const verifyAddress = (address: string): boolean => {
 }
 
 export const verifyAmountRange = (amount: string = '') => {
-  return +amount >= MIN_AMOUNT
+  return BigInt(CKBToShannonFormatter(amount)) >= BigInt(MIN_AMOUNT * SHANNON_CKB_RATIO)
 }
 
 export const verifyAmount = (amount: string = '0') => {
   if (Number.isNaN(+amount)) {
     return { code: ErrorCode.FieldInvalid }
   }
-  if (+amount < 0) {
-    return { code: ErrorCode.NotNegative }
-  }
   const [, decimal = ''] = amount.split('.')
   if (decimal.length > MAX_DECIMAL_DIGITS) {
     return {
       code: ErrorCode.DecimalExceed,
     }
   }
+  if (BigInt(CKBToShannonFormatter(amount)) < BigInt(0)) {
+    return { code: ErrorCode.NotNegative }
+  }
   return true
 }
 
 export const verifyTotalAmount = (totalAmount: string, fee: string, balance: string) => {
-  if (+balance < 0) {
+  if (BigInt(balance) < BigInt(0)) {
     return false
   }
   return BigInt(totalAmount) + BigInt(fee) <= BigInt(balance)

From 99f77aa55fc503784848e39395beb4b749c7ef8c Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 20:02:28 +0800
Subject: [PATCH 20/35] feat(neuron-ui): use the same style of activity record
 on deposit record.

---
 .../src/components/CustomRows/daoRecordRow.module.scss    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss b/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss
index d9a0f1b74e..e0ad25f66c 100644
--- a/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss
+++ b/packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss
@@ -1,11 +1,13 @@
 .daoRecord {
   display: flex;
   flex-direction: column;
-  border: 1px solid #000;
   border-radius: 2px;
-  margin: 10px 0;
-  padding: 5px 15px;
+  margin: 15px 0;
+  border-right: 1px solid #eee;
   border-left: 5px solid green;
+  box-sizing: border-box;
+  padding: 5px 10px;
+  box-shadow: 0 1px 5px 1px rgba(0, 0, 0, 0.14);
 
   .primaryInfo,
   .secondaryInfo {

From 9988a13e08db498429d3ef3ed9b15000bd33cc11 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Wed, 13 Nov 2019 22:06:18 +0800
Subject: [PATCH 21/35] feat: Regenerate addresses if necessary on launch

---
 .../src/controllers/app/index.ts              |  3 ++
 .../neuron-wallet/src/controllers/wallets.ts  | 38 +++++++++----------
 .../src/database/address/address-dao.ts       |  9 +++--
 .../neuron-wallet/src/services/addresses.ts   |  6 +--
 .../neuron-wallet/src/services/wallets.ts     | 12 +++++-
 5 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/app/index.ts b/packages/neuron-wallet/src/controllers/app/index.ts
index e5e404d159..6a0ed85bd5 100644
--- a/packages/neuron-wallet/src/controllers/app/index.ts
+++ b/packages/neuron-wallet/src/controllers/app/index.ts
@@ -6,6 +6,7 @@ import env from 'env'
 import { updateApplicationMenu } from './menu'
 import logger from 'utils/logger'
 import { subscribe } from './subscribe'
+import WalletService from 'services/wallets'
 
 const app = electronApp || (remote && remote.app)
 
@@ -65,6 +66,8 @@ export default class AppController {
         this.mainWindow.show()
         this.mainWindow.focus()
         logger.info('The main window is ready to show')
+
+        WalletService.getInstance().generateAddressesIfNecessary()
       } else {
         logger.error('The main window is not initialized on ready to show')
       }
diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index a8aa816d5b..cf4400795a 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -294,26 +294,24 @@ export default class WalletsController {
   }
 
   public static async getAllAddresses(id: string) {
-    const addresses = await AddressService.allAddressesByWalletId(id).then(addrs =>
-      addrs.map(
-        ({
-          address,
-          blake160: identifier,
-          addressType: type,
-          txCount,
-          balance,
-          description = '',
-          addressIndex: index = '',
-        }) => ({
-          address,
-          identifier,
-          type,
-          txCount,
-          description,
-          balance,
-          index,
-        })
-      )
+    const addresses = AddressService.allAddressesByWalletId(id).map(
+      ({
+        address,
+        blake160: identifier,
+        addressType: type,
+        txCount,
+        balance,
+        description = '',
+        addressIndex: index = '',
+      }) => ({
+        address,
+        identifier,
+        type,
+        txCount,
+        description,
+        balance,
+        index,
+      })
     )
     return {
       status: ResponseCode.Success,
diff --git a/packages/neuron-wallet/src/database/address/address-dao.ts b/packages/neuron-wallet/src/database/address/address-dao.ts
index 76b6b28b5e..f252311fc3 100644
--- a/packages/neuron-wallet/src/database/address/address-dao.ts
+++ b/packages/neuron-wallet/src/database/address/address-dao.ts
@@ -120,10 +120,11 @@ export default class AddressDao {
   }
 
   public static allAddressesByWalletId(walletId: string, version: AddressVersion): Address[] {
-    const all = AddressStore.getAll()
-    return all.filter(value => {
-      return value.walletId === walletId && value.version === version
-    })
+    return AddressStore.getAll()
+      .filter(value => value.walletId === walletId && value.version === version)
+      .sort((lhs, rhs) => {
+        return lhs.addressType - rhs.addressType || lhs.addressIndex - rhs.addressIndex
+      })
   }
 
   public static usedAddressesByWalletId(walletId: string, version: AddressVersion):Address[] {
diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
index d3e080ca53..b81b36175a 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -22,7 +22,7 @@ export default class AddressService {
     return !!addressEntity
   }
 
-  public static generateAndSave = async (
+  public static generateAndSave = (
     walletId: string,
     extendedKey: AccountExtendedPublicKey,
     isImporting: boolean | undefined,
@@ -63,7 +63,7 @@ export default class AddressService {
     AddressCreatedSubject.getSubject().next(addrs)
   }
 
-  public static checkAndGenerateSave = async (
+  public static checkAndGenerateSave = (
     walletId: string,
     extendedKey: AccountExtendedPublicKey,
     isImporting: boolean | undefined,
@@ -216,7 +216,7 @@ export default class AddressService {
     return AddressDao.allAddresses(version)
   }
 
-  public static allAddressesByWalletId = async (walletId: string): Promise<AddressInterface[]> => {
+  public static allAddressesByWalletId = (walletId: string): AddressInterface[] => {
     const version = AddressService.getAddressVersion()
     return AddressDao.allAddressesByWalletId(walletId, version)
   }
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index f3a24f4c11..056c00beca 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -173,7 +173,15 @@ export default class WalletService {
     return FileKeystoreWallet.fromJSON(wallet)
   }
 
-  public generateAddressesById = async (
+  public generateAddressesIfNecessary = () => {
+    for (const wallet of this.getAll()) {
+      if (AddressService.allAddressesByWalletId(wallet.id).length === 0) {
+        this.generateAddressesById(wallet.id, false)
+      }
+    }
+  }
+
+  public generateAddressesById = (
     id: string,
     isImporting: boolean,
     receivingAddressCount: number = 20,
@@ -181,7 +189,7 @@ export default class WalletService {
   ) => {
     const wallet: Wallet = this.get(id)
     const accountExtendedPublicKey: AccountExtendedPublicKey = wallet.accountExtendedPublicKey()
-    await AddressService.checkAndGenerateSave(
+    AddressService.checkAndGenerateSave(
       id,
       accountExtendedPublicKey,
       isImporting,

From 170dd4da78827206fd6b09c26cdffbad9a85e3e3 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 13 Nov 2019 22:09:17 +0800
Subject: [PATCH 22/35] refactor(neuron-ui): remove useless Math.floor in
 calculateAPY

---
 packages/neuron-ui/src/utils/calculateAPY.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-ui/src/utils/calculateAPY.ts b/packages/neuron-ui/src/utils/calculateAPY.ts
index 330e5e1d38..b4bec8fc05 100644
--- a/packages/neuron-ui/src/utils/calculateAPY.ts
+++ b/packages/neuron-ui/src/utils/calculateAPY.ts
@@ -2,6 +2,6 @@ const YEAR = 365 * 24 * 60 * 60 * 1000
 
 export default (interest: string, amount: string, duration: string) => {
   const BASE = 10000
-  const v = Math.floor(+((BigInt(interest) * BigInt(BASE)) / BigInt(amount)).toString()) * (YEAR / +duration)
+  const v = +((BigInt(interest) * BigInt(BASE)) / BigInt(amount)).toString() * (YEAR / +duration)
   return `${(v / BASE).toFixed(2)}`
 }

From 0eafab291daa14baf8535fd70d7fc387bd4aaab5 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 10:02:49 +0800
Subject: [PATCH 23/35] refactor: Remove unnecessary async/await call on
 address modules

---
 .../neuron-wallet/src/controllers/wallets.ts  |  2 +-
 .../src/database/address/address-dao.ts       |  2 +-
 .../neuron-wallet/src/listeners/address.ts    | 14 +++---
 .../neuron-wallet/src/services/addresses.ts   | 16 +++---
 .../neuron-wallet/src/services/wallets.ts     | 38 +++++---------
 .../src/startup/sync-block-task/create.ts     |  2 +-
 .../src/startup/sync-block-task/indexer.ts    |  2 +-
 .../src/startup/sync-block-task/sync.ts       |  2 +-
 .../tests/services/address.test.ts            | 50 +++++++++----------
 9 files changed, 56 insertions(+), 72 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index cf4400795a..bf895fc921 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -499,7 +499,7 @@ export default class WalletsController {
     const walletService = WalletsService.getInstance()
     const wallet = walletService.get(walletID)
 
-    await AddressService.updateDescription(wallet.id, address, description)
+    AddressService.updateDescription(wallet.id, address, description)
 
     return {
       status: ResponseCode.Success,
diff --git a/packages/neuron-wallet/src/database/address/address-dao.ts b/packages/neuron-wallet/src/database/address/address-dao.ts
index f252311fc3..c2b48409e6 100644
--- a/packages/neuron-wallet/src/database/address/address-dao.ts
+++ b/packages/neuron-wallet/src/database/address/address-dao.ts
@@ -127,7 +127,7 @@ export default class AddressDao {
       })
   }
 
-  public static usedAddressesByWalletId(walletId: string, version: AddressVersion):Address[] {
+  public static usedAddressesByWalletId(walletId: string, version: AddressVersion): Address[] {
     const all = AddressStore.getAll()
     return all.filter(value => {
       return value.walletId === walletId
diff --git a/packages/neuron-wallet/src/listeners/address.ts b/packages/neuron-wallet/src/listeners/address.ts
index 26af7af070..845105fd7f 100644
--- a/packages/neuron-wallet/src/listeners/address.ts
+++ b/packages/neuron-wallet/src/listeners/address.ts
@@ -29,14 +29,12 @@ export const register = () => {
     const uniqueAddresses = [...new Set(addresses)]
     const addrs = await AddressService.updateTxCountAndBalances(uniqueAddresses, url)
     const walletIds: string[] = addrs.map(addr => (addr as Address).walletId).filter((value, idx, a) => a.indexOf(value) === idx)
-    await Promise.all(
-      walletIds.map(async id => {
-        const wallet = WalletService.getInstance().get(id)
-        const accountExtendedPublicKey: AccountExtendedPublicKey = wallet.accountExtendedPublicKey()
-        // set isImporting to undefined means unknown
-        await AddressService.checkAndGenerateSave(id, accountExtendedPublicKey, undefined, 20, 10)
-      })
-    )
+    for (const id of walletIds) {
+      const wallet = WalletService.getInstance().get(id)
+      const accountExtendedPublicKey: AccountExtendedPublicKey = wallet.accountExtendedPublicKey()
+      // set isImporting to undefined means unknown
+      AddressService.checkAndGenerateSave(id, accountExtendedPublicKey, undefined, 20, 10)
+    }
   })
 }
 
diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
index b81b36175a..5c479c4df3 100644
--- a/packages/neuron-wallet/src/services/addresses.ts
+++ b/packages/neuron-wallet/src/services/addresses.ts
@@ -17,7 +17,7 @@ export interface AddressMetaInfo {
 }
 
 export default class AddressService {
-  public static isAddressUsed = async (address: string, walletId: string): Promise<boolean> => {
+  public static isAddressUsed = (address: string, walletId: string): boolean => {
     const addressEntity = AddressDao.findByAddress(address, walletId)
     return !!addressEntity
   }
@@ -190,7 +190,7 @@ export default class AddressService {
     return [testnetAddressInfo, mainnetAddressInfo]
   }
 
-  public static nextUnusedAddress = async (walletId: string): Promise<AddressInterface | undefined> => {
+  public static nextUnusedAddress = (walletId: string): AddressInterface | undefined => {
     const version = AddressService.getAddressVersion()
 
     const addressEntity = AddressDao.nextUnusedAddress(walletId, version)
@@ -200,7 +200,7 @@ export default class AddressService {
     return addressEntity
   }
 
-  public static nextUnusedChangeAddress = async (walletId: string): Promise<AddressInterface | undefined> => {
+  public static nextUnusedChangeAddress = (walletId: string): AddressInterface | undefined => {
     const version = AddressService.getAddressVersion()
 
     const addressEntity = AddressDao.nextUnusedChangeAddress(walletId, version)
@@ -210,7 +210,7 @@ export default class AddressService {
     return addressEntity
   }
 
-  public static allAddresses = async (): Promise<AddressInterface[]> => {
+  public static allAddresses = (): AddressInterface[] => {
     const version = AddressService.getAddressVersion()
 
     return AddressDao.allAddresses(version)
@@ -221,20 +221,20 @@ export default class AddressService {
     return AddressDao.allAddressesByWalletId(walletId, version)
   }
 
-  public static usedAddresses = async (walletId: string): Promise<AddressInterface[]> => {
+  public static usedAddresses = (walletId: string): AddressInterface[] => {
     const version = AddressService.getAddressVersion()
     return AddressDao.usedAddressesByWalletId(walletId, version)
   }
 
-  public static updateDescription = async (walletId: string, address: string, description: string) => {
+  public static updateDescription = (walletId: string, address: string, description: string): AddressInterface | undefined => {
     return AddressDao.updateDescription(walletId, address, description)
   }
 
-  public static deleteByWalletId = async (walletId: string) => {
+  public static deleteByWalletId = (walletId: string): AddressInterface[] => {
     return AddressDao.deleteByWalletId(walletId)
   }
 
-  public static findByAddresses = async (addresses: string[]) => {
+  public static findByAddresses = (addresses: string[]): AddressInterface[] => {
     return AddressDao.findByAddresses(addresses)
   }
 
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index 056c00beca..653b84f250 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -187,8 +187,7 @@ export default class WalletService {
     receivingAddressCount: number = 20,
     changeAddressCount: number = 10
   ) => {
-    const wallet: Wallet = this.get(id)
-    const accountExtendedPublicKey: AccountExtendedPublicKey = wallet.accountExtendedPublicKey()
+    const accountExtendedPublicKey: AccountExtendedPublicKey = this.get(id).accountExtendedPublicKey()
     AddressService.checkAndGenerateSave(
       id,
       accountExtendedPublicKey,
@@ -198,18 +197,6 @@ export default class WalletService {
     )
   }
 
-  public generateCurrentWalletAddresses = async (
-    isImporting: boolean,
-    receivingAddressCount: number = 20,
-    changeAddressCount: number = 10
-  ) => {
-    const wallet: Wallet | undefined = this.getCurrent()
-    if (!wallet) {
-      return undefined
-    }
-    return this.generateAddressesById(wallet.id, isImporting, receivingAddressCount, changeAddressCount)
-  }
-
   public create = (props: WalletProperties) => {
     if (!props) {
       throw new IsRequired('wallet property')
@@ -277,7 +264,7 @@ export default class WalletService {
 
     this.listStore.writeSync(this.walletsKey, newWallets)
     wallet.deleteKeystore()
-    const addressInterfaces = await AddressService.deleteByWalletId(id)
+    const addressInterfaces = AddressService.deleteByWalletId(id)
     this.deindexAddresses(addressInterfaces.map(addr => addr.address))
   }
 
@@ -288,7 +275,7 @@ export default class WalletService {
     if (addressesWithEnvPrefix.length === 0) {
       return
     }
-    const addrs: string[] = (await AddressService.findByAddresses(addressesWithEnvPrefix)).map(addr => addr.address)
+    const addrs: string[] = AddressService.findByAddresses(addressesWithEnvPrefix).map(addr => addr.address)
     const deindexAddresses: string[] = addresses.filter(item => addrs.indexOf(item) < 0);
     // only deindex if no same wallet
     if (deindexAddresses.length !== 0) {
@@ -472,7 +459,7 @@ export default class WalletService {
       throw new WalletNotFound(walletID)
     }
 
-    const addressInfos = await this.getAddressInfos(walletID)
+    const addressInfos = this.getAddressInfos(walletID)
 
     const addresses: string[] = addressInfos.map(info => info.address)
 
@@ -483,7 +470,7 @@ export default class WalletService {
       capacity: BigInt(item.capacity).toString(),
     }))
 
-    const changeAddress: string = await this.getChangeAddress()
+    const changeAddress: string = this.getChangeAddress()
 
     const tx: TransactionWithoutHash = await TransactionGenerator.generateTx(
       lockHashes,
@@ -502,20 +489,20 @@ export default class WalletService {
     fee: string = '0',
     feeRate: string = '0',
   ): Promise<TransactionWithoutHash> => {
-    const wallet = await this.get(walletID)
+    const wallet = this.get(walletID)
     if (!wallet) {
       throw new WalletNotFound(walletID)
     }
 
-    const addressInfos = await this.getAddressInfos(walletID)
+    const addressInfos = this.getAddressInfos(walletID)
 
     const addresses: string[] = addressInfos.map(info => info.address)
 
     const lockHashes: string[] = new LockUtils(await LockUtils.systemScript()).addressesToAllLockHashes(addresses)
 
-    const address = await AddressesService.nextUnusedAddress(walletID)
+    const address = AddressesService.nextUnusedAddress(walletID)
 
-    const changeAddress: string = await this.getChangeAddress()
+    const changeAddress: string = this.getChangeAddress()
 
     const tx = await TransactionGenerator.generateDepositTx(
       lockHashes,
@@ -798,7 +785,7 @@ export default class WalletService {
   }
 
   // path is a BIP44 full path such as "m/44'/309'/0'/0/0"
-  public getAddressInfos = async (walletID: string): Promise<AddressInterface[]> => {
+  public getAddressInfos = (walletID: string): AddressInterface[] => {
     const wallet = this.get(walletID)
     if (!wallet) {
       throw new WalletNotFound(walletID)
@@ -806,10 +793,9 @@ export default class WalletService {
     return AddressService.allAddressesByWalletId(walletID)
   }
 
-  public getChangeAddress = async (): Promise<string> => {
+  public getChangeAddress = (): string => {
     const walletId = this.getCurrent()!.id
-    const addr = await AddressService.nextUnusedChangeAddress(walletId)
-    return addr!.address
+    return AddressService.nextUnusedChangeAddress(walletId)!.address
   }
 
   public signWitness = (
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/create.ts b/packages/neuron-wallet/src/startup/sync-block-task/create.ts
index a3220e1a12..1c856cbe84 100644
--- a/packages/neuron-wallet/src/startup/sync-block-task/create.ts
+++ b/packages/neuron-wallet/src/startup/sync-block-task/create.ts
@@ -12,7 +12,7 @@ import DataUpdateSubject from 'models/subjects/data-update'
 export { genesisBlockHash }
 
 const updateAllAddressesTxCount = async (url: string) => {
-  const addresses = (await AddressService.allAddresses()).map(addr => addr.address)
+  const addresses = AddressService.allAddresses().map(addr => addr.address)
   await AddressService.updateTxCountAndBalances(addresses, url)
 }
 
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts b/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
index 3300e261ab..87f4b91b62 100644
--- a/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
+++ b/packages/neuron-wallet/src/startup/sync-block-task/indexer.ts
@@ -12,7 +12,7 @@ const { nodeService, addressCreatedSubject, walletCreatedSubject } = remote.requ
 // maybe should call this every time when new address generated
 // load all addresses and convert to lockHashes
 export const loadAddressesAndConvert = async (nodeURL: string): Promise<string[]> => {
-  const addresses: string[] = (await AddressService.allAddresses()).map(addr => addr.address)
+  const addresses: string[] = AddressService.allAddresses().map(addr => addr.address)
   const lockUtils = new LockUtils(await LockUtils.loadSystemScript(nodeURL))
   return lockUtils.addressesToAllLockHashes(addresses)
 }
diff --git a/packages/neuron-wallet/src/startup/sync-block-task/sync.ts b/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
index 3c35053760..fdac5e0682 100644
--- a/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
+++ b/packages/neuron-wallet/src/startup/sync-block-task/sync.ts
@@ -21,7 +21,7 @@ export interface LockHashInfo {
 // load all addresses and convert to lockHashes
 export const loadAddressesAndConvert = async (nodeURL: string): Promise<string[]> => {
   const lockUtils = new LockUtils(await LockUtils.systemScript(nodeURL))
-  const addresses = (await AddressService.allAddresses()).map(addr => addr.address)
+  const addresses = AddressService.allAddresses().map(addr => addr.address)
   return lockUtils.addressesToAllLockHashes(addresses)
 }
 
diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index 1746b4d7f1..665fbc1da2 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -90,16 +90,16 @@ describe('Key tests with db', () => {
     AddressDao.deleteAll()
   })
 
-  const generate = async (id: string = walletId) => {
-    await AddressService.generateAndSave(id, extendedKey, undefined, 0, 0, 2, 1)
+  const generate = (id: string = walletId) => {
+    AddressService.generateAndSave(id, extendedKey, undefined, 0, 0, 2, 1)
   }
 
-  const checkAndGenerate = async (id: string = walletId) => {
-    await AddressService.checkAndGenerateSave(id, extendedKey, undefined, 2, 1)
+  const checkAndGenerate = (id: string = walletId) => {
+    AddressService.checkAndGenerateSave(id, extendedKey, undefined, 2, 1)
   }
 
   it('generateAndSave', async () => {
-    await generate()
+    generate()
 
     const all = AddressDao.getAll()
 
@@ -130,54 +130,54 @@ describe('Key tests with db', () => {
     expect(final.length).toEqual((2 + 1) * 2 * 2)
   })
 
-  it('generateAndSave with two wallet', async () => {
-    await generate()
-    await generate('2')
+  it('generateAndSave with two wallet', () => {
+    generate()
+    generate('2')
     const all = AddressDao.getAll()
 
     expect(all.length).toEqual((2 + 1) * 2 * 2)
   })
 
-  it('isAddressUsed', async () => {
+  it('isAddressUsed', () => {
     AddressDao.create([address, usedAddress])
-    const used = await AddressService.isAddressUsed(address.address, walletId)
+    const used = AddressService.isAddressUsed(address.address, walletId)
     expect(used).toBe(true)
   })
 
-  it('nextUnusedAddress', async () => {
+  it('nextUnusedAddress', () => {
     AddressDao.create([address, usedAddress, changeAddress])
-    const addr = await AddressService.nextUnusedAddress(walletId)
+    const addr = AddressService.nextUnusedAddress(walletId)
     const addrDao = AddressDao.nextUnusedAddress(walletId, AddressVersion.Testnet)
     expect(addr).toEqual(addrDao)
   })
 
-  it('nextUnusedChangeAddress', async () => {
+  it('nextUnusedChangeAddress', () => {
     AddressDao.create([address, usedAddress, changeAddress])
-    const addr = await AddressService.nextUnusedChangeAddress(walletId)
+    const addr = AddressService.nextUnusedChangeAddress(walletId)
     const addrDao = AddressDao.nextUnusedChangeAddress(walletId, AddressVersion.Testnet)
     expect(addr).toEqual(addrDao)
   })
 
-  it('allAddresses', async () => {
-    await generate()
-    await generate('2')
-    const all = await AddressService.allAddresses()
+  it('allAddresses', () => {
+    generate()
+    generate('2')
+    const all = AddressService.allAddresses()
     expect(all.length).toEqual(6)
   })
 
-  it('allAddressesByWalletId', async () => {
-    await generate()
-    await generate('2')
-    const all = await AddressService.allAddressesByWalletId(walletId)
+  it('allAddressesByWalletId', () => {
+    generate()
+    generate('2')
+    const all = AddressService.allAddressesByWalletId(walletId)
     expect(all.length).toEqual(3)
   })
 
-  it('usedAddress', async () => {
+  it('usedAddress', () => {
     AddressDao.create([address, usedAddress])
 
-    const addr = await AddressService.usedAddresses(walletId)
+    const addr = AddressService.usedAddresses(walletId)
     expect(addr).toEqual([])
-    const addr2 = await AddressService.usedAddresses('2')
+    const addr2 = AddressService.usedAddresses('2')
     expect(addr2).not.toEqual([])
   })
 })

From af9bf3c77f27d4dd7f14b72933d5fe46c272ebc5 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 10:52:35 +0800
Subject: [PATCH 24/35] refactor: Remove more await call

---
 packages/neuron-wallet/src/controllers/wallets.ts |  2 +-
 packages/neuron-wallet/src/services/wallets.ts    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/neuron-wallet/src/controllers/wallets.ts b/packages/neuron-wallet/src/controllers/wallets.ts
index bf895fc921..0491f7952d 100644
--- a/packages/neuron-wallet/src/controllers/wallets.ts
+++ b/packages/neuron-wallet/src/controllers/wallets.ts
@@ -134,7 +134,7 @@ export default class WalletsController {
       keystore,
     })
 
-    await walletsService.generateAddressesById(wallet.id, isImporting)
+    walletsService.generateAddressesById(wallet.id, isImporting)
 
     return {
       status: ResponseCode.Success,
diff --git a/packages/neuron-wallet/src/services/wallets.ts b/packages/neuron-wallet/src/services/wallets.ts
index 653b84f250..9bfea2d62a 100644
--- a/packages/neuron-wallet/src/services/wallets.ts
+++ b/packages/neuron-wallet/src/services/wallets.ts
@@ -357,7 +357,7 @@ export default class WalletService {
 
     const txHash = core.utils.rawTransactionToHash(ConvertTo.toSdkTxWithoutHash(tx))
 
-    const addressInfos = await this.getAddressInfos(walletID)
+    const addressInfos = this.getAddressInfos(walletID)
     const paths = addressInfos.map(info => info.path)
     const pathAndPrivateKeys = this.getPrivateKeys(wallet, paths, password)
     const findPrivateKey = (blake160: string) => {
@@ -454,7 +454,7 @@ export default class WalletService {
     fee: string = '0',
     feeRate: string = '0',
   ): Promise<TransactionWithoutHash> => {
-    const wallet = await this.get(walletID)
+    const wallet = this.get(walletID)
     if (!wallet) {
       throw new WalletNotFound(walletID)
     }
@@ -522,7 +522,7 @@ export default class WalletService {
     fee: string = '0',
     feeRate: string = '0'
   ): Promise<TransactionWithoutHash> => {
-    const wallet = await this.get(walletID)
+    const wallet = this.get(walletID)
     if (!wallet) {
       throw new WalletNotFound(walletID)
     }
@@ -538,7 +538,7 @@ export default class WalletService {
       throw new TransactionIsNotCommittedYet()
     }
 
-    const addressInfos = await this.getAddressInfos(walletID)
+    const addressInfos = this.getAddressInfos(walletID)
 
     const addresses: string[] = addressInfos.map(info => info.address)
 
@@ -767,12 +767,12 @@ export default class WalletService {
   }
 
   public computeCycles = async (walletID: string = '', capacities: string): Promise<string> => {
-    const wallet = await this.get(walletID)
+    const wallet = this.get(walletID)
     if (!wallet) {
       throw new WalletNotFound(walletID)
     }
 
-    const addressInfos = await this.getAddressInfos(walletID)
+    const addressInfos = this.getAddressInfos(walletID)
 
     const addresses: string[] = addressInfos.map(info => info.address)
 

From e03ec8087bf1b2ff8c9585caca361075c9558866 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 11:14:27 +0800
Subject: [PATCH 25/35] test: Remove async/await when testing address dao

---
 packages/neuron-wallet/tests/database/address/balance.test.ts | 2 +-
 packages/neuron-wallet/tests/database/address/dao.test.ts     | 2 +-
 packages/neuron-wallet/tests/services/address.test.ts         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/neuron-wallet/tests/database/address/balance.test.ts b/packages/neuron-wallet/tests/database/address/balance.test.ts
index c45ef8fd66..15811932de 100644
--- a/packages/neuron-wallet/tests/database/address/balance.test.ts
+++ b/packages/neuron-wallet/tests/database/address/balance.test.ts
@@ -2,7 +2,7 @@ import { AddressType } from '../../../src/models/keys/address'
 import AddressDao, { Address, AddressVersion } from '../../../src/database/address/address-dao'
 
 describe('balance', () => {
-  beforeEach(async () => {
+  beforeEach(() => {
     AddressDao.deleteAll()
   })
 
diff --git a/packages/neuron-wallet/tests/database/address/dao.test.ts b/packages/neuron-wallet/tests/database/address/dao.test.ts
index ae9b459c2a..f24416621e 100644
--- a/packages/neuron-wallet/tests/database/address/dao.test.ts
+++ b/packages/neuron-wallet/tests/database/address/dao.test.ts
@@ -47,7 +47,7 @@ describe('Address Dao tests', () => {
     version: AddressVersion.Testnet,
   }
 
-  beforeEach(async () => {
+  beforeEach(() => {
     AddressDao.deleteAll()
   })
 
diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index 665fbc1da2..f28e4cb4c9 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -86,7 +86,7 @@ describe('Key tests with db', () => {
     version: AddressVersion.Testnet,
   }
 
-  beforeEach(async () => {
+  beforeEach(() => {
     AddressDao.deleteAll()
   })
 
@@ -107,7 +107,7 @@ describe('Key tests with db', () => {
   })
 
   it('checkAndGenerateSave', async () => {
-    await generate()
+    generate()
 
     const all = AddressDao.getAll()
 

From f3b6b27f94114e622b497f53b010bd6b2f248534 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 11:40:46 +0800
Subject: [PATCH 26/35] test: Do not run address tests as async

---
 .../tests/database/address/dao.test.ts             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/neuron-wallet/tests/database/address/dao.test.ts b/packages/neuron-wallet/tests/database/address/dao.test.ts
index f24416621e..5044459f74 100644
--- a/packages/neuron-wallet/tests/database/address/dao.test.ts
+++ b/packages/neuron-wallet/tests/database/address/dao.test.ts
@@ -51,7 +51,7 @@ describe('Address Dao tests', () => {
     AddressDao.deleteAll()
   })
 
-  it('create', async () => {
+  it('create', () => {
     AddressDao.create([address])
 
     const all = AddressDao.getAll()
@@ -74,7 +74,7 @@ describe('Address Dao tests', () => {
   //   expect(dao.txCount).toEqual(getCountByAddress)
   // })
 
-  it('nextUnusedAddress', async () => {
+  it('nextUnusedAddress', () => {
     AddressDao.create([address, usedAddress])
 
     const addr = AddressDao.nextUnusedAddress('1', AddressVersion.Testnet)
@@ -87,7 +87,7 @@ describe('Address Dao tests', () => {
     expect(mainnetAddr).toBe(undefined)
   })
 
-  it('nextUnusedChangeAddress', async () => {
+  it('nextUnusedChangeAddress', () => {
     AddressDao.create([address, usedAddress, changeAddress])
 
     const addr = AddressDao.nextUnusedChangeAddress('1', AddressVersion.Testnet)
@@ -100,7 +100,7 @@ describe('Address Dao tests', () => {
     expect(mainnetAddr).toBe(undefined)
   })
 
-  it('allAddresses', async () => {
+  it('allAddresses', () => {
     AddressDao.create([address, usedAddress])
 
     const all = AddressDao.allAddresses(AddressVersion.Testnet)
@@ -111,14 +111,14 @@ describe('Address Dao tests', () => {
     expect(allMainnet.length).toEqual(0)
   })
 
-  it('allAddressesByWalletId', async () => {
+  it('allAddressesByWalletId', () => {
     AddressDao.create([address, usedAddress])
 
     const all = AddressDao.allAddressesByWalletId('1', AddressVersion.Testnet)
     expect(all.length).toEqual(1)
   })
 
-  it('usedAddressByWalletId', async () => {
+  it('usedAddressByWalletId', () => {
     AddressDao.create([address, usedAddress])
 
     const walletOne = AddressDao.usedAddressesByWalletId('1', AddressVersion.Testnet)
@@ -128,7 +128,7 @@ describe('Address Dao tests', () => {
     expect(walletTwo.length).toEqual(1)
   })
 
-  it('findByAddress', async () => {
+  it('findByAddress', () => {
     AddressDao.create([address, usedAddress])
 
     const one = AddressDao.findByAddress(address.address, address.walletId)

From 8e2d505600c1f54529beec32be1c9fd091de609d Mon Sep 17 00:00:00 2001
From: Chen Yu <keithwhisper@gmail.com>
Date: Thu, 14 Nov 2019 11:50:25 +0800
Subject: [PATCH 27/35] refactor(neuron-ui): improve precision of calculateAPY
 (#1102)

* refactor(neuron-ui): improve precision of calculateAPY

* fix(neuron-ui): display percentage of apy

* test(neuron-ui): fix tests of calculateGlobalAPY
---
 .../src/tests/calculation/calculateGlobalAPY/fixtures.ts    | 2 +-
 packages/neuron-ui/src/utils/calculateAPY.ts                | 6 +++---
 packages/neuron-ui/src/utils/calculateGlobalAPY.ts          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
index 3b0eb42968..8033cbe2d6 100644
--- a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
+++ b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
@@ -7,6 +7,6 @@ export default {
   'one period and one handrand days': {
     currentTime: new Date('2023-04-10').getTime(),
     genesisTime: new Date('2019-01-01').getTime(),
-    expectAPY: 0.02369552868619654,
+    expectAPY: 2.369552868619654,
   },
 }
diff --git a/packages/neuron-ui/src/utils/calculateAPY.ts b/packages/neuron-ui/src/utils/calculateAPY.ts
index b4bec8fc05..0748ea8c8b 100644
--- a/packages/neuron-ui/src/utils/calculateAPY.ts
+++ b/packages/neuron-ui/src/utils/calculateAPY.ts
@@ -1,7 +1,7 @@
 const YEAR = 365 * 24 * 60 * 60 * 1000
+const BASE = 10000000
 
 export default (interest: string, amount: string, duration: string) => {
-  const BASE = 10000
-  const v = +((BigInt(interest) * BigInt(BASE)) / BigInt(amount)).toString() * (YEAR / +duration)
-  return `${(v / BASE).toFixed(2)}`
+  const v = (BigInt(interest) * BigInt(YEAR) * BigInt(BASE)) / (BigInt(amount) * BigInt(duration))
+  return `${(Number(v) / (BASE / 100)).toFixed(2)}`
 }
diff --git a/packages/neuron-ui/src/utils/calculateGlobalAPY.ts b/packages/neuron-ui/src/utils/calculateGlobalAPY.ts
index 4c189275e5..b80971bec1 100644
--- a/packages/neuron-ui/src/utils/calculateGlobalAPY.ts
+++ b/packages/neuron-ui/src/utils/calculateGlobalAPY.ts
@@ -44,5 +44,5 @@ export default async (now: number, initialTimestamp: number | undefined = cached
   realPrimaryOffer += primaryOfferFraction
 
   const totalOffer = INITIAL_OFFER + realPrimaryOffer + realSecondaryOffer
-  return +(Number(SECONDARY_OFFER) / Number(totalOffer)).toFixed(2)
+  return +(Number(SECONDARY_OFFER) / (Number(totalOffer) / 100)).toFixed(2)
 }

From e6d6060a503099189c04152e83a356ac54447680 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Thu, 14 Nov 2019 11:56:34 +0800
Subject: [PATCH 28/35] feat(neuron-ui): rename interest to compensation

---
 .../src/components/CustomRows/DAORecordRow.tsx         | 10 +++++-----
 .../src/components/NervosDAO/WithdrawDialog.tsx        |  2 +-
 packages/neuron-ui/src/locales/en.json                 |  6 +++---
 packages/neuron-ui/src/locales/zh.json                 |  6 +++---
 packages/neuron-ui/src/utils/calculateAPY.ts           |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
index 564aaf4764..f129370cf3 100644
--- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
+++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -64,13 +64,13 @@ const DAORecord = ({
       })
   }, [daoData, depositOutPoint, blockNumber])
 
-  const interest = BigInt(withdraw || capacity) - BigInt(capacity)
+  const compensation = BigInt(withdraw || capacity) - BigInt(capacity)
 
   let ready = false
   let metaInfo = 'Ready'
   if (!depositOutPoint) {
     const duration = BigInt(tipBlockNumber) - BigInt(blockNumber)
-    metaInfo = t('nervos-dao.interest-accumulated', {
+    metaInfo = t('nervos-dao.compensation-accumulated', {
       blockNumber: localNumberFormatter(duration >= BigInt(0) ? duration : 0),
     })
   } else {
@@ -115,8 +115,8 @@ const DAORecord = ({
     <div className={`${styles.daoRecord} ${depositOutPoint ? styles.isClaim : ''}`}>
       <div className={styles.primaryInfo}>
         <div>
-          {interest >= BigInt(0)
-            ? `${depositOutPoint ? '' : '~'}${shannonToCKBFormatter(interest.toString()).toString()} CKB`
+          {compensation >= BigInt(0)
+            ? `${depositOutPoint ? '' : '~'}${shannonToCKBFormatter(compensation.toString()).toString()} CKB`
             : ''}
         </div>
         <div>{`${shannonToCKBFormatter(capacity)} CKB`}</div>
@@ -142,7 +142,7 @@ const DAORecord = ({
         </div>
       </div>
       <div className={styles.secondaryInfo}>
-        <span>{`APY: ~${calculateAPY(interest.toString(), capacity, `${Date.now() - +timestamp}`)}%`}</span>
+        <span>{`APY: ~${calculateAPY(compensation.toString(), capacity, `${Date.now() - +timestamp}`)}%`}</span>
         <span>{uniformTimeFormatter(+timestamp)}</span>
         <span>{metaInfo}</span>
       </div>
diff --git a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
index 294da0d95a..01fce07c2d 100644
--- a/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/WithdrawDialog.tsx
@@ -92,7 +92,7 @@ const WithdrawDialog = ({
             <span>{`${shannonToCKBFormatter(record.capacity)} CKB`}</span>
           </Text>
           <Text as="p" variant="large" block>
-            <span>{`${t('nervos-dao.interest')}: `}</span>
+            <span>{`${t('nervos-dao.compensation')}: `}</span>
             <span>
               {withdrawValue
                 ? `${shannonToCKBFormatter((BigInt(withdrawValue) - BigInt(record.capacity)).toString())} CKB`
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index e1c8db0a17..0cf35a730f 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -325,13 +325,13 @@
       "cancel": "Cancel",
       "proceed": "Proceed",
       "deposit-value": "Deposit",
-      "interest": "Interest",
+      "compensation": "Compensation",
       "notice-wait-time": "Notice: You need to wait {{epochs}} epochs {{blocks}} blocks(~{{days}} days) to claim the saving.",
-      "deposit-terms": "Nervos DAO needs 102 CKB for receipt storage, which is not interest-bearing.\nNervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit.",
+      "deposit-terms": "Nervos DAO needs 102 CKB for receipt storage, which is not compensation-bearing.\nNervos DAO is a system layer decentralized infrastructure. Your saving here is secure.\nAccording to the Nervos DAO protocol, you need at least 180 epochs to withdraw your deposit.",
       "deposited-action-label": "Withdraw",
       "withdrawing-action-label": "Claim",
       "minimal-fee-required": "The minimum deposit capacity is {{minimal}} CKB",
-      "interest-accumulated": "{{blockNumber}} blocks interest accumulated",
+      "compensation-accumulated": "{{blockNumber}} blocks compensation accumulated",
       "blocks-left": "{{epochs}} epochs {{blocks}} blocks left(~{{days}} days)",
       "withdraw-alert": "Alert: these are only {{epochs}} epochs left before the next start withdrawing epoch number conforming to Nervos DAO, and it is possible that you have to do the withdraw after the next period(~{{days}}) due to the jam on CKB.",
       "insufficient-period-alert-title": "Insufficient Period",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index eea59d3f59..d216b8e6f7 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -325,13 +325,13 @@
       "cancel": "取消",
       "proceed": "继续",
       "deposit-value": "存款",
-      "interest": "利息",
+      "compensation": "锁定补贴",
       "notice-wait-time": "注意: 您需要等待 {{epochs}} epochs {{blocks}} 区块(~{{days}}天)完成最终取款。",
-      "deposit-terms": "存入 NervosDAO 的资产中需要 102 CKB 作为存款凭证的存储，这部分 CKB 是无法产生利息的。\nNervos DAO 是一个系统层面的去中心化底层设施。您在其中存款是十分安全的。\n根据 Nervos DAO 的协议, 您需要等待至少 180 个 epochs 才能取回您的存款。",
+      "deposit-terms": "存入 NervosDAO 的资产中需要 102 CKB 作为存款凭证的存储，这部分 CKB 是无法产生锁定补贴的。\nNervos DAO 是一个系统层面的去中心化底层设施。您在其中存款是十分安全的。\n根据 Nervos DAO 的协议, 您需要等待至少 180 个 epochs 才能取回您的存款。",
       "deposited-action-label": "结算",
       "withdrawing-action-label": "取款",
       "minimal-fee-required": "存入金额应不少于 {{minimal}} CKB",
-      "interest-accumulated": "已累计 {{blockNumber}} 个块的利息",
+      "compensation-accumulated": "已累计 {{blockNumber}} 个块的锁定补贴",
       "blocks-left": " 还需等待 {{epochs}} epochs {{blocks}} 个块(~{{days}} 天)",
       "withdraw-alert": "风险提示：距离 NervosDAO 规定的最近一个允许提现 epoch 仅剩下 {{epochs}} 个 epoch，存在提现交易拥堵无法上链从而导致只能在下一个提现周期(约 {{days}} 天)的风险",
       "insufficient-period-alert-title": "未达到要求周期",
diff --git a/packages/neuron-ui/src/utils/calculateAPY.ts b/packages/neuron-ui/src/utils/calculateAPY.ts
index 0748ea8c8b..cae67e4206 100644
--- a/packages/neuron-ui/src/utils/calculateAPY.ts
+++ b/packages/neuron-ui/src/utils/calculateAPY.ts
@@ -1,7 +1,7 @@
 const YEAR = 365 * 24 * 60 * 60 * 1000
 const BASE = 10000000
 
-export default (interest: string, amount: string, duration: string) => {
-  const v = (BigInt(interest) * BigInt(YEAR) * BigInt(BASE)) / (BigInt(amount) * BigInt(duration))
+export default (compensation: string, amount: string, duration: string) => {
+  const v = (BigInt(compensation) * BigInt(YEAR) * BigInt(BASE)) / (BigInt(amount) * BigInt(duration))
   return `${(Number(v) / (BASE / 100)).toFixed(2)}`
 }

From 60571388a3225bd16c6c8402bc6c2018d74069a8 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 12:00:47 +0800
Subject: [PATCH 29/35] test: Do not run address tests as async

---
 packages/neuron-wallet/tests/services/address.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
index f28e4cb4c9..a06ff9be13 100644
--- a/packages/neuron-wallet/tests/services/address.test.ts
+++ b/packages/neuron-wallet/tests/services/address.test.ts
@@ -98,7 +98,7 @@ describe('Key tests with db', () => {
     AddressService.checkAndGenerateSave(id, extendedKey, undefined, 2, 1)
   }
 
-  it('generateAndSave', async () => {
+  it('generateAndSave', () => {
     generate()
 
     const all = AddressDao.getAll()
@@ -106,7 +106,7 @@ describe('Key tests with db', () => {
     expect(all.length).toEqual((2 + 1) * 2)
   })
 
-  it('checkAndGenerateSave', async () => {
+  it('checkAndGenerateSave', () => {
     generate()
 
     const all = AddressDao.getAll()
@@ -123,7 +123,7 @@ describe('Key tests with db', () => {
       })
     AddressDao.updateAll(usedAll)
 
-    await checkAndGenerate()
+    checkAndGenerate()
 
     const final = AddressDao.getAll()
 

From c337a2151dbaadfd82d6d31dd49b51093bfb09c2 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Thu, 14 Nov 2019 12:03:15 +0800
Subject: [PATCH 30/35] feat(neuron-ui): rename APY to APC

---
 .../src/components/CustomRows/DAORecordRow.tsx   |  4 ++--
 .../neuron-ui/src/components/NervosDAO/index.tsx | 12 ++++++------
 packages/neuron-ui/src/locales/en.json           |  2 +-
 packages/neuron-ui/src/locales/zh.json           |  2 +-
 .../fixtures.ts                                  |  4 ++--
 .../calculation/calculateGlobalAPC/index.test.ts | 16 ++++++++++++++++
 .../calculation/calculateGlobalAPY/index.test.ts | 16 ----------------
 .../utils/{calculateAPY.ts => calculateAPC.ts}   |  0
 ...lculateGlobalAPY.ts => calculateGlobalAPC.ts} |  0
 9 files changed, 28 insertions(+), 28 deletions(-)
 rename packages/neuron-ui/src/tests/calculation/{calculateGlobalAPY => calculateGlobalAPC}/fixtures.ts (84%)
 create mode 100644 packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/index.test.ts
 delete mode 100644 packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts
 rename packages/neuron-ui/src/utils/{calculateAPY.ts => calculateAPC.ts} (100%)
 rename packages/neuron-ui/src/utils/{calculateGlobalAPY.ts => calculateGlobalAPC.ts} (100%)

diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
index f129370cf3..a847a68b62 100644
--- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
+++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx
@@ -3,7 +3,7 @@ import { DefaultButton } from 'office-ui-fabric-react'
 import { useTranslation } from 'react-i18next'
 import { ckbCore, getBlockByNumber } from 'services/chain'
 import { showMessage } from 'services/remote'
-import calculateAPY from 'utils/calculateAPY'
+import calculateAPC from 'utils/calculateAPC'
 import { shannonToCKBFormatter, uniformTimeFormatter, localNumberFormatter } from 'utils/formatters'
 import calculateClaimEpochNumber from 'utils/calculateClaimEpochNumber'
 import { epochParser } from 'utils/parsers'
@@ -142,7 +142,7 @@ const DAORecord = ({
         </div>
       </div>
       <div className={styles.secondaryInfo}>
-        <span>{`APY: ~${calculateAPY(compensation.toString(), capacity, `${Date.now() - +timestamp}`)}%`}</span>
+        <span>{`APC: ~${calculateAPC(compensation.toString(), capacity, `${Date.now() - +timestamp}`)}%`}</span>
         <span>{uniformTimeFormatter(+timestamp)}</span>
         <span>{metaInfo}</span>
       </div>
diff --git a/packages/neuron-ui/src/components/NervosDAO/index.tsx b/packages/neuron-ui/src/components/NervosDAO/index.tsx
index 3435891b41..448ba0e0ba 100644
--- a/packages/neuron-ui/src/components/NervosDAO/index.tsx
+++ b/packages/neuron-ui/src/components/NervosDAO/index.tsx
@@ -8,7 +8,7 @@ import appState from 'states/initStates/app'
 import { AppActions, StateWithDispatch } from 'states/stateProvider/reducer'
 import { updateNervosDaoData, clearNervosDaoData } from 'states/stateProvider/actionCreators'
 
-import calculateGlobalAPY from 'utils/calculateGlobalAPY'
+import calculateGlobalAPC from 'utils/calculateGlobalAPC'
 import calculateFee from 'utils/calculateFee'
 import { shannonToCKBFormatter, CKBToShannonFormatter } from 'utils/formatters'
 import { MIN_DEPOSIT_AMOUNT, MEDIUM_FEE_RATE, SHANNON_CKB_RATIO, CapacityUnit } from 'utils/const'
@@ -45,7 +45,7 @@ const NervosDAO = ({
   const [activeRecord, setActiveRecord] = useState<State.NervosDAORecord | null>(null)
   const [errorMessage, setErrorMessage] = useState('')
   const [withdrawList, setWithdrawList] = useState<(string | null)[]>([])
-  const [globalAPY, setGlobalAPY] = useState(0)
+  const [globalAPC, setGlobalAPC] = useState(0)
 
   const clearGeneratedTx = useCallback(() => {
     dispatch({
@@ -106,8 +106,8 @@ const NervosDAO = ({
 
   useEffect(() => {
     if (tipBlockTimestamp) {
-      calculateGlobalAPY(tipBlockTimestamp).then(apy => {
-        setGlobalAPY(apy)
+      calculateGlobalAPC(tipBlockTimestamp).then(apc => {
+        setGlobalAPC(apc)
       })
     }
   }, [tipBlockTimestamp])
@@ -298,10 +298,10 @@ const NervosDAO = ({
         <Text as="span" variant="small" block>{`Epoch number: ${epochInfo.number}`}</Text>
         <Text as="span" variant="small" block>{`Epoch index: ${epochInfo.index}`}</Text>
         <Text as="span" variant="small" block>{`Epoch length: ${epochInfo.length}`}</Text>
-        <Text as="span" variant="small" block>{`APY: ~${globalAPY}%`}</Text>
+        <Text as="span" variant="small" block>{`APC: ~${globalAPC}%`}</Text>
       </Stack>
     )
-  }, [epoch, globalAPY])
+  }, [epoch, globalAPC])
 
   const lockAndFreeProperties = [
     {
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
index 0cf35a730f..eb07aa5946 100644
--- a/packages/neuron-ui/src/locales/en.json
+++ b/packages/neuron-ui/src/locales/en.json
@@ -314,7 +314,7 @@
       "locked": "Locked",
       "deposit": "Deposit",
       "deposit-receipts": "Deposit Receipts",
-      "apy": "APY",
+      "apc": "APC",
       "deposit-at": "Deposit at {{time}}",
       "claim": "Claim",
       "withdraw": "Withdraw",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
index d216b8e6f7..d79846dac7 100644
--- a/packages/neuron-ui/src/locales/zh.json
+++ b/packages/neuron-ui/src/locales/zh.json
@@ -314,7 +314,7 @@
       "locked": "已锁定",
       "deposit": "存入",
       "deposit-receipts": "存款凭证",
-      "apy": "预期年化利率",
+      "apc": "年化锁定补贴率",
       "deposit-at": "存入于{{time}}",
       "claim": "取款",
       "withdraw": "结算",
diff --git a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/fixtures.ts
similarity index 84%
rename from packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
rename to packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/fixtures.ts
index 8033cbe2d6..dea8b027bb 100644
--- a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/fixtures.ts
+++ b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/fixtures.ts
@@ -2,11 +2,11 @@ export default {
   'return 0 if the genesis block is not loaded': {
     currentTime: Date.now(),
     genesisTime: undefined,
-    expectAPY: 0,
+    expectAPC: 0,
   },
   'one period and one handrand days': {
     currentTime: new Date('2023-04-10').getTime(),
     genesisTime: new Date('2019-01-01').getTime(),
-    expectAPY: 2.369552868619654,
+    expectAPC: 2.369552868619654,
   },
 }
diff --git a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/index.test.ts
new file mode 100644
index 0000000000..673cfaf3ad
--- /dev/null
+++ b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPC/index.test.ts
@@ -0,0 +1,16 @@
+import calculateGlobalAPC from 'utils/calculateGlobalAPC'
+import fixtures from './fixtures'
+
+describe('calculate the global apc', () => {
+  const fixtureTable = Object.entries(fixtures).map(([title, { currentTime, genesisTime, expectAPC }]) => [
+    title,
+    currentTime,
+    genesisTime,
+    expectAPC,
+  ])
+
+  test.each(fixtureTable)(`%s`, async (_title, currentTime, genesisTime, expectAPC) => {
+    const apc = await calculateGlobalAPC(currentTime, genesisTime)
+    expect(apc).toBe(expectAPC === 0 ? 0 : +expectAPC.toFixed(2))
+  })
+})
diff --git a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts b/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts
deleted file mode 100644
index d82bbc797c..0000000000
--- a/packages/neuron-ui/src/tests/calculation/calculateGlobalAPY/index.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import calculateGlobalAPY from 'utils/calculateGlobalAPY'
-import fixtures from './fixtures'
-
-describe('calculate the global apy', () => {
-  const fixtureTable = Object.entries(fixtures).map(([title, { currentTime, genesisTime, expectAPY }]) => [
-    title,
-    currentTime,
-    genesisTime,
-    expectAPY,
-  ])
-
-  test.each(fixtureTable)(`%s`, async (_title, currentTime, genesisTime, expectAPY) => {
-    const apy = await calculateGlobalAPY(currentTime, genesisTime)
-    expect(apy).toBe(expectAPY === 0 ? 0 : +expectAPY.toFixed(2))
-  })
-})
diff --git a/packages/neuron-ui/src/utils/calculateAPY.ts b/packages/neuron-ui/src/utils/calculateAPC.ts
similarity index 100%
rename from packages/neuron-ui/src/utils/calculateAPY.ts
rename to packages/neuron-ui/src/utils/calculateAPC.ts
diff --git a/packages/neuron-ui/src/utils/calculateGlobalAPY.ts b/packages/neuron-ui/src/utils/calculateGlobalAPC.ts
similarity index 100%
rename from packages/neuron-ui/src/utils/calculateGlobalAPY.ts
rename to packages/neuron-ui/src/utils/calculateGlobalAPC.ts

From 50fb9b4889bc7e1e18698a83067baec6d7fcb9e7 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 12:38:28 +0800
Subject: [PATCH 31/35] chore: Test mode should not log all kinds of typeorm
 levels

---
 packages/neuron-wallet/src/database/chain/ormconfig.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/src/database/chain/ormconfig.ts b/packages/neuron-wallet/src/database/chain/ormconfig.ts
index 030e4eed5e..c5730b278f 100644
--- a/packages/neuron-wallet/src/database/chain/ormconfig.ts
+++ b/packages/neuron-wallet/src/database/chain/ormconfig.ts
@@ -32,7 +32,7 @@ const connectOptions = async (genesisBlockHash: string): Promise<SqliteConnectio
   const database = env.isTestMode ? ':memory:' : dbPath(genesisBlockHash)
 
   const logging: boolean | ('query' | 'schema' | 'error' | 'warn' | 'info' | 'log' | 'migration')[] =
-    (env.isDevMode || env.isTestMode) ? ['warn', 'error', 'log', 'info', 'schema', 'migration'] : ['warn', 'error']
+    (env.isDevMode) ? ['warn', 'error', 'log', 'info', 'schema', 'migration'] : ['warn', 'error']
 
   return {
     ...connectionOptions,

From a9c23e84442397f2fae2f3d76f009495468c02d8 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 12:58:52 +0800
Subject: [PATCH 32/35] test: Delete mockDeleteAddressByWalletId

---
 packages/neuron-wallet/tests/services/wallets.test.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/neuron-wallet/tests/services/wallets.test.ts b/packages/neuron-wallet/tests/services/wallets.test.ts
index 81c01a53a5..0478b44101 100644
--- a/packages/neuron-wallet/tests/services/wallets.test.ts
+++ b/packages/neuron-wallet/tests/services/wallets.test.ts
@@ -3,13 +3,6 @@ import Keystore from '../../src/models/keys/keystore'
 import Keychain from '../../src/models/keys/keychain'
 import { mnemonicToSeedSync } from '../../src/models/keys/mnemonic'
 import { ExtendedPrivateKey, AccountExtendedPublicKey } from '../../src/models/keys/key'
-import AddressService from '../../src/services/addresses'
-
-const mockDeleteAddressByWalletId = () => {
-  const mockDeleteAddress = jest.fn()
-  mockDeleteAddress.mockReturnValue(undefined)
-  AddressService.deleteByWalletId = mockDeleteAddress.bind(AddressService)
-}
 
 describe('wallet service', () => {
   let walletService: WalletService
@@ -121,7 +114,6 @@ describe('wallet service', () => {
   })
 
   it('delete wallet', () => {
-    mockDeleteAddressByWalletId()
     const w1 = walletService.create(wallet1)
     walletService.create(wallet2)
     expect(walletService.getAll().length).toBe(2)
@@ -154,7 +146,6 @@ describe('wallet service', () => {
   })
 
   it('delete current wallet', () => {
-    mockDeleteAddressByWalletId()
     const w1 = walletService.create(wallet1)
     const w2 = walletService.create(wallet2)
     walletService.delete(w1.id)
@@ -164,7 +155,6 @@ describe('wallet service', () => {
   })
 
   it('delete none current wallet', () => {
-    mockDeleteAddressByWalletId()
     const w1 = walletService.create(wallet1)
     const w2 = walletService.create(wallet2)
     walletService.delete(w2.id)

From 13e6ebe46e4a66ed1ab824690301bc4f852e0dbc Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 13:26:12 +0800
Subject: [PATCH 33/35] chore(ci): Run wallet CI with runInBand option

---
 packages/neuron-wallet/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index 1530c36f10..f490580768 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -21,7 +21,7 @@
     "start:dev": "yarn run build && electron .",
     "build": "ttsc && ncp ./src/startup/sync-block-task/index.html ./dist/startup/sync-block-task/index.html",
     "clean": "rimraf dist/*",
-    "test": "jest --color",
+    "test": "jest --color --runInBand",
     "test:e2e": "jest --config jest.e2e.config.js --color",
     "lint": "eslint --fix --ext .ts,.js src",
     "precommit": "lint-staged",

From a7b463b5daf442d7ed197754a174316cd066f636 Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 13:50:44 +0800
Subject: [PATCH 34/35] chore: Bump to v0.24.5

---
 lerna.json                          | 2 +-
 package.json                        | 2 +-
 packages/neuron-ui/package.json     | 2 +-
 packages/neuron-wallet/package.json | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lerna.json b/lerna.json
index 33a4f30e1f..a4bf763061 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.24.4",
+  "version": "0.24.5",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/package.json b/package.json
index cca3c7e96c..9768d96911 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.24.4",
+  "version": "0.24.5",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
index 1c8eab3e4c..b10015055d 100644
--- a/packages/neuron-ui/package.json
+++ b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.24.4",
+  "version": "0.24.5",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json
index f490580768..bb864d38bb 100644
--- a/packages/neuron-wallet/package.json
+++ b/packages/neuron-wallet/package.json
@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.24.4",
+  "version": "0.24.5",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -64,7 +64,7 @@
     "electron-devtools-installer": "2.2.4",
     "electron-notarize": "0.1.1",
     "lint-staged": "9.2.5",
-    "neuron-ui": "0.24.4",
+    "neuron-ui": "0.24.5",
     "rimraf": "3.0.0",
     "spectron": "8.0.0",
     "ts-transformer-imports": "0.4.3",

From 674cec48f46cc8e3f43e58d2a8b22609f1bb5f6d Mon Sep 17 00:00:00 2001
From: James Chen <james@ashchan.com>
Date: Thu, 14 Nov 2019 13:51:53 +0800
Subject: [PATCH 35/35] docs: Update changelog

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 402299c135..760656b3ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## [0.24.5](https://github.com/nervosnetwork/neuron/compare/v0.24.4...v0.24.5) (2019-11-14)
+
+
+### Bug Fixes
+
+* **neuron-ui:** add decimal validation on deposit value ([#1093](https://github.com/nervosnetwork/neuron/issues/1093)) ([61eab4f](https://github.com/nervosnetwork/neuron/commit/61eab4f))
+* current block number should be -1 if not start ([543cdd0](https://github.com/nervosnetwork/neuron/commit/543cdd0))
+* dao i18n ([4f41d9d](https://github.com/nervosnetwork/neuron/commit/4f41d9d))
+
+
+### Features
+
+* **neuron-ui:** add an alert when past epochs are less than 5 ([15d0cc8](https://github.com/nervosnetwork/neuron/commit/15d0cc8))
+* **neuron-ui:** add border color on dao records ([96b4ef6](https://github.com/nervosnetwork/neuron/commit/96b4ef6))
+* **neuron-ui:** rename APY to APC ([c337a21](https://github.com/nervosnetwork/neuron/commit/c337a21))
+* **neuron-ui:** rename interest to compensation ([e6d6060](https://github.com/nervosnetwork/neuron/commit/e6d6060))
+* Regenerate addresses if necessary on launch ([9988a13](https://github.com/nervosnetwork/neuron/commit/9988a13))
+* **neuron-ui:** add content in deposit notice ([dd0c7dc](https://github.com/nervosnetwork/neuron/commit/dd0c7dc))
+* **neuron-ui:** add global apy estimation ([#1092](https://github.com/nervosnetwork/neuron/issues/1092)) ([dc82cbb](https://github.com/nervosnetwork/neuron/commit/dc82cbb))
+* **neuron-ui:** add more translation of nervos dao ([3c62598](https://github.com/nervosnetwork/neuron/commit/3c62598))
+* **neuron-ui:** adjust the order of dao records ([e8398b6](https://github.com/nervosnetwork/neuron/commit/e8398b6))
+* **neuron-ui:** remove the user-confirmation from phase2 of nervos dao ([7e9e9e3](https://github.com/nervosnetwork/neuron/commit/7e9e9e3))
+* **neuron-ui:** rename deposit record to deposit receipt ([4c587a8](https://github.com/nervosnetwork/neuron/commit/4c587a8))
+* **neuron-ui:** use the same style of activity record on deposit record. ([99f77aa](https://github.com/nervosnetwork/neuron/commit/99f77aa))
+* Remove address sqlite db ([6f95340](https://github.com/nervosnetwork/neuron/commit/6f95340))
+* Send address db changed event when address store ([617a9a3](https://github.com/nervosnetwork/neuron/commit/617a9a3))
+* **neuron-ui:** remove redundant error messages ([c67aa36](https://github.com/nervosnetwork/neuron/commit/c67aa36))
+* **neuron-ui:** update the info and message of nervos dao ([cd44e43](https://github.com/nervosnetwork/neuron/commit/cd44e43))
+* **neuron-ui:** use the same style of overview on nervos dao overview ([20bbf33](https://github.com/nervosnetwork/neuron/commit/20bbf33))
+
+
+
 ## [0.24.4](https://github.com/nervosnetwork/neuron/compare/v0.24.3...v0.24.4) (2019-11-12)