From 8335ee268fd27be0efcf8371465c14f63a05db96 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 1 Dec 2016 16:05:56 -0300 Subject: [PATCH 1/3] fix tx history download --- src/js/services/walletService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 3e5da9097..67071969a 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -312,7 +312,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim return tx.txid != endingTxid; }); - return cb(null, res, res.length == limit); + return cb(null, res, res.length >= limit); }); }; From 061e2221847ecbe6edd6fc863ca30a8978d39b5c Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 1 Dec 2016 16:26:44 -0300 Subject: [PATCH 2/3] modify httprequest timeout --- angular-bitcore-wallet-client/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/angular-bitcore-wallet-client/index.js b/angular-bitcore-wallet-client/index.js index a7d0c09d6..0765b6df0 100644 --- a/angular-bitcore-wallet-client/index.js +++ b/angular-bitcore-wallet-client/index.js @@ -36,6 +36,7 @@ bwcModule.provider("bwcService", function() { var bwc = new Client({ baseUrl: opts.bwsurl || 'https://bws.bitpay.com/bws/api', verbose: opts.verbose, + timeout: 100000, transports: ['polling'], }); if (walletData) From 884ff75f5acf1c6146593c9185526c6e2af326ff Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 1 Dec 2016 16:54:12 -0300 Subject: [PATCH 3/3] add history download retry if err --- src/js/services/walletService.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index 67071969a..b1033478d 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -403,7 +403,16 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim function getNewTxs(newTxs, skip, cb) { getTxsFromServer(wallet, skip, endingTxid, requestLimit, function(err, res, shouldContinue) { - if (err) return cb(err); + if (err) { + $log.warn('BWS Error:' + err); //TODO + if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) { + log.info('Retrying history download in 5 secs...'); + return $timeout(function() { + return getNewTxs(newTxs, skip, cb); + }, 5000); + }; + return cb(err); + } newTxs = newTxs.concat(processNewTxs(wallet, lodash.compact(res)));