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

Merge pull request #634 from bitcoinjs/txbb

Browse source 
TransactionBuilder cleanup
This commit is contained in:
Daniel Cousens 2016-09-27 16:55:50 +10:00 • committed by GitHub
commit a4def1049c
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/transaction_builder.js
View file

@ -16,7 +16,7 @@ var Transaction = require('./transaction')
function fixMSSignatures (transaction, vin, pubKeys, signatures, prevOutScript, hashType, skipPubKey) { function fixMSSignatures (transaction, vin, pubKeys, signatures, prevOutScript, hashType, skipPubKey) {
// maintain a local copy of unmatched signatures // maintain a local copy of unmatched signatures
var unmatched = signatures.slice() var unmatched = signatures.slice()
var cache = {} var signatureHash
return pubKeys.map(function (pubKey) { return pubKeys.map(function (pubKey) {
// skip optionally provided pubKey // skip optionally provided pubKey
@ -30,7 +30,9 @@ function fixMSSignatures (transaction, vin, pubKeys, signatures, prevOutScript,
// skip if undefined || OP_0 // skip if undefined || OP_0
if (!signature) return false if (!signature) return false
var signatureHash = cache[hashType] = cache[hashType] || transaction.hashForSignature(vin, prevOutScript, hashType) if (!signatureHash) {
signatureHash = transaction.hashForSignature(vin, prevOutScript, hashType)
}
if (!keyPair2.verify(signatureHash, signature)) return false if (!keyPair2.verify(signatureHash, signature)) return false
// remove matched signature from unmatched // remove matched signature from unmatched
@ -249,12 +251,12 @@ TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOu
throw new Error('No, this would invalidate signatures') throw new Error('No, this would invalidate signatures')
} }
var prevOut = txHash.toString('hex') + ':' + vout var prevTxOut = txHash.toString('hex') + ':' + vout
if (this.prevTxMap[prevOut]) throw new Error('Transaction is already an input') if (this.prevTxMap[prevTxOut]) throw new Error('Duplicate TxOut: ' + prevTxOut)
var vin = this.tx.addInput(txHash, vout, sequence) var vin = this.tx.addInput(txHash, vout, sequence)
this.inputs[vin] = input this.inputs[vin] = input
this.prevTxMap[prevOut] = vin this.prevTxMap[prevTxOut] = vin
return vin return vin
} }
@ -422,7 +424,6 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash
input.signatures.length === input.pubKeys.length input.signatures.length === input.pubKeys.length
var kpPubKey = keyPair.getPublicKeyBuffer() var kpPubKey = keyPair.getPublicKeyBuffer()
var signatureScript
// are we ready to sign? // are we ready to sign?
if (canSign) { if (canSign) {
@ -480,7 +481,7 @@ TransactionBuilder.prototype.sign = function (index, keyPair, redeemScript, hash
} }
// ready to sign? // ready to sign?
signatureScript = 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 in order signing of public keys // enforce in order signing of public keys