Used untagged message for claim signing and minor refactor

LiskHQ · Apr 10, 2024 · 5e4cdcd · 5e4cdcd
1 parent 7696599
commit 5e4cdcd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/libs/hardwareWallet/ledger/ledgerLiskAppIPCChannel/index.js b/libs/hardwareWallet/ledger/ledgerLiskAppIPCChannel/index.js
@@ -8,6 +8,7 @@ import {
   getPubKey,
   getConnectedDevices,
   getSignedMessage,
+  getSignedRawMessage,
   getSignedTransaction,
   getMultipleAddresses,
 } from './serverLedgerHWCommunication';
@@ -39,7 +40,7 @@ export const ledgerLiskAppIPCChannel = () => {
 
   createIpcMainChannel(GET_SIGNED_RAW_MESSAGE, async (data) => {
     const id = `${GET_SIGNED_RAW_MESSAGE}-${Date.now()}`;
-    const result = await getSequentiallyQueuedData(myq, id, () => getSignedMessage(data));
+    const result = await getSequentiallyQueuedData(myq, id, () => getSignedRawMessage(data));
     return result;
   });
 

diff --git a/libs/hardwareWallet/ledger/ledgerLiskAppIPCChannel/serverLedgerHWCommunication/index.js b/libs/hardwareWallet/ledger/ledgerLiskAppIPCChannel/serverLedgerHWCommunication/index.js
@@ -90,6 +90,28 @@ export async function getSignedMessage({ devicePath, accountIndex, unsignedMessa
   }
 }
 
+export async function getSignedRawMessage({ devicePath, accountIndex, unsignedMessage }) {
+  let transport;
+  try {
+    transport = await TransportNodeHid.open(devicePath);
+    const liskLedger = new LiskApp(transport);
+    const ledgerAccount = getLedgerAccount(accountIndex);
+    const message = isHexString(unsignedMessage)
+      ? Buffer.from(unsignedMessage, 'hex')
+      : Buffer.from(unsignedMessage);
+    const response = await liskLedger.claimMessage(ledgerAccount.derivePath(), message);
+    await transport?.close();
+
+    if (response?.error_message === 'No errors') {
+      return response;
+    }
+    return Promise.reject(response.return_code);
+  } catch (error) {
+    if (transport) await transport.close();
+    return Promise.reject(error);
+  }
+}
+
 export async function getConnectedDevices() {
   try {
     const devicePaths = await TransportNodeHid.list();

diff --git a/src/modules/message/store/action.js b/src/modules/message/store/action.js
@@ -50,7 +50,7 @@ export const signClaimMessage =
       const [error, signature] = await to(
         signClaimMessageUsingHW({
           account: currentAccount,
-          message: getUnsignedNonProtocolMessage(portalMessage),
+          message: portalMessage,
         })
       );