♻️ Handle public key check to always be buffer

LiskHQ · Jan 10, 2022 · 0b88772 · 0b88772
1 parent 326abd1
commit 0b88772
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/utils/hwManager.js b/src/utils/hwManager.js
@@ -32,6 +32,10 @@ const getAccountsFromDevice = async ({ device: { deviceId }, network }) => {
   return accounts;
 };
 
+const isKeyMatch = (aPublicKey, signerPublicKey) => (Buffer.isBuffer(aPublicKey)
+  ? aPublicKey.equals(signerPublicKey)
+  : Buffer.from(aPublicKey, 'hex').equals(signerPublicKey));
+
 /**
  * updateTransactionSignatures - Function.
  * This function updates transaction object to include the signatures at correct index.
@@ -55,10 +59,10 @@ const updateTransactionSignatures = (
   const { mandatoryKeys, optionalKeys } = keys;
   if (mandatoryKeys.length + optionalKeys.length > 0) {
     const mandatoryKeyIndex = mandatoryKeys.findIndex(
-      aPublicKey => aPublicKey.equals(signerPublicKey),
+      aPublicKey => isKeyMatch(aPublicKey, signerPublicKey),
     );
     const optionalKeyIndex = optionalKeys.findIndex(
-      aPublicKey => aPublicKey.equals(signerPublicKey),
+      aPublicKey => isKeyMatch(aPublicKey, signerPublicKey),
     );
     const signatureOffset = isMultiSignatureRegistration ? 1 : 0;
     if (mandatoryKeyIndex !== -1) {

diff --git a/src/utils/transaction.js b/src/utils/transaction.js
@@ -462,7 +462,6 @@ const signMultisigUsingPrivateKey = (
   ];
   const senderIndex = members.indexOf(publicKey);
   const isSender = rawTransaction.senderPublicKey === publicKey;
-  console.log(isMultiSignatureRegistration, isSender, senderIndex);
 
   if (isMultiSignatureRegistration && isSender && senderIndex > -1) {
     const signatures = Array.from(Array(members.length + 1).keys()).map((index) => {
@@ -513,8 +512,6 @@ const signUsingHW = async (
   const senderIndex = members.indexOf(account.summary.publicKey);
   const isSender = rawTransaction.senderPublicKey === account.summary.publicKey;
 
-  console.log(isMultiSignatureRegistration, isSender, senderIndex);
-
   if (isMultiSignatureRegistration && isSender && senderIndex > -1) {
     const signatures = Array.from(Array(members.length + 1).keys()).map((index) => {
       if (signedTransaction.signatures[index]) return signedTransaction.signatures[index];