Merge pull request #16 from paulmillr/master

Use top-level modules from @noble/hashes

Author: alcuadrado

Diff for: package.json

@@ -12,30 +12,8 @@
       "url": "https://paulmillr.com"
     }
   ],
-  "repository": "github:ethereum/js-ethereum-cryptography",
+  "repository": "https://github.com/ethereum/js-ethereum-cryptography",
   "license": "MIT",
-  "keywords": [
-    "ethereum",
-    "cryptography",
-    "digital signature",
-    "hash",
-    "encryption",
-    "prng",
-    "keccak",
-    "scrypt",
-    "pbkdf2",
-    "sha-256",
-    "ripemd-160",
-    "blake2b",
-    "aes",
-    "advanced encryption standar",
-    "secp256k1",
-    "ecdsa",
-    "bip32",
-    "hierarchical deterministic keys",
-    "hdwallet",
-    "hdkeys"
-  ],
   "main": "./index.js",
   "files": [
     "src",
@@ -47,7 +25,7 @@
   ],
   "dependencies": {
     "micro-base": "^0.10.0",
-    "@noble/hashes": "^0.4.4",
+    "@noble/hashes": "^0.5.1",
     "@noble/secp256k1": "^1.3.3"
   },
   "browser": {
@@ -97,6 +75,28 @@
     "webpack": "^4.39.3",
     "webpack-cli": "^3.3.8"
   },
+  "keywords": [
+    "ethereum",
+    "cryptography",
+    "digital signature",
+    "hash",
+    "encryption",
+    "prng",
+    "keccak",
+    "scrypt",
+    "pbkdf2",
+    "sha-256",
+    "ripemd-160",
+    "blake2b",
+    "aes",
+    "advanced encryption standar",
+    "secp256k1",
+    "ecdsa",
+    "bip32",
+    "hierarchical deterministic keys",
+    "hdwallet",
+    "hdkeys"
+  ],
   "targets": {
     "parcel_tests": {
       "context": "browser"

Diff for: src/bip39/index.ts

@@ -1,7 +1,7 @@
-import { pbkdf2, pbkdf2Async } from "@noble/hashes/lib/pbkdf2";
-import { sha256 } from "@noble/hashes/lib/sha256";
-import { sha512 } from "@noble/hashes/lib/sha512";
-import { assertNumber } from "@noble/hashes/lib/utils";
+import { pbkdf2, pbkdf2Async } from "@noble/hashes/pbkdf2";
+import { sha256 } from "@noble/hashes/sha256";
+import { sha512 } from "@noble/hashes/sha512";
+import { assertNumber } from "@noble/hashes/utils";
 import { utils as baseUtils } from "micro-base";
 import { getRandomBytesSync } from "../random";
 import { assertBytes } from "../utils";

Diff for: src/blake2b.ts

@@ -1,4 +1,4 @@
-import { blake2b as _blake2b } from "@noble/hashes/lib/blake2b";
+import { blake2b as _blake2b } from "@noble/hashes/blake2b";
 import { assertBytes } from "./utils";
 
 export const blake2b = (msg: Uint8Array, outputLength = 64): Uint8Array => {

Diff for: src/hdkey.ts

@@ -1,8 +1,8 @@
-import { hmac } from "@noble/hashes/lib/hmac";
-import { ripemd160 } from "@noble/hashes/lib/ripemd160";
-import { sha256 } from "@noble/hashes/lib/sha256";
-import { sha512 } from "@noble/hashes/lib/sha512";
-import { bytesToHex } from "@noble/hashes/lib/utils";
+import { hmac } from "@noble/hashes/hmac";
+import { ripemd160 } from "@noble/hashes/ripemd160";
+import { sha256 } from "@noble/hashes/sha256";
+import { sha512 } from "@noble/hashes/sha512";
+import { bytesToHex } from "@noble/hashes/utils";
 import { base58check } from "micro-base";
 import * as secp from "./secp256k1";
 import {

Diff for: src/keccak.ts

@@ -1,4 +1,4 @@
-import * as sha3 from "@noble/hashes/lib/sha3";
+import * as sha3 from "@noble/hashes/sha3";
 import { wrapHash } from "./utils";
 
 export const keccak224 = wrapHash(sha3.keccak_224);

Diff for: src/pbkdf2.ts

@@ -1,9 +1,9 @@
 import {
   pbkdf2 as _pbkdf2,
   pbkdf2Async as _pbkdf2Async
-} from "@noble/hashes/lib/pbkdf2";
-import { sha256 } from "@noble/hashes/lib/sha256";
-import { sha512 } from "@noble/hashes/lib/sha512";
+} from "@noble/hashes/pbkdf2";
+import { sha256 } from "@noble/hashes/sha256";
+import { sha512 } from "@noble/hashes/sha512";
 import { assertBytes } from "./utils";
 
 export async function pbkdf2(

Diff for: src/ripemd160.ts

@@ -1,4 +1,4 @@
-import { ripemd160 as _ripemd160 } from "@noble/hashes/lib/ripemd160";
+import { ripemd160 as _ripemd160 } from "@noble/hashes/ripemd160";
 import { wrapHash } from "./utils";
 
 export const ripemd160 = wrapHash(_ripemd160);

Diff for: src/scrypt.ts

@@ -1,7 +1,7 @@
 import {
   scrypt as _scrypt,
   scryptAsync as _scryptAsync
-} from "@noble/hashes/lib/scrypt";
+} from "@noble/hashes/scrypt";
 import { assertBytes } from "./utils";
 
 export async function scrypt(

Diff for: src/secp256k1-compat.ts

@@ -1,4 +1,4 @@
-import { sha256 } from "@noble/hashes/lib/sha256";
+import { sha256 } from "@noble/hashes/sha256";
 import * as secp from "./secp256k1";
 import { assertBool, assertBytes, hexToBytes, toHex } from "./utils";
 

Diff for: src/secp256k1.ts

@@ -1,5 +1,5 @@
-import { hmac } from "@noble/hashes/lib/hmac";
-import { sha256 } from "@noble/hashes/lib/sha256";
+import { hmac } from "@noble/hashes/hmac";
+import { sha256 } from "@noble/hashes/sha256";
 import { utils as _utils } from "@noble/secp256k1";
 export {
   getPublicKey,

Diff for: src/sha256.ts

@@ -1,4 +1,4 @@
-import { sha256 as _sha256 } from "@noble/hashes/lib/sha256";
+import { sha256 as _sha256 } from "@noble/hashes/sha256";
 import { wrapHash } from "./utils";
 
 export const sha256 = wrapHash(_sha256);

Diff for: src/sha512.ts

@@ -1,4 +1,4 @@
-import { sha512 as _sha512 } from "@noble/hashes/lib/sha512";
+import { sha512 as _sha512 } from "@noble/hashes/sha512";
 import { wrapHash } from "./utils";
 
 export const sha512 = wrapHash(_sha512);

Diff for: src/utils.ts

@@ -1,5 +1,5 @@
 // buf.toString('hex') -> toHex(buf)
-export { bytesToHex as toHex, createView } from "@noble/hashes/lib/utils";
+export { bytesToHex as toHex, createView } from "@noble/hashes/utils";
 // Buffer.from(hex, 'hex') -> hexToBytes(hex)
 export function hexToBytes(hex: string): Uint8Array {
   if (typeof hex !== "string") {