From 0d7b8af543c82d31b56b845700a3d7f07c345229 Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@conformal.com>
Date: Mon, 20 Apr 2015 16:52:26 -0400
Subject: [PATCH] Updates for txscript.NewScript API change.

---
 rpcserver.go             | 4 ++--
 votingpool/withdrawal.go | 5 ++---
 wallet/createtx.go       | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/rpcserver.go b/rpcserver.go
index a300790..49e54df 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -2834,8 +2834,8 @@ func SignRawTransaction(w *wallet.Wallet, chainSvr *chain.Client, icmd btcjson.C
 
 		// Either it was already signed or we just signed it.
 		// Find out if it is completely satisfied or still needs more.
-		engine, err := txscript.NewScript(txIn.SignatureScript, input,
-			i, msgTx, txscript.StandardVerifyFlags)
+		engine, err := txscript.NewScript(input, msgTx, i,
+			txscript.StandardVerifyFlags)
 		if err != nil || engine.Execute() != nil {
 			complete = false
 		}
diff --git a/votingpool/withdrawal.go b/votingpool/withdrawal.go
index 87a7a1d..74e1bd0 100644
--- a/votingpool/withdrawal.go
+++ b/votingpool/withdrawal.go
@@ -844,9 +844,8 @@ func signMultiSigUTXO(mgr *waddrmgr.Manager, tx *wire.MsgTx, idx int, pkScript [
 // validateSigScripts executes the signature script of the tx input with the
 // given index, returning an error if it fails.
 func validateSigScript(msgtx *wire.MsgTx, idx int, pkScript []byte) error {
-	txIn := msgtx.TxIn[idx]
-	engine, err := txscript.NewScript(
-		txIn.SignatureScript, pkScript, idx, msgtx, txscript.StandardVerifyFlags)
+	engine, err := txscript.NewScript(pkScript, msgtx, idx,
+		txscript.StandardVerifyFlags)
 	if err != nil {
 		return newError(ErrTxSigning, "cannot create script engine", err)
 	}
diff --git a/wallet/createtx.go b/wallet/createtx.go
index 17df4be..93b0ad0 100644
--- a/wallet/createtx.go
+++ b/wallet/createtx.go
@@ -403,10 +403,9 @@ func signMsgTx(msgtx *wire.MsgTx, prevOutputs []txstore.Credit, mgr *waddrmgr.Ma
 }
 
 func validateMsgTx(msgtx *wire.MsgTx, prevOutputs []txstore.Credit) error {
-	for i, txin := range msgtx.TxIn {
-		engine, err := txscript.NewScript(
-			txin.SignatureScript, prevOutputs[i].TxOut().PkScript,
-			i, msgtx, txscript.StandardVerifyFlags)
+	for i := range msgtx.TxIn {
+		engine, err := txscript.NewScript(prevOutputs[i].TxOut().PkScript,
+			msgtx, i, txscript.StandardVerifyFlags)
 		if err != nil {
 			return fmt.Errorf("cannot create script engine: %s", err)
 		}