Merge branch 'develop'

Author: devchenyan

_typos.toml

@@ -1,11 +1,9 @@
 [default.extend-words]
 thur = "thur"
+numer = "numer"
 
 # defined in database schema
 lastest = "lastest"
 
 [files]
 extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts"]
-
-
-

compatible.csv

@@ -1,5 +1,6 @@
-CKB,0.110,0.109,0.108,0.107,0.106,0.105,0.104,0.103
-Neuron,,,,,,,,
-0.110,yes,yes,no,no,no,no,no,no
-0.106,no,no,yes,yes,yes,yes,no,no
-0.103,no,no,no,no,no,no,yes,yes
+CKB,0.111,0.110,0.109,0.108,0.107,0.106,0.105,0.104,0.103
+Neuron,,,,,,,,,
+0.111,yes,yes,yes,no,no,no,no,no,no
+0.110,yes,yes,yes,no,no,no,no,no,no
+0.106,no,no,no,yes,yes,yes,yes,no,no
+0.103,no,no,no,no,no,no,no,yes,yes

packages/neuron-wallet/package.json

@@ -42,17 +42,16 @@
     ]
   },
   "dependencies": {
-    "@ckb-lumos/base": "0.20.0-alpha.3",
-    "@ckb-lumos/bi": "0.20.0-alpha.3",
-    "@ckb-lumos/ckb-indexer": "0.20.0-alpha.3",
-    "@ckb-lumos/codec": "0.20.0-alpha.3",
-    "@ckb-lumos/config-manager": "0.20.0-alpha.3",
-    "@ckb-lumos/hd": "0.20.0-alpha.3",
-    "@ckb-lumos/helpers": "0.20.0-alpha.3",
-    "@ckb-lumos/rpc": "0.20.0-alpha.3",
+    "@ckb-lumos/base": "^0.21.0-next.1",
+    "@ckb-lumos/bi": "^0.21.0-next.1",
+    "@ckb-lumos/ckb-indexer": "^0.21.0-next.1",
+    "@ckb-lumos/codec": "^0.21.0-next.1",
+    "@ckb-lumos/config-manager": "^0.21.0-next.1",
+    "@ckb-lumos/hd": "^0.21.0-next.1",
+    "@ckb-lumos/helpers": "^0.21.0-next.1",
+    "@ckb-lumos/rpc": "^0.21.0-next.1",
     "@iarna/toml": "2.2.5",
     "@ledgerhq/hw-transport-node-hid": "6.27.16",
-    "@nervosnetwork/ckb-sdk-core": "0.109.0",
     "@walletconnect/core": "2.10.2",
     "archiver": "5.3.0",
     "async": "3.2.4",

packages/neuron-wallet/src/block-sync-renderer/sync/queue.ts

@@ -146,7 +146,7 @@ export default class Queue {
     const headers = await rpc
       .createBatchRequest<'getHeader', string[], CKBComponents.BlockHeader[]>(blockHashes.map(v => ['getHeader', v]))
       .exec()
-    headers.forEach((blockHeader, idx) => {
+    headers.forEach((blockHeader: CKBComponents.BlockHeader, idx: number) => {
       if (blockHeader) {
         const header = BlockHeader.fromSDK(blockHeader)
         txs[idx].timestamp = header.timestamp

packages/neuron-wallet/src/controllers/offline-sign.ts

@@ -40,7 +40,8 @@ export default class OfflineSignController {
     const rpc = generateRPC(NodeService.getInstance().nodeUrl)
 
     if (context === undefined) {
-      const rawTx = rpc.paramsFormatter.toRawTransaction(tx.toSDKRawTransaction())
+      const rawSdkTx = tx.toSDKRawTransaction()
+      const rawTx = rpc.paramsFormatter.toRawTransaction(rawSdkTx)
       const txs = await Promise.all(rawTx.inputs.map(i => rpc.getTransaction(i.previous_output!.tx_hash)))
       context = txs.map(i => rpc.paramsFormatter.toRawTransaction(i.transaction))
     }

packages/neuron-wallet/src/models/chain/block.ts

@@ -14,7 +14,9 @@ export default class Block {
     const header = BlockHeader.fromSDK(block.header)
     return new Block(
       header,
-      block.transactions.map(tx => Transaction.fromSDK(tx, header))
+      block.transactions.map((tx: CKBComponents.RawTransaction | CKBComponents.Transaction) =>
+        Transaction.fromSDK(tx, header)
+      )
     )
   }
 }

packages/neuron-wallet/src/models/chain/transaction.ts

@@ -298,7 +298,7 @@ export default class Transaction {
     blockHeader?: BlockHeader
   ): Transaction {
     const txHash: string | undefined = (tx as CKBComponents.Transaction).hash
-    const outputs = tx.outputs.map((o, i) => {
+    const outputs = tx.outputs.map((o: CKBComponents.CellOutput, i: number) => {
       const output = Output.fromSDK(o)
       if (txHash) {
         output.setOutPoint(new OutPoint(txHash, i.toString()))
@@ -307,9 +307,9 @@ export default class Transaction {
     })
     return new Transaction(
       tx.version,
-      tx.cellDeps.map(cd => CellDep.fromSDK(cd)),
+      tx.cellDeps.map((cd: CKBComponents.CellDep) => CellDep.fromSDK(cd)),
       tx.headerDeps,
-      tx.inputs.map(i => Input.fromSDK(i)),
+      tx.inputs.map((i: CKBComponents.CellInput) => Input.fromSDK(i)),
       outputs,
       tx.outputsData,
       tx.witnesses,

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

@@ -155,6 +155,7 @@ class NodeService {
   }
 
   public async verifyExternalCkbNode() {
+    logger.info('CKB:\tstart verify external ckb node')
     const network = NetworksService.getInstance().getCurrent()
     if (this._isCkbNodeExternal && network.type !== NetworkType.Light) {
       const localNodeInfo = await new RpcService(network.remote).localNodeInfo()

packages/neuron-wallet/src/services/sdk-core.ts

@@ -1,4 +1,4 @@
-import CKB from '@nervosnetwork/ckb-sdk-core'
+import { CKBRPC } from '@ckb-lumos/rpc'
 import https from 'https'
 import http from 'http'
 
@@ -19,14 +19,14 @@ const getHttpAgent = () => {
   return httpAgent
 }
 
-export const generateCKB = (url: string): CKB => {
-  const ckb = new CKB(url)
+export const generateCKB = (url: string): CKBRPC => {
+  const rpc = new CKBRPC(url)
   if (url.startsWith('https')) {
-    ckb.rpc.setNode({ url, httpsAgent: getHttpsAgent() })
+    rpc.setNode({ url, httpsAgent: getHttpsAgent() })
   } else {
-    ckb.rpc.setNode({ url, httpAgent: getHttpAgent() })
+    rpc.setNode({ url, httpAgent: getHttpAgent() })
   }
-  return ckb
+  return rpc
 }
 
 export default {

packages/neuron-wallet/src/services/transaction-sender.ts

@@ -1,4 +1,3 @@
-import signWitnesses from '@nervosnetwork/ckb-sdk-core/lib/signWitnesses'
 import NodeService from './node'
 import { serializeWitnessArgs } from '../utils/serialization'
 import { scriptToAddress } from '../utils/scriptAndAddress'
@@ -21,6 +20,7 @@ import Script from '../models/chain/script'
 import Multisig from '../models/multisig'
 import Blake2b from '../models/blake2b'
 import logger from '../utils/logger'
+import { signWitnesses } from '../utils/signWitnesses'
 import { bytes as byteUtils, bytes, number } from '@ckb-lumos/codec'
 import SystemScriptInfo from '../models/system-script-info'
 import AddressParser from '../models/address-parser'
@@ -42,7 +42,7 @@ import { getMultisigStatus } from '../utils/multisig'
 import { SignStatus } from '../models/offline-sign'
 import NetworksService from './networks'
 import { generateRPC } from '../utils/ckb-rpc'
-import CKB from '@nervosnetwork/ckb-sdk-core'
+import { CKBRPC } from '@ckb-lumos/rpc'
 import CellsService from './cells'
 import hd from '@ckb-lumos/hd'
 
@@ -216,7 +216,8 @@ export default class TransactionSender {
         wit.lock = serializedMultisig + wit.lock!.slice(2)
         signed[0] = serializeWitnessArgs(wit.toSDK())
       } else {
-        signed = signWitnesses(privateKey)({
+        signed = signWitnesses({
+          privateKey,
           transactionHash: txHash,
           witnesses: serializedWitnesses.map(wit => {
             if (typeof wit === 'string') {
@@ -791,9 +792,8 @@ export default class TransactionSender {
     depositOutPoint: OutPoint,
     withdrawBlockHash: string
   ): Promise<bigint> => {
-    const ckb = new CKB(NodeService.getInstance().nodeUrl)
+    const ckb = new CKBRPC(NodeService.getInstance().nodeUrl)
     const result = await ckb.calculateDaoMaximumWithdraw(depositOutPoint.toSDK(), withdrawBlockHash)
-
     return BigInt(result)
   }