From 4ee9a4d1913c4be02902de62937129027af62e46 Mon Sep 17 00:00:00 2001
From: Richard Moore <github@ricmoo.com>
Date: Fri, 26 Jan 2018 21:56:20 -0500
Subject: [PATCH] Added x-ethers compatible encrypted mnemonic to JSON wallets.

---
 tests/make-tests/make-wallets.js              |  10 +-
 ...sale-.json => wallet-crowdsale_null-.json} |   0
 ...son => wallet-crowdsale_password-foo.json} |   0
 .../test-wallets/wallet-ethers1-password.json |   1 +
 .../test-wallets/wallet-ethers2-password.json |   1 +
 ...et-test-life.json => wallet-life-foo.json} |   0
 ...-.json => wallet-secretstorage_null-.json} |   0
 ...=> wallet-secretstorage_password-foo.json} |   0
 tests/test-wallet.js                          |   4 +
 tests/tests/wallets.json.gz                   | Bin 1805 -> 2719 bytes
 wallet/package.json                           |   2 +-
 wallet/secret-storage.js                      | 106 +++++++++++++++---
 wallet/wallet.js                              |  19 +++-
 13 files changed, 125 insertions(+), 18 deletions(-)
 rename tests/make-tests/test-wallets/{wallet-crowdsale-.json => wallet-crowdsale_null-.json} (100%)
 rename tests/make-tests/test-wallets/{wallet-crowdsale-foo.json => wallet-crowdsale_password-foo.json} (100%)
 create mode 100644 tests/make-tests/test-wallets/wallet-ethers1-password.json
 create mode 100644 tests/make-tests/test-wallets/wallet-ethers2-password.json
 rename tests/make-tests/test-wallets/{wallet-test-life.json => wallet-life-foo.json} (100%)
 rename tests/make-tests/test-wallets/{wallet-secretstorage-.json => wallet-secretstorage_null-.json} (100%)
 rename tests/make-tests/test-wallets/{wallet-secretstorage-foo.json => wallet-secretstorage_password-foo.json} (100%)

diff --git a/tests/make-tests/make-wallets.js b/tests/make-tests/make-wallets.js
index 025056c40..b56a4101e 100644
--- a/tests/make-tests/make-wallets.js
+++ b/tests/make-tests/make-wallets.js
@@ -32,8 +32,15 @@ var privateKeys = {
     '0x4a9cf99357f5789251a8d7fad5b86d0f31eeb938': '0xa016182717223d01f776149ec0b4a217d0e9930cad263f205427c6d3cd5560e7',
     '0x88a5c2d9919e46f883eb62f7b8dd9d0cc45bc290': '0xf03e581353c794928373fb0893bc731aefc4c4e234e643f3a46998b03cd4d7c5',
     '0x17c5185167401ed00cf5f5b2fc97d9bbfdb7d025': '0x4242424242424242424242424242424242424242424242424242424242424242',
+    '0x012363d61bdc53d0290a0f25e9c89f8257550fb8': '0x4c94faa2c558a998d10ee8b2b9b8eb1fbcb8a6ac5fd085c6f95535604fc1bffb',
+    '0x15db397ed5f682acb22b0afc6c8de4cdfbda7cbc': '0xcdf3c34a2ea0ff181f462856168f5851e68c37b583eb158403e43aeab4964fee'
 }
 
