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

fix create and join bws errors

Browse source
This commit is contained in:
Javier 2015-10-19 17:26:15 -03:00
commit 3d7132861d
7 changed files with 73 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,17 +48,21 @@ angular.module('copayApp.services')
});
};
root.setBaseURL = function(walletId) {
var config = configService.getSync();
var defaults = configService.getDefaults();
bwcService.setBaseUrl(config.bws[walletId] || defaults.bws.url);
bwcService.setTransports(['polling']);
}
root.setWalletClient = function(credentials) {
if (root.walletClients[credentials.walletId] &&
root.walletClients[credentials.walletId].started) {
return;
}
var config = configService.getSync();
var defaults = configService.getDefaults();
bwcService.setBaseUrl(config.bws[credentials.walletId] || defaults.bws.url);
bwcService.setTransports(['polling']);
root.setBaseURL(credentials.walletId);
var client = bwcService.getClient(JSON.stringify(credentials));
root.walletClients[credentials.walletId] = client;
@ -108,7 +112,7 @@ angular.module('copayApp.services')
});
}
root.setWalletClients = function(walletId) {
root.setWalletClients = function() {
var credentials = root.profile.credentials;
lodash.each(credentials, function(credentials) {
root.setWalletClient(credentials);
@ -165,6 +169,9 @@ angular.module('copayApp.services')
root._seedWallet = function(opts, cb) {
opts = opts || {};
if (opts.bwsurl)
bwcService.setBaseUrl(opts.bwsurl);
var walletClient = bwcService.getClient();
var network = opts.networkName || 'livenet';
@ -240,19 +247,36 @@ angular.module('copayApp.services')
}, function(err, secret) {
if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
root.setAndStoreFocus(walletClient.credentials.walletId, function() {
storageService.storeProfile(root.profile, function(err) {
return cb(null, secret, walletClient.credentials.walletId);
});
root.storeData(walletClient, function(err) {
if (err) return cb(err);
return cb(null);
});
})
});
};
root.joinWallet = function(opts, cb) {
root.storeData = function(walletClient, cb) {
var walletId = walletClient.credentials.walletId;
var opts_ = {
bws: {}
};
opts_.bws[walletId] = bwsurl;
configService.set(opts_, function(err) {
if (err) console.log(err);
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
root.setAndStoreFocus(walletId, function() {
storageService.storeProfile(root.profile, function(err) {
if (err) return cb(err);
return cb(null);
});
});
});
}
root.joinWallet = function(opts, bwsurl, cb) {
var walletClient = bwcService.getClient();
$log.debug('Joining Wallet:', opts);
@ -278,19 +302,14 @@ angular.module('copayApp.services')
walletClient.joinWallet(opts.secret, opts.myName || 'me', {}, function(err) {
if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb);
root.profile.credentials.push(JSON.parse(walletClient.export()));
root.setWalletClients();
root.setAndStoreFocus(walletClient.credentials.walletId, function() {
storageService.storeProfile(root.profile, function(err) {
return cb();
});
root.storeData(walletClient, function(err) {
if (err) return cb(err);
return cb(null);
});
})
})
});
});
};
root.getClient = function(walletId) {
return root.walletClients[walletId];
};
@ -341,7 +360,11 @@ angular.module('copayApp.services')
};
root.importWallet = function(str, opts, cb) {
if (opts.bwsurl)
bwcService.setBaseUrl(opts.bwsurl);
var walletClient = bwcService.getClient();
$log.debug('Importing Wallet:', opts);
try {
walletClient.import(str, {
@ -366,7 +389,6 @@ angular.module('copayApp.services')
});
};
root._normalizeMnemonic = function(words) {
var isJA = words.indexOf('\u3000') > -1;
var wordList = words.split(/[\u3000\s]+/);
@ -409,8 +431,6 @@ angular.module('copayApp.services')
});
};
root.create = function(opts, cb) {
$log.info('Creating profile');
configService.get(function(err) {

6
src/js/services/storageService.js
View file

@ -124,7 +124,7 @@ angular.module('copayApp.services')
};
root.storeFocusedWalletId = function(id, cb) {
storage.set('focusedWalletId', id||'', cb);
storage.set('focusedWalletId', id || '', cb);
};
root.getFocusedWalletId = function(cb) {
@ -151,8 +151,8 @@ angular.module('copayApp.services')
storage.get('backup-' + walletId, cb);
};
root.setCleanAndScanAddresses = function(cb) {
storage.set('CleanAndScanAddresses', Date.now(), cb);
root.setCleanAndScanAddresses = function(walletId, cb) {
storage.set('CleanAndScanAddresses', walletId, cb);
};
root.getCleanAndScanAddresses = function(cb) {