refactor(wrapped-keys-lit-actions): LIT-3920 - Extract private key generation from _encrypted_ private key generation for direct use of generated, un-encrypted keys for signing messages in new executeWrappedKeyOperations method

Author: MaximusHaximus

packages/wrapped-keys-lit-actions/src/lib/common/internal/getDecryptedKey.js

@@ -7,15 +7,13 @@ export async function getDecryptedKey({
 }) {
   try {
     // May be undefined, since we're using `decryptToSingleNode`
-    const privateKey = await Lit.Actions.decryptToSingleNode({
+    return await Lit.Actions.decryptToSingleNode({
       accessControlConditions,
       ciphertext,
       dataToEncryptHash,
       chain: 'ethereum',
       authSig: null,
     });
-
-    return privateKey;
   } catch (err) {
     throw new Error(`When decrypting key to a single node - ${err.message}`);
   }

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

@@ -1,4 +1,7 @@
-/* global ethers, Lit */
+import { generateEthereumPrivateKey } from './generatePrivateKey';
+import { LIT_PREFIX } from '../../constants';
+
+/* global Lit */
 
 /**
  * Generates a random Ethers private key that only allows the provided PKP to decrypt it
@@ -7,25 +10,20 @@
  * @private
  * @returns { Promise<{ciphertext: string, dataToEncryptHash: string, publicKey: string}> } - The ciphertext & dataToEncryptHash which are the result of the encryption, and the publicKey of the newly generated Ethers Wrapped Key.
  */
-import { LIT_PREFIX } from '../../constants';
 
 export async function generateEncryptedEthereumPrivateKey({
   accessControlConditions,
 }) {
-  const wallet = ethers.Wallet.createRandom();
-  const privateKey = LIT_PREFIX + wallet.privateKey.toString();
-
-  let utf8Encode = new TextEncoder();
-  const to_encrypt = utf8Encode.encode(privateKey);
+  const { privateKey, publicKey } = generateEthereumPrivateKey();
 
   const { ciphertext, dataToEncryptHash } = await Lit.Actions.encrypt({
     accessControlConditions,
-    to_encrypt,
+    to_encrypt: new TextEncoder().encode(LIT_PREFIX + privateKey),
   });
 
   return {
     ciphertext,
     dataToEncryptHash,
-    publicKey: wallet.publicKey,
+    publicKey,
   };
 }

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

@@ -0,0 +1,10 @@
+/* global ethers */
+
+export function generateEthereumPrivateKey() {
+  const wallet = ethers.Wallet.createRandom();
+
+  return {
+    privateKey: wallet.privateKey.toString(),
+    publicKey: wallet.publicKey,
+  };
+}

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

@@ -1,5 +1,4 @@
-import { Keypair } from '@solana/web3.js';
-
+import { generateSolanaPrivateKey } from './generatePrivateKey';
 import { LIT_PREFIX } from '../../constants';
 
 /* global Lit */
@@ -14,20 +13,16 @@ import { LIT_PREFIX } from '../../constants';
 export async function generateEncryptedSolanaPrivateKey({
   accessControlConditions,
 }) {
-  const solanaKeypair = Keypair.generate();
-  const privateKey =
-    LIT_PREFIX + Buffer.from(solanaKeypair.secretKey).toString('hex');
-  let utf8Encode = new TextEncoder();
-  const to_encrypt = utf8Encode.encode(privateKey);
+  const { privateKey, publicKey } = generateSolanaPrivateKey();
 
   const { ciphertext, dataToEncryptHash } = await Lit.Actions.encrypt({
     accessControlConditions,
-    to_encrypt,
+    to_encrypt: new TextEncoder().encode(LIT_PREFIX + privateKey),
   });
 
   return {
     ciphertext,
     dataToEncryptHash,
-    publicKey: solanaKeypair.publicKey.toString(),
+    publicKey,
   };
 }

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

@@ -0,0 +1,10 @@
+import { Keypair } from '@solana/web3.js';
+
+export function generateSolanaPrivateKey() {
+  const solanaKeypair = Keypair.generate();
+
+  return {
+    privateKey: Buffer.from(solanaKeypair.secretKey).toString('hex'),
+    publicKey: solanaKeypair.publicKey.toString(),
+  };
+}