RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "use big numbers when calculating fee."

Browse Source 
This reverts commit a057dc4064.
This commit is contained in:
Christopher Jeffrey 2015-12-23 02:42:57 -08:00
parent a057dc4064
commit 2f6f3e11b1
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/bcoin/tx.js
View File

@ -649,7 +649,7 @@ TX.prototype.maxSize = function maxSize() {
} }
}, this); }, this);
return new bn(size); return size;
}; };
TX.prototype.utxos = function utxos(unspent) { TX.prototype.utxos = function utxos(unspent) {
@ -657,10 +657,10 @@ TX.prototype.utxos = function utxos(unspent) {
var cost = this.funds('out'); var cost = this.funds('out');
// Use initial fee for starters // Use initial fee for starters
var fee = new bn(1); var fee = 1;
// total = cost + fee // total = cost + fee
var total = cost.addn(TX.fee); var total = cost.add(new bn(TX.fee));
var inputs = this.inputs.slice(); var inputs = this.inputs.slice();
var utxos = []; var utxos = [];
@ -691,11 +691,9 @@ TX.prototype.utxos = function utxos(unspent) {
// Calculate maximum possible size after signing // Calculate maximum possible size after signing
byteSize = this.maxSize(); byteSize = this.maxSize();
addFee = byteSize.modn(1024) === 0 addFee = Math.ceil(byteSize / 1024) - fee;
? byteSize.divn(1024).sub(fee) total.iadd(new bn(addFee * TX.fee));
: byteSize.divn(1024).addn(1).sub(fee); fee += addFee;
total.iadd(addFee.muln(TX.fee));
fee.iadd(addFee);
// Failed to get enough funds, add more inputs // Failed to get enough funds, add more inputs
if (this.funds('in').cmp(total) < 0) if (this.funds('in').cmp(total) < 0)
@ -767,26 +765,24 @@ TX.prototype._recalculateFee = function recalculateFee() {
} }
var byteSize = this.maxSize(); var byteSize = this.maxSize();
var newFee = byteSize.modn(1024) === 0 var newFee = Math.ceil(byteSize / 1024) * TX.fee;
? byteSize.divn(1024).muln(TX.fee) var currentFee = this.getFee().toNumber();
: byteSize.divn(1024).addn(1).muln(TX.fee);
var currentFee = this.getFee();
if (newFee.cmp(currentFee) === 0) { if (newFee === currentFee) {
if (!this.changeOutput) if (!this.changeOutput)
this.outputs.pop(); this.outputs.pop();
return; return;
} }
if (newFee.cmp(currentFee) > 0) { if (newFee > currentFee) {
if (output.value.cmp(newFee.sub(currentFee)) < 0) { if (output.value.cmpn(newFee - currentFee) < 0) {
this.outputs.pop(); this.outputs.pop();
this.changeOutput = null; this.changeOutput = null;
return; return;
} }
output.value.isub(newFee.sub(currentFee)); output.value.isubn(newFee - currentFee);
} else { } else {
output.value.iadd(currentFee.sub(newFee)); output.value.iaddn(currentFee - newFee);
} }
if (output.value.cmpn(TX.dust) < 0) { if (output.value.cmpn(TX.dust) < 0) {