Merge branch 'LIT-3920-batchGeneratePrivateKeys' into feature/lit-3945-js-sdk-add-sendtosinglenode-feature

Author: Ansonhkg

local-tests/tests/wrapped-keys/testBatchGeneratePrivateKeys.ts

@@ -94,6 +94,7 @@ export const testBatchGeneratePrivateKeys = async (
     const solanaMessageToSign = 'This is a test solana message';
     const evmMessageToSign = 'This is a test evm message';
     const results = await batchGeneratePrivateKeys({
+    const { results } = await batchGeneratePrivateKeys({
       pkpSessionSigs: pkpSessionSigsSigning,
       actions: [
         {

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

@@ -17,17 +17,11 @@ async function processEthereumAction(action, ndx) {
   const ethereumKey = generateEthereumPrivateKey();
 
   const [generatedPrivateKey, messageSignature] = await Promise.all([
-    Lit.Actions.runOnce(
-      { waitForResponse: true, name: `encryptEthereumPrivateKey_${ndx}` },
-      async () =>
-        JSON.stringify(
-          await encryptPrivateKey({
-            accessControlConditions,
-            publicKey: ethereumKey.publicKey,
-            privateKey: ethereumKey.privateKey,
-          })
-        )
-    ),
+    encryptPrivateKey({
+      accessControlConditions,
+      publicKey: ethereumKey.publicKey,
+      privateKey: ethereumKey.privateKey,
+    }),
     messageToSign
       ? signMessageEthereumKey({
           messageToSign: messageToSign,
@@ -39,7 +33,7 @@ async function processEthereumAction(action, ndx) {
   return {
     network,
     generatedPrivateKey: {
-      ...JSON.parse(generatedPrivateKey),
+      ...generatedPrivateKey,
       memo: generateKeyParams.memo,
     },
     ...(messageSignature
@@ -56,17 +50,11 @@ async function processSolanaAction(action, ndx) {
   const solanaKey = generateSolanaPrivateKey();
 
   const [generatedPrivateKey, messageSignature] = await Promise.all([
-    Lit.Actions.runOnce(
-      { waitForResponse: true, name: `encryptSolanaPrivateKey_${ndx}` },
-      async () =>
-        JSON.stringify(
-          await encryptPrivateKey({
-            accessControlConditions,
-            publicKey: solanaKey.publicKey,
-            privateKey: solanaKey.privateKey,
-          })
-        )
-    ),
+    encryptPrivateKey({
+      accessControlConditions,
+      publicKey: solanaKey.publicKey,
+      privateKey: solanaKey.privateKey,
+    }),
     messageToSign
       ? signMessageSolanaKey({
           messageToSign: messageToSign,
@@ -78,7 +66,7 @@ async function processSolanaAction(action, ndx) {
   return {
     network,
     generatedPrivateKey: {
-      ...JSON.parse(generatedPrivateKey),
+      ...generatedPrivateKey,
       memo: generateKeyParams.memo,
     },
     ...(messageSignature
@@ -144,13 +132,10 @@ function validateParams(actions) {
   try {
     validateParams(actions);
 
-    const batchGeneratePrivateKeysActionResult = await Lit.Actions.runOnce(
-      { waitForResponse: true, name: `processActions` },
-      async () => JSON.stringify(await processActions(actions))
-    );
+    const batchGeneratePrivateKeysActionResult = await processActions(actions);
 
     Lit.Actions.setResponse({
-      response: batchGeneratePrivateKeysActionResult,
+      response: JSON.stringify(batchGeneratePrivateKeysActionResult),
     });
 
     // 1. Generate both EVM and solana private keys

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

@@ -13,18 +13,18 @@ import { generateEthereumPrivateKey } from './internal/generatePrivateKey';
 import { encryptPrivateKey } from '../common/internal/encryptKey';
 
 (async () => {
-  const { privateKey, publicKey } = generateEthereumPrivateKey();
-
   const encryptedKeyResultStr = await Lit.Actions.runOnce(
     { waitForResponse: true, name: 'encryptEthereumPrivateKey' },
-    async () =>
-      JSON.stringify(
+    async () => {
+      const { privateKey, publicKey } = generateEthereumPrivateKey();
+      return JSON.stringify(
         await encryptPrivateKey({
           accessControlConditions,
           privateKey,
           publicKey,
         })
-      )
+      );
+    }
   );
 
   Lit.Actions.setResponse({

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

@@ -12,18 +12,18 @@ const { encryptPrivateKey } = require('../common/internal/encryptKey');
  * @returns { Promise<string> } - Returns a stringified JSON object with ciphertext & dataToEncryptHash which are the result of the encryption. Also returns the publicKey of the newly generated Solana Wrapped Key.
  */
 (async () => {
-  const { privateKey, publicKey } = generateSolanaPrivateKey();
-
   const encryptedKeyResultStr = await Lit.Actions.runOnce(
     { waitForResponse: true, name: 'encryptSolanaPrivateKey' },
-    async () =>
-      JSON.stringify(
+    async () => {
+      const { privateKey, publicKey } = generateSolanaPrivateKey();
+      return JSON.stringify(
         await encryptPrivateKey({
           accessControlConditions,
           publicKey,
           privateKey,
         })
-      )
+      );
+    }
   );
 
   Lit.Actions.setResponse({

packages/wrapped-keys/src/lib/api/batch-generate-private-keys.ts

@@ -41,7 +41,7 @@ export async function batchGeneratePrivateKeys(
     pkpSessionSigs,
   });
 
-  return Promise.all(
+  const results = await Promise.all(
     actionResults.map(
       async (result): Promise<BatchGeneratePrivateKeysActionResult> => {
         const { generatedPrivateKey, network } = result;
@@ -70,4 +70,6 @@ export async function batchGeneratePrivateKeys(
       }
     )
   );
+
+  return { pkpAddress, results };
 }

packages/wrapped-keys/src/lib/types.ts

@@ -157,8 +157,10 @@ export interface BatchGeneratePrivateKeysActionResult {
   signedMessage?: { signature: string };
 }
 
-export type BatchGeneratePrivateKeysResult =
-  BatchGeneratePrivateKeysActionResult[];
+export interface BatchGeneratePrivateKeysResult {
+  pkpAddress: string;
+  results: BatchGeneratePrivateKeysActionResult[];
+}
 
 /** @typedef GeneratePrivateKeyParams
  * @extends BaseApiParams