Merge pull request #705 from nervosnetwork/rc/v0.1.0-alpha.12

ashchan · web-flow · commit 95a10b9e05b9 · 2019-07-19T15:06:53.000+09:00
[ᚬmaster] Release v0.1.0 alpha.12
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@nervosnetwork/neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nervosnetwork/neuron-ui",
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
diff --git a/packages/neuron-ui/src/components/History/hooks.ts b/packages/neuron-ui/src/components/History/hooks.ts
@@ -34,7 +34,7 @@ export const useSearch = (search: string = '', walletID: string = '', dispatch:
 
     dispatch(actionCreators.getTransactions({ ...params, keywords: params.keywords, walletID }))
   }, [search, walletID, dispatch])
-  return { keywords, onKeywordsChange }
+  return { keywords, onKeywordsChange, setKeywords }
 }
 
 export default {
diff --git a/packages/neuron-ui/src/components/History/index.tsx b/packages/neuron-ui/src/components/History/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import React, { useCallback, useEffect } from 'react'
 import { RouteComponentProps } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { Stack, SearchBox, getTheme } from 'office-ui-fabric-react'
@@ -42,7 +42,12 @@ const History = ({
 }: React.PropsWithoutRef<StateWithDispatch & RouteComponentProps>) => {
   const [t] = useTranslation()
 
-  const { keywords, onKeywordsChange } = useSearch(search, id, dispatch)
+  const { keywords, onKeywordsChange, setKeywords } = useSearch(search, id, dispatch)
+  useEffect(() => {
+    if (id) {
+      setKeywords('')
+    }
+  }, [id, setKeywords])
   const onSearch = useCallback(() => history.push(`${Routes.History}?keywords=${keywords}`), [history, keywords])
 
   return (
diff --git a/packages/neuron-ui/src/components/Overview/index.tsx b/packages/neuron-ui/src/components/Overview/index.tsx
@@ -276,17 +276,17 @@ const Overview = ({
       <Text as="h1" variant={TITLE_FONT_SIZE}>
         {name}
       </Text>
-      <Stack horizontal>
+      <Stack horizontal horizontalAlign="space-between">
         <PropertyList columns={balanceColumns} items={balanceItems} isHeaderVisible={false} />
         <Stack tokens={{ childrenGap: 15 }}>
           <div ref={blockchainInfoRef}>
             <DefaultButton onClick={showBlockchainStatus} styles={{ root: { width: '200px' } }}>
-              Blockchain Status
+              {t('overview.blockchain-status')}
             </DefaultButton>
           </div>
           <div ref={minerInfoRef}>
             <DefaultButton onClick={showMinerInfo} styles={{ root: { width: '200px' } }}>
-              Miner Info
+              {t('overview.miner-info')}
             </DefaultButton>
           </div>
         </Stack>
@@ -311,9 +311,10 @@ const Overview = ({
           </Stack>
         </Callout>
       ) : null}
+      {/* TODO: Implement this */}
       {minerInfoRef.current ? (
         <Callout target={minerInfoRef.current} hidden={!displayMinerInfo} onDismiss={hideMinerInfo} gapSpace={0}>
-          Miner Info
+          {t('overview.miner-info')}
         </Callout>
       ) : null}
     </Stack>
diff --git a/packages/neuron-ui/src/components/Receive/index.tsx b/packages/neuron-ui/src/components/Receive/index.tsx
@@ -78,7 +78,7 @@ const Receive = ({
             {t('receive.address-qrcode')}
           </Text>
         </Stack>
-        <Stack padding="15px">
+        <Stack tokens={{ padding: '15px' }}>
           <QRCode value={accountAddress} size={400} />
         </Stack>
       </Modal>
diff --git a/packages/neuron-ui/src/containers/Main/hooks.ts b/packages/neuron-ui/src/containers/Main/hooks.ts
@@ -484,12 +484,15 @@ export const useSyncChainData = ({ chainURL, dispatch }: { chainURL: string; dis
 
 export const useOnCurrentWalletChange = ({
   walletID,
-  chain,
+  pageNo,
+  pageSize,
   dispatch,
   history,
 }: {
   walletID: string
-  chain: State.Chain
+  pageNo: number
+  pageSize: number
+
   dispatch: StateDispatch
   history: any
 }) => {
@@ -498,27 +501,18 @@ export const useOnCurrentWalletChange = ({
       walletsCall.getAllAddresses(walletID)
       transactionsCall.getAllByKeywords({
         walletID,
-        keywords: chain.transactions.keywords,
-        pageNo: chain.transactions.pageNo,
-        pageSize: chain.transactions.pageSize,
+        keywords: '',
+        pageNo,
+        pageSize,
       })
-      transactionsCall.get(walletID, chain.transaction.hash)
     } else {
       history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`)
       dispatch({
         type: NeuronWalletActions.Wallet,
         payload: initStates.wallet,
       })
     }
-  }, [
-    walletID,
-    chain.transactions.pageNo,
-    chain.transactions.pageSize,
-    chain.transactions.keywords,
-    chain.transaction.hash,
-    dispatch,
-    history,
-  ])
+  }, [walletID, pageNo, pageSize, dispatch, history])
 }
 
 export default {
diff --git a/packages/neuron-ui/src/containers/Main/index.tsx b/packages/neuron-ui/src/containers/Main/index.tsx
@@ -108,7 +108,11 @@ const MainContent = ({
 }: React.PropsWithoutRef<{ dispatch: StateDispatch } & RouteComponentProps>) => {
   const neuronWalletState = useState()
   const {
-    chain: { networkID },
+    wallet: { id: walletID },
+    chain: {
+      networkID,
+      transactions: { pageNo, pageSize },
+    },
     settings: { networks },
   } = neuronWalletState
   const [, i18n] = useTranslation()
@@ -129,12 +133,15 @@ const MainContent = ({
     chainURL,
     dispatch,
   })
+
   useOnCurrentWalletChange({
-    walletID: neuronWalletState.wallet.id,
-    chain: neuronWalletState.chain,
+    walletID,
+    pageNo,
+    pageSize,
     dispatch,
     history,
   })
+
   return (
     <>
       {mainContents.map(container => (
diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json
@@ -20,10 +20,12 @@
       "datetime": "Date & Time",
       "status": "Status",
       "amount": "Amount",
+      "blockchain-status": "Blockchain Status",
       "chain-identity": "Chain Identity",
       "tip-block-number": "Block Number",
       "epoch": "Epoch",
-      "difficulty": "Difficulty"
+      "difficulty": "Difficulty",
+      "miner-info": "Miner Info"
     },
     "wizard": {
       "welcome-to-nervos-neuron": "Welcome to Neuron",
diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json
@@ -20,10 +20,12 @@
       "datetime": "时间",
       "status": "状态",
       "amount": "金额",
+      "blockchain-status": "链状态",
       "chain-identity": "链的 ID",
       "tip-block-number": "区块高度",
       "epoch": "Epoch",
-      "difficulty": "难度"
+      "difficulty": "难度",
+      "miner-info": "挖矿信息"
     },
     "wizard": {
       "welcome-to-nervos-ckb": "欢迎使用 Neuron",
diff --git 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.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -48,15 +48,15 @@
   },
   "devDependencies": {
     "@nervosnetwork/ckb-types": "0.15.1",
-    "@nervosnetwork/neuron-ui": "0.1.0-alpha.11",
+    "@nervosnetwork/neuron-ui": "0.1.0-alpha.12",
     "@types/async": "3.0.0",
     "@types/electron-devtools-installer": "2.2.0",
     "@types/elliptic": "6.4.8",
     "@types/sqlite3": "3.1.5",
     "@types/uuid": "3.4.4",
     "devtron": "1.4.0",
-    "electron": "5.0.6",
-    "electron-builder": "21.0.14",
+    "electron": "5.0.7",
+    "electron-builder": "21.1.1",
     "electron-devtools-installer": "2.2.4",
     "electron-notarize": "0.1.1",
     "lint-staged": "8.1.7",
diff --git a/packages/neuron-wallet/src/controllers/app/index.ts b/packages/neuron-wallet/src/controllers/app/index.ts
@@ -9,6 +9,7 @@ import NetworksService from '../../services/networks'
 import WalletsService from '../../services/wallets'
 import NodeService from '../../services/node'
 import WalletsController from '../wallets'
+import SyncInfoController from '../sync-info'
 
 import { Controller as ControllerDecorator } from '../../decorators'
 import { Channel, ResponseCode } from '../../utils/const'
@@ -35,16 +36,14 @@ export default class AppController {
       walletsService.getAll(),
       networksService.getCurrentID(),
       networksService.getAll(),
-      new Promise(resolve => {
-        nodeService.tipNumberSubject.pipe(take(1)).subscribe(
-          tipNum => {
-            resolve(tipNum || '0')
-          },
-          () => {
-            resolve('0')
+      SyncInfoController.currentBlockNumber()
+        .then(res => {
+          if (res.status) {
+            return res.result.currentBlockNumber
           }
-        )
-      }),
+          return '0'
+        })
+        .catch(() => '0'),
       new Promise(resolve => {
         nodeService.connectStatusSubject.pipe(take(1)).subscribe(
           status => {
diff --git a/packages/neuron-wallet/src/models/subjects/current-block-subject.ts b/packages/neuron-wallet/src/models/subjects/current-block-subject.ts
@@ -1,5 +1,5 @@
 import { ReplaySubject } from 'rxjs'
-import { debounceTime } from 'rxjs/operators'
+import { sampleTime } from 'rxjs/operators'
 import windowManager from '../window-manager'
 import { Channel, ResponseCode } from '../../utils/const'
 
@@ -16,7 +16,7 @@ export class CurrentBlockSubject {
   }
 
   static subscribe() {
-    CurrentBlockSubject.subject.pipe(debounceTime(500)).subscribe(({ blockNumber }) => {
+    CurrentBlockSubject.subject.pipe(sampleTime(500)).subscribe(({ blockNumber }) => {
       windowManager.broadcast(Channel.Chain, 'tipBlockNumber', {
         status: ResponseCode.Success,
         result: blockNumber,
diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts
@@ -1,6 +1,6 @@
 import Core from '@nervosnetwork/ckb-sdk-core'
 import { interval, BehaviorSubject } from 'rxjs'
-import { distinctUntilChanged, flatMap, delay, retry } from 'rxjs/operators'
+import { distinctUntilChanged, sampleTime, flatMap, delay, retry } from 'rxjs/operators'
 import { ShouldBeTypeOf } from '../exceptions'
 import windowManager from '../models/window-manager'
 import { Channel, ResponseCode } from '../utils/const'
@@ -28,7 +28,7 @@ class NodeService {
   }
 
   public syncConnectStatus = () => {
-    this.connectStatusSubject.pipe(distinctUntilChanged()).subscribe(connectStatus => {
+    this.connectStatusSubject.pipe(sampleTime(10000)).subscribe(connectStatus => {
       windowManager.broadcast(Channel.Chain, 'status', {
         status: ResponseCode.Success,
         result: connectStatus,
diff --git a/packages/neuron-wallet/src/services/sync/queue.ts b/packages/neuron-wallet/src/services/sync/queue.ts
@@ -4,6 +4,7 @@ import { Block, BlockHeader } from '../../types/cell-types'
 import RangeForCheck from './range-for-check'
 import BlockNumber from './block-number'
 import Utils from './utils'
+import TransactionsService from '../transactions'
 
 export default class Queue {
   private q: any
@@ -38,8 +39,9 @@ export default class Queue {
     this.q = async.queue(this.getWorker(), this.concurrent)
   }
 
-  private regenerateQueue = () => {
-    this.q.kill()
+  private regenerateQueue = async () => {
+    this.kill()
+    await Utils.sleep(3000)
     this.generateQueue()
   }
 
@@ -84,7 +86,7 @@ export default class Queue {
     const blocks: Block[] = await this.getBlocksService.getRangeBlocks(blockNumbers)
     const blockHeaders: BlockHeader[] = blocks.map(block => block.header)
 
-    // TODO: 2. check blockHeaders
+    // 2. check blockHeaders
     await this.checkBlockHeader(blockHeaders)
 
     // 3. check and save
@@ -102,15 +104,16 @@ export default class Queue {
     const checkResult = this.rangeForCheck.check(blockHeaders)
     if (!checkResult.success) {
       if (checkResult.type === 'first-not-match') {
-        // TODO: reset currentBlockNumber
         const range = await this.rangeForCheck.getRange()
         const rangeFirstBlockHeader: BlockHeader = range[0]
-        this.currentBlockNumber.updateCurrent(BigInt(rangeFirstBlockHeader.number))
-        this.regenerateQueue()
+        await this.currentBlockNumber.updateCurrent(BigInt(rangeFirstBlockHeader.number))
+        await this.rangeForCheck.setRange([])
+        await TransactionsService.deleteWhenFork(rangeFirstBlockHeader.number)
+        await this.regenerateQueue()
         this.startBlockNumber = await this.currentBlockNumber.getCurrent()
         this.batchPush()
       } else if (checkResult.type === 'block-headers-not-match') {
-        // TODO: throw here and retry 5 times
+        // throw here and retry 5 times
         throw new Error('chain forked')
       }
     }
diff --git a/packages/neuron-wallet/src/services/transactions.ts b/packages/neuron-wallet/src/services/transactions.ts
@@ -453,6 +453,21 @@ export default class TransactionsService {
       .execute()
   }
 
+  public static deleteWhenFork = async (blockNumber: string) => {
+    const txs = await getConnection()
+      .getRepository(TransactionEntity)
+      .createQueryBuilder('tx')
+      .where(
+        'CAST(tx.blockNumber AS UNSIGNED BIG INT) > CAST(:blockNumber AS UNSIGNED BIG INT) AND tx.status = :status',
+        {
+          blockNumber,
+          status: TransactionStatus.Success,
+        }
+      )
+      .getMany()
+    return getConnection().manager.remove(txs)
+  }
+
   // update previousOutput's status to 'dead' if found
   // calculate output lockHash, input lockHash and capacity
   // when send a transaction, use TxSaveType.Sent
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"packages": [`
`3`	`3`	`"packages/*"`
`4`	`4`	`],`
`5`		`- "version": "0.1.0-alpha.11",`
	`5`	`+ "version": "0.1.0-alpha.12",`
`6`	`6`	`"npmClient": "yarn",`
`7`	`7`	`"useWorkspaces": true`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nervosnetwork/neuron-ui",`
`3`		`- "version": "0.1.0-alpha.11",`
	`3`	`+ "version": "0.1.0-alpha.12",`
`4`	`4`	`"private": true,`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Nervos Core Dev",`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export const useSearch = (search: string = '', walletID: string = '', dispatch:`
`34`	`34`
`35`	`35`	`dispatch(actionCreators.getTransactions({ ...params, keywords: params.keywords, walletID }))`
`36`	`36`	`}, [search, walletID, dispatch])`
`37`		`- return { keywords, onKeywordsChange }`
	`37`	`+ return { keywords, onKeywordsChange, setKeywords }`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`export default {`