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

Show GAP error and returns the latest address

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-05-29 17:09:21 -03:00
commit 02eb9561b7
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app-template/package-template.json
View file

@ -56,7 +56,7 @@
"bezier-easing": "^2.0.3", "bezier-easing": "^2.0.3",
"bhttp": "^1.2.1", "bhttp": "^1.2.1",
"bitauth": "^0.2.1", "bitauth": "^0.2.1",
"bitcore-wallet-client": "5.2.0", "bitcore-wallet-client": "5.2.1",
"bower": "^1.7.9", "bower": "^1.7.9",
"cordova-android": "5.1.1", "cordova-android": "5.1.1",
"cordova-custom-config": "^3.0.5", "cordova-custom-config": "^3.0.5",

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

@ -836,13 +836,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
wallet.createAddress({}, function(err, addr) { wallet.createAddress({}, function(err, addr) {
if (err) { if (err) {
var prefix = gettextCatalog.getString('Could not create address'); var prefix = gettextCatalog.getString('Could not create address');
if (err.error && err.error.match(/locked/gi)) { if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
$log.debug(err.error); $log.warn(err);
return $timeout(function() { return $timeout(function() {
createAddress(wallet, cb); createAddress(wallet, cb);
}, 5000); }, 5000);
} else if (err.message && err.message == 'MAIN_ADDRESS_GAP_REACHED') { } else if (err instanceof errors.MAIN_ADDRESS_GAP_REACHED || (err.message && err.message == 'MAIN_ADDRESS_GAP_REACHED')) {
$log.warn(err.message); $log.warn(err);
prefix = null; prefix = null;
wallet.getMainAddresses({ wallet.getMainAddresses({
reverse: true, reverse: true,