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

Script/Address: Add check for valid number of threshold needed

Browse Source
This commit is contained in:
eordano 2015-02-18 11:53:22 -03:00
parent c19d5c6501
commit 1a5780e35e
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/script/script.js
View File

@ -543,6 +543,8 @@ Script.prototype.removeCodeseparators = function() {
* public keys before creating the script * public keys before creating the script
*/ */
Script.buildMultisigOut = function(publicKeys, threshold, opts) { Script.buildMultisigOut = function(publicKeys, threshold, opts) {
$.checkArgument(threshold <= publicKeys.length,
'Number of required signatures must be less than or equal to the number of public keys');
opts = opts || {}; opts = opts || {};
var script = new Script(); var script = new Script();
script.add(Opcode.smallInt(threshold)); script.add(Opcode.smallInt(threshold));

6
test/address.js
View File

@ -499,6 +499,12 @@ describe('Address', function() {
var address2 = Address.createMultisig(publics, 2); var address2 = Address.createMultisig(publics, 2);
address.toString().should.equal(address2.toString()); address.toString().should.equal(address2.toString());
}); });
it('fails if invalid array is provided', function() {
expect(function() {
return Address.createMultisig([],3,'testnet');
}).to.throw('Number of required signatures must be less than or equal to the number of public keys');
});
}); });
}); });

6
test/script/script.js
View File

@ -430,6 +430,12 @@ describe('Script', function() {
s.toString().should.equal('OP_2 33 0x021f2f6e1e50cb6a953935c3601284925decd3fd21bc445712576873fb8c6ebc18 33 0x022df8750480ad5b26950b25c7ba79d3e37d75f640f8e5d9bcd5b150a0f85014da 33 0x03e3818b65bcc73a7d64064106a859cc1a5a728c4345ff0b641209fba0d90de6e9 OP_3 OP_CHECKMULTISIG'); s.toString().should.equal('OP_2 33 0x021f2f6e1e50cb6a953935c3601284925decd3fd21bc445712576873fb8c6ebc18 33 0x022df8750480ad5b26950b25c7ba79d3e37d75f640f8e5d9bcd5b150a0f85014da 33 0x03e3818b65bcc73a7d64064106a859cc1a5a728c4345ff0b641209fba0d90de6e9 OP_3 OP_CHECKMULTISIG');
s.isMultisigOut().should.equal(true); s.isMultisigOut().should.equal(true);
}); });
it('should fail when number of required signatures is greater than number of pubkeys', function() {
expect(sortkeys.length).to.equal(3);
expect(function() {
return Script.buildMultisigOut(sortkeys, 4);
}).to.throw('Number of required signatures must be less than or equal to the number of public keys');
});
it('should create unsorted script if specified', function() { it('should create unsorted script if specified', function() {
var s = Script.buildMultisigOut(sortkeys, 2); var s = Script.buildMultisigOut(sortkeys, 2);
var u = Script.buildMultisigOut(sortkeys, 2, { var u = Script.buildMultisigOut(sortkeys, 2, {