Make sure estimateFees in KB isn't below 1

decred · Feb 24, 2016 · f80e2fe · f80e2fe
1 parent 2aaab2c
commit f80e2fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/model/txproposal.js b/lib/model/txproposal.js
@@ -198,7 +198,9 @@ TxProposal.prototype.getEstimatedSize = function() {
 };
 
 TxProposal.prototype.estimateFee = function() {
-  var fee = 5000000 * this.getEstimatedSize() / 1000;
+  var txSize = this.getEstimatedSize() / 1000;
+  txSize = txSize < 1 ? 1 : txSize;
+  var fee = 1000000 * txSize;
 
   this.fee = parseInt(fee.toFixed(0));
 };

diff --git a/lib/server.js b/lib/server.js
@@ -1063,7 +1063,6 @@ WalletService.prototype._selectTxInputs = function(txp, utxosToExclude, cb) {
             return cb();
           }
         } catch (ex) {
-		console.log(serializationOpts);
           log.error('Error building Bitcore transaction', ex);
           return cb(ex);
         }
@@ -1131,7 +1130,6 @@ WalletService.prototype.createTx = function(opts, cb) {
     opts.outputs = _.pick(opts, ['amount', 'toAddress']);
   }
   opts.outputs = [].concat(opts.outputs);
-  console.log(opts.outputs);
   if (!Utils.checkRequired(opts, ['outputs', 'proposalSignature']))
     return cb(new ClientError('Required argument missing'));
 
@@ -1236,7 +1234,6 @@ WalletService.prototype.createTx = function(opts, cb) {
         }
 
         var txp = Model.TxProposal.create(txOpts);
- console.log(txp);
 
         if (!self._clientSupportsTXPv2()) {
           txp.version = '1.0.1';