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

Transaction: Check that threshold is less than amount of signatures

This commit is contained in:
eordano 2015-02-18 09:43:47 -03:00
parent a6ef4a610b
commit c19d5c6501
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/transaction/transaction.js
View File

@ -447,6 +447,8 @@ Transaction.prototype._fromNonP2SH = function(utxo) {
}; };
Transaction.prototype._fromMultisigUtxo = function(utxo, pubkeys, threshold) { Transaction.prototype._fromMultisigUtxo = function(utxo, pubkeys, threshold) {
$.checkArgument(threshold <= pubkeys.length,
'Number of required signatures must be greater than the number of public keys');
utxo = new UnspentOutput(utxo); utxo = new UnspentOutput(utxo);
this.addInput(new MultiSigScriptHashInput({ this.addInput(new MultiSigScriptHashInput({
output: new Output({ output: new Output({

19
test/transaction/transaction.js
View File

@ -126,6 +126,10 @@ describe('Transaction', function() {
var changeAddress = 'mgBCJAsvzgT2qNNeXsoECg2uPKrUsZ76up'; var changeAddress = 'mgBCJAsvzgT2qNNeXsoECg2uPKrUsZ76up';
var changeAddressP2SH = '2N7T3TAetJrSCruQ39aNrJvYLhG1LJosujf'; var changeAddressP2SH = '2N7T3TAetJrSCruQ39aNrJvYLhG1LJosujf';
var privateKey = 'cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY'; var privateKey = 'cSBnVM4xvxarwGQuAfQFwqDg9k5tErHUHzgWsEfD4zdwUasvqRVY';
var private1 = '6ce7e97e317d2af16c33db0b9270ec047a91bff3eff8558afb5014afb2bb5976';
var private2 = 'c9b26b0f771a0d2dad88a44de90f05f416b3b385ff1d989343005546a0032890';
var public1 = new PrivateKey(private1).publicKey;
var public2 = new PrivateKey(private2).publicKey;
var simpleUtxoWith1BTC = { var simpleUtxoWith1BTC = {
address: fromAddress, address: fromAddress,
@ -364,10 +368,6 @@ describe('Transaction', function() {
expect(deserialized.inputs[0] instanceof Transaction.Input.PublicKeyHash).to.equal(true); expect(deserialized.inputs[0] instanceof Transaction.Input.PublicKeyHash).to.equal(true);
}); });
it('can serialize and deserialize a P2SH input', function() { it('can serialize and deserialize a P2SH input', function() {
var private1 = '6ce7e97e317d2af16c33db0b9270ec047a91bff3eff8558afb5014afb2bb5976';
var private2 = 'c9b26b0f771a0d2dad88a44de90f05f416b3b385ff1d989343005546a0032890';
var public1 = new PrivateKey(private1).publicKey;
var public2 = new PrivateKey(private2).publicKey;
var transaction = new Transaction() var transaction = new Transaction()
.from({ .from({
txId: '0000', // Not relevant txId: '0000', // Not relevant
@ -401,6 +401,17 @@ describe('Transaction', function() {
transaction.addInput(new Transaction.Input(), Script.empty(), 0); transaction.addInput(new Transaction.Input(), Script.empty(), 0);
}).to.not.throw(); }).to.not.throw();
}); });
it('does not allow a threshold number greater than the amount of public keys', function() {
expect(function() {
transaction = new Transaction();
return transaction.from({
txId: '0000000000000000000000000000000000000000000000000000000000000000',
outputIndex: 0,
script: Script(),
satoshis: 10000
}, [], 1);
}).to.throw('Number of required signatures must be greater than the number of public keys');
});
}); });
describe('removeInput and removeOutput', function() { describe('removeInput and removeOutput', function() {