aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-11-18 05:49:46 +0800
committerDan Finlay <dan@danfinlay.com>2016-11-18 05:49:46 +0800
commitf229d32442f34859be169e38a42ffecdfb8fc48a (patch)
tree274a190850635a4e3e82b07de7da4f74248e9dea /app/scripts/keyring-controller.js
parent161ff62fdcf6f76f7243a1e865dd0cccbc89121f (diff)
downloadtangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.tar
tangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.tar.gz
tangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.tar.bz2
tangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.tar.lz
tangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.tar.xz
tangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.tar.zst
tangerine-wallet-browser-f229d32442f34859be169e38a42ffecdfb8fc48a.zip
Replace old random-id code with incrementing id generator
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 3ebf02c44..5b06de690 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -7,7 +7,6 @@ const ethBinToOps = require('eth-bin-to-ops')
const EthQuery = require('eth-query')
const BN = ethUtil.BN
const Transaction = require('ethereumjs-tx')
-const createId = require('web3-provider-engine/util/random-id')
const autoFaucet = require('./lib/auto-faucet')
const bip39 = require('bip39')
@@ -22,6 +21,8 @@ const keyringTypes = [
HdKeyring,
]
+const createId = require('./lib/random-id')
+
module.exports = class KeyringController extends EventEmitter {
constructor (opts) {