feat: bump sdk to v0.22.0

Author: classicalliu

packages/neuron-ui/package.json

@@ -43,7 +43,7 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.21.0",
+    "@nervosnetwork/ckb-sdk-core": "0.22.0",
     "@uifabric/experiments": "7.16.1",
     "@uifabric/styling": "7.6.2",
     "canvg": "2.0.0",

packages/neuron-wallet/package.json

@@ -34,8 +34,8 @@
     ]
   },
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.21.0",
-    "@nervosnetwork/ckb-sdk-utils": "0.21.0",
+    "@nervosnetwork/ckb-sdk-core": "0.22.0",
+    "@nervosnetwork/ckb-sdk-utils": "0.22.0",
     "bn.js": "4.11.8",
     "chalk": "2.4.2",
     "electron-log": "3.0.7",
@@ -51,7 +51,7 @@
     "uuid": "3.3.3"
   },
   "devDependencies": {
-    "@nervosnetwork/ckb-types": "0.21.0",
+    "@nervosnetwork/ckb-types": "0.22.0",
     "@types/electron-devtools-installer": "2.2.0",
     "@types/elliptic": "6.4.9",
     "@types/sqlite3": "3.1.5",

packages/neuron-wallet/src/database/chain/entities/transaction.ts

@@ -11,7 +11,7 @@ import {
   AfterRemove,
 } from 'typeorm'
 import { remote } from 'electron'
-import { Witness, Transaction as TransactionInterface, TransactionStatus, CellDep } from 'types/cell-types'
+import { Transaction as TransactionInterface, TransactionStatus, CellDep } from 'types/cell-types'
 import TxDbChangedSubject from 'models/subjects/tx-db-changed-subject'
 import InputEntity from './input'
 import OutputEntity from './output'
@@ -47,7 +47,7 @@ export default class Transaction extends BaseEntity {
   @Column({
     type: 'simple-json',
   })
-  witnesses!: Witness[]
+  witnesses!: string[]
 
   @Column({
     type: 'varchar',

packages/neuron-wallet/src/env.ts

@@ -50,7 +50,7 @@ const env: ENV = {
         name: 'Local',
         remote: 'http://localhost:8114',
         type: 1,
-        chain: 'ckb_devnet',
+        chain: 'ckb_dev',
       },
     ],
   },

packages/neuron-wallet/src/models/lock-utils.ts

@@ -85,7 +85,7 @@ export default class LockUtils {
 
     const lock: Script = {
       codeHash: systemScript.codeHash,
-      args: [LockUtils.addressToBlake160(address)],
+      args: LockUtils.addressToBlake160(address),
       hashType,
     }
     return lock
@@ -113,7 +113,7 @@ export default class LockUtils {
   }
 
   static lockScriptToAddress(lock: Script): string {
-    const blake160: string = lock.args![0]
+    const blake160: string = lock.args!
     return this.blake160ToAddress(blake160)
   }
 
@@ -127,8 +127,7 @@ export default class LockUtils {
   }
 
   static addressToBlake160(address: string): string {
-    const prefix = env.testnet ? core.utils.AddressPrefix.Testnet : core.utils.AddressPrefix.Mainnet
-    const result: string = core.utils.parseAddress(address, prefix, 'hex') as string
+    const result: string = core.utils.parseAddress(address, 'hex') as string
     const hrp: string = `0100`
     let blake160: string = result.slice(hrp.length + 2, result.length)
     if (!blake160.startsWith('0x')) {

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

@@ -159,7 +159,7 @@ export default class CellsService {
         if (!args) {
           return undefined
         }
-        return args[0]
+        return args
       })
       .filter(blake160 => !!blake160) as string[]
 

packages/neuron-wallet/src/services/tx/transaction-generator.ts

@@ -34,7 +34,7 @@ export class TransactionGenerator {
         data: '0x',
         lock: {
           codeHash,
-          args: [blake160],
+          args: blake160,
           hashType,
         },
       }
@@ -53,7 +53,7 @@ export class TransactionGenerator {
         data: '0x',
         lock: {
           codeHash,
-          args: [changeBlake160],
+          args: changeBlake160,
           hashType,
         },
       }

packages/neuron-wallet/src/services/tx/transaction-service.ts

@@ -269,11 +269,11 @@ export class TransactionsService {
     let outputBlake160s: string[] = []
     if (tx.inputs) {
       inputBlake160s = tx.inputs
-        .map(input => input.lock && input.lock.args && input.lock.args[0])
+        .map(input => input.lock && input.lock.args)
         .filter(blake160 => blake160) as string[]
     }
     if (tx.outputs) {
-      outputBlake160s = tx.outputs.map(output => output.lock.args![0])
+      outputBlake160s = tx.outputs.map(output => output.lock.args!)
     }
     return [...new Set(inputBlake160s.concat(outputBlake160s))]
   }

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

@@ -4,7 +4,7 @@ import { AccountExtendedPublicKey, PathAndPrivateKey } from 'models/keys/key'
 import Keystore from 'models/keys/keystore'
 import Store from 'models/store'
 import LockUtils from 'models/lock-utils'
-import { Witness, TransactionWithoutHash, Input } from 'types/cell-types'
+import { TransactionWithoutHash, Input } from 'types/cell-types'
 import ConvertTo from 'types/convert-to'
 import Blake2b from 'utils/blake2b'
 import { WalletNotFound, IsRequired, UsedName } from 'exceptions'
@@ -380,16 +380,16 @@ export default class WalletService {
     const paths = addressInfos.map(info => info.path)
     const pathAndPrivateKeys = this.getPrivateKeys(wallet, paths, password)
 
-    const witnesses: Witness[] = inputs!.map((input: Input) => {
-      const blake160: string = input.lock!.args![0]
+    const witnesses: string[] = inputs!.map((input: Input) => {
+      const blake160: string = input.lock!.args!
       const info = addressInfos.find(i => i.blake160 === blake160)
       const { path } = info!
       const pathAndPrivateKey = pathAndPrivateKeys.find(p => p.path === path)
       if (!pathAndPrivateKey) {
         throw new Error('no private key found')
       }
       const { privateKey } = pathAndPrivateKey
-      const witness = this.signWitness({ data: [] }, privateKey, txHash)
+      const witness = this.signWitness('', privateKey, txHash)
       return witness
     })
 
@@ -443,19 +443,15 @@ export default class WalletService {
     return addr!.address
   }
 
-  public signWitness = (witness: Witness, privateKey: string, txHash: string): Witness => {
+  public signWitness = (witness: string, privateKey: string, txHash: string): string => {
     const addrObj = core.generateAddress(privateKey)
-    const oldData = witness.data
+    const oldData = witness
     const blake2b = new Blake2b()
     blake2b.update(txHash)
-    oldData.forEach(data => {
-      blake2b.update(data)
-    })
+    blake2b.update(oldData)
     const message = blake2b.digest()
     const signature = addrObj.signRecoverable(message)
-    const newWitness: Witness = {
-      data: [signature],
-    }
+    const newWitness = signature
     return newWitness
   }
 

packages/neuron-wallet/src/startup/sync-block-task/init-database.ts

@@ -2,6 +2,7 @@ import initConnection from 'database/chain/ormconfig'
 import Utils from 'services/sync/utils'
 import { updateMetaInfo, getMetaInfo } from 'database/chain/meta-info'
 import LockUtils from 'models/lock-utils'
+import logger from 'utils/logger'
 import genesisBlockHash from './genesis'
 
 export const initDatabase = async () => {
@@ -11,6 +12,7 @@ export const initDatabase = async () => {
     const systemScriptInfo = await LockUtils.systemScript()
     updateMetaInfo({ genesisBlockHash: hash, systemScriptInfo })
   } catch (err) {
+    logger.debug('initDatabase error:', err)
     try {
       const metaInfo = getMetaInfo()
       await initConnection(metaInfo.genesisBlockHash)