Merge pull request #1871 from nervosnetwork/rc/v0.33.0

Rc/v0.33.0-rc1

Author: kellyshang

.ckb-version

@@ -1 +1 @@
-v0.32.0
+v0.35.1

CHANGELOG.md

@@ -1,3 +1,40 @@
+# 0.33.0-rc1 (2020-09-27)
+
+This is a release candidate to preview the changes in the next official release and may not be stable. Welcome any questions or suggestions.
+
+[CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1) was released on Sept. 14th, 2020. This version of 
+CKB node is now bundled and preconfigured in Neuron. 
+
+Note: There will be a data migration for the new bundled node [CKB v0.35.1](https://github.com/nervosnetwork/ckb/releases/tag/v0.35.1), which may take several minutes to boot up for the first time after upgraded from the earlier versions.
+
+### Refactor
+
+* Upgrade from Electron 7 to Electron 9.
+* Refactor the wallet address storage to be based on an SQLite table rather than a JSON file.
+* Deprecate LevelDB and use SQLite instead.
+* Refactor send component.
+
+### New features
+
+* Reduce the confirmation block height from 300 to 24.
+* Enable `Asset Accounts` for mainnet.
+* Support transfer to multisig address.
+
+### Bug fixes
+
+* Fixed `InsufficientCellCapacity` error for CKB ACP transfer when there are cells with data.
+* Fixed `too many SQL variables` error when there are too many addresses in wallets.
+* Fixed the autofill description on unlocking assets.
+* Refine error message when the fee for dao withdrawal transaction is insufficient.
+
+
+# 0.32.3 (2020-09-22)
+[CKB v0.32.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.32.0) was released on May 22nd, 2020. This version of CKB node is now bundled and preconfigured in Neuron. 
+
+### Bug fixes
+
+* Fix a bug of lumos query for multisign lock.
+
 # 0.33.0-beta.1 (2020-09-12)
 
 This is a beta version to preview the changes in the next release and may not be stable. It is not suggested to install this version for asset management. Welcome any questions or suggestions.

azure-pipelines.yml

@@ -5,6 +5,7 @@ trigger:
       - master
       - develop
       - rc/*
+      - hotfix/*
   tags:
     include:
       - refs/tags/v*

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.33.0-beta.1",
+  "version": "0.33.0-rc1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.33.0-beta.1",
+  "version": "0.33.0-rc1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.33.0-beta.1",
+  "version": "0.33.0-rc1",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

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

@@ -97,7 +97,7 @@ const PasswordRequest = () => {
             if (isSending) {
               break
             }
-            await sendTransaction({ walletID, tx: generatedTx, description, password })(dispatch).then(status => {
+            await sendTransaction({ walletID, tx: generatedTx, password })(dispatch).then(status => {
               if (isSuccessResponse({ status })) {
                 dispatch({
                   type: AppActions.SetGlobalDialog,

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

@@ -66,10 +66,7 @@ const SpecialAssetList = () => {
   const isMainnet = isMainnetUtil(networks, networkID)
 
   useEffect(() => {
-    dispatch({
-      type: AppActions.UpdateGeneratedTx,
-      payload: null,
-    })
+    dispatch({ type: AppActions.ClearSendState })
   }, [dispatch])
 
   const fetchList = useCallback(

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

@@ -1,14 +1,7 @@
 import React, { useEffect, useState, useMemo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { currentWallet as currentWalletCache } from 'services/localCache'
-import {
-  getSystemCodeHash,
-  getTransaction,
-  showErrorMessage,
-  getAllNetworks,
-  getCurrentNetworkID,
-} from 'services/remote'
-import { ckbCore } from 'services/chain'
+import { getTransaction, showErrorMessage, getAllNetworks, getCurrentNetworkID } from 'services/remote'
 
 import { transactionState } from 'states'
 
@@ -21,6 +14,7 @@ import {
   shannonToCKBFormatter,
   useExitOnWalletChange,
   isSuccessResponse,
+  scriptToAddress,
 } from 'utils'
 import CopyZone from 'widgets/CopyZone'
 
@@ -30,12 +24,10 @@ const { MAINNET_TAG } = CONSTANTS
 
 const Transaction = () => {
   const [t, i18n] = useTranslation()
-  const [systemCodeHash, setSystemCodeHash] = useState<string>('')
   const [transaction, setTransaction] = useState(transactionState)
   const [isMainnet, setIsMainnet] = useState(false)
   const [error, setError] = useState({ code: '', message: '' })
 
-  const addressPrefix = isMainnet ? ckbCore.utils.AddressPrefix.Mainnet : ckbCore.utils.AddressPrefix.Testnet
   const hash = useMemo(() => window.location.href.split('/').pop(), [])
 
   useOnLocaleChange(i18n)
@@ -46,11 +38,6 @@ const Transaction = () => {
   }, [i18n.language, hash])
 
   useEffect(() => {
-    getSystemCodeHash().then(res => {
-      if (isSuccessResponse(res)) {
-        setSystemCodeHash(res.result)
-      }
-    })
     Promise.all([getAllNetworks(), getCurrentNetworkID()])
       .then(([networksRes, idRes]) => {
         if (isSuccessResponse(networksRes) && isSuccessResponse(idRes)) {
@@ -149,23 +136,7 @@ const Transaction = () => {
           address = t('transaction.cell-from-cellbase')
         } else {
           try {
-            if (cell.lock.codeHash === systemCodeHash && cell.lock.hashType === 'type') {
-              address = ckbCore.utils.bech32Address(cell.lock.args, {
-                prefix: addressPrefix,
-                type: ckbCore.utils.AddressType.HashIdx,
-                codeHashOrCodeHashIndex: '0x00',
-              })
-            } else {
-              address = ckbCore.utils.fullPayloadToAddress({
-                arg: cell.lock.args,
-                prefix: addressPrefix,
-                type:
-                  cell.lock.hashType === 'data'
-                    ? ckbCore.utils.AddressType.DataCodeHash
-                    : ckbCore.utils.AddressType.TypeCodeHash,
-                codeHash: cell.lock.codeHash,
-              })
-            }
+            address = scriptToAddress(cell.lock, isMainnet)
           } catch (err) {
             console.error(err)
           }
@@ -188,7 +159,7 @@ const Transaction = () => {
           </tr>
         )
       }),
-    [t, addressPrefix, systemCodeHash]
+    [t, isMainnet]
   )
 
   if (error.code) {

packages/neuron-ui/src/containers/Main/hooks.ts

@@ -21,7 +21,7 @@ import {
 import { ckbCore, getBlockchainInfo, getTipHeader } from 'services/chain'
 import { networks as networksCache, currentNetworkID as currentNetworkIDCache } from 'services/localCache'
 import { WalletWizardPath } from 'components/WalletWizard'
-import { ConnectionStatus, ErrorCode, RoutePath } from 'utils'
+import { ErrorCode, RoutePath, getConnectionStatus } from 'utils'
 
 const SYNC_INTERVAL_TIME = 4000
 const CONNECTING_BUFFER = 15_000
@@ -60,12 +60,7 @@ export const useSyncChainData = ({ chainURL, dispatch }: { chainURL: string; dis
           }
         })
         .catch(() => {
-          if (isCurrentUrl(chainURL)) {
-            dispatch({
-              type: NeuronWalletActions.UpdateConnectionStatus,
-              payload: Date.now() > CONNECTING_DEADLINE ? ConnectionStatus.Offline : ConnectionStatus.Connecting,
-            })
-          }
+          // ignore, unconnected events are handled in subscription
         })
     }
     clearInterval(timer!)
@@ -175,13 +170,9 @@ export const useSubscription = ({
     })
     const connectionStatusSubscription = ConnectionStatusSubject.subscribe(status => {
       if (isCurrentUrl(status.url)) {
-        let payload = status.connected ? ConnectionStatus.Online : ConnectionStatus.Offline
-        if (payload === ConnectionStatus.Offline && Date.now() <= CONNECTING_DEADLINE) {
-          payload = ConnectionStatus.Connecting
-        }
         dispatch({
           type: NeuronWalletActions.UpdateConnectionStatus,
-          payload,
+          payload: getConnectionStatus({ ...status, isTimeout: Date.now() > CONNECTING_DEADLINE }),
         })
       }
     })