Merge pull request #210 from fleet-sdk/arobsn/bump-crypto

arobsn · web-flow · commit d665d3ca77d3 · 2025-11-19T09:04:38.000-03:00
feat: bump @noble & @Scure crypto dependencies
diff --git a/.changeset/brave-walls-sneeze.md b/.changeset/brave-walls-sneeze.md
@@ -0,0 +1,5 @@
+---
+"@fleet-sdk/wallet": patch
+---
+
+Bump `@scure/bip32` to `v2`
diff --git a/.changeset/dry-heads-dream.md b/.changeset/dry-heads-dream.md
@@ -0,0 +1,5 @@
+---
+"@fleet-sdk/wallet": patch
+---
+
+Bump `@scure/bip39` to `v2`
diff --git a/.changeset/eight-bugs-tan.md b/.changeset/eight-bugs-tan.md
@@ -0,0 +1,5 @@
+---
+"@fleet-sdk/crypto": patch
+---
+
+Bump `@scure/base` to `v2`
diff --git a/.changeset/shiny-taxes-cry.md b/.changeset/shiny-taxes-cry.md
@@ -0,0 +1,5 @@
+---
+"@fleet-sdk/wallet": patch
+---
+
+Bump `@noble/curves` to `v2`
diff --git a/.changeset/wacky-towns-stick.md b/.changeset/wacky-towns-stick.md
@@ -0,0 +1,5 @@
+---
+"@fleet-sdk/crypto": patch
+---
+
+Bump `@noble/hashes` to `v2`
diff --git a/packages/crypto/package.json b/packages/crypto/package.json
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@fleet-sdk/common": "workspace:^",
-    "@noble/hashes": "^1.8.0",
-    "@scure/base": "^1.2.6"
+    "@noble/hashes": "^2.0.1",
+    "@scure/base": "^2.0.0"
   },
   "files": [
     "dist",
diff --git a/packages/crypto/src/coders/hex.bench.ts b/packages/crypto/src/coders/hex.bench.ts
@@ -1,4 +1,4 @@
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
+import { bytesToHex, hexToBytes } from "@noble/hashes/utils.js";
 import { hex as scureHex } from "@scure/base";
 import { bench, describe } from "vitest";
 import { regularBoxes, validBoxes } from "../../../_test-vectors/mockedBoxes";
diff --git a/packages/crypto/src/hashes.spec.ts b/packages/crypto/src/hashes.spec.ts
@@ -1,4 +1,4 @@
-import { randomBytes } from "@noble/hashes/utils";
+import { randomBytes } from "@noble/hashes/utils.js";
 import { describe, expect, it } from "vitest";
 import { hex, utf8 } from "./coders";
 import { blake2b, blake2b256, sha256 } from "./hashes";
diff --git a/packages/crypto/src/hashes.ts b/packages/crypto/src/hashes.ts
@@ -1,5 +1,5 @@
-import { blake2b as _blake2b } from "@noble/hashes/blake2b";
-import { sha256 as _sha256 } from "@noble/hashes/sha256";
+import { type Blake2Opts, blake2b as _blake2b } from "@noble/hashes/blake2.js";
+import { sha256 as _sha256 } from "@noble/hashes/sha2.js";
 import { hex } from "./coders";
 import type { ByteInput } from "./types";
 
@@ -22,11 +22,17 @@ export function blake2b(message: ByteInput, options?: Blake2bOptions): Uint8Arra
   if (options?.salt) options.salt = ensureBytes(options.salt);
   if (options?.personalization) options.personalization = ensureBytes(options.personalization);
 
-  return _blake2b(ensureBytes(message), options);
+  const opts: Blake2Opts = {
+    key: options?.key ? ensureBytes(options?.key) : undefined,
+    salt: options?.salt ? ensureBytes(options?.salt) : undefined,
+    personalization: options?.personalization ? ensureBytes(options?.personalization) : undefined,
+    dkLen: options?.dkLen
+  };
+  return _blake2b(ensureBytes(message), opts);
 }
 
 export function blake2b256(message: ByteInput, options?: Blake2b256Options): Uint8Array {
-  return blake2b(ensureBytes(message), { dkLen: 32, ...options });
+  return blake2b(message, { dkLen: 32, ...options });
 }
 
 export function sha256(message: ByteInput): Uint8Array {
diff --git a/packages/crypto/src/index.ts b/packages/crypto/src/index.ts
@@ -1,4 +1,4 @@
-import { randomBytes as nobleRandomBytes } from "@noble/hashes/utils";
+import { randomBytes as nobleRandomBytes } from "@noble/hashes/utils.js";
 
 /**
  * Secure PRNG from "@noble/hashes". Uses crypto.getRandomValues, which defers to OS.
diff --git a/packages/wallet/package.json b/packages/wallet/package.json
@@ -43,9 +43,9 @@
     "@fleet-sdk/core": "workspace:^",
     "@fleet-sdk/crypto": "workspace:^",
     "@fleet-sdk/serializer": "workspace:^",
-    "@noble/curves": "^1.9.2",
-    "@scure/bip32": "^1.7.0",
-    "@scure/bip39": "^1.6.0"
+    "@noble/curves": "^2.0.1",
+    "@scure/bip32": "^2.0.1",
+    "@scure/bip39": "^2.0.1"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/wallet/src/mnemonic.ts b/packages/wallet/src/mnemonic.ts
@@ -1,5 +1,5 @@
 import { generateMnemonic as generate, validateMnemonic as validate } from "@scure/bip39";
-import { wordlist as english } from "@scure/bip39/wordlists/english";
+import { wordlist as english } from "@scure/bip39/wordlists/english.js";
 
 export function generateMnemonic(strength = 160, wordlist = english): string {
   return generate(wordlist, strength);
diff --git a/packages/wallet/src/prover/proveDLogProtocol.spec.ts b/packages/wallet/src/prover/proveDLogProtocol.spec.ts
@@ -1,5 +1,5 @@
 import { hex } from "@fleet-sdk/crypto";
-import { secp256k1 } from "@noble/curves/secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1.js";
 import { Address, verify_signature } from "ergo-lib-wasm-nodejs";
 import fc from "fast-check";
 import { describe, expect, it, test } from "vitest";
@@ -79,7 +79,7 @@ describe("ProveDLog protocol", () => {
           sk: fc.uint8Array({ minLength: 32, maxLength: 32 })
         }),
         ({ msg, sk }) => {
-          const pk = getPublicKey(hex.encode(sk));
+          const pk = getPublicKey(sk);
           const signature = sign(msg, sk);
 
           expect(verify(msg, signature, pk)).to.be.true;
diff --git a/packages/wallet/src/prover/proveDLogProtocol.ts b/packages/wallet/src/prover/proveDLogProtocol.ts
@@ -1,9 +1,10 @@
 import { FleetError, _0n, concatBytes } from "@fleet-sdk/common";
 import { bigintBE, blake2b256, hex, randomBytes, validateEcPoint } from "@fleet-sdk/crypto";
-import { secp256k1 } from "@noble/curves/secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1.js";
 
-const { ProjectivePoint: ECPoint, CURVE } = secp256k1;
-const G = ECPoint.BASE;
+const { Point } = secp256k1;
+const G = Point.BASE;
+const N = Point.CURVE().n;
 
 const BLAKE2B_256_DIGEST_LEN = 32;
 const ERGO_SOUNDNESS_BYTES = 24;
@@ -39,16 +40,16 @@ export function sign(message: Uint8Array, secretKey: Uint8Array) {
  */
 export function genSignature(message: Uint8Array, secretKey: Uint8Array): undefined | Uint8Array {
   const sk = bigintBE.encode(secretKey);
-  const pk = G.multiply(sk).toRawBytes();
+  const pk = G.multiply(sk).toBytes();
   const k = genRandomSecret();
-  const w = G.multiply(k).toRawBytes();
+  const w = G.multiply(k).toBytes();
   const c = fiatShamirHash(genCommitment(pk, w, message));
 
   // The next line is ignored in the coverage report because it depends on randomness.
   /* v8 ignore next -- @preserve */
   if (c === 0n) throw new FleetError("Failed to generate challenge");
 
-  const z = umod(sk * c + k, CURVE.n);
+  const z = umod(sk * c + k, N);
   const signature = concatBytes(bigintBE.decode(c), bigintBE.decode(z));
 
   // The next line is ignored in the coverage report because it depends on randomness.
@@ -69,7 +70,7 @@ function genRandomSecret() {
   let c = 0;
 
   while (r === 0n && c < MAX_ITERATIONS) {
-    r = umod(bigintBE.encode(randomBytes(32)), CURVE.n);
+    r = umod(bigintBE.encode(randomBytes(32)), N);
     c++;
   }
 
@@ -105,8 +106,8 @@ export function verify(message: Uint8Array, proof: Uint8Array, publicKey: Uint8A
   const c = bigintBE.encode(proof.slice(0, ERGO_SOUNDNESS_BYTES));
   const z = bigintBE.encode(proof.slice(ERGO_SOUNDNESS_BYTES, ERGO_SCHNORR_SIG_LEN));
 
-  const t = ECPoint.fromHex(publicKey).multiply(CURVE.n - c);
-  const w = G.multiply(z).add(t).toRawBytes();
+  const t = Point.fromBytes(publicKey).multiply(N - c);
+  const w = G.multiply(z).add(t).toBytes();
   const c2 = fiatShamirHash(genCommitment(publicKey, w, message));
 
   return c2 === c;
diff --git a/packages/wallet/src/wordlists.spec.ts b/packages/wallet/src/wordlists.spec.ts
@@ -8,8 +8,7 @@ import {
   korean,
   portuguese,
   simplifiedChinese,
-  spanish,
-  traditionalChinese
+  spanish
 } from "./wordlists";
 
 describe("wordlists", () => {
@@ -18,7 +17,6 @@ describe("wordlists", () => {
     expect(english).to.have.length(wordlistLength);
     expect(portuguese).to.have.length(wordlistLength);
     expect(simplifiedChinese).to.have.length(wordlistLength);
-    expect(traditionalChinese).to.have.length(wordlistLength);
     expect(czech).to.have.length(wordlistLength);
     expect(french).to.have.length(wordlistLength);
     expect(italian).to.have.length(wordlistLength);
diff --git a/packages/wallet/src/wordlists.ts b/packages/wallet/src/wordlists.ts
@@ -1,10 +1,9 @@
-export { wordlist as english } from "@scure/bip39/wordlists/english";
-export { wordlist as japanese } from "@scure/bip39/wordlists/japanese";
-export { wordlist as korean } from "@scure/bip39/wordlists/korean";
-export { wordlist as spanish } from "@scure/bip39/wordlists/spanish";
-export { wordlist as simplifiedChinese } from "@scure/bip39/wordlists/simplified-chinese";
-export { wordlist as traditionalChinese } from "@scure/bip39/wordlists/traditional-chinese";
-export { wordlist as french } from "@scure/bip39/wordlists/french";
-export { wordlist as italian } from "@scure/bip39/wordlists/italian";
-export { wordlist as portuguese } from "@scure/bip39/wordlists/portuguese";
-export { wordlist as czech } from "@scure/bip39/wordlists/czech";
+export { wordlist as english } from "@scure/bip39/wordlists/english.js";
+export { wordlist as japanese } from "@scure/bip39/wordlists/japanese.js";
+export { wordlist as korean } from "@scure/bip39/wordlists/korean.js";
+export { wordlist as spanish } from "@scure/bip39/wordlists/spanish.js";
+export { wordlist as simplifiedChinese } from "@scure/bip39/wordlists/simplified-chinese.js";
+export { wordlist as french } from "@scure/bip39/wordlists/french.js";
+export { wordlist as italian } from "@scure/bip39/wordlists/italian.js";
+export { wordlist as portuguese } from "@scure/bip39/wordlists/portuguese.js";
+export { wordlist as czech } from "@scure/bip39/wordlists/czech.js";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@fleet-sdk/wallet": patch
 +---
++
 +Bump `@scure/bip32` to `v2`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";`
	`1`	`+import { bytesToHex, hexToBytes } from "@noble/hashes/utils.js";`
`2`	`2`	`import { hex as scureHex } from "@scure/base";`
`3`	`3`	`import { bench, describe } from "vitest";`
`4`	`4`	`import { regularBoxes, validBoxes } from "../../../_test-vectors/mockedBoxes";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { randomBytes } from "@noble/hashes/utils";`
	`1`	`+import { randomBytes } from "@noble/hashes/utils.js";`
`2`	`2`	`import { describe, expect, it } from "vitest";`
`3`	`3`	`import { hex, utf8 } from "./coders";`
`4`	`4`	`import { blake2b, blake2b256, sha256 } from "./hashes";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { randomBytes as nobleRandomBytes } from "@noble/hashes/utils";`
	`1`	`+import { randomBytes as nobleRandomBytes } from "@noble/hashes/utils.js";`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Secure PRNG from "@noble/hashes". Uses crypto.getRandomValues, which defers to OS.`