Replace scryptsy with scrypt-js

Author: alcuadrado

packages/ethereum-cryptography/package.json

@@ -49,7 +49,6 @@
     "pure/**/*.d.ts.map"
   ],
   "browser": {
-    "./scrypt.js": "./pure/scrypt.js",
     "./ripemd160.js": "./pure/ripemd160.js",
     "./sha256.js": "./pure/sha256.js",
     "./hdkey.js": "./pure/hdkey.js",
@@ -59,11 +58,11 @@
   "sideEffects": false,
   "scripts": {
     "prepare": "npm run build",
-    "build": "npm-run-all build:tsc scryptsy-without-crypto:build scryptsy-without-crypto:copy hdkey-without-crypto:build hdkey-without-crypto:copy bip39-without-wordlists:build bip39-without-wordlists:copy",
+    "build": "npm-run-all build:tsc hdkey-without-crypto:build hdkey-without-crypto:copy bip39-without-wordlists:build bip39-without-wordlists:copy",
     "build:tsc": "tsc --project tsconfig.prod.json",
-    "test": "npm-run-all scryptsy-without-crypto:build hdkey-without-crypto:build bip39-without-wordlists:build test:node",
+    "test": "npm-run-all hdkey-without-crypto:build bip39-without-wordlists:build test:node",
     "test:node": "mocha",
-    "clean": "rimraf vendor test-builds pure shims scryptsy-without-crypto-build hdkey-without-crypto-build bip39-without-wordlists-build '*.js' '*.js.map' '*.d.ts' '*.d.ts.map' 'src/**/*.js'",
+    "clean": "rimraf vendor test-builds pure shims hdkey-without-crypto-build bip39-without-wordlists-build '*.js' '*.js.map' '*.d.ts' '*.d.ts.map' 'src/**/*.js'",
     "lint": "tslint --project tsconfig.json",
     "lint:fix": "tslint --fix --project tsconfig.json",
     "browser-tests": "npm-run-all browser-tests:build browser-tests:test",
@@ -73,8 +72,6 @@
     "browser-tests:test-browserify": "karma start --single-run --browsers ChromeHeadless test/karma.browserify.conf.js",
     "browser-tests:test-webpack": "karma start --single-run --browsers ChromeHeadless test/karma.webpack.conf.js",
     "browser-tests:test-rollup": "karma start --single-run --browsers ChromeHeadless test/karma.rollup.conf.js",
-    "scryptsy-without-crypto:build": "bash -x scripts/build-scryptsy-without-crypto.sh",
-    "scryptsy-without-crypto:copy": "mkdir -p vendor && cp src/vendor/scryptsy-without-crypto.js ./vendor",
     "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",
@@ -115,16 +112,17 @@
   "dependencies": {
     "@types/pbkdf2": "^3.0.0",
     "@types/secp256k1": "^4.0.1",
+    "blakejs": "^1.1.0",
+    "browserify-aes": "^1.2.0",
     "bs58check": "^2.1.2",
-    "safe-buffer": "^5.1.2",
     "create-hash": "^1.2.0",
-    "pbkdf2": "^3.0.17",
     "create-hmac": "^1.1.7",
-    "blakejs": "^1.1.0",
-    "browserify-aes": "^1.2.0",
     "hash.js": "^1.1.7",
     "keccak": "^3.0.0",
+    "pbkdf2": "^3.0.17",
     "randombytes": "^2.1.0",
+    "safe-buffer": "^5.1.2",
+    "scrypt-js": "^3.0.0",
     "secp256k1": "^4.0.1",
     "setimmediate": "^1.0.5"
   }

packages/ethereum-cryptography/scripts/build-browser-tests.sh

@@ -3,11 +3,6 @@ set -e
 echo "Building tests with TypeScript"
 npx tsc --project tsconfig.json
 
-echo "Building scryptsy-without-crypto"
-npm run scryptsy-without-crypto:build
-mkdir -p test-builds/tsc/src/vendor
-cp src/vendor/scryptsy-without-crypto.js test-builds/tsc/src/vendor
-
 echo "Building hdkey-without-crypto"
 npm run hdkey-without-crypto:build
 mkdir -p test-builds/tsc/src/vendor test-builds/tsc/src/pure/vendor

packages/ethereum-cryptography/scripts/build-scryptsy-without-crypto.sh

@@ -1,13 +1,24 @@
-import * as scryptPure from "./pure/scrypt";
+import "scrypt-js/thirdparty/setImmediate";
+const scryptJs = require("scrypt-js");
 
-let scryptModule: typeof scryptPure;
-
-try {
-  // tslint:disable-next-line no-implicit-dependencies
-  scryptModule = require("ethereum-cryptography-native/scrypt");
-} catch {
-  scryptModule = scryptPure;
+export async function scrypt(
+  password: Buffer,
+  salt: Buffer,
+  n: number,
+  p: number,
+  r: number,
+  dklen: number
+): Promise<Buffer> {
+  return Buffer.from(await scryptJs.scrypt(password, salt, n, r, p, dklen));
 }
 
-export const scrypt = scryptModule.scrypt;
-export const scryptSync = scryptModule.scryptSync;
+export function scryptSync(
+  password: Buffer,
+  salt: Buffer,
+  n: number,
+  p: number,
+  r: number,
+  dklen: number
+): Buffer {
+  return Buffer.from(scryptJs.syncScrypt(password, salt, n, r, p, dklen));
+}

packages/ethereum-cryptography/scryptsy

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