From aa42db1458698371764ee5e2ab75b309b26d1c71 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Mon, 29 Aug 2016 15:49:05 -0300 Subject: [PATCH] bp to walletService --- src/js/controllers/bitpayCard.js | 57 ++----------------------- src/js/controllers/modals/txpDetails.js | 4 -- src/js/controllers/sellGlidera.js | 53 ++++++++++------------- 3 files changed, 25 insertions(+), 89 deletions(-) diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js index b861275e7..9451b38fa 100644 --- a/src/js/controllers/bitpayCard.js +++ b/src/js/controllers/bitpayCard.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $rootScope, $timeout, $log, $ionicModal, lodash, bitpayCardService, configService, profileService, walletService, fingerprintService, ongoingProcess, bwcError, bitcore, pbkdf2Service, moment, platformInfo) { +angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $rootScope, $timeout, $log, $ionicModal, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, pbkdf2Service, moment, platformInfo) { var self = this; var wallet; @@ -205,7 +205,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }; walletService.createTx(wallet, txp, function(err, createdTxp) { - ongoingProcess.set('Processing Transaction...', false); if (err) { self.error = bwcError.msg(err); $timeout(function() { @@ -213,10 +212,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }); return; } - self.confirmTx(createdTxp, function(err, tx) { - ongoingProcess.set('Processing Transaction...', false); + walletService.publishAndSign(createdTxp, function(err, tx) { if (err) { - self.error = bwcError.msg(err); + self.error = err; $timeout(function() { $scope.$digest(); }); @@ -234,55 +232,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi }, 100); }; - this.confirmTx = function(txp, cb) { - - fingerprintService.check(wallet, function(err) { - if (err) { - $log.debug(err); - return cb(err); - } - - walletService.handleEncryptedWallet(wallet, function(err) { - if (err) { - $log.debug(err); - return bwcError.cb(err, null, cb); - } - - ongoingProcess.set('Processing Transaction...', true); - walletService.publishTx(wallet, txp, function(err, publishedTxp) { - if (err) { - $log.debug(err); - return bwcError.cb(err, null, cb); - } - - walletService.signTx(wallet, publishedTxp, function(err, signedTxp) { - walletService.lock(wallet); - if (err) { - $log.debug(err); - walletService.removeTx(wallet, signedTxp, function(err) { - if (err) $log.debug(err); - }); - return bwcError.cb(err, null, cb); - } - - walletService.broadcastTx(wallet, signedTxp, function(err, broadcastedTxp) { - if (err) { - $log.debug(err); - walletService.removeTx(wallet, broadcastedTxp, function(err) { - if (err) $log.debug(err); - }); - return bwcError.cb(err, null, cb); - } - $timeout(function() { - return cb(null, broadcastedTxp); - }, 5000); - }); - }); - }); - }); - }); - }; - this.authenticate = function() { self.error = null; diff --git a/src/js/controllers/modals/txpDetails.js b/src/js/controllers/modals/txpDetails.js index 497a33e95..b426602e6 100644 --- a/src/js/controllers/modals/txpDetails.js +++ b/src/js/controllers/modals/txpDetails.js @@ -48,10 +48,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi }, 10); }; - $scope.$on('$destroy', function() { - walletService.lock($scope.wallet); - }); - $scope.reject = function(txp) { $scope.loading = true; $scope.error = null; diff --git a/src/js/controllers/sellGlidera.js b/src/js/controllers/sellGlidera.js index 66c0f0de0..e50757128 100644 --- a/src/js/controllers/sellGlidera.js +++ b/src/js/controllers/sellGlidera.js @@ -208,53 +208,44 @@ angular.module('copayApp.controllers').controller('sellGlideraController', self.error = err.message ||  bwcError.msg(err); return; } - fingerprintService.check(wallet, function(err) { + walletService.prepare(wallet, txp, function(err, password) { if (err) { self.error = err.message ||  bwcError.msg(err); return; } - - walletService.handleEncryptedWallet(wallet, function(err) { + ongoingProcess.set('signingTx', true); + walletService.publishTx(wallet, createdTxp, function(err, publishedTxp) { if (err) { + ongoingProcess.clear(); self.error = err.message ||  bwcError.msg(err); - return; } - ongoingProcess.set('signingTx', true); - walletService.publishTx(wallet, createdTxp, function(err, publishedTxp) { + walletService.signTx(wallet, publishedTxp, function(err, password, signedTxp) { + walletService.removeTx(wallet, signedTxp, function(err) { + if (err) $log.debug(err); + }); + ongoingProcess.clear(); if (err) { - ongoingProcess.clear(); self.error = err.message ||  bwcError.msg(err); + return; } - - walletService.signTx(wallet, publishedTxp, function(err, signedTxp) { - walletService.lock(wallet); - walletService.removeTx(wallet, signedTxp, function(err) { - if (err) $log.debug(err); - }); + var rawTx = signedTxp.raw; + var data = { + refundAddress: refundAddress, + signedTransaction: rawTx, + priceUuid: self.sellPrice.priceUuid, + useCurrentPrice: self.sellPrice.priceUuid ? false : true, + ip: null + }; + ongoingProcess.set('Seling Bitcoin', true); + glideraService.sell(token, twoFaCode, data, function(err, data) { ongoingProcess.clear(); if (err) { self.error = err.message ||  bwcError.msg(err); return; } - var rawTx = signedTxp.raw; - var data = { - refundAddress: refundAddress, - signedTransaction: rawTx, - priceUuid: self.sellPrice.priceUuid, - useCurrentPrice: self.sellPrice.priceUuid ? false : true, - ip: null - }; - ongoingProcess.set('Seling Bitcoin', true); - glideraService.sell(token, twoFaCode, data, function(err, data) { - ongoingProcess.clear(); - if (err) { - self.error = err.message ||  bwcError.msg(err); - return; - } - self.success = data; - $scope.update(); - }); + self.success = data; + $scope.update(); }); }); });