|
@ -146,16 +146,19 @@ TransactionBuilder.prototype.__build = function(allowIncomplete) { |
|
|
scriptSig = scripts.pubKeyHashInput(signature, pubKey) |
|
|
scriptSig = scripts.pubKeyHashInput(signature, pubKey) |
|
|
|
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
case 'multisig': |
|
|
case 'multisig': |
|
|
var redeemScript = allowIncomplete ? undefined : input.redeemScript |
|
|
var redeemScript = allowIncomplete ? undefined : input.redeemScript |
|
|
scriptSig = scripts.multisigInput(signatures, redeemScript) |
|
|
scriptSig = scripts.multisigInput(signatures, redeemScript) |
|
|
|
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
case 'pubkey': |
|
|
case 'pubkey': |
|
|
var signature = signatures[0] |
|
|
var signature = signatures[0] |
|
|
scriptSig = scripts.pubKeyInput(signature) |
|
|
scriptSig = scripts.pubKeyInput(signature) |
|
|
|
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
default: |
|
|
default: |
|
|
assert(false, scriptType + ' not supported') |
|
|
assert(false, scriptType + ' not supported') |
|
|
} |
|
|
} |
|
@ -214,6 +217,7 @@ TransactionBuilder.fromTransaction = function(transaction) { |
|
|
signatures = [parsed.signature] |
|
|
signatures = [parsed.signature] |
|
|
|
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
case 'multisig': |
|
|
case 'multisig': |
|
|
var scriptSigs = scriptSig.chunks.slice(1) // ignore OP_0
|
|
|
var scriptSigs = scriptSig.chunks.slice(1) // ignore OP_0
|
|
|
var parsed = scriptSigs.map(function(scriptSig) { |
|
|
var parsed = scriptSigs.map(function(scriptSig) { |
|
@ -225,6 +229,7 @@ TransactionBuilder.fromTransaction = function(transaction) { |
|
|
signatures = parsed.map(function(p) { return p.signature }) |
|
|
signatures = parsed.map(function(p) { return p.signature }) |
|
|
|
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
case 'pubkey': |
|
|
case 'pubkey': |
|
|
var parsed = ECSignature.parseScriptSignature(scriptSig.chunks[0]) |
|
|
var parsed = ECSignature.parseScriptSignature(scriptSig.chunks[0]) |
|
|
|
|
|
|
|
@ -233,6 +238,7 @@ TransactionBuilder.fromTransaction = function(transaction) { |
|
|
signatures = [parsed.signature] |
|
|
signatures = [parsed.signature] |
|
|
|
|
|
|
|
|
break |
|
|
break |
|
|
|
|
|
|
|
|
default: |
|
|
default: |
|
|
assert(false, scriptType + ' not supported') |
|
|
assert(false, scriptType + ' not supported') |
|
|
} |
|
|
} |
|
|