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

To debug sign procedure (#4151)

Browse source 
* Should be considering the existence of a property and not its value. (#4139)

* BETA to debug sign test on Android

* add more logs

* 1.11.4

* and even more logs...

* 1.11.5

* better log messages

* fix log decorator for mobile

* fix android-prod

* 1.11.6
This commit is contained in:
Matias Alejo Garcia 2016-04-29 12:14:09 -03:00 • committed by Gustavo Maximiliano Cortez
commit 8b61189f85
11 changed files with 82 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/js/services/txService.js
View file

@ -72,6 +72,7 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
};
root.prepare = function(opts, cb) {
$log.info("at .prepare");
opts = opts || {};
var fc = opts.selectedClient || profileService.focusedClient;
if (!fc.canSign() && !fc.isPrivKeyExternal())
@ -79,12 +80,14 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
root.checkTouchId(opts, function(err) {
if (err) {
$log.warn('CheckTouchId error:', err);
return cb(err);
};
profileService.unlockFC(opts, function(err) {
if (err) {
return cb(bwsError.msg(err));
$log.warn("prepare/unlockFC error:", err);
return cb(err);
};
return cb();
@ -176,6 +179,7 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
};
root.sign = function(txp, opts, cb) {
$log.info('at .sign');
opts = opts || {};
var fc = opts.selectedClient || profileService.focusedClient;
@ -191,14 +195,26 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
return cb(msg);
}
} else {
fc.signTxProposal(txp, function(err, signedTxp) {
profileService.lockFC();
return cb(err, signedTxp);
});
txp.signatures = null;
$log.info('at .sign: (isEncrypted):', fc.isPrivKeyEncrypted());
$log.info('txp BEFORE:', txp);
try {
fc.signTxProposal(txp, function(err, signedTxp) {
$log.info('txp AFTER:',err, signedTxp);
profileService.lockFC();
return cb(err, signedTxp);
});
} catch (e) {
$log.warn('Error at signTxProposal:', e);
return cb(e);
}
}
};
root.signAndBroadcast = function(txp, opts, cb) {
$log.info('at .signAndBroadcast');
opts = opts || {};
reportSigningStatus(opts);
@ -234,12 +250,14 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
root.prepareAndSignAndBroadcast = function(txp, opts, cb) {
opts = opts || {};
$log.info('at .prepareSignAndBroadcast');
root.prepare(opts, function(err) {
if (err) {
$log.warn('Prepare error:' + err);
stopReport(opts);
return cb(err);
};
reportSigningStatus(opts);
root.signAndBroadcast(txp, opts, function(err, txp) {
if (err) {
stopReport(opts);