Merge pull request #1430 from cosmos/migrate-to-libsodium-wrappers-sumo

Migrate to libsodium-wrappers-sumo
cosmos · May 25, 2023 · cb1e689 · cb1e689
2 parents f7dd3ef + d1a5dcc
commit cb1e689
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 47 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@types-libsodium-wrappers-npm-0.7.10-1977488a6a-717054ebcb.zip b/.yarn/cache/@types-libsodium-wrappers-npm-0.7.10-1977488a6a-717054ebcb.zip
diff --git a/.yarn/cache/@types-libsodium-wrappers-npm-0.7.9-4b14af299f-5ddf61b804.zip b/.yarn/cache/@types-libsodium-wrappers-npm-0.7.9-4b14af299f-5ddf61b804.zip
diff --git a/.yarn/cache/@types-libsodium-wrappers-sumo-npm-0.7.5-b503484acd-27846e49cd.zip b/.yarn/cache/@types-libsodium-wrappers-sumo-npm-0.7.5-b503484acd-27846e49cd.zip
diff --git a/.yarn/cache/libsodium-npm-0.7.9-98a3b621b1-1c922c9972.zip b/.yarn/cache/libsodium-npm-0.7.9-98a3b621b1-1c922c9972.zip
diff --git a/.yarn/cache/libsodium-sumo-npm-0.7.11-aaac6bcc6c-9efac902a0.zip b/.yarn/cache/libsodium-sumo-npm-0.7.11-aaac6bcc6c-9efac902a0.zip
diff --git a/.yarn/cache/libsodium-wrappers-npm-0.7.9-be74b30f7d-b5b1b9e1b4.zip b/.yarn/cache/libsodium-wrappers-npm-0.7.9-be74b30f7d-b5b1b9e1b4.zip
diff --git a/.yarn/cache/libsodium-wrappers-sumo-npm-0.7.11-08fe1b2cf4-26c7aaf8c4.zip b/.yarn/cache/libsodium-wrappers-sumo-npm-0.7.11-08fe1b2cf4-26c7aaf8c4.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to
 
 ## [Unreleased]
 
