BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3950 from matiu/opt/feelevel 

fail if fee level cannot be get
This commit is contained in:
Gustavo Maximiliano Cortez 2016-03-04 17:47:45 -03:00
parent c430717651 667e70d7f6
commit b7c202ec60
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/js/services/feeService.js
View File

@ -17,17 +17,18 @@ angular.module('copayApp.services').factory('feeService', function($log, profile
root.getCurrentFeeValue = function(cb) { root.getCurrentFeeValue = function(cb) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;
var feeLevel = root.getCurrentFeeLevel(); var feeLevel = root.getCurrentFeeLevel();
// static fee
var fee = 10000;
fc.getFeeLevels(fc.credentials.network, function(err, levels) { fc.getFeeLevels(fc.credentials.network, function(err, levels) {
if (err) { if (err)
return cb({message: 'Could not get dynamic fee. Using static 10000sat'}, fee); return cb({message: 'Could not get dynamic fee'});
}
else { var feeLevelValue = lodash.find(levels, { level: feeLevel });
fee = lodash.find(levels, { level: feeLevel }).feePerKB; if (!feeLevelValue || ! feeLevelValue.feePerKB)
$log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT'); return cb({message: 'Could not get dynamic fee for level: ' + feeLevel});
return cb(null, fee);
} var fee = feeLevel.feePerKB;
$log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT');
return cb(null, fee);
}); });
}; };

3
src/js/services/txService.js
View File

@ -103,7 +103,8 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr
}; };
getFee(function(err, feePerKb) { getFee(function(err, feePerKb) {
if (err) $log.debug(err); if (err) return cb(err);
opts.feePerKb = feePerKb; opts.feePerKb = feePerKb;
opts.excludeUnconfirmedUtxos = currentSpendUnconfirmed ? false : true; opts.excludeUnconfirmedUtxos = currentSpendUnconfirmed ? false : true;
fc.createTxProposal(opts, function(err, txp) { fc.createTxProposal(opts, function(err, txp) {