perf: remove argon bench on boot, use sane defaults across the board

shapeshift · Nov 21, 2023 · 5b3e66f · 5b3e66f
1 parent 5e315b9
commit 5b3e66f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 232 deletions.
diff --git a/packages/hdwallet-native-vault/src/argonBenchmark.test.ts b/packages/hdwallet-native-vault/src/argonBenchmark.test.ts
diff --git a/packages/hdwallet-native-vault/src/argonBenchmark.ts b/packages/hdwallet-native-vault/src/argonBenchmark.ts
diff --git a/packages/hdwallet-native-vault/src/index.ts b/packages/hdwallet-native-vault/src/index.ts
@@ -1,7 +1,6 @@
 import { createMnemonic, crypto, entropyToMnemonic, GENERATE_MNEMONIC } from "./util";
 import { Vault } from "./vault";
 
-export { argonBenchmark } from "./argonBenchmark";
 export type { ISealableVaultFactory, IVault, IVaultFactory } from "./types";
 export { GENERATE_MNEMONIC } from "./util";
 export { Vault } from "./vault";

diff --git a/packages/hdwallet-native-vault/src/rawVault.ts b/packages/hdwallet-native-vault/src/rawVault.ts
@@ -5,7 +5,6 @@ import * as jose from "jose";
 import * as ta from "type-assertions";
 import * as uuid from "uuid";
 
-import { argonBenchmark } from "./argonBenchmark";
 import { ArgonParams, IVaultBackedBy, IVaultFactory, VaultPrepareParams } from "./types";
 import { crypto, encoder, keyStoreUUID, Revocable, revocable, setCrypto, setPerformance, vaultStoreUUID } from "./util";
 
@@ -69,16 +68,16 @@ export class RawVault extends Revocable(Object.freeze(class {})) implements IVau
       (await idb.get<ArgonParams>("defaultArgonParams", await RawVault.#keyStore)) ?? {
         then: (onfulfilled, onrejected) => {
           return (async () => {
+            // For more details on parameter selection, see:
+            // https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-argon2-04#section-4
             const out: ArgonParams = {
               parallelism: 1,
               memorySize: 32 * 1024,
-              iterations: 26,
+              iterations: 16,
             };
-            const argonBenchmarkResults = await argonBenchmark(out.memorySize, 1000, { measureError: true });
-            console.debug("argonBenchmarkResults:", argonBenchmarkResults);
-            await idb.set("argonBenchmarkResults", argonBenchmarkResults, await RawVault.#keyStore);
-            out.iterations = argonBenchmarkResults.iterations;
+
             await idb.set("defaultArgonParams", out, await RawVault.#keyStore);
+
             return out;
           })().then(onfulfilled, onrejected);
         },