diff options
author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-03 09:49:04 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 09:49:04 +0800 |
commit | fe61fcb0fcbee05724b77f9729660c9f692a0cb1 (patch) | |
tree | e81657c2671e25fbbba9e9bc3a62828269c38da5 /app/scripts/keyrings/simple.js | |
parent | 305cda4265e84d520d21c473a796e8f71febc57f (diff) | |
parent | b93cdd428b5013787f78a266bcb5ca84d26b9941 (diff) | |
download | tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.tar tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.tar.gz tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.tar.bz2 tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.tar.lz tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.tar.xz tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.tar.zst tangerine-wallet-browser-fe61fcb0fcbee05724b77f9729660c9f692a0cb1.zip |
Merge branch 'dev' into i897-ReplayProtection
Diffstat (limited to 'app/scripts/keyrings/simple.js')
-rw-r--r-- | app/scripts/keyrings/simple.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/scripts/keyrings/simple.js b/app/scripts/keyrings/simple.js index 8f339cf80..9717f1c45 100644 --- a/app/scripts/keyrings/simple.js +++ b/app/scripts/keyrings/simple.js @@ -19,10 +19,11 @@ class SimpleKeyring extends EventEmitter { return Promise.resolve(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) + 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() |