@waku/enr 0.0.10 → 0.0.11

package/CHANGELOG.md

@@ -27,6 +27,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * devDependencies
     * @waku/interfaces bumped from 0.0.10 to 0.0.11
 
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @waku/utils bumped from 0.0.4 to 0.0.5
+  * devDependencies
+    * @waku/interfaces bumped from 0.0.11 to 0.0.12
+
 ## [0.0.9](https://github.com/waku-org/js-waku/compare/enr-v0.0.8...enr-v0.0.9) (2023-03-28)
 
 

package/bundle/index.js

@@ -22734,6 +22734,20 @@ const bits = {
 const curveTypes = Object.keys(bits);
 curveTypes.join(' / ');
 
+function isWebkitLinux() {
+    return typeof navigator !== 'undefined' && navigator.userAgent.includes('Safari') && navigator.userAgent.includes('Linux') && !navigator.userAgent.includes('Chrome');
+}
+// WebKit on Linux does not support deriving a key from an empty PBKDF2 key.
+// So, as a workaround, we provide the generated key as a constant. We test that
+// this generated key is accurate in test/workaround.spec.ts
+// Generated via:
+// await crypto.subtle.exportKey('jwk',
+//   await crypto.subtle.deriveKey(
+//     { name: 'PBKDF2', salt: new Uint8Array(16), iterations: 32767, hash: { name: 'SHA-256' } },
+//     await crypto.subtle.importKey('raw', new Uint8Array(0), { name: 'PBKDF2' }, false, ['deriveKey']),
+//     { name: 'AES-GCM', length: 128 }, true, ['encrypt', 'decrypt'])
+// )
+const derivedEmptyPasswordKey = { alg: 'A128GCM', ext: true, k: 'scm9jmO_4BJAgdwWGVulLg', key_ops: ['encrypt', 'decrypt'], kty: 'oct' };
 // Based off of code from https://github.com/luke-park/SecureCompatibleEncryptionExamples
 function create(opts) {
     const algorithm = opts?.algorithm ?? 'AES-GCM';
@@ -22755,10 +22769,16 @@ function create(opts) {
         if (typeof password === 'string') {
             password = fromString$1(password);
         }
-        // Derive a key using PBKDF2.
-        const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
-        const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits']);
-        const cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['encrypt']);
+        let cryptoKey;
+        if (password.length === 0 && isWebkitLinux()) {
+            cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['encrypt']);
+        }
+        else {
+            // Derive a key using PBKDF2.
+            const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
+            const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']);
+            cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['encrypt']);
+        }
         // Encrypt the string.
         const ciphertext = await crypto.subtle.encrypt(aesGcm, cryptoKey, data);
         return concat([salt, aesGcm.iv, new Uint8Array(ciphertext)]);
@@ -22777,10 +22797,16 @@ function create(opts) {
         if (typeof password === 'string') {
             password = fromString$1(password);
         }
-        // Derive the key using PBKDF2.
-        const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
-        const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits']);
-        const cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['decrypt']);
+        let cryptoKey;
+        if (password.length === 0 && isWebkitLinux()) {
+            cryptoKey = await crypto.subtle.importKey('jwk', derivedEmptyPasswordKey, { name: 'AES-GCM' }, true, ['decrypt']);
+        }
+        else {
+            // Derive the key using PBKDF2.
+            const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } };
+            const rawKey = await crypto.subtle.importKey('raw', password, { name: 'PBKDF2' }, false, ['deriveKey']);
+            cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['decrypt']);
+        }
         // Decrypt the string.
         const plaintext = await crypto.subtle.decrypt(aesGcm, cryptoKey, ciphertext);
         return new Uint8Array(plaintext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/enr",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "ENR (EIP-778) for Waku",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -36,11 +36,9 @@
     "build:esm": "tsc",
     "build:bundle": "rollup --config rollup.config.js",
     "fix": "run-s fix:*",
-    "fix:prettier": "prettier . --write",
     "fix:lint": "eslint src *.js --fix",
     "check": "run-s check:*",
     "check:lint": "eslint src --ext .ts",
-    "check:prettier": "prettier . --list-different",
     "check:spelling": "cspell \"{README.md,src/**/*.ts}\"",
     "check:tsc": "tsc -p tsconfig.dev.json",
     "test": "run-s test:*",
@@ -54,27 +52,27 @@
   },
   "dependencies": {
     "@ethersproject/rlp": "^5.7.0",
-    "@libp2p/crypto": "^1.0.14",
-    "@libp2p/peer-id": "^2.0.2",
+    "@libp2p/crypto": "^1.0.15",
+    "@libp2p/peer-id": "^2.0.3",
     "@multiformats/multiaddr": "^12.0.0",
     "@noble/secp256k1": "^1.7.1",
-    "@waku/utils": "0.0.4",
+    "@waku/utils": "0.0.5",
     "debug": "^4.3.4",
     "js-sha3": "^0.8.0"
   },
   "devDependencies": {
     "@libp2p/interface-peer-id": "^2.0.1",
     "@libp2p/interface-peer-info": "^1.0.8",
-    "@libp2p/peer-id-factory": "^2.0.1",
+    "@libp2p/peer-id-factory": "^2.0.3",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.2",
     "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.51.0",
     "@waku/build-utils": "*",
-    "@waku/interfaces": "0.0.11",
+    "@waku/interfaces": "0.0.12",
     "chai": "^4.3.7",
     "cspell": "^6.31.1",
     "eslint": "^8.35.0",
@@ -89,10 +87,10 @@
     "karma-webpack": "^5.0.0",
     "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.8",
     "process": "^0.11.10",
     "puppeteer": "^19.8.2",
-    "rollup": "^3.15.0",
+    "rollup": "^3.21.3",
     "ts-loader": "^9.4.2",
     "typescript": "^4.9.5",
     "uint8arrays": "^4.0.3"