LaconicNetwork/cosmjs-util
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Deduplicate KDF execution

Browse Source
This commit is contained in:
Simon Warta 2020-07-23 14:43:24 +02:00
parent 97c936e71f
commit 35cf3e89db
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/sdk38/src/secp256k1wallet.ts
View File

@ -1,5 +1,4 @@
import {
Argon2id,
Bip39,
EnglishMnemonic,
pathToString,
@ -20,7 +19,6 @@ import { encodeSecp256k1Signature } from "./signature";
import { StdSignature } from "./types";
import {
AccountData,
cosmjsSalt,
executeKdf,
KdfConfiguration,
makeCosmoshubPath,
@ -204,17 +202,7 @@ export class Secp256k1Wallet implements OfflineSigner {
private static async deserializeTypeV1(serialization: string, password: string): Promise<Secp256k1Wallet> {
const root = JSON.parse(serialization);
if (!isNonNullObject(root)) throw new Error("Root document is not an object.");
const untypedRoot: any = root;
let encryptionKey: Uint8Array;
switch (untypedRoot.kdf.algorithm) {
case "argon2id": {
const kdfOptions = untypedRoot.kdf.params;
encryptionKey = await Argon2id.execute(password, cosmjsSalt, kdfOptions);
break;
}
default:
throw new Error("Unsupported KDF algorithm");
}
const encryptionKey = await executeKdf(password, (root as any).kdf);
return Secp256k1Wallet.deserializeWithEncryptionKey(serialization, encryptionKey);
}