LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scripts: multisigInput only uses scriptPubKey for validation, OP_0 validation not necessary

Browse source
This commit is contained in:
Daniel Cousens 2015-03-03 09:53:57 +11:00
parent b13271477c
commit af3491822e
3 changed files with 7 additions and 25 deletions

9
src/scripts.js
View file

@ -253,13 +253,8 @@ function multisigInput (signatures, scriptPubKey) {
var m = mOp - (ops.OP_1 - 1) var m = mOp - (ops.OP_1 - 1)
var n = nOp - (ops.OP_1 - 1) var n = nOp - (ops.OP_1 - 1)
var count = 0 assert(signatures.length >= m, 'Not enough signatures provided')
signatures.forEach(function (signature) { assert(signatures.length <= n, 'Too many signatures provided')
count += (signature !== ops.OP_0)
})
assert(count >= m, 'Not enough signatures provided')
assert(count <= n, 'Too many signatures provided')
} }
return Script.fromChunks([].concat(ops.OP_0, signatures)) return Script.fromChunks([].concat(ops.OP_0, signatures))

20
test/fixtures/scripts.json vendored
View file

@ -173,31 +173,19 @@
{ {
"description": "Not enough signatures provided", "description": "Not enough signatures provided",
"type": "multisig", "type": "multisig",
"pubKeys": [ "scriptPubKey": "OP_2 0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798 02b80011a883a0fd621ad46dfc405df1e74bf075cbaf700fd4aebef6e96f848340 OP_2 OP_CHECKMULTISIG",
"0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798", "signatures": []
"02b80011a883a0fd621ad46dfc405df1e74bf075cbaf700fd4aebef6e96f848340"
],
"signatures": [
null,
null
]
}, },
{ {
"exception": "Not enough signatures provided", "exception": "Not enough signatures provided",
"pubKeys": [ "scriptPubKey": "OP_2 02359c6e3f04cefbf089cf1d6670dc47c3fb4df68e2bad1fa5a369f9ce4b42bbd1 0395a9d84d47d524548f79f435758c01faec5da2b7e551d3b8c995b7e06326ae4a OP_2 OP_CHECKMULTISIG",
"02359c6e3f04cefbf089cf1d6670dc47c3fb4df68e2bad1fa5a369f9ce4b42bbd1",
"0395a9d84d47d524548f79f435758c01faec5da2b7e551d3b8c995b7e06326ae4a"
],
"signatures": [ "signatures": [
"304402207515cf147d201f411092e6be5a64a6006f9308fad7b2a8fdaab22cd86ce764c202200974b8aca7bf51dbf54150d3884e1ae04f675637b926ec33bf75939446f6ca2801" "304402207515cf147d201f411092e6be5a64a6006f9308fad7b2a8fdaab22cd86ce764c202200974b8aca7bf51dbf54150d3884e1ae04f675637b926ec33bf75939446f6ca2801"
] ]
}, },
{ {
"exception": "Too many signatures provided", "exception": "Too many signatures provided",
"pubKeys": [ "scriptPubKey": "OP_2 02359c6e3f04cefbf089cf1d6670dc47c3fb4df68e2bad1fa5a369f9ce4b42bbd1 0395a9d84d47d524548f79f435758c01faec5da2b7e551d3b8c995b7e06326ae4a OP_2 OP_CHECKMULTISIG",
"02359c6e3f04cefbf089cf1d6670dc47c3fb4df68e2bad1fa5a369f9ce4b42bbd1",
"0395a9d84d47d524548f79f435758c01faec5da2b7e551d3b8c995b7e06326ae4a"
],
"signatures": [ "signatures": [
"304402207515cf147d201f411092e6be5a64a6006f9308fad7b2a8fdaab22cd86ce764c202200974b8aca7bf51dbf54150d3884e1ae04f675637b926ec33bf75939446f6ca2801", "304402207515cf147d201f411092e6be5a64a6006f9308fad7b2a8fdaab22cd86ce764c202200974b8aca7bf51dbf54150d3884e1ae04f675637b926ec33bf75939446f6ca2801",
"3045022100ef253c1faa39e65115872519e5f0a33bbecf430c0f35cf562beabbad4da24d8d02201742be8ee49812a73adea3007c9641ce6725c32cd44ddb8e3a3af460015d140501", "3045022100ef253c1faa39e65115872519e5f0a33bbecf430c0f35cf562beabbad4da24d8d02201742be8ee49812a73adea3007c9641ce6725c32cd44ddb8e3a3af460015d140501",

3
test/scripts.js
View file

@ -192,8 +192,7 @@ describe('Scripts', function () {
}) })
fixtures.invalid.multisigInput.forEach(function (f) { fixtures.invalid.multisigInput.forEach(function (f) {
var pubKeys = f.pubKeys.map(ECPubKey.fromHex) var scriptPubKey = Script.fromASM(f.scriptPubKey)
var scriptPubKey = scripts.multisigOutput(pubKeys.length, pubKeys)
it('throws on ' + f.exception, function () { it('throws on ' + f.exception, function () {
var signatures = f.signatures.map(function (signature) { var signatures = f.signatures.map(function (signature) {