Fixing bug in serialization for p2sh signature

src/main/scala/org/bitcoins/core/crypto/TransactionSignatureChecker.scala

@@ -80,7 +80,9 @@ trait TransactionSignatureChecker extends BitcoinSLogger {
       }
       val hashTypeByte = if (signature.bytes.nonEmpty) signature.bytes.last else 0x00.toByte
       val hashType = HashType(Seq(0.toByte, 0.toByte, 0.toByte, hashTypeByte))
-      val hashForSignature = TransactionSignatureSerializer.hashForSignature(txSignatureComponent,hashType)
+      val hashForSignature = TransactionSignatureSerializer.hashForSignature(txSignatureComponent.transaction,
+        txSignatureComponent.inputIndex,
+        sigsRemovedScript, hashType)
       logger.info("Hash for signature: " + BitcoinSUtil.encodeHex(hashForSignature.bytes))
       val isValid = pubKey.verify(hashForSignature,signature)
       if (isValid) SignatureValidationSuccess else SignatureValidationFailureIncorrectSignatures

src/main/scala/org/bitcoins/core/script/ScriptProgram.scala

@@ -330,8 +330,9 @@ object ScriptProgram {
 
   /** Creates a fresh instance of [[org.bitcoins.core.script.PreExecutionScriptProgram]] */
   def apply(transaction: Transaction, scriptPubKey: ScriptPubKey, inputIndex: UInt32,  flags: Seq[ScriptFlag]): PreExecutionScriptProgram = {
-    val t = TransactionSignatureComponent(transaction,inputIndex,scriptPubKey, flags)
-    ScriptProgram(t)
+    val t = TransactionSignatureComponent(transaction,inputIndex,scriptPubKey,flags)
+    val script = t.scriptSignature.asm
+    PreExecutionScriptProgramImpl(t,Nil,script.toList,script.toList,Nil,t.flags)
   }
 
   /**

src/main/scala/org/bitcoins/core/script/interpreter/ScriptInterpreter.scala

@@ -164,7 +164,7 @@ trait ScriptInterpreter extends CryptoInterpreter with StackInterpreter with Con
           else if (evaluated.stackTopIsFalse) ScriptProgram(evaluated,ScriptErrorEvalFalse)
           else evaluated
         case Right(err) =>
-          val program = ScriptProgram(witnessTxSigComponent)
+          val program = ScriptProgram.toExecutionInProgress(ScriptProgram(witnessTxSigComponent))
           ScriptProgram(program,err)
       }
     case UnassignedWitness =>

src/test/scala/org/bitcoins/core/script/interpreter/ScriptInterpreterTest.scala

@@ -28,7 +28,7 @@ class ScriptInterpreterTest extends FlatSpec with MustMatchers with ScriptInterp
 
 
     //use this to represent a single test case from script_valid.json
-    val lines =
+/*    val lines =
         """
           | [ [
   [
@@ -42,8 +42,8 @@ class ScriptInterpreterTest extends FlatSpec with MustMatchers with ScriptInterp
   "OK",
   "Basic P2WSH"
  ]]
-   """.stripMargin
-    //val lines = try source.getLines.filterNot(_.isEmpty).map(_.trim) mkString "\n" finally source.close()
+   """.stripMargin*/
+    val lines = try source.getLines.filterNot(_.isEmpty).map(_.trim) mkString "\n" finally source.close()
     val json = lines.parseJson
     val testCasesOpt : Seq[Option[CoreTestCase]] = json.convertTo[Seq[Option[CoreTestCase]]]
     val testCases : Seq[CoreTestCase] = testCasesOpt.flatten