Merge pull request #19 from makkii-dev/bugfix/swap-scrypt

Bugfix/swap scrypt

Author: qoire

package.json

@@ -55,7 +55,7 @@
     "assert": "^2.0.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "cross-env": "^6.0.3",
-    "documentation": "^12.1.4",
+    "documentation": "^13.2.5",
     "eslint": "^6.6.0",
     "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-prettier": "^6.7.0",

packages/app-aion/__tests__/UTC--2021-07-05T19_41_44.749Z--a02a36c79c6300b1ccac19bc5f1a60feb6f8510e657fac927b9ecadf0b0f3c3d

@@ -9,6 +9,8 @@ const client = new AionKeystoreClient();
 const signer = new AionLocalSigner();
 
 describe('AION Keystore Client function test', function () {
+    this.timeout(60000);
+
     it('Test generateMnemonic', function () {
         const mnemonic_ = client.generateMnemonic();
         assert.strictEqual(mnemonic_.split(' ').length, 12);
@@ -49,6 +51,14 @@ describe('AION Keystore Client function test', function () {
         const {address} = await client.recoverKeyPairByKeyFile(content, 'password');
         assert.strictEqual(address, '0xa05ed4fcb3fd1c2b8d65f7a9cbff0e280e53b40e6399f9887c3e28b37b5d09bf');
     })
+
+    it('Test recover recently generated keyfile', async () => {
+        this.timeout(20000);
+        const content = fs.readFileSync(path.resolve(__dirname, './UTC--2021-07-05T19_41_44.749Z--a02a36c79c6300b1ccac19bc5f1a60feb6f8510e657fac927b9ecadf0b0f3c3d'));
+        const {address} = await client.recoverKeyPairByKeyFile(content, 'password');
+        assert.strictEqual(address, '0xa02a36c79c6300b1ccac19bc5f1a60feb6f8510e657fac927b9ecadf0b0f3c3d');
+    });
+
     it('Test sign Transaction', async function(){
         const unsignedTx = {
             to:'0xa03c27530d83ad581bf73627a8aa65a698a3bf70d65152d13aed5afd26b119ef',

packages/app-aion/__tests__/kestore_client.test.js

@@ -40,8 +40,8 @@
     "crypto-browserify": "^3.12.0",
     "lib-common-util-js": "https://github.com/chaion/lib-common-util-js.git#7c64a4fd9b96b4c4d25b26de47e290eef10cc92e",
     "lib-hw-ledger-js": "https://github.com/chaion/lib-hw-ledger-js.git#e6f6a1d82b7ceb74fc1517f69f7ad2f612befd8a",
-    "scrypt.js": "^0.3.0",
-    "tweetnacl": "^1.0.1"
+    "tweetnacl": "^1.0.1",
+    "scrypt-js": "^3.0.1"
   },
   "publishConfig": {
     "access": "public"

packages/app-aion/lib/lib_keystore/keyfile.js

@@ -1,9 +1,9 @@
 import { hexutil } from "lib-common-util-js";
+import { syncScrypt } from "scrypt-js";
 import { ab2str, crypto } from "../utils";
 import { keyPair } from "./keyPair";
 
 const RLP = require("aion-rlp");
-const scrypt = require("scrypt.js");
 const blake2b = require("blake2b");
 
 const fromV3 = (input, password) =>
@@ -37,7 +37,7 @@ const fromV3 = (input, password) =>
                 Keystore.crypto.kdfParams.p = hexutil.toHex(KdfParams[3]); // 14
                 Keystore.crypto.kdfParams.r = hexutil.toHex(KdfParams[4]); // 15
                 Keystore.crypto.kdfParams.salt = ab2str(KdfParams[5]); // 16
-                derivedKey = scrypt(
+                derivedKey = syncScrypt(
                     Buffer.from(password),
                     Buffer.from(Keystore.crypto.kdfParams.salt, "hex"),
                     parseInt(Keystore.crypto.kdfParams.n, 16),
@@ -107,7 +107,7 @@ function toV3(privateKey, password) {
     cipherparams[0] = tempParams.toString("hex");
     const Cipherparams = RLP.encode(cipherparams);
 
-    const derivedKey = scrypt(
+    const derivedKey = syncScrypt(
         Buffer.from(password),
         Buffer.from(salt, "hex"),
         n,