aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-13 18:00:11 +0800
committerkumavis <aaron@kumavis.me>2017-01-13 18:00:11 +0800
commit29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb (patch)
treeab5dc7ae04109c0b78a33db14637e71a267c6635 /app/scripts/keyring-controller.js
parentcc5e9aca4fa2a1e78c49be680405d93ac918bccf (diff)
downloadtangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.tar
tangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.tar.gz
tangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.tar.bz2
tangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.tar.lz
tangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.tar.xz
tangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.tar.zst
tangerine-wallet-browser-29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb.zip
background - handle tx finalization in controllers instead of provider-engine
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index d4c0d863e..df2910187 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -317,13 +317,11 @@ 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) {
- const address = normalize(selectedAddress)
- return this.getKeyringForAccount(address)
+ signTransaction (ethTx, _fromAddress) {
+ const fromAddress = normalize(_fromAddress)
+ return this.getKeyringForAccount(fromAddress)
.then((keyring) => {
- return keyring.signTransaction(address, ethTx)
- }).then((tx) => {
- return {tx, txId}
+ return keyring.signTransaction(fromAddress, ethTx)
})
}
// Add Unconfirmed Message