Merge pull request #27 from iden3/PID-3513-switch-sha256-noble-hashes

Switch to noble-hashes

Author: daveroga

.nvmrc

@@ -1 +1 @@
-v20.11.1
+v20.19.0

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@iden3/js-crypto",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Crypto primitives for iden3",
   "source": "./src/index.ts",
   "exports": {
@@ -54,6 +54,6 @@
     "vitest": "^3.1.3"
   },
   "dependencies": {
-    "@noble/hashes": "^1.8.0"
+    "@noble/hashes": "^2.0.1"
   }
 }

package.json

@@ -1,7 +1,7 @@
 import { babyJub } from './babyjub';
 import { Eddsa, eddsa } from './eddsa';
 import { Hex } from '../hex';
-import { blake512 } from '@noble/hashes/blake1';
+import { blake512 } from '@noble/hashes/blake1.js';
 import { utils } from '../ff';
 
 export class Signature {

src/babyjub/eddsa-keys.ts

@@ -2,7 +2,7 @@ import { babyJub, BabyJub } from './babyjub';
 import { poseidon } from '../poseidon';
 import { F1Field, Scalar, utils } from '../ff';
 import { PublicKey, Signature } from './eddsa-keys';
-import { blake512 } from '@noble/hashes/blake1';
+import { blake512 } from '@noble/hashes/blake1.js';
 
 export class Eddsa {
   babyJub: BabyJub = babyJub;

src/babyjub/eddsa.ts

@@ -2,5 +2,6 @@ export { Eddsa, eddsa, BabyJub, babyJub, Signature, PublicKey, PrivateKey } from
 export { poseidon, Poseidon, OPT } from './poseidon';
 export { Hex } from './hex';
 export { base58FromBytes, base58ToBytes } from './base58';
-export { sha256, Hash } from './sha256';
+export { Hash } from './sha256';
+export { sha256 } from './sha256-noble';
 export { utils as ffUtils, getRandomBytes } from './ff';

src/index.ts

@@ -0,0 +1,5 @@
+import * as sha2 from '@noble/hashes/sha2.js';
+
+export function sha256(data: Uint8Array): Uint8Array {
+  return sha2.sha256(data);
+}

src/sha256-noble.ts

@@ -100,7 +100,9 @@ function hashBlocks(w: Int32Array, v: Int32Array, p: Uint8Array, pos: number, le
   return pos;
 }
 
-// Hash implements SHA256 hash algorithm.
+/**
+ * @deprecated Hash implementation of SHA256 has been replaced by noble-hashes SHA256.
+ */
 export class Hash {
   digestLength: number = digestLength;
   blockSize: number = blockSize;
@@ -243,10 +245,3 @@ export class Hash {
     this.bufferLength = 0;
   }
 }
-
-export function sha256(data: Uint8Array): Uint8Array {
-  const h = new Hash().update(data);
-  const digest = h.digest();
-  h.clean();
-  return digest;
-}

src/sha256.ts

@@ -1,5 +1,5 @@
 import { Hex } from '../src';
-import { blake512 } from '@noble/hashes/blake1';
+import { blake512 } from '@noble/hashes/blake1.js';
 
 describe('blake512 hash', () => {
   it('blake512', () => {

tests/blake512.test.ts

@@ -1,8 +1,17 @@
-import { sha256 } from '../src/sha256';
+import { sha256 } from '../src/sha256-noble';
+import { Hash } from '../src/sha256';
 import { Hex } from '../src/hex';
 
 describe('SHA-256 Hashing', () => {
   const encoder = new TextEncoder();
+
+  function sha256Old(data: Uint8Array): Uint8Array {
+    const h = new Hash().update(data);
+    const digest = h.digest();
+    h.clean();
+    return digest;
+  }
+
   it('should correctly hash a string', () => {
     const suite = [
       {
@@ -25,6 +34,9 @@ describe('SHA-256 Hashing', () => {
     for (const { input, expectedHash } of suite) {
       const result = Hex.encodeString(sha256(encoder.encode(input)));
       expect(result).toEqual(expectedHash);
+
+      const resultOld = Hex.encodeString(sha256Old(encoder.encode(input)));
+      expect(resultOld).toEqual(expectedHash);
     }
   });