diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-29 07:19:14 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-29 07:19:14 +0800 |
commit | 9b4f3825e78659148ea2c651c2622b3fb01c41b5 (patch) | |
tree | 44d5a0838a6670db7b32ef893c7e1b3fce5dab47 /app | |
parent | 6eb6968037aeacd9c876912634ca5f4b5287957b (diff) | |
parent | 331d9c91ee42f766fe56e2ebef1d1ad283d6c438 (diff) | |
download | tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.tar tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.tar.gz tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.tar.bz2 tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.tar.lz tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.tar.xz tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.tar.zst tangerine-wallet-browser-9b4f3825e78659148ea2c651c2622b3fb01c41b5.zip |
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/keyring-controller.js | 31 | ||||
-rw-r--r-- | app/scripts/keyrings/hd.js | 86 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 1 |
3 files changed, 111 insertions, 7 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 5e7900b10..3ac101ad8 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -11,8 +11,10 @@ const createId = require('web3-provider-engine/util/random-id') // Keyrings: const SimpleKeyring = require('./keyrings/simple') +const HdKeyring = require('./keyrings/hd') const keyringTypes = [ SimpleKeyring, + HdKeyring, ] module.exports = class KeyringController extends EventEmitter { @@ -67,7 +69,12 @@ module.exports = class KeyringController extends EventEmitter { }) .then((encryptedString) => { this.configManager.setVault(encryptedString) - cb(null, this.getState()) + + // TEMPORARY SINGLE-KEYRING CONFIG: + this.addNewKeyring('HD Key Tree', null, cb) + + // NORMAL BEHAVIOR: + // cb(null, this.getState()) }) .catch((err) => { cb(err) @@ -97,25 +104,35 @@ module.exports = class KeyringController extends EventEmitter { } addNewKeyring(type, opts, cb) { - const i = this.getAccounts().length const Keyring = this.getKeyringClassForType(type) const keyring = new Keyring(opts) const accounts = keyring.addAccounts(1) - accounts.forEach((account) => { - this.loadBalanceAndNickname(account, i) - }) - + this.setupAccounts(accounts) this.keyrings.push(keyring) this.persistAllKeyrings() .then(() => { - cb(this.getState()) + cb(null, this.getState()) }) .catch((reason) => { cb(reason) }) } + addNewAccount(keyRingNum = 0, cb) { + const ring = this.keyrings[keyRingNum] + const accounts = ring.addAccounts(1) + this.setupAccounts(accounts) + cb(null, this.getState()) + } + + setupAccounts(accounts) { + const i = this.getAccounts().length + accounts.forEach((account) => { + this.loadBalanceAndNickname(account, i) + }) + } + // Takes an account address and an iterator representing // the current number of named accounts. loadBalanceAndNickname(account, i) { diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js new file mode 100644 index 000000000..61df8f28e --- /dev/null +++ b/app/scripts/keyrings/hd.js @@ -0,0 +1,86 @@ +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') + +const hdPathString = `m/44'/60'/0'/0` + +module.exports = class HdKeyring 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.root = this.hdWallet.derivePath(hdPathString) + } + + serialize() { + return { + mnemonic: this.mnemonic, + n: this.wallets.length, + } + } + + addAccounts(n = 1) { + if (!this.root) { + this.initFromMnemonic(bip39.generateMnemonic()) + } + + const oldLen = this.wallets.length + const newWallets = [] + 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) + } + 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) + } + +} + diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 9c89d752b..a7d9a8ec2 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -61,6 +61,7 @@ module.exports = class MetamaskController { // forward directly to keyringController createNewVault: keyringController.createNewVault.bind(keyringController), addNewKeyring: keyringController.addNewKeyring.bind(keyringController), + addNewAccount: keyringController.addNewAccount.bind(keyringController), submitPassword: keyringController.submitPassword.bind(keyringController), setSelectedAddress: keyringController.setSelectedAddress.bind(keyringController), approveTransaction: keyringController.approveTransaction.bind(keyringController), |