diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-01-06 04:51:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-06 04:51:12 +0800 |
commit | 4e62ae98bd7c62ef0618c4c5e88569b86d1bffec (patch) | |
tree | e1cdd6bf33af4da4d3a21de0018d51b33976c43c /app/scripts/keyring-controller.js | |
parent | af61bb90653b873cba6678db43dc4997cb47b505 (diff) | |
parent | 906c3882bb426985b403e744727f3a2071eabce7 (diff) | |
download | tangerine-wallet-browser-4e62ae98bd7c62ef0618c4c5e88569b86d1bffec.tar.gz tangerine-wallet-browser-4e62ae98bd7c62ef0618c4c5e88569b86d1bffec.tar.zst tangerine-wallet-browser-4e62ae98bd7c62ef0618c4c5e88569b86d1bffec.zip |
Merge branch 'dev' into network-indicator-refactor
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index 92429f7f5..c58be0aae 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -316,20 +316,16 @@ module.exports = class KeyringController extends EventEmitter { // // This method signs tx and returns a promise for // TX Manager to update the state after signing - signTransaction (ethTx, selectedAddress, txId, cb) { - try { - const address = normalize(selectedAddress) - return this.getKeyringForAccount(address) - .then((keyring) => { - return keyring.signTransaction(address, ethTx) - }).then((tx) => { - this.emit(`${txId}:signed`, {tx, txId, cb}) - }) - } catch (e) { - cb(e) - } - } + signTransaction (ethTx, selectedAddress, txId) { + const address = normalize(selectedAddress) + return this.getKeyringForAccount(address) + .then((keyring) => { + return keyring.signTransaction(address, ethTx) + }).then((tx) => { + return {tx, txId} + }) + } // Add Unconfirmed Message // @object msgParams // @function cb |