+### Fixed
+
+- @cosmjs/crypto: Migrate to `libsodium-wrappers-sumo` to be able to use the
+  `crypto_pwhash` functions ([#1429]).
+
+[#1429]: https://github.com/cosmos/cosmjs/issues/1429
+
 ### Added
 
 - @cosmjs/cosmwasm-stargate: Add `SigningCosmWasmClient.instantiate2` ([#1407]).

diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -47,7 +47,7 @@
     "@noble/hashes": "^1",
     "bn.js": "^5.2.0",
     "elliptic": "^6.5.4",
-    "libsodium-wrappers": "^0.7.6"
+    "libsodium-wrappers-sumo": "^0.7.11"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
@@ -58,7 +58,7 @@
     "@types/karma-firefox-launcher": "^2",
     "@types/karma-jasmine": "^4",
     "@types/karma-jasmine-html-reporter": "^1",
-    "@types/libsodium-wrappers": "^0.7.7",
+    "@types/libsodium-wrappers-sumo": "^0.7.5",
     "@types/node": "^18",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
     "@typescript-eslint/parser": "^5.54.0",

diff --git a/packages/crypto/src/libsodium.ts b/packages/crypto/src/libsodium.ts
@@ -4,7 +4,10 @@
 // libsodium.js API: https://gist.github.com/webmaster128/b2dbe6d54d36dd168c9fabf441b9b09c
 
 import { isNonNullObject } from "@cosmjs/utils";
-import sodium from "libsodium-wrappers";
+// 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";
 
 export interface Argon2idOptions {
   /** Output length in bytes */

diff --git a/yarn.lock b/yarn.lock
@@ -456,7 +456,7 @@ __metadata:
     "@types/karma-firefox-launcher": ^2
     "@types/karma-jasmine": ^4
     "@types/karma-jasmine-html-reporter": ^1
-    "@types/libsodium-wrappers": ^0.7.7
+    "@types/libsodium-wrappers-sumo": ^0.7.5
     "@types/node": ^18
     "@typescript-eslint/eslint-plugin": ^5.54.0
     "@typescript-eslint/parser": ^5.54.0
@@ -478,7 +478,7 @@ __metadata:
     karma-firefox-launcher: ^2.1.0
     karma-jasmine: ^5
     karma-jasmine-html-reporter: ^1.5.4
-    libsodium-wrappers: ^0.7.6
+    libsodium-wrappers-sumo: ^0.7.11
     nyc: ^15.1.0
     prettier: ^2.8.1
     ses: ^0.11.0
@@ -1700,10 +1700,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/libsodium-wrappers@npm:^0.7.7":
-  version: 0.7.9
-  resolution: "@types/libsodium-wrappers@npm:0.7.9"
-  checksum: 5ddf61b8047e38f00c1509369ad868a724235a67940971cc671b070ab9d6b2e6872407253be1163b174f742ecbb0986fda7b91aa0b7069437359b4671bfc529b
+"@types/libsodium-wrappers-sumo@npm:^0.7.5":
+  version: 0.7.5
+  resolution: "@types/libsodium-wrappers-sumo@npm:0.7.5"
+  dependencies:
+    "@types/libsodium-wrappers": "*"
+  checksum: 27846e49cd54556c05011ff475cc6564ce8dde8f9a02a542740e3ebaab7de21ed2dfb4afdc182510d7058d3475f748bab0aa4a41178cd105b9f8618a00f8ef3f
+  languageName: node
+  linkType: hard
+
+"@types/libsodium-wrappers@npm:*":
+  version: 0.7.10
+  resolution: "@types/libsodium-wrappers@npm:0.7.10"
+  checksum: 717054ebcb5fa553e378144b8d564bed8b691905c0d4e90b95c64d77ba24ec9fe798cb2c58cd61dad545ceacb1f05ab69b5597217f9829f2da7a23f0688d11d0
   languageName: node
   linkType: hard
 
@@ -5083,19 +5092,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"libsodium-wrappers@npm:^0.7.6":
-  version: 0.7.9
-  resolution: "libsodium-wrappers@npm:0.7.9"
-  dependencies:
-    libsodium: ^0.7.0
-  checksum: b5b1b9e1b4aa5662e07df244934125f9e3cd2ba7fe0ec45191a5ffc822d22f4d2f6e09e42d91c30c4f48ca0c7f810a176fdf5e32eed6722d7d82a2a719459f56
+"libsodium-sumo@npm:^0.7.11":
+  version: 0.7.11
+  resolution: "libsodium-sumo@npm:0.7.11"
+  checksum: 9efac902a05002e1caca1c1df3a7cd838ac370588cfa31107d6e787cb5a181f4ca46c7961e3136943c8b07b1d543c0283b91e08a141f9b55a74f10808c3017ef
   languageName: node
   linkType: hard
 
-"libsodium@npm:^0.7.0":
-  version: 0.7.9
-  resolution: "libsodium@npm:0.7.9"
-  checksum: 1c922c9972cf97ddb7207ee4f810dd291e0610dd57ea0e47f2343968392546aaa629945a2fb39ae5f19d067f6ed0bb7330f32cc9a680a847a662e9a210ce7bfb
+"libsodium-wrappers-sumo@npm:^0.7.11":
+  version: 0.7.11
+  resolution: "libsodium-wrappers-sumo@npm:0.7.11"
+  dependencies:
+    libsodium-sumo: ^0.7.11
+  checksum: 26c7aaf8c4b6da6b06ef17637e5541e16c796be9611b194d795501f021ac04abfeda09cadae66b3b515308993cd57361a571eefabdf9d9b3377b070a17535440
   languageName: node
   linkType: hard