aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/scripts/keyring-controller.js4
-rw-r--r--app/scripts/keyrings/hd.js67
-rw-r--r--app/scripts/keyrings/simple.js21
-rw-r--r--test/unit/account-link-test.js4
-rw-r--r--test/unit/keyrings/hd-test.js8
-rw-r--r--test/unit/keyrings/simple-test.js6
6 files changed, 65 insertions, 45 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index cf761c88c..fdef9d7b3 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -67,7 +67,7 @@ module.exports = class KeyringController extends EventEmitter {
currentFiat: this.configManager.getCurrentFiat(),
conversionRate: this.configManager.getConversionRate(),
conversionDate: this.configManager.getConversionDate(),
- keyringTypes: this.keyringTypes.map((krt) => krt.type()),
+ keyringTypes: this.keyringTypes.map(krt => krt.type),
identities: this.identities,
}
}
@@ -312,7 +312,7 @@ module.exports = class KeyringController extends EventEmitter {
getKeyringClassForType (type) {
const Keyring = this.keyringTypes.reduce((res, kr) => {
- if (kr.type() === type) {
+ if (kr.type === type) {
return kr
} else {
return res
diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js
index b98f29187..a28ef6736 100644
--- a/app/scripts/keyrings/hd.js
+++ b/app/scripts/keyrings/hd.js
@@ -2,17 +2,17 @@ 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'
+// *Internal Deps
+const sigUtil = require('../lib/sig-util')
+// Options:
const hdPathString = `m/44'/60'/0'/0`
+const type = 'HD Key Tree'
-module.exports = class HdKeyring extends EventEmitter {
+class HdKeyring extends EventEmitter {
- static type () {
- return type
- }
+ /* PUBLIC METHODS */
constructor (opts = {}) {
super()
@@ -20,6 +20,13 @@ module.exports = class HdKeyring extends EventEmitter {
this.deserialize(opts)
}
+ serialize () {
+ return {
+ mnemonic: this.mnemonic,
+ numberOfAccounts: this.wallets.length,
+ }
+ }
+
deserialize (opts = {}) {
this.opts = opts || {}
this.wallets = []
@@ -27,7 +34,7 @@ module.exports = class HdKeyring extends EventEmitter {
this.root = null
if ('mnemonic' in opts) {
- this.initFromMnemonic(opts.mnemonic)
+ this._initFromMnemonic(opts.mnemonic)
}
if ('numberOfAccounts' in opts) {
@@ -35,28 +42,9 @@ module.exports = class HdKeyring extends EventEmitter {
}
}
- 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())
+ this._initFromMnemonic(bip39.generateMnemonic())
}
const oldLen = this.wallets.length
@@ -76,7 +64,7 @@ module.exports = class HdKeyring extends EventEmitter {
// tx is an instance of the ethereumjs-transaction class.
signTransaction (address, tx) {
- const wallet = this.getWalletForAccount(address)
+ const wallet = this._getWalletForAccount(address)
var privKey = wallet.getPrivateKey()
tx.sign(privKey)
return tx
@@ -84,7 +72,7 @@ module.exports = class HdKeyring extends EventEmitter {
// For eth_sign, we need to sign transactions:
signMessage (withAccount, data) {
- const wallet = this.getWalletForAccount(withAccount)
+ const wallet = this._getWalletForAccount(withAccount)
const message = ethUtil.removeHexPrefix(data)
var privKey = wallet.getPrivateKey()
var msgSig = ethUtil.ecsign(new Buffer(message, 'hex'), privKey)
@@ -92,10 +80,29 @@ module.exports = class HdKeyring extends EventEmitter {
return rawMsgSig
}
- getWalletForAccount (account) {
+ exportAccount (address) {
+ const wallet = this._getWalletForAccount(address)
+ return wallet.getPrivateKey().toString('hex')
+ }
+
+
+ /* PRIVATE METHODS */
+
+ _initFromMnemonic (mnemonic) {
+ this.mnemonic = mnemonic
+ const seed = bip39.mnemonicToSeed(mnemonic)
+ this.hdWallet = hdkey.fromMasterSeed(seed)
+ this.root = this.hdWallet.derivePath(hdPathString)
+ }
+
+
+ _getWalletForAccount (account) {
return this.wallets.find((w) => {
const address = w.getAddress().toString('hex')
return ((address === account) || (sigUtil.normalize(address) === account))
})
}
}
+
+HdKeyring.type = type
+module.exports = HdKeyring
diff --git a/app/scripts/keyrings/simple.js b/app/scripts/keyrings/simple.js
index ee743bc03..4fdccc4f7 100644
--- a/app/scripts/keyrings/simple.js
+++ b/app/scripts/keyrings/simple.js
@@ -4,7 +4,9 @@ const ethUtil = require('ethereumjs-util')
const type = 'Simple Key Pair'
const sigUtil = require('../lib/sig-util')
-module.exports = class SimpleKeyring extends EventEmitter {
+class SimpleKeyring extends EventEmitter {
+
+ /* PUBLIC METHODS */
static type () {
return type
@@ -44,7 +46,7 @@ module.exports = class SimpleKeyring extends EventEmitter {
// tx is an instance of the ethereumjs-transaction class.
signTransaction (address, tx) {
- const wallet = this.getWalletForAccount(address)
+ const wallet = this._getWalletForAccount(address)
var privKey = wallet.getPrivateKey()
tx.sign(privKey)
return tx
@@ -52,7 +54,7 @@ module.exports = class SimpleKeyring extends EventEmitter {
// For eth_sign, we need to sign transactions:
signMessage (withAccount, data) {
- const wallet = this.getWalletForAccount(withAccount)
+ const wallet = this._getWalletForAccount(withAccount)
const message = ethUtil.removeHexPrefix(data)
var privKey = wallet.getPrivateKey()
var msgSig = ethUtil.ecsign(new Buffer(message, 'hex'), privKey)
@@ -60,8 +62,19 @@ module.exports = class SimpleKeyring extends EventEmitter {
return rawMsgSig
}
- getWalletForAccount (account) {
+ exportAccount (address) {
+ const wallet = this._getWalletForAccount(address)
+ return wallet.getPrivateKey().toString('hex')
+ }
+
+
+ /* PRIVATE METHODS */
+
+ _getWalletForAccount (account) {
return this.wallets.find(w => w.getAddress().toString('hex') === account)
}
}
+
+SimpleKeyring.type = type
+module.exports = SimpleKeyring
diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js
index 08d190f71..39889b6be 100644
--- a/test/unit/account-link-test.js
+++ b/test/unit/account-link-test.js
@@ -3,8 +3,8 @@ var linkGen = require('../../ui/lib/account-link')
describe('account-link', function() {
- it('adds testnet prefix to ropsten test network', function() {
- var result = linkGen('account', '3')
+ it('adds testnet prefix to morden test network', function() {
+ var result = linkGen('account', '2')
assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected')
assert.notEqual(result.indexOf('account'), -1, 'account included')
})
diff --git a/test/unit/keyrings/hd-test.js b/test/unit/keyrings/hd-test.js
index c22ffc913..bec1a8134 100644
--- a/test/unit/keyrings/hd-test.js
+++ b/test/unit/keyrings/hd-test.js
@@ -27,9 +27,9 @@ describe('hd-keyring', function() {
assert.equal(accounts[1], secondAcct)
})
- describe('Keyring.type()', function() {
- it('is a class method that returns the type string.', function() {
- const type = HdKeyring.type()
+ describe('Keyring.type', function() {
+ it('is a class property that returns the type string.', function() {
+ const type = HdKeyring.type
assert.equal(typeof type, 'string')
})
})
@@ -37,7 +37,7 @@ describe('hd-keyring', function() {
describe('#type', function() {
it('returns the correct value', function() {
const type = keyring.type
- const correct = HdKeyring.type()
+ const correct = HdKeyring.type
assert.equal(type, correct)
})
})
diff --git a/test/unit/keyrings/simple-test.js b/test/unit/keyrings/simple-test.js
index ba000a7a8..96a2fdcf0 100644
--- a/test/unit/keyrings/simple-test.js
+++ b/test/unit/keyrings/simple-test.js
@@ -13,9 +13,9 @@ describe('simple-keyring', function() {
keyring = new SimpleKeyring()
})
- describe('Keyring.type()', function() {
- it('is a class method that returns the type string.', function() {
- const type = SimpleKeyring.type()
+ describe('Keyring.type', function() {
+ it('is a class property that returns the type string.', function() {
+ const type = SimpleKeyring.type
assert.equal(type, TYPE_STR)
})
})
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:36:42 +0800