Merge branch 'dev' into i831-AddRopsten-Dev

2 files changed, 168 insertions, 0 deletions

diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js
new file mode 100644
index 000000000..b98f29187
--- /dev/null
+++ b/app/scripts/keyrings/hd.js
@@ -0,0 +1,101 @@
+const EventEmitter = require('events').EventEmitter
+const hdkey = require('ethereumjs-wallet/hdkey')
+const bip39 = require('bip39')
+const ethUtil = require('ethereumjs-util')
+const sigUtil = require('../lib/sig-util')
+
+const type = 'HD Key Tree'
+
+const hdPathString = `m/44'/60'/0'/0`
+
+module.exports = class HdKeyring extends EventEmitter {
+
+  static type () {
+    return type
+  }
+
+  constructor (opts = {}) {
+    super()
+    this.type = type
+    this.deserialize(opts)
+  }
+
+  deserialize (opts = {}) {
+    this.opts = opts || {}
+    this.wallets = []
+    this.mnemonic = null
+    this.root = null
+
+    if ('mnemonic' in opts) {
+      this.initFromMnemonic(opts.mnemonic)
+    }
+
+    if ('numberOfAccounts' in opts) {
+      this.addAccounts(opts.numberOfAccounts)
+    }
+  }
+
+  initFromMnemonic (mnemonic) {
+    this.mnemonic = mnemonic
+    const seed = bip39.mnemonicToSeed(mnemonic)
+    this.hdWallet = hdkey.fromMasterSeed(seed)
+    this.root = this.hdWallet.derivePath(hdPathString)
+  }
+
+  serialize () {
+    return {
+      mnemonic: this.mnemonic,
+      numberOfAccounts: this.wallets.length,
+    }
+  }
+
+  exportAccount (address) {
+    const wallet = this.getWalletForAccount(address)
+    return wallet.getPrivateKey().toString('hex')
+  }
+
+  addAccounts (numberOfAccounts = 1) {
+    if (!this.root) {
+      this.initFromMnemonic(bip39.generateMnemonic())
+    }
+
+    const oldLen = this.wallets.length
+    const newWallets = []
+    for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {
+      const child = this.root.deriveChild(i)
+      const wallet = child.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) => {
+      const address = w.getAddress().toString('hex')
+      return ((address === account) || (sigUtil.normalize(address) === account))
+    })
+  }
+}
diff --git a/app/scripts/keyrings/simple.js b/app/scripts/keyrings/simple.js
new file mode 100644
index 000000000..ee743bc03
--- /dev/null
+++ b/app/scripts/keyrings/simple.js
@@ -0,0 +1,67 @@
+const EventEmitter = require('events').EventEmitter
+const Wallet = require('ethereumjs-wallet')
+const ethUtil = require('ethereumjs-util')
+const type = 'Simple Key Pair'
+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 = []
+  }
+
+  serialize () {
+    return this.wallets.map(w => w.getPrivateKey().toString('hex'))
+  }
+
+  deserialize (wallets = []) {
+    this.wallets = wallets.map((w) => {
+      var b = new Buffer(w, 'hex')
+      const wallet = Wallet.fromPrivateKey(b)
+      return wallet
+    })
+  }
+
+  addAccounts (n = 1) {
+    var newWallets = []
+    for (var i = 0; i < n; i++) {
+      newWallets.push(Wallet.generate())
+    }
+    this.wallets = this.wallets.concat(newWallets)
+    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)
+  }
+
+}