migrate to argon2id from @noble/hashes

Author: dynst

.pnp.cjs

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

.yarn/cache/libsodium-sumo-npm-0.7.11-aaac6bcc6c-f7518d1781.zip

@@ -1,15 +1,7 @@
-// Keep all classes requiring libsodium-js in one file as having multiple
-// requiring of the libsodium-wrappers module currently crashes browsers
-//
-// libsodium.js API: https://gist.github.com/webmaster128/b2dbe6d54d36dd168c9fabf441b9b09c
-
 import { isNonNullObject } from "@cosmjs/utils";
 import { xchacha20poly1305 } from "@noble/ciphers/chacha.js";
 import { ed25519 } from "@noble/curves/ed25519.js";
-// Using crypto_pwhash requires sumo. Once we migrate to a standalone
-// Argon2 implementation, we can use the normal libsodium-wrappers
-// again: https://github.com/cosmos/cosmjs/issues/1031
-import sodium from "libsodium-wrappers-sumo";
+import { type ArgonOpts, argon2id } from "@noble/hashes/argon2.js";
 
 export interface Argon2idOptions {
   /** Output length in bytes */
@@ -44,15 +36,18 @@ export class Argon2id {
     salt: Uint8Array,
     options: Argon2idOptions,
   ): Promise<Uint8Array> {
-    await sodium.ready;
-    return sodium.crypto_pwhash(
-      options.outputLength,
-      password,
-      salt, // libsodium only supports 16 byte salts and will throw when you don't respect that
-      options.opsLimit,
-      options.memLimitKib * 1024,
-      sodium.crypto_pwhash_ALG_ARGON2ID13,
-    );
+    const opts: ArgonOpts = {
+      t: options.opsLimit,
+      m: options.memLimitKib,
+      p: 1, // no parallelism allowed, just like libsodium
+      dkLen: options.outputLength,
+    };
+
+    if (salt.length !== 16) {
+      throw new Error(`Got invalid salt length ${salt.length}. Must be 16.`);
+    }
+
+    return argon2id(password, salt, opts);
   }
 }
 

.yarn/cache/libsodium-wrappers-sumo-npm-0.7.11-08fe1b2cf4-81270738b3.zip

@@ -340,7 +340,6 @@ __metadata:
     karma-firefox-launcher: "npm:^2.1.0"
     karma-jasmine: "npm:^5"
     karma-jasmine-html-reporter: "npm:^1.5.4"
-    libsodium-wrappers-sumo: "npm:^0.7.11"
     nyc: "npm:^15.1.0"
     prettier: "npm:^3.5.3"
     ses: "npm:^1.13.0"
@@ -5616,22 +5615,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"libsodium-sumo@npm:^0.7.11":
-  version: 0.7.11
-  resolution: "libsodium-sumo@npm:0.7.11"
-  checksum: 10c0/f7518d178148d17c04d716898ea8aa5c5ebc302920ff67258a1fbe52e9d4605bb4a9912541db06bce7c16bde9a3af86110b749c869846d087a1b64a921007db8
-  languageName: node
-  linkType: hard
-
-"libsodium-wrappers-sumo@npm:^0.7.11":
-  version: 0.7.11
-  resolution: "libsodium-wrappers-sumo@npm:0.7.11"
-  dependencies:
-    libsodium-sumo: "npm:^0.7.11"
-  checksum: 10c0/81270738b3e7c50910c34e161aa34d84ab6fbfe9e5256561fc279498b594cb3b090c58ec19d40ada67dc24e7f1f7e018d9fd68d2ae367196116164795b6d2896
-  languageName: node
-  linkType: hard
-
 "linkify-it@npm:^5.0.0":
   version: 5.0.0
   resolution: "linkify-it@npm:5.0.0"