Merge pull request #1 from eordano/dust

Add test: OP_RETURN is not dust
This commit is contained in:
Gabriel Jaldon 2015-02-09 20:17:27 +08:00
commit 66d061e5b2
2 changed files with 15 additions and 7 deletions

View File

@ -151,12 +151,10 @@ Transaction.prototype._validateChange = function() {
Transaction.DUST_AMOUNT = 5460;
Transaction.prototype._hasDustOutputs = function() {
var output;
for (output in this.outputs) {
if (this.outputs[output].script.isDataOut()) {
return false;
}
if (this.outputs[output].satoshis < Transaction.DUST_AMOUNT) {
var index, output;
for (index in this.outputs) {
output = this.outputs[index];
if (output.satoshis < Transaction.DUST_AMOUNT && !output.script.isDataOut()) {
return true;
}
}

View File

@ -279,7 +279,7 @@ describe('Transaction', function() {
return transaction.serialize();
}).to.throw(errors.Transaction.FeeError);
});
it('fails if a dust transaction is created', function() {
it('fails if a dust output is created', function() {
var transaction = new Transaction()
.from(simpleUtxoWith1BTC)
.to(toAddress, 1)
@ -289,6 +289,16 @@ describe('Transaction', function() {
return transaction.serialize();
}).to.throw(errors.Transaction.DustOutputs);
});
it('doesn\'t fail if a dust output is an op_return', function() {
var transaction = new Transaction()
.from(simpleUtxoWith1BTC)
.addData('not dust!')
.change(changeAddress)
.sign(privateKey);
expect(function() {
return transaction.serialize();
}).to.not.throw(errors.Transaction.DustOutputs);
});
});
describe('to and from JSON', function() {