refactor(wrapped-keys-lit-actions): LIT-3920 - Normalize function signature for verifyMessageSignature() and signMessage()

Author: MaximusHaximus

packages/wrapped-keys-lit-actions/src/lib/ethereum/internal/signMessage.js

@@ -11,11 +11,13 @@ async function signMessage({ privateKey, messageToSign }) {
   }
 }
 
-function verifyMessageSignature(messageToSign, signature) {
+function verifyMessageSignature({ messageToSign, signature }) {
   try {
     return ethers.utils.verifyMessage(messageToSign, signature);
   } catch (err) {
-    throw new Error(`When validating signed message is valid: ${err.message}`);
+    throw new Error(
+      `When validating signed Ethereum message is valid: ${err.message}`
+    );
   }
 }
 
@@ -25,11 +27,7 @@ export async function signMessageEthereumKey({ privateKey, messageToSign }) {
     messageToSign,
   });
 
-  const recoveredAddress = verifyMessageSignature(
-    messageToSign,
-    signature,
-    walletAddress
-  );
+  const recoveredAddress = verifyMessageSignature({ messageToSign, signature });
 
   if (recoveredAddress !== walletAddress) {
     throw new Error(

packages/wrapped-keys-lit-actions/src/lib/solana/internal/signMessage.js

@@ -2,7 +2,7 @@ import { Keypair } from '@solana/web3.js';
 import bs58 from 'bs58';
 import nacl from 'tweetnacl';
 
-async function signMessage({ messageToSign, solanaKeyPair }) {
+function signMessage({ messageToSign, solanaKeyPair }) {
   try {
     const signature = nacl.sign.detached(
       new TextEncoder().encode(messageToSign),
@@ -25,19 +25,25 @@ function verifyMessageSignature({ signature, solanaKeyPair, messageToSign }) {
 
     return isValid;
   } catch (err) {
-    throw new Error(`When validating signed message is valid: ${err.message}`);
+    throw new Error(
+      `When validating signed Solana message is valid: ${err.message}`
+    );
   }
 }
 
 export async function signMessageSolanaKey({ messageToSign, privateKey }) {
   const solanaKeyPair = Keypair.fromSecretKey(Buffer.from(privateKey, 'hex'));
 
-  const { signature } = await signMessage({
+  const { signature } = signMessage({
     messageToSign,
     solanaKeyPair,
   });
 
-  const isValid = verifyMessageSignature({ signature, solanaKeyPair });
+  const isValid = verifyMessageSignature({
+    signature,
+    solanaKeyPair,
+    messageToSign,
+  });
 
   if (!isValid) {
     throw new Error('Signature did not verify to expected Solana public key');