Skip to content

Commit 4a2ea83

Browse files
committed
fix: Return salt error from Wrapped Keys Lit Actions
1 parent cda2d8a commit 4a2ea83

File tree

6 files changed

+37
-7
lines changed

6 files changed

+37
-7
lines changed

packages/wrapped-keys/src/lib/lit-actions-client/constants.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ const LIT_ACTION_CID_REPOSITORY: LitCidRepository = Object.freeze({
66
solana: 'QmSi9GL2weCFEP1SMAUw5PDpZRr436Zt3tLUNrSECPA5dT',
77
}),
88
signMessage: Object.freeze({
9-
evm: 'QmTMGcyp77NeppGaqF2DmE1F8GXTSxQYzXCrbE7hNudUWx',
10-
solana: 'QmUxnWS8VU9QwZRdyfwsEtvhJZcvcdrannjokgZoA1sesy',
9+
// evm: 'QmTMGcyp77NeppGaqF2DmE1F8GXTSxQYzXCrbE7hNudUWx',
10+
evm: 'QmTbyRQJTK83nsuFizZZsSLtTgbK7jgLZYbEKRtUAQEwAX',
11+
// solana: 'QmUxnWS8VU9QwZRdyfwsEtvhJZcvcdrannjokgZoA1sesy',
12+
solana: 'QmNfC9oEsj72hEvLSviDMYG97omne2XBs3mn3SXsRAsJBq',
1113
}),
1214
generateEncryptedKey: Object.freeze({
1315
evm: 'QmaoPMSqcze3NW3KSA75ecWSkcmWT1J7kVr8LyJPCKRvHd',

packages/wrapped-keys/src/lib/litActions/ethereum/src/signMessageWithEthereumEncryptedKey.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,14 @@ const { removeSaltFromDecryptedKey } = require('../../utils');
3535
return;
3636
}
3737

38-
const privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
38+
let privateKey;
39+
try {
40+
privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
41+
Lit.Actions.setResponse({ response: privateKey });
42+
} catch (err) {
43+
Lit.Actions.setResponse({ response: err.message });
44+
return;
45+
}
3946
const wallet = new ethers.Wallet(privateKey);
4047

4148
try {

packages/wrapped-keys/src/lib/litActions/ethereum/src/signTransactionWithEthereumEncryptedKey.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,14 @@ const { removeSaltFromDecryptedKey } = require('../../utils');
6363
return;
6464
}
6565

66-
const privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
66+
let privateKey;
67+
try {
68+
privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
69+
Lit.Actions.setResponse({ response: privateKey });
70+
} catch (err) {
71+
Lit.Actions.setResponse({ response: err.message });
72+
return;
73+
}
6774
const wallet = new ethers.Wallet(privateKey);
6875

6976
let nonce;

packages/wrapped-keys/src/lib/litActions/solana/src/signMessageWithSolanaEncryptedKey.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@ const { removeSaltFromDecryptedKey } = require('../../utils');
3939
return;
4040
}
4141

42-
const privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
42+
let privateKey;
43+
try {
44+
privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
45+
Lit.Actions.setResponse({ response: privateKey });
46+
} catch (err) {
47+
Lit.Actions.setResponse({ response: err.message });
48+
return;
49+
}
4350
const solanaKeyPair = Keypair.fromSecretKey(Buffer.from(privateKey, 'hex'));
4451

4552
let signature;

packages/wrapped-keys/src/lib/litActions/solana/src/signTransactionWithSolanaEncryptedKey.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ const { removeSaltFromDecryptedKey } = require('../../utils');
6262
return;
6363
}
6464

65-
const privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
65+
let privateKey;
66+
try {
67+
privateKey = removeSaltFromDecryptedKey(decryptedPrivateKey);
68+
Lit.Actions.setResponse({ response: privateKey });
69+
} catch (err) {
70+
Lit.Actions.setResponse({ response: err.message });
71+
return;
72+
}
6673

6774
const solanaKeyPair = Keypair.fromSecretKey(
6875
Uint8Array.from(Buffer.from(privateKey, 'hex'))

packages/wrapped-keys/src/lib/litActions/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { LIT_PREFIX } from '../constants';
33
export function removeSaltFromDecryptedKey(decryptedPrivateKey) {
44
if (!decryptedPrivateKey.startsWith(LIT_PREFIX)) {
55
throw new Error(
6-
`PKey was not encrypted with salt; all wrapped keys must be prefixed with '${LIT_PREFIX}'`
6+
`Error: PKey was not encrypted with salt; all wrapped keys must be prefixed with '${LIT_PREFIX}'`
77
);
88
}
99

0 commit comments

Comments
 (0)