anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

handle error / incomplete on receive

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-15 11:56:59 -03:00
commit 6dba17937f
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
5 changed files with 102 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/js/services/profileService.js
View file

@ -82,8 +82,10 @@ angular.module('copayApp.services')
c.name = config.aliasFor[walletId] || client.credentials.walletName;
c.color = config.colorFor[walletId] || '#4A90E2';
c.network = client.credentials.network;
root.setCustomBWSFlag(c);
c.m = client.credentials.m;
c.n = client.credentials.n;
root.setCustomBWSFlag(c);
root.wallet[walletId] = c;
client.removeAllListeners();
@ -713,18 +715,30 @@ angular.module('copayApp.services')
storageService.storeProfile(root.profile, cb);
};
root.getWallets = function(network, n) {
root.getWallets = function(opts) {
if (opts && !lodash.isObject(opts))
throw "bad argument";
opts = opts || {};
var ret = lodash.values(root.wallet);
if (network) {
if (opts.network) {
ret = lodash.filter(ret, function(x) {
return (x.credentials.network == network);
return (x.credentials.network == opts.network);
});
}
if (n) {
if (opts.n) {
ret = lodash.filter(ret, function(w) {
return (w.credentials.n == n);
return (w.credentials.n == opts.n);
});
}
if (opts.onlyComplete) {
ret = lodash.filter(ret, function(w) {
return w.isComplete();
});
}

9
src/js/services/walletService.js
View file

@ -1,7 +1,7 @@
'use strict';
// DO NOT INCLUDE STORAGE HERE \/ \/
angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, storageService, configService, rateService, uxLanguage, bwcService, $filter) {
angular.module('copayApp.services').factory('walletService', function($log, $timeout, lodash, trezor, ledger, storageService, configService, rateService, uxLanguage, bwcService, $filter, gettextCatalog, bwcError) {
// DO NOT INCLUDE STORAGE HERE ^^
//
//
@ -755,7 +755,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
});
};
root._createAddress = function(wallet, cb) {
var createAddress = function(wallet, cb) {
$log.debug('Creating address for wallet:', wallet.id);
wallet.createAddress({}, function(err, addr) {
@ -764,7 +764,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (err.error && err.error.match(/locked/gi)) {
$log.debug(err.error);
return $timeout(function() {
root._createAddress(walletId, cb);
createAddress(wallet, cb);
}, 5000);
} else if (err.message && err.message == 'MAIN_ADDRESS_GAP_REACHED') {
$log.warn(err.message);
@ -784,6 +784,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
};
root.getAddress = function(wallet, forceNew, cb) {
console.log('[walletService.js.786:wallet:]',wallet, forceNew); //TODO
var firstStep;
if (forceNew) {
@ -802,7 +803,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (addr) return cb(null, addr);
root._createAddress(wallet, function(err, addr) {
createAddress(wallet, function(err, addr) {
if (err) return cb(err);
storageService.storeLastAddress(wallet.id, addr, function() {
if (err) return cb(err);