txbuilder: refactor for clarity
This commit is contained in:
parent
6800518ab6
commit
4660b84c2d
1 changed files with 10 additions and 12 deletions
|
@ -371,22 +371,20 @@ TransactionBuilder.prototype.sign = function (index, privKey, redeemScript, hash
|
||||||
var signatureScript = input.redeemScript || input.prevOutScript
|
var signatureScript = input.redeemScript || input.prevOutScript
|
||||||
var signatureHash = this.tx.hashForSignature(index, signatureScript, hashType)
|
var signatureHash = this.tx.hashForSignature(index, signatureScript, hashType)
|
||||||
|
|
||||||
|
// enforce signature order matches public keys
|
||||||
if (input.scriptType === 'multisig' && input.redeemScript && input.signatures.length !== input.pubKeys.length) {
|
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) {
|
input.signatures = input.pubKeys.map(function (pubKey) {
|
||||||
var signature = null
|
var match
|
||||||
_signatures.forEach(function (_signature, _sigIdx) {
|
|
||||||
// check if the signature is not null / false / OP_0 and verify if it belongs to the pubKey
|
// check for any matching signatures
|
||||||
if (!signature && _signature && pubKey.verify(signatureHash, _signature)) {
|
input.signatures.some(function (signature) {
|
||||||
// use .splice to remove the signature from the list, so we won't verify it again
|
if (!pubKey.verify(signatureHash, signature)) return false
|
||||||
signature = _signatures.splice(_sigIdx, 1)[0]
|
match = signature
|
||||||
}
|
|
||||||
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
return signature || ops.OP_0
|
return match || undefined
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue