deps: update p-event, p-wait-for and noble deps (#3302)

Updates deps to the latest version.

Author: achingbrain

.github/dictionary.txt

@@ -13,6 +13,7 @@ incrby
 microtask
 nothrow
 peerStore
+prehash
 reprovide
 reprovided
 reprovider

interop/package.json

@@ -26,7 +26,7 @@
     "@multiformats/multiaddr": "^13.0.1",
     "aegir": "^47.0.22",
     "libp2p": "^3.0.0",
-    "p-event": "^6.0.1",
+    "p-event": "^7.0.0",
     "redis": "^4.7.1"
   }
 }

packages/connection-encrypter-noise/package.json

@@ -58,9 +58,9 @@
     "@libp2p/interface": "^3.0.0",
     "@libp2p/peer-id": "^6.0.0",
     "@libp2p/utils": "^7.0.0",
-    "@noble/ciphers": "^1.3.0",
-    "@noble/curves": "^1.9.7",
-    "@noble/hashes": "^1.8.0",
+    "@noble/ciphers": "^2.0.1",
+    "@noble/curves": "^2.0.1",
+    "@noble/hashes": "^2.0.1",
     "protons-runtime": "^5.6.0",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0",

packages/connection-encrypter-noise/src/crypto/js.ts

@@ -1,7 +1,7 @@
-import { chacha20poly1305 } from '@noble/ciphers/chacha'
-import { x25519 } from '@noble/curves/ed25519'
-import { extract, expand } from '@noble/hashes/hkdf'
-import { sha256 } from '@noble/hashes/sha2'
+import { chacha20poly1305 } from '@noble/ciphers/chacha.js'
+import { x25519 } from '@noble/curves/ed25519.js'
+import { extract, expand } from '@noble/hashes/hkdf.js'
+import { sha256 } from '@noble/hashes/sha2.js'
 import type { ICryptoInterface } from '../crypto.js'
 import type { KeyPair } from '../types.js'
 import type { Uint8ArrayList } from 'uint8arraylist'

packages/connection-encrypter-tls/package.json

@@ -50,7 +50,7 @@
     "@peculiar/webcrypto": "^1.5.0",
     "@peculiar/x509": "^1.13.0",
     "asn1js": "^3.0.6",
-    "p-event": "^6.0.1",
+    "p-event": "^7.0.0",
     "protons-runtime": "^5.6.0",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"

packages/crypto/package.json

@@ -86,8 +86,8 @@
   },
   "dependencies": {
     "@libp2p/interface": "^3.0.0",
-    "@noble/curves": "^1.9.7",
-    "@noble/hashes": "^1.8.0",
+    "@noble/curves": "^2.0.1",
+    "@noble/hashes": "^2.0.1",
     "multiformats": "^13.4.0",
     "protons-runtime": "^5.6.0",
     "uint8arraylist": "^2.4.8",

packages/crypto/src/keys/ed25519/index.browser.ts

@@ -1,4 +1,4 @@
-import { ed25519 as ed } from '@noble/curves/ed25519'
+import { ed25519 as ed } from '@noble/curves/ed25519.js'
 import { toString as uint8arrayToString } from 'uint8arrays/to-string'
 import crypto from '../../webcrypto/index.js'
 import type { Uint8ArrayKeyPair } from '../interface.js'
@@ -24,7 +24,7 @@ const webCryptoEd25519SupportedPromise = (async () => {
 
 export function generateKey (): Uint8ArrayKeyPair {
   // the actual private key (32 bytes)
-  const privateKeyRaw = ed.utils.randomPrivateKey()
+  const privateKeyRaw = ed.utils.randomSecretKey()
   const publicKey = ed.getPublicKey(privateKeyRaw)
 
   // concatenated the public key to the private key
@@ -78,7 +78,7 @@ async function hashAndSignWebCrypto (privateKey: Uint8Array, msg: Uint8Array | U
   return new Uint8Array(sig, 0, sig.byteLength)
 }
 
-function hashAndSignNoble (privateKey: Uint8Array, msg: Uint8Array | Uint8ArrayList): Uint8Array {
+export function hashAndSignNoble (privateKey: Uint8Array, msg: Uint8Array | Uint8ArrayList): Uint8Array {
   const privateKeyRaw = privateKey.subarray(0, KEYS_BYTE_LENGTH)
 
   return ed.sign(msg instanceof Uint8Array ? msg : msg.subarray(), privateKeyRaw)
@@ -106,7 +106,7 @@ async function hashAndVerifyWebCrypto (publicKey: Uint8Array, sig: Uint8Array, m
   throw new TypeError('WebCrypto does not support SharedArrayBuffer for Ed25519 keys')
 }
 
-function hashAndVerifyNoble (publicKey: Uint8Array, sig: Uint8Array, msg: Uint8Array | Uint8ArrayList): boolean {
+export function hashAndVerifyNoble (publicKey: Uint8Array, sig: Uint8Array, msg: Uint8Array | Uint8ArrayList): boolean {
   return ed.verify(sig, msg instanceof Uint8Array ? msg : msg.subarray(), publicKey)
 }
 

packages/crypto/src/keys/rsa/utils.ts

@@ -1,5 +1,5 @@
 import { InvalidParametersError, InvalidPublicKeyError } from '@libp2p/interface'
-import { sha256 } from '@noble/hashes/sha256'
+import { sha256 } from '@noble/hashes/sha2.js'
 import { create } from 'multiformats/hashes/digest'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

packages/crypto/src/keys/secp256k1/index.browser.ts

@@ -1,4 +1,4 @@
-import { secp256k1 as secp } from '@noble/curves/secp256k1'
+import { secp256k1 as secp } from '@noble/curves/secp256k1.js'
 import { sha256 } from 'multiformats/hashes/sha2'
 import { SigningError, VerificationError } from '../../errors.js'
 import { isPromise } from '../../util.js'
@@ -21,7 +21,10 @@ export function hashAndSign (key: Uint8Array, msg: Uint8Array | Uint8ArrayList,
     return p
       .then(({ digest }) => {
         options?.signal?.throwIfAborted()
-        return secp.sign(digest, key).toDERRawBytes()
+        return secp.sign(digest, key, {
+          prehash: false,
+          format: 'der'
+        })
       })
       .catch(err => {
         if (err.name === 'AbortError') {
@@ -33,7 +36,10 @@ export function hashAndSign (key: Uint8Array, msg: Uint8Array | Uint8ArrayList,
   }
 
   try {
-    return secp.sign(p.digest, key).toDERRawBytes()
+    return secp.sign(p.digest, key, {
+      prehash: false,
+      format: 'der'
+    })
   } catch (err) {
     throw new SigningError(String(err))
   }
@@ -49,7 +55,10 @@ export function hashAndVerify (key: Uint8Array, sig: Uint8Array, msg: Uint8Array
     return p
       .then(({ digest }) => {
         options?.signal?.throwIfAborted()
-        return secp.verify(sig, digest, key)
+        return secp.verify(sig, digest, key, {
+          prehash: false,
+          format: 'der'
+        })
       })
       .catch(err => {
         if (err.name === 'AbortError') {
@@ -62,7 +71,10 @@ export function hashAndVerify (key: Uint8Array, sig: Uint8Array, msg: Uint8Array
 
   try {
     options?.signal?.throwIfAborted()
-    return secp.verify(sig, p.digest, key)
+    return secp.verify(sig, p.digest, key, {
+      prehash: false,
+      format: 'der'
+    })
   } catch (err) {
     throw new VerificationError(String(err))
   }

packages/crypto/src/keys/secp256k1/index.ts

@@ -1,5 +1,5 @@
 import crypto from 'node:crypto'
-import { secp256k1 as secp } from '@noble/curves/secp256k1'
+import { secp256k1 as secp } from '@noble/curves/secp256k1.js'
 import { SigningError, VerificationError } from '../../errors.js'
 import type { AbortOptions } from '@libp2p/interface'
 import type { Uint8ArrayList } from 'uint8arraylist'
@@ -29,8 +29,10 @@ export function hashAndSign (key: Uint8Array, msg: Uint8Array | Uint8ArrayList,
   const digest = hash.digest()
 
   try {
-    const signature = secp.sign(digest, key)
-    return signature.toDERRawBytes()
+    return secp.sign(digest, key, {
+      prehash: false,
+      format: 'der'
+    })
   } catch (err) {
     throw new SigningError(String(err))
   }
@@ -54,7 +56,10 @@ export function hashAndVerify (key: Uint8Array, sig: Uint8Array, msg: Uint8Array
   const digest = hash.digest()
 
   try {
-    return secp.verify(sig, digest, key)
+    return secp.verify(sig, digest, key, {
+      prehash: false,
+      format: 'der'
+    })
   } catch (err) {
     throw new VerificationError(String(err))
   }