refac: Prettier

Author: DashKash54

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

@@ -52,6 +52,7 @@ export const testExportWrappedKey = async (devEnv: TinnyEnvironment) => {
   const { decryptedPrivateKey } = await exportPrivateKey({
     pkpSessionSigs: pkpSessionSigsExport,
     litNodeClient: devEnv.litNodeClient,
+    network: 'solana',
   });
 
   if (decryptedPrivateKey !== privateKey) {

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

@@ -49,10 +49,10 @@ export const testGenerateEthereumWrappedKey = async (
 
   console.log(pkpSessionSigsExport);
 
-  // FIXME: Export broken as we can't decrypt data encrypted inside a Lit Action
   const { decryptedPrivateKey } = await exportPrivateKey({
     pkpSessionSigs: pkpSessionSigsExport,
     litNodeClient: devEnv.litNodeClient,
+    network: 'evm',
   });
 
   const wallet = new ethers.Wallet(decryptedPrivateKey);

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

@@ -4,7 +4,7 @@ import { api } from '@lit-protocol/wrapped-keys';
 import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
 import nacl from 'tweetnacl';
 import bs58 from 'bs58';
-import { ethers } from 'ethers';
+import { Keypair } from '@solana/web3.js';
 
 const { generatePrivateKey, signMessageWithEncryptedKey, exportPrivateKey } =
   api;
@@ -83,16 +83,18 @@ export const testGenerateSolanaWrappedKey = async (
     new Date(Date.now() + 1000 * 60 * 10).toISOString()
   ); // 10 mins expiry
 
-  // FIXME: Export broken as we can't decrypt data encrypted inside a Lit Action
   const { decryptedPrivateKey } = await exportPrivateKey({
     pkpSessionSigs: pkpSessionSigsExport,
     litNodeClient: devEnv.litNodeClient,
+    network: 'solana',
   });
 
-  const wallet = new ethers.Wallet(decryptedPrivateKey);
-  const decryptedPublicKey = wallet.publicKey;
+  const solanaKeyPair = Keypair.fromSecretKey(
+    Buffer.from(decryptedPrivateKey, 'hex')
+  );
+  const decryptedPublicKey = solanaKeyPair.publicKey;
 
-  if (decryptedPublicKey !== generatedPublicKey) {
+  if (decryptedPublicKey.toString() !== generatedPublicKey) {
     throw new Error(
       `Decrypted decryptedPublicKey: ${decryptedPublicKey} doesn't match with the original generatedPublicKey: ${generatedPublicKey}`
     );

packages/wrapped-keys/esbuild.config.js

@@ -26,9 +26,7 @@ const esbuild = require('esbuild');
     inject: ['./buffer.shim.js'],
   });
   await esbuild.build({
-    entryPoints: [
-      './src/lib/litActions/common/src/exportPrivateKey.js',
-    ],
+    entryPoints: ['./src/lib/litActions/common/src/exportPrivateKey.js'],
     bundle: true,
     minify: true,
     sourcemap: false,

packages/wrapped-keys/src/lib/api/export-private-key.ts

@@ -2,10 +2,7 @@ import { exportPrivateKeyWithLitAction } from '../lit-actions-client';
 
 import { fetchPrivateKeyMetadata } from '../service-client';
 import { ExportPrivateKeyParams, ExportPrivateKeyResult } from '../types';
-import {
-  getFirstSessionSig,
-  getPkpAccessControlCondition,
-} from '../utils';
+import { getFirstSessionSig, getPkpAccessControlCondition } from '../utils';
 import { getLitActionCid } from '../lit-actions-client/utils';
 
 /**
@@ -20,7 +17,6 @@ import { getLitActionCid } from '../lit-actions-client/utils';
 export async function exportPrivateKey(
   params: ExportPrivateKeyParams
 ): Promise<ExportPrivateKeyResult> {
-
   const { litNodeClient, network, pkpSessionSigs } = params;
 
   const sessionSig = getFirstSessionSig(pkpSessionSigs);

packages/wrapped-keys/src/lib/lit-actions-client/export-private-key.ts

@@ -3,8 +3,7 @@ import { AccessControlConditions } from '@lit-protocol/types';
 import { postLitActionValidation } from './utils';
 import { ExportPrivateKeyParams, StoredKeyMetadata } from '../types';
 
-interface SignMessageWithLitActionParams
-  extends ExportPrivateKeyParams {
+interface SignMessageWithLitActionParams extends ExportPrivateKeyParams {
   accessControlConditions: AccessControlConditions;
   storedKeyMetadata: StoredKeyMetadata;
   litActionIpfsCid: string;
@@ -21,7 +20,12 @@ export async function exportPrivateKeyWithLitAction(
     storedKeyMetadata,
   } = args;
 
-  const { pkpAddress, ciphertext, dataToEncryptHash, ...storeKeyMetadataMinusEncryptedAndPkp } = storedKeyMetadata;
+  const {
+    pkpAddress,
+    ciphertext,
+    dataToEncryptHash,
+    ...storeKeyMetadataMinusEncryptedAndPkp
+  } = storedKeyMetadata;
   const result = await litNodeClient.executeJs({
     sessionSigs: pkpSessionSigs,
     ipfsId: litActionIpfsCid,
@@ -33,7 +37,7 @@ export async function exportPrivateKeyWithLitAction(
     },
   });
 
-  const decryptedPrivateKey =  postLitActionValidation(result);
+  const decryptedPrivateKey = postLitActionValidation(result);
 
   return {
     decryptedPrivateKey,

packages/wrapped-keys/src/lib/litActions/common/src/exportPrivateKey.js

@@ -35,9 +35,9 @@ const { removeSaltFromDecryptedKey } = require('../../utils');
   }
 
   try {
-      const privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
-      Lit.Actions.setResponse({ response: privateKey });
+    const privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
+    Lit.Actions.setResponse({ response: privateKey });
   } catch (err) {
-      Lit.Actions.setResponse({ response: err.message });
+    Lit.Actions.setResponse({ response: err.message });
   }
 })();

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

@@ -70,8 +70,7 @@ export type StoreEncryptedKeyMetadataParams = BaseApiParams &
  * @extends BaseApiParams
  *
  */
-export type ExportPrivateKeyParams = BaseApiParams &
-  ApiParamsSupportedNetworks;
+export type ExportPrivateKeyParams = BaseApiParams & ApiParamsSupportedNetworks;
 
 /** Includes the decrypted private key and metadata that was stored alongside it in the wrapped keys service
  *