prefill signatures with OP_0s and place signatures in correct order in txb.sign when it's not already prefilled with OP_0s
This commit is contained in:
parent
29b93b8a5c
commit
000625c191
1 changed files with 23 additions and 3 deletions
|
@ -238,7 +238,7 @@ TransactionBuilder.prototype.__build = function (allowIncomplete) {
|
||||||
case 'multisig': {
|
case 'multisig': {
|
||||||
// Array.prototype.map is sparse-compatible
|
// Array.prototype.map is sparse-compatible
|
||||||
var msSignatures = input.signatures.map(function (signature) {
|
var msSignatures = input.signatures.map(function (signature) {
|
||||||
return signature.toScriptSignature(input.hashType)
|
return signature && signature.toScriptSignature(input.hashType)
|
||||||
})
|
})
|
||||||
|
|
||||||
// fill in blanks with OP_0
|
// fill in blanks with OP_0
|
||||||
|
@ -368,13 +368,33 @@ TransactionBuilder.prototype.sign = function (index, privKey, redeemScript, hash
|
||||||
input.signatures = input.signatures || []
|
input.signatures = input.signatures || []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var signatureScript = input.redeemScript || input.prevOutScript
|
||||||
|
var signatureHash = this.tx.hashForSignature(index, signatureScript, hashType)
|
||||||
|
|
||||||
|
if (input.scriptType === 'multisig' && input.redeemScript && input.signatures.length !== input.pubKeys.length) {
|
||||||
|
// store signatures locally
|
||||||
|
var _signatures = input.signatures.slice()
|
||||||
|
|
||||||
|
// loop over pubKeys to set their respective signature or set it to OP_0
|
||||||
|
input.signatures = input.pubKeys.map(function (pubKey) {
|
||||||
|
var signature = null
|
||||||
|
_signatures.forEach(function (_signature, _sigIdx) {
|
||||||
|
// check if the signature is not null / false / OP_0 and verify if it belongs to the pubKey
|
||||||
|
if (!signature && _signature && pubKey.verify(signatureHash, _signature)) {
|
||||||
|
// use .splice to remove the signature from the list, so we won't verify it again
|
||||||
|
signature = _signatures.splice(_sigIdx, 1)[0]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return signature || ops.OP_0
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// enforce in order signing of public keys
|
// enforce in order signing of public keys
|
||||||
assert(input.pubKeys.some(function (pubKey, i) {
|
assert(input.pubKeys.some(function (pubKey, i) {
|
||||||
if (!privKey.pub.Q.equals(pubKey.Q)) return false
|
if (!privKey.pub.Q.equals(pubKey.Q)) return false
|
||||||
|
|
||||||
assert(!input.signatures[i], 'Signature already exists')
|
assert(!input.signatures[i], 'Signature already exists')
|
||||||
var signatureScript = input.redeemScript || input.prevOutScript
|
|
||||||
var signatureHash = this.tx.hashForSignature(index, signatureScript, hashType)
|
|
||||||
var signature = privKey.sign(signatureHash)
|
var signature = privKey.sign(signatureHash)
|
||||||
input.signatures[i] = signature
|
input.signatures[i] = signature
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue