Merge pull request #281 from Zilliqa/fix/nodejs-crypto-scrypt

bb111189 · web-flow · commit 3bc32a6aa558 · 2021-03-05T16:30:57.000+08:00
fix/nodejs-crypto-scrypt-undefined-error
diff --git a/examples/webpack/html/index.html b/examples/webpack/html/index.html
@@ -7,6 +7,7 @@
     <!-- Please generate zilliqa-min.js using yarn build:web-->>
     <script src="zilliqa.min.js"></script>
     <script src="index.js"></script>
+    <script src="load-keystore-demo.js"></script>
 </head>
 <body>
 </body>
diff --git a/examples/webpack/html/load-keystore-demo.js b/examples/webpack/html/load-keystore-demo.js
@@ -0,0 +1,11 @@
+async function test() {
+    const zilliqa = new Zilliqa.Zilliqa('https://dev-api.zilliqa.com');
+    const keystore = `{"address":"0x3591c6b333776a5b6c885Ada53b4462dEe8c67B6","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"1b23d4a09fa241b9cbe176fbc7d9567f"},"ciphertext":"40cce0a0b4eee4e4258341e18d880ff4b12ed25887252b90b7de4b6be86da5d5","kdf":"scrypt","kdfparams":{"salt":"4997f389a370424072967f6faeb709c238ff3cc3606a4101fc3dcbdd74b67108","n":8192,"c":262144,"r":8,"p":1,"dklen":32},"mac":"97f0677a9f0ad0c6052896e1b5ae94f86025047b9fe2617c1fce220af0db0e82"},"id":"39626239-3338-4138-b662-363663333030","version":3}`;
+    const keystoreAddress = await zilliqa.wallet.addByKeystore(keystore, "strong_password");
+    const exportedKeystore = await zilliqa.wallet.export("0x3591c6b333776a5b6c885Ada53b4462dEe8c67B6", "strong_password", 'scrypt');
+
+    console.log("keystore loaded - address: %o", keystoreAddress);
+    console.log("exported keystore: %o", exportedKeystore);
+}
+
+  test();
diff --git a/packages/zilliqa-js-crypto/package.json b/packages/zilliqa-js-crypto/package.json
@@ -33,6 +33,7 @@
     "hmac-drbg": "^1.0.1",
     "pbkdf2": "^3.0.16",
     "randombytes": "^2.0.6",
+    "scrypt-js": "^3.0.1",
     "scryptsy": "^2.1.0",
     "sodium-native": "^3.2.0",
     "uuid": "^3.3.2"
diff --git a/packages/zilliqa-js-crypto/src/keystore.ts b/packages/zilliqa-js-crypto/src/keystore.ts
@@ -18,7 +18,7 @@
 import aes from 'aes-js';
 import hashjs from 'hash.js';
 import { pbkdf2Sync } from 'pbkdf2';
-import crypto from 'crypto';
+import scrypt from 'scrypt-js';
 import uuid from 'uuid';
 
 import { bytes } from '@zilliqa-js/util';
@@ -60,7 +60,8 @@ async function getDerivedKey(
 
   if (kdf === 'scrypt') {
     const { n, r, p, dklen } = params as ScryptParams;
-    return crypto.scryptSync(key, salt, dklen, { N: n, r: r, p: p });
+    const derivedKeyInt8Array = scrypt.syncScrypt(key, salt, n, r, p, dklen);
+    return Buffer.from(derivedKeyInt8Array);
   }
 
   throw new Error('Only pbkdf2 and scrypt are supported');
diff --git a/yarn.lock b/yarn.lock
@@ -8940,6 +8940,11 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
+scrypt-js@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312"
+  integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==
+
 scryptsy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790"
