Merge pull request #17 from SpringRole/develop

fix wallet generation issue

Author: nervehammer

.babelrc

@@ -1,3 +1,12 @@
 {
-    "presets": ["@babel/env", "minify"]
+    "presets": ["@babel/env", "minify"],
+    "plugins": [
+        [
+            "@babel/plugin-transform-runtime",
+            {
+                "helpers": true,
+                "regenerator": true
+            }
+        ]
+    ]
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@springrole/springwallet",
-    "version": "0.2.0",
+    "version": "0.2.2",
     "description": "Wallet for SpringRole users",
     "main": "dist/index.js",
     "scripts": {
@@ -44,6 +44,7 @@
     "devDependencies": {
         "@babel/cli": "^7.12.10",
         "@babel/core": "^7.12.10",
+        "@babel/plugin-transform-runtime": "^7.12.10",
         "@babel/preset-env": "^7.12.11",
         "babel-preset-minify": "^0.5.1",
         "eslint": "^7.18.0",

src/index.js

@@ -24,6 +24,7 @@ export class SpringWallet {
     constructor(network) {
         if (!network) throw new Error("'network' not defined");
         this.network = networkConfig(network);
+        this.wallet = undefined;
         this.walletAddress = this.initWalletAddress();
         this.privateKey = this.initPrivateKey();
         this.provider = this.initProvider(this.network);
@@ -120,7 +121,7 @@ export class SpringWallet {
      * @method encryptMnemonic
      * @param {String} mnemonic phrase
      * @param {String} password
-     * @returns {String} encryptMnemonic
+     * @returns {Promise<String>} encryptMnemonic
      */
     static encryptMnemonic(phrase, password) {
         return encryptMnemonic(phrase, password);
@@ -150,14 +151,11 @@ export class SpringWallet {
     /**
      * Fetch encrypted mnemonic from browser's local storage
      * @method getEncryptedMnemonic
-     * @returns {String} encryptedMnemonic
+     * @returns {Object} encryptedMnemonic
      */
     static getWalletSession() {
         const data = localStorage.getItem(STORAGE_SESSION_KEY);
-        if (!data) {
-            return null;
-        }
-
+        if (!data) return null;
         const { address, encryptedMnemonic } = JSON.parse(data);
         return { address, encryptedMnemonic };
     }
@@ -169,13 +167,13 @@ export class SpringWallet {
      * @returns wallet instance
      */
     static async initializeWalletFromMnemonic(mnemonic) {
-        const seed = mnemonicToSeed(mnemonic);
+        const seed = await mnemonicToSeed(mnemonic);
         const hdKey = await hdkey.fromMasterSeed(seed);
         const wallet = await hdKey.derivePath(MNEMONIC_PATH).deriveChild(0).getWallet();
         return wallet;
     }
 
-    async unlockWallet(mnemonic) {
+    static async unlockWallet(mnemonic) {
         const wallet = await SpringWallet.initializeWalletFromMnemonic(mnemonic);
         this.wallet = wallet;
         this.walletAddress = wallet.getChecksumAddressString();
@@ -185,3 +183,5 @@ export class SpringWallet {
         return this.walletAddress;
     }
 }
+
+export { encryptMnemonic, decryptMnemonic };

src/utils/encryption.js

@@ -60,7 +60,7 @@ export async function decryptMnemonic(encryptedMnemonic, password) {
     const decipher = createDecipheriv('aes-128-cbc', encKey, iv);
     const plaintextBuffer = Buffer.concat([decipher.update(cipherText), decipher.final()]);
 
-    const hmac = crypto.createHmac('sha256', macKey);
+    const hmac = createHmac('sha256', macKey);
     hmac.write(hmacPayload);
 
     const hmacDigest = hmac.digest();