diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-06-03 07:52:18 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-06-03 07:52:18 +0800 |
commit | 9cc04be5e467ea6f41584c42cc742680163a6fe6 (patch) | |
tree | 1dfa5a964ac95efb3c85a0c5559d1413c6918e94 /app/scripts | |
parent | 01e63d41ede22a7290553f888261583d22b24eda (diff) | |
download | tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.tar tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.tar.gz tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.tar.bz2 tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.tar.lz tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.tar.xz tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.tar.zst tangerine-wallet-browser-9cc04be5e467ea6f41584c42cc742680163a6fe6.zip |
Added seed word recovery to config screen
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/background.js | 8 | ||||
-rw-r--r-- | app/scripts/lib/idStore.js | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index bfd1fc92b..432040c53 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -145,7 +145,7 @@ function setupPublicConfig(stream){ } function setupProviderConnection(stream, originDomain){ - + stream.on('data', function onRpcRequest(payload){ // Append origin to rpc payload payload.origin = originDomain @@ -195,6 +195,8 @@ function setupControllerConnection(stream){ exportAccount: idStore.exportAccount.bind(idStore), revealAccount: idStore.revealAccount.bind(idStore), saveAccountLabel: idStore.saveAccountLabel.bind(idStore), + tryPassword: idStore.tryPassword.bind(idStore), + recoverSeed: idStore.recoverSeed.bind(idStore), }) stream.pipe(dnode).pipe(stream) dnode.on('remote', function(remote){ @@ -246,7 +248,7 @@ function newUnsignedTransaction(txParams, cb){ }) var txId = idStore.addUnconfirmedTransaction(txParams, cb) } else { - addUnconfirmedTx(txParams, cb) + addUnconfirmedTx(txParams, cb) } } @@ -258,7 +260,7 @@ function newUnsignedMessage(msgParams, cb){ }) var msgId = idStore.addUnconfirmedMessage(msgParams, cb) } else { - addUnconfirmedMsg(msgParams, cb) + addUnconfirmedMsg(msgParams, cb) } } diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 4ce4fd6f2..991827603 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -59,6 +59,13 @@ IdentityStore.prototype.createNewVault = function(password, entropy, cb){ }) } +IdentityStore.prototype.recoverSeed = function(cb){ + configManager.setShowSeedWords(true) + if (!this_idmgmt) return cb(new Error('Unauthenticated. Please sign in.')) + var seedWords = this._idmgmt.getSeed() + cb(null, seedWords) +} + IdentityStore.prototype.recoverFromSeed = function(password, seed, cb){ this._createIdmgmt(password, seed, null, (err) => { if (err) return cb(err) @@ -150,7 +157,7 @@ IdentityStore.prototype.setLocked = function(cb){ } IdentityStore.prototype.submitPassword = function(password, cb){ - this._tryPassword(password, (err) => { + this.tryPassword(password, (err) => { if (err) return cb(err) // load identities before returning... this._loadIdentities() @@ -366,7 +373,7 @@ IdentityStore.prototype._mayBeFauceting = function(i) { // keyStore managment - unlocking + deserialization // -IdentityStore.prototype._tryPassword = function(password, cb){ +IdentityStore.prototype.tryPassword = function(password, cb){ this._createIdmgmt(password, null, null, cb) } |