Merge pull request #1903 from nervosnetwork/fix/hardware-sign-message

fix: hardware sign message should use default address to sign

Author: kellyshang

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

@@ -12,7 +12,7 @@ import { AccountExtendedPublicKey } from 'models/keys/key'
 export abstract class Hardware {
   public deviceInfo: DeviceInfo
   public isConnected: boolean
-  protected defaultAddress = AccountExtendedPublicKey.ckbAccountPath
+  protected defaultPath = AccountExtendedPublicKey.ckbAccountPath
 
   constructor(device: DeviceInfo) {
     this.deviceInfo = device

packages/neuron-wallet/src/services/hardware/ledger.ts

@@ -46,7 +46,7 @@ export default class Ledger extends Hardware {
   }
 
   public async getExtendedPublicKey (): Promise<ExtendedPublicKey> {
-    const { public_key, chain_code } = await this.ledgerCKB!.getWalletExtendedPublicKey(this.defaultAddress)
+    const { public_key, chain_code } = await this.ledgerCKB!.getWalletExtendedPublicKey(this.defaultPath)
     return {
       publicKey: public_key,
       chainCode: chain_code
@@ -63,19 +63,19 @@ export default class Ledger extends Hardware {
     }
 
     const signature = await this.ledgerCKB!.signTransaction(
-      path === Address.pathForReceiving(0) ? this.defaultAddress : path,
+      path === Address.pathForReceiving(0) ? this.defaultPath : path,
       rawTx,
       witnesses,
       context,
-      this.defaultAddress,
+      this.defaultPath,
     )
 
     return signature
   }
 
   async signMessage (path: string, messageHex: string) {
     const message = HexUtils.removePrefix(messageHex)
-    const signed = await this.ledgerCKB!.signMessage(path, message, false)
+    const signed = await this.ledgerCKB!.signMessage(path === Address.pathForReceiving(0) ? this.defaultPath : path, message, false)
     return HexUtils.addPrefix(signed)
   }