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

Update change on each output or input change

Browse Source
This commit is contained in:
Esteban Ordano 2015-02-04 12:15:43 -03:00
parent bd97f20f1c
commit ed393dcb91
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/transaction/transaction.js
View File

@ -421,11 +421,11 @@ Transaction.prototype.addInput = function(input, outputScript, satoshis) {
*/ */
Transaction.prototype.uncheckedAddInput = function(input) { Transaction.prototype.uncheckedAddInput = function(input) {
$.checkArgumentType(input, Input, 'input'); $.checkArgumentType(input, Input, 'input');
this._changeSetup = false;
this.inputs.push(input); this.inputs.push(input);
if (input.output) { if (input.output) {
this._inputAmount += input.output.satoshis; this._inputAmount += input.output.satoshis;
} }
this._updateChangeOutput();
return this; return this;
}; };
@ -450,7 +450,7 @@ Transaction.prototype.hasAllUtxoInfo = function() {
*/ */
Transaction.prototype.fee = function(amount) { Transaction.prototype.fee = function(amount) {
this._fee = amount; this._fee = amount;
this._changeSetup = false; this._updateChangeOutput();
return this; return this;
}; };
@ -467,7 +467,7 @@ Transaction.prototype.fee = function(amount) {
*/ */
Transaction.prototype.change = function(address) { Transaction.prototype.change = function(address) {
this._change = new Address(address); this._change = new Address(address);
this._changeSetup = false; this._updateChangeOutput();
return this; return this;
}; };
@ -509,8 +509,12 @@ Transaction.prototype.addData = function(value) {
Transaction.prototype.addOutput = function(output) { Transaction.prototype.addOutput = function(output) {
$.checkArgumentType(output, Output, 'output'); $.checkArgumentType(output, Output, 'output');
this._addOutput(output);
this._updateChangeOutput();
};
Transaction.prototype._addOutput = function(output) {
this.outputs.push(output); this.outputs.push(output);
this._changeSetup = false;
this._outputAmount += output.satoshis; this._outputAmount += output.satoshis;
}; };
@ -518,12 +522,7 @@ Transaction.prototype._updateChangeOutput = function() {
if (!this._change) { if (!this._change) {
return; return;
} }
if (this._changeSetup) { this._clearSignatures();
return;
}
if (!_.isUndefined(this._changeSetup)) {
this._clearSignatures();
}
if (!_.isUndefined(this._changeOutput)) { if (!_.isUndefined(this._changeOutput)) {
this.removeOutput(this._changeOutput); this.removeOutput(this._changeOutput);
} }
@ -531,14 +530,13 @@ Transaction.prototype._updateChangeOutput = function() {
var fee = this.getFee(); var fee = this.getFee();
if (available - fee > 0) { if (available - fee > 0) {
this._changeOutput = this.outputs.length; this._changeOutput = this.outputs.length;
this.addOutput(new Output({ this._addOutput(new Output({
script: Script.fromAddress(this._change), script: Script.fromAddress(this._change),
satoshis: available - fee satoshis: available - fee
})); }));
} else { } else {
this._changeOutput = undefined; this._changeOutput = undefined;
} }
this._changeSetup = true;
}; };
Transaction.prototype.getFee = function() { Transaction.prototype.getFee = function() {
@ -606,7 +604,6 @@ Transaction.prototype.removeOutput = function(index) {
*/ */
Transaction.prototype.sign = function(privateKey, sigtype) { Transaction.prototype.sign = function(privateKey, sigtype) {
$.checkState(this.hasAllUtxoInfo()); $.checkState(this.hasAllUtxoInfo());
this._updateChangeOutput();
var self = this; var self = this;
if (_.isArray(privateKey)) { if (_.isArray(privateKey)) {
_.each(privateKey, function(privateKey) { _.each(privateKey, function(privateKey) {

3
test/transaction/transaction.js
View File

@ -260,7 +260,8 @@ describe('Transaction', function() {
var transaction = new Transaction() var transaction = new Transaction()
.from(simpleUtxoWith1BTC) .from(simpleUtxoWith1BTC)
.change(changeAddress) .change(changeAddress)
.to(toAddress, 1); .fee(50000000)
.to(toAddress, 40000000);
expect(function() { expect(function() {
return transaction.serialize(); return transaction.serialize();
}).to.throw(errors.Transaction.FeeError); }).to.throw(errors.Transaction.FeeError);