TxBuilder: simplify addInput

src/transaction_builder.js

@@ -121,24 +121,17 @@ TransactionBuilder.fromTransaction = function (transaction) {
   return txb
 }
 
-TransactionBuilder.prototype.addInput = function (prevTx, index, sequence, prevOutScript) {
+TransactionBuilder.prototype.addInput = function (txHash, vout, sequence, prevOutScript) {
-  var prevOutHash
+  // is it a txId?
-
+  if (typeof txHash === 'string') {
-  // txId
+    // a txId is big-endian hex, we want a little-endian Buffer
-  if (typeof prevTx === 'string') {
+    txHash = new Buffer(txHash, 'hex')
-    prevOutHash = new Buffer(prevTx, 'hex')
+    Array.prototype.reverse.call(txHash)
-
+
-    // TxId hex is big-endian, we want little-endian hash
+  // is it a Transaction?
-    Array.prototype.reverse.call(prevOutHash)
+  } else if (txHash instanceof Transaction) {
-
+    prevOutScript = txHash.outs[vout].script
-  // Transaction
+    txHash = txHash.getHash()
-  } else if (prevTx instanceof Transaction) {
-    prevOutHash = prevTx.getHash()
-    prevOutScript = prevTx.outs[index].script
-
-  // txHash
-  } else {
-    prevOutHash = prevTx
   }
 
   var input = {}
@@ -172,10 +165,10 @@ TransactionBuilder.prototype.addInput = function (prevTx, index, sequence, prevO
     return input2.hashType & Transaction.SIGHASH_ANYONECANPAY
   }), 'No, this would invalidate signatures')
 
-  var prevOut = prevOutHash.toString('hex') + ':' + index
+  var prevOut = txHash.toString('hex') + ':' + vout
   assert(!(prevOut in this.prevTxMap), 'Transaction is already an input')
 
-  var vin = this.tx.addInput(prevOutHash, index, sequence)
+  var vin = this.tx.addInput(txHash, vout, sequence)
   this.inputs[vin] = input
   this.prevTxMap[prevOut] = vin