migrate to argon2id from hash-wasm

Author: dynst

.pnp.cjs

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:505d7271f3fa67b1baedc9c0259b5c37dcfdbd8a3334f962266468c4945b9de0
+size 1820660

.yarn/cache/hash-wasm-npm-4.12.0-d6bb202626-6cb9505531.zip

@@ -42,7 +42,8 @@
     "@cosmjs/utils": "workspace:^",
     "@noble/ciphers": "^1.3.0",
     "@noble/curves": "^1.9.2",
-    "@noble/hashes": "^1"
+    "@noble/hashes": "^1",
+    "hash-wasm": "^4.12.0"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",

packages/crypto/package.json

@@ -1,7 +1,7 @@
-import { isNonNullObject } from "@cosmjs/utils";
+import { assert, isNonNullObject } from "@cosmjs/utils";
 import { xchacha20poly1305 } from "@noble/ciphers/chacha.js";
 import { ed25519 } from "@noble/curves/ed25519.js";
-import { type ArgonOpts, argon2id } from "@noble/hashes/argon2.js";
+import { type IArgon2Options, argon2id } from "hash-wasm";
 
 export interface Argon2idOptions {
   /** Output length in bytes */
@@ -36,18 +36,24 @@ export class Argon2id {
     salt: Uint8Array,
     options: Argon2idOptions,
   ): Promise<Uint8Array> {
-    const opts: ArgonOpts = {
-      t: options.opsLimit,
-      m: options.memLimitKib,
-      p: 1, // no parallelism allowed, just like libsodium
-      dkLen: options.outputLength,
+    const opts: IArgon2Options = {
+      password,
+      salt,
+      outputType: "binary",
+      iterations: options.opsLimit,
+      memorySize: options.memLimitKib,
+      parallelism: 1, // no parallelism allowed, just like libsodium
+      hashLength: options.outputLength,
     };
 
     if (salt.length !== 16) {
       throw new Error(`Got invalid salt length ${salt.length}. Must be 16.`);
     }
 
-    return argon2id(password, salt, opts);
+    const hash = await argon2id(opts);
+    // guaranteed by outputType: 'binary'
+    assert(typeof hash !== "string");
+    return hash;
   }
 }
 

packages/crypto/src/libsodium.ts

@@ -333,6 +333,7 @@ __metadata:
     "@types/node": "npm:*"
     buffer: "npm:^6.0.3"
     glob: "npm:^11"
+    hash-wasm: "npm:^4.12.0"
     jasmine: "npm:^4"
     jasmine-spec-reporter: "npm:^6"
     karma: "npm:^6.3.14"
@@ -4601,6 +4602,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hash-wasm@npm:^4.12.0":
+  version: 4.12.0
+  resolution: "hash-wasm@npm:4.12.0"
+  checksum: 10c0/6cb95055319810b6f673de755289960683a9831807690795f0e8918b2fd7e6ae5b82a9dc47cbace171cf2814b412ef68c315a0ead0b4d96bd3e56a05e4bde136
+  languageName: node
+  linkType: hard
+
 "hasha@npm:^5.0.0":
   version: 5.2.2
   resolution: "hasha@npm:5.2.2"