Merge pull request #1128 from nervosnetwork/better-chain-info

feat: ChainInfo delegates Networks Service to get current chain

packages/neuron-wallet/src/controllers/app/menu.ts

@@ -6,7 +6,6 @@ import { UpdateController } from 'controllers'
 import { showWindow } from './show-window'
 import NetworksService from 'services/networks'
 import WalletsService from 'services/wallets'
-import ChainInfo from 'models/chain-info'
 import CommandSubject from 'models/subjects/command'
 
 enum URL {
@@ -295,10 +294,8 @@ const contextMenuTemplate: {
   },
   networkList: async (id: string) => {
     const networksService = NetworksService.getInstance()
-    const [network, currentNetworkID] = await Promise.all([
-      networksService.get(id).catch(() => null),
-      networksService.getCurrentID().catch(() => null),
-    ])
+    const network = networksService.get(id)
+    const currentNetworkID = networksService.getCurrentID()
 
     if (!network) {
       showMessageBox({
@@ -401,7 +398,11 @@ const contextMenuTemplate: {
       return []
     }
 
-    const address = bech32Address(identifier)
+    const address = bech32Address(identifier, {
+      prefix: NetworksService.getInstance().isMainnet() ? AddressPrefix.Mainnet : AddressPrefix.Testnet,
+      type: AddressType.HashIdx,
+      codeHashOrCodeHashIndex: '0x00',
+    })
     return [
       {
         label: i18n.t('contextMenu.copy-address'),
@@ -413,7 +414,7 @@ const contextMenuTemplate: {
       },
       {
         label: i18n.t('contextMenu.view-on-explorer'),
-        click: () => { shell.openExternal(`${ChainInfo.getInstance().explorerUrl()}/address/${address}`) }
+        click: () => { shell.openExternal(`${NetworksService.getInstance().explorerUrl()}/address/${address}`) }
       },
     ]
   },
@@ -431,7 +432,7 @@ const contextMenuTemplate: {
       },
       {
         label: i18n.t('contextMenu.view-on-explorer'),
-        click: () => { shell.openExternal(`${ChainInfo.getInstance().explorerUrl()}/transaction/${hash}`) }
+        click: () => { shell.openExternal(`${NetworksService.getInstance().explorerUrl()}/transaction/${hash}`) }
       },
     ]
   },

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

@@ -2,9 +2,9 @@ import fs from 'fs'
 import { parseAddress } from '@nervosnetwork/ckb-sdk-utils'
 import { dialog, SaveDialogReturnValue, BrowserWindow } from 'electron'
 import WalletsService, { Wallet, WalletProperties, FileKeystoreWallet } from 'services/wallets'
+import NetworksService from 'services/networks'
 import Keystore from 'models/keys/keystore'
 import Keychain from 'models/keys/keychain'
-import ChainInfo from 'models/chain-info'
 import { validateMnemonic, mnemonicToSeedSync } from 'models/keys/mnemonic'
 import { AccountExtendedPublicKey, ExtendedPrivateKey } from 'models/keys/key'
 import { ResponseCode } from 'utils/const'
@@ -341,7 +341,7 @@ export default class WalletsController {
       feeRate = '1000'
     }
 
-    const isMainnet = ChainInfo.getInstance().isMainnet()
+    const isMainnet = NetworksService.getInstance().isMainnet()
     params.items.forEach(item => {
       if (isMainnet && !item.address.startsWith('ckb')) {
         throw new MainnetAddressRequired(item.address)

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

@@ -10,7 +10,6 @@ import { OutPoint, Script, ScriptHashType } from 'types/cell-types'
 import ConvertTo from 'types/convert-to'
 import { SystemScriptSubject } from 'models/subjects/system-script'
 import Core from '@nervosnetwork/ckb-sdk-core'
-import ChainInfo from './chain-info'
 
 export interface SystemScript {
   codeHash: string
@@ -119,13 +118,12 @@ export default class LockUtils {
     return LockUtils.computeScriptHash(lock)
   }
 
-  static lockScriptToAddress(lock: Script): string {
+  static lockScriptToAddress(lock: Script, prefix: AddressPrefix = AddressPrefix.Mainnet): string {
     const blake160: string = lock.args!
-    return LockUtils.blake160ToAddress(blake160)
+    return LockUtils.blake160ToAddress(blake160, prefix)
   }
 
-  static blake160ToAddress(blake160: string): string {
-    const prefix = ChainInfo.getInstance().isMainnet() ? AddressPrefix.Mainnet : AddressPrefix.Testnet
+  static blake160ToAddress(blake160: string, prefix: AddressPrefix = AddressPrefix.Mainnet): string {
     return bech32Address(blake160, {
       prefix,
       type: AddressType.HashIdx,

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

@@ -5,7 +5,7 @@ import LockUtils from 'models/lock-utils'
 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'
+import NetworksService from 'services/networks'
 
 const MAX_ADDRESS_COUNT = 30
 
@@ -162,7 +162,7 @@ export default class AddressService {
       AddressPrefix.Mainnet
     ).address
 
-    const addressToParse = ChainInfo.getInstance().isMainnet() ? mainnetAddress : testnetAddress
+    const addressToParse = NetworksService.getInstance().isMainnet() ? mainnetAddress : testnetAddress
     const blake160: string = LockUtils.addressToBlake160(addressToParse)
 
     const testnetAddressInfo: AddressInterface = {
@@ -238,6 +238,6 @@ export default class AddressService {
   }
 
   private static getAddressVersion = (): AddressVersion => {
-    return ChainInfo.getInstance().isMainnet() ? AddressVersion.Mainnet : AddressVersion.Testnet
+    return NetworksService.getInstance().isMainnet() ? AddressVersion.Mainnet : AddressVersion.Testnet
   }
 }

packages/neuron-wallet/src/services/indexer/queue.ts

@@ -1,7 +1,9 @@
 import { Subject, Subscription } from 'rxjs'
+import {  AddressPrefix } from '@nervosnetwork/ckb-sdk-utils'
 import Utils from 'services/sync/utils'
 import logger from 'utils/logger'
 import GetBlocks from 'services/sync/get-blocks'
+import NetworksService from 'services/networks'
 import { Transaction, TransactionWithStatus } from 'types/cell-types'
 import TypeConvert from 'types/type-convert'
 import BlockNumber from 'services/sync/block-number'
@@ -211,7 +213,10 @@ export default class IndexerQueue {
             blockHash: transactionWithStatus.txStatus.blockHash!
           }
           if (type === TxPointType.CreatedBy && this.latestCreatedBy.includes(txUniqueFlag)) {
-            const address = LockUtils.lockScriptToAddress(transaction.outputs![parseInt(txPoint.index, 16)].lock)
+            const address = LockUtils.lockScriptToAddress(
+              transaction.outputs![parseInt(txPoint.index, 16)].lock,
+              NetworksService.getInstance().isMainnet ? AddressPrefix.Mainnet : AddressPrefix.Testnet
+            )
             AddressesUsedSubject.getSubject().next({
               addresses: [address],
               url: this.url,
@@ -273,13 +278,19 @@ export default class IndexerQueue {
 
           let address: string | undefined
           if (type === TxPointType.CreatedBy) {
-            address = LockUtils.lockScriptToAddress(transaction.outputs![parseInt(txPoint.index, 16)].lock)
+            address = LockUtils.lockScriptToAddress(
+              transaction.outputs![parseInt(txPoint.index, 16)].lock,
+              NetworksService.getInstance().isMainnet ? AddressPrefix.Mainnet : AddressPrefix.Testnet
+            )
             this.latestCreatedBy.push(txUniqueFlag)
           } else if (type === TxPointType.ConsumedBy) {
             const input = txEntity.inputs[parseInt(txPoint.index, 16)]
             const output = await IndexerTransaction.updateInputLockHash(input.outPointTxHash!, input.outPointIndex!)
             if (output) {
-              address = LockUtils.lockScriptToAddress(output.lock)
+              address = LockUtils.lockScriptToAddress(
+                output.lock,
+                NetworksService.getInstance().isMainnet ? AddressPrefix.Mainnet : AddressPrefix.Testnet
+              )
             }
           }
           if (address) {