+var mnemonics = {
+    '0x15db397ed5f682acb22b0afc6c8de4cdfbda7cbc': 'debris glass rich exotic window other film slow expose flight either wealth',
+    '0x012363d61bdc53d0290a0f25e9c89f8257550fb8': 'service basket parent alcohol fault similar survey twelve hockey cloud walk panel'
+};
+
 var walletPath = path.join(__dirname, 'test-wallets');
 fs.readdirSync(walletPath).forEach(function(filename) {
     var data = require(path.join(walletPath, filename));
@@ -44,8 +51,6 @@ fs.readdirSync(walletPath).forEach(function(filename) {
     var password = filename.substring(0, filename.length - 5).split('-');
     password = password[password.length - 1];
 
-    if (password === 'life') { password = 'foo'; }
-
     if (data.ethaddr) {
         Output.push({
             type: 'crowdsale',
@@ -61,6 +66,7 @@ fs.readdirSync(walletPath).forEach(function(filename) {
             type: 'secret-storage',
             address: prefixAddress(data.address),
             json: JSON.stringify(data),
+            mnemonic: mnemonics[prefixAddress(data.address)] || '',
             name: name,
             password: password,
             privateKey: privateKeys[prefixAddress(data.address)],
diff --git a/tests/make-tests/test-wallets/wallet-crowdsale-.json b/tests/make-tests/test-wallets/wallet-crowdsale_null-.json
similarity index 100%
rename from tests/make-tests/test-wallets/wallet-crowdsale-.json
rename to tests/make-tests/test-wallets/wallet-crowdsale_null-.json
diff --git a/tests/make-tests/test-wallets/wallet-crowdsale-foo.json b/tests/make-tests/test-wallets/wallet-crowdsale_password-foo.json
similarity index 100%
rename from tests/make-tests/test-wallets/wallet-crowdsale-foo.json
rename to tests/make-tests/test-wallets/wallet-crowdsale_password-foo.json
diff --git a/tests/make-tests/test-wallets/wallet-ethers1-password.json b/tests/make-tests/test-wallets/wallet-ethers1-password.json
new file mode 100644
index 000000000..a609bddde
--- /dev/null
+++ b/tests/make-tests/test-wallets/wallet-ethers1-password.json
@@ -0,0 +1 @@
+{"address":"012363d61bdc53d0290a0f25e9c89f8257550fb8","id":"5ba8719b-faf9-49ec-8bca-21522e3d56dc","version":3,"Crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"bc0473d60284d2d6994bb6793e916d06"},"ciphertext":"e73ed0b0c53bcaea4516a15faba3f6d76dbe71b9b46a460ed7e04a68e0867dd7","kdf":"scrypt","kdfparams":{"salt":"97f0b6e17c392f76a726ceea02bac98f17265f1aa5cf8f9ad1c2b56025bc4714","n":131072,"dklen":32,"p":1,"r":8},"mac":"ff4f2db7e7588f8dd41374d7b98dfd7746b554c0099a6c0765be7b1c7913e1f3"},"x-ethers":{"client":"ethers.js","gethFilename":"UTC--2018-01-27T01-52-22.0Z--012363d61bdc53d0290a0f25e9c89f8257550fb8","mnemonicCounter":"70224accc00e35328a010a19fef51121","mnemonicCiphertext":"cf835e13e4f90b190052263dbd24b020","version":"0.1"}}
diff --git a/tests/make-tests/test-wallets/wallet-ethers2-password.json b/tests/make-tests/test-wallets/wallet-ethers2-password.json
new file mode 100644
index 000000000..f4546dc9a
--- /dev/null
+++ b/tests/make-tests/test-wallets/wallet-ethers2-password.json
@@ -0,0 +1 @@
+{"version":3,"id":"05D302EE-23DC-48C4-B89C-CAAAC1C780C4","x-ethers":{"gethFilename":"UTC--2018-01-26T20-25-02.0Z--15db397ed5f682acb22b0afc6c8de4cdfbda7cbc","mnemonicCiphertext":"b92c7c3da540ae7beee55365fb330c33","mnemonicCounter":"a65d689a73c096025f2acae3f7068510","client":"ethers/iOS","version":"0.1"},"Crypto":{"ciphertext":"fa6ff2374087a089ec9fcba3bc21389f5e26ec2932c95b608ebe0218efab83c6","cipherparams":{"iv":"5ddca45b254406516ca2c97d18d5dfd9"},"kdf":"scrypt","kdfparams":{"r":8,"p":1,"n":262144,"dklen":32,"salt":"864a474f8586ab0fa97ed9240ae6227b2b22b48bdf298137c355e4a07eb19831"},"mac":"eaa89325acedbf88c0893e53c8c8d426b590655746c66da9cd76e4f72d84084f","cipher":"aes-128-ctr"},"address":"15db397ed5f682acb22b0afc6c8de4cdfbda7cbc"}
diff --git a/tests/make-tests/test-wallets/wallet-test-life.json b/tests/make-tests/test-wallets/wallet-life-foo.json
similarity index 100%
rename from tests/make-tests/test-wallets/wallet-test-life.json
rename to tests/make-tests/test-wallets/wallet-life-foo.json
diff --git a/tests/make-tests/test-wallets/wallet-secretstorage-.json b/tests/make-tests/test-wallets/wallet-secretstorage_null-.json
similarity index 100%
rename from tests/make-tests/test-wallets/wallet-secretstorage-.json
rename to tests/make-tests/test-wallets/wallet-secretstorage_null-.json
diff --git a/tests/make-tests/test-wallets/wallet-secretstorage-foo.json b/tests/make-tests/test-wallets/wallet-secretstorage_password-foo.json
similarity index 100%
rename from tests/make-tests/test-wallets/wallet-secretstorage-foo.json
rename to tests/make-tests/test-wallets/wallet-secretstorage_password-foo.json
diff --git a/tests/test-wallet.js b/tests/test-wallet.js
index 804f02335..0990cf622 100644
--- a/tests/test-wallet.js
+++ b/tests/test-wallet.js
@@ -41,6 +41,10 @@ describe('Test JSON Wallets', function() {
                     'generated correct private key - ' + wallet.privateKey);
                 assert.equal(wallet.address.toLowerCase(), test.address,
                     'generate correct address - '  + wallet.address);
+                if (test.mnemonic) {
+                    assert.equal(wallet.mnemonic, test.mnemonic,
+                        'mnemonic enabled encrypted wallet has a mnemonic');
+                }
             });
         });
     });
diff --git a/tests/tests/wallets.json.gz b/tests/tests/wallets.json.gz
index d09b64086c5d79c3c03873b9f5cd2474b80cb449..09c6e3876d3916ed43536df09c7de05d7a7a624b 100644
GIT binary patch
literal 2719
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
ZX$CwA0&y8MdG_CD{|Bn?Z2vYI008|EQ7ixe

literal 1805
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

diff --git a/wallet/package.json b/wallet/package.json
index 79dcd9839..5d998527c 100644
--- a/wallet/package.json
+++ b/wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ethers-wallet",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Wallet and signing library for Ethereum.",
   "bugs": {
     "url": "http://github.com/ethers-io/ethers.js/issues",
diff --git a/wallet/secret-storage.js b/wallet/secret-storage.js
index 854f1db9a..d2752c3ef 100644
--- a/wallet/secret-storage.js
+++ b/wallet/secret-storage.js
@@ -8,7 +8,11 @@ var hmac = require('ethers-utils/hmac');
 var pbkdf2 = require('ethers-utils/pbkdf2');
 var utils = require('ethers-utils');
 
-var SigningKey = require('./signing-key.js');
+var SigningKey = require('./signing-key');
+var HDNode = require('./hdnode');
+
+// @TODO: Maybe move this to HDNode?
+var defaultPath = "m/44'/60'/0'/0/0";
 
 function arrayify(hexString) {
     if (typeof(hexString) === 'string' && hexString.substring(0, 2) !== '0x') {
@@ -17,6 +21,12 @@ function arrayify(hexString) {
     return utils.arrayify(hexString);
 }
 
+function zpad(value, length) {
+    value = String(value);
+    while (value.length < length) { value = '0' + value; }
+    return value;
+}
+
 function getPassword(password) {
     if (typeof(password) === 'string') {
         return utils.toUtf8Bytes(password, 'NFKC');
@@ -133,7 +143,7 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
 
             var aesCtr = new aes.ModeOfOperation.ctr(key, counter);
 
-            return new arrayify(aesCtr.decrypt(ciphertext));
+            return arrayify(aesCtr.decrypt(ciphertext));
         }
 
         return null;
@@ -153,6 +163,7 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
         }
 
         var privateKey = decrypt(key.slice(0, 16), ciphertext);
+        var mnemonicKey = key.slice(32, 64);
 
         if (!privateKey) {
             reject(new Error('unsupported cipher'));
@@ -165,6 +176,28 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
             return null;
         }
 
+        // Version 0.1 x-ethers metadata must contain an encrypted mnemonic phrase
+        if (searchPath(data, 'x-ethers/version') === '0.1') {
+            var mnemonicCiphertext = arrayify(searchPath(data, 'x-ethers/mnemonicCiphertext'), 'x-ethers/mnemonicCiphertext');
+            var mnemonicIv = arrayify(searchPath(data, 'x-ethers/mnemonicCounter'), 'x-ethers/mnemonicCounter');
+
+            var mnemonicCounter = new aes.Counter(mnemonicIv);
+            var mnemonicAesCtr = new aes.ModeOfOperation.ctr(mnemonicKey, mnemonicCounter);
+
+            var path = searchPath(data, 'x-ethers/path') || defaultPath;
+
+            var entropy = arrayify(mnemonicAesCtr.decrypt(mnemonicCiphertext));
+            var mnemonic = HDNode.entropyToMnemonic(entropy);
+
+            if (HDNode.fromMnemonic(mnemonic).derivePath(path).privateKey != utils.hexlify(privateKey)) {
+                reject(new Error('mnemonic mismatch'));
+                return null;
+            }
+
+            signingKey.mnemonic = mnemonic;
+            signingKey.path = path;
+        }
+
         return signingKey;
     }
 
@@ -194,7 +227,7 @@ utils.defineProperty(secretStorage, 'decrypt', function(json, password, progress
                     return;
                 }
 
-                scrypt(password, salt, N, r, p, dkLen, function(error, progress, key) {
+                scrypt(password, salt, N, r, p, 64, function(error, progress, key) {
                     if (error) {
                         error.progress = progress;
                         reject(error);
@@ -265,11 +298,33 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
     if (privateKey instanceof SigningKey) {
         privateKey = privateKey.privateKey;
     }
-    privateKey = utils.arrayify(privateKey, 'private key');
+    privateKey = arrayify(privateKey, 'private key');
     if (privateKey.length !== 32) { throw new Error('invalid private key'); }
 
     password = getPassword(password);
 
+    var entropy = options.entropy;
+    if (options.mnemonic) {
+        if (entropy) {
+            if (HDNode.entropyToMnemonic(entropy) !== options.mnemonic) {
+                throw new Error('entropy and mnemonic mismatch');
+            }
+        } else {
+            entropy = HDNode.mnemonicToEntropy(options.mnemonic);
+        }
+    }
+    if (entropy) {
+        entropy = arrayify(entropy, 'entropy');
+    }
+
+    var path = options.path;
+    if (entropy && !path) {
+        path = defaultPath;
+    }
+
+    var client = options.client;
+    if (!client) { client = "ethers.js"; }
+
     // Check/generate the salt
     var salt = options.salt;
     if (salt) {
@@ -283,13 +338,17 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
     if (options.iv) {
         iv = arrayify(options.iv, 'iv');
         if (iv.length !== 16) { throw new Error('invalid iv'); }
+    } else {
+       iv = utils.randomBytes(16);
     }
 
     // Override the uuid
     var uuidRandom = options.uuid;
     if (uuidRandom) {
-        uuidRandom = utils.arrayify(uuidRandom, 'uuid');
+        uuidRandom = arrayify(uuidRandom, 'uuid');
         if (uuidRandom.length !== 16) { throw new Error('invalid uuid'); }
+    } else {
+        uuidRandom = utils.randomBytes(16);
     }
 
     // Override the scrypt password-based key derivation function parameters
@@ -304,8 +363,7 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
 
         // We take 64 bytes:
         //   - 32 bytes   As normal for the Web3 secret storage (derivedKey, macPrefix)
-        //   - 16 bytes   The initialization vector
-        //   - 16 bytes   The UUID random bytes
+        //   - 32 bytes   AES key to encrypt mnemonic with (required here to be Ethers Wallet)
         scrypt(password, salt, N, r, p, 64, function(error, progress, key) {
             if (error) {
                 error.progress = progress;
@@ -314,15 +372,12 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
             } else if (key) {
                 key = arrayify(key);
 
-                // These will be used to encrypt the wallet (as per Web3 secret storage)
+                // This will be used to encrypt the wallet (as per Web3 secret storage)
                 var derivedKey = key.slice(0, 16);
                 var macPrefix = key.slice(16, 32);
 
-                // Get the initialization vector
-                if (!iv) { iv = key.slice(32, 48); }
-
-                // Get the UUID random data
-                if (!uuidRandom) { uuidRandom = key.slice(48, 64); }
+                // This will be used to encrypt the mnemonic phrase (if any)
+                var mnemonicKey = key.slice(32, 64);
 
                 // Get the address for this private key
                 var address = (new SigningKey(privateKey)).address;
@@ -338,7 +393,7 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
                 // See: https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition
                 var data = {
                     address: address.substring(2).toLowerCase(),
-                    id: uuid.v4({random: uuidRandom}),
+                    id: uuid.v4({ random: uuidRandom }),
                     version: 3,
                     Crypto: {
                         cipher: 'aes-128-ctr',
@@ -358,6 +413,29 @@ utils.defineProperty(secretStorage, 'encrypt', function(privateKey, password, op
                     }
                 };
 
+                // If we have a mnemonic, encrypt it into the JSON wallet
+                if (entropy) {
+                    var mnemonicIv = utils.randomBytes(16);
+                    var mnemonicCounter = new aes.Counter(mnemonicIv);
+                    var mnemonicAesCtr = new aes.ModeOfOperation.ctr(mnemonicKey, mnemonicCounter);
+                    var mnemonicCiphertext = utils.arrayify(mnemonicAesCtr.encrypt(entropy));
+                    var now = new Date();
+                    var timestamp = (now.getUTCFullYear() + '-' +
+                                     zpad(now.getUTCMonth() + 1, 2) + '-' +
+                                     zpad(now.getUTCDate(), 2) + 'T' +
+                                     zpad(now.getUTCHours(), 2) + '-' +
+                                     zpad(now.getUTCMinutes(), 2) + '-' +
+                                     zpad(now.getUTCSeconds(), 2) + '.0Z'
+                                    );
+                    data['x-ethers'] = {
+                        client: client,
+                        gethFilename: ('UTC--' + timestamp + '--' + data.address),
+                        mnemonicCounter: utils.hexlify(mnemonicIv).substring(2),
+                        mnemonicCiphertext: utils.hexlify(mnemonicCiphertext).substring(2),
+                        version: "0.1"
+                    };
+                }
+
                 if (progressCallback) { progressCallback(1); }
                 resolve(JSON.stringify(data));
 
diff --git a/wallet/wallet.js b/wallet/wallet.js
index 0b105ac57..ef0244edd 100644
--- a/wallet/wallet.js
+++ b/wallet/wallet.js
@@ -331,6 +331,17 @@ utils.defineProperty(Wallet.prototype, 'encrypt', function(password, options, pr
 
     if (!options) { options = {}; }
 
+    if (this.mnemonic) {
+        // Make sure we don't accidentally bubble the mnemonic up the call-stack
+        var safeOptions = {};
+        for (var key in options) { safeOptions[key] = options[key]; }
+        options = safeOptions;
+
+        // Set the mnemonic and path
+        options.mnemonic = this.mnemonic;
+        options.path = this.path
+    }
+
     return secretStorage.encrypt(this.privateKey, password, options, progressCallback);
 });
 
@@ -349,6 +360,7 @@ utils.defineProperty(Wallet, 'createRandom', function(options) {
     if (options.extraEntropy) {
         entropy = utils.keccak256(utils.concat([entropy, options.extraEntropy])).substring(0, 34);
     }
+
     var mnemonic = HDNode.entropyToMnemonic(entropy);
     return Wallet.fromMnemonic(mnemonic, options.path);
 });
@@ -372,7 +384,12 @@ utils.defineProperty(Wallet, 'fromEncryptedWallet', function(json, password, pro
         } else if (secretStorage.isValidWallet(json)) {
 
             secretStorage.decrypt(json, password, progressCallback).then(function(signingKey) {
-                resolve(new Wallet(signingKey));
+                var wallet = new Wallet(signingKey);
+                if (signingKey.mnemonic && signingKey.path) {
+                    utils.defineProperty(wallet, 'mnemonic', signingKey.mnemonic);
+                    utils.defineProperty(wallet, 'path', signingKey.path);
+                }
+                resolve(wallet);
             }, function(error) {
                 reject(error);
             });