Merge pull request #1005 from MetaMask/dev

Merge dev into master!

1 files changed, 82 insertions, 0 deletions

diff --git a/app/scripts/keyrings/simple.js b/app/scripts/keyrings/simple.js
new file mode 100644
index 000000000..6b16137ae
--- /dev/null
+++ b/app/scripts/keyrings/simple.js
@@ -0,0 +1,82 @@
+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')
+
+class SimpleKeyring extends EventEmitter {
+
+  /* PUBLIC METHODS */
+
+  constructor (opts) {
+    super()
+    this.type = type
+    this.opts = opts || {}
+    this.wallets = []
+  }
+
+  serialize () {
+    return Promise.resolve(this.wallets.map(w => w.getPrivateKey().toString('hex')))
+  }
+
+  deserialize (privateKeys = []) {
+    this.wallets = privateKeys.map((privateKey) => {
+      const stripped = ethUtil.stripHexPrefix(privateKey)
+      const buffer = new Buffer(stripped, 'hex')
+      const wallet = Wallet.fromPrivateKey(buffer)
+      return wallet
+    })
+    return Promise.resolve()
+  }
+
+  addAccounts (n = 1) {
+    var newWallets = []
+    for (var i = 0; i < n; i++) {
+      newWallets.push(Wallet.generate())
+    }
+    this.wallets = this.wallets.concat(newWallets)
+    const hexWallets = newWallets.map(w => ethUtil.bufferToHex(w.getAddress()))
+    return Promise.resolve(hexWallets)
+  }
+
+  getAccounts () {
+    return Promise.resolve(this.wallets.map(w => ethUtil.bufferToHex(w.getAddress())))
+  }
+
+  // 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 Promise.resolve(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 Promise.resolve(rawMsgSig)
+  }
+
+  exportAccount (address) {
+    const wallet = this._getWalletForAccount(address)
+    return Promise.resolve(wallet.getPrivateKey().toString('hex'))
+  }
+
+
+  /* PRIVATE METHODS */
+
+  _getWalletForAccount (account) {
+    let wallet = this.wallets.find(w => ethUtil.bufferToHex(w.getAddress()) === account)
+    if (!wallet) throw new Error('Simple Keyring - Unable to find matching address.')
+    return wallet
+  }
+
+}
+
+SimpleKeyring.type = type
+module.exports = SimpleKeyring