Remove every mention to -native

Author: alcuadrado

package.json

@@ -49,11 +49,9 @@
     "pure/**/*.d.ts.map"
   ],
   "browser": {
-    "./ripemd160.js": "./pure/ripemd160.js",
-    "./sha256.js": "./pure/sha256.js",
     "./hdkey.js": "./pure/hdkey.js",
-    "./blake2b.js": "./pure/blake2b.js",
-    "./bip39/index.js": "./pure/bip39/index.js"
+    "./ripemd160.js": "./pure/ripemd160.js",
+    "./sha256.js": "./pure/sha256.js"
   },
   "sideEffects": false,
   "scripts": {
@@ -75,7 +73,7 @@
     "hdkey-without-crypto:build": "bash -x scripts/build-hdkey-without-crypto.sh",
     "hdkey-without-crypto:copy": "mkdir -p vendor pure/vendor && cp src/vendor/hdkey-without-crypto.js ./vendor && cp src/pure/vendor/hdkey-without-crypto.js ./pure/vendor",
     "bip39-without-wordlists:build": "bash -x scripts/build-bip39-without-wordlists.sh",
-    "bip39-without-wordlists:copy": "mkdir -p pure/vendor && cp src/pure/vendor/bip39-without-wordlists.js ./pure/vendor"
+    "bip39-without-wordlists:copy": "mkdir -p vendor && cp src/vendor/bip39-without-wordlists.js ./vendor"
   },
   "devDependencies": {
     "@types/chai": "^4.2.1",

scripts/build-bip39-without-wordlists.sh

@@ -4,4 +4,4 @@ echo "Bundling bip39 with Rollup"
 npx rollup -c bip39-without-wordlists-config/rollup.config.js
 
 echo "Copying output"
-cp bip39-without-wordlists-build/bip39-without-wordlists.js ./src/pure/vendor
+cp bip39-without-wordlists-build/bip39-without-wordlists.js ./src/vendor

scripts/build-browser-tests.sh

@@ -11,8 +11,8 @@ cp src/pure/vendor/hdkey-without-crypto.js test-builds/tsc/src/pure/vendor
 
 echo "Building bip39-without-wordlists"
 npm run bip39-without-wordlists:build
-mkdir -p test-builds/tsc/src/pure/vendor
-cp src/pure/vendor/bip39-without-wordlists.js test-builds/tsc/src/pure/vendor
+mkdir -p test-builds/tsc/src/vendor
+cp src/vendor/bip39-without-wordlists.js test-builds/tsc/src/vendor
 
 echo "Building tests with Parcel"
 npx parcel build --no-cache --no-minify test-builds/tsc/src/pure/*.js test-builds/tsc/test/pure/*.js -d test-builds/parcel

src/bip39/index.ts

@@ -1,17 +1,40 @@
-import * as bip39Pure from "../pure/bip39";
+const bip39 = require("../vendor/bip39-without-wordlists");
 
-let bip39Module: typeof bip39Pure;
+export function generateMnemonic(
+  wordlist: string[],
+  strength: number = 128
+): string {
+  return bip39.generateMnemonic(strength, undefined, wordlist);
+}
+
+export function mnemonicToEntropy(
+  mnemonic: string,
+  wordlist: string[]
+): Buffer {
+  return bip39.mnemonicToEntropy(mnemonic, wordlist);
+}
+
+export function entropyToMnemonic(entropy: Buffer, wordlist: string[]): string {
+  return bip39.entropyToMnemonic(entropy, wordlist);
+}
+
+export function validateMnemonic(
+  mnemonic: string,
+  wordlist: string[]
+): boolean {
+  return bip39.validateMnemonic(mnemonic, wordlist);
+}
 
-try {
-  // tslint:disable-next-line no-implicit-dependencies
-  bip39Module = require("ethereum-cryptography-native/bip39");
-} catch {
-  bip39Module = require("../pure/bip39");
+export async function mnemonicToSeed(
+  mnemonic: string,
+  passphrase: string = ""
+): Promise<Buffer> {
+  return bip39.mnemonicToSeed(mnemonic, passphrase);
 }
 
-export const generateMnemonic = bip39Module.generateMnemonic;
-export const mnemonicToEntropy = bip39Module.mnemonicToEntropy;
-export const entropyToMnemonic = bip39Module.entropyToMnemonic;
-export const validateMnemonic = bip39Module.validateMnemonic;
-export const mnemonicToSeed = bip39Module.mnemonicToSeed;
-export const mnemonicToSeedSync = bip39Module.mnemonicToSeedSync;
+export function mnemonicToSeedSync(
+  mnemonic: string,
+  passphrase: string = ""
+): Buffer {
+  return bip39.mnemonicToSeedSync(mnemonic, passphrase);
+}

src/blake2b.ts

@@ -1,12 +1,9 @@
-import * as blake2bPure from "./pure/blake2b";
+const blake2bJs = require("blakejs");
 
-let blake2bModule: typeof blake2bPure;
+export function blake2b(input: Buffer, outputLength = 64): Buffer {
+  if (outputLength <= 0 || outputLength > 64) {
+    throw Error("Invalid outputLength");
+  }
 
-try {
-  // tslint:disable-next-line no-implicit-dependencies
-  blake2bModule = require("ethereum-cryptography-native/blake2b");
-} catch {
-  blake2bModule = require("./pure/blake2b");
+  return Buffer.from(blake2bJs.blake2b(input, undefined, outputLength));
 }
-
-export const blake2b = blake2bModule.blake2b;

src/hdkey.ts

@@ -1,17 +1,5 @@
 import * as hdkeyPure from "./pure/hdkey";
 
-let hdkey: typeof hdkeyPure.HDKey;
-
-try {
-  // tslint:disable-next-line no-implicit-dependencies
-  hdkey = require("ethereum-cryptography-native/hdkey").HDKey;
-} catch {
-  // This module is slightly more complicated, as we don't want to use the
-  // 100% pure version of hdkey if the native one isn't installed.
-
-  // We require this local version of hdkey-without-crypto because it uses
-  // the built-in crypto module
-  hdkey = require("./vendor/hdkey-without-crypto");
-}
+const hdkey: typeof hdkeyPure.HDKey = require("./vendor/hdkey-without-crypto");
 
 export const HDKey = hdkey;

src/pure/bip39/index.ts

@@ -1,6 +1,6 @@
+import * as bip39 from "../../src/bip39";
 import { wordlist as englishWordlist } from "../../src/bip39/wordlists/english";
 import { wordlist as spanishWordlist } from "../../src/bip39/wordlists/spanish";
-import * as bip39 from "../../src/pure/bip39";
 import { createTests } from "../test-vectors/bip39";
 
 createTests(

src/pure/blake2b.ts

@@ -1,4 +1,4 @@
-import { blake2b } from "../../src/pure/blake2b";
+import { blake2b } from "../../src/blake2b";
 import { createTests } from "../test-vectors/blake2b";
 
 createTests(blake2b);