Bug Fix : multi sig Pay2Script must insert additional 0 in signature,…

… 1.0.5.3
MetacoSA · Sep 19, 2014 · 262b06f · 262b06f
1 parent 232dc26
commit 262b06f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/NBitcoin/Properties/AssemblyInfo.cs b/NBitcoin/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.2")]
+[assembly: AssemblyVersion("1.0.5.3")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NBitcoin/StandardScriptTemplate.cs b/NBitcoin/StandardScriptTemplate.cs
@@ -269,10 +269,12 @@ public PayToScriptHashSigParameters ExtractScriptSigParameters(Script scriptSig)
 				return null;
 			try
 			{
+				var multiSig = ops.Length > 0 && ops[0].Code == OpcodeType.OP_0;
 				PayToScriptHashSigParameters result = new PayToScriptHashSigParameters();
 				result.Signatures =
 					ops
-					.Take(ops.Length - 1)
+					.Skip(multiSig ? 1 : 0)
+					.Take(ops.Length - 1 - (multiSig ? 1 : 0))
 					.Select(o => new TransactionSignature(o.PushData))
 					.ToArray();
 				result.RedeemScript = new Script(ops[ops.Length - 1].PushData);
@@ -287,6 +289,9 @@ public PayToScriptHashSigParameters ExtractScriptSigParameters(Script scriptSig)
 		public Script GenerateScriptSig(TransactionSignature[] signatures, Script redeemScript)
 		{
 			List<Op> ops = new List<Op>();
+			bool multiSig = signatures.Length > 1;
+			if(multiSig)
+				ops.Add(OpcodeType.OP_0);
 			foreach(var sig in signatures)
 			{
 				ops.Add(Op.GetPushOp(sig.ToBytes()));