From f02e02bef845fb4b55dfa315c29da1e0afe9e68c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 27 Oct 2016 16:50:01 -0700
Subject: Add hd wallet keyring

---
 app/scripts/keyrings/hd.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 app/scripts/keyrings/hd.js

(limited to 'app/scripts/keyrings')

diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js
new file mode 100644
index 000000000..a852c9d29
--- /dev/null
+++ b/app/scripts/keyrings/hd.js
@@ -0,0 +1,78 @@
+const EventEmitter = require('events').EventEmitter
+const hdkey = require('ethereumjs-wallet/hdkey')
+const bip39 = require('bip39')
+const ethUtil = require('ethereumjs-util')
+const type = 'HD Key Tree'
+const sigUtil = require('../lib/sig-util')
+
+module.exports = class SimpleKeyring extends EventEmitter {
+
+  static type() {
+    return type
+  }
+
+  constructor(opts) {
+    super()
+    this.type = type
+    this.opts = opts || {}
+    this.wallets = []
+    this.mnemonic = null
+  }
+
+  deserialize({ mnemonic, n }) {
+    this.initFromMnemonic(mnemonic || bip39.generateMnemonic())
+    this.addAccounts(n)
+  }
+
+  initFromMnemonic(mnemonic) {
+    const seed = bip39.mnemonicToSeed(mnemonic)
+    this.mnemonic = mnemonic
+    this.hdWallet = hdkey.fromMasterSeed(seed)
+    this.seed = bip39.mnemonicToSeedHex(seed)
+  }
+
+  serialize() {
+    return {
+      mnemonic: this.mnemonic,
+      n: this.wallets.length,
+    }
+  }
+
+  addAccounts(n = 1) {
+    const newWallets = []
+    for (let i = 0; i < n; i++) {
+      const wallet = this.hdWallet.getWallet()
+      newWallets.push(wallet)
+      this.wallets.push(wallet)
+    }
+    return newWallets.map(w => w.getAddress().toString('hex'))
+  }
+
+  getAccounts() {
+    return this.wallets.map(w => w.getAddress().toString('hex'))
+  }
+
+  // tx is an instance of the ethereumjs-transaction class.
+  signTransaction(address, tx) {
+    const wallet = this.getWalletForAccount(address)
+    var privKey = wallet.getPrivateKey()
+    tx.sign(privKey)
+    return tx
+  }
+
+  // For eth_sign, we need to sign transactions:
+  signMessage(withAccount, data) {
+    const wallet = this.getWalletForAccount(withAccount)
+    const message = ethUtil.removeHexPrefix(data)
+    var privKey = wallet.getPrivateKey()
+    var msgSig = ethUtil.ecsign(new Buffer(message, 'hex'), privKey)
+    var rawMsgSig = ethUtil.bufferToHex(sigUtil.concatSig(msgSig.v, msgSig.r, msgSig.s))
+    return rawMsgSig
+  }
+
+  getWalletForAccount(account) {
+    return this.wallets.find(w => w.getAddress().toString('hex') === account)
+  }
+
+}
+
-- 
cgit v1.2.3


From 2690d1acfd3042f468cb2cd7ccc2dccd63c20cc9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 27 Oct 2016 17:23:26 -0700
Subject: Added hd wallet tests

---
 app/scripts/keyrings/hd.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'app/scripts/keyrings')

diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js
index a852c9d29..61df8f28e 100644
--- a/app/scripts/keyrings/hd.js
+++ b/app/scripts/keyrings/hd.js
@@ -5,7 +5,9 @@ const ethUtil = require('ethereumjs-util')
 const type = 'HD Key Tree'
 const sigUtil = require('../lib/sig-util')
 
-module.exports = class SimpleKeyring extends EventEmitter {
+const hdPathString = `m/44'/60'/0'/0`
+
+module.exports = class HdKeyring extends EventEmitter {
 
   static type() {
     return type
@@ -28,7 +30,7 @@ module.exports = class SimpleKeyring extends EventEmitter {
     const seed = bip39.mnemonicToSeed(mnemonic)
     this.mnemonic = mnemonic
     this.hdWallet = hdkey.fromMasterSeed(seed)
-    this.seed = bip39.mnemonicToSeedHex(seed)
+    this.root = this.hdWallet.derivePath(hdPathString)
   }
 
   serialize() {
@@ -39,9 +41,15 @@ module.exports = class SimpleKeyring extends EventEmitter {
   }
 
   addAccounts(n = 1) {
+    if (!this.root) {
+      this.initFromMnemonic(bip39.generateMnemonic())
+    }
+
+    const oldLen = this.wallets.length
     const newWallets = []
-    for (let i = 0; i < n; i++) {
-      const wallet = this.hdWallet.getWallet()
+    for (let i = oldLen; i < n + oldLen; i++) {
+      const child = this.root.deriveChild(i)
+      const wallet = child.getWallet()
       newWallets.push(wallet)
       this.wallets.push(wallet)
     }
-- 
cgit v1.2